Clean up comments

Base data: types uniquely lacked a comment; items on one line; distinguish unknowns
Dex entries: don't imply that pointers don't exist

data/pokemon/base_stats/abra.asm

@@ -3,20 +3,19 @@
 	db  25,  20,  15,  90, 105,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 200 ; catch rate
 	db 73 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F25 ; gender ratio
-	db GENDER_F25 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/abra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end

data/pokemon/base_stats/aerodactyl.asm

@@ -3,20 +3,19 @@
 	db  80, 105,  65, 130,  60,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, FLYING
+	db ROCK, FLYING ; type
 	db 45 ; catch rate
 	db 202 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F12_5 ; gender ratio
-	db GENDER_F12_5 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/aerodactyl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER
 	; end

data/pokemon/base_stats/aipom.asm

@@ -3,20 +3,19 @@
 	db  55,  70,  55,  85,  40,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 94 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/aipom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT
 	; end

data/pokemon/base_stats/alakazam.asm

@@ -3,20 +3,19 @@
 	db  55,  50,  45, 120, 135,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 50 ; catch rate
 	db 186 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F25 ; gender ratio
-	db GENDER_F25 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/alakazam/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end

data/pokemon/base_stats/ampharos.asm

@@ -3,20 +3,19 @@
 	db  90,  75,  75,  55, 115,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 194 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ampharos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
 	; end

data/pokemon/base_stats/arbok.asm

@@ -3,20 +3,19 @@
 	db  60,  85,  69,  80,  65,  79
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 90 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/arbok/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, REPTILE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH
 	; end

data/pokemon/base_stats/arcanine.asm

@@ -3,20 +3,19 @@
 	db  90, 110,  80,  95, 100,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 75 ; catch rate
 	db 213 ; base exp
-	db BURNT_BERRY ; item 1
+	db BURNT_BERRY, BURNT_BERRY; items
-	db BURNT_BERRY ; item 2
+	db GENDER_F25 ; gender ratio
-	db GENDER_F25 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/arcanine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end

data/pokemon/base_stats/ariados.asm

@@ -3,20 +3,19 @@
 	db  70,  90,  70,  40,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 90 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ariados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH
 	; end

data/pokemon/base_stats/articuno.asm

@@ -3,20 +3,19 @@
 	db  90,  85, 100,  85,  95, 125
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, FLYING
+	db ICE, FLYING ; type
 	db 3 ; catch rate
 	db 215 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDERLESS ; gender ratio
-	db GENDERLESS ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/articuno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM
 	; end

data/pokemon/base_stats/azumarill.asm

@@ -3,20 +3,19 @@
 	db 100,  50,  80,  50,  50,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 153 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/azumarill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end

data/pokemon/base_stats/bayleef.asm

@@ -3,20 +3,19 @@
 	db  60,  62,  80,  60,  63,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 141 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F12_5 ; gender ratio
-	db GENDER_F12_5 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bayleef/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH
 	; end

data/pokemon/base_stats/beedrill.asm

@@ -3,20 +3,19 @@
 	db  65,  80,  40,  75,  45,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 45 ; catch rate
 	db 159 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, POISON_BARB; items
-	db POISON_BARB ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/beedrill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT
 	; end

data/pokemon/base_stats/bellossom.asm

@@ -3,20 +3,19 @@
 	db  75,  80,  85,  50,  90, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 184 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bellossom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH
 	; end

data/pokemon/base_stats/bellsprout.asm

@@ -3,20 +3,19 @@
 	db  50,  75,  35,  40,  70,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 255 ; catch rate
 	db 84 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bellsprout/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end

data/pokemon/base_stats/blastoise.asm

@@ -3,20 +3,19 @@
 	db  79,  83, 100,  78,  85, 105
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 210 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F12_5 ; gender ratio
-	db GENDER_F12_5 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/blastoise/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end

data/pokemon/base_stats/blissey.asm

@@ -3,20 +3,19 @@
 	db 255,  10,  10,  55,  75, 135
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 30 ; catch rate
 	db 255 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, LUCKY_EGG; items
-	db LUCKY_EGG ; item 2
+	db GENDER_F100 ; gender ratio
-	db GENDER_F100 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/blissey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end

data/pokemon/base_stats/bulbasaur.asm

@@ -3,20 +3,19 @@
 	db  45,  49,  49,  45,  65,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F12_5 ; gender ratio
-	db GENDER_F12_5 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bulbasaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end

data/pokemon/base_stats/butterfree.asm

@@ -3,20 +3,19 @@
 	db  60,  45,  50,  70,  80,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FLYING
+	db BUG, FLYING ; type
 	db 45 ; catch rate
 	db 160 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, SILVERPOWDER; items
-	db SILVERPOWDER ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/butterfree/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH
 	; end

data/pokemon/base_stats/caterpie.asm

@@ -3,20 +3,19 @@
 	db  45,  30,  35,  45,  20,  20
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, BUG
+	db BUG, BUG ; type
 	db 255 ; catch rate
 	db 53 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, NO_ITEM; items
-	db NO_ITEM ; item 2
+	db GENDER_F50 ; gender ratio
-	db GENDER_F50 ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/caterpie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end

data/pokemon/base_stats/celebi.asm

@@ -3,20 +3,19 @@
 	db 100, 100, 100, 100, 100, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, GRASS
+	db PSYCHIC, GRASS ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM ; item 1
+	db NO_ITEM, MIRACLEBERRY; items
-	db MIRACLEBERRY ; item 2
+	db GENDERLESS ; gender ratio
-	db GENDERLESS ; gender
+	db 100 ; unknown 1
-	db 100 ; unknown
 	db 120 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/celebi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH
 	; end