Verify wild data sizes with def_grass/water_wildmons and end_grass/water_wildmons macros

7 files changed, 354 insertions, 244 deletions

diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index ebc95c3f..563ba0e4 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -2,7 +2,7 @@
 
 JohtoGrassWildMons:
 
-	map_id SPROUT_TOWER_2F
+	def_grass_wildmons SPROUT_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -28,8 +28,9 @@ JohtoGrassWildMons:
 	db 6, GASTLY
 	db 5, RATTATA
 	db 5, RATTATA
+	end_grass_wildmons
 
-	map_id SPROUT_TOWER_3F
+	def_grass_wildmons SPROUT_TOWER_3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -55,8 +56,9 @@ JohtoGrassWildMons:
 	db 6, GASTLY
 	db 5, RATTATA
 	db 5, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_2F
+	def_grass_wildmons TIN_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -82,8 +84,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_3F
+	def_grass_wildmons TIN_TOWER_3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -109,8 +112,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_4F
+	def_grass_wildmons TIN_TOWER_4F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -136,8 +140,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_5F
+	def_grass_wildmons TIN_TOWER_5F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -163,8 +168,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_6F
+	def_grass_wildmons TIN_TOWER_6F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -190,8 +196,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_7F
+	def_grass_wildmons TIN_TOWER_7F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -217,8 +224,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_8F
+	def_grass_wildmons TIN_TOWER_8F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -244,8 +252,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id TIN_TOWER_9F
+	def_grass_wildmons TIN_TOWER_9F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -271,8 +280,9 @@ JohtoGrassWildMons:
 	db 23, RATTATA
 	db 24, RATTATA
 	db 24, RATTATA
+	end_grass_wildmons
 
-	map_id BURNED_TOWER_1F
+	def_grass_wildmons BURNED_TOWER_1F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, RATTATA
@@ -298,8 +308,9 @@ JohtoGrassWildMons:
 	db 16, KOFFING
 	db 15, RATICATE
 	db 15, RATICATE
+	end_grass_wildmons
 
-	map_id BURNED_TOWER_B1F
+	def_grass_wildmons BURNED_TOWER_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, RATTATA
@@ -325,10 +336,10 @@ JohtoGrassWildMons:
 	db 15, ZUBAT
 	db 14, MAGMAR
 	db 14, MAGMAR
+	end_grass_wildmons
 
-	map_id NATIONAL_PARK
+	def_grass_wildmons NATIONAL_PARK
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 10, CATERPIE
@@ -346,7 +357,6 @@ JohtoGrassWildMons:
 	db 13, SUNKERN
 	db 14, PIDGEY
 	db 14, PIDGEY
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 10, WEEDLE
@@ -365,7 +375,6 @@ JohtoGrassWildMons:
 	db 14, PIDGEY
 	db 14, PIDGEY
 	ENDC
-
 	; nite
 	db 10, HOOTHOOT
 	db 10, HOOTHOOT
@@ -374,8 +383,9 @@ JohtoGrassWildMons:
 	db 10, HOOTHOOT
 	db 14, HOOTHOOT
 	db 14, HOOTHOOT
+	end_grass_wildmons
 
-	map_id RUINS_OF_ALPH_OUTSIDE
+	def_grass_wildmons RUINS_OF_ALPH_OUTSIDE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, NATU
@@ -401,8 +411,9 @@ JohtoGrassWildMons:
 	db 20, SMEARGLE
 	db 22, SMEARGLE
 	db 22, SMEARGLE
+	end_grass_wildmons
 
-	map_id RUINS_OF_ALPH_INNER_CHAMBER
+	def_grass_wildmons RUINS_OF_ALPH_INNER_CHAMBER
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, UNOWN
@@ -428,10 +439,10 @@ JohtoGrassWildMons:
 	db 5, UNOWN
 	db 5, UNOWN
 	db 5, UNOWN
+	end_grass_wildmons
 
-	map_id UNION_CAVE_1F
+	def_grass_wildmons UNION_CAVE_1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 6, GEODUDE
@@ -457,7 +468,6 @@ JohtoGrassWildMons:
 	db 7, ZUBAT
 	db 6, ONIX
 	db 6, ONIX
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 6, GEODUDE
@@ -484,10 +494,10 @@ JohtoGrassWildMons:
 	db 6, ONIX
 	db 6, ONIX
 	ENDC
+	end_grass_wildmons
 
-	map_id UNION_CAVE_B1F
+	def_grass_wildmons UNION_CAVE_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 8, GEODUDE
@@ -513,7 +523,6 @@ JohtoGrassWildMons:
 	db 9, ZUBAT
 	db 6, RATTATA
 	db 6, RATTATA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 8, GEODUDE
@@ -540,8 +549,9 @@ JohtoGrassWildMons:
 	db 6, RATTATA
 	db 6, RATTATA
 	ENDC
+	end_grass_wildmons
 
-	map_id UNION_CAVE_B2F
+	def_grass_wildmons UNION_CAVE_B2F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, ZUBAT
@@ -567,8 +577,9 @@ JohtoGrassWildMons:
 	db 20, RATTATA
 	db 23, ONIX
 	db 23, ONIX
+	end_grass_wildmons
 
-	map_id SLOWPOKE_WELL_B1F
+	def_grass_wildmons SLOWPOKE_WELL_B1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, ZUBAT
@@ -594,8 +605,9 @@ JohtoGrassWildMons:
 	db 8, ZUBAT
 	db 8, SLOWPOKE
 	db 8, SLOWPOKE
+	end_grass_wildmons
 
-	map_id SLOWPOKE_WELL_B2F
+	def_grass_wildmons SLOWPOKE_WELL_B2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 21, ZUBAT
@@ -621,10 +633,10 @@ JohtoGrassWildMons:
 	db 23, GOLBAT
 	db 23, SLOWPOKE
 	db 23, SLOWPOKE
+	end_grass_wildmons
 
