diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 16:48:31 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 16:48:31 -0500 |
| commit | eb3726bba049d25810ca14f050d1717e693ea2be (patch) | |
| tree | 1ca920fe30708ef6268dda2fefb7f0eea59ce42a | |
| parent | e018a9d005c4c9033acbd9ae4073e60c32952823 (diff) | |
NO_ITEM == 0
252 files changed, 311 insertions, 311 deletions
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 9dca824c0..c4ecd31b0 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 200 ; catch rate db 73 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 889909fa9..29e406504 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -6,7 +6,7 @@ db ROCK, FLYING ; type db 45 ; catch rate db 202 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index a03372532..827cc794f 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 3d5c6672b..1bdaca5a1 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 50 ; catch rate db 186 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index c10d364af..790eb5938 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index ece66c976..a1d1391e1 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 90 ; catch rate db 147 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 8bbca643f..0133ad049 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 75 ; catch rate db 213 ; base exp - db BURNT_BERRY, BURNT_BERRY; items + db BURNT_BERRY, BURNT_BERRY ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 792a87d3f..ca8076a20 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index 24b5cd5f8..deca0d857 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -6,7 +6,7 @@ db ICE, FLYING ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 30ba90c5a..d76e1bd72 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 75 ; catch rate db 153 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index 3a0720e2e..5974e3be7 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 40a52b0e9..8e371d790 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 45 ; catch rate db 159 ; base exp - db NO_ITEM, POISON_BARB; items + db NO_ITEM, POISON_BARB ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 8f5405091..9c6a6a935 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 038692552..315da4464 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 255 ; catch rate db 84 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 82c282f6a..9cb62420a 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index ef9d1714b..8e6256843 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM, LUCKY_EGG; items + db NO_ITEM, LUCKY_EGG ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 7e97d62c8..758504e94 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index c943ea07c..f2c125ac4 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -6,7 +6,7 @@ db BUG, FLYING ; type db 45 ; catch rate db 160 ; base exp - db NO_ITEM, SILVERPOWDER; items + db NO_ITEM, SILVERPOWDER ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index 60ff1c018..d7525ee53 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -6,7 +6,7 @@ db BUG, BUG ; type db 255 ; catch rate db 53 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index 3307591f9..79ec6dcd7 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -6,7 +6,7 @@ db PSYCHIC, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM, MIRACLEBERRY; items + db NO_ITEM, MIRACLEBERRY ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index 993150249..78ec783ae 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM, LUCKY_EGG; items + db NO_ITEM, LUCKY_EGG ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index 631e864d9..237f7d72b 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -6,7 +6,7 @@ db FIRE, FLYING ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index b132a0ddf..6f60c22a8 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 826c5fcf4..832757a7e 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 034d79355..78560d003 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index 570135584..3bad12e41 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -6,7 +6,7 @@ db WATER, ELECTRIC ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 34b332358..dc627f02c 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 25 ; catch rate db 129 ; base exp - db MYSTERYBERRY, MOON_STONE; items + db MYSTERYBERRY, MOON_STONE ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 2ff9c1645..71c8ac9a7 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 150 ; catch rate db 68 ; base exp - db MYSTERYBERRY, MOON_STONE; items + db MYSTERYBERRY, MOON_STONE ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 5436c661e..af68d2f36 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 150 ; catch rate db 37 ; base exp - db MYSTERYBERRY, MOON_STONE; items + db MYSTERYBERRY, MOON_STONE ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 552d9a6fe..7dfc72ff9 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -6,7 +6,7 @@ db WATER, ICE ; type db 60 ; catch rate db 203 ; base exp - db PEARL, BIG_PEARL; items + db PEARL, BIG_PEARL ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 16234bbf1..e5f2536f8 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -6,7 +6,7 @@ db WATER, ROCK ; type db 60 ; catch rate db 113 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index f52866f3b..11b39ab2d 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -6,7 +6,7 @@ db POISON, FLYING ; type db 90 ; catch rate db 204 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 2f08eaecc..8b0fa482f 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 55fdf7586..a44eea42e 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 190 ; catch rate db 87 ; base exp - db NO_ITEM, THICK_CLUB; items + db NO_ITEM, THICK_CLUB ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index 9ffb7a562..e4a632ef7 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index f00e6fbf6..aacb0e6ae 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -6,7 +6,7 @@ db ICE, FLYING ; type db 45 ; catch rate db 183 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index d90aac1b3..18117d30d 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -6,7 +6,7 @@ db WATER, ICE ; type db 75 ; catch rate db 176 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 8c97db59d..eb16f74ea 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 255 ; catch rate db 81 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 06c7f2b4c..98edff5b3 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 35 ; catch rate db 61 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index c3232e2f1..dbdb095e2 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 45 ; catch rate db 158 ; base exp - db NO_ITEM, SHARP_BEAK; items + db NO_ITEM, SHARP_BEAK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 0d503a191..668740723 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 190 ; catch rate db 96 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index af38c1aee..06d91e3a5 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 272310082..a876a54de 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -6,7 +6,7 @@ db DRAGON, DRAGON ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM, DRAGON_SCALE; items + db NO_ITEM, DRAGON_SCALE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index b3698900a..6d088437f 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -6,7 +6,7 @@ db DRAGON, FLYING ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM, DRAGON_SCALE; items + db NO_ITEM, DRAGON_SCALE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 7cdf68c88..2e8b2a226 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -6,7 +6,7 @@ db DRAGON, DRAGON ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM, DRAGON_SCALE; items + db NO_ITEM, DRAGON_SCALE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 9cfad8c45..9d1ad9b41 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 190 ; catch rate db 102 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index fe6d0415b..8743b2513 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 50 ; catch rate db 153 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 5118dfd2c..5e6e2170b 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 8fce2db3f..0176dec0d 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 92 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index a0c72af1e..5d9903d0e 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 255 ; catch rate db 62 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 521a23344..1ab247deb 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 156 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 456bc5797..29b58e505 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 60 ; catch rate db 150 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index 48eb8ac14..75b6f4375 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 3e0a778c7..1374353ea 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 502185e9a..a918b8a20 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 3cc9a8543..208e93267 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -6,7 +6,7 @@ db GRASS, PSYCHIC ; type db 90 ; catch rate db 98 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 3e3e83281..a573c30ff 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -6,7 +6,7 @@ db GRASS, PSYCHIC ; type db 45 ; catch rate db 212 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 874f06d69..eed2f6c60 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM, STICK; items + db NO_ITEM, STICK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 432c9965a..294aa8b4d 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM, SHARP_BEAK; items + db NO_ITEM, SHARP_BEAK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index 6cdaa6857..acdbc4126 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index 01d1fcc77..462f62aa7 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index d38a9411a..ccdc379e0 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 198 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index a22389430..24eded41f 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -6,7 +6,7 @@ db BUG, STEEL ; type db 75 ; catch rate db 118 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index 303e301d0..cb1400fa3 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db BERRY, GOLD_BERRY; items + db BERRY, GOLD_BERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index cc399fabf..e3bdd277d 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -6,7 +6,7 @@ db GHOST, POISON ; type db 190 ; catch rate db 95 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index a8b2240a2..fd08cb5b9 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -6,7 +6,7 @@ db GHOST, POISON ; type db 45 ; catch rate db 190 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 4cfc7ea5b..f084e0b84 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -6,7 +6,7 @@ db ROCK, GROUND ; type db 255 ; catch rate db 86 ; base exp - db NO_ITEM, EVERSTONE; items + db NO_ITEM, EVERSTONE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 996171792..e4a93e1a1 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -6,7 +6,7 @@ db NORMAL, PSYCHIC ; type db 60 ; catch rate db 149 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index d0b026f7c..ae609d5d2 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -6,7 +6,7 @@ db GROUND, FLYING ; type db 60 ; catch rate db 108 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 78ca61d01..3fa7e5519 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 120 ; catch rate db 132 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 0928342a3..071df7e59 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -6,7 +6,7 @@ db POISON, FLYING ; type db 90 ; catch rate db 171 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 1a598fd28..eb432d38b 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 225 ; catch rate db 111 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index 53a633c1d..5cc8e01a1 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 75 ; catch rate db 174 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index b484a9f73..bb973d0b9 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -6,7 +6,7 @@ db ROCK, GROUND ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM, EVERSTONE; items + db NO_ITEM, EVERSTONE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index 272cb2c04..3d3933377 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 75 ; catch rate db 178 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index 216378ea9..97c4699c0 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -6,7 +6,7 @@ db ROCK, GROUND ; type db 120 ; catch rate db 134 ; base exp - db NO_ITEM, EVERSTONE; items + db NO_ITEM, EVERSTONE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 24a0c6edd..35c0e5eaf 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM, NUGGET; items + db NO_ITEM, NUGGET ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index aaef18154..61c9f5e54 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 190 ; catch rate db 91 ; base exp - db BURNT_BERRY, BURNT_BERRY; items + db BURNT_BERRY, BURNT_BERRY ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index 66916f2d8..0e4d5ca6e 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -6,7 +6,7 @@ db WATER, FLYING ; type db 45 ; catch rate db 214 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 5 ; step cycles to hatch diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index e6268fefa..f9f985a70 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -6,7 +6,7 @@ db GHOST, POISON ; type db 90 ; catch rate db 126 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index b02fb74d8..699fc40a8 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -6,7 +6,7 @@ db BUG, FIGHTING ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index 0d753ff50..f5d84215b 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 45 ; catch rate db 140 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index 6fd72dd4e..4577d6cca 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 45 ; catch rate db 139 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index f7041fbc1..caf0375a1 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 45 ; catch rate db 138 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index f63bd3a1b..248fc05b7 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -6,7 +6,7 @@ db FIRE, FLYING ; type db 3 ; catch rate db 220 ; base exp - db SACRED_ASH, SACRED_ASH; items + db SACRED_ASH, SACRED_ASH ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index 9fcc72dcf..29293fc6a 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index 05d378af8..4119f13a7 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -6,7 +6,7 @@ db GRASS, FLYING ; type db 255 ; catch rate db 74 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 1869ebacf..dd3c085a8 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 225 ; catch rate db 83 ; base exp - db NO_ITEM, DRAGON_SCALE; items + db NO_ITEM, DRAGON_SCALE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index 7c14cf179..57a9a77fe 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -6,7 +6,7 @@ db DARK, FIRE ; type db 45 ; catch rate db 204 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index c212ea227..108d548b9 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -6,7 +6,7 @@ db DARK, FIRE ; type db 120 ; catch rate db 114 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 312659af0..d48bb297a 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 75 ; catch rate db 165 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index 73cf2f077..b6aa6adf5 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 170 ; catch rate db 39 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index aa3d60b65..e06579d8b 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index 42f9a3e69..5a3066a56 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 170 ; catch rate db 76 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index 283ce0fd8..109096d97 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index d9ffb165a..eb98fdb31 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -6,7 +6,7 @@ db GRASS, FLYING ; type db 45 ; catch rate db 176 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 47fbefdc2..030c2a978 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -6,7 +6,7 @@ db ICE, PSYCHIC ; type db 45 ; catch rate db 137 ; base exp - db ICE_BERRY, ICE_BERRY; items + db ICE_BERRY, ICE_BERRY ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 36089b5a2..f9ac24011 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -6,7 +6,7 @@ db ROCK, WATER ; type db 45 ; catch rate db 119 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 30 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index 4cba3259e..c6d755694 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -6,7 +6,7 @@ db ROCK, WATER ; type db 45 ; catch rate db 201 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 30 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 7533d2894..eff333df4 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 100 ; catch rate db 145 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 5c9902df5..20c0db908 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 120 ; catch rate db 71 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 69f6ba6f9..f56401af5 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 175 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index f64cddccc..930f30b7b 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -6,7 +6,7 @@ db WATER, DRAGON ; type db 45 ; catch rate db 207 ; base exp - db NO_ITEM, DRAGON_SCALE; items + db NO_ITEM, DRAGON_SCALE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index f76ff1a26..3362dc4f0 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 60 ; catch rate db 206 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 593be0a67..cd37c020e 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 190 ; catch rate db 114 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index 830908fd5..5b8214773 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 225 ; catch rate db 115 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index d8e38b369..140d85dc4 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -6,7 +6,7 @@ db WATER, ELECTRIC ; type db 75 ; catch rate db 156 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 5985e9f68..dbbaa0203 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -6,7 +6,7 @@ db WATER, ICE ; type db 45 ; catch rate db 219 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index d40e559c6..fc595d973 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -6,7 +6,7 @@ db ROCK, GROUND ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index e8fcc7db1..ac8e998b7 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -6,7 +6,7 @@ db BUG, FLYING ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index a532862ea..7ec0cf21b 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -6,7 +6,7 @@ db BUG, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 80c034a8a..71b61380f 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 127 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 76678116a..dae611f43 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -6,7 +6,7 @@ db PSYCHIC, FLYING ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 67566ee37..a8a18ae9e 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 45 ; catch rate db 193 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index fa18abc93..eeef8bdb5 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 90 ; catch rate db 146 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index ee81897a0..a3eef3d17 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 180 ; catch rate db 88 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index dcf076627..259cbd32d 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 117 ; base exp - db BURNT_BERRY, BURNT_BERRY; items + db BURNT_BERRY, BURNT_BERRY ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index 03a8e8147..2daa19ead 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -6,7 +6,7 @@ db FIRE, ROCK ; type db 75 ; catch rate db 154 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index 3398a5291..16e0cebc9 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 255 ; catch rate db 20 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 5 ; step cycles to hatch diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index dcef3350c..7c12c9304 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 167 ; base exp - db BURNT_BERRY, BURNT_BERRY; items + db BURNT_BERRY, BURNT_BERRY ; items db GENDER_F25 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 667ca215e..de03ea6ff 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -6,7 +6,7 @@ db ELECTRIC, STEEL ; type db 190 ; catch rate db 89 ; base exp - db NO_ITEM, METAL_COAT; items + db NO_ITEM, METAL_COAT ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 201ac98c2..9f76e9535 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -6,7 +6,7 @@ db ELECTRIC, STEEL ; type db 60 ; catch rate db 161 ; base exp - db NO_ITEM, METAL_COAT; items + db NO_ITEM, METAL_COAT ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 4f4c8323c..20685da70 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index 33b674f4e..7b5cd54a9 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -6,7 +6,7 @@ db WATER, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index dbc7542ab..fbfe2b807 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index f57d0e577..28f936745 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 190 ; catch rate db 58 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index b98e344ee..264814f55 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 75 ; catch rate db 124 ; base exp - db NO_ITEM, THICK_CLUB; items + db NO_ITEM, THICK_CLUB ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index 41336bf88..7e1b00fbd 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 4f12a79ff..70a8d99c3 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 255 ; catch rate db 69 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index 4f91cbd72..335e894e3 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -6,7 +6,7 @@ db BUG, BUG ; type db 120 ; catch rate db 72 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index ddc70b947..00210b8fd 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM, MIRACLEBERRY; items + db NO_ITEM, MIRACLEBERRY ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 2c1e68497..72af5a116 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM, BERSERK_GENE; items + db NO_ITEM, BERSERK_GENE ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index 8a28845f7..20454d80a 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 200 ; base exp - db MOOMOO_MILK, MOOMOO_MILK; items + db MOOMOO_MILK, MOOMOO_MILK ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index 232fc4bea..e4d427ae4 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -6,7 +6,7 @@ db GHOST, GHOST ; type db 45 ; catch rate db 147 ; base exp - db NO_ITEM, SPELL_TAG; items + db NO_ITEM, SPELL_TAG ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 17f90610e..975c7a9ab 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -6,7 +6,7 @@ db FIRE, FLYING ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 3073f6d6e..9caaa03d1 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 136 ; base exp - db NO_ITEM, MYSTERYBERRY; items + db NO_ITEM, MYSTERYBERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 4f22ac6b1..ed929874e 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 75 ; catch rate db 157 ; base exp - db NO_ITEM, NUGGET; items + db NO_ITEM, NUGGET ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 7e49aa5d9..db9c40fa1 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -6,7 +6,7 @@ db DARK, FLYING ; type db 30 ; catch rate db 107 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index 01fe673d3..6f1076eb7 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -6,7 +6,7 @@ db PSYCHIC, FLYING ; type db 190 ; catch rate db 73 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index e06b80f19..2d70f6621 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -6,7 +6,7 @@ db POISON, GROUND ; type db 45 ; catch rate db 195 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 96436233c..0de2794e0 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -6,7 +6,7 @@ db POISON, GROUND ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index b6d52cbbf..d7a53a596 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index b155aaf52..d89889419 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 235 ; catch rate db 60 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index fb406792c..aad8f6eb3 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 60b0a9f34..3d1ed2ab9 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 120 ; catch rate db 118 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 6f167809e..fb4a416fd 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 75 ; catch rate db 178 ; base exp - db BURNT_BERRY, BURNT_BERRY; items + db BURNT_BERRY, BURNT_BERRY ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index a0ee3cf39..5ad54adc6 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index 935e1e649..c4a9a9c09 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index fd7cecbfb..aac42694b 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 255 ; catch rate db 78 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 1d934e51f..d676205de 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -6,7 +6,7 @@ db ROCK, WATER ; type db 45 ; catch rate db 120 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 30 ; step cycles to hatch diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 446f13bcd..33816ae00 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -6,7 +6,7 @@ db ROCK, WATER ; type db 45 ; catch rate db 199 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 30 ; step cycles to hatch diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index e9e1d53ec..6b3183e97 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -6,7 +6,7 @@ db ROCK, GROUND ; type db 45 ; catch rate db 108 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 6bea13e23..d7b2de570 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -6,7 +6,7 @@ db BUG, GRASS ; type db 190 ; catch rate db 70 ; base exp - db TINYMUSHROOM, BIG_MUSHROOM; items + db TINYMUSHROOM, BIG_MUSHROOM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index c2113d8ad..cafcef2cd 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -6,7 +6,7 @@ db BUG, GRASS ; type db 75 ; catch rate db 128 ; base exp - db TINYMUSHROOM, BIG_MUSHROOM; items + db TINYMUSHROOM, BIG_MUSHROOM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index 5b580bab7..a718c052d 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 90 ; catch rate db 148 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 20bb20668..e3a331614 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index 319f50c62..a5dccbd05 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 42 ; base exp - db NO_ITEM, BERRY; items + db NO_ITEM, BERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 398d3aab6..5d935b01d 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 45 ; catch rate db 172 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index cafa3a403..766a2e5cf 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 120 ; catch rate db 113 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 72f66c923..4d9ccb21a 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 255 ; catch rate db 55 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 2edf64ee2..72b9e1e94 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 82 ; base exp - db NO_ITEM, BERRY; items + db NO_ITEM, BERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index fe20a92f7..454555e6c 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -6,7 +6,7 @@ db ICE, GROUND ; type db 75 ; catch rate db 160 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 55cf7d4a4..fc5e2e591 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -6,7 +6,7 @@ db BUG, BUG ; type db 190 ; catch rate db 60 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 37f28a030..7d7a46257 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -6,7 +6,7 @@ db BUG, BUG ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 3cf6ec968..617dc0c7c 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM, KINGS_ROCK; items + db NO_ITEM, KINGS_ROCK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 119b5f071..d3a2722a5 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 255 ; catch rate db 77 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index 6d0347b28..2c2e9dba9 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 120 ; catch rate db 131 ; base exp - db NO_ITEM, KINGS_ROCK; items + db NO_ITEM, KINGS_ROCK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index fb20eab80..114cc7c88 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -6,7 +6,7 @@ db WATER, FIGHTING ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM, KINGS_ROCK; items + db NO_ITEM, KINGS_ROCK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index f2e8d1276..574d5e59f 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 190 ; catch rate db 152 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index b8287bde2..0f7dadadf 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 130 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 2f6dd81c7..f2cff7de4 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 180 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index c02101bcc..77b3c85b5 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 75 ; catch rate db 149 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index af71eb065..09bc34d32 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 190 ; catch rate db 80 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 59b44d324..b4bc6e5e7 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -6,7 +6,7 @@ db ROCK, GROUND ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index 0c583bed0..b9b499bd3 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -6,7 +6,7 @@ db WATER, GROUND ; type db 90 ; catch rate db 137 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 5f687007b..eeafc75b9 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 6a2de9a23..16cf03d07 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -6,7 +6,7 @@ db WATER, POISON ; type db 45 ; catch rate db 100 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index 482452179..80e7cb39d 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 75 ; catch rate db 122 ; base exp - db NO_ITEM, BERRY; items + db NO_ITEM, BERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 4a1775245..8c8f3a892 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 6cc216709..9fef3737e 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 60 ; catch rate db 192 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 96269adb7..942abebef 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index f1479d2d9..9eb0fe31b 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index a611ffda8..a41ce6ce8 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index b610aaa52..6745dd147 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -6,7 +6,7 @@ db GROUND, ROCK ; type db 60 ; catch rate db 204 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index 8127827a2..3881e57b7 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -6,7 +6,7 @@ db GROUND, ROCK ; type db 120 ; catch rate db 135 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 0132b0fa8..2fa394171 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 255 ; catch rate db 93 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 5b7a13467..4036e1642 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -6,7 +6,7 @@ db GROUND, GROUND ; type db 90 ; catch rate db 163 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index 6cd870ccd..e59a4bd96 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -6,7 +6,7 @@ db BUG, STEEL ; type db 25 ; catch rate db 200 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index 0d39fe8ff..a39f00ec9 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -6,7 +6,7 @@ db BUG, FLYING ; type db 45 ; catch rate db 187 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index a6f557de5..9793dbc2a 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 75 ; catch rate db 155 ; base exp - db NO_ITEM, DRAGON_SCALE; items + db NO_ITEM, DRAGON_SCALE ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 237c9e4ff..16877fbc4 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 60 ; catch rate db 170 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index 3776f51a4..00cef0380 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 190 ; catch rate db 100 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index f0cb873e9..b32a13168 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM, BERRY; items + db NO_ITEM, BERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index 64ed157ae..c7a39fc88 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 190 ; catch rate db 97 ; base exp - db PEARL, BIG_PEARL; items + db PEARL, BIG_PEARL ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index 78e52d9d4..ca4cbc9c2 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -6,7 +6,7 @@ db BUG, ROCK ; type db 190 ; catch rate db 80 ; base exp - db BERRY, BERRY; items + db BERRY, BERRY ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index 063c38513..73fc39741 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -6,7 +6,7 @@ db STEEL, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index 585aad5c3..fe757d659 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -6,7 +6,7 @@ db GRASS, FLYING ; type db 120 ; catch rate db 136 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index c4b0ce378..797dbbf3a 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -6,7 +6,7 @@ db WATER, PSYCHIC ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM, KINGS_ROCK; items + db NO_ITEM, KINGS_ROCK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index 4f3f570d5..56e565e5c 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -6,7 +6,7 @@ db WATER, PSYCHIC ; type db 70 ; catch rate db 164 ; base exp - db NO_ITEM, KINGS_ROCK; items + db NO_ITEM, KINGS_ROCK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index b5efaa2ad..99d9a60ba 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -6,7 +6,7 @@ db WATER, PSYCHIC ; type db 190 ; catch rate db 99 ; base exp - db NO_ITEM, KINGS_ROCK; items + db NO_ITEM, KINGS_ROCK ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 65d29368a..ec6007b5d 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index bd77a4578..efc5c9b87 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index 90f8fb084..6a36dbc78 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -6,7 +6,7 @@ db ICE, PSYCHIC ; type db 45 ; catch rate db 87 ; base exp - db ICE_BERRY, ICE_BERRY; items + db ICE_BERRY, ICE_BERRY ; items db GENDER_F100 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index b092b5540..25829878b 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -6,7 +6,7 @@ db DARK, ICE ; type db 60 ; catch rate db 132 ; base exp - db NO_ITEM, QUICK_CLAW; items + db NO_ITEM, QUICK_CLAW ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index aeb87f428..68b1be600 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 25 ; catch rate db 154 ; base exp - db LEFTOVERS, LEFTOVERS; items + db LEFTOVERS, LEFTOVERS ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 1beab40e9..0e118f05b 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 190 ; catch rate db 63 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index a8d565733..98b61b6b7 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index 29acb53aa..e02fb6ca1 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index c8c8f8783..f09725cb0 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index 91793abdc..8e7bd40ce 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 165 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 5d0dd82f6..2021fc7dd 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -6,7 +6,7 @@ db WATER, PSYCHIC ; type db 60 ; catch rate db 207 ; base exp - db STARDUST, STAR_PIECE; items + db STARDUST, STAR_PIECE ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index cdb4db546..06f2e54e2 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 225 ; catch rate db 106 ; base exp - db STARDUST, STAR_PIECE; items + db STARDUST, STAR_PIECE ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 2332b5abb..e8e620831 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -6,7 +6,7 @@ db STEEL, GROUND ; type db 25 ; catch rate db 196 ; base exp - db NO_ITEM, METAL_COAT; items + db NO_ITEM, METAL_COAT ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index 63b1d3349..cd95db096 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -6,7 +6,7 @@ db ROCK, ROCK ; type db 65 ; catch rate db 135 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index 669a85aaa..372025a0c 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index 96973dc7d..f5505fe02 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 120 ; catch rate db 146 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index b6305b273..ed43b7298 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 235 ; catch rate db 52 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index 9b12a6c6e..4adeab317 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -6,7 +6,7 @@ db ICE, GROUND ; type db 225 ; catch rate db 78 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 7b8272210..a081dcf2e 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -6,7 +6,7 @@ db GRASS, GRASS ; type db 45 ; catch rate db 166 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 1b294e951..63efbd9e5 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 45 ; catch rate db 211 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index a88ea6b64..ab1e1c83f 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index a11b5e0fe..c5ce41e0a 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -6,7 +6,7 @@ db WATER, POISON ; type db 190 ; catch rate db 105 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index b5e4876a4..35037c668 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -6,7 +6,7 @@ db WATER, POISON ; type db 60 ; catch rate db 205 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index a660370a6..d435a3a04 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index fb96952f8..77176266c 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -6,7 +6,7 @@ db NORMAL, FLYING ; type db 75 ; catch rate db 114 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 476ac9614..86830e11e 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index 49f518649..06fc8be7b 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index 6ad00c834..a3bd68aef 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -6,7 +6,7 @@ db ROCK, DARK ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 74d2ae9d6..597c5b06b 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -6,7 +6,7 @@ db FIGHTING, FIGHTING ; type db 75 ; catch rate db 91 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 25 ; step cycles to hatch diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 4e04da7fb..7012c9929 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -6,7 +6,7 @@ db DARK, DARK ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index 6eef4b84d..f7d84f142 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 225 ; catch rate db 61 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 40 ; step cycles to hatch diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 20b47b992..c577515a1 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 1bb244087..adc313ee1 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 196 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 35 ; step cycles to hatch diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index da5331286..43e50bfd4 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 75 ; catch rate db 138 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 2da97c64f..77f05af31 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 39968701f..ff41011b3 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 95f3b42db..0e8127220 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 45 ; catch rate db 191 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index c0316bfee..e894606ac 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 13ca3fef3..a22e09fb8 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -6,7 +6,7 @@ db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 103 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index 21ca508bc..8b233e6da 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -6,7 +6,7 @@ db FIRE, FIRE ; type db 190 ; catch rate db 63 ; base exp - db BURNT_BERRY, BURNT_BERRY; items + db BURNT_BERRY, BURNT_BERRY ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index ea7a0bd84..20db04447 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -6,7 +6,7 @@ db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F12_5 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index da63aa6f4..c2536b316 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -6,7 +6,7 @@ db BUG, POISON ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index c55c8234f..20e8ffcd6 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -6,7 +6,7 @@ db GRASS, POISON ; type db 120 ; catch rate db 151 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 10270e200..1db8162dd 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -6,7 +6,7 @@ db POISON, POISON ; type db 60 ; catch rate db 173 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index c8577ff6c..0a3498b8f 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -6,7 +6,7 @@ db NORMAL, NORMAL ; type db 50 ; catch rate db 109 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 10 ; step cycles to hatch diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index c84ac68c4..816f71e8c 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -6,7 +6,7 @@ db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index da5101f9c..e3b4e19e6 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -6,7 +6,7 @@ db WATER, GROUND ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index 3c58623b8..79bf0bc60 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -6,7 +6,7 @@ db PSYCHIC, FLYING ; type db 75 ; catch rate db 171 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 756482591..01918230c 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -6,7 +6,7 @@ db BUG, FLYING ; type db 75 ; catch rate db 147 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 342590f12..5dc9562b0 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -6,7 +6,7 @@ db ELECTRIC, FLYING ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDERLESS ; gender ratio db 100 ; unknown 1 db 80 ; step cycles to hatch diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index abbd6402d..ee3716844 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -6,7 +6,7 @@ db POISON, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM, NO_ITEM; items + db NO_ITEM, NO_ITEM ; items db GENDER_F50 ; gender ratio db 100 ; unknown 1 db 15 ; step cycles to hatch diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index 224e460c9..29ae6ebd6 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -2,43 +2,43 @@ TrainerClassAttributes: ; 3959c ; entries correspond to trainer classes (see constants/trainer_constants.asm) ; Falkner - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Whitney - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Bugsy - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Morty - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Pryce - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Jasmine - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Chuck - db FULL_HEAL, 0 ; items + db FULL_HEAL, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES @@ -50,31 +50,31 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Rival1 - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 15 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Pokemon Prof - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Will - db MAX_POTION, 0 ; items + db MAX_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Cal - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Bruno - db MAX_POTION, 0 ; items + db MAX_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES @@ -98,175 +98,175 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Brock - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Misty - db FULL_HEAL, 0 ; items + db FULL_HEAL, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Lt Surge - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Scientist - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Erika - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Youngster - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 4 ; base reward dw AI_BASIC + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Schoolboy - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_OFTEN ; Bird Keeper - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 6 ; base reward dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Lass - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 6 ; base reward dw AI_BASIC + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_OFTEN ; Janine - db DIRE_HIT, 0 ; items + db DIRE_HIT, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Cooltrainerm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 12 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Cooltrainerf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 12 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Beauty - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 22 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Pokemaniac - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 15 ; base reward dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Gruntm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Gentleman - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Skier - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Teacher - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Sabrina - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Bug Catcher - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 4 ; base reward dw AI_BASIC + AI_SETUP + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Fisher - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_OFTEN ; Swimmerm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 2 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Swimmerf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Sailor - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Super Nerd - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Rival2 - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Guitarist - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Hiker - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Biker - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES @@ -278,97 +278,97 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Burglar - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 22 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Firebreather - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 12 ; base reward dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Juggler - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Blackbelt T - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 6 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Executivem - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Psychic T - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Picnicker - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward dw AI_BASIC + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Camper - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward dw AI_BASIC + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Executivef - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Sage - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Medium - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Boarder - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Pokefanm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 20 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Kimono Girl - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Twins - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward dw NO_AI dw CONTEXT_USE + SWITCH_OFTEN ; Pokefanf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 20 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES @@ -386,19 +386,19 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Officer - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Gruntf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Mysticalman - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES |