Merge branch 'master' of https://github.com/pret/pokered

60 files changed, 238 insertions, 118 deletions

diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm
index a991e9ae..4858ab5d 100644
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@@ -1,4 +1,5 @@
 WildDataPointers:
+	table_width 2, WildDataPointers
 	dw NoMons      ; PALLET_TOWN
 	dw NoMons      ; VIRIDIAN_CITY
 	dw NoMons      ; PEWTER_CITY
@@ -248,6 +249,7 @@ WildDataPointers:
 	dw NoMons
 	dw NoMons
 	dw NoMons
+	assert_table_length NUM_MAPS
 	dw -1 ; end
 
 ; wild pokemon data is divided into two parts.
diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm
index 24a24f60..f8a830de 100644
--- a/data/wild/maps/CeruleanCave1F.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
@@ -1,5 +1,5 @@
 DungeonMons1:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 50, GOLBAT
 	db 55, GOLBAT
 	db 45, GRAVELER
@@ -10,5 +10,7 @@ DungeonMons1:
 	db 54, PARASECT
 	db 55, DITTO
 	db 60, DITTO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm
index 07b34527..712d8cec 100644
--- a/data/wild/maps/CeruleanCave2F.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
@@ -1,5 +1,5 @@
 DungeonMons2:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 52, GOLBAT
 	db 57, GOLBAT
 	db 50, GRAVELER
@@ -10,5 +10,7 @@ DungeonMons2:
 	db 58, WEEPINBELL
 	db 60, RHYDON
 	db 58, RHYDON
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm
index 969ab18f..5787d240 100644
--- a/data/wild/maps/CeruleanCaveB1F.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
@@ -1,5 +1,5 @@
 DungeonMonsB1:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db 54, GOLBAT
 	db 59, GOLBAT
 	db 55, GRAVELER
@@ -10,5 +10,7 @@ DungeonMonsB1:
 	db 65, DITTO
 	db 55, LICKITUNG
 	db 50, LICKITUNG
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm
index d1e73af4..e5ba5fa5 100644
--- a/data/wild/maps/DiglettsCave.asm
+++ b/data/wild/maps/DiglettsCave.asm
@@ -1,5 +1,5 @@
 CaveMons:
-	db 20 ; grass encounter rate
+	def_grass_wildmons 20 ; encounter rate
 	db 18, DIGLETT
 	db 19, DIGLETT
 	db 17, DIGLETT
@@ -10,5 +10,7 @@ CaveMons:
 	db 22, DIGLETT
 	db 29, DUGTRIO
 	db 31, DUGTRIO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm
index 2e426655..93edc040 100644
--- a/data/wild/maps/MtMoon1F.asm
+++ b/data/wild/maps/MtMoon1F.asm
@@ -1,5 +1,5 @@
 MoonMons1:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db  8, ZUBAT
 	db  9, ZUBAT
 	db 10, GEODUDE
@@ -10,5 +10,7 @@ MoonMons1:
 	db 11, ZUBAT
 	db 12, SANDSHREW
 	db 11, CLEFAIRY
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm
index 1eee34ce..d729dc6f 100644
--- a/data/wild/maps/MtMoonB1F.asm
+++ b/data/wild/maps/MtMoonB1F.asm
@@ -1,5 +1,5 @@
 MoonMonsB1:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db  8, ZUBAT
 	db  9, ZUBAT
 	db 10, ZUBAT
@@ -10,5 +10,7 @@ MoonMonsB1:
 	db 11, PARAS
 	db 10, CLEFAIRY
 	db 12, CLEFAIRY
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm
index d49ec585..63671cbe 100644
--- a/data/wild/maps/MtMoonB2F.asm
+++ b/data/wild/maps/MtMoonB2F.asm
@@ -1,5 +1,5 @@
 MoonMonsB2:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 10, ZUBAT
 	db 11, GEODUDE
 	db 13, PARAS