-	map_id ILEX_FOREST
+	def_grass_wildmons ILEX_FOREST
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 5, CATERPIE
@@ -642,7 +654,6 @@ JohtoGrassWildMons:
 	db 5, ZUBAT
 	db 6, PARAS
 	db 6, PARAS
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 5, WEEDLE
@@ -670,8 +681,9 @@ JohtoGrassWildMons:
 	db 5, ZUBAT
 	db 6, PARAS
 	db 6, PARAS
+	end_grass_wildmons
 
-	map_id MOUNT_MORTAR_1F_OUTSIDE
+	def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, ZUBAT
@@ -697,8 +709,9 @@ JohtoGrassWildMons:
 	db 14, GEODUDE
 	db 16, RATTATA
 	db 15, MARILL
+	end_grass_wildmons
 
-	map_id MOUNT_MORTAR_1F_INSIDE
+	def_grass_wildmons MOUNT_MORTAR_1F_INSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, GEODUDE
@@ -724,8 +737,9 @@ JohtoGrassWildMons:
 	db 15, MACHOP
 	db 14, ZUBAT
 	db 14, ZUBAT
+	end_grass_wildmons
 
-	map_id MOUNT_MORTAR_2F_INSIDE
+	def_grass_wildmons MOUNT_MORTAR_2F_INSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 31, GRAVELER
@@ -751,8 +765,9 @@ JohtoGrassWildMons:
 	db 28, MACHOP
 	db 30, GOLBAT
 	db 30, GOLBAT
+	end_grass_wildmons
 
-	map_id MOUNT_MORTAR_B1F
+	def_grass_wildmons MOUNT_MORTAR_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, ZUBAT
@@ -778,10 +793,10 @@ JohtoGrassWildMons:
 	db 16, GEODUDE
 	db 16, RATICATE
 	db 16, RATICATE
+	end_grass_wildmons
 
-	map_id ICE_PATH_1F
+	def_grass_wildmons ICE_PATH_1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 21, SWINUB
@@ -807,7 +822,6 @@ JohtoGrassWildMons:
 	db 22, ZUBAT
 	db 22, JYNX
 	db 22, JYNX
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 21, SWINUB
@@ -834,10 +848,10 @@ JohtoGrassWildMons:
 	db 22, JYNX
 	db 22, JYNX
 	ENDC
+	end_grass_wildmons
 
-	map_id ICE_PATH_B1F
+	def_grass_wildmons ICE_PATH_B1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 21, SWINUB
@@ -863,7 +877,6 @@ JohtoGrassWildMons:
 	db 22, ZUBAT
 	db 22, JYNX
 	db 22, JYNX
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 21, SWINUB
@@ -890,10 +903,10 @@ JohtoGrassWildMons:
 	db 22, JYNX
 	db 22, JYNX
 	ENDC
+	end_grass_wildmons
 
-	map_id ICE_PATH_B2F_MAHOGANY_SIDE
+	def_grass_wildmons ICE_PATH_B2F_MAHOGANY_SIDE
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 22, SWINUB
@@ -919,7 +932,6 @@ JohtoGrassWildMons:
 	db 23, ZUBAT
 	db 23, JYNX
 	db 23, JYNX
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 22, SWINUB
@@ -946,10 +958,10 @@ JohtoGrassWildMons:
 	db 23, JYNX
 	db 23, JYNX
 	ENDC
+	end_grass_wildmons
 
-	map_id ICE_PATH_B2F_BLACKTHORN_SIDE
+	def_grass_wildmons ICE_PATH_B2F_BLACKTHORN_SIDE
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 22, SWINUB
@@ -975,7 +987,6 @@ JohtoGrassWildMons:
 	db 23, ZUBAT
 	db 23, JYNX
 	db 23, JYNX
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 22, SWINUB
@@ -1002,10 +1013,10 @@ JohtoGrassWildMons:
 	db 23, JYNX
 	db 23, JYNX
 	ENDC
+	end_grass_wildmons
 
-	map_id ICE_PATH_B3F
+	def_grass_wildmons ICE_PATH_B3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 23, SWINUB
@@ -1031,7 +1042,6 @@ JohtoGrassWildMons:
 	db 24, ZUBAT
 	db 24, JYNX
 	db 24, JYNX
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 23, SWINUB
@@ -1058,8 +1068,9 @@ JohtoGrassWildMons:
 	db 24, JYNX
 	db 24, JYNX
 	ENDC
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_NW
+	def_grass_wildmons WHIRL_ISLAND_NW
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -1085,8 +1096,9 @@ JohtoGrassWildMons:
 	db 23, GOLBAT
 	db 24, SEEL
 	db 24, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_NE
+	def_grass_wildmons WHIRL_ISLAND_NE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -1112,8 +1124,9 @@ JohtoGrassWildMons:
 	db 23, GOLBAT
 	db 24, SEEL
 	db 24, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_SW
+	def_grass_wildmons WHIRL_ISLAND_SW
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -1139,8 +1152,9 @@ JohtoGrassWildMons:
 	db 23, GOLBAT
 	db 24, SEEL
 	db 24, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_CAVE
+	def_grass_wildmons WHIRL_ISLAND_CAVE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -1166,8 +1180,9 @@ JohtoGrassWildMons:
 	db 23, GOLBAT
 	db 24, SEEL
 	db 24, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_SE
+	def_grass_wildmons WHIRL_ISLAND_SE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -1193,8 +1208,9 @@ JohtoGrassWildMons:
 	db 23, GOLBAT
 	db 24, SEEL
 	db 24, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_B1F
+	def_grass_wildmons WHIRL_ISLAND_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, KRABBY
@@ -1220,8 +1236,9 @@ JohtoGrassWildMons:
 	db 24, GOLBAT
 	db 25, SEEL
 	db 25, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_B2F
+	def_grass_wildmons WHIRL_ISLAND_B2F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, KRABBY
@@ -1247,8 +1264,9 @@ JohtoGrassWildMons:
 	db 24, GOLBAT
 	db 25, SEEL
 	db 25, SEEL
+	end_grass_wildmons
 
-	map_id WHIRL_ISLAND_LUGIA_CHAMBER
+	def_grass_wildmons WHIRL_ISLAND_LUGIA_CHAMBER
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 24, KRABBY
@@ -1274,10 +1292,10 @@ JohtoGrassWildMons:
 	db 25, GOLBAT
 	db 26, SEEL
 	db 26, SEEL
+	end_grass_wildmons
 
-	map_id SILVER_CAVE_ROOM_1
+	def_grass_wildmons SILVER_CAVE_ROOM_1
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 42, ONIX
@@ -1303,7 +1321,6 @@ JohtoGrassWildMons:
 	db 45, GOLBAT
 	db 20, LARVITAR
 	db 15, LARVITAR
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 42, ONIX
@@ -1330,10 +1347,10 @@ JohtoGrassWildMons:
 	db 20, LARVITAR
 	db 15, LARVITAR
 	ENDC
+	end_grass_wildmons
 
-	map_id SILVER_CAVE_ROOM_2
+	def_grass_wildmons SILVER_CAVE_ROOM_2
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 45, QUAGSIRE
@@ -1359,7 +1376,6 @@ JohtoGrassWildMons:
 	db 48, GOLBAT
 	db 20, LARVITAR
 	db 15, LARVITAR
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 45, QUAGSIRE
@@ -1386,10 +1402,10 @@ JohtoGrassWildMons:
 	db 20, LARVITAR
 	db 15, LARVITAR
 	ENDC
+	end_grass_wildmons
 
-	map_id SILVER_CAVE_ROOM_3
+	def_grass_wildmons SILVER_CAVE_ROOM_3
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 51, GOLBAT
@@ -1415,7 +1431,6 @@ JohtoGrassWildMons:
 	db 51, GOLDUCK
 	db 20, LARVITAR
 	db 15, LARVITAR
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 51, GOLBAT
@@ -1442,10 +1457,10 @@ JohtoGrassWildMons:
 	db 20, LARVITAR
 	db 15, LARVITAR
 	ENDC
+	end_grass_wildmons
 
-	map_id SILVER_CAVE_ITEM_ROOMS
+	def_grass_wildmons SILVER_CAVE_ITEM_ROOMS
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 45, QUAGSIRE
@@ -1471,7 +1486,6 @@ JohtoGrassWildMons:
 	db 48, GOLBAT
 	db 20, LARVITAR
 	db 15, LARVITAR
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 45, QUAGSIRE
@@ -1498,8 +1512,9 @@ JohtoGrassWildMons:
 	db 20, LARVITAR
 	db 15, LARVITAR
 	ENDC
+	end_grass_wildmons
 
-	map_id DARK_CAVE_VIOLET_ENTRANCE
+	def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -1525,8 +1540,9 @@ JohtoGrassWildMons:
 	db 3, ZUBAT
 	db 4, ZUBAT
 	db 4, DUNSPARCE
+	end_grass_wildmons
 
-	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
+	def_grass_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, GEODUDE
@@ -1552,8 +1568,9 @@ JohtoGrassWildMons:
 	db 25, WOBBUFFET
 	db 23, GOLBAT
 	db 23, GOLBAT
+	end_grass_wildmons
 
-	map_id ROUTE_29
+	def_grass_wildmons ROUTE_29
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, PIDGEY
@@ -1579,10 +1596,10 @@ JohtoGrassWildMons:
 	db 4, RATTATA
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
+	end_grass_wildmons
 
-	map_id ROUTE_30
+	def_grass_wildmons ROUTE_30
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 2, PIDGEY
@@ -1608,7 +1625,6 @@ JohtoGrassWildMons:
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 3, LEDYBA
@@ -1635,10 +1651,10 @@ JohtoGrassWildMons:
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_31
+	def_grass_wildmons ROUTE_31
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 3, PIDGEY
@@ -1664,7 +1680,6 @@ JohtoGrassWildMons:
 	db 5, HOOTHOOT
 	db 5, HOOTHOOT
 	db 5, HOOTHOOT
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 4, LEDYBA
@@ -1691,10 +1706,10 @@ JohtoGrassWildMons:
 	db 5, HOOTHOOT
 	db 5, HOOTHOOT
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_32
+	def_grass_wildmons ROUTE_32
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 6, BELLSPROUT
@@ -1720,7 +1735,6 @@ JohtoGrassWildMons:
 	db 8, WOOPER
 	db 8, ZUBAT
 	db 8, ZUBAT
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 6, BELLSPROUT
@@ -1747,10 +1761,10 @@ JohtoGrassWildMons:
 	db 8, ZUBAT
 	db 8, ZUBAT
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_33
+	def_grass_wildmons ROUTE_33
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 6, HOPPIP
@@ -1776,7 +1790,6 @@ JohtoGrassWildMons:
 	db 8, ZUBAT
 	db 8, ZUBAT
 	db 8, ZUBAT
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 6, HOPPIP
@@ -1803,8 +1816,9 @@ JohtoGrassWildMons:
 	db 8, ZUBAT
 	db 8, ZUBAT
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_34
+	def_grass_wildmons ROUTE_34
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, DROWZEE
@@ -1830,10 +1844,10 @@ JohtoGrassWildMons:
 	db 13, RATTATA
 	db 10, DITTO
 	db 10, DITTO
+	end_grass_wildmons
 
-	map_id ROUTE_35
+	def_grass_wildmons ROUTE_35
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 12, NIDORAN_M
@@ -1859,7 +1873,6 @@ JohtoGrassWildMons:
 	db 14, HOOTHOOT
 	db 10, DITTO
 	db 12, YANMA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 12, NIDORAN_F
