Update to latest pokered

7 files changed, 313 insertions, 127 deletions

diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm
index a56958ef..7a82c86e 100644
--- a/data/baseStats/victreebel.asm
+++ b/data/baseStats/victreebel.asm
@@ -1,4 +1,4 @@
-db DEX_VICTREEBEL	 ; pokedex id
+db DEX_VICTREEBEL ; pokedex id
 db 80 ; base hp
 db 105 ; base attack
 db 65 ; base defense
diff --git a/data/evos_moves.asm b/data/evos_moves.asm
index a668ea3e..2371fb83 100755
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -29,8 +29,8 @@ EvosMovesPointerTable:
 	dw Mon009_EvosMoves
 	dw Mon127_EvosMoves
 	dw Mon114_EvosMoves
-	dw Mon152_EvosMoves	;MissingNo
-	dw Mon153_EvosMoves	;MissingNo
+	dw Mon152_EvosMoves ;MissingNo
+	dw Mon153_EvosMoves ;MissingNo
 	dw Mon058_EvosMoves
 	dw Mon095_EvosMoves
 	dw Mon022_EvosMoves
@@ -48,26 +48,26 @@ EvosMovesPointerTable:
 	dw Mon054_EvosMoves
 	dw Mon096_EvosMoves
 	dw Mon076_EvosMoves
-	dw Mon154_EvosMoves	;MissingNo
+	dw Mon154_EvosMoves ;MissingNo
 	dw Mon126_EvosMoves
-	dw Mon155_EvosMoves	;MissingNo
+	dw Mon155_EvosMoves ;MissingNo
 	dw Mon125_EvosMoves
 	dw Mon082_EvosMoves
 	dw Mon109_EvosMoves
-	dw Mon156_EvosMoves	;MissingNo
+	dw Mon156_EvosMoves ;MissingNo
 	dw Mon056_EvosMoves
 	dw Mon086_EvosMoves
 	dw Mon050_EvosMoves
 	dw Mon128_EvosMoves
-	dw Mon157_EvosMoves	;MissingNo
-	dw Mon158_EvosMoves	;MissingNo
-	dw Mon159_EvosMoves	;MissingNo
+	dw Mon157_EvosMoves ;MissingNo
+	dw Mon158_EvosMoves ;MissingNo
+	dw Mon159_EvosMoves ;MissingNo
 	dw Mon083_EvosMoves
 	dw Mon048_EvosMoves
 	dw Mon149_EvosMoves
-	dw Mon160_EvosMoves	;MissingNo
-	dw Mon161_EvosMoves	;MissingNo
-	dw Mon162_EvosMoves	;MissingNo
+	dw Mon160_EvosMoves ;MissingNo
+	dw Mon161_EvosMoves ;MissingNo
+	dw Mon162_EvosMoves ;MissingNo
 	dw Mon084_EvosMoves
 	dw Mon060_EvosMoves
 	dw Mon124_EvosMoves
@@ -77,23 +77,23 @@ EvosMovesPointerTable:
 	dw Mon132_EvosMoves
 	dw Mon052_EvosMoves
 	dw Mon098_EvosMoves
-	dw Mon163_EvosMoves	;MissingNo
-	dw Mon164_EvosMoves	;MissingNo
-	dw Mon165_EvosMoves	;MissingNo
+	dw Mon163_EvosMoves ;MissingNo
+	dw Mon164_EvosMoves ;MissingNo
+	dw Mon165_EvosMoves ;MissingNo
 	dw Mon037_EvosMoves
 	dw Mon038_EvosMoves
 	dw Mon025_EvosMoves
 	dw Mon026_EvosMoves
-	dw Mon166_EvosMoves	;MissingNo
-	dw Mon167_EvosMoves	;MissingNo
+	dw Mon166_EvosMoves ;MissingNo
+	dw Mon167_EvosMoves ;MissingNo
 	dw Mon147_EvosMoves
 	dw Mon148_EvosMoves
 	dw Mon140_EvosMoves
 	dw Mon141_EvosMoves
 	dw Mon116_EvosMoves
 	dw Mon117_EvosMoves
-	dw Mon168_EvosMoves	;MissingNo
-	dw Mon169_EvosMoves	;MissingNo
+	dw Mon168_EvosMoves ;MissingNo
+	dw Mon169_EvosMoves ;MissingNo
 	dw Mon027_EvosMoves
 	dw Mon028_EvosMoves
 	dw Mon138_EvosMoves
@@ -113,38 +113,38 @@ EvosMovesPointerTable:
 	dw Mon013_EvosMoves
 	dw Mon014_EvosMoves
 	dw Mon015_EvosMoves
-	dw Mon170_EvosMoves	;MissingNo
+	dw Mon170_EvosMoves ;MissingNo
 	dw Mon085_EvosMoves
 	dw Mon057_EvosMoves
 	dw Mon051_EvosMoves
 	dw Mon049_EvosMoves
 	dw Mon087_EvosMoves
-	dw Mon171_EvosMoves	;MissingNo
-	dw Mon172_EvosMoves	;MissingNo
+	dw Mon171_EvosMoves ;MissingNo
+	dw Mon172_EvosMoves ;MissingNo
 	dw Mon010_EvosMoves
 	dw Mon011_EvosMoves
 	dw Mon012_EvosMoves
 	dw Mon068_EvosMoves
-	dw Mon173_EvosMoves	;MissingNo
+	dw Mon173_EvosMoves ;MissingNo
 	dw Mon055_EvosMoves
 	dw Mon097_EvosMoves
 	dw Mon042_EvosMoves
 	dw Mon150_EvosMoves
 	dw Mon143_EvosMoves
 	dw Mon129_EvosMoves
-	dw Mon174_EvosMoves	;MissingNo
-	dw Mon175_EvosMoves	;MissingNo
+	dw Mon174_EvosMoves ;MissingNo
+	dw Mon175_EvosMoves ;MissingNo
 	dw Mon089_EvosMoves
-	dw Mon176_EvosMoves	;MissingNo
+	dw Mon176_EvosMoves ;MissingNo
 	dw Mon099_EvosMoves
 	dw Mon091_EvosMoves