@@ -10,5 +10,7 @@ MoonMonsB2:
 	db  9, CLEFAIRY
 	db 11, CLEFAIRY
 	db 13, CLEFAIRY
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm
index 75fcadfe..8aea3fac 100644
--- a/data/wild/maps/PokemonMansion1F.asm
+++ b/data/wild/maps/PokemonMansion1F.asm
@@ -1,5 +1,5 @@
 MansionMons1:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 34, RATTATA
 	db 34, RATICATE
 	db 23, GRIMER
@@ -10,5 +10,7 @@ MansionMons1:
 	db 26, GRIMER
 	db 34, GROWLITHE
 	db 38, GROWLITHE
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm
index 2143532f..818e705b 100644
--- a/data/wild/maps/PokemonMansion2F.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
@@ -1,5 +1,5 @@
 MansionMons2:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 37, RATTATA
 	db 37, RATICATE
 	db 26, GRIMER
@@ -10,5 +10,7 @@ MansionMons2:
 	db 35, GRIMER
 	db 35, MUK
 	db 38, MUK
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm
index f0c77977..36eb701b 100644
--- a/data/wild/maps/PokemonMansion3F.asm
+++ b/data/wild/maps/PokemonMansion3F.asm
@@ -1,5 +1,5 @@
 MansionMons3:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 40, RATTATA
 	db 40, RATICATE
 	db 32, GRIMER
@@ -10,5 +10,7 @@ MansionMons3:
 	db 38, GRIMER
 	db 38, MUK
 	db 41, MUK
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm
index c0ad432b..1954695c 100644
--- a/data/wild/maps/PokemonMansionB1F.asm
+++ b/data/wild/maps/PokemonMansionB1F.asm
@@ -1,5 +1,5 @@
 MansionMonsB1:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 35, GRIMER
 	db 38, GRIMER
 	db 37, RATICATE
@@ -10,5 +10,7 @@ MansionMonsB1:
 	db 46, RATICATE
 	db 18, DITTO
 	db 12, DITTO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm
index 95bef4a3..5e061298 100644
--- a/data/wild/maps/PokemonTower1F.asm
+++ b/data/wild/maps/PokemonTower1F.asm
@@ -1,4 +1,6 @@
 TowerMons1:
-	db 0 ; grass encounter rate
+	def_grass_wildmons 0 ; encounter rate
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm
index 77b7d415..39794a20 100644
--- a/data/wild/maps/PokemonTower2F.asm
+++ b/data/wild/maps/PokemonTower2F.asm
@@ -1,4 +1,6 @@
 TowerMons2:
-	db 0 ; grass encounter rate
+	def_grass_wildmons 0 ; encounter rate
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm
index b608ea15..42ee5a6f 100644
--- a/data/wild/maps/PokemonTower3F.asm
+++ b/data/wild/maps/PokemonTower3F.asm
@@ -1,5 +1,5 @@
 TowerMons3:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 20, GASTLY
 	db 21, GASTLY
 	db 22, GASTLY
@@ -10,5 +10,7 @@ TowerMons3:
 	db 25, GASTLY
 	db 20, HAUNTER
 	db 25, HAUNTER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm
index 425b200c..b81bc541 100644
--- a/data/wild/maps/PokemonTower4F.asm
+++ b/data/wild/maps/PokemonTower4F.asm
@@ -1,5 +1,5 @@
 TowerMons4:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 20, GASTLY
 	db 21, GASTLY
 	db 22, GASTLY
@@ -10,5 +10,7 @@ TowerMons4:
 	db 25, GASTLY
 	db 20, HAUNTER
 	db 25, HAUNTER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm
index 5a0c96e1..66af9751 100644
--- a/data/wild/maps/PokemonTower5F.asm
+++ b/data/wild/maps/PokemonTower5F.asm
@@ -1,5 +1,5 @@
 TowerMons5:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 22, GASTLY
 	db 23, GASTLY
 	db 24, GASTLY
