shithub: pokecrystal

Download patch

ref: eb3726bba049d25810ca14f050d1717e693ea2be
parent: e018a9d005c4c9033acbd9ae4073e60c32952823
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Feb 25 11:48:31 EST 2018

NO_ITEM == 0

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -2,43 +2,43 @@
 ; 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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