-	dw Mon177_EvosMoves	;MissingNo
+	dw Mon177_EvosMoves ;MissingNo
 	dw Mon101_EvosMoves
 	dw Mon036_EvosMoves
 	dw Mon110_EvosMoves
 	dw Mon053_EvosMoves
 	dw Mon105_EvosMoves
-	dw Mon178_EvosMoves	;MissingNo
+	dw Mon178_EvosMoves ;MissingNo
 	dw Mon093_EvosMoves
 	dw Mon063_EvosMoves
 	dw Mon065_EvosMoves
@@ -154,13 +154,13 @@ EvosMovesPointerTable:
 	dw Mon001_EvosMoves
 	dw Mon003_EvosMoves
 	dw Mon073_EvosMoves
-	dw Mon179_EvosMoves	;MissingNo
+	dw Mon179_EvosMoves ;MissingNo
 	dw Mon118_EvosMoves
 	dw Mon119_EvosMoves
-	dw Mon180_EvosMoves	;MissingNo
-	dw Mon181_EvosMoves	;MissingNo
-	dw Mon182_EvosMoves	;MissingNo
-	dw Mon183_EvosMoves	;MissingNo
+	dw Mon180_EvosMoves ;MissingNo
+	dw Mon181_EvosMoves ;MissingNo
+	dw Mon182_EvosMoves ;MissingNo
+	dw Mon183_EvosMoves ;MissingNo
 	dw Mon077_EvosMoves
 	dw Mon078_EvosMoves
 	dw Mon019_EvosMoves
@@ -170,19 +170,19 @@ EvosMovesPointerTable:
 	dw Mon074_EvosMoves
 	dw Mon137_EvosMoves
 	dw Mon142_EvosMoves
-	dw Mon184_EvosMoves	;MissingNo
+	dw Mon184_EvosMoves ;MissingNo
 	dw Mon081_EvosMoves
-	dw Mon185_EvosMoves	;MissingNo
-	dw Mon186_EvosMoves	;MissingNo
+	dw Mon185_EvosMoves ;MissingNo
+	dw Mon186_EvosMoves ;MissingNo
 	dw Mon004_EvosMoves
 	dw Mon007_EvosMoves
 	dw Mon005_EvosMoves
 	dw Mon008_EvosMoves
 	dw Mon006_EvosMoves
-	dw Mon187_EvosMoves	;MissingNo
-	dw Mon188_EvosMoves	;MissingNo
-	dw Mon189_EvosMoves	;MissingNo
-	dw Mon190_EvosMoves	;MissingNo
+	dw Mon187_EvosMoves ;MissingNo
+	dw Mon188_EvosMoves ;MissingNo
+	dw Mon189_EvosMoves ;MissingNo
+	dw Mon190_EvosMoves ;MissingNo
 	dw Mon043_EvosMoves
 	dw Mon044_EvosMoves
 	dw Mon045_EvosMoves
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm
index f3ea62ef..1fa4b64a 100755
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -266,8 +266,8 @@ MapHSPointers:
 ; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList)
 
 ; These constants come from the bytes for Predef functions:
-Hide	equ $11
-Show	equ $15
+Hide equ $11
+Show equ $15
 
 MapHSXX:
 	db $FF,$FF,$FF
diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
index d83e7b4e..987d8d28 100755
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -1,77 +1,77 @@
 MonPartyData:
