diff options
23 files changed, 29 insertions, 29 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index e82902da3..31d8a522b 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) diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index acaf1c851..1189afec1 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 215 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index 69bc8e751..8943dc8bc 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 64 ; base exp db NO_ITEM, MIRACLEBERRY ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 98edff5b3..4528b5381 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -7,7 +7,7 @@ db 35 ; catch rate db 61 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 29b58e505..ec4714cd3 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 150 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index c5eccc9d8..7085e8990 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 217 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index ea99530ee..d2a7627cb 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 220 ; base exp db SACRED_ASH, SACRED_ASH ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 1896e2158..db3c17b29 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 220 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index de03ea6ff..5a34e2bbc 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 89 ; base exp db NO_ITEM, METAL_COAT ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 9f76e9535..620171c17 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 161 ; base exp db NO_ITEM, METAL_COAT ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index a96cf034d..aa9ed7012 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 64 ; base exp db NO_ITEM, MIRACLEBERRY ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 71e3b9f09..348603b84 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 220 ; base exp db NO_ITEM, BERSERK_GENE ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index a94a4fa5f..2635909d1 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 217 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index 0f7dadadf..e8b1f4402 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 130 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index f2cff7de4..11fd950aa 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 180 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 11e2a12c9..753800d93 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 216 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index ca5f3d919..b8186988e 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 207 ; base exp db STARDUST, STAR_PIECE ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 81fc90216..667c1f2f1 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -7,7 +7,7 @@ db 225 ; catch rate db 106 ; base exp db STARDUST, STAR_PIECE ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index 6ac110534..b52e0f5d0 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 215 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index 8d92bfff4..248aae9d1 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -7,7 +7,7 @@ db 225 ; catch rate db 61 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index a22e09fb8..ad5f16737 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 103 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index afdd064ad..a5589ab9a 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 216 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDERLESS ; gender ratio + db GENDER_UNKNOWN ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 2b5586c51..5468d76fe 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -209,7 +209,7 @@ GetGender: ; 50bdd ; The higher the ratio, the more likely the monster is to be female. - cp GENDERLESS + cp GENDER_UNKNOWN jr z, .Genderless and a ; GENDER_F0? |