@@ -1886,10 +1899,10 @@ JohtoGrassWildMons:
 	db 10, DITTO
 	db 12, YANMA
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_36
+	def_grass_wildmons ROUTE_36
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 12, NIDORAN_M
@@ -1915,7 +1928,6 @@ JohtoGrassWildMons:
 	db 13, STANTLER
 	db 15, HOOTHOOT
 	db 15, HOOTHOOT
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 12, NIDORAN_F
@@ -1942,10 +1954,10 @@ JohtoGrassWildMons:
 	db 15, HOOTHOOT
 	db 15, HOOTHOOT
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_37
+	def_grass_wildmons ROUTE_37
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 13, PIDGEY
@@ -1971,7 +1983,6 @@ JohtoGrassWildMons:
 	db 15, SPINARAK
 	db 15, SPINARAK
 	db 15, SPINARAK
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 13, LEDYBA
@@ -1998,10 +2009,10 @@ JohtoGrassWildMons:
 	db 15, HOOTHOOT
 	db 15, HOOTHOOT
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_38
+	def_grass_wildmons ROUTE_38
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 16, RATTATA
@@ -2027,7 +2038,6 @@ JohtoGrassWildMons:
 	db 13, MILTANK
 	db 13, TAUROS
 	db 13, SNUBBULL
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 16, MEOWTH
@@ -2054,8 +2064,9 @@ JohtoGrassWildMons:
 	db 13, TAUROS
 	db 13, SNUBBULL
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_39
+	def_grass_wildmons ROUTE_39
 	IF DEF(_GOLD)
 	db 2 percent, 2 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
@@ -2082,7 +2093,6 @@ JohtoGrassWildMons:
 	db 15, MILTANK
 	db 15, TAUROS
 	db 15, TAUROS
-
 	ELIF DEF(_SILVER)
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
@@ -2110,10 +2120,10 @@ JohtoGrassWildMons:
 	db 15, TAUROS
 	db 15, TAUROS
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_42
+	def_grass_wildmons ROUTE_42
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 15, MANKEY
@@ -2139,7 +2149,6 @@ JohtoGrassWildMons:
 	db 15, FLAAFFY
 	db 17, FLAAFFY
 	db 17, FLAAFFY
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 13, MAREEP
@@ -2166,8 +2175,9 @@ JohtoGrassWildMons:
 	db 17, FLAAFFY
 	db 17, FLAAFFY
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_43
+	def_grass_wildmons ROUTE_43
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, FLAAFFY
@@ -2193,8 +2203,9 @@ JohtoGrassWildMons:
 	db 15, MAREEP
 	db 16, VENONAT
 	db 16, VENONAT
+	end_grass_wildmons
 
-	map_id ROUTE_44
+	def_grass_wildmons ROUTE_44
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, TANGELA
@@ -2220,10 +2231,10 @@ JohtoGrassWildMons:
 	db 24, WEEPINBELL
 	db 26, LICKITUNG
 	db 26, LICKITUNG
+	end_grass_wildmons
 
-	map_id ROUTE_45
+	def_grass_wildmons ROUTE_45
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 23, GEODUDE
@@ -2249,7 +2260,6 @@ JohtoGrassWildMons:
 	db 25, GRAVELER
 	db 27, GRAVELER
 	db 27, GRAVELER
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 23, GEODUDE
@@ -2276,8 +2286,9 @@ JohtoGrassWildMons:
 	db 27, SKARMORY
 	db 27, SKARMORY
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_46
+	def_grass_wildmons ROUTE_46
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -2303,10 +2314,10 @@ JohtoGrassWildMons:
 	db 4, GEODUDE
 	db 3, JIGGLYPUFF
 	db 5, JIGGLYPUFF
+	end_grass_wildmons
 
-	map_id SILVER_CAVE_OUTSIDE
+	def_grass_wildmons SILVER_CAVE_OUTSIDE
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 41, TANGELA
@@ -2332,7 +2343,6 @@ JohtoGrassWildMons:
 	db 38, SNEASEL
 	db 42, SNEASEL
 	db 42, SNEASEL
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 41, TANGELA
@@ -2359,5 +2369,6 @@ JohtoGrassWildMons:
 	db 42, SNEASEL
 	db 42, SNEASEL
 	ENDC
+	end_grass_wildmons
 
 	db -1 ; end
diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm
index 0924807c..e6e40860 100644
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -2,37 +2,42 @@
 
 JohtoWaterWildMons:
 
-	map_id RUINS_OF_ALPH_OUTSIDE
+	def_water_wildmons RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
+	end_water_wildmons
 
-	map_id UNION_CAVE_1F
+	def_water_wildmons UNION_CAVE_1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
+	end_water_wildmons
 
-	map_id UNION_CAVE_B1F
+	def_water_wildmons UNION_CAVE_B1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
+	end_water_wildmons
 
-	map_id UNION_CAVE_B2F
+	def_water_wildmons UNION_CAVE_B2F
 	db 4 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id SLOWPOKE_WELL_B1F
+	def_water_wildmons SLOWPOKE_WELL_B1F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 10, SLOWPOKE
+	end_water_wildmons
 
-	map_id SLOWPOKE_WELL_B2F
+	def_water_wildmons SLOWPOKE_WELL_B2F
 	IF DEF(_GOLD)
 	db 4 percent ; encounter rate
 	ELIF DEF(_SILVER)
@@ -41,184 +46,211 @@ JohtoWaterWildMons:
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 20, SLOWBRO
+	end_water_wildmons
 
-	map_id ILEX_FOREST
+	def_water_wildmons ILEX_FOREST
 	db 2 percent ; encounter rate
 	db 15, PSYDUCK
 	db 10, PSYDUCK
 	db 15, GOLDUCK
+	end_water_wildmons
 
-	map_id MOUNT_MORTAR_1F_OUTSIDE
+	def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 15, GOLDEEN
 	db 20, SEAKING
+	end_water_wildmons
 
-	map_id MOUNT_MORTAR_2F_INSIDE
+	def_water_wildmons MOUNT_MORTAR_2F_INSIDE
 	db 2 percent ; encounter rate
 	db 20, GOLDEEN
 	db 25, GOLDEEN
 	db 25, SEAKING
+	end_water_wildmons
 
-	map_id MOUNT_MORTAR_B1F
+	def_water_wildmons MOUNT_MORTAR_B1F
 	db 2 percent ; encounter rate
 	db 20, GOLDEEN
 	db 15, GOLDEEN
 	db 20, SEAKING