-	dn SPRITE_GRASS, SPRITE_GRASS			;Bulbasaur/Ivysaur
-	dn SPRITE_GRASS, SPRITE_MON				;Venusaur/Charmander
-	dn SPRITE_MON, SPRITE_MON				;Charmeleon/Charizard
-	dn SPRITE_WATER, SPRITE_WATER			;Squirtle/Wartortle
-	dn SPRITE_WATER, SPRITE_BUG				;Blastoise/Caterpie
-	dn SPRITE_BUG, SPRITE_BUG				;Metapod/Butterfree
-	dn SPRITE_BUG, SPRITE_BUG				;Weedle/Kakuna
-	dn SPRITE_BUG, SPRITE_BIRD_M			;Beedrill/Pidgey
-	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Pidgeotto/Pidgeot
-	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Rattata/Raticate
-	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Spearow/Fearow
-	dn SPRITE_SNAKE, SPRITE_SNAKE			;Ekans/Arbok
-	dn SPRITE_FAIRY, SPRITE_FAIRY			;Pikachu/Raichu
-	dn SPRITE_MON, SPRITE_MON				;Sandshrew/Sandslash
-	dn SPRITE_MON, SPRITE_MON				;NidoranF/Nidorina
-	dn SPRITE_MON, SPRITE_MON				;Nidoqueen/NidoranM
-	dn SPRITE_MON, SPRITE_MON				;Nidorino/Nidoking
-	dn SPRITE_FAIRY, SPRITE_FAIRY			;Clefairy/Clefable
-	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Vulpix/Ninetales
-	dn SPRITE_FAIRY, SPRITE_FAIRY			;Jigglypuff/Wigglytuff
-	dn SPRITE_MON, SPRITE_MON				;Zubat/Golbat
-	dn SPRITE_GRASS, SPRITE_GRASS			;Oddish/Gloom
-	dn SPRITE_GRASS, SPRITE_BUG				;Vileplume/Paras
-	dn SPRITE_BUG, SPRITE_BUG				;Parasect/Venonat
-	dn SPRITE_BUG, SPRITE_MON				;Venomoth/Diglett
-	dn SPRITE_MON, SPRITE_MON				;Dugtrio/Meowth
-	dn SPRITE_MON, SPRITE_MON				;Persian/Psyduck
-	dn SPRITE_MON, SPRITE_MON				;Golduck/Mankey
-	dn SPRITE_MON, SPRITE_QUADRUPED			;Primeape/Growlithe
-	dn SPRITE_QUADRUPED, SPRITE_MON			;Arcanine/Poliwag
-	dn SPRITE_MON, SPRITE_MON				;Poliwhirl/Poliwrath
-	dn SPRITE_MON, SPRITE_MON				;Abra/Kadabra
-	dn SPRITE_MON, SPRITE_MON				;Alakazam/Machop
-	dn SPRITE_MON, SPRITE_MON				;Machoke/Machamp
-	dn SPRITE_GRASS, SPRITE_GRASS			;Bellsprout/Weepinbell
-	dn SPRITE_GRASS, SPRITE_WATER			;Victreebel/Tentacool
-	dn SPRITE_WATER, SPRITE_MON				;Tentacruel/Geodude
-	dn SPRITE_MON, SPRITE_MON				;Graveler/Golem
-	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Ponyta/Rapidash
-	dn SPRITE_QUADRUPED, SPRITE_MON			;Slowpoke/Slowbro
-	dn SPRITE_BALL_M, SPRITE_BALL_M			;Magnemite/Magneton
-	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Farfetch'd/Doduo
-	dn SPRITE_BIRD_M, SPRITE_WATER			;Dodrio/Seel
-	dn SPRITE_WATER, SPRITE_MON				;Dewgong/Grimer
-	dn SPRITE_MON, SPRITE_HELIX				;Muk/Shellder
-	dn SPRITE_HELIX, SPRITE_MON				;Cloyster/Gastly
-	dn SPRITE_MON, SPRITE_MON				;Haunter/Gengar
-	dn SPRITE_SNAKE, SPRITE_MON				;Onix/Drowzee
-	dn SPRITE_MON, SPRITE_WATER				;Hypno/Krabby
-	dn SPRITE_WATER, SPRITE_BALL_M			;Kingler/Voltorb
-	dn SPRITE_BALL_M, SPRITE_GRASS			;Electrode/Exeggcute
-	dn SPRITE_GRASS, SPRITE_MON				;Exeggutor/Cubone
-	dn SPRITE_MON, SPRITE_MON				;Marowak/Hitmonlee
-	dn SPRITE_MON, SPRITE_MON				;Hitmonchan/Lickitung
-	dn SPRITE_MON, SPRITE_MON				;Koffing/Weezing
-	dn SPRITE_QUADRUPED, SPRITE_MON			;Rhyhorn/Rhydon
-	dn SPRITE_FAIRY, SPRITE_GRASS			;Chansey/Tangela
-	dn SPRITE_MON, SPRITE_WATER				;Kangaskhan/Horsea
-	dn SPRITE_WATER, SPRITE_WATER			;Seadra/Goldeen
-	dn SPRITE_WATER, SPRITE_HELIX			;Seaking/Staryu
-	dn SPRITE_HELIX, SPRITE_MON				;Starmie/Mr.Mime
-	dn SPRITE_BUG, SPRITE_MON				;Scyther/Jynx
-	dn SPRITE_MON, SPRITE_MON				;Electabuzz/Magmar
-	dn SPRITE_BUG, SPRITE_QUADRUPED			;Pinsir/Tauros
-	dn SPRITE_WATER, SPRITE_SNAKE			;Magikarp/Gyarados
-	dn SPRITE_WATER, SPRITE_MON				;Lapras/Ditto
-	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Eevee/Vaporeon
-	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Jolteon/Flareon
-	dn SPRITE_MON, SPRITE_HELIX				;Porygon/Omanyte
-	dn SPRITE_HELIX, SPRITE_HELIX			;Omastar/Kabuto
-	dn SPRITE_HELIX, SPRITE_BIRD_M			;Kabutops/Aerodactyl
-	dn SPRITE_MON, SPRITE_BIRD_M			;Snorlax/Articuno
-	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Zapdos/Moltres
-	dn SPRITE_SNAKE, SPRITE_SNAKE			;Dratini/Dragonair
-	dn SPRITE_SNAKE, SPRITE_MON				;Dragonite/Mewtwo
-	dn SPRITE_MON, 0						;Mew/Padding
+	dn SPRITE_GRASS, SPRITE_GRASS           ;Bulbasaur/Ivysaur
+	dn SPRITE_GRASS, SPRITE_MON             ;Venusaur/Charmander
+	dn SPRITE_MON, SPRITE_MON               ;Charmeleon/Charizard
+	dn SPRITE_WATER, SPRITE_WATER           ;Squirtle/Wartortle
+	dn SPRITE_WATER, SPRITE_BUG             ;Blastoise/Caterpie
+	dn SPRITE_BUG, SPRITE_BUG               ;Metapod/Butterfree
+	dn SPRITE_BUG, SPRITE_BUG               ;Weedle/Kakuna
+	dn SPRITE_BUG, SPRITE_BIRD_M            ;Beedrill/Pidgey
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M         ;Pidgeotto/Pidgeot
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED   ;Rattata/Raticate
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M         ;Spearow/Fearow
+	dn SPRITE_SNAKE, SPRITE_SNAKE           ;Ekans/Arbok
+	dn SPRITE_FAIRY, SPRITE_FAIRY           ;Pikachu/Raichu
+	dn SPRITE_MON, SPRITE_MON               ;Sandshrew/Sandslash
+	dn SPRITE_MON, SPRITE_MON               ;NidoranF/Nidorina
+	dn SPRITE_MON, SPRITE_MON               ;Nidoqueen/NidoranM
+	dn SPRITE_MON, SPRITE_MON               ;Nidorino/Nidoking
+	dn SPRITE_FAIRY, SPRITE_FAIRY           ;Clefairy/Clefable
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED   ;Vulpix/Ninetales
+	dn SPRITE_FAIRY, SPRITE_FAIRY           ;Jigglypuff/Wigglytuff
+	dn SPRITE_MON, SPRITE_MON               ;Zubat/Golbat
+	dn SPRITE_GRASS, SPRITE_GRASS           ;Oddish/Gloom
+	dn SPRITE_GRASS, SPRITE_BUG             ;Vileplume/Paras
+	dn SPRITE_BUG, SPRITE_BUG               ;Parasect/Venonat
+	dn SPRITE_BUG, SPRITE_MON               ;Venomoth/Diglett
+	dn SPRITE_MON, SPRITE_MON               ;Dugtrio/Meowth
+	dn SPRITE_MON, SPRITE_MON               ;Persian/Psyduck
+	dn SPRITE_MON, SPRITE_MON               ;Golduck/Mankey
+	dn SPRITE_MON, SPRITE_QUADRUPED         ;Primeape/Growlithe
+	dn SPRITE_QUADRUPED, SPRITE_MON         ;Arcanine/Poliwag
+	dn SPRITE_MON, SPRITE_MON               ;Poliwhirl/Poliwrath
+	dn SPRITE_MON, SPRITE_MON               ;Abra/Kadabra
+	dn SPRITE_MON, SPRITE_MON               ;Alakazam/Machop
+	dn SPRITE_MON, SPRITE_MON               ;Machoke/Machamp
+	dn SPRITE_GRASS, SPRITE_GRASS           ;Bellsprout/Weepinbell
+	dn SPRITE_GRASS, SPRITE_WATER           ;Victreebel/Tentacool
+	dn SPRITE_WATER, SPRITE_MON             ;Tentacruel/Geodude
+	dn SPRITE_MON, SPRITE_MON               ;Graveler/Golem
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED   ;Ponyta/Rapidash
+	dn SPRITE_QUADRUPED, SPRITE_MON         ;Slowpoke/Slowbro
+	dn SPRITE_BALL_M, SPRITE_BALL_M         ;Magnemite/Magneton
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M         ;Farfetch'd/Doduo
+	dn SPRITE_BIRD_M, SPRITE_WATER          ;Dodrio/Seel
+	dn SPRITE_WATER, SPRITE_MON             ;Dewgong/Grimer
+	dn SPRITE_MON, SPRITE_HELIX             ;Muk/Shellder
+	dn SPRITE_HELIX, SPRITE_MON             ;Cloyster/Gastly
+	dn SPRITE_MON, SPRITE_MON               ;Haunter/Gengar
+	dn SPRITE_SNAKE, SPRITE_MON             ;Onix/Drowzee
+	dn SPRITE_MON, SPRITE_WATER             ;Hypno/Krabby
+	dn SPRITE_WATER, SPRITE_BALL_M          ;Kingler/Voltorb
+	dn SPRITE_BALL_M, SPRITE_GRASS          ;Electrode/Exeggcute
+	dn SPRITE_GRASS, SPRITE_MON             ;Exeggutor/Cubone
+	dn SPRITE_MON, SPRITE_MON               ;Marowak/Hitmonlee
+	dn SPRITE_MON, SPRITE_MON               ;Hitmonchan/Lickitung
+	dn SPRITE_MON, SPRITE_MON               ;Koffing/Weezing
+	dn SPRITE_QUADRUPED, SPRITE_MON         ;Rhyhorn/Rhydon
+	dn SPRITE_FAIRY, SPRITE_GRASS           ;Chansey/Tangela
+	dn SPRITE_MON, SPRITE_WATER             ;Kangaskhan/Horsea
+	dn SPRITE_WATER, SPRITE_WATER           ;Seadra/Goldeen
+	dn SPRITE_WATER, SPRITE_HELIX           ;Seaking/Staryu
+	dn SPRITE_HELIX, SPRITE_MON             ;Starmie/Mr.Mime
+	dn SPRITE_BUG, SPRITE_MON               ;Scyther/Jynx
+	dn SPRITE_MON, SPRITE_MON               ;Electabuzz/Magmar
+	dn SPRITE_BUG, SPRITE_QUADRUPED         ;Pinsir/Tauros
+	dn SPRITE_WATER, SPRITE_SNAKE           ;Magikarp/Gyarados
+	dn SPRITE_WATER, SPRITE_MON             ;Lapras/Ditto
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED   ;Eevee/Vaporeon
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED   ;Jolteon/Flareon
+	dn SPRITE_MON, SPRITE_HELIX             ;Porygon/Omanyte
+	dn SPRITE_HELIX, SPRITE_HELIX           ;Omastar/Kabuto
+	dn SPRITE_HELIX, SPRITE_BIRD_M          ;Kabutops/Aerodactyl
+	dn SPRITE_MON, SPRITE_BIRD_M            ;Snorlax/Articuno
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M         ;Zapdos/Moltres
+	dn SPRITE_SNAKE, SPRITE_SNAKE           ;Dratini/Dragonair
+	dn SPRITE_SNAKE, SPRITE_MON             ;Dragonite/Mewtwo
+	dn SPRITE_MON, 0                        ;Mew/Padding
diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 0fe55731..0ac69e5e 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -1254,6 +1254,6 @@ VictreebelDexEntry:
 
 MissingNoDexEntry:
 	db "???@"