@@ -10,5 +10,7 @@ TowerMons5:
 	db 27, GASTLY
 	db 22, HAUNTER
 	db 27, HAUNTER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm
index 5e9d23f4..1ddafd84 100644
--- a/data/wild/maps/PokemonTower6F.asm
+++ b/data/wild/maps/PokemonTower6F.asm
@@ -1,5 +1,5 @@
 TowerMons6:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 22, GASTLY
 	db 23, GASTLY
 	db 24, GASTLY
@@ -10,5 +10,7 @@ TowerMons6:
 	db 27, GASTLY
 	db 22, HAUNTER
 	db 27, HAUNTER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm
index 8a3467ff..5c859a00 100644
--- a/data/wild/maps/PokemonTower7F.asm
+++ b/data/wild/maps/PokemonTower7F.asm
@@ -1,5 +1,5 @@
 TowerMons7:
-	db 20 ; grass encounter rate
+	def_grass_wildmons 20 ; encounter rate
 	db 24, GASTLY
 	db 25, GASTLY
 	db 26, GASTLY
@@ -10,5 +10,7 @@ TowerMons7:
 	db 29, GASTLY
 	db 24, HAUNTER
 	db 29, HAUNTER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm
index a910420e..fde69fcd 100644
--- a/data/wild/maps/PowerPlant.asm
+++ b/data/wild/maps/PowerPlant.asm
@@ -1,5 +1,5 @@
 PowerPlantMons:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 30, MAGNEMITE
 	db 35, MAGNEMITE
 	db 33, MAGNETON
@@ -10,5 +10,7 @@ PowerPlantMons:
 	db 38, MAGNETON
 	db 33, MUK
 	db 37, MUK
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm
index 5c64bac4..98785e39 100644
--- a/data/wild/maps/RockTunnel1F.asm
+++ b/data/wild/maps/RockTunnel1F.asm
@@ -1,5 +1,5 @@
 TunnelMonsB1:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 15, ZUBAT
 	db 16, GEODUDE
 	db 17, ZUBAT
@@ -10,5 +10,7 @@ TunnelMonsB1:
 	db 17, MACHOP
 	db 19, MACHOP
 	db 21, MACHOP
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm
index 3f034958..035574ef 100644
--- a/data/wild/maps/RockTunnelB1F.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
@@ -1,5 +1,5 @@
 TunnelMonsB2:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 20, ZUBAT
 	db 17, GEODUDE
 	db 18, MACHOP
@@ -10,5 +10,7 @@ TunnelMonsB2:
 	db 14, ONIX
 	db 18, ONIX
 	db 22, ONIX
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm
index df599383..7634f3b4 100644
--- a/data/wild/maps/Route1.asm
+++ b/data/wild/maps/Route1.asm
@@ -1,5 +1,5 @@
 Route1Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db  3, PIDGEY
 	db  4, PIDGEY
 	db  2, RATTATA
@@ -10,5 +10,7 @@ Route1Mons:
 	db  4, RATTATA
 	db  6, PIDGEY
 	db  7, PIDGEY
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm
index b7ca364c..bd9ba28f 100644
--- a/data/wild/maps/Route10.asm
+++ b/data/wild/maps/Route10.asm
@@ -1,5 +1,5 @@
 Route10Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 16, MAGNEMITE
 	db 18, RATTATA
 	db 18, MAGNEMITE
@@ -10,5 +10,7 @@ Route10Mons:
 	db 20, RATICATE
 	db 16, MACHOP
 	db 18, MACHOP
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm
index eb00aa7e..e564296a 100644
--- a/data/wild/maps/Route11.asm
+++ b/data/wild/maps/Route11.asm
@@ -1,5 +1,5 @@
 Route11Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 16, PIDGEY
 	db 15, RATTATA
 	db 18, PIDGEY