+	end_water_wildmons
 
-	map_id WHIRL_ISLAND_SW
+	def_water_wildmons WHIRL_ISLAND_SW
 	db 4 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, HORSEA
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id WHIRL_ISLAND_B2F
+	def_water_wildmons WHIRL_ISLAND_B2F
 	db 4 percent ; encounter rate
 	db 15, HORSEA
 	db 20, HORSEA
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id WHIRL_ISLAND_LUGIA_CHAMBER
+	def_water_wildmons WHIRL_ISLAND_LUGIA_CHAMBER
 	db 4 percent ; encounter rate
 	db 20, HORSEA
 	db 20, TENTACRUEL
 	db 20, SEADRA
+	end_water_wildmons
 
-	map_id SILVER_CAVE_ROOM_2
+	def_water_wildmons SILVER_CAVE_ROOM_2
 	db 2 percent ; encounter rate
 	db 35, SEAKING
 	db 40, SEAKING
 	db 35, GOLDEEN
+	end_water_wildmons
 
-	map_id DARK_CAVE_VIOLET_ENTRANCE
+	def_water_wildmons DARK_CAVE_VIOLET_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
+	end_water_wildmons
 
-	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
+	def_water_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
+	end_water_wildmons
 
-	map_id DRAGONS_DEN_B1F
+	def_water_wildmons DRAGONS_DEN_B1F
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 10, DRATINI
+	end_water_wildmons
 
-	map_id ROUTE_30
+	def_water_wildmons ROUTE_30
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
+	end_water_wildmons
 
-	map_id ROUTE_31
+	def_water_wildmons ROUTE_31
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
+	end_water_wildmons
 
-	map_id ROUTE_32
+	def_water_wildmons ROUTE_32
 	db 6 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_34
+	def_water_wildmons ROUTE_34
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_35
+	def_water_wildmons ROUTE_35
 	db 4 percent ; encounter rate
 	db 20, PSYDUCK
 	db 15, PSYDUCK
 	db 20, GOLDUCK
+	end_water_wildmons
 
-	map_id ROUTE_40
+	def_water_wildmons ROUTE_40
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_41
+	def_water_wildmons ROUTE_41
 	db 6 percent ; encounter rate
-
 	IF DEF(_GOLD)
 	db 20, TENTACOOL
 	db 20, TENTACRUEL
 	db 20, MANTINE
-
 	ELIF DEF(_SILVER)
 	db 20, TENTACOOL
 	db 20, TENTACRUEL
 	db 15, TENTACOOL
 	ENDC
+	end_water_wildmons
 
-	map_id ROUTE_42
+	def_water_wildmons ROUTE_42
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 15, GOLDEEN
 	db 20, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_43
+	def_water_wildmons ROUTE_43
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
+	end_water_wildmons
 
-	map_id ROUTE_44
+	def_water_wildmons ROUTE_44
 	db 2 percent ; encounter rate
 	db 25, POLIWAG
 	db 20, POLIWAG
 	db 25, POLIWHIRL
+	end_water_wildmons
 
-	map_id ROUTE_45
+	def_water_wildmons ROUTE_45
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 5, MAGIKARP
+	end_water_wildmons
 
-	map_id NEW_BARK_TOWN
+	def_water_wildmons NEW_BARK_TOWN
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id CHERRYGROVE_CITY
+	def_water_wildmons CHERRYGROVE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id VIOLET_CITY
+	def_water_wildmons VIOLET_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
+	end_water_wildmons
 
-	map_id CIANWOOD_CITY
+	def_water_wildmons CIANWOOD_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id OLIVINE_CITY
+	def_water_wildmons OLIVINE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id ECRUTEAK_CITY
+	def_water_wildmons ECRUTEAK_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
+	end_water_wildmons
 
-	map_id LAKE_OF_RAGE
+	def_water_wildmons LAKE_OF_RAGE
 	IF DEF(_GOLD)
 	db 4 percent ; encounter rate
 	ELIF DEF(_SILVER)
@@ -227,23 +259,27 @@ JohtoWaterWildMons:
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 15, GYARADOS
+	end_water_wildmons
 
-	map_id BLACKTHORN_CITY
+	def_water_wildmons BLACKTHORN_CITY
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
+	end_water_wildmons
 
-	map_id SILVER_CAVE_OUTSIDE
+	def_water_wildmons SILVER_CAVE_OUTSIDE
 	db 2 percent ; encounter rate
 	db 35, POLIWHIRL
 	db 40, POLIWHIRL
 	db 35, POLIWAG
+	end_water_wildmons
 
-	map_id OLIVINE_PORT
+	def_water_wildmons OLIVINE_PORT
 	db 2 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
 	db -1 ; end
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index 2884d010..29008441 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -2,7 +2,7 @@
 
 KantoGrassWildMons:
 
-	map_id DIGLETTS_CAVE
+	def_grass_wildmons DIGLETTS_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, DIGLETT
@@ -28,10 +28,10 @@ KantoGrassWildMons:
 	db 19, DUGTRIO
 	db 24, DUGTRIO
 	db 29, DUGTRIO
+	end_grass_wildmons
 
-	map_id MOUNT_MOON
+	def_grass_wildmons MOUNT_MOON
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 6, ZUBAT
@@ -57,7 +57,6 @@ KantoGrassWildMons:
 	db 10, SANDSLASH
 	db 8, CLEFAIRY
 	db 8, CLEFAIRY
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 6, ZUBAT
@@ -84,8 +83,9 @@ KantoGrassWildMons:
 	db 8, CLEFAIRY
 	db 8, CLEFAIRY
 	ENDC
+	end_grass_wildmons
 
-	map_id ROCK_TUNNEL_1F
+	def_grass_wildmons ROCK_TUNNEL_1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, CUBONE
@@ -111,8 +111,9 @@ KantoGrassWildMons:
 	db 14, MACHOKE
 	db 13, CUBONE
 	db 13, CUBONE
+	end_grass_wildmons
 