-	db 10
-	db 100
-	db 0,"コメント さくせいちゅう@"
+	db 10 ; 1.0 m
+	db 100 ; 10.0 kg
+	db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written)
diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm
index c186dd00..0c586dad 100755
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -60,16 +60,22 @@ YoungsterData:
 ; Route 3
 	db 11,RATTATA,EKANS,0
 	db 14,SPEAROW,0
+; Mt. Moon 1F
 	db 10,RATTATA,RATTATA,ZUBAT,0
+; Route 24
 	db 14,RATTATA,EKANS,ZUBAT,0
+; Route 25
 	db 15,RATTATA,SPEAROW,0
 	db 17,SLOWPOKE,0
 	db 14,EKANS,SANDSHREW,0
+; SS Anne 1F Rooms
 	db 21,NIDORAN_M,0
+; Route 11
 	db 21,EKANS,0
 	db 19,SANDSHREW,ZUBAT,0
 	db 17,RATTATA,RATTATA,RATICATE,0
 	db 18,NIDORAN_M,NIDORINO,0
+; Unused
 	db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0
 BugCatcherData:
 ; Viridian Forest
@@ -80,12 +86,17 @@ BugCatcherData:
 	db 10,CATERPIE,WEEDLE,CATERPIE,0
 	db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0
 	db 11,CATERPIE,METAPOD,0
+; Mt. Moon 1F
 	db 11,WEEDLE,KAKUNA,0
 	db 10,CATERPIE,METAPOD,CATERPIE,0