@@ -10,5 +10,7 @@ Route11Mons:
 	db 20, PIDGEOTTO
 	db 19, DROWZEE
 	db 17, RATICATE
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm
index 46c4106e..40fd8e07 100644
--- a/data/wild/maps/Route12.asm
+++ b/data/wild/maps/Route12.asm
@@ -1,5 +1,5 @@
 Route12Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 25, ODDISH
 	db 25, BELLSPROUT
 	db 28, PIDGEY
@@ -10,8 +10,9 @@ Route12Mons:
 	db 29, WEEPINBELL
 	db 26, FARFETCHD
 	db 31, FARFETCHD
+	end_grass_wildmons
 
-	db 3 ; water encounter rate
+	def_water_wildmons 3 ; encounter rate
 	db 15, SLOWPOKE
 	db 15, SLOWPOKE
 	db 15, SLOWPOKE
@@ -22,3 +23,4 @@ Route12Mons:
 	db 15, SLOWPOKE
 	db 15, SLOWBRO
 	db 20, SLOWBRO
+	end_water_wildmons
diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm
index d19e0d83..33e097cd 100644
--- a/data/wild/maps/Route13.asm
+++ b/data/wild/maps/Route13.asm
@@ -1,5 +1,5 @@
 Route13Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 25, ODDISH
 	db 25, BELLSPROUT
 	db 28, PIDGEOTTO
@@ -10,8 +10,9 @@ Route13Mons:
 	db 29, WEEPINBELL
 	db 26, FARFETCHD
 	db 31, FARFETCHD
+	end_grass_wildmons
 
-	db 3 ; water encounter rate
+	def_water_wildmons 3 ; encounter rate
 	db 15, SLOWPOKE
 	db 15, SLOWPOKE
 	db 15, SLOWPOKE
@@ -22,3 +23,4 @@ Route13Mons:
 	db 15, SLOWPOKE
 	db 15, SLOWBRO
 	db 20, SLOWBRO
+	end_water_wildmons
diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm
index fe600bed..98b1f4e3 100644
--- a/data/wild/maps/Route14.asm
+++ b/data/wild/maps/Route14.asm
@@ -1,5 +1,5 @@
 Route14Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 26, ODDISH
 	db 26, BELLSPROUT
 	db 24, VENONAT
@@ -10,5 +10,7 @@ Route14Mons:
 	db 30, WEEPINBELL
 	db 27, VENONAT
 	db 30, VENOMOTH
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm
index 4374acfb..87392fa4 100644
--- a/data/wild/maps/Route15.asm
+++ b/data/wild/maps/Route15.asm
@@ -1,5 +1,5 @@
 Route15Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 26, ODDISH
 	db 26, BELLSPROUT
 	db 24, VENONAT
@@ -10,5 +10,7 @@ Route15Mons:
 	db 30, WEEPINBELL
 	db 27, VENONAT
 	db 30, VENOMOTH
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm
index f858dcdb..4265809a 100644
--- a/data/wild/maps/Route16.asm
+++ b/data/wild/maps/Route16.asm
@@ -1,5 +1,5 @@
 Route16Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db 22, SPEAROW
 	db 22, DODUO
 	db 23, RATTATA
@@ -10,5 +10,7 @@ Route16Mons:
 	db 24, FEAROW
 	db 25, RATICATE
 	db 26, RATICATE
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm
index 3f6316f3..4c167abe 100644
--- a/data/wild/maps/Route17.asm
+++ b/data/wild/maps/Route17.asm
@@ -1,5 +1,5 @@
 Route17Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db 26, DODUO
 	db 27, FEAROW
 	db 27, DODUO
@@ -10,5 +10,7 @@ Route17Mons:
 	db 28, DODUO
 	db 32, PONYTA
 	db 29, DODRIO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm
index b76cef02..04b4dbfa 100644
--- a/data/wild/maps/Route18.asm
+++ b/data/wild/maps/Route18.asm
@@ -1,5 +1,5 @@
 Route18Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db 22, SPEAROW
 	db 22, DODUO
 	db 23, RATTATA
