shithub: pokecrystal

Download patch

ref: 1891879b62bcc6fb08ecf11216672e02ca7b522f
parent: f750d4f4185529cfb440ac7825d202ebcf160766
author: mid-kid <esteve.varela@gmail.com>
date: Mon Feb 26 13:43:30 EST 2018 

GENDERLESS -> GENDER_UNKNOWN

This is how they're called in official sources, and it fits better with
the other `GENDER_` constants.


--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -26,13 +26,13 @@
 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/engine/pokemon/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -209,7 +209,7 @@
 
 ; 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?