-	map_id ROCK_TUNNEL_B1F
+	def_grass_wildmons ROCK_TUNNEL_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, CUBONE
@@ -138,10 +139,10 @@ KantoGrassWildMons:
 	db 14, MAROWAK
 	db 14, KANGASKHAN
 	db 14, KANGASKHAN
+	end_grass_wildmons
 
-	map_id VICTORY_ROAD
+	def_grass_wildmons VICTORY_ROAD
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 32, GRAVELER
@@ -167,7 +168,6 @@ KantoGrassWildMons:
 	db 36, ONIX
 	db 35, RHYHORN
 	db 35, RHYHORN
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 32, GRAVELER
@@ -194,8 +194,9 @@ KantoGrassWildMons:
 	db 35, RHYHORN
 	db 35, RHYHORN
 	ENDC
+	end_grass_wildmons
 
-	map_id TOHJO_FALLS
+	def_grass_wildmons TOHJO_FALLS
 	IF DEF(_GOLD)
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	ELIF DEF(_SILVER)
@@ -225,8 +226,9 @@ KantoGrassWildMons:
 	db 20, RATTATA
 	db 23, SLOWPOKE
 	db 23, SLOWPOKE
+	end_grass_wildmons
 
-	map_id ROUTE_1
+	def_grass_wildmons ROUTE_1
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, PIDGEY
@@ -252,10 +254,10 @@ KantoGrassWildMons:
 	db 6, RATTATA
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
+	end_grass_wildmons
 
-	map_id ROUTE_2
+	def_grass_wildmons ROUTE_2
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 3, CATERPIE
@@ -281,7 +283,6 @@ KantoGrassWildMons:
 	db 7, ARIADOS
 	db 4, PIKACHU
 	db 4, PIKACHU
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 3, WEEDLE
@@ -308,10 +309,10 @@ KantoGrassWildMons:
 	db 4, PIKACHU
 	db 4, PIKACHU
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_3
+	def_grass_wildmons ROUTE_3
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 5, SPEAROW
@@ -337,7 +338,6 @@ KantoGrassWildMons:
 	db 10, RATTATA
 	db 8, RATTATA
 	db 8, RATTATA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 5, SPEAROW
@@ -364,11 +364,11 @@ KantoGrassWildMons:
 	db 8, RATTATA
 	db 8, RATTATA
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_4
+	def_grass_wildmons ROUTE_4
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-
 	IF DEF(_GOLD)
 	; morn
 	db 5, SPEAROW
@@ -394,7 +394,6 @@ KantoGrassWildMons:
 	db 10, RATTATA
 	db 8, RATTATA
 	db 8, RATTATA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 5, SPEAROW
@@ -421,10 +420,10 @@ KantoGrassWildMons:
 	db 8, RATTATA
 	db 8, RATTATA
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_5
+	def_grass_wildmons ROUTE_5
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 13, PIDGEY
@@ -450,7 +449,6 @@ KantoGrassWildMons:
 	db 12, ABRA
 	db 14, ABRA
 	db 14, ABRA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 13, PIDGEY
@@ -477,10 +475,10 @@ KantoGrassWildMons:
 	db 14, ABRA
 	db 14, ABRA
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_6
+	def_grass_wildmons ROUTE_6
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 13, PIDGEY
@@ -506,7 +504,6 @@ KantoGrassWildMons:
 	db 12, ABRA
 	db 14, ABRA
 	db 14, ABRA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 13, PIDGEY
@@ -533,10 +530,10 @@ KantoGrassWildMons:
 	db 14, ABRA
 	db 14, ABRA
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_7
+	def_grass_wildmons ROUTE_7
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 17, RATTATA
@@ -562,7 +559,6 @@ KantoGrassWildMons:
 	db 19, MURKROW
 	db 15, HOUNDOUR
 	db 15, HOUNDOUR
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 17, MEOWTH
@@ -589,10 +585,10 @@ KantoGrassWildMons:
 	db 15, HOUNDOUR
 	db 15, HOUNDOUR
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_8
+	def_grass_wildmons ROUTE_8
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 17, PIDGEOTTO
@@ -618,7 +614,6 @@ KantoGrassWildMons:
 	db 18, GROWLITHE
 	db 15, KADABRA
 	db 15, KADABRA
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 17, MEOWTH
@@ -645,10 +640,10 @@ KantoGrassWildMons:
 	db 15, KADABRA
 	db 15, KADABRA
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_9
+	def_grass_wildmons ROUTE_9
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 13, MANKEY
@@ -674,7 +669,6 @@ KantoGrassWildMons:
 	db 15, RATICATE
 	db 15, PRIMEAPE
 	db 15, PRIMEAPE
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 13, RATTATA
@@ -701,8 +695,9 @@ KantoGrassWildMons:
 	db 15, RATICATE
 	db 15, RATICATE
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_10_NORTH
+	def_grass_wildmons ROUTE_10_NORTH
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 16, SPEAROW
@@ -728,8 +723,9 @@ KantoGrassWildMons:
 	db 18, RATICATE
 	db 15, ELECTABUZZ
 	db 15, ELECTABUZZ
+	end_grass_wildmons
 
-	map_id ROUTE_11
+	def_grass_wildmons ROUTE_11
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, DROWZEE
@@ -755,10 +751,10 @@ KantoGrassWildMons:
 	db 16, HYPNO
 	db 16, HYPNO
 	db 16, HYPNO
+	end_grass_wildmons
 