@@ -10,5 +10,7 @@ Route18Mons:
 	db 24, FEAROW
 	db 25, RATICATE
 	db 26, RATICATE
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route19.asm b/data/wild/maps/Route19.asm
index 70b06ac8..c09ba290 100644
--- a/data/wild/maps/Route19.asm
+++ b/data/wild/maps/Route19.asm
@@ -1,7 +1,8 @@
 Route19Mons:
-	db 0 ; grass encounter rate
+	def_grass_wildmons 0 ; encounter rate
+	end_grass_wildmons
 
-	db 5 ; water encounter rate
+	def_water_wildmons 5 ; encounter rate
 	db  5, TENTACOOL
 	db 10, TENTACOOL
 	db 15, TENTACOOL
@@ -12,3 +13,4 @@ Route19Mons:
 	db 30, TENTACOOL
 	db 35, TENTACOOL
 	db 40, TENTACOOL
+	end_water_wildmons
diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm
index 40093712..eda91039 100644
--- a/data/wild/maps/Route2.asm
+++ b/data/wild/maps/Route2.asm
@@ -1,5 +1,5 @@
 Route2Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db  3, RATTATA
 	db  3, PIDGEY
 	db  4, RATTATA
@@ -10,5 +10,7 @@ Route2Mons:
 	db  6, NIDORAN_F
 	db  7, PIDGEY
 	db  7, PIDGEY
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm
index e934e079..54a647f9 100644
--- a/data/wild/maps/Route21.asm
+++ b/data/wild/maps/Route21.asm
@@ -1,5 +1,5 @@
 Route21Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db 15, PIDGEY
 	db 13, RATTATA
 	db 13, PIDGEY
@@ -10,8 +10,9 @@ Route21Mons:
 	db 17, PIDGEOTTO
 	db 19, PIDGEOTTO
 	db 15, PIDGEOTTO
+	end_grass_wildmons
 
-	db 5 ; water encounter rate
+	def_water_wildmons 5 ; encounter rate
 	db  5, TENTACOOL
 	db 10, TENTACOOL
 	db 15, TENTACOOL
@@ -22,3 +23,4 @@ Route21Mons:
 	db 30, TENTACOOL
 	db 35, TENTACOOL
 	db 40, TENTACOOL
+	end_water_wildmons
diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm
index 1b50ded0..9398fafc 100644
--- a/data/wild/maps/Route22.asm
+++ b/data/wild/maps/Route22.asm
@@ -1,5 +1,5 @@
 Route22Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db  2, NIDORAN_M
 	db  2, NIDORAN_F
 	db  3, MANKEY
@@ -10,5 +10,7 @@ Route22Mons:
 	db  2, SPEAROW
 	db  4, SPEAROW
 	db  6, SPEAROW
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm
index cc1642e8..99e3c548 100644
--- a/data/wild/maps/Route23.asm
+++ b/data/wild/maps/Route23.asm
@@ -1,5 +1,5 @@
 Route23Mons:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 41, NIDORINO
 	db 41, NIDORINA
 	db 36, MANKEY
@@ -10,5 +10,7 @@ Route23Mons:
 	db 45, FEAROW
 	db 41, PRIMEAPE
 	db 46, PRIMEAPE
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm
index e493dfbf..852137f4 100644
--- a/data/wild/maps/Route24.asm
+++ b/data/wild/maps/Route24.asm
@@ -1,5 +1,5 @@
 Route24Mons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db 12, ODDISH
 	db 12, BELLSPROUT
 	db 13, PIDGEY
@@ -10,5 +10,7 @@ Route24Mons:
 	db 16, VENONAT
 	db 17, PIDGEY
 	db 17, PIDGEOTTO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm
index 2daa060c..22b68eb0 100644
--- a/data/wild/maps/Route25.asm
+++ b/data/wild/maps/Route25.asm
@@ -1,5 +1,5 @@
 Route25Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 12, ODDISH
 	db 12, BELLSPROUT
 	db 13, PIDGEY
