From 0e7a101e41bceb9f57eed614d56634403109aa4b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 13 Dec 2017 17:59:14 -0500 Subject: [PATCH] Use constants for gender ratios --- constants/pokemon_data_constants.asm | 9 +++++++++ data/base_stats/abra.asm | 2 +- data/base_stats/aerodactyl.asm | 2 +- data/base_stats/aipom.asm | 2 +- data/base_stats/alakazam.asm | 2 +- data/base_stats/ampharos.asm | 2 +- data/base_stats/arbok.asm | 2 +- data/base_stats/arcanine.asm | 2 +- data/base_stats/ariados.asm | 2 +- data/base_stats/articuno.asm | 2 +- data/base_stats/azumarill.asm | 2 +- data/base_stats/bayleef.asm | 2 +- data/base_stats/beedrill.asm | 2 +- data/base_stats/bellossom.asm | 2 +- data/base_stats/bellsprout.asm | 2 +- data/base_stats/blastoise.asm | 2 +- data/base_stats/blissey.asm | 2 +- data/base_stats/bulbasaur.asm | 2 +- data/base_stats/butterfree.asm | 2 +- data/base_stats/caterpie.asm | 2 +- data/base_stats/celebi.asm | 2 +- data/base_stats/chansey.asm | 2 +- data/base_stats/charizard.asm | 2 +- data/base_stats/charmander.asm | 2 +- data/base_stats/charmeleon.asm | 2 +- data/base_stats/chikorita.asm | 2 +- data/base_stats/chinchou.asm | 2 +- data/base_stats/clefable.asm | 2 +- data/base_stats/clefairy.asm | 2 +- data/base_stats/cleffa.asm | 2 +- data/base_stats/cloyster.asm | 2 +- data/base_stats/corsola.asm | 2 +- data/base_stats/crobat.asm | 2 +- data/base_stats/croconaw.asm | 2 +- data/base_stats/cubone.asm | 2 +- data/base_stats/cyndaquil.asm | 2 +- data/base_stats/delibird.asm | 2 +- data/base_stats/dewgong.asm | 2 +- data/base_stats/diglett.asm | 2 +- data/base_stats/ditto.asm | 2 +- data/base_stats/dodrio.asm | 2 +- data/base_stats/doduo.asm | 2 +- data/base_stats/donphan.asm | 2 +- data/base_stats/dragonair.asm | 2 +- data/base_stats/dragonite.asm | 2 +- data/base_stats/dratini.asm | 2 +- data/base_stats/drowzee.asm | 2 +- data/base_stats/dugtrio.asm | 2 +- data/base_stats/dunsparce.asm | 2 +- data/base_stats/eevee.asm | 2 +- data/base_stats/ekans.asm | 2 +- data/base_stats/electabuzz.asm | 2 +- data/base_stats/electrode.asm | 2 +- data/base_stats/elekid.asm | 2 +- data/base_stats/entei.asm | 2 +- data/base_stats/espeon.asm | 2 +- data/base_stats/exeggcute.asm | 2 +- data/base_stats/exeggutor.asm | 2 +- data/base_stats/farfetch_d.asm | 2 +- data/base_stats/fearow.asm | 2 +- data/base_stats/feraligatr.asm | 2 +- data/base_stats/flaaffy.asm | 2 +- data/base_stats/flareon.asm | 2 +- data/base_stats/forretress.asm | 2 +- data/base_stats/furret.asm | 2 +- data/base_stats/gastly.asm | 2 +- data/base_stats/gengar.asm | 2 +- data/base_stats/geodude.asm | 2 +- data/base_stats/girafarig.asm | 2 +- data/base_stats/gligar.asm | 2 +- data/base_stats/gloom.asm | 2 +- data/base_stats/golbat.asm | 2 +- data/base_stats/goldeen.asm | 2 +- data/base_stats/golduck.asm | 2 +- data/base_stats/golem.asm | 2 +- data/base_stats/granbull.asm | 2 +- data/base_stats/graveler.asm | 2 +- data/base_stats/grimer.asm | 2 +- data/base_stats/growlithe.asm | 2 +- data/base_stats/gyarados.asm | 2 +- data/base_stats/haunter.asm | 2 +- data/base_stats/heracross.asm | 2 +- data/base_stats/hitmonchan.asm | 2 +- data/base_stats/hitmonlee.asm | 2 +- data/base_stats/hitmontop.asm | 2 +- data/base_stats/ho_oh.asm | 2 +- data/base_stats/hoothoot.asm | 2 +- data/base_stats/hoppip.asm | 2 +- data/base_stats/horsea.asm | 2 +- data/base_stats/houndoom.asm | 2 +- data/base_stats/houndour.asm | 2 +- data/base_stats/hypno.asm | 2 +- data/base_stats/igglybuff.asm | 2 +- data/base_stats/ivysaur.asm | 2 +- data/base_stats/jigglypuff.asm | 2 +- data/base_stats/jolteon.asm | 2 +- data/base_stats/jumpluff.asm | 2 +- data/base_stats/jynx.asm | 2 +- data/base_stats/kabuto.asm | 2 +- data/base_stats/kabutops.asm | 2 +- data/base_stats/kadabra.asm | 2 +- data/base_stats/kakuna.asm | 2 +- data/base_stats/kangaskhan.asm | 2 +- data/base_stats/kingdra.asm | 2 +- data/base_stats/kingler.asm | 2 +- data/base_stats/koffing.asm | 2 +- data/base_stats/krabby.asm | 2 +- data/base_stats/lanturn.asm | 2 +- data/base_stats/lapras.asm | 2 +- data/base_stats/larvitar.asm | 2 +- data/base_stats/ledian.asm | 2 +- data/base_stats/ledyba.asm | 2 +- data/base_stats/lickitung.asm | 2 +- data/base_stats/lugia.asm | 2 +- data/base_stats/machamp.asm | 2 +- data/base_stats/machoke.asm | 2 +- data/base_stats/machop.asm | 2 +- data/base_stats/magby.asm | 2 +- data/base_stats/magcargo.asm | 2 +- data/base_stats/magikarp.asm | 2 +- data/base_stats/magmar.asm | 2 +- data/base_stats/magnemite.asm | 2 +- data/base_stats/magneton.asm | 2 +- data/base_stats/mankey.asm | 2 +- data/base_stats/mantine.asm | 2 +- data/base_stats/mareep.asm | 2 +- data/base_stats/marill.asm | 2 +- data/base_stats/marowak.asm | 2 +- data/base_stats/meganium.asm | 2 +- data/base_stats/meowth.asm | 2 +- data/base_stats/metapod.asm | 2 +- data/base_stats/mew.asm | 2 +- data/base_stats/mewtwo.asm | 2 +- data/base_stats/miltank.asm | 2 +- data/base_stats/misdreavus.asm | 2 +- data/base_stats/moltres.asm | 2 +- data/base_stats/mr__mime.asm | 2 +- data/base_stats/muk.asm | 2 +- data/base_stats/murkrow.asm | 2 +- data/base_stats/natu.asm | 2 +- data/base_stats/nidoking.asm | 2 +- data/base_stats/nidoqueen.asm | 2 +- data/base_stats/nidoran_f.asm | 2 +- data/base_stats/nidoran_m.asm | 2 +- data/base_stats/nidorina.asm | 2 +- data/base_stats/nidorino.asm | 2 +- data/base_stats/ninetales.asm | 2 +- data/base_stats/noctowl.asm | 2 +- data/base_stats/octillery.asm | 2 +- data/base_stats/oddish.asm | 2 +- data/base_stats/omanyte.asm | 2 +- data/base_stats/omastar.asm | 2 +- data/base_stats/onix.asm | 2 +- data/base_stats/paras.asm | 2 +- data/base_stats/parasect.asm | 2 +- data/base_stats/persian.asm | 2 +- data/base_stats/phanpy.asm | 2 +- data/base_stats/pichu.asm | 2 +- data/base_stats/pidgeot.asm | 2 +- data/base_stats/pidgeotto.asm | 2 +- data/base_stats/pidgey.asm | 2 +- data/base_stats/pikachu.asm | 2 +- data/base_stats/piloswine.asm | 2 +- data/base_stats/pineco.asm | 2 +- data/base_stats/pinsir.asm | 2 +- data/base_stats/politoed.asm | 2 +- data/base_stats/poliwag.asm | 2 +- data/base_stats/poliwhirl.asm | 2 +- data/base_stats/poliwrath.asm | 2 +- data/base_stats/ponyta.asm | 2 +- data/base_stats/porygon.asm | 2 +- data/base_stats/porygon2.asm | 2 +- data/base_stats/primeape.asm | 2 +- data/base_stats/psyduck.asm | 2 +- data/base_stats/pupitar.asm | 2 +- data/base_stats/quagsire.asm | 2 +- data/base_stats/quilava.asm | 2 +- data/base_stats/qwilfish.asm | 2 +- data/base_stats/raichu.asm | 2 +- data/base_stats/raikou.asm | 2 +- data/base_stats/rapidash.asm | 2 +- data/base_stats/raticate.asm | 2 +- data/base_stats/rattata.asm | 2 +- data/base_stats/remoraid.asm | 2 +- data/base_stats/rhydon.asm | 2 +- data/base_stats/rhyhorn.asm | 2 +- data/base_stats/sandshrew.asm | 2 +- data/base_stats/sandslash.asm | 2 +- data/base_stats/scizor.asm | 2 +- data/base_stats/scyther.asm | 2 +- data/base_stats/seadra.asm | 2 +- data/base_stats/seaking.asm | 2 +- data/base_stats/seel.asm | 2 +- data/base_stats/sentret.asm | 2 +- data/base_stats/shellder.asm | 2 +- data/base_stats/shuckle.asm | 2 +- data/base_stats/skarmory.asm | 2 +- data/base_stats/skiploom.asm | 2 +- data/base_stats/slowbro.asm | 2 +- data/base_stats/slowking.asm | 2 +- data/base_stats/slowpoke.asm | 2 +- data/base_stats/slugma.asm | 2 +- data/base_stats/smeargle.asm | 2 +- data/base_stats/smoochum.asm | 2 +- data/base_stats/sneasel.asm | 2 +- data/base_stats/snorlax.asm | 2 +- data/base_stats/snubbull.asm | 2 +- data/base_stats/spearow.asm | 2 +- data/base_stats/spinarak.asm | 2 +- data/base_stats/squirtle.asm | 2 +- data/base_stats/stantler.asm | 2 +- data/base_stats/starmie.asm | 2 +- data/base_stats/staryu.asm | 2 +- data/base_stats/steelix.asm | 2 +- data/base_stats/sudowoodo.asm | 2 +- data/base_stats/suicune.asm | 2 +- data/base_stats/sunflora.asm | 2 +- data/base_stats/sunkern.asm | 2 +- data/base_stats/swinub.asm | 2 +- data/base_stats/tangela.asm | 2 +- data/base_stats/tauros.asm | 2 +- data/base_stats/teddiursa.asm | 2 +- data/base_stats/tentacool.asm | 2 +- data/base_stats/tentacruel.asm | 2 +- data/base_stats/togepi.asm | 2 +- data/base_stats/togetic.asm | 2 +- data/base_stats/totodile.asm | 2 +- data/base_stats/typhlosion.asm | 2 +- data/base_stats/tyranitar.asm | 2 +- data/base_stats/tyrogue.asm | 2 +- data/base_stats/umbreon.asm | 2 +- data/base_stats/unown.asm | 2 +- data/base_stats/ursaring.asm | 2 +- data/base_stats/vaporeon.asm | 2 +- data/base_stats/venomoth.asm | 2 +- data/base_stats/venonat.asm | 2 +- data/base_stats/venusaur.asm | 2 +- data/base_stats/victreebel.asm | 2 +- data/base_stats/vileplume.asm | 2 +- data/base_stats/voltorb.asm | 2 +- data/base_stats/vulpix.asm | 2 +- data/base_stats/wartortle.asm | 2 +- data/base_stats/weedle.asm | 2 +- data/base_stats/weepinbell.asm | 2 +- data/base_stats/weezing.asm | 2 +- data/base_stats/wigglytuff.asm | 2 +- data/base_stats/wobbuffet.asm | 2 +- data/base_stats/wooper.asm | 2 +- data/base_stats/xatu.asm | 2 +- data/base_stats/yanma.asm | 2 +- data/base_stats/zapdos.asm | 2 +- data/base_stats/zubat.asm | 2 +- main.asm | 6 +++--- 253 files changed, 263 insertions(+), 254 deletions(-) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 3c6b77206..13387fb21 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -25,6 +25,15 @@ BASE_EGG_GROUPS EQUS "(BaseEggGroups - CurBaseData)" BASE_TMHM EQUS "(BaseTMHM - CurBaseData)" BASE_DATA_SIZE EQUS "(CurBaseDataEnd - CurBaseData)" +; gender ratio constants +GENDER_F0 EQU 0 percent +GENDER_F12_5 EQU 31 ; 12.5 percent +GENDER_F25 EQU 25 percent +GENDER_F50 EQU 50 percent +GENDER_F75 EQU 75 percent +GENDER_F100 EQU 254 ; 100 percent +GENDERLESS EQU 255 + ; BaseGrowthRate values ; GrowthRates indexes (see main.asm) const_def diff --git a/data/base_stats/abra.asm b/data/base_stats/abra.asm index f3a39edbb..a2520320a 100644 --- a/data/base_stats/abra.asm +++ b/data/base_stats/abra.asm @@ -8,7 +8,7 @@ db 73 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/aerodactyl.asm b/data/base_stats/aerodactyl.asm index 56530206c..897311399 100644 --- a/data/base_stats/aerodactyl.asm +++ b/data/base_stats/aerodactyl.asm @@ -8,7 +8,7 @@ db 202 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/aipom.asm b/data/base_stats/aipom.asm index aa9ca45a1..839bff358 100644 --- a/data/base_stats/aipom.asm +++ b/data/base_stats/aipom.asm @@ -8,7 +8,7 @@ db 94 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/alakazam.asm b/data/base_stats/alakazam.asm index 79e2e99ee..d0647e268 100644 --- a/data/base_stats/alakazam.asm +++ b/data/base_stats/alakazam.asm @@ -8,7 +8,7 @@ db 186 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ampharos.asm b/data/base_stats/ampharos.asm index a0a2c48f7..ec361a08d 100644 --- a/data/base_stats/ampharos.asm +++ b/data/base_stats/ampharos.asm @@ -8,7 +8,7 @@ db 194 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/arbok.asm b/data/base_stats/arbok.asm index 48129fc36..ed84e5dc8 100644 --- a/data/base_stats/arbok.asm +++ b/data/base_stats/arbok.asm @@ -8,7 +8,7 @@ db 147 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/arcanine.asm b/data/base_stats/arcanine.asm index 81452dd19..d543bb8da 100644 --- a/data/base_stats/arcanine.asm +++ b/data/base_stats/arcanine.asm @@ -8,7 +8,7 @@ db 213 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ariados.asm b/data/base_stats/ariados.asm index 244c70d86..8a436f624 100644 --- a/data/base_stats/ariados.asm +++ b/data/base_stats/ariados.asm @@ -8,7 +8,7 @@ db 134 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/articuno.asm b/data/base_stats/articuno.asm index 320e210c6..ddf85599b 100644 --- a/data/base_stats/articuno.asm +++ b/data/base_stats/articuno.asm @@ -8,7 +8,7 @@ db 215 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/azumarill.asm b/data/base_stats/azumarill.asm index c18e517c4..c4286ad5d 100644 --- a/data/base_stats/azumarill.asm +++ b/data/base_stats/azumarill.asm @@ -8,7 +8,7 @@ db 153 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bayleef.asm b/data/base_stats/bayleef.asm index bb439ccd3..82caf4ae7 100644 --- a/data/base_stats/bayleef.asm +++ b/data/base_stats/bayleef.asm @@ -8,7 +8,7 @@ db 141 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/beedrill.asm b/data/base_stats/beedrill.asm index 465b076de..c76accff8 100644 --- a/data/base_stats/beedrill.asm +++ b/data/base_stats/beedrill.asm @@ -8,7 +8,7 @@ db 159 ; base exp db NO_ITEM ; item 1 db POISON_BARB ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bellossom.asm b/data/base_stats/bellossom.asm index 6489fe50c..9131b2b38 100644 --- a/data/base_stats/bellossom.asm +++ b/data/base_stats/bellossom.asm @@ -8,7 +8,7 @@ db 184 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bellsprout.asm b/data/base_stats/bellsprout.asm index d8e3160e6..94a8ded6b 100644 --- a/data/base_stats/bellsprout.asm +++ b/data/base_stats/bellsprout.asm @@ -8,7 +8,7 @@ db 84 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/blastoise.asm b/data/base_stats/blastoise.asm index 1a2df93b3..7bb267d72 100644 --- a/data/base_stats/blastoise.asm +++ b/data/base_stats/blastoise.asm @@ -8,7 +8,7 @@ db 210 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/blissey.asm b/data/base_stats/blissey.asm index d9c870da4..dc1c9a02b 100644 --- a/data/base_stats/blissey.asm +++ b/data/base_stats/blissey.asm @@ -8,7 +8,7 @@ db 255 ; base exp db NO_ITEM ; item 1 db LUCKY_EGG ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/bulbasaur.asm b/data/base_stats/bulbasaur.asm index eb4bec3f6..bc843bcd3 100644 --- a/data/base_stats/bulbasaur.asm +++ b/data/base_stats/bulbasaur.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/butterfree.asm b/data/base_stats/butterfree.asm index ca1609d1e..24b142e60 100644 --- a/data/base_stats/butterfree.asm +++ b/data/base_stats/butterfree.asm @@ -8,7 +8,7 @@ db 160 ; base exp db NO_ITEM ; item 1 db SILVERPOWDER ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/caterpie.asm b/data/base_stats/caterpie.asm index 47e0b5210..cdac5bf26 100644 --- a/data/base_stats/caterpie.asm +++ b/data/base_stats/caterpie.asm @@ -8,7 +8,7 @@ db 53 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/celebi.asm b/data/base_stats/celebi.asm index 2a09691bd..c955ae2a1 100644 --- a/data/base_stats/celebi.asm +++ b/data/base_stats/celebi.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db MIRACLEBERRY ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/chansey.asm b/data/base_stats/chansey.asm index 2ba6091f9..1ae3af6fe 100644 --- a/data/base_stats/chansey.asm +++ b/data/base_stats/chansey.asm @@ -8,7 +8,7 @@ db 255 ; base exp db NO_ITEM ; item 1 db LUCKY_EGG ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/charizard.asm b/data/base_stats/charizard.asm index d8b1ee769..8d32f3f91 100644 --- a/data/base_stats/charizard.asm +++ b/data/base_stats/charizard.asm @@ -8,7 +8,7 @@ db 209 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/charmander.asm b/data/base_stats/charmander.asm index ba6822529..98383865c 100644 --- a/data/base_stats/charmander.asm +++ b/data/base_stats/charmander.asm @@ -8,7 +8,7 @@ db 65 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/charmeleon.asm b/data/base_stats/charmeleon.asm index 0be9be06f..9f7f32b51 100644 --- a/data/base_stats/charmeleon.asm +++ b/data/base_stats/charmeleon.asm @@ -8,7 +8,7 @@ db 142 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/chikorita.asm b/data/base_stats/chikorita.asm index 74f77ae8f..fdf120402 100644 --- a/data/base_stats/chikorita.asm +++ b/data/base_stats/chikorita.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/chinchou.asm b/data/base_stats/chinchou.asm index 13fb43872..caa5d06e1 100644 --- a/data/base_stats/chinchou.asm +++ b/data/base_stats/chinchou.asm @@ -8,7 +8,7 @@ db 90 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/clefable.asm b/data/base_stats/clefable.asm index ffa07d9dc..e5978e387 100644 --- a/data/base_stats/clefable.asm +++ b/data/base_stats/clefable.asm @@ -8,7 +8,7 @@ db 129 ; base exp db MYSTERYBERRY ; item 1 db MOON_STONE ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/clefairy.asm b/data/base_stats/clefairy.asm index ee1f38d04..54089b5cc 100644 --- a/data/base_stats/clefairy.asm +++ b/data/base_stats/clefairy.asm @@ -8,7 +8,7 @@ db 68 ; base exp db MYSTERYBERRY ; item 1 db MOON_STONE ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cleffa.asm b/data/base_stats/cleffa.asm index 3afb4c6c6..98e77e968 100644 --- a/data/base_stats/cleffa.asm +++ b/data/base_stats/cleffa.asm @@ -8,7 +8,7 @@ db 37 ; base exp db MYSTERYBERRY ; item 1 db MOON_STONE ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cloyster.asm b/data/base_stats/cloyster.asm index f7de0467d..4119dbec2 100644 --- a/data/base_stats/cloyster.asm +++ b/data/base_stats/cloyster.asm @@ -8,7 +8,7 @@ db 203 ; base exp db PEARL ; item 1 db BIG_PEARL ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/corsola.asm b/data/base_stats/corsola.asm index 5a3adde57..dddf30644 100644 --- a/data/base_stats/corsola.asm +++ b/data/base_stats/corsola.asm @@ -8,7 +8,7 @@ db 113 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/crobat.asm b/data/base_stats/crobat.asm index 923ca38a9..71c012079 100644 --- a/data/base_stats/crobat.asm +++ b/data/base_stats/crobat.asm @@ -8,7 +8,7 @@ db 204 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/croconaw.asm b/data/base_stats/croconaw.asm index 66fb9f10c..8dbd57632 100644 --- a/data/base_stats/croconaw.asm +++ b/data/base_stats/croconaw.asm @@ -8,7 +8,7 @@ db 143 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cubone.asm b/data/base_stats/cubone.asm index 7c8d32d82..dc15c8773 100644 --- a/data/base_stats/cubone.asm +++ b/data/base_stats/cubone.asm @@ -8,7 +8,7 @@ db 87 ; base exp db NO_ITEM ; item 1 db THICK_CLUB ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/cyndaquil.asm b/data/base_stats/cyndaquil.asm index b1f294907..137e8c78d 100644 --- a/data/base_stats/cyndaquil.asm +++ b/data/base_stats/cyndaquil.asm @@ -8,7 +8,7 @@ db 65 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/delibird.asm b/data/base_stats/delibird.asm index 139bfb66b..8ddb23e7c 100644 --- a/data/base_stats/delibird.asm +++ b/data/base_stats/delibird.asm @@ -8,7 +8,7 @@ db 183 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dewgong.asm b/data/base_stats/dewgong.asm index e73de86b3..951a1e87e 100644 --- a/data/base_stats/dewgong.asm +++ b/data/base_stats/dewgong.asm @@ -8,7 +8,7 @@ db 176 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/diglett.asm b/data/base_stats/diglett.asm index 9e9005114..b93947622 100644 --- a/data/base_stats/diglett.asm +++ b/data/base_stats/diglett.asm @@ -8,7 +8,7 @@ db 81 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ditto.asm b/data/base_stats/ditto.asm index 6cbbe60ca..b88780bed 100644 --- a/data/base_stats/ditto.asm +++ b/data/base_stats/ditto.asm @@ -8,7 +8,7 @@ db 61 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dodrio.asm b/data/base_stats/dodrio.asm index dd96b10aa..6f8463663 100644 --- a/data/base_stats/dodrio.asm +++ b/data/base_stats/dodrio.asm @@ -8,7 +8,7 @@ db 158 ; base exp db NO_ITEM ; item 1 db SHARP_BEAK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/doduo.asm b/data/base_stats/doduo.asm index 02c1e792a..1ef229455 100644 --- a/data/base_stats/doduo.asm +++ b/data/base_stats/doduo.asm @@ -8,7 +8,7 @@ db 96 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/donphan.asm b/data/base_stats/donphan.asm index 6e66787e1..ee0418de0 100644 --- a/data/base_stats/donphan.asm +++ b/data/base_stats/donphan.asm @@ -8,7 +8,7 @@ db 189 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dragonair.asm b/data/base_stats/dragonair.asm index 621b50d51..e0ca4b8e9 100644 --- a/data/base_stats/dragonair.asm +++ b/data/base_stats/dragonair.asm @@ -8,7 +8,7 @@ db 144 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dragonite.asm b/data/base_stats/dragonite.asm index 83bbbb3eb..8ca777e96 100644 --- a/data/base_stats/dragonite.asm +++ b/data/base_stats/dragonite.asm @@ -8,7 +8,7 @@ db 218 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dratini.asm b/data/base_stats/dratini.asm index f9cf27faf..c1c173c86 100644 --- a/data/base_stats/dratini.asm +++ b/data/base_stats/dratini.asm @@ -8,7 +8,7 @@ db 67 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/drowzee.asm b/data/base_stats/drowzee.asm index 04d7780bb..5aa756351 100644 --- a/data/base_stats/drowzee.asm +++ b/data/base_stats/drowzee.asm @@ -8,7 +8,7 @@ db 102 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dugtrio.asm b/data/base_stats/dugtrio.asm index 402cc6c03..e245f8320 100644 --- a/data/base_stats/dugtrio.asm +++ b/data/base_stats/dugtrio.asm @@ -8,7 +8,7 @@ db 153 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/dunsparce.asm b/data/base_stats/dunsparce.asm index e3ed6a9df..5cbdb5807 100644 --- a/data/base_stats/dunsparce.asm +++ b/data/base_stats/dunsparce.asm @@ -8,7 +8,7 @@ db 75 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/eevee.asm b/data/base_stats/eevee.asm index 44584c15d..79bbafbcf 100644 --- a/data/base_stats/eevee.asm +++ b/data/base_stats/eevee.asm @@ -8,7 +8,7 @@ db 92 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ekans.asm b/data/base_stats/ekans.asm index 0876d169a..0aa84fde2 100644 --- a/data/base_stats/ekans.asm +++ b/data/base_stats/ekans.asm @@ -8,7 +8,7 @@ db 62 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/electabuzz.asm b/data/base_stats/electabuzz.asm index 7b690eae2..29cdf9018 100644 --- a/data/base_stats/electabuzz.asm +++ b/data/base_stats/electabuzz.asm @@ -8,7 +8,7 @@ db 156 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/electrode.asm b/data/base_stats/electrode.asm index 3c2895384..44d92de66 100644 --- a/data/base_stats/electrode.asm +++ b/data/base_stats/electrode.asm @@ -8,7 +8,7 @@ db 150 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/elekid.asm b/data/base_stats/elekid.asm index 9fae865c6..a1f871586 100644 --- a/data/base_stats/elekid.asm +++ b/data/base_stats/elekid.asm @@ -8,7 +8,7 @@ db 106 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/entei.asm b/data/base_stats/entei.asm index c05954720..63f5f0af6 100644 --- a/data/base_stats/entei.asm +++ b/data/base_stats/entei.asm @@ -8,7 +8,7 @@ db 217 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/espeon.asm b/data/base_stats/espeon.asm index deebb0902..5748ded74 100644 --- a/data/base_stats/espeon.asm +++ b/data/base_stats/espeon.asm @@ -8,7 +8,7 @@ db 197 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/exeggcute.asm b/data/base_stats/exeggcute.asm index 95daf462b..3cd83b6c9 100644 --- a/data/base_stats/exeggcute.asm +++ b/data/base_stats/exeggcute.asm @@ -8,7 +8,7 @@ db 98 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/exeggutor.asm b/data/base_stats/exeggutor.asm index d7561e6eb..d5c466f21 100644 --- a/data/base_stats/exeggutor.asm +++ b/data/base_stats/exeggutor.asm @@ -8,7 +8,7 @@ db 212 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/farfetch_d.asm b/data/base_stats/farfetch_d.asm index 2ab5fb9e8..8da2b08a4 100644 --- a/data/base_stats/farfetch_d.asm +++ b/data/base_stats/farfetch_d.asm @@ -8,7 +8,7 @@ db 94 ; base exp db NO_ITEM ; item 1 db STICK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/fearow.asm b/data/base_stats/fearow.asm index 6cb670332..2ce86b1bf 100644 --- a/data/base_stats/fearow.asm +++ b/data/base_stats/fearow.asm @@ -8,7 +8,7 @@ db 162 ; base exp db NO_ITEM ; item 1 db SHARP_BEAK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/feraligatr.asm b/data/base_stats/feraligatr.asm index 758fdb1da..c59ca6ffb 100644 --- a/data/base_stats/feraligatr.asm +++ b/data/base_stats/feraligatr.asm @@ -8,7 +8,7 @@ db 210 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/flaaffy.asm b/data/base_stats/flaaffy.asm index 936ee3b1d..2cf5e15bc 100644 --- a/data/base_stats/flaaffy.asm +++ b/data/base_stats/flaaffy.asm @@ -8,7 +8,7 @@ db 117 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/flareon.asm b/data/base_stats/flareon.asm index 345b9a385..00faecec6 100644 --- a/data/base_stats/flareon.asm +++ b/data/base_stats/flareon.asm @@ -8,7 +8,7 @@ db 198 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/forretress.asm b/data/base_stats/forretress.asm index ab36e1827..08fec2745 100644 --- a/data/base_stats/forretress.asm +++ b/data/base_stats/forretress.asm @@ -8,7 +8,7 @@ db 118 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/furret.asm b/data/base_stats/furret.asm index 75180036c..3e3b7a656 100644 --- a/data/base_stats/furret.asm +++ b/data/base_stats/furret.asm @@ -8,7 +8,7 @@ db 116 ; base exp db BERRY ; item 1 db GOLD_BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gastly.asm b/data/base_stats/gastly.asm index dcec2fdca..cda05fe05 100644 --- a/data/base_stats/gastly.asm +++ b/data/base_stats/gastly.asm @@ -8,7 +8,7 @@ db 95 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gengar.asm b/data/base_stats/gengar.asm index 5fe8894ef..9b9cc3310 100644 --- a/data/base_stats/gengar.asm +++ b/data/base_stats/gengar.asm @@ -8,7 +8,7 @@ db 190 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/geodude.asm b/data/base_stats/geodude.asm index 2b472bafc..86b627107 100644 --- a/data/base_stats/geodude.asm +++ b/data/base_stats/geodude.asm @@ -8,7 +8,7 @@ db 86 ; base exp db NO_ITEM ; item 1 db EVERSTONE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/girafarig.asm b/data/base_stats/girafarig.asm index 3180513f7..7391367cf 100644 --- a/data/base_stats/girafarig.asm +++ b/data/base_stats/girafarig.asm @@ -8,7 +8,7 @@ db 149 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gligar.asm b/data/base_stats/gligar.asm index 3197e0203..5bb7fdca8 100644 --- a/data/base_stats/gligar.asm +++ b/data/base_stats/gligar.asm @@ -8,7 +8,7 @@ db 108 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gloom.asm b/data/base_stats/gloom.asm index d67f73d54..33cea01f2 100644 --- a/data/base_stats/gloom.asm +++ b/data/base_stats/gloom.asm @@ -8,7 +8,7 @@ db 132 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/golbat.asm b/data/base_stats/golbat.asm index be69af4cf..06769b880 100644 --- a/data/base_stats/golbat.asm +++ b/data/base_stats/golbat.asm @@ -8,7 +8,7 @@ db 171 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/goldeen.asm b/data/base_stats/goldeen.asm index 3769ce1b6..314852a3e 100644 --- a/data/base_stats/goldeen.asm +++ b/data/base_stats/goldeen.asm @@ -8,7 +8,7 @@ db 111 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/golduck.asm b/data/base_stats/golduck.asm index b32d538b5..9c4dbb5f5 100644 --- a/data/base_stats/golduck.asm +++ b/data/base_stats/golduck.asm @@ -8,7 +8,7 @@ db 174 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/golem.asm b/data/base_stats/golem.asm index b8fb85054..9a9f04451 100644 --- a/data/base_stats/golem.asm +++ b/data/base_stats/golem.asm @@ -8,7 +8,7 @@ db 177 ; base exp db NO_ITEM ; item 1 db EVERSTONE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/granbull.asm b/data/base_stats/granbull.asm index c2dcda517..088e17dd8 100644 --- a/data/base_stats/granbull.asm +++ b/data/base_stats/granbull.asm @@ -8,7 +8,7 @@ db 178 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/graveler.asm b/data/base_stats/graveler.asm index 17e4e8905..dfbeb770c 100644 --- a/data/base_stats/graveler.asm +++ b/data/base_stats/graveler.asm @@ -8,7 +8,7 @@ db 134 ; base exp db NO_ITEM ; item 1 db EVERSTONE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/grimer.asm b/data/base_stats/grimer.asm index 7fb64eb07..86dacd1e6 100644 --- a/data/base_stats/grimer.asm +++ b/data/base_stats/grimer.asm @@ -8,7 +8,7 @@ db 90 ; base exp db NO_ITEM ; item 1 db NUGGET ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/growlithe.asm b/data/base_stats/growlithe.asm index a5e8676f6..ef5cc53b3 100644 --- a/data/base_stats/growlithe.asm +++ b/data/base_stats/growlithe.asm @@ -8,7 +8,7 @@ db 91 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/gyarados.asm b/data/base_stats/gyarados.asm index 9b57391c5..1bdceff88 100644 --- a/data/base_stats/gyarados.asm +++ b/data/base_stats/gyarados.asm @@ -8,7 +8,7 @@ db 214 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 5 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/haunter.asm b/data/base_stats/haunter.asm index 76f18a739..0db7406c1 100644 --- a/data/base_stats/haunter.asm +++ b/data/base_stats/haunter.asm @@ -8,7 +8,7 @@ db 126 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/heracross.asm b/data/base_stats/heracross.asm index 5d625bf58..1f81d9c7b 100644 --- a/data/base_stats/heracross.asm +++ b/data/base_stats/heracross.asm @@ -8,7 +8,7 @@ db 200 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hitmonchan.asm b/data/base_stats/hitmonchan.asm index dbad48c61..3eeb23dd4 100644 --- a/data/base_stats/hitmonchan.asm +++ b/data/base_stats/hitmonchan.asm @@ -8,7 +8,7 @@ db 140 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hitmonlee.asm b/data/base_stats/hitmonlee.asm index 2a7c5a553..a31352209 100644 --- a/data/base_stats/hitmonlee.asm +++ b/data/base_stats/hitmonlee.asm @@ -8,7 +8,7 @@ db 139 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hitmontop.asm b/data/base_stats/hitmontop.asm index b4e33a3ee..532b8a6d8 100644 --- a/data/base_stats/hitmontop.asm +++ b/data/base_stats/hitmontop.asm @@ -8,7 +8,7 @@ db 138 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ho_oh.asm b/data/base_stats/ho_oh.asm index 5e58d46ae..311bbf6cf 100644 --- a/data/base_stats/ho_oh.asm +++ b/data/base_stats/ho_oh.asm @@ -8,7 +8,7 @@ db 220 ; base exp db SACRED_ASH ; item 1 db SACRED_ASH ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hoothoot.asm b/data/base_stats/hoothoot.asm index 1af3a01db..0442fe414 100644 --- a/data/base_stats/hoothoot.asm +++ b/data/base_stats/hoothoot.asm @@ -8,7 +8,7 @@ db 58 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hoppip.asm b/data/base_stats/hoppip.asm index ad2bb7a02..b1918d699 100644 --- a/data/base_stats/hoppip.asm +++ b/data/base_stats/hoppip.asm @@ -8,7 +8,7 @@ db 74 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/horsea.asm b/data/base_stats/horsea.asm index 5a4e06b84..3296f52af 100644 --- a/data/base_stats/horsea.asm +++ b/data/base_stats/horsea.asm @@ -8,7 +8,7 @@ db 83 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/houndoom.asm b/data/base_stats/houndoom.asm index 82271238c..234832675 100644 --- a/data/base_stats/houndoom.asm +++ b/data/base_stats/houndoom.asm @@ -8,7 +8,7 @@ db 204 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/houndour.asm b/data/base_stats/houndour.asm index 6f97bd086..f743cd81e 100644 --- a/data/base_stats/houndour.asm +++ b/data/base_stats/houndour.asm @@ -8,7 +8,7 @@ db 114 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/hypno.asm b/data/base_stats/hypno.asm index 1bf322d95..6c132b6bf 100644 --- a/data/base_stats/hypno.asm +++ b/data/base_stats/hypno.asm @@ -8,7 +8,7 @@ db 165 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/igglybuff.asm b/data/base_stats/igglybuff.asm index 1951f5aa0..fbf32ecca 100644 --- a/data/base_stats/igglybuff.asm +++ b/data/base_stats/igglybuff.asm @@ -8,7 +8,7 @@ db 39 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ivysaur.asm b/data/base_stats/ivysaur.asm index 032c2408c..7d98b4b6d 100644 --- a/data/base_stats/ivysaur.asm +++ b/data/base_stats/ivysaur.asm @@ -8,7 +8,7 @@ db 141 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jigglypuff.asm b/data/base_stats/jigglypuff.asm index 66ab23227..0f4ea788e 100644 --- a/data/base_stats/jigglypuff.asm +++ b/data/base_stats/jigglypuff.asm @@ -8,7 +8,7 @@ db 76 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jolteon.asm b/data/base_stats/jolteon.asm index 3f956946a..665a40d1d 100644 --- a/data/base_stats/jolteon.asm +++ b/data/base_stats/jolteon.asm @@ -8,7 +8,7 @@ db 197 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jumpluff.asm b/data/base_stats/jumpluff.asm index 7a857dec4..623fbe82d 100644 --- a/data/base_stats/jumpluff.asm +++ b/data/base_stats/jumpluff.asm @@ -8,7 +8,7 @@ db 176 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/jynx.asm b/data/base_stats/jynx.asm index 054dca9ae..c47a4315d 100644 --- a/data/base_stats/jynx.asm +++ b/data/base_stats/jynx.asm @@ -8,7 +8,7 @@ db 137 ; base exp db ICE_BERRY ; item 1 db ICE_BERRY ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kabuto.asm b/data/base_stats/kabuto.asm index 024f2791d..9a38cbcba 100644 --- a/data/base_stats/kabuto.asm +++ b/data/base_stats/kabuto.asm @@ -8,7 +8,7 @@ db 119 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kabutops.asm b/data/base_stats/kabutops.asm index 3c5076954..b8de99fa1 100644 --- a/data/base_stats/kabutops.asm +++ b/data/base_stats/kabutops.asm @@ -8,7 +8,7 @@ db 201 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kadabra.asm b/data/base_stats/kadabra.asm index bf5f33638..6a4e56f13 100644 --- a/data/base_stats/kadabra.asm +++ b/data/base_stats/kadabra.asm @@ -8,7 +8,7 @@ db 145 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kakuna.asm b/data/base_stats/kakuna.asm index 827e17262..83241fbcd 100644 --- a/data/base_stats/kakuna.asm +++ b/data/base_stats/kakuna.asm @@ -8,7 +8,7 @@ db 71 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kangaskhan.asm b/data/base_stats/kangaskhan.asm index ca6094ad7..21af227f0 100644 --- a/data/base_stats/kangaskhan.asm +++ b/data/base_stats/kangaskhan.asm @@ -8,7 +8,7 @@ db 175 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kingdra.asm b/data/base_stats/kingdra.asm index ac4dfd659..e62d0f23e 100644 --- a/data/base_stats/kingdra.asm +++ b/data/base_stats/kingdra.asm @@ -8,7 +8,7 @@ db 207 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/kingler.asm b/data/base_stats/kingler.asm index 65c3344ac..01ac23a99 100644 --- a/data/base_stats/kingler.asm +++ b/data/base_stats/kingler.asm @@ -8,7 +8,7 @@ db 206 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/koffing.asm b/data/base_stats/koffing.asm index b46e8241e..70e8bd114 100644 --- a/data/base_stats/koffing.asm +++ b/data/base_stats/koffing.asm @@ -8,7 +8,7 @@ db 114 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/krabby.asm b/data/base_stats/krabby.asm index 517d3bd07..60ce4c7f4 100644 --- a/data/base_stats/krabby.asm +++ b/data/base_stats/krabby.asm @@ -8,7 +8,7 @@ db 115 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lanturn.asm b/data/base_stats/lanturn.asm index f4dd4cd3a..f5b747fad 100644 --- a/data/base_stats/lanturn.asm +++ b/data/base_stats/lanturn.asm @@ -8,7 +8,7 @@ db 156 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lapras.asm b/data/base_stats/lapras.asm index e57154bc6..9477b6791 100644 --- a/data/base_stats/lapras.asm +++ b/data/base_stats/lapras.asm @@ -8,7 +8,7 @@ db 219 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/larvitar.asm b/data/base_stats/larvitar.asm index 03a9be50f..7de66ca7f 100644 --- a/data/base_stats/larvitar.asm +++ b/data/base_stats/larvitar.asm @@ -8,7 +8,7 @@ db 67 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ledian.asm b/data/base_stats/ledian.asm index a1ca61629..84a06c092 100644 --- a/data/base_stats/ledian.asm +++ b/data/base_stats/ledian.asm @@ -8,7 +8,7 @@ db 134 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ledyba.asm b/data/base_stats/ledyba.asm index a01e329b1..68a20d1ea 100644 --- a/data/base_stats/ledyba.asm +++ b/data/base_stats/ledyba.asm @@ -8,7 +8,7 @@ db 54 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lickitung.asm b/data/base_stats/lickitung.asm index 8b915bc59..0f8f351da 100644 --- a/data/base_stats/lickitung.asm +++ b/data/base_stats/lickitung.asm @@ -8,7 +8,7 @@ db 127 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/lugia.asm b/data/base_stats/lugia.asm index 26f337e2a..3a4109ab9 100644 --- a/data/base_stats/lugia.asm +++ b/data/base_stats/lugia.asm @@ -8,7 +8,7 @@ db 220 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/machamp.asm b/data/base_stats/machamp.asm index 056ce3945..bb716cf25 100644 --- a/data/base_stats/machamp.asm +++ b/data/base_stats/machamp.asm @@ -8,7 +8,7 @@ db 193 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/machoke.asm b/data/base_stats/machoke.asm index 3fdec0eb2..79caf8c70 100644 --- a/data/base_stats/machoke.asm +++ b/data/base_stats/machoke.asm @@ -8,7 +8,7 @@ db 146 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/machop.asm b/data/base_stats/machop.asm index bdde42528..6b0cbaab7 100644 --- a/data/base_stats/machop.asm +++ b/data/base_stats/machop.asm @@ -8,7 +8,7 @@ db 88 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magby.asm b/data/base_stats/magby.asm index 876bceb3f..478dfb8b8 100644 --- a/data/base_stats/magby.asm +++ b/data/base_stats/magby.asm @@ -8,7 +8,7 @@ db 117 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magcargo.asm b/data/base_stats/magcargo.asm index bdbd0ca97..45493135b 100644 --- a/data/base_stats/magcargo.asm +++ b/data/base_stats/magcargo.asm @@ -8,7 +8,7 @@ db 154 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magikarp.asm b/data/base_stats/magikarp.asm index 5d489fbff..2519b475b 100644 --- a/data/base_stats/magikarp.asm +++ b/data/base_stats/magikarp.asm @@ -8,7 +8,7 @@ db 20 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 5 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magmar.asm b/data/base_stats/magmar.asm index 3c27ad670..ea14c66cd 100644 --- a/data/base_stats/magmar.asm +++ b/data/base_stats/magmar.asm @@ -8,7 +8,7 @@ db 167 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 63 ; gender + db GENDER_F25 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magnemite.asm b/data/base_stats/magnemite.asm index 78a3ddea6..19a85a9a1 100644 --- a/data/base_stats/magnemite.asm +++ b/data/base_stats/magnemite.asm @@ -8,7 +8,7 @@ db 89 ; base exp db NO_ITEM ; item 1 db METAL_COAT ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/magneton.asm b/data/base_stats/magneton.asm index 8b9158bba..5fdbe68f4 100644 --- a/data/base_stats/magneton.asm +++ b/data/base_stats/magneton.asm @@ -8,7 +8,7 @@ db 161 ; base exp db NO_ITEM ; item 1 db METAL_COAT ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mankey.asm b/data/base_stats/mankey.asm index 7ee15d3f7..77cc260d4 100644 --- a/data/base_stats/mankey.asm +++ b/data/base_stats/mankey.asm @@ -8,7 +8,7 @@ db 74 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mantine.asm b/data/base_stats/mantine.asm index e8730d787..bfe113428 100644 --- a/data/base_stats/mantine.asm +++ b/data/base_stats/mantine.asm @@ -8,7 +8,7 @@ db 168 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mareep.asm b/data/base_stats/mareep.asm index 366863245..cc190b664 100644 --- a/data/base_stats/mareep.asm +++ b/data/base_stats/mareep.asm @@ -8,7 +8,7 @@ db 59 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/marill.asm b/data/base_stats/marill.asm index 7d9f4ce8a..73708d1df 100644 --- a/data/base_stats/marill.asm +++ b/data/base_stats/marill.asm @@ -8,7 +8,7 @@ db 58 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/marowak.asm b/data/base_stats/marowak.asm index 76b7e4870..3e04b9697 100644 --- a/data/base_stats/marowak.asm +++ b/data/base_stats/marowak.asm @@ -8,7 +8,7 @@ db 124 ; base exp db NO_ITEM ; item 1 db THICK_CLUB ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/meganium.asm b/data/base_stats/meganium.asm index 57f228c28..cf1125003 100644 --- a/data/base_stats/meganium.asm +++ b/data/base_stats/meganium.asm @@ -8,7 +8,7 @@ db 208 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/meowth.asm b/data/base_stats/meowth.asm index f795aa4c2..f177f0efd 100644 --- a/data/base_stats/meowth.asm +++ b/data/base_stats/meowth.asm @@ -8,7 +8,7 @@ db 69 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/metapod.asm b/data/base_stats/metapod.asm index deb7bc8e7..e26e31fc5 100644 --- a/data/base_stats/metapod.asm +++ b/data/base_stats/metapod.asm @@ -8,7 +8,7 @@ db 72 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mew.asm b/data/base_stats/mew.asm index 7544467c7..e2bac0040 100644 --- a/data/base_stats/mew.asm +++ b/data/base_stats/mew.asm @@ -8,7 +8,7 @@ db 64 ; base exp db NO_ITEM ; item 1 db MIRACLEBERRY ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mewtwo.asm b/data/base_stats/mewtwo.asm index 61e01c32c..28da9f404 100644 --- a/data/base_stats/mewtwo.asm +++ b/data/base_stats/mewtwo.asm @@ -8,7 +8,7 @@ db 220 ; base exp db NO_ITEM ; item 1 db BERSERK_GENE ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/miltank.asm b/data/base_stats/miltank.asm index 7083c15c7..63ed422bc 100644 --- a/data/base_stats/miltank.asm +++ b/data/base_stats/miltank.asm @@ -8,7 +8,7 @@ db 200 ; base exp db MOOMOO_MILK ; item 1 db MOOMOO_MILK ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/misdreavus.asm b/data/base_stats/misdreavus.asm index 5811aa665..dc730ad9a 100644 --- a/data/base_stats/misdreavus.asm +++ b/data/base_stats/misdreavus.asm @@ -8,7 +8,7 @@ db 147 ; base exp db NO_ITEM ; item 1 db SPELL_TAG ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/moltres.asm b/data/base_stats/moltres.asm index 13eb7e7af..bf70c2821 100644 --- a/data/base_stats/moltres.asm +++ b/data/base_stats/moltres.asm @@ -8,7 +8,7 @@ db 217 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/mr__mime.asm b/data/base_stats/mr__mime.asm index 3a271baf4..d7042d55a 100644 --- a/data/base_stats/mr__mime.asm +++ b/data/base_stats/mr__mime.asm @@ -8,7 +8,7 @@ db 136 ; base exp db NO_ITEM ; item 1 db MYSTERYBERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/muk.asm b/data/base_stats/muk.asm index 7669e59b0..30c6414fd 100644 --- a/data/base_stats/muk.asm +++ b/data/base_stats/muk.asm @@ -8,7 +8,7 @@ db 157 ; base exp db NO_ITEM ; item 1 db NUGGET ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/murkrow.asm b/data/base_stats/murkrow.asm index 08a1d7143..7f459e8aa 100644 --- a/data/base_stats/murkrow.asm +++ b/data/base_stats/murkrow.asm @@ -8,7 +8,7 @@ db 107 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/natu.asm b/data/base_stats/natu.asm index 2f65b73ba..9d00ce7eb 100644 --- a/data/base_stats/natu.asm +++ b/data/base_stats/natu.asm @@ -8,7 +8,7 @@ db 73 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoking.asm b/data/base_stats/nidoking.asm index a5d6abef0..316f71e87 100644 --- a/data/base_stats/nidoking.asm +++ b/data/base_stats/nidoking.asm @@ -8,7 +8,7 @@ db 195 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoqueen.asm b/data/base_stats/nidoqueen.asm index cf888b7eb..e9d2ae611 100644 --- a/data/base_stats/nidoqueen.asm +++ b/data/base_stats/nidoqueen.asm @@ -8,7 +8,7 @@ db 194 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoran_f.asm b/data/base_stats/nidoran_f.asm index e80b622c9..1cd53b17a 100644 --- a/data/base_stats/nidoran_f.asm +++ b/data/base_stats/nidoran_f.asm @@ -8,7 +8,7 @@ db 59 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidoran_m.asm b/data/base_stats/nidoran_m.asm index 1029a2511..cf0c1e1b2 100644 --- a/data/base_stats/nidoran_m.asm +++ b/data/base_stats/nidoran_m.asm @@ -8,7 +8,7 @@ db 60 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidorina.asm b/data/base_stats/nidorina.asm index 3ca843e85..42b3aebf8 100644 --- a/data/base_stats/nidorina.asm +++ b/data/base_stats/nidorina.asm @@ -8,7 +8,7 @@ db 117 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/nidorino.asm b/data/base_stats/nidorino.asm index c853ef943..f31e8df3d 100644 --- a/data/base_stats/nidorino.asm +++ b/data/base_stats/nidorino.asm @@ -8,7 +8,7 @@ db 118 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ninetales.asm b/data/base_stats/ninetales.asm index c651f8c57..5fd84b886 100644 --- a/data/base_stats/ninetales.asm +++ b/data/base_stats/ninetales.asm @@ -8,7 +8,7 @@ db 178 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/noctowl.asm b/data/base_stats/noctowl.asm index 7c97fd769..e2c8565bd 100644 --- a/data/base_stats/noctowl.asm +++ b/data/base_stats/noctowl.asm @@ -8,7 +8,7 @@ db 162 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/octillery.asm b/data/base_stats/octillery.asm index 1d64afa82..80b5ad97a 100644 --- a/data/base_stats/octillery.asm +++ b/data/base_stats/octillery.asm @@ -8,7 +8,7 @@ db 164 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/oddish.asm b/data/base_stats/oddish.asm index dc91485b6..df75f6485 100644 --- a/data/base_stats/oddish.asm +++ b/data/base_stats/oddish.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/omanyte.asm b/data/base_stats/omanyte.asm index 0e511f244..6278f4e3c 100644 --- a/data/base_stats/omanyte.asm +++ b/data/base_stats/omanyte.asm @@ -8,7 +8,7 @@ db 120 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/omastar.asm b/data/base_stats/omastar.asm index 7e35a8987..d3f3b15e1 100644 --- a/data/base_stats/omastar.asm +++ b/data/base_stats/omastar.asm @@ -8,7 +8,7 @@ db 199 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/onix.asm b/data/base_stats/onix.asm index f67c1eb86..2fc5bd175 100644 --- a/data/base_stats/onix.asm +++ b/data/base_stats/onix.asm @@ -8,7 +8,7 @@ db 108 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/paras.asm b/data/base_stats/paras.asm index 4994aa8dd..d86a51765 100644 --- a/data/base_stats/paras.asm +++ b/data/base_stats/paras.asm @@ -8,7 +8,7 @@ db 70 ; base exp db TINYMUSHROOM ; item 1 db BIG_MUSHROOM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/parasect.asm b/data/base_stats/parasect.asm index 310eba07f..5c4320fd3 100644 --- a/data/base_stats/parasect.asm +++ b/data/base_stats/parasect.asm @@ -8,7 +8,7 @@ db 128 ; base exp db TINYMUSHROOM ; item 1 db BIG_MUSHROOM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/persian.asm b/data/base_stats/persian.asm index f76ecaaae..fd2677e16 100644 --- a/data/base_stats/persian.asm +++ b/data/base_stats/persian.asm @@ -8,7 +8,7 @@ db 148 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/phanpy.asm b/data/base_stats/phanpy.asm index 08ff39595..93a26d43c 100644 --- a/data/base_stats/phanpy.asm +++ b/data/base_stats/phanpy.asm @@ -8,7 +8,7 @@ db 124 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pichu.asm b/data/base_stats/pichu.asm index dbadc22d3..da497bdf8 100644 --- a/data/base_stats/pichu.asm +++ b/data/base_stats/pichu.asm @@ -8,7 +8,7 @@ db 42 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pidgeot.asm b/data/base_stats/pidgeot.asm index 1024b6624..35222d2be 100644 --- a/data/base_stats/pidgeot.asm +++ b/data/base_stats/pidgeot.asm @@ -8,7 +8,7 @@ db 172 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pidgeotto.asm b/data/base_stats/pidgeotto.asm index 8e9d434a3..13b2d8e0c 100644 --- a/data/base_stats/pidgeotto.asm +++ b/data/base_stats/pidgeotto.asm @@ -8,7 +8,7 @@ db 113 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pidgey.asm b/data/base_stats/pidgey.asm index d5f8fa630..0290f1717 100644 --- a/data/base_stats/pidgey.asm +++ b/data/base_stats/pidgey.asm @@ -8,7 +8,7 @@ db 55 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pikachu.asm b/data/base_stats/pikachu.asm index 5875b1ea7..cd998aead 100644 --- a/data/base_stats/pikachu.asm +++ b/data/base_stats/pikachu.asm @@ -8,7 +8,7 @@ db 82 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/piloswine.asm b/data/base_stats/piloswine.asm index 3da32746b..dd8bf950b 100644 --- a/data/base_stats/piloswine.asm +++ b/data/base_stats/piloswine.asm @@ -8,7 +8,7 @@ db 160 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pineco.asm b/data/base_stats/pineco.asm index 43289701c..2c27a9913 100644 --- a/data/base_stats/pineco.asm +++ b/data/base_stats/pineco.asm @@ -8,7 +8,7 @@ db 60 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pinsir.asm b/data/base_stats/pinsir.asm index cd07cde27..697bba44c 100644 --- a/data/base_stats/pinsir.asm +++ b/data/base_stats/pinsir.asm @@ -8,7 +8,7 @@ db 200 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/politoed.asm b/data/base_stats/politoed.asm index 8b510fc8f..dd11f5080 100644 --- a/data/base_stats/politoed.asm +++ b/data/base_stats/politoed.asm @@ -8,7 +8,7 @@ db 185 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/poliwag.asm b/data/base_stats/poliwag.asm index abcab97e2..fb362450c 100644 --- a/data/base_stats/poliwag.asm +++ b/data/base_stats/poliwag.asm @@ -8,7 +8,7 @@ db 77 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/poliwhirl.asm b/data/base_stats/poliwhirl.asm index c2aac43f7..d0d461164 100644 --- a/data/base_stats/poliwhirl.asm +++ b/data/base_stats/poliwhirl.asm @@ -8,7 +8,7 @@ db 131 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/poliwrath.asm b/data/base_stats/poliwrath.asm index 1e3130078..5745daee7 100644 --- a/data/base_stats/poliwrath.asm +++ b/data/base_stats/poliwrath.asm @@ -8,7 +8,7 @@ db 185 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ponyta.asm b/data/base_stats/ponyta.asm index 2366b1b12..5c1f77c98 100644 --- a/data/base_stats/ponyta.asm +++ b/data/base_stats/ponyta.asm @@ -8,7 +8,7 @@ db 152 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/porygon.asm b/data/base_stats/porygon.asm index 340c79af1..b0c99914b 100644 --- a/data/base_stats/porygon.asm +++ b/data/base_stats/porygon.asm @@ -8,7 +8,7 @@ db 130 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/porygon2.asm b/data/base_stats/porygon2.asm index 6c5a518a7..9e049a156 100644 --- a/data/base_stats/porygon2.asm +++ b/data/base_stats/porygon2.asm @@ -8,7 +8,7 @@ db 180 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/primeape.asm b/data/base_stats/primeape.asm index 4abd0b68f..249f9bee4 100644 --- a/data/base_stats/primeape.asm +++ b/data/base_stats/primeape.asm @@ -8,7 +8,7 @@ db 149 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/psyduck.asm b/data/base_stats/psyduck.asm index bbd0e64e3..261fdde99 100644 --- a/data/base_stats/psyduck.asm +++ b/data/base_stats/psyduck.asm @@ -8,7 +8,7 @@ db 80 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/pupitar.asm b/data/base_stats/pupitar.asm index 643b88e34..63c0a41a7 100644 --- a/data/base_stats/pupitar.asm +++ b/data/base_stats/pupitar.asm @@ -8,7 +8,7 @@ db 144 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/quagsire.asm b/data/base_stats/quagsire.asm index 3e65ce4a1..0f49866e7 100644 --- a/data/base_stats/quagsire.asm +++ b/data/base_stats/quagsire.asm @@ -8,7 +8,7 @@ db 137 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/quilava.asm b/data/base_stats/quilava.asm index f1d9a8b3c..efadeda06 100644 --- a/data/base_stats/quilava.asm +++ b/data/base_stats/quilava.asm @@ -8,7 +8,7 @@ db 142 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/qwilfish.asm b/data/base_stats/qwilfish.asm index 5308e60ef..70648e5fd 100644 --- a/data/base_stats/qwilfish.asm +++ b/data/base_stats/qwilfish.asm @@ -8,7 +8,7 @@ db 100 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/raichu.asm b/data/base_stats/raichu.asm index aefc56713..cdc5193cd 100644 --- a/data/base_stats/raichu.asm +++ b/data/base_stats/raichu.asm @@ -8,7 +8,7 @@ db 122 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/raikou.asm b/data/base_stats/raikou.asm index 26966258d..a68f16181 100644 --- a/data/base_stats/raikou.asm +++ b/data/base_stats/raikou.asm @@ -8,7 +8,7 @@ db 216 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rapidash.asm b/data/base_stats/rapidash.asm index a55f7cd36..0167e7439 100644 --- a/data/base_stats/rapidash.asm +++ b/data/base_stats/rapidash.asm @@ -8,7 +8,7 @@ db 192 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/raticate.asm b/data/base_stats/raticate.asm index 6248cf4ca..1cfc65906 100644 --- a/data/base_stats/raticate.asm +++ b/data/base_stats/raticate.asm @@ -8,7 +8,7 @@ db 116 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rattata.asm b/data/base_stats/rattata.asm index 0fb688d58..13c21e889 100644 --- a/data/base_stats/rattata.asm +++ b/data/base_stats/rattata.asm @@ -8,7 +8,7 @@ db 57 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/remoraid.asm b/data/base_stats/remoraid.asm index 4af024564..10ae15479 100644 --- a/data/base_stats/remoraid.asm +++ b/data/base_stats/remoraid.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rhydon.asm b/data/base_stats/rhydon.asm index 8890718a5..cdcfb4cad 100644 --- a/data/base_stats/rhydon.asm +++ b/data/base_stats/rhydon.asm @@ -8,7 +8,7 @@ db 204 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/rhyhorn.asm b/data/base_stats/rhyhorn.asm index 33cff8b54..67d438751 100644 --- a/data/base_stats/rhyhorn.asm +++ b/data/base_stats/rhyhorn.asm @@ -8,7 +8,7 @@ db 135 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sandshrew.asm b/data/base_stats/sandshrew.asm index f2148f9fa..cc0a4c492 100644 --- a/data/base_stats/sandshrew.asm +++ b/data/base_stats/sandshrew.asm @@ -8,7 +8,7 @@ db 93 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sandslash.asm b/data/base_stats/sandslash.asm index ae4c38df0..75f66b363 100644 --- a/data/base_stats/sandslash.asm +++ b/data/base_stats/sandslash.asm @@ -8,7 +8,7 @@ db 163 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/scizor.asm b/data/base_stats/scizor.asm index c05fa7aca..127110c7a 100644 --- a/data/base_stats/scizor.asm +++ b/data/base_stats/scizor.asm @@ -8,7 +8,7 @@ db 200 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/scyther.asm b/data/base_stats/scyther.asm index e01386c6e..4c4779f0f 100644 --- a/data/base_stats/scyther.asm +++ b/data/base_stats/scyther.asm @@ -8,7 +8,7 @@ db 187 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/seadra.asm b/data/base_stats/seadra.asm index b242641c3..b4dc47c20 100644 --- a/data/base_stats/seadra.asm +++ b/data/base_stats/seadra.asm @@ -8,7 +8,7 @@ db 155 ; base exp db NO_ITEM ; item 1 db DRAGON_SCALE ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/seaking.asm b/data/base_stats/seaking.asm index 381c61298..4d6d2f91e 100644 --- a/data/base_stats/seaking.asm +++ b/data/base_stats/seaking.asm @@ -8,7 +8,7 @@ db 170 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/seel.asm b/data/base_stats/seel.asm index 2589fc272..39b44fad8 100644 --- a/data/base_stats/seel.asm +++ b/data/base_stats/seel.asm @@ -8,7 +8,7 @@ db 100 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sentret.asm b/data/base_stats/sentret.asm index 25c7b779c..12e120087 100644 --- a/data/base_stats/sentret.asm +++ b/data/base_stats/sentret.asm @@ -8,7 +8,7 @@ db 57 ; base exp db NO_ITEM ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/shellder.asm b/data/base_stats/shellder.asm index 7d7f801d7..fb60ff262 100644 --- a/data/base_stats/shellder.asm +++ b/data/base_stats/shellder.asm @@ -8,7 +8,7 @@ db 97 ; base exp db PEARL ; item 1 db BIG_PEARL ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/shuckle.asm b/data/base_stats/shuckle.asm index 9f2cee33b..7cd31ad79 100644 --- a/data/base_stats/shuckle.asm +++ b/data/base_stats/shuckle.asm @@ -8,7 +8,7 @@ db 80 ; base exp db BERRY ; item 1 db BERRY ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/skarmory.asm b/data/base_stats/skarmory.asm index 106cee7f3..cf271b39f 100644 --- a/data/base_stats/skarmory.asm +++ b/data/base_stats/skarmory.asm @@ -8,7 +8,7 @@ db 168 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/skiploom.asm b/data/base_stats/skiploom.asm index 2920f19f0..46bbc8a8c 100644 --- a/data/base_stats/skiploom.asm +++ b/data/base_stats/skiploom.asm @@ -8,7 +8,7 @@ db 136 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slowbro.asm b/data/base_stats/slowbro.asm index 7c6520d8a..12e172238 100644 --- a/data/base_stats/slowbro.asm +++ b/data/base_stats/slowbro.asm @@ -8,7 +8,7 @@ db 164 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slowking.asm b/data/base_stats/slowking.asm index 4974b23c5..7307ca826 100644 --- a/data/base_stats/slowking.asm +++ b/data/base_stats/slowking.asm @@ -8,7 +8,7 @@ db 164 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slowpoke.asm b/data/base_stats/slowpoke.asm index 4ad676ab0..36bf88af2 100644 --- a/data/base_stats/slowpoke.asm +++ b/data/base_stats/slowpoke.asm @@ -8,7 +8,7 @@ db 99 ; base exp db NO_ITEM ; item 1 db KINGS_ROCK ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/slugma.asm b/data/base_stats/slugma.asm index 52da7221f..a760dd40e 100644 --- a/data/base_stats/slugma.asm +++ b/data/base_stats/slugma.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/smeargle.asm b/data/base_stats/smeargle.asm index e3011c8d2..d80443acf 100644 --- a/data/base_stats/smeargle.asm +++ b/data/base_stats/smeargle.asm @@ -8,7 +8,7 @@ db 106 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/smoochum.asm b/data/base_stats/smoochum.asm index 985a52a19..69d74d5e8 100644 --- a/data/base_stats/smoochum.asm +++ b/data/base_stats/smoochum.asm @@ -8,7 +8,7 @@ db 87 ; base exp db ICE_BERRY ; item 1 db ICE_BERRY ; item 2 - db 254 ; gender + db GENDER_F100 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sneasel.asm b/data/base_stats/sneasel.asm index eb62897eb..3abea4b7a 100644 --- a/data/base_stats/sneasel.asm +++ b/data/base_stats/sneasel.asm @@ -8,7 +8,7 @@ db 132 ; base exp db NO_ITEM ; item 1 db QUICK_CLAW ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/snorlax.asm b/data/base_stats/snorlax.asm index e04cd1442..0efe599c5 100644 --- a/data/base_stats/snorlax.asm +++ b/data/base_stats/snorlax.asm @@ -8,7 +8,7 @@ db 154 ; base exp db LEFTOVERS ; item 1 db LEFTOVERS ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/snubbull.asm b/data/base_stats/snubbull.asm index 3ac629f26..00d94a3cb 100644 --- a/data/base_stats/snubbull.asm +++ b/data/base_stats/snubbull.asm @@ -8,7 +8,7 @@ db 63 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/spearow.asm b/data/base_stats/spearow.asm index 4321aa799..b94e3559c 100644 --- a/data/base_stats/spearow.asm +++ b/data/base_stats/spearow.asm @@ -8,7 +8,7 @@ db 58 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/spinarak.asm b/data/base_stats/spinarak.asm index 7f00a4677..d9ca7679f 100644 --- a/data/base_stats/spinarak.asm +++ b/data/base_stats/spinarak.asm @@ -8,7 +8,7 @@ db 54 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/squirtle.asm b/data/base_stats/squirtle.asm index 06484e52c..1d9faa25d 100644 --- a/data/base_stats/squirtle.asm +++ b/data/base_stats/squirtle.asm @@ -8,7 +8,7 @@ db 66 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/stantler.asm b/data/base_stats/stantler.asm index 911e1904f..1978739e7 100644 --- a/data/base_stats/stantler.asm +++ b/data/base_stats/stantler.asm @@ -8,7 +8,7 @@ db 165 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/starmie.asm b/data/base_stats/starmie.asm index dbc2122bb..aa60f18d2 100644 --- a/data/base_stats/starmie.asm +++ b/data/base_stats/starmie.asm @@ -8,7 +8,7 @@ db 207 ; base exp db STARDUST ; item 1 db STAR_PIECE ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/staryu.asm b/data/base_stats/staryu.asm index 6d0d90eb3..d0520c3cc 100644 --- a/data/base_stats/staryu.asm +++ b/data/base_stats/staryu.asm @@ -8,7 +8,7 @@ db 106 ; base exp db STARDUST ; item 1 db STAR_PIECE ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/steelix.asm b/data/base_stats/steelix.asm index f740d0c02..df5d8940c 100644 --- a/data/base_stats/steelix.asm +++ b/data/base_stats/steelix.asm @@ -8,7 +8,7 @@ db 196 ; base exp db NO_ITEM ; item 1 db METAL_COAT ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sudowoodo.asm b/data/base_stats/sudowoodo.asm index 6ddc4cd57..1c6c33984 100644 --- a/data/base_stats/sudowoodo.asm +++ b/data/base_stats/sudowoodo.asm @@ -8,7 +8,7 @@ db 135 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/suicune.asm b/data/base_stats/suicune.asm index 6262bd513..04ece5516 100644 --- a/data/base_stats/suicune.asm +++ b/data/base_stats/suicune.asm @@ -8,7 +8,7 @@ db 215 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sunflora.asm b/data/base_stats/sunflora.asm index d8f01ebad..97974939c 100644 --- a/data/base_stats/sunflora.asm +++ b/data/base_stats/sunflora.asm @@ -8,7 +8,7 @@ db 146 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/sunkern.asm b/data/base_stats/sunkern.asm index 2cab9d9a1..054625425 100644 --- a/data/base_stats/sunkern.asm +++ b/data/base_stats/sunkern.asm @@ -8,7 +8,7 @@ db 52 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/swinub.asm b/data/base_stats/swinub.asm index 70b389b30..37f1dd67d 100644 --- a/data/base_stats/swinub.asm +++ b/data/base_stats/swinub.asm @@ -8,7 +8,7 @@ db 78 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tangela.asm b/data/base_stats/tangela.asm index d379fdb92..9bb27ffca 100644 --- a/data/base_stats/tangela.asm +++ b/data/base_stats/tangela.asm @@ -8,7 +8,7 @@ db 166 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tauros.asm b/data/base_stats/tauros.asm index 365de3f8d..553458e83 100644 --- a/data/base_stats/tauros.asm +++ b/data/base_stats/tauros.asm @@ -8,7 +8,7 @@ db 211 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/teddiursa.asm b/data/base_stats/teddiursa.asm index 0269d4c68..d636aed87 100644 --- a/data/base_stats/teddiursa.asm +++ b/data/base_stats/teddiursa.asm @@ -8,7 +8,7 @@ db 124 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tentacool.asm b/data/base_stats/tentacool.asm index e225309e5..b13879b47 100644 --- a/data/base_stats/tentacool.asm +++ b/data/base_stats/tentacool.asm @@ -8,7 +8,7 @@ db 105 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tentacruel.asm b/data/base_stats/tentacruel.asm index 22b2a3808..a678d13a8 100644 --- a/data/base_stats/tentacruel.asm +++ b/data/base_stats/tentacruel.asm @@ -8,7 +8,7 @@ db 205 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/togepi.asm b/data/base_stats/togepi.asm index 1bf6cc339..51249de6d 100644 --- a/data/base_stats/togepi.asm +++ b/data/base_stats/togepi.asm @@ -8,7 +8,7 @@ db 74 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/togetic.asm b/data/base_stats/togetic.asm index f8330c50f..4fc94103d 100644 --- a/data/base_stats/togetic.asm +++ b/data/base_stats/togetic.asm @@ -8,7 +8,7 @@ db 114 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/totodile.asm b/data/base_stats/totodile.asm index 3d57dbc89..1753d5af0 100644 --- a/data/base_stats/totodile.asm +++ b/data/base_stats/totodile.asm @@ -8,7 +8,7 @@ db 66 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/typhlosion.asm b/data/base_stats/typhlosion.asm index a73529cef..698a4e0a0 100644 --- a/data/base_stats/typhlosion.asm +++ b/data/base_stats/typhlosion.asm @@ -8,7 +8,7 @@ db 209 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tyranitar.asm b/data/base_stats/tyranitar.asm index c116bdde3..b695007f1 100644 --- a/data/base_stats/tyranitar.asm +++ b/data/base_stats/tyranitar.asm @@ -8,7 +8,7 @@ db 218 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/tyrogue.asm b/data/base_stats/tyrogue.asm index 87d44a3c5..4e5e7ee43 100644 --- a/data/base_stats/tyrogue.asm +++ b/data/base_stats/tyrogue.asm @@ -8,7 +8,7 @@ db 91 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 0 ; gender + db GENDER_F0 ; gender db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/umbreon.asm b/data/base_stats/umbreon.asm index 1274f6afa..dbda2b3b6 100644 --- a/data/base_stats/umbreon.asm +++ b/data/base_stats/umbreon.asm @@ -8,7 +8,7 @@ db 197 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/unown.asm b/data/base_stats/unown.asm index d447757eb..0b13f3eca 100644 --- a/data/base_stats/unown.asm +++ b/data/base_stats/unown.asm @@ -8,7 +8,7 @@ db 61 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/ursaring.asm b/data/base_stats/ursaring.asm index ba87a54ff..7aa8a4265 100644 --- a/data/base_stats/ursaring.asm +++ b/data/base_stats/ursaring.asm @@ -8,7 +8,7 @@ db 189 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/vaporeon.asm b/data/base_stats/vaporeon.asm index 7d024d5fd..0e55a1946 100644 --- a/data/base_stats/vaporeon.asm +++ b/data/base_stats/vaporeon.asm @@ -8,7 +8,7 @@ db 196 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/venomoth.asm b/data/base_stats/venomoth.asm index c2ac64222..4e813b3aa 100644 --- a/data/base_stats/venomoth.asm +++ b/data/base_stats/venomoth.asm @@ -8,7 +8,7 @@ db 138 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/venonat.asm b/data/base_stats/venonat.asm index ef662fb91..5db99f8a1 100644 --- a/data/base_stats/venonat.asm +++ b/data/base_stats/venonat.asm @@ -8,7 +8,7 @@ db 75 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/venusaur.asm b/data/base_stats/venusaur.asm index 728508bee..f5d6a3a33 100644 --- a/data/base_stats/venusaur.asm +++ b/data/base_stats/venusaur.asm @@ -8,7 +8,7 @@ db 208 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/victreebel.asm b/data/base_stats/victreebel.asm index fd33d5c1c..0efade3ad 100644 --- a/data/base_stats/victreebel.asm +++ b/data/base_stats/victreebel.asm @@ -8,7 +8,7 @@ db 191 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/vileplume.asm b/data/base_stats/vileplume.asm index f6f4b370e..12170e167 100644 --- a/data/base_stats/vileplume.asm +++ b/data/base_stats/vileplume.asm @@ -8,7 +8,7 @@ db 184 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/voltorb.asm b/data/base_stats/voltorb.asm index 5daf64af9..7c2255729 100644 --- a/data/base_stats/voltorb.asm +++ b/data/base_stats/voltorb.asm @@ -8,7 +8,7 @@ db 103 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/vulpix.asm b/data/base_stats/vulpix.asm index 0212212ff..9cea11f93 100644 --- a/data/base_stats/vulpix.asm +++ b/data/base_stats/vulpix.asm @@ -8,7 +8,7 @@ db 63 ; base exp db BURNT_BERRY ; item 1 db BURNT_BERRY ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wartortle.asm b/data/base_stats/wartortle.asm index 751d881ef..437342a8b 100644 --- a/data/base_stats/wartortle.asm +++ b/data/base_stats/wartortle.asm @@ -8,7 +8,7 @@ db 143 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 31 ; gender + db GENDER_F12_5 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/weedle.asm b/data/base_stats/weedle.asm index acc241e74..b47a720ec 100644 --- a/data/base_stats/weedle.asm +++ b/data/base_stats/weedle.asm @@ -8,7 +8,7 @@ db 52 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/weepinbell.asm b/data/base_stats/weepinbell.asm index b87ba6326..4a70c5bb2 100644 --- a/data/base_stats/weepinbell.asm +++ b/data/base_stats/weepinbell.asm @@ -8,7 +8,7 @@ db 151 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/weezing.asm b/data/base_stats/weezing.asm index 96a645828..49161c69b 100644 --- a/data/base_stats/weezing.asm +++ b/data/base_stats/weezing.asm @@ -8,7 +8,7 @@ db 173 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wigglytuff.asm b/data/base_stats/wigglytuff.asm index 82321d595..ff1910c0e 100644 --- a/data/base_stats/wigglytuff.asm +++ b/data/base_stats/wigglytuff.asm @@ -8,7 +8,7 @@ db 109 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 191 ; gender + db GENDER_F75 ; gender db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wobbuffet.asm b/data/base_stats/wobbuffet.asm index 4b865b33c..c476dd828 100644 --- a/data/base_stats/wobbuffet.asm +++ b/data/base_stats/wobbuffet.asm @@ -8,7 +8,7 @@ db 177 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/wooper.asm b/data/base_stats/wooper.asm index 0f0d53630..6e621fe4b 100644 --- a/data/base_stats/wooper.asm +++ b/data/base_stats/wooper.asm @@ -8,7 +8,7 @@ db 52 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/xatu.asm b/data/base_stats/xatu.asm index ba0e964af..77388858e 100644 --- a/data/base_stats/xatu.asm +++ b/data/base_stats/xatu.asm @@ -8,7 +8,7 @@ db 171 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/yanma.asm b/data/base_stats/yanma.asm index 96cf497be..98449c720 100644 --- a/data/base_stats/yanma.asm +++ b/data/base_stats/yanma.asm @@ -8,7 +8,7 @@ db 147 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/zapdos.asm b/data/base_stats/zapdos.asm index eece9b897..44c1a8e82 100644 --- a/data/base_stats/zapdos.asm +++ b/data/base_stats/zapdos.asm @@ -8,7 +8,7 @@ db 216 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 255 ; gender + db GENDERLESS ; gender db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown diff --git a/data/base_stats/zubat.asm b/data/base_stats/zubat.asm index ac5f450d1..e8fd33ea2 100644 --- a/data/base_stats/zubat.asm +++ b/data/base_stats/zubat.asm @@ -8,7 +8,7 @@ db 54 ; base exp db NO_ITEM ; item 1 db NO_ITEM ; item 2 - db 127 ; gender + db GENDER_F50 ; gender db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown diff --git a/main.asm b/main.asm index 6da4dabc2..876a06ef1 100644 --- a/main.asm +++ b/main.asm @@ -3640,13 +3640,13 @@ GetGender: ; 50bdd ; The higher the ratio, the more likely the monster is to be female. - cp $ff + cp GENDERLESS jr z, .Genderless - and a + and a ; GENDER_F0? jr z, .Male - cp $fe + cp GENDER_F100 jr z, .Female ; Values below the ratio are male, and vice versa.