-	map_id ROUTE_13
+	def_grass_wildmons ROUTE_13
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 23, NIDORINA
@@ -784,7 +780,6 @@ KantoGrassWildMons:
 	db 24, QUAGSIRE
 	db 24, QUAGSIRE
 	db 25, CHANSEY
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 23, NIDORINO
@@ -811,10 +806,10 @@ KantoGrassWildMons:
 	db 24, QUAGSIRE
 	db 25, CHANSEY
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_14
+	def_grass_wildmons ROUTE_14
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 23, NIDORINA
@@ -840,7 +835,6 @@ KantoGrassWildMons:
 	db 24, QUAGSIRE
 	db 24, QUAGSIRE
 	db 25, CHANSEY
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 23, NIDORINO
@@ -867,10 +861,10 @@ KantoGrassWildMons:
 	db 24, QUAGSIRE
 	db 25, CHANSEY
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_15
+	def_grass_wildmons ROUTE_15
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 23, NIDORINA
@@ -896,7 +890,6 @@ KantoGrassWildMons:
 	db 24, QUAGSIRE
 	db 24, QUAGSIRE
 	db 25, CHANSEY
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 23, NIDORINO
@@ -923,8 +916,9 @@ KantoGrassWildMons:
 	db 24, QUAGSIRE
 	db 25, CHANSEY
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_16
+	def_grass_wildmons ROUTE_16
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, GRIMER
@@ -950,8 +944,9 @@ KantoGrassWildMons:
 	db 27, SLUGMA
 	db 30, MUK
 	db 30, MUK
+	end_grass_wildmons
 
-	map_id ROUTE_17
+	def_grass_wildmons ROUTE_17
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 28, FEAROW
@@ -977,8 +972,9 @@ KantoGrassWildMons:
 	db 29, SLUGMA
 	db 32, MUK
 	db 32, MUK
+	end_grass_wildmons
 
-	map_id ROUTE_18
+	def_grass_wildmons ROUTE_18
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, GRIMER
@@ -1004,8 +1000,9 @@ KantoGrassWildMons:
 	db 27, SLUGMA
 	db 30, MUK
 	db 30, MUK
+	end_grass_wildmons
 
-	map_id ROUTE_21
+	def_grass_wildmons ROUTE_21
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 30, TANGELA
@@ -1031,8 +1028,9 @@ KantoGrassWildMons:
 	db 30, TANGELA
 	db 28, MR__MIME
 	db 28, MR__MIME
+	end_grass_wildmons
 
-	map_id ROUTE_22
+	def_grass_wildmons ROUTE_22
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -1058,8 +1056,9 @@ KantoGrassWildMons:
 	db 6, PONYTA
 	db 7, RATTATA
 	db 7, RATTATA
+	end_grass_wildmons
 
-	map_id ROUTE_24
+	def_grass_wildmons ROUTE_24
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 8, BELLSPROUT
@@ -1085,8 +1084,9 @@ KantoGrassWildMons:
 	db 10, BELLSPROUT
 	db 10, VENOMOTH
 	db 10, VENOMOTH
+	end_grass_wildmons
 
-	map_id ROUTE_25
+	def_grass_wildmons ROUTE_25
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 8, PIDGEY
@@ -1112,10 +1112,10 @@ KantoGrassWildMons:
 	db 14, WEEPINBELL
 	db 10, BELLSPROUT
 	db 10, BELLSPROUT
+	end_grass_wildmons
 
-	map_id ROUTE_26
+	def_grass_wildmons ROUTE_26
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 28, DODUO
@@ -1141,7 +1141,6 @@ KantoGrassWildMons:
 	db 30, QUAGSIRE
 	db 32, QUAGSIRE
 	db 32, QUAGSIRE
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 28, DODUO
@@ -1168,10 +1167,10 @@ KantoGrassWildMons:
 	db 30, ARBOK
 	db 30, ARBOK
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_27
+	def_grass_wildmons ROUTE_27
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 28, DODUO
@@ -1197,7 +1196,6 @@ KantoGrassWildMons:
 	db 32, PONYTA
 	db 30, SANDSLASH
 	db 30, SANDSLASH
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 28, DODUO
@@ -1224,10 +1222,10 @@ KantoGrassWildMons:
 	db 32, QUAGSIRE
 	db 32, QUAGSIRE
 	ENDC
+	end_grass_wildmons
 
-	map_id ROUTE_28
+	def_grass_wildmons ROUTE_28
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 39, TANGELA
@@ -1253,7 +1251,6 @@ KantoGrassWildMons:
 	db 42, RAPIDASH
 	db 42, RAPIDASH
 	db 42, RAPIDASH
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 39, TANGELA
@@ -1280,5 +1277,6 @@ KantoGrassWildMons:
 	db 42, RAPIDASH
 	db 42, RAPIDASH
 	ENDC
+	end_grass_wildmons
 
 	db -1 ; end
diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm
index 1f91e95e..c63c7fa8 100644
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -2,148 +2,172 @@
 
 KantoWaterWildMons:
 
-	map_id ROUTE_4
+	def_water_wildmons ROUTE_4
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_6
+	def_water_wildmons ROUTE_6
 	db 2 percent ; encounter rate
 	db 10, PSYDUCK
 	db 5, PSYDUCK
 	db 10, GOLDUCK
+	end_water_wildmons
 
-	map_id ROUTE_9
+	def_water_wildmons ROUTE_9
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 10, GOLDEEN
 	db 15, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_10_NORTH
+	def_water_wildmons ROUTE_10_NORTH
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 10, GOLDEEN
 	db 15, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_12
+	def_water_wildmons ROUTE_12
 	db 6 percent ; encounter rate
 	db 25, TENTACOOL
 	db 25, QUAGSIRE
 	db 25, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_13
+	def_water_wildmons ROUTE_13
 	db 6 percent ; encounter rate
 	db 25, TENTACOOL
 	db 25, QUAGSIRE
 	db 25, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_19
+	def_water_wildmons ROUTE_19
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_20
+	def_water_wildmons ROUTE_20
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_21
+	def_water_wildmons ROUTE_21
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_22
+	def_water_wildmons ROUTE_22
 	db 2 percent ; encounter rate
 	db 10, POLIWAG
 	db 5, POLIWAG
 	db 10, POLIWHIRL
+	end_water_wildmons
 
-	map_id ROUTE_24
+	def_water_wildmons ROUTE_24
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_25
+	def_water_wildmons ROUTE_25
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_26
+	def_water_wildmons ROUTE_26
 	db 6 percent ; encounter rate
 	db 30, TENTACOOL
 	db 25, TENTACOOL
 	db 30, TENTACRUEL