@@ -10,5 +10,7 @@ Route25Mons:
 	db 16, VENONAT
 	db 17, PIDGEY
 	db 17, PIDGEOTTO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm
index be7afe95..49dde638 100644
--- a/data/wild/maps/Route3.asm
+++ b/data/wild/maps/Route3.asm
@@ -1,5 +1,5 @@
 Route3Mons:
-	db 20 ; grass encounter rate
+	def_grass_wildmons 20 ; encounter rate
 	db  8, SPEAROW
 	db  9, SPEAROW
 	db  9, MANKEY
@@ -10,5 +10,7 @@ Route3Mons:
 	db 12, RATTATA
 	db 11, SPEAROW
 	db 12, SPEAROW
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm
index 29f0aec4..7aa1f37b 100644
--- a/data/wild/maps/Route4.asm
+++ b/data/wild/maps/Route4.asm
@@ -1,5 +1,5 @@
 Route4Mons:
-	db 20 ; grass encounter rate
+	def_grass_wildmons 20 ; encounter rate
 	db  8, SPEAROW
 	db  9, SPEAROW
 	db  9, MANKEY
@@ -10,5 +10,7 @@ Route4Mons:
 	db 12, RATTATA
 	db 11, SPEAROW
 	db 12, SPEAROW
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm
index 7517bcb9..dc2ee194 100644
--- a/data/wild/maps/Route5.asm
+++ b/data/wild/maps/Route5.asm
@@ -1,5 +1,5 @@
 Route5Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 15, PIDGEY
 	db 14, RATTATA
 	db  7, ABRA
@@ -10,5 +10,7 @@ Route5Mons:
 	db  3, JIGGLYPUFF
 	db  5, JIGGLYPUFF
 	db  7, JIGGLYPUFF
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm
index 067d2694..df91e521 100644
--- a/data/wild/maps/Route6.asm
+++ b/data/wild/maps/Route6.asm
@@ -1,5 +1,5 @@
 Route6Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 15, PIDGEY
 	db 14, RATTATA
 	db  7, ABRA
@@ -10,8 +10,9 @@ Route6Mons:
 	db  3, JIGGLYPUFF
 	db  5, JIGGLYPUFF
 	db  7, JIGGLYPUFF
+	end_grass_wildmons
 
-	db 3 ; water encounter rate
+	def_water_wildmons 3 ; encounter rate
 	db 15, PSYDUCK
 	db 15, PSYDUCK
 	db 15, PSYDUCK
@@ -22,3 +23,4 @@ Route6Mons:
 	db 15, PSYDUCK
 	db 15, GOLDUCK
 	db 20, GOLDUCK
+	end_water_wildmons
diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm
index 1ebb1ce9..e0e78991 100644
--- a/data/wild/maps/Route7.asm
+++ b/data/wild/maps/Route7.asm
@@ -1,5 +1,5 @@
 Route7Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 20, PIDGEY
 	db 22, PIDGEY
 	db 20, RATTATA
@@ -10,5 +10,7 @@ Route7Mons:
 	db 19, JIGGLYPUFF
 	db 24, JIGGLYPUFF
 	db 24, JIGGLYPUFF
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm
index db07dbba..a55d5e79 100644
--- a/data/wild/maps/Route8.asm
+++ b/data/wild/maps/Route8.asm
@@ -1,5 +1,5 @@
 Route8Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 20, PIDGEY
 	db 22, PIDGEY
 	db 20, RATTATA
@@ -10,5 +10,7 @@ Route8Mons:
 	db 24, JIGGLYPUFF
 	db 20, KADABRA
 	db 27, KADABRA
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm
index 78512402..273452c9 100644
--- a/data/wild/maps/Route9.asm
+++ b/data/wild/maps/Route9.asm
@@ -1,5 +1,5 @@
 Route9Mons:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 16, NIDORAN_M
 	db 16, NIDORAN_F
 	db 18, RATTATA