+; Route 24
 	db 14,CATERPIE,WEEDLE,0
+; Route 6
 	db 16,WEEDLE,CATERPIE,WEEDLE,0
 	db 20,BUTTERFREE,0
+; Unused
 	db 18,METAPOD,CATERPIE,VENONAT,0
+; Route 9
 	db 19,BEEDRILL,BEEDRILL,0
 	db 20,CATERPIE,WEEDLE,VENONAT,0
 LassData:
@@ -93,147 +104,213 @@ LassData:
 	db 9,PIDGEY,PIDGEY,0
 	db 10,RATTATA,NIDORAN_M,0
 	db 14,JIGGLYPUFF,0
+; Route 4
 	db 31,PARAS,PARAS,PARASECT,0
+; Mt. Moon 1F
 	db 11,ODDISH,BELLSPROUT,0
 	db 14,CLEFAIRY,0
+; Route 24
 	db 16,PIDGEY,NIDORAN_F,0
 	db 14,PIDGEY,NIDORAN_F,0
+; Route 25
 	db 15,NIDORAN_M,NIDORAN_F,0
 	db 13,ODDISH,PIDGEY,ODDISH,0
+; SS Anne 1F Rooms
 	db 18,PIDGEY,NIDORAN_F,0
+; SS Anne 2F Rooms
 	db 18,RATTATA,PIKACHU,0
+; Route 8
 	db 23,NIDORAN_F,NIDORINA,0
 	db 24,MEOWTH,MEOWTH,MEOWTH,0
 	db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0
 	db 22,CLEFAIRY,CLEFAIRY,0
+; Celadon Gym
 	db 23,BELLSPROUT,WEEPINBELL,0
 	db 23,ODDISH,GLOOM,0
 SailorData:
+; SS Anne Stern
 	db 18,MACHOP,SHELLDER,0
 	db 17,MACHOP,TENTACOOL,0
+; SS Anne B1F Rooms
 	db 21,SHELLDER,0
 	db 17,HORSEA,SHELLDER,TENTACOOL,0
 	db 18,TENTACOOL,STARYU,0
 	db 17,HORSEA,HORSEA,HORSEA,0
 	db 20,MACHOP,0
+; Vermilion Gym
 	db 21,PIKACHU,PIKACHU,0
 JrTrainerMData:
+; Pewter Gym
 	db 11,DIGLETT,SANDSHREW,0
+; Route 24/Route 25
 	db 14,RATTATA,EKANS,0
+; Route 24
 	db 18,MANKEY,0
+; Route 6
 	db 20,SQUIRTLE,0
 	db 16,SPEAROW,RATICATE,0
+; Unused
 	db 18,DIGLETT,DIGLETT,SANDSHREW,0
+; Route 9
 	db 21,GROWLITHE,CHARMANDER,0
 	db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0
+; Route 12
 	db 29,NIDORAN_M,NIDORINO,0
 JrTrainerFData:
+; Cerulean Gym
 	db 19,GOLDEEN,0
+; Route 6
 	db 16,RATTATA,PIKACHU,0
 	db 16,PIDGEY,PIDGEY,PIDGEY,0
+; Unused
 	db 22,BULBASAUR,0
+; Route 9
 	db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0
 	db 23,MEOWTH,0
+; Route 10
 	db 20,PIKACHU,CLEFAIRY,0
 	db 21,PIDGEY,PIDGEOTTO,0
+; Rock Tunnel B1F
 	db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0
 	db 22,ODDISH,BULBASAUR,0
+; Celadon Gym
 	db 24,BULBASAUR,IVYSAUR,0
+; Route 13
 	db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0
 	db 30,POLIWAG,POLIWAG,0
 	db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0
 	db 28,GOLDEEN,POLIWAG,HORSEA,0
+; Route 20
 	db 31,GOLDEEN,SEAKING,0
+; Rock Tunnel 1F
 	db 22,BELLSPROUT,CLEFAIRY,0
 	db 20,MEOWTH,ODDISH,PIDGEY,0
 	db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0
+; Route 15
 	db 28,GLOOM,ODDISH,ODDISH,0
 	db 29,PIKACHU,RAICHU,0
 	db 33,CLEFAIRY,0
 	db 29,BELLSPROUT,ODDISH,TANGELA,0
+; Route 20
 	db 30,TENTACOOL,HORSEA,SEEL,0
 PokemaniacData:
+; Route 10
 	db 30,RHYHORN,LICKITUNG,0
 	db 20,CUBONE,SLOWPOKE,0
+; Rock Tunnel B1F
 	db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0
 	db 22,CHARMANDER,CUBONE,0
 	db 25,SLOWPOKE,0
+; Victory Road 2F
 	db 40,CHARMELEON,LAPRAS,LICKITUNG,0
+; Rock Tunnel 1F
 	db 23,CUBONE,SLOWPOKE,0
 SuperNerdData:
+; Mt. Moon 1F
 	db 11,MAGNEMITE,VOLTORB,0
+; Mt. Moon B2F
 	db 12,GRIMER,VOLTORB,KOFFING,0
+; Route 8
 	db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0
 	db 22,GRIMER,MUK,GRIMER,0
 	db 26,KOFFING,0
+; Unused
 	db 22,KOFFING,MAGNEMITE,WEEZING,0
 	db 20,MAGNEMITE,MAGNEMITE,KOFFING,MAGNEMITE,0
 	db 24,MAGNEMITE,VOLTORB,0
+; Cinnabar Gym
 	db 36,VULPIX,VULPIX,NINETALES,0
 	db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0
 	db 41,RAPIDASH,0
 	db 37,GROWLITHE,VULPIX,0
 HikerData:
+; Mt. Moon 1F
 	db 10,GEODUDE,GEODUDE,ONIX,0
+; Route 25
 	db 15,MACHOP,GEODUDE,0
 	db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0
 	db 17,ONIX,0
+; Route 9
 	db 21,GEODUDE,ONIX,0
 	db 20,GEODUDE,MACHOP,GEODUDE,0
+; Route 10
 	db 21,GEODUDE,ONIX,0
 	db 19,ONIX,GRAVELER,0