+	end_water_wildmons
 
-	map_id ROUTE_27
+	def_water_wildmons ROUTE_27
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
+	end_water_wildmons
 
-	map_id TOHJO_FALLS
+	def_water_wildmons TOHJO_FALLS
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 20, SLOWPOKE
 	db 20, SEAKING
+	end_water_wildmons
 
-	map_id ROUTE_28
+	def_water_wildmons ROUTE_28
 	db 2 percent ; encounter rate
 	db 40, POLIWAG
 	db 35, POLIWAG
 	db 40, POLIWHIRL
+	end_water_wildmons
 
-	map_id PALLET_TOWN
+	def_water_wildmons PALLET_TOWN
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
-	map_id VIRIDIAN_CITY
+	def_water_wildmons VIRIDIAN_CITY
 	db 2 percent ; encounter rate
 	db 10, POLIWAG
 	db 5, POLIWAG
 	db 10, POLIWHIRL
+	end_water_wildmons
 
-	map_id CERULEAN_CITY
+	def_water_wildmons CERULEAN_CITY
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
+	end_water_wildmons
 
-	map_id VERMILION_CITY
+	def_water_wildmons VERMILION_CITY
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
-	map_id CELADON_CITY
+	def_water_wildmons CELADON_CITY
 	db 2 percent ; encounter rate
 	db 20, GRIMER
 	db 15, GRIMER
 	db 15, MUK
+	end_water_wildmons
 
-	map_id FUCHSIA_CITY
+	def_water_wildmons FUCHSIA_CITY
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
+	end_water_wildmons
 
-	map_id CINNABAR_ISLAND
+	def_water_wildmons CINNABAR_ISLAND
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
-	map_id VERMILION_PORT
+	def_water_wildmons VERMILION_PORT
 	db 2 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
+	end_water_wildmons
 
 	db -1 ; end
diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm
index 954ec7bb..2f1335c8 100644
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -3,7 +3,7 @@
 SwarmGrassWildMons:
 
 ; Yanma swarm
-	map_id ROUTE_35
+	def_grass_wildmons ROUTE_35
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, NIDORAN_M
@@ -29,11 +29,11 @@ SwarmGrassWildMons:
 	db 14, HOOTHOOT
 	db 10, DITTO
 	db 10, DITTO
+	end_grass_wildmons
 
 ; Snubbull swarm
-	map_id ROUTE_38
+	def_grass_wildmons ROUTE_38
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
-
 	IF DEF(_GOLD)
 	; morn
 	db 16, SNUBBULL
@@ -59,7 +59,6 @@ SwarmGrassWildMons:
 	db 13, MILTANK
 	db 13, TAUROS
 	db 13, TAUROS
-
 	ELIF DEF(_SILVER)
 	; morn
 	db 16, SNUBBULL
@@ -86,9 +85,10 @@ SwarmGrassWildMons:
 	db 13, TAUROS
 	db 13, TAUROS
 	ENDC
+	end_grass_wildmons
 
 ; Dunsparce swarm
-	map_id DARK_CAVE_VIOLET_ENTRANCE
+	def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -114,9 +114,10 @@ SwarmGrassWildMons:
 	db 2, DUNSPARCE
 	db 4, DUNSPARCE
 	db 4, DUNSPARCE
+	end_grass_wildmons
 
 ; Marill swarm
-	map_id MOUNT_MORTAR_1F_OUTSIDE
+	def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, MARILL
@@ -142,5 +143,6 @@ SwarmGrassWildMons:
 	db 14, GEODUDE
 	db 16, RATTATA
 	db 16, RATTATA
+	end_grass_wildmons
 
 	db -1 ; end
diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm
index d535dc6d..67f10efe 100644
--- a/data/wild/swarm_water.asm
+++ b/data/wild/swarm_water.asm
@@ -3,10 +3,11 @@
 SwarmWaterWildMons:
 
 ; Marill swarm
-	map_id MOUNT_MORTAR_1F_OUTSIDE
+	def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
+	end_water_wildmons
 
 	db -1 ; end
diff --git a/macros/asserts.asm b/macros/asserts.asm
index e045e2f5..306fc4c3 100644
--- a/macros/asserts.asm
+++ b/macros/asserts.asm
@@ -18,3 +18,41 @@ x = \1
 	assert x * CURRENT_TABLE_WIDTH == @ - CURRENT_TABLE_START, \
 		"{CURRENT_TABLE_START}: expected {d:x} entries, each {d:CURRENT_TABLE_WIDTH} bytes"
 ENDM
+
+def_grass_wildmons: MACRO
+;\1: map id
+if DEF(CURRENT_GRASS_WILDMONS_MAP)
+PURGE CURRENT_GRASS_WILDMONS_MAP
+endc
+if DEF(CURRENT_GRASS_WILDMONS_LABEL)
+PURGE CURRENT_GRASS_WILDMONS_LABEL
+endc
+CURRENT_GRASS_WILDMONS_MAP EQUS "\1"
+CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1"
+CURRENT_GRASS_WILDMONS_LABEL:
+	map_id \1
+ENDM
+
+end_grass_wildmons: MACRO
+	assert GRASS_WILDDATA_LENGTH == @ - CURRENT_GRASS_WILDMONS_LABEL, \
+		"def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes"
+ENDM
+
+def_water_wildmons: MACRO
+;\1: map id
+if DEF(CURRENT_WATER_WILDMONS_MAP)
+PURGE CURRENT_WATER_WILDMONS_MAP
+endc
+if DEF(CURRENT_WATER_WILDMONS_LABEL)
+PURGE CURRENT_WATER_WILDMONS_LABEL
+endc
+CURRENT_WATER_WILDMONS_MAP EQUS "\1"
+CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1"
+CURRENT_WATER_WILDMONS_LABEL:
+	map_id \1
+ENDM
+
+end_water_wildmons: MACRO
+	assert WATER_WILDDATA_LENGTH == @ - CURRENT_WATER_WILDMONS_LABEL, \
+		"def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes"
+ENDM