@@ -10,5 +10,7 @@ Route9Mons:
 	db 18, NIDORINA
 	db 20, RATICATE
 	db 19, FEAROW
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm
index 125fbc6a..5573d8b8 100644
--- a/data/wild/maps/SafariZoneCenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
@@ -1,5 +1,5 @@
 ZoneMonsCenter:
-	db 30 ; grass encounter rate
+	def_grass_wildmons 30 ; encounter rate
 	db 14, NIDORAN_M
 	db 36, NIDORAN_F
 	db 24, EXEGGCUTE
@@ -10,5 +10,7 @@ ZoneMonsCenter:
 	db 32, PARASECT
 	db 22, TANGELA
 	db  7, CHANSEY
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm
index ba0a1954..1b634058 100644
--- a/data/wild/maps/SafariZoneEast.asm
+++ b/data/wild/maps/SafariZoneEast.asm
@@ -1,5 +1,5 @@
 ZoneMons1:
-	db 30 ; grass encounter rate
+	def_grass_wildmons 30 ; encounter rate
 	db 21, NIDORAN_M
 	db 29, NIDORAN_F
 	db 22, EXEGGCUTE
@@ -10,5 +10,7 @@ ZoneMons1:
 	db 24, MAROWAK
 	db 21, CHANSEY
 	db 15, SCYTHER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm
index fa6dd3b4..6ce432ef 100644
--- a/data/wild/maps/SafariZoneNorth.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
@@ -1,5 +1,5 @@
 ZoneMons2:
-	db 30 ; grass encounter rate
+	def_grass_wildmons 30 ; encounter rate
 	db 36, NIDORAN_M
 	db 14, NIDORAN_F
 	db 20, EXEGGCUTE
@@ -10,5 +10,7 @@ ZoneMons2:
 	db 33, KANGASKHAN
 	db 25, SCYTHER
 	db 15, PINSIR
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm
index b1e2fe3a..42a4d3a3 100644
--- a/data/wild/maps/SafariZoneWest.asm
+++ b/data/wild/maps/SafariZoneWest.asm
@@ -1,5 +1,5 @@
 ZoneMons3:
-	db 30 ; grass encounter rate
+	def_grass_wildmons 30 ; encounter rate
 	db 29, NIDORAN_M
 	db 21, NIDORAN_F
 	db 22, EXEGGCUTE
@@ -10,5 +10,7 @@ ZoneMons3:
 	db 24, MAROWAK
 	db 25, PINSIR
 	db 27, TANGELA
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm
index e37005b2..bc14de89 100644
--- a/data/wild/maps/SeafoamIslands1F.asm
+++ b/data/wild/maps/SeafoamIslands1F.asm
@@ -1,5 +1,5 @@
 IslandMons1:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 18, ZUBAT
 	db 25, KRABBY
 	db 27, KRABBY
@@ -10,5 +10,7 @@ IslandMons1:
 	db  9, ZUBAT
 	db 27, GOLBAT
 	db 36, GOLBAT
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm
index fd9ab09a..b213df3d 100644
--- a/data/wild/maps/SeafoamIslandsB1F.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
@@ -1,5 +1,5 @@
 IslandMonsB1:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 27, ZUBAT
 	db 26, KRABBY
 	db 36, ZUBAT
@@ -10,5 +10,7 @@ IslandMonsB1:
 	db 28, KINGLER
 	db 22, SEEL
 	db 26, SEEL
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm
index 53961534..4cb4805c 100644
--- a/data/wild/maps/SeafoamIslandsB2F.asm
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
@@ -1,5 +1,5 @@
 IslandMonsB2:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 27, ZUBAT
 	db 27, KRABBY
 	db 36, ZUBAT
@@ -10,5 +10,7 @@ IslandMonsB2:
 	db 36, GOLBAT
 	db 31, SLOWPOKE
 	db 31, SLOWBRO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm
index 5435d1e6..e58c306f 100644
--- a/data/wild/maps/SeafoamIslandsB3F.asm
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
@@ -1,5 +1,5 @@
 IslandMonsB3:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 27, GOLBAT
 	db 36, ZUBAT
 	db 29, KRABBY