+; Rock Tunnel B1F
 	db 21,GEODUDE,GEODUDE,GRAVELER,0
 	db 25,GEODUDE,0
+; Route 9/Rock Tunnel B1F
 	db 20,MACHOP,ONIX,0
+; Rock Tunnel 1F
 	db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0
 	db 20,ONIX,ONIX,GEODUDE,0
 	db 21,GEODUDE,GRAVELER,0
 BikerData:
+; Route 13
 	db 28,KOFFING,KOFFING,KOFFING,0
+; Route 14
 	db 29,KOFFING,GRIMER,0
+; Route 15
 	db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0
 	db 28,KOFFING,GRIMER,WEEZING,0
+; Route 16
 	db 29,GRIMER,KOFFING,0
 	db 33,WEEZING,0
 	db 26,GRIMER,GRIMER,GRIMER,GRIMER,0
+; Route 17
 	db 28,WEEZING,KOFFING,WEEZING,0
 	db 33,MUK,0
 	db 29,VOLTORB,VOLTORB,0
 	db 29,WEEZING,MUK,0
 	db 25,KOFFING,WEEZING,KOFFING,KOFFING,WEEZING,0
+; Route 14
 	db 26,KOFFING,KOFFING,GRIMER,KOFFING,0
 	db 28,GRIMER,GRIMER,KOFFING,0
 	db 29,KOFFING,MUK,0
 BurglarData:
+; Unused
 	db 29,GROWLITHE,VULPIX,0
 	db 33,GROWLITHE,0
 	db 28,VULPIX,CHARMANDER,PONYTA,0
+; Cinnabar Gym
 	db 36,GROWLITHE,VULPIX,NINETALES,0
 	db 41,PONYTA,0
 	db 37,VULPIX,GROWLITHE,0
+; Mansion 2F
 	db 34,CHARMANDER,CHARMELEON,0
+; Mansion 3F
 	db 38,NINETALES,0
+; Mansion B1F
 	db 34,GROWLITHE,PONYTA,0
 EngineerData:
+; Unused
 	db 21,VOLTORB,MAGNEMITE,0
+; Route 11
 	db 21,MAGNEMITE,0
 	db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0
 Juggler1Data:
 ; none
 FisherData:
+; SS Anne 2F Rooms
 	db 17,GOLDEEN,TENTACOOL,GOLDEEN,0
+; SS Anne B1F Rooms
 	db 17,TENTACOOL,STARYU,SHELLDER,0
+; Route 12
 	db 22,GOLDEEN,POLIWAG,GOLDEEN,0
 	db 24,TENTACOOL,GOLDEEN,0
 	db 27,GOLDEEN,0
 	db 21,POLIWAG,SHELLDER,GOLDEEN,HORSEA,0
+; Route 21
 	db 28,SEAKING,GOLDEEN,SEAKING,SEAKING,0
 	db 31,SHELLDER,CLOYSTER,0
 	db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0
 	db 33,SEAKING,GOLDEEN,0
+; Route 12
 	db 24,MAGIKARP,MAGIKARP,0
 SwimmerData:
+; Cerulean Gym
 	db 16,HORSEA,SHELLDER,0
+; Route 19
 	db 30,TENTACOOL,SHELLDER,0
 	db 29,GOLDEEN,HORSEA,STARYU,0
 	db 30,POLIWAG,POLIWHIRL,0
@@ -241,192 +318,280 @@ SwimmerData:
 	db 29,GOLDEEN,SHELLDER,SEAKING,0
 	db 30,HORSEA,HORSEA,0
 	db 27,TENTACOOL,TENTACOOL,STARYU,HORSEA,TENTACRUEL,0
+; Route 20
 	db 31,SHELLDER,CLOYSTER,0
 	db 35,STARYU,0
 	db 28,HORSEA,HORSEA,SEADRA,HORSEA,0
+; Route 21
 	db 33,SEADRA,TENTACRUEL,0
 	db 37,STARMIE,0
 	db 33,STARYU,WARTORTLE,0
 	db 32,POLIWHIRL,TENTACOOL,SEADRA,0
 CueBallData:
+; Route 16
 	db 28,MACHOP,MANKEY,MACHOP,0
 	db 29,MANKEY,MACHOP,0
 	db 33,MACHOP,0
+; Route 17
 	db 29,MANKEY,PRIMEAPE,0
 	db 29,MACHOP,MACHOKE,0
 	db 33,MACHOKE,0
 	db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0
 	db 29,PRIMEAPE,MACHOKE,0
+; Route 21
 	db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0
 GamblerData:
+; Route 11
 	db 18,POLIWAG,HORSEA,0
 	db 18,BELLSPROUT,ODDISH,0
 	db 18,VOLTORB,MAGNEMITE,0
 	db 18,GROWLITHE,VULPIX,0
+; Route 8
 	db 22,POLIWAG,POLIWAG,POLIWHIRL,0
+; Unused
 	db 22,ONIX,GEODUDE,GRAVELER,0
+; Route 8
 	db 24,GROWLITHE,VULPIX,0
 BeautyData:
+; Celadon Gym
 	db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0
 	db 24,BELLSPROUT,BELLSPROUT,0
 	db 26,EXEGGCUTE,0
+; Route 13
 	db 27,RATTATA,PIKACHU,RATTATA,0
 	db 29,CLEFAIRY,MEOWTH,0
+; Route 20
 	db 35,SEAKING,0
 	db 30,SHELLDER,SHELLDER,CLOYSTER,0
 	db 31,POLIWAG,SEAKING,0
+; Route 15
 	db 29,PIDGEOTTO,WIGGLYTUFF,0
 	db 29,BULBASAUR,IVYSAUR,0
+; Unused
 	db 33,WEEPINBELL,BELLSPROUT,WEEPINBELL,0
+; Route 19
 	db 27,POLIWAG,GOLDEEN,SEAKING,GOLDEEN,POLIWAG,0
 	db 30,GOLDEEN,SEAKING,0
 	db 29,STARYU,STARYU,STARYU,0
+; Route 20
 	db 30,SEADRA,HORSEA,SEADRA,0
 PsychicData:
+; Saffron Gym
 	db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0
 	db 34,MR_MIME,KADABRA,0
 	db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0
 	db 38,SLOWBRO,0
 RockerData:
+; Vermilion Gym
 	db 20,VOLTORB,MAGNEMITE,VOLTORB,0
+; Route 12
 	db 29,VOLTORB,ELECTRODE,0
 JugglerData:
+; Silph Co. 5F
 	db 29,KADABRA,MR_MIME,0
+; Victory Road 2F
 	db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0
+; Fucshia Gym
 	db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0
 	db 34,DROWZEE,HYPNO,0
+; Victory Road 2F
 	db 48,MR_MIME,0
+; Unused
 	db 33,HYPNO,0
+; Fucshia Gym
 	db 38,HYPNO,0
 	db 34,DROWZEE,KADABRA,0
 TamerData:
+; Fucshia Gym
 	db 34,SANDSLASH,ARBOK,0
 	db 33,ARBOK,SANDSLASH,ARBOK,0
+; Viridian Gym
 	db 43,RHYHORN,0
 	db 39,ARBOK,TAUROS,0
+; Victory Road 2F
 	db 44,PERSIAN,GOLDUCK,0
+; Unused
 	db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0
 BirdKeeperData:
+; Route 13
 	db 29,PIDGEY,PIDGEOTTO,0
 	db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0
 	db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0
+; Route 14
 	db 33,FARFETCHD,0
 	db 29,SPEAROW,FEAROW,0
+; Route 15
 	db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0
 	db 28,DODRIO,DODUO,DODUO,0
+; Route 18
 	db 29,SPEAROW,FEAROW,0
 	db 34,DODRIO,0
 	db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0
+; Route 20
 	db 30,FEAROW,FEAROW,PIDGEOTTO,0
+; Unused
 	db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0
 	db 42,FARFETCHD,FEAROW,0
+; Route 14
 	db 28,PIDGEY,DODUO,PIDGEOTTO,0
 	db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0
 	db 29,PIDGEOTTO,FEAROW,0
 	db 28,SPEAROW,DODUO,FEAROW,0
 BlackbeltData:
+; Fighting Dojo
 	db 37,HITMONLEE,HITMONCHAN,0
 	db 31,MANKEY,MANKEY,PRIMEAPE,0
 	db 32,MACHOP,MACHOKE,0
 	db 36,PRIMEAPE,0
 	db 31,MACHOP,MANKEY,PRIMEAPE,0
+; Viridian Gym
 	db 40,MACHOP,MACHOKE,0
 	db 43,MACHOKE,0
 	db 38,MACHOKE,MACHOP,MACHOKE,0
+; Victory Road 2F
 	db 43,MACHOKE,MACHOP,MACHOKE,0
 Green1Data:
 	db 5,SQUIRTLE,0
 	db 5,BULBASAUR,0
 	db 5,CHARMANDER,0
+; Route 22
 	db $FF,9,PIDGEY,8,SQUIRTLE,0
 	db $FF,9,PIDGEY,8,BULBASAUR,0
 	db $FF,9,PIDGEY,8,CHARMANDER,0
+; Cerulean City
 	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0
 	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0
 	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0
 ProfOakData:
+; Unused
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0
 ChiefData:
 ; none
 ScientistData:
+; Unused
 	db 34,KOFFING,VOLTORB,0
+; Silph Co. 2F
 	db 26,GRIMER,WEEZING,KOFFING,WEEZING,0
 	db 28,MAGNEMITE,VOLTORB,MAGNETON,0
+; Silph Co. 3F/Mansion 1F
 	db 29,ELECTRODE,WEEZING,0
+; Silph Co. 4F
 	db 33,ELECTRODE,0
+; Silph Co. 5F
 	db 26,MAGNETON,KOFFING,WEEZING,MAGNEMITE,0
+; Silph Co. 6F
 	db 25,VOLTORB,KOFFING,MAGNETON,MAGNEMITE,KOFFING,0
+; Silph Co. 7F
 	db 29,ELECTRODE,MUK,0
+; Silph Co. 8F
 	db 29,GRIMER,ELECTRODE,0
+; Silph Co. 9F
 	db 28,VOLTORB,KOFFING,MAGNETON,0
+; Silph Co. 10F
 	db 29,MAGNEMITE,KOFFING,0
+; Mansion 3F
 	db 33,MAGNEMITE,MAGNETON,VOLTORB,0
+; Mansion B1F
 	db 34,MAGNEMITE,ELECTRODE,0
 GiovanniData:
+; Rocket Hideout B4F
 	db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0
+; Silph Co. 11F
 	db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0
+; Viridian Gym
 	db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0
 RocketData:
+; Mt. Moon B2F
 	db 13,RATTATA,ZUBAT,0
 	db 11,SANDSHREW,RATTATA,ZUBAT,0
 	db 12,ZUBAT,EKANS,0
 	db 16,RATICATE,0
+; Cerulean City
 	db 17,MACHOP,DROWZEE,0
+; Route 24
 	db 15,EKANS,ZUBAT,0
+; Game Corner
 	db 20,RATICATE,ZUBAT,0
+; Rocket Hideout B1F
 	db 21,DROWZEE,MACHOP,0
 	db 21,RATICATE,RATICATE,0
 	db 20,GRIMER,KOFFING,KOFFING,0
 	db 19,RATTATA,RATICATE,RATICATE,RATTATA,0
 	db 22,GRIMER,KOFFING,0
+; Rocket Hideout B2F
 	db 17,ZUBAT,KOFFING,GRIMER,ZUBAT,RATICATE,0
+; Rocket Hideout B3F
 	db 20,RATTATA,RATICATE,DROWZEE,0
 	db 21,MACHOP,MACHOP,0
+; Rocket Hideout B4F
 	db 23,SANDSHREW,EKANS,SANDSLASH,0
 	db 23,EKANS,SANDSHREW,ARBOK,0
 	db 21,KOFFING,ZUBAT,0
+; Pokémon Tower 7F
 	db 25,ZUBAT,ZUBAT,GOLBAT,0
 	db 26,KOFFING,DROWZEE,0
 	db 23,ZUBAT,RATTATA,RATICATE,ZUBAT,0
+; Unused
 	db 26,DROWZEE,KOFFING,0
+; Silph Co. 2F
 	db 29,CUBONE,ZUBAT,0
 	db 25,GOLBAT,ZUBAT,ZUBAT,RATICATE,ZUBAT,0
+; Silph Co. 3F
 	db 28,RATICATE,HYPNO,RATICATE,0
+; Silph Co. 4F
 	db 29,MACHOP,DROWZEE,0
 	db 28,EKANS,ZUBAT,CUBONE,0
+; Silph Co. 5F
 	db 33,ARBOK,0
 	db 33,HYPNO,0
+; Silph Co. 6F
 	db 29,MACHOP,MACHOKE,0
 	db 28,ZUBAT,ZUBAT,GOLBAT,0
+; Silph Co. 7F
 	db 26,RATICATE,ARBOK,KOFFING,GOLBAT,0
 	db 29,CUBONE,CUBONE,0
 	db 29,SANDSHREW,SANDSLASH,0
+; Silph Co. 8F
 	db 26,RATICATE,ZUBAT,GOLBAT,RATTATA,0
 	db 28,WEEZING,GOLBAT,KOFFING,0
+; Silph Co. 9F
 	db 28,DROWZEE,GRIMER,MACHOP,0
 	db 28,GOLBAT,DROWZEE,HYPNO,0
+; Silph Co. 10F
 	db 33,MACHOKE,0
+; Silph Co. 11F
 	db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0
 	db 32,CUBONE,DROWZEE,MAROWAK,0
 CooltrainerMData:
+; Viridian Gym
 	db 39,NIDORINO,NIDOKING,0
+; Victory Road 3F
 	db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0
 	db 43,KINGLER,TENTACRUEL,BLASTOISE,0
+; Unused
 	db 45,KINGLER,STARMIE,0
+; Victory Road 1F
 	db 42,IVYSAUR,WARTORTLE,CHARMELEON,CHARIZARD,0
+; Unused
 	db 44,IVYSAUR,WARTORTLE,CHARMELEON,0
 	db 49,NIDOKING,0
 	db 44,KINGLER,CLOYSTER,0
+; Viridian Gym
 	db 39,SANDSLASH,DUGTRIO,0
 	db 43,RHYHORN,0
 CooltrainerFData:
+; Celadon Gym
 	db 24,WEEPINBELL,GLOOM,IVYSAUR,0
+; Victory Road 3F
 	db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0
 	db 43,PARASECT,DEWGONG,CHANSEY,0
+; Unused
 	db 46,VILEPLUME,BUTTERFREE,0
+; Victory Road 1F
 	db 44,PERSIAN,NINETALES,0
+; Unused
 	db 45,IVYSAUR,VENUSAUR,0
 	db 45,NIDORINA,NIDOQUEEN,0
 	db 43,PERSIAN,NINETALES,RAICHU,0
@@ -447,21 +612,29 @@ BlaineData:
 SabrinaData:
 	db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0
 GentlemanData:
+; SS Anne 1F Rooms
 	db 18,GROWLITHE,GROWLITHE,0
 	db 19,NIDORAN_M,NIDORAN_F,0
+; SS Anne 2F Rooms/Vermilion Gym
 	db 23,PIKACHU,0
+; Unused
 	db 48,PRIMEAPE,0
+; SS Anne 2F Rooms
 	db 17,GROWLITHE,PONYTA,0
 Green2Data:
+; SS Anne 2F
 	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0
 	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0
 	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0
+; Pokémon Tower 2F
 	db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0
 	db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0
 	db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0
+; Silph Co. 7F
 	db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
 	db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
 	db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
+; Route 22
 	db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0
 	db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0
 	db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0
@@ -472,27 +645,40 @@ Green3Data:
 LoreleiData:
 	db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
 ChannelerData:
+; Unused
 	db 22,GASTLY,0
 	db 24,GASTLY,0
 	db 23,GASTLY,GASTLY,0
 	db 24,GASTLY,0
+; Pokémon Tower 3F
 	db 23,GASTLY,0
 	db 24,GASTLY,0
+; Unused
 	db 24,HAUNTER,0
+; Pokémon Tower 3F
 	db 22,GASTLY,0
+; Pokémon Tower 4F
 	db 24,GASTLY,0
 	db 23,GASTLY,GASTLY,0
+; Unused
 	db 24,GASTLY,0
+; Pokémon Tower 4F
 	db 22,GASTLY,0
+; Unused
 	db 24,GASTLY,0
+; Pokémon Tower 5F
 	db 23,HAUNTER,0
+; Unused
 	db 24,GASTLY,0
+; Pokémon Tower 5F
 	db 22,GASTLY,0
 	db 24,GASTLY,0
 	db 22,HAUNTER,0
+; Pokémon Tower 6F
 	db 22,GASTLY,GASTLY,GASTLY,0
 	db 24,GASTLY,0
 	db 24,GASTLY,0
+; Saffron Gym
 	db 34,GASTLY,HAUNTER,0
 	db 38,HAUNTER,0
 	db 33,GASTLY,GASTLY,HAUNTER,0
diff --git a/data/wild_mons.asm b/data/wild_mons.asm
index a4265565..a2c9d6b2 100755
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -253,12 +253,12 @@ WildDataPointers:
 ; first part:  pokemon found in grass
 ; second part: pokemon found while surfing
 ; each part goes as follows:
-	; if first byte == 00, then
-		; no wild pokemon on this map
-	; if first byte != 00, then
-		; first byte is encounter rate
-		; followed by 20 bytes:
-		; level, species (ten times)
+    ; if first byte == 00, then
+        ; no wild pokemon on this map
+    ; if first byte != 00, then
+        ; first byte is encounter rate
+        ; followed by 20 bytes:
+        ; level, species (ten times)
 
 INCLUDE "data/wildPokemon/nomons.asm"
 INCLUDE "data/wildPokemon/route1.asm"