@@ -10,8 +10,9 @@ IslandMonsB3:
 	db 30, SEEL
 	db 28, DEWGONG
 	db 32, DEWGONG
+	end_grass_wildmons
 
-	db 5 ; water encounter rate
+	def_water_wildmons 5 ; encounter rate
 	db 25, TENTACOOL
 	db 30, TENTACOOL
 	db 20, TENTACOOL
@@ -22,3 +23,4 @@ IslandMonsB3:
 	db 30, STARYU
 	db 30, STARYU
 	db 30, STARYU
+	end_water_wildmons
diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm
index bfeb6821..84d4ba5d 100644
--- a/data/wild/maps/SeafoamIslandsB4F.asm
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
@@ -1,5 +1,5 @@
 IslandMonsB4:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 36, GOLBAT
 	db 36, ZUBAT
 	db 30, KRABBY
@@ -10,8 +10,9 @@ IslandMonsB4:
 	db 45, ZUBAT
 	db 30, DEWGONG
 	db 34, DEWGONG
+	end_grass_wildmons
 
-	db 5 ; water encounter rate
+	def_water_wildmons 5 ; encounter rate
 	db 25, TENTACOOL
 	db 30, TENTACOOL
 	db 20, TENTACOOL
@@ -22,3 +23,4 @@ IslandMonsB4:
 	db 30, STARYU
 	db 30, STARYU
 	db 30, STARYU
+	end_water_wildmons
diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm
index bcb16dc8..17ece17a 100644
--- a/data/wild/maps/VictoryRoad1F.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
@@ -1,5 +1,5 @@
 PlateauMons1:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 26, GEODUDE
 	db 31, GEODUDE
 	db 36, GEODUDE
@@ -10,5 +10,7 @@ PlateauMons1:
 	db 45, ONIX
 	db 41, GRAVELER
 	db 47, GRAVELER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm
index 89b736cd..04ebaa6e 100644
--- a/data/wild/maps/VictoryRoad2F.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
@@ -1,5 +1,5 @@
 PlateauMons2:
-	db 10 ; grass encounter rate
+	def_grass_wildmons 10 ; encounter rate
 	db 31, GEODUDE
 	db 36, GEODUDE
 	db 41, GEODUDE
@@ -10,5 +10,7 @@ PlateauMons2:
 	db 47, ONIX
 	db 39, MACHOKE
 	db 42, MACHOKE
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm
index aec2d097..cf56245e 100644
--- a/data/wild/maps/VictoryRoad3F.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
@@ -1,5 +1,5 @@
 PlateauMons3:
-	db 15 ; grass encounter rate
+	def_grass_wildmons 15 ; encounter rate
 	db 36, GEODUDE
 	db 44, GOLBAT
 	db 41, GEODUDE
@@ -10,5 +10,7 @@ PlateauMons3:
 	db 45, MACHOKE
 	db 47, GRAVELER
 	db 47, GRAVELER
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm
index e7b1288f..93286607 100644
--- a/data/wild/maps/ViridianForest.asm
+++ b/data/wild/maps/ViridianForest.asm
@@ -1,5 +1,5 @@
 ForestMons:
-	db 25 ; grass encounter rate
+	def_grass_wildmons 25 ; encounter rate
 	db  3, CATERPIE
 	db  4, METAPOD
 	db  4, CATERPIE
@@ -10,5 +10,7 @@ ForestMons:
 	db  6, METAPOD
 	db  8, PIDGEY
 	db  9, PIDGEOTTO
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm
index 19570b50..1ccba991 100644
--- a/data/wild/maps/nothing.asm
+++ b/data/wild/maps/nothing.asm
@@ -1,4 +1,6 @@
 NoMons:
-	db 0 ; grass encounter rate
+	def_grass_wildmons 0 ; encounter rate
+	end_grass_wildmons
 
-	db 0 ; water encounter rate
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons