Clean up some data, using macros for multiline list entries

59 files changed, 1152 insertions, 1131 deletions

diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm
index 20e8643a..eb39c525 100644
--- a/data/wild/maps/CeruleanCave1F.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
@@ -1,18 +1,19 @@
 DungeonMons1:
-	db $0A
-	db 46,GOLBAT
-	db 46,HYPNO
-	db 46,MAGNETON
-	db 49,DODRIO
-	db 49,VENOMOTH
-	IF DEF(_RED)
-		db 52,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 52,SANDSLASH
-	ENDC
-	db 49,KADABRA
-	db 52,PARASECT
-	db 53,RAICHU
-	db 53,DITTO
-	db $00
+	db 10 ; grass encounter rate
+	db 46, GOLBAT
+	db 46, HYPNO
+	db 46, MAGNETON
+	db 49, DODRIO
+	db 49, VENOMOTH
+IF DEF(_RED)
+	db 52, ARBOK
+ENDC
+IF DEF(_BLUE)
+	db 52, SANDSLASH
+ENDC
+	db 49, KADABRA
+	db 52, PARASECT
+	db 53, RAICHU
+	db 53, DITTO
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm
index 5afe55ac..cbdb2eaf 100644
--- a/data/wild/maps/CeruleanCave2F.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
@@ -1,13 +1,14 @@
 DungeonMons2:
-	db $0F
-	db 51,DODRIO
-	db 51,VENOMOTH
-	db 51,KADABRA
-	db 52,RHYDON
-	db 52,MAROWAK
-	db 52,ELECTRODE
-	db 56,CHANSEY
-	db 54,WIGGLYTUFF
-	db 55,DITTO
-	db 60,DITTO
-	db $00
+	db 15 ; grass encounter rate
+	db 51, DODRIO
+	db 51, VENOMOTH
+	db 51, KADABRA
+	db 52, RHYDON
+	db 52, MAROWAK
+	db 52, ELECTRODE
+	db 56, CHANSEY
+	db 54, WIGGLYTUFF
+	db 55, DITTO
+	db 60, DITTO
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm
index 245d5912..86e8fba2 100644
--- a/data/wild/maps/CeruleanCaveB1F.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
@@ -1,18 +1,19 @@
 DungeonMonsB1:
-	db $19
-	db 55,RHYDON
-	db 55,MAROWAK
-	db 55,ELECTRODE
-	db 64,CHANSEY
-	db 64,PARASECT
-	db 64,RAICHU
-	IF DEF(_RED)
-		db 57,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 57,SANDSLASH
-	ENDC
-	db 65,DITTO
-	db 63,DITTO
-	db 67,DITTO
-	db $00
+	db 25 ; grass encounter rate
+	db 55, RHYDON
+	db 55, MAROWAK
+	db 55, ELECTRODE
+	db 64, CHANSEY
+	db 64, PARASECT
+	db 64, RAICHU
+IF DEF(_RED)
+	db 57, ARBOK
+ENDC
+IF DEF(_BLUE)
+	db 57, SANDSLASH
+ENDC
+	db 65, DITTO
+	db 63, DITTO
+	db 67, DITTO
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm
index 37512687..d1e73af4 100755
--- a/data/wild/maps/DiglettsCave.asm
+++ b/data/wild/maps/DiglettsCave.asm
@@ -1,13 +1,14 @@
 CaveMons:
-	db $14
-	db 18,DIGLETT
-	db 19,DIGLETT
-	db 17,DIGLETT
-	db 20,DIGLETT
-	db 16,DIGLETT
-	db 15,DIGLETT
-	db 21,DIGLETT
-	db 22,DIGLETT
-	db 29,DUGTRIO
-	db 31,DUGTRIO
-	db $00
+	db 20 ; grass encounter rate
+	db 18, DIGLETT
+	db 19, DIGLETT
+	db 17, DIGLETT
+	db 20, DIGLETT
+	db 16, DIGLETT
+	db 15, DIGLETT
+	db 21, DIGLETT
+	db 22, DIGLETT
+	db 29, DUGTRIO
+	db 31, DUGTRIO
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm
index 44b34c45..d8c9ba1b 100755
--- a/data/wild/maps/MtMoon1F.asm
+++ b/data/wild/maps/MtMoon1F.asm
@@ -1,13 +1,14 @@
 MoonMons1:
-	db $0A
-	db 8,ZUBAT
-	db 7,ZUBAT
-	db 9,ZUBAT
-	db 8,GEODUDE
-	db 6,ZUBAT
-	db 10,ZUBAT
-	db 10,GEODUDE
-	db 8,PARAS
-	db 11,ZUBAT
-	db 8,CLEFAIRY
-	db $00
+	db 10 ; grass encounter rate
+	db  8, ZUBAT
+	db  7, ZUBAT
+	db  9, ZUBAT
+	db  8, GEODUDE
+	db  6, ZUBAT
+	db 10, ZUBAT
+	db 10, GEODUDE
+	db  8, PARAS
+	db 11, ZUBAT
+	db  8, CLEFAIRY
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm
index 5c0d8a53..875a7256 100755
--- a/data/wild/maps/MtMoonB1F.asm
+++ b/data/wild/maps/MtMoonB1F.asm
@@ -1,13 +1,14 @@
 MoonMonsB1:
-	db $0A
-	db 8,ZUBAT
-	db 7,ZUBAT
-	db 7,GEODUDE
-	db 8,GEODUDE
-	db 9,ZUBAT
-	db 10,PARAS
-	db 10,ZUBAT
-	db 11,ZUBAT
-	db 9,CLEFAIRY
-	db 9,GEODUDE
-	db $00
+	db 10 ; grass encounter rate
+	db  8, ZUBAT
+	db  7, ZUBAT
+	db  7, GEODUDE
+	db  8, GEODUDE
+	db  9, ZUBAT
+	db 10, PARAS
+	db 10, ZUBAT
+	db 11, ZUBAT
+	db  9, CLEFAIRY
+	db  9, GEODUDE
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm
index cbf97e7e..ae90ed1e 100755
--- a/data/wild/maps/MtMoonB2F.asm
+++ b/data/wild/maps/MtMoonB2F.asm
@@ -1,13 +1,14 @@
 MoonMonsB2:
-	db $0A
-	db 9,ZUBAT
-	db 9,GEODUDE
-	db 10,ZUBAT
-	db 10,GEODUDE
-	db 11,ZUBAT
-	db 10,PARAS
-	db 12,PARAS
-	db 10,CLEFAIRY
-	db 12,ZUBAT
-	db 12,CLEFAIRY
-	db $00
+	db 10 ; grass encounter rate
+	db  9, ZUBAT
+	db  9, GEODUDE
+	db 10, ZUBAT
+	db 10, GEODUDE
+	db 11, ZUBAT
+	db 10, PARAS
+	db 12, PARAS
+	db 10, CLEFAIRY
+	db 12, ZUBAT
+	db 12, CLEFAIRY
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm
index 22ad032b..3be7fb18 100755
--- a/data/wild/maps/PokemonMansion1F.asm
+++ b/data/wild/maps/PokemonMansion1F.asm
@@ -1,27 +1,28 @@
 MansionMons1:
-	db $0A
-	IF DEF(_RED)
-		db 32,KOFFING
-		db 30,KOFFING
-		db 34,PONYTA
-		db 30,PONYTA
-		db 34,GROWLITHE
-		db 32,PONYTA
-		db 30,GRIMER
-		db 28,PONYTA
-		db 37,WEEZING
-		db 39,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 32,GRIMER
-		db 30,GRIMER
-		db 34,PONYTA
-		db 30,PONYTA
-		db 34,VULPIX
-		db 32,PONYTA
-		db 30,KOFFING
-		db 28,PONYTA
-		db 37,MUK
-		db 39,WEEZING
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 32, KOFFING
+	db 30, KOFFING
+	db 34, PONYTA
+	db 30, PONYTA
+	db 34, GROWLITHE
+	db 32, PONYTA
+	db 30, GRIMER
+	db 28, PONYTA
+	db 37, WEEZING
+	db 39, MUK
+ENDC
+IF DEF(_BLUE)
+	db 32, GRIMER
+	db 30, GRIMER
+	db 34, PONYTA
+	db 30, PONYTA
+	db 34, VULPIX
+	db 32, PONYTA
+	db 30, KOFFING
+	db 28, PONYTA
+	db 37, MUK
+	db 39, WEEZING
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm
index 985474fc..494973b2 100755
--- a/data/wild/maps/PokemonMansion2F.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
@@ -1,27 +1,28 @@
 MansionMons2:
-	db $0A
-	IF DEF(_RED)
-		db 32,GROWLITHE
-		db 34,KOFFING
-		db 34,KOFFING
-		db 30,PONYTA
-		db 30,KOFFING
-		db 32,PONYTA
-		db 30,GRIMER
-		db 28,PONYTA
-		db 39,WEEZING
-		db 37,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 32,VULPIX
-		db 34,GRIMER
-		db 34,GRIMER
-		db 30,PONYTA
-		db 30,GRIMER
-		db 32,PONYTA
-		db 30,KOFFING
-		db 28,PONYTA
-		db 39,MUK
-		db 37,WEEZING
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 32, GROWLITHE
+	db 34, KOFFING
+	db 34, KOFFING
+	db 30, PONYTA
+	db 30, KOFFING
+	db 32, PONYTA
+	db 30, GRIMER
+	db 28, PONYTA
+	db 39, WEEZING
+	db 37, MUK
+ENDC
+IF DEF(_BLUE)
+	db 32, VULPIX
+	db 34, GRIMER
+	db 34, GRIMER
+	db 30, PONYTA
+	db 30, GRIMER
+	db 32, PONYTA
+	db 30, KOFFING
+	db 28, PONYTA
+	db 39, MUK
+	db 37, WEEZING
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm
index 9c5521ae..bbb14213 100755
--- a/data/wild/maps/PokemonMansion3F.asm
+++ b/data/wild/maps/PokemonMansion3F.asm
@@ -1,27 +1,28 @@
 MansionMons3:
-	db $0A
-	IF DEF(_RED)
-		db 31,KOFFING
-		db 33,GROWLITHE
-		db 35,KOFFING
-		db 32,PONYTA
-		db 34,PONYTA
-		db 40,WEEZING
-		db 34,GRIMER
-		db 38,WEEZING
-		db 36,PONYTA
-		db 42,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 31,GRIMER
-		db 33,VULPIX
-		db 35,GRIMER
-		db 32,PONYTA
-		db 34,MAGMAR
-		db 40,MUK
-		db 34,KOFFING
-		db 38,MUK
-		db 36,PONYTA
-		db 42,WEEZING
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 31, KOFFING
+	db 33, GROWLITHE
+	db 35, KOFFING
+	db 32, PONYTA
+	db 34, PONYTA
+	db 40, WEEZING
+	db 34, GRIMER
+	db 38, WEEZING
+	db 36, PONYTA
+	db 42, MUK
+ENDC
+IF DEF(_BLUE)
+	db 31, GRIMER
+	db 33, VULPIX
+	db 35, GRIMER
+	db 32, PONYTA
+	db 34, MAGMAR
+	db 40, MUK
+	db 34, KOFFING
+	db 38, MUK
+	db 36, PONYTA
+	db 42, WEEZING
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm
index 83266ddd..77f989b2 100755
--- a/data/wild/maps/PokemonMansionB1F.asm
+++ b/data/wild/maps/PokemonMansionB1F.asm
@@ -1,27 +1,28 @@
 MansionMonsB1:
-	db $0A
-	IF DEF(_RED)
-		db 33,KOFFING
-		db 31,KOFFING
-		db 35,GROWLITHE
-		db 32,PONYTA
-		db 31,KOFFING
-		db 40,WEEZING
-		db 34,PONYTA
-		db 35,GRIMER
-		db 42,WEEZING
-		db 42,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 33,GRIMER
-		db 31,GRIMER
-		db 35,VULPIX
-		db 32,PONYTA
-		db 31,GRIMER
-		db 40,MUK
-		db 34,PONYTA
-		db 35,KOFFING
-		db 38,MAGMAR
-		db 42,WEEZING
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 33, KOFFING
+	db 31, KOFFING
+	db 35, GROWLITHE
+	db 32, PONYTA
+	db 31, KOFFING
+	db 40, WEEZING
+	db 34, PONYTA
+	db 35, GRIMER
+	db 42, WEEZING
+	db 42, MUK
+ENDC
+IF DEF(_BLUE)
+	db 33, GRIMER
+	db 31, GRIMER
+	db 35, VULPIX
+	db 32, PONYTA
+	db 31, GRIMER
+	db 40, MUK
+	db 34, PONYTA
+	db 35, KOFFING
+	db 38, MAGMAR
+	db 42, WEEZING
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm
index df951e70..95bef4a3 100755
--- a/data/wild/maps/PokemonTower1F.asm
+++ b/data/wild/maps/PokemonTower1F.asm
@@ -1,3 +1,4 @@
 TowerMons1:
-	db $00
-	db $00
+	db 0 ; grass encounter rate
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm
index dcbe0da0..77b7d415 100755
--- a/data/wild/maps/PokemonTower2F.asm
+++ b/data/wild/maps/PokemonTower2F.asm
@@ -1,3 +1,4 @@
 TowerMons2:
-	db $00
-	db $00
+	db 0 ; grass encounter rate
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm
index 135ed84f..177497e9 100755
--- a/data/wild/maps/PokemonTower3F.asm
+++ b/data/wild/maps/PokemonTower3F.asm
@@ -1,13 +1,14 @@
 TowerMons3:
-	db $0A
-	db 20,GASTLY
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 19,GASTLY
-	db 18,GASTLY
-	db 24,GASTLY
-	db 20,CUBONE
-	db 22,CUBONE
-	db 25,HAUNTER
-	db $00
+	db 10 ; grass encounter rate
+	db 20, GASTLY
+	db 21, GASTLY
+	db 22, GASTLY
+	db 23, GASTLY
+	db 19, GASTLY
+	db 18, GASTLY
+	db 24, GASTLY
+	db 20, CUBONE
+	db 22, CUBONE
+	db 25, HAUNTER
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm
index 0c84b0cf..b6e82d14 100755
--- a/data/wild/maps/PokemonTower4F.asm
+++ b/data/wild/maps/PokemonTower4F.asm
@@ -1,13 +1,14 @@
 TowerMons4:
-	db $0A
-	db 20,GASTLY
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 19,GASTLY
-	db 18,GASTLY
-	db 25,HAUNTER
-	db 20,CUBONE
-	db 22,CUBONE
-	db 24,GASTLY
-	db $00
+	db 10 ; grass encounter rate
+	db 20, GASTLY
+	db 21, GASTLY
+	db 22, GASTLY
+	db 23, GASTLY
+	db 19, GASTLY
+	db 18, GASTLY
+	db 25, HAUNTER
+	db 20, CUBONE
+	db 22, CUBONE
+	db 24, GASTLY
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm
index 440dbf8d..03c41eba 100755
--- a/data/wild/maps/PokemonTower5F.asm
+++ b/data/wild/maps/PokemonTower5F.asm
@@ -1,13 +1,14 @@
 TowerMons5:
-	db $0A
-	db 20,GASTLY
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 19,GASTLY
-	db 18,GASTLY
-	db 25,HAUNTER
-	db 20,CUBONE
-	db 22,CUBONE
-	db 24,GASTLY
-	db $00
+	db 10 ; grass encounter rate
+	db 20, GASTLY
+	db 21, GASTLY
+	db 22, GASTLY
+	db 23, GASTLY
+	db 19, GASTLY
+	db 18, GASTLY
+	db 25, HAUNTER
+	db 20, CUBONE
+	db 22, CUBONE
+	db 24, GASTLY
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm
index 553fdb5d..38898de1 100755
--- a/data/wild/maps/PokemonTower6F.asm
+++ b/data/wild/maps/PokemonTower6F.asm
@@ -1,13 +1,14 @@
 TowerMons6:
-	db $0F
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 24,GASTLY
-	db 20,GASTLY
-	db 19,GASTLY
-	db 26,HAUNTER
-	db 22,CUBONE
-	db 24,CUBONE
-	db 28,HAUNTER
-	db $00
+	db 15 ; grass encounter rate
+	db 21, GASTLY
+	db 22, GASTLY
+	db 23, GASTLY
+	db 24, GASTLY
+	db 20, GASTLY
+	db 19, GASTLY
+	db 26, HAUNTER
+	db 22, CUBONE
+	db 24, CUBONE
+	db 28, HAUNTER
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm
index 0f7e66e9..b2faa100 100755
--- a/data/wild/maps/PokemonTower7F.asm
+++ b/data/wild/maps/PokemonTower7F.asm
@@ -1,13 +1,14 @@
 TowerMons7:
-	db $0F
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 24,GASTLY
-	db 20,GASTLY
-	db 28,HAUNTER
-	db 22,CUBONE
-	db 24,CUBONE
-	db 28,HAUNTER
-	db 30,HAUNTER
-	db $00
+	db 15 ; grass encounter rate
+	db 21, GASTLY
+	db 22, GASTLY
+	db 23, GASTLY
+	db 24, GASTLY
+	db 20, GASTLY
+	db 28, HAUNTER
+	db 22, CUBONE
+	db 24, CUBONE
+	db 28, HAUNTER
+	db 30, HAUNTER
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm
index 35eece95..f70dfbcb 100755
--- a/data/wild/maps/PowerPlant.asm
+++ b/data/wild/maps/PowerPlant.asm
@@ -1,19 +1,20 @@
 PowerPlantMons:
-	db $0A
-	db 21,VOLTORB
-	db 21,MAGNEMITE
-	db 20,PIKACHU
-	db 24,PIKACHU
-	db 23,MAGNEMITE
-	db 23,VOLTORB
-	db 32,MAGNETON
-	db 35,MAGNETON
-	IF DEF(_RED)
-		db 33,ELECTABUZZ
-		db 36,ELECTABUZZ
-	ENDC
-	IF DEF(_BLUE)
-		db 33,RAICHU
-		db 36,RAICHU
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+	db 21, VOLTORB
+	db 21, MAGNEMITE
+	db 20, PIKACHU
+	db 24, PIKACHU
+	db 23, MAGNEMITE
+	db 23, VOLTORB
+	db 32, MAGNETON
+	db 35, MAGNETON
+IF DEF(_RED)
+	db 33, ELECTABUZZ
+	db 36, ELECTABUZZ
+ENDC
+IF DEF(_BLUE)
+	db 33, RAICHU
+	db 36, RAICHU
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm
index a36f2092..42a6d58b 100755
--- a/data/wild/maps/RockTunnel1F.asm
+++ b/data/wild/maps/RockTunnel1F.asm
@@ -1,13 +1,14 @@
 TunnelMonsB1:
-	db $0F
-	db 16,ZUBAT
-	db 17,ZUBAT
-	db 17,GEODUDE
-	db 15,MACHOP
-	db 16,GEODUDE
-	db 18,ZUBAT
-	db 15,ZUBAT
-	db 17,MACHOP
-	db 13,ONIX
-	db 15,ONIX
-	db $00
+	db 15 ; grass encounter rate
+	db 16, ZUBAT
+	db 17, ZUBAT
+	db 17, GEODUDE
+	db 15, MACHOP
+	db 16, GEODUDE
+	db 18, ZUBAT
+	db 15, ZUBAT
+	db 17, MACHOP
+	db 13, ONIX
+	db 15, ONIX
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm
index 2fc7ef94..2f970332 100755
--- a/data/wild/maps/RockTunnelB1F.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
@@ -1,13 +1,14 @@
 TunnelMonsB2:
-	db $0F
-	db 16,ZUBAT
-	db 17,ZUBAT
-	db 17,GEODUDE
-	db 15,MACHOP
-	db 16,GEODUDE
-	db 18,ZUBAT
-	db 17,MACHOP
-	db 17,ONIX
-	db 13,ONIX
-	db 18,GEODUDE
-	db $00
+	db 15 ; grass encounter rate
+	db 16, ZUBAT
+	db 17, ZUBAT
+	db 17, GEODUDE
+	db 15, MACHOP
+	db 16, GEODUDE
+	db 18, ZUBAT
+	db 17, MACHOP
+	db 17, ONIX
+	db 13, ONIX
+	db 18, GEODUDE
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm
index f618c34f..e75ded3b 100755
--- a/data/wild/maps/Route1.asm
+++ b/data/wild/maps/Route1.asm
@@ -1,13 +1,14 @@
 Route1Mons:
-	db $19
-	db 3,PIDGEY
-	db 3,RATTATA
-	db 3,RATTATA
-	db 2,RATTATA
-	db 2,PIDGEY
-	db 3,PIDGEY
-	db 3,PIDGEY
-	db 4,RATTATA
-	db 4,PIDGEY
-	db 5,PIDGEY
-	db $00
+	db 25 ; grass encounter rate
+	db  3, PIDGEY
+	db  3, RATTATA
+	db  3, RATTATA
+	db  2, RATTATA
+	db  2, PIDGEY
+	db  3, PIDGEY
+	db  3, PIDGEY
+	db  4, RATTATA
+	db  4, PIDGEY
+	db  5, PIDGEY
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm
index 34e0b5ee..603dc389 100755
--- a/data/wild/maps/Route10.asm
+++ b/data/wild/maps/Route10.asm
@@ -1,27 +1,25 @@
 Route10Mons:
-	db $0F
-	IF DEF(_RED)
-		db 16,VOLTORB
-		db 16,SPEAROW
-		db 14,VOLTORB
-		db 11,EKANS
-		db 13,SPEAROW
-		db 15,EKANS
-		db 17,VOLTORB
-		db 17,SPEAROW
-		db 13,EKANS
-		db 17,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 16,VOLTORB
-		db 16,SPEAROW
-		db 14,VOLTORB
-		db 11,SANDSHREW
-		db 13,SPEAROW
-		db 15,SANDSHREW
-		db 17,VOLTORB
-		db 17,SPEAROW
-		db 13,SANDSHREW
-		db 17,SANDSHREW
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+	db 16, VOLTORB
+	db 16, SPEAROW
+	db 14, VOLTORB
+IF DEF(_RED)
+	db 11, EKANS
+	db 13, SPEAROW
+	db 15, EKANS
+	db 17, VOLTORB
+	db 17, SPEAROW
+	db 13, EKANS
+	db 17, EKANS
+ENDC
+IF DEF(_BLUE)
+	db 11, SANDSHREW
+	db 13, SPEAROW
+	db 15, SANDSHREW
+	db 17, VOLTORB
+	db 17, SPEAROW
+	db 13, SANDSHREW
+	db 17, SANDSHREW
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm
index 9e4e3644..ea053c07 100755
--- a/data/wild/maps/Route11.asm
+++ b/data/wild/maps/Route11.asm
@@ -1,27 +1,25 @@
 Route11Mons:
-	db $0F
-	IF DEF(_RED)
-		db 14,EKANS
-		db 15,SPEAROW
-		db 12,EKANS
-		db 9,DROWZEE
-		db 13,SPEAROW
-		db 13,DROWZEE
-		db 15,EKANS
-		db 17,SPEAROW
-		db 11,DROWZEE
-		db 15,DROWZEE
-	ENDC
-	IF DEF(_BLUE)
-		db 14,SANDSHREW
-		db 15,SPEAROW
-		db 12,SANDSHREW
-		db 9,DROWZEE
-		db 13,SPEAROW
-		db 13,DROWZEE
-		db 15,SANDSHREW
-		db 17,SPEAROW
-		db 11,DROWZEE
-		db 15,DROWZEE
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db 14, EKANS
+	db 15, SPEAROW
+	db 12, EKANS
+	db  9, DROWZEE
+	db 13, SPEAROW
+	db 13, DROWZEE
+	db 15, EKANS
+ENDC
+IF DEF(_BLUE)
+	db 14, SANDSHREW
+	db 15, SPEAROW
+	db 12, SANDSHREW
+	db  9, DROWZEE
+	db 13, SPEAROW
+	db 13, DROWZEE
+	db 15, SANDSHREW
+ENDC
+	db 17, SPEAROW
+	db 11, DROWZEE
+	db 15, DROWZEE
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm
index 45dfbc9d..acdfe6b6 100755
--- a/data/wild/maps/Route12.asm
+++ b/data/wild/maps/Route12.asm
@@ -1,27 +1,28 @@
 Route12Mons:
-	db $0F
-	IF DEF(_RED)
-		db 24,ODDISH
-		db 25,PIDGEY
-		db 23,PIDGEY
-		db 24,VENONAT
-		db 22,ODDISH
-		db 26,VENONAT
-		db 26,ODDISH
-		db 27,PIDGEY
-		db 28,GLOOM
-		db 30,GLOOM
-	ENDC
-	IF DEF(_BLUE)
-		db 24,BELLSPROUT
-		db 25,PIDGEY
-		db 23,PIDGEY
-		db 24,VENONAT
-		db 22,BELLSPROUT
-		db 26,VENONAT
-		db 26,BELLSPROUT
-		db 27,PIDGEY
-		db 28,WEEPINBELL
-		db 30,WEEPINBELL
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db 24, ODDISH
+	db 25, PIDGEY
+	db 23, PIDGEY
+	db 24, VENONAT
+	db 22, ODDISH
+	db 26, VENONAT
+	db 26, ODDISH
+	db 27, PIDGEY
+	db 28, GLOOM
+	db 30, GLOOM
+ENDC
+IF DEF(_BLUE)
+	db 24, BELLSPROUT
+	db 25, PIDGEY
+	db 23, PIDGEY
+	db 24, VENONAT
+	db 22, BELLSPROUT
+	db 26, VENONAT
+	db 26, BELLSPROUT
+	db 27, PIDGEY
+	db 28, WEEPINBELL
+	db 30, WEEPINBELL
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm
index 2a1a6cb5..4d0c0a46 100755
--- a/data/wild/maps/Route13.asm
+++ b/data/wild/maps/Route13.asm
@@ -1,28 +1,28 @@
 Route13Mons:
-	IF DEF(_RED)
-		db $14
-		db 24,ODDISH
-		db 25,PIDGEY
-		db 27,PIDGEY
-		db 24,VENONAT
-		db 22,ODDISH
-		db 26,VENONAT
-		db 26,ODDISH
-		db 25,DITTO
-		db 28,GLOOM
-		db 30,GLOOM
-	ENDC
-	IF DEF(_BLUE)
-		db $14
-		db 24,BELLSPROUT
-		db 25,PIDGEY
-		db 27,PIDGEY
-		db 24,VENONAT
-		db 22,BELLSPROUT
-		db 26,VENONAT
-		db 26,BELLSPROUT
-		db 25,DITTO
-		db 28,WEEPINBELL
-		db 30,WEEPINBELL
-	ENDC
-	db $00
+	db 20 ; grass encounter rate
+IF DEF(_RED)
+	db 24, ODDISH
+	db 25, PIDGEY
+	db 27, PIDGEY
+	db 24, VENONAT
+	db 22, ODDISH
+	db 26, VENONAT
+	db 26, ODDISH
+	db 25, DITTO
+	db 28, GLOOM
+	db 30, GLOOM
+ENDC
+IF DEF(_BLUE)
+	db 24, BELLSPROUT
+	db 25, PIDGEY
+	db 27, PIDGEY
+	db 24, VENONAT
+	db 22, BELLSPROUT
+	db 26, VENONAT
+	db 26, BELLSPROUT
+	db 25, DITTO
+	db 28, WEEPINBELL
+	db 30, WEEPINBELL
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm
index aad5aa48..a91631a8 100755
--- a/data/wild/maps/Route14.asm
+++ b/data/wild/maps/Route14.asm
@@ -1,27 +1,26 @@
 Route14Mons:
-	db $0F
-	IF DEF(_RED)
-		db 24,ODDISH
-		db 26,PIDGEY
-		db 23,DITTO
-		db 24,VENONAT
-		db 22,ODDISH
-		db 26,VENONAT
-		db 26,ODDISH
-		db 30,GLOOM
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	IF DEF(_BLUE)
-		db 24,BELLSPROUT
-		db 26,PIDGEY
-		db 23,DITTO
-		db 24,VENONAT
-		db 22,BELLSPROUT
-		db 26,VENONAT
-		db 26,BELLSPROUT
-		db 30,WEEPINBELL
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db 24, ODDISH
+	db 26, PIDGEY
+	db 23, DITTO
+	db 24, VENONAT
+	db 22, ODDISH
+	db 26, VENONAT
+	db 26, ODDISH
+	db 30, GLOOM
+ENDC
+IF DEF(_BLUE)
+	db 24, BELLSPROUT
+	db 26, PIDGEY
+	db 23, DITTO
+	db 24, VENONAT
+	db 22, BELLSPROUT
+	db 26, VENONAT
+	db 26, BELLSPROUT
+	db 30, WEEPINBELL
+ENDC
+	db 28, PIDGEOTTO
+	db 30, PIDGEOTTO
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm
index b4762230..13bd7f32 100755
--- a/data/wild/maps/Route15.asm
+++ b/data/wild/maps/Route15.asm
@@ -1,27 +1,26 @@
 Route15Mons:
-	db $0F
-	IF DEF(_RED)
-		db 24,ODDISH
-		db 26,DITTO
-		db 23,PIDGEY
-		db 26,VENONAT
-		db 22,ODDISH
-		db 28,VENONAT
-		db 26,ODDISH
-		db 30,GLOOM
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	IF DEF(_BLUE)
-		db 24,BELLSPROUT
-		db 26,DITTO
-		db 23,PIDGEY
-		db 26,VENONAT
-		db 22,BELLSPROUT
-		db 28,VENONAT
-		db 26,BELLSPROUT
-		db 30,WEEPINBELL
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db 24, ODDISH
+	db 26, DITTO
+	db 23, PIDGEY
+	db 26, VENONAT
+	db 22, ODDISH
+	db 28, VENONAT
+	db 26, ODDISH
+	db 30, GLOOM
+ENDC
+IF DEF(_BLUE)
+	db 24, BELLSPROUT
+	db 26, DITTO
+	db 23, PIDGEY
+	db 26, VENONAT
+	db 22, BELLSPROUT
+	db 28, VENONAT
+	db 26, BELLSPROUT
+	db 30, WEEPINBELL
+ENDC
+	db 28, PIDGEOTTO
+	db 30, PIDGEOTTO
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm
index c2421c50..ecab87c1 100755
--- a/data/wild/maps/Route16.asm
+++ b/data/wild/maps/Route16.asm
@@ -1,13 +1,14 @@
 Route16Mons:
-	db $19
-	db 20,SPEAROW
-	db 22,SPEAROW
-	db 18,RATTATA
-	db 20,DODUO
-	db 20,RATTATA
-	db 18,DODUO
-	db 22,DODUO
-	db 22,RATTATA
-	db 23,RATICATE
-	db 25,RATICATE
-	db $00
+	db 25 ; grass encounter rate
+	db 20, SPEAROW
+	db 22, SPEAROW
+	db 18, RATTATA
+	db 20, DODUO
+	db 20, RATTATA
+	db 18, DODUO
+	db 22, DODUO
+	db 22, RATTATA
+	db 23, RATICATE
+	db 25, RATICATE
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm
index 8dffd9a3..762b5449 100755
--- a/data/wild/maps/Route17.asm
+++ b/data/wild/maps/Route17.asm
@@ -1,13 +1,14 @@
 Route17Mons:
-	db $19
-	db 20,SPEAROW
-	db 22,SPEAROW
-	db 25,RATICATE
-	db 24,DODUO
-	db 27,RATICATE
-	db 26,DODUO
-	db 28,DODUO
-	db 29,RATICATE
-	db 25,FEAROW
-	db 27,FEAROW
-	db $00
+	db 25 ; grass encounter rate
+	db 20, SPEAROW
+	db 22, SPEAROW
+	db 25, RATICATE
+	db 24, DODUO
+	db 27, RATICATE
+	db 26, DODUO
+	db 28, DODUO
+	db 29, RATICATE
+	db 25, FEAROW
+	db 27, FEAROW
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm
index 47bd247d..d8123c5e 100755
--- a/data/wild/maps/Route18.asm
+++ b/data/wild/maps/Route18.asm
@@ -1,13 +1,14 @@
 Route18Mons:
-	db $19
-	db 20,SPEAROW
-	db 22,SPEAROW
-	db 25,RATICATE
-	db 24,DODUO
-	db 25,FEAROW
-	db 26,DODUO
-	db 28,DODUO
-	db 29,RATICATE
-	db 27,FEAROW
-	db 29,FEAROW
-	db $00
+	db 25 ; grass encounter rate
+	db 20, SPEAROW
+	db 22, SPEAROW
+	db 25, RATICATE
+	db 24, DODUO
+	db 25, FEAROW
+	db 26, DODUO
+	db 28, DODUO
+	db 29, RATICATE
+	db 27, FEAROW
+	db 29, FEAROW
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm
index ad958ea5..035e5b28 100755
--- a/data/wild/maps/Route2.asm
+++ b/data/wild/maps/Route2.asm
@@ -1,24 +1,23 @@
 Route2Mons:
-	db $19
-	db 3,RATTATA
-	db 3,PIDGEY
-	db 4,PIDGEY
-	db 4,RATTATA
-	db 5,PIDGEY
-	IF DEF(_RED)
-		db 3,WEEDLE
-	ENDC
-	IF DEF(_BLUE)
-		db 3,CATERPIE
-	ENDC
-	db 2,RATTATA
-	db 5,RATTATA
-	IF DEF(_RED)
-		db 4,WEEDLE
-		db 5,WEEDLE
-	ENDC
-	IF DEF(_BLUE)
-		db 4,CATERPIE
-		db 5,CATERPIE
-	ENDC
-	db $00
+	db 25 ; grass encounter rate
+	db  3, RATTATA
+	db  3, PIDGEY
+	db  4, PIDGEY
+	db  4, RATTATA
+	db  5, PIDGEY
+IF DEF(_RED)
+	db  3, WEEDLE
+	db  2, RATTATA
+	db  5, RATTATA
+	db  4, WEEDLE
+	db  5, WEEDLE
+ENDC
+IF DEF(_BLUE)
+	db  3, CATERPIE
+	db  2, RATTATA
+	db  5, RATTATA
+	db  4, CATERPIE
+	db  5, CATERPIE
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm
index 3cc73ba0..13ffe445 100755
--- a/data/wild/maps/Route21.asm
+++ b/data/wild/maps/Route21.asm
@@ -1,23 +1,24 @@
 Route21Mons:
-	db $19
-	db 21,RATTATA
-	db 23,PIDGEY
-	db 30,RATICATE
-	db 23,RATTATA
-	db 21,PIDGEY
-	db 30,PIDGEOTTO
-	db 32,PIDGEOTTO
-	db 28,TANGELA
-	db 30,TANGELA
-	db 32,TANGELA
-	db $05
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACOOL
-	db 40,TENTACOOL
+	db 25 ; grass encounter rate
+	db 21, RATTATA
+	db 23, PIDGEY
+	db 30, RATICATE
+	db 23, RATTATA
+	db 21, PIDGEY
+	db 30, PIDGEOTTO
+	db 32, PIDGEOTTO
+	db 28, TANGELA
+	db 30, TANGELA
+	db 32, TANGELA
+
+	db 5 ; water encounter rate
+	db  5, TENTACOOL
+	db 10, TENTACOOL
+	db 15, TENTACOOL
+	db  5, TENTACOOL
+	db 10, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACOOL
+	db 40, TENTACOOL
diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm
index 750a2f4e..c8f72608 100755
--- a/data/wild/maps/Route22.asm
+++ b/data/wild/maps/Route22.asm
@@ -1,27 +1,27 @@
 Route22Mons:
-	db $19
-	IF DEF(_RED)
-		db 3,RATTATA
-		db 3,NIDORAN_M
-		db 4,RATTATA
-		db 4,NIDORAN_M
-		db 2,RATTATA
-		db 2,NIDORAN_M
-		db 3,SPEAROW
-		db 5,SPEAROW
-		db 3,NIDORAN_F
-		db 4,NIDORAN_F
-	ENDC
-	IF DEF(_BLUE)
-		db 3,RATTATA
-		db 3,NIDORAN_F
-		db 4,RATTATA
-		db 4,NIDORAN_F
-		db 2,RATTATA
-		db 2,NIDORAN_F
-		db 3,SPEAROW
-		db 5,SPEAROW
-		db 3,NIDORAN_M
-		db 4,NIDORAN_M
-	ENDC
-	db $00
+	db 25 ; grass encounter rate
+	db  3, RATTATA
+IF DEF(_RED)
+	db  3, NIDORAN_M
+	db  4, RATTATA
+	db  4, NIDORAN_M
+	db  2, RATTATA
+	db  2, NIDORAN_M
+	db  3, SPEAROW
+	db  5, SPEAROW
+	db  3, NIDORAN_F
+	db  4, NIDORAN_F
+ENDC
+IF DEF(_BLUE)
+	db  3, NIDORAN_F
+	db  4, RATTATA
+	db  4, NIDORAN_F
+	db  2, RATTATA
+	db  2, NIDORAN_F
+	db  3, SPEAROW
+	db  5, SPEAROW
+	db  3, NIDORAN_M
+	db  4, NIDORAN_M
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm
index a057d24d..77f019a3 100755
--- a/data/wild/maps/Route23.asm
+++ b/data/wild/maps/Route23.asm
@@ -1,23 +1,24 @@
 Route23Mons:
-	db $0A
-	IF DEF(_RED)
-		db 26,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 26,SANDSHREW
-	ENDC
-	db 33,DITTO
-	db 26,SPEAROW
-	db 38,FEAROW
-	db 38,DITTO
-	db 38,FEAROW
-	IF DEF(_RED)
-		db 41,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 41,SANDSLASH
-	ENDC
-	db 43,DITTO
-	db 41,FEAROW
-	db 43,FEAROW
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 26, EKANS
+ENDC
+IF DEF(_BLUE)
+	db 26, SANDSHREW
+ENDC
+	db 33, DITTO
+	db 26, SPEAROW
+	db 38, FEAROW
+	db 38, DITTO
+	db 38, FEAROW
+IF DEF(_RED)
+	db 41, ARBOK
+ENDC
+IF DEF(_BLUE)
+	db 41, SANDSLASH
+ENDC
+	db 43, DITTO
+	db 41, FEAROW
+	db 43, FEAROW
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm
index 3a745f36..8ba7d232 100755
--- a/data/wild/maps/Route24.asm
+++ b/data/wild/maps/Route24.asm
@@ -1,27 +1,25 @@
 Route24Mons:
-	db $19
-	IF DEF(_RED)
-		db 7,WEEDLE
-		db 8,KAKUNA
-		db 12,PIDGEY
-		db 12,ODDISH
-		db 13,ODDISH
-		db 10,ABRA
-		db 14,ODDISH
-		db 13,PIDGEY
-		db 8,ABRA
-		db 12,ABRA
-	ENDC
-	IF DEF(_BLUE)
-		db 7,CATERPIE
-		db 8,METAPOD
-		db 12,PIDGEY
-		db 12,BELLSPROUT
-		db 13,BELLSPROUT
-		db 10,ABRA
-		db 14,BELLSPROUT
-		db 13,PIDGEY
-		db 8,ABRA
-		db 12,ABRA
-	ENDC
-	db $00
+	db 25 ; grass encounter rate
+IF DEF(_RED)
+	db  7, WEEDLE
+	db  8, KAKUNA
+	db 12, PIDGEY
+	db 12, ODDISH
+	db 13, ODDISH
+	db 10, ABRA
+	db 14, ODDISH
+ENDC
+IF DEF(_BLUE)
+	db  7, CATERPIE
+	db  8, METAPOD
+	db 12, PIDGEY
+	db 12, BELLSPROUT
+	db 13, BELLSPROUT
+	db 10, ABRA
+	db 14, BELLSPROUT
+ENDC
+	db 13, PIDGEY
+	db  8, ABRA
+	db 12, ABRA
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm
index 4884fa64..7e0ded65 100755
--- a/data/wild/maps/Route25.asm
+++ b/data/wild/maps/Route25.asm
@@ -1,27 +1,28 @@
 Route25Mons:
-	db $0F
-	IF DEF(_RED)
-		db 8,WEEDLE
-		db 9,KAKUNA
-		db 13,PIDGEY
-		db 12,ODDISH
-		db 13,ODDISH
-		db 12,ABRA
-		db 14,ODDISH
-		db 10,ABRA
-		db 7,METAPOD
-		db 8,CATERPIE
-	ENDC
-	IF DEF(_BLUE)
-		db 8,CATERPIE
-		db 9,METAPOD
-		db 13,PIDGEY
-		db 12,BELLSPROUT
-		db 13,BELLSPROUT
-		db 12,ABRA
-		db 14,BELLSPROUT
-		db 10,ABRA
-		db 7,KAKUNA
-		db 8,WEEDLE
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db  8, WEEDLE
+	db  9, KAKUNA
+	db 13, PIDGEY
+	db 12, ODDISH
+	db 13, ODDISH
+	db 12, ABRA
+	db 14, ODDISH
+	db 10, ABRA
+	db  7, METAPOD
+	db  8, CATERPIE
+ENDC
+IF DEF(_BLUE)
+	db  8, CATERPIE
+	db  9, METAPOD
+	db 13, PIDGEY
+	db 12, BELLSPROUT
+	db 13, BELLSPROUT
+	db 12, ABRA
+	db 14, BELLSPROUT
+	db 10, ABRA
+	db  7, KAKUNA
+	db  8, WEEDLE
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm
index dea820a4..b397b1d1 100755
--- a/data/wild/maps/Route3.asm
+++ b/data/wild/maps/Route3.asm
@@ -1,13 +1,14 @@
 Route3Mons:
-	db $14
-	db 6,PIDGEY
-	db 5,SPEAROW
-	db 7,PIDGEY
-	db 6,SPEAROW
-	db 7,SPEAROW
-	db 8,PIDGEY
-	db 8,SPEAROW
-	db 3,JIGGLYPUFF
-	db 5,JIGGLYPUFF
-	db 7,JIGGLYPUFF
-	db $00
+	db 20 ; grass encounter rate
+	db  6, PIDGEY
+	db  5, SPEAROW
+	db  7, PIDGEY
+	db  6, SPEAROW
+	db  7, SPEAROW
+	db  8, PIDGEY
+	db  8, SPEAROW
+	db  3, JIGGLYPUFF
+	db  5, JIGGLYPUFF
+	db  7, JIGGLYPUFF
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm
index 624d58de..d4f4763b 100755
--- a/data/wild/maps/Route4.asm
+++ b/data/wild/maps/Route4.asm
@@ -1,27 +1,24 @@
 Route4Mons:
-	db $14
-	IF DEF(_RED)
-		db 10,RATTATA
-		db 10,SPEAROW
-		db 8,RATTATA
-		db 6,EKANS
-		db 8,SPEAROW
-		db 10,EKANS
-		db 12,RATTATA
-		db 12,SPEAROW
-		db 8,EKANS
-		db 12,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 10,RATTATA
-		db 10,SPEAROW
-		db 8,RATTATA
-		db 6,SANDSHREW
-		db 8,SPEAROW
-		db 10,SANDSHREW
-		db 12,RATTATA
-		db 12,SPEAROW
-		db 8,SANDSHREW
-		db 12,SANDSHREW
-	ENDC
-	db $00
+	db 20 ; grass encounter rate
+	db 10, RATTATA
+	db 10, SPEAROW
+	db  8, RATTATA
+IF DEF(_RED)
+	db  6, EKANS
+	db  8, SPEAROW
+	db 10, EKANS
+	db 12, RATTATA
+	db 12, SPEAROW
+	db  8, EKANS
+	db 12, EKANS
+ENDC
+IF DEF(_BLUE)
+	db  6, SANDSHREW
+	db  8, SPEAROW
+	db 10, SANDSHREW
+	db 12, RATTATA
+	db 12, SPEAROW
+	db  8, SANDSHREW
+	db 12, SANDSHREW
+ENDC
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm
index cb8c583b..dd200378 100755
--- a/data/wild/maps/Route5.asm
+++ b/data/wild/maps/Route5.asm
@@ -1,27 +1,28 @@
 Route5Mons:
-	db $0F
-	IF DEF(_RED)
-		db 13,ODDISH
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MANKEY
-		db 12,MANKEY
-		db 15,ODDISH
-		db 16,ODDISH
-		db 16,PIDGEY
-		db 14,MANKEY
-		db 16,MANKEY
-	ENDC
-	IF DEF(_BLUE)
-		db 13,BELLSPROUT
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MEOWTH
-		db 12,MEOWTH
-		db 15,BELLSPROUT
-		db 16,BELLSPROUT
-		db 16,PIDGEY
-		db 14,MEOWTH
-		db 16,MEOWTH
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db 13, ODDISH
+	db 13, PIDGEY
+	db 15, PIDGEY
+	db 10, MANKEY
+	db 12, MANKEY
+	db 15, ODDISH
+	db 16, ODDISH
+	db 16, PIDGEY
+	db 14, MANKEY
+	db 16, MANKEY
+ENDC
+IF DEF(_BLUE)
+	db 13, BELLSPROUT
+	db 13, PIDGEY
+	db 15, PIDGEY
+	db 10, MEOWTH
+	db 12, MEOWTH
+	db 15, BELLSPROUT
+	db 16, BELLSPROUT
+	db 16, PIDGEY
+	db 14, MEOWTH
+	db 16, MEOWTH
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm
index 92512ffb..15585ea4 100755
--- a/data/wild/maps/Route6.asm
+++ b/data/wild/maps/Route6.asm
@@ -1,27 +1,28 @@
 Route6Mons:
-	db $0F
-	IF DEF(_RED)
-		db 13,ODDISH
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MANKEY
-		db 12,MANKEY
-		db 15,ODDISH
-		db 16,ODDISH
-		db 16,PIDGEY
-		db 14,MANKEY
-		db 16,MANKEY
-	ENDC
-	IF DEF(_BLUE)
-		db 13,BELLSPROUT
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MEOWTH
-		db 12,MEOWTH
-		db 15,BELLSPROUT
-		db 16,BELLSPROUT
-		db 16,PIDGEY
-		db 14,MEOWTH
-		db 16,MEOWTH
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+IF DEF(_RED)
+	db 13, ODDISH
+	db 13, PIDGEY
+	db 15, PIDGEY
+	db 10, MANKEY
+	db 12, MANKEY
+	db 15, ODDISH
+	db 16, ODDISH
+	db 16, PIDGEY
+	db 14, MANKEY
+	db 16, MANKEY
+ENDC
+IF DEF(_BLUE)
+	db 13, BELLSPROUT
+	db 13, PIDGEY
+	db 15, PIDGEY
+	db 10, MEOWTH
+	db 12, MEOWTH
+	db 15, BELLSPROUT
+	db 16, BELLSPROUT
+	db 16, PIDGEY
+	db 14, MEOWTH
+	db 16, MEOWTH
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm
index 559c98ee..39508bf0 100755
--- a/data/wild/maps/Route7.asm
+++ b/data/wild/maps/Route7.asm
@@ -1,27 +1,27 @@
 Route7Mons:
-	db $0F
-	IF DEF(_RED)
-		db 19,PIDGEY
-		db 19,ODDISH
-		db 17,MANKEY
-		db 22,ODDISH
-		db 22,PIDGEY
-		db 18,MANKEY
-		db 18,GROWLITHE
-		db 20,GROWLITHE
-		db 19,MANKEY
-		db 20,MANKEY
-	ENDC
-	IF DEF(_BLUE)
-		db 19,PIDGEY
-		db 19,BELLSPROUT
-		db 17,MEOWTH
-		db 22,BELLSPROUT
-		db 22,PIDGEY
-		db 18,MEOWTH
-		db 18,VULPIX
-		db 20,VULPIX
-		db 19,MEOWTH
-		db 20,MEOWTH
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+	db 19, PIDGEY
+IF DEF(_RED)
+	db 19, ODDISH
+	db 17, MANKEY
+	db 22, ODDISH
+	db 22, PIDGEY
+	db 18, MANKEY
+	db 18, GROWLITHE
+	db 20, GROWLITHE
+	db 19, MANKEY
+	db 20, MANKEY
+ENDC
+IF DEF(_BLUE)
+	db 19, BELLSPROUT
+	db 17, MEOWTH
+	db 22, BELLSPROUT
+	db 22, PIDGEY
+	db 18, MEOWTH
+	db 18, VULPIX
+	db 20, VULPIX
+	db 19, MEOWTH
+	db 20, MEOWTH
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm
index 8a0bfa31..005ee677 100755
--- a/data/wild/maps/Route8.asm
+++ b/data/wild/maps/Route8.asm
@@ -1,27 +1,27 @@
 Route8Mons:
-	db $0F
-	IF DEF(_RED)
-		db 18,PIDGEY
-		db 18,MANKEY
-		db 17,EKANS
-		db 16,GROWLITHE
-		db 20,PIDGEY
-		db 20,MANKEY
-		db 19,EKANS
-		db 17,GROWLITHE
-		db 15,GROWLITHE
-		db 18,GROWLITHE
-	ENDC
-	IF DEF(_BLUE)
-		db 18,PIDGEY
-		db 18,MEOWTH
-		db 17,SANDSHREW
-		db 16,VULPIX
-		db 20,PIDGEY
-		db 20,MEOWTH
-		db 19,SANDSHREW
-		db 17,VULPIX
-		db 15,VULPIX
-		db 18,VULPIX
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+	db 18, PIDGEY
+IF DEF(_RED)
+	db 18, MANKEY
+	db 17, EKANS
+	db 16, GROWLITHE
+	db 20, PIDGEY
+	db 20, MANKEY
+	db 19, EKANS
+	db 17, GROWLITHE
+	db 15, GROWLITHE
+	db 18, GROWLITHE
+ENDC
+IF DEF(_BLUE)
+	db 18, MEOWTH
+	db 17, SANDSHREW
+	db 16, VULPIX
+	db 20, PIDGEY
+	db 20, MEOWTH
+	db 19, SANDSHREW
+	db 17, VULPIX
+	db 15, VULPIX
+	db 18, VULPIX
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm
index 716589b0..a38fc35f 100755
--- a/data/wild/maps/Route9.asm
+++ b/data/wild/maps/Route9.asm
@@ -1,27 +1,25 @@
 Route9Mons:
-	db $0F
-	IF DEF(_RED)
-		db 16,RATTATA
-		db 16,SPEAROW
-		db 14,RATTATA
-		db 11,EKANS
-		db 13,SPEAROW
-		db 15,EKANS
-		db 17,RATTATA
-		db 17,SPEAROW
-		db 13,EKANS
-		db 17,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 16,RATTATA
-		db 16,SPEAROW
-		db 14,RATTATA
-		db 11,SANDSHREW
-		db 13,SPEAROW
-		db 15,SANDSHREW
-		db 17,RATTATA
-		db 17,SPEAROW
-		db 13,SANDSHREW
-		db 17,SANDSHREW
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+	db 16, RATTATA
+	db 16, SPEAROW
+	db 14, RATTATA
+IF DEF(_RED)
+	db 11, EKANS
+	db 13, SPEAROW
+	db 15, EKANS
+	db 17, RATTATA
+	db 17, SPEAROW
+	db 13, EKANS
+	db 17, EKANS
+ENDC
+IF DEF(_BLUE)
+	db 11, SANDSHREW
+	db 13, SPEAROW
+	db 15, SANDSHREW
+	db 17, RATTATA
+	db 17, SPEAROW
+	db 13, SANDSHREW
+	db 17, SANDSHREW
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm
index 0cd5323a..4661b927 100755
--- a/data/wild/maps/SafariZoneCenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
@@ -1,27 +1,27 @@
 ZoneMonsCenter:
-	db $1E
-	IF DEF(_RED)
-		db 22,NIDORAN_M
-		db 25,RHYHORN
-		db 22,VENONAT
-		db 24,EXEGGCUTE
-		db 31,NIDORINO
-		db 25,EXEGGCUTE
-		db 31,NIDORINA
-		db 30,PARASECT
-		db 23,SCYTHER
-		db 23,CHANSEY
-	ENDC
-	IF DEF(_BLUE)
-		db 22,NIDORAN_F
-		db 25,RHYHORN
-		db 22,VENONAT
-		db 24,EXEGGCUTE
-		db 31,NIDORINA
-		db 25,EXEGGCUTE
-		db 31,NIDORINO
-		db 30,PARASECT
-		db 23,PINSIR
-		db 23,CHANSEY
-	ENDC
-	db $00
+	db 30 ; grass encounter rate
+IF DEF(_RED)
+	db 22, NIDORAN_M
+	db 25, RHYHORN
+	db 22, VENONAT
+	db 24, EXEGGCUTE
+	db 31, NIDORINO
+	db 25, EXEGGCUTE
+	db 31, NIDORINA
+	db 30, PARASECT
+	db 23, SCYTHER
+ENDC
+IF DEF(_BLUE)
+	db 22, NIDORAN_F
+	db 25, RHYHORN
+	db 22, VENONAT
+	db 24, EXEGGCUTE
+	db 31, NIDORINA
+	db 25, EXEGGCUTE
+	db 31, NIDORINO
+	db 30, PARASECT
+	db 23, PINSIR
+ENDC
+	db 23, CHANSEY
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm
index 3d77b6fe..9910bf12 100755
--- a/data/wild/maps/SafariZoneEast.asm
+++ b/data/wild/maps/SafariZoneEast.asm
@@ -1,27 +1,28 @@
 ZoneMons1:
-	db $1E
-	IF DEF(_RED)
-		db 24,NIDORAN_M
-		db 26,DODUO
-		db 22,PARAS
-		db 25,EXEGGCUTE
-		db 33,NIDORINO
-		db 23,EXEGGCUTE
-		db 24,NIDORAN_F
-		db 25,PARASECT
-		db 25,KANGASKHAN
-		db 28,SCYTHER
-	ENDC
-	IF DEF(_BLUE)
-		db 24,NIDORAN_F
-		db 26,DODUO
-		db 22,PARAS
-		db 25,EXEGGCUTE
-		db 33,NIDORINA
-		db 23,EXEGGCUTE
-		db 24,NIDORAN_M
-		db 25,PARASECT
-		db 25,KANGASKHAN
-		db 28,PINSIR
-	ENDC
-	db $00
+	db 30 ; grass encounter rate
+IF DEF(_RED)
+	db 24, NIDORAN_M
+	db 26, DODUO
+	db 22, PARAS
+	db 25, EXEGGCUTE
+	db 33, NIDORINO
+	db 23, EXEGGCUTE
+	db 24, NIDORAN_F
+	db 25, PARASECT
+	db 25, KANGASKHAN
+	db 28, SCYTHER
+ENDC
+IF DEF(_BLUE)
+	db 24, NIDORAN_F
+	db 26, DODUO
+	db 22, PARAS
+	db 25, EXEGGCUTE
+	db 33, NIDORINA
+	db 23, EXEGGCUTE
+	db 24, NIDORAN_M
+	db 25, PARASECT
+	db 25, KANGASKHAN
+	db 28, PINSIR
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm
index c1b6a547..4482571b 100755
--- a/data/wild/maps/SafariZoneNorth.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
@@ -1,28 +1,25 @@
 ZoneMons2:
-	db $1E
-	IF DEF(_RED)
-		db 22,NIDORAN_M
-	ENDC
-	IF DEF(_BLUE)
-		db 22,NIDORAN_F
-	ENDC
-	db 26,RHYHORN
-	db 23,PARAS
-	db 25,EXEGGCUTE
-	IF DEF(_RED)
-		db 30,NIDORINO
-	ENDC
-	IF DEF(_BLUE)
-		db 30,NIDORINA
-	ENDC
-	db 27,EXEGGCUTE
-	IF DEF(_RED)
-		db 30,NIDORINA
-	ENDC
-	IF DEF(_BLUE)
-		db 30,NIDORINO
-	ENDC
-	db 32,VENOMOTH
-	db 26,CHANSEY
-	db 28,TAUROS
-	db $00
+	db 30 ; grass encounter rate
+IF DEF(_RED)
+	db 22, NIDORAN_M
+	db 26, RHYHORN
+	db 23, PARAS
+	db 25, EXEGGCUTE
+	db 30, NIDORINO
+	db 27, EXEGGCUTE
+	db 30, NIDORINA
+ENDC
+IF DEF(_BLUE)
+	db 22, NIDORAN_F
+	db 26, RHYHORN
+	db 23, PARAS
+	db 25, EXEGGCUTE
+	db 30, NIDORINA
+	db 27, EXEGGCUTE
+	db 30, NIDORINO
+ENDC
+	db 32, VENOMOTH
+	db 26, CHANSEY
+	db 28, TAUROS
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm
index 47b6a102..c9989cc9 100755
--- a/data/wild/maps/SafariZoneWest.asm
+++ b/data/wild/maps/SafariZoneWest.asm
@@ -1,27 +1,25 @@
 ZoneMons3:
-	db $1E
-	IF DEF(_RED)
-		db 25,NIDORAN_M
-		db 26,DODUO
-		db 23,VENONAT
-		db 24,EXEGGCUTE
-		db 33,NIDORINO
-		db 26,EXEGGCUTE
-		db 25,NIDORAN_F
-		db 31,VENOMOTH
-		db 26,TAUROS
-		db 28,KANGASKHAN
-	ENDC
-	IF DEF(_BLUE)
-		db 25,NIDORAN_F
-		db 26,DODUO
-		db 23,VENONAT
-		db 24,EXEGGCUTE
-		db 33,NIDORINA
-		db 26,EXEGGCUTE
-		db 25,NIDORAN_M
-		db 31,VENOMOTH
-		db 26,TAUROS
-		db 28,KANGASKHAN
-	ENDC
-	db $00
+	db 30 ; grass encounter rate
+IF DEF(_RED)
+	db 25, NIDORAN_M
+	db 26, DODUO
+	db 23, VENONAT
+	db 24, EXEGGCUTE
+	db 33, NIDORINO
+	db 26, EXEGGCUTE
+	db 25, NIDORAN_F
+ENDC
+IF DEF(_BLUE)
+	db 25, NIDORAN_F
+	db 26, DODUO
+	db 23, VENONAT
+	db 24, EXEGGCUTE
+	db 33, NIDORINA
+	db 26, EXEGGCUTE
+	db 25, NIDORAN_M
+ENDC
+	db 31, VENOMOTH
+	db 26, TAUROS
+	db 28, KANGASKHAN
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm
index 07c6a187..d3232627 100755
--- a/data/wild/maps/SeaRoutes.asm
+++ b/data/wild/maps/SeaRoutes.asm
@@ -1,13 +1,14 @@
 WaterMons:
-	db $00
-	db $05
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACOOL
-	db 40,TENTACOOL
+	db 0 ; water encounter rate
+
+	db 5 ; grass encounter rate
+	db  5, TENTACOOL
+	db 10, TENTACOOL
+	db 15, TENTACOOL
+	db  5, TENTACOOL
+	db 10, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACOOL
+	db 40, TENTACOOL
diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm
index 3c431f9a..b191de13 100755
--- a/data/wild/maps/SeafoamIslands1F.asm
+++ b/data/wild/maps/SeafoamIslands1F.asm
@@ -1,27 +1,27 @@
 IslandMons1:
-	db $0F
-	IF DEF(_RED)
-		db 30,SEEL
-		db 30,SLOWPOKE
-		db 30,SHELLDER
-		db 30,HORSEA
-		db 28,HORSEA
-		db 21,ZUBAT
-		db 29,GOLBAT
-		db 28,PSYDUCK
-		db 28,SHELLDER
-		db 38,GOLDUCK
-	ENDC
-	IF DEF(_BLUE)
-		db 30,SEEL
-		db 30,PSYDUCK
-		db 30,STARYU
-		db 30,KRABBY
-		db 28,KRABBY
-		db 21,ZUBAT
-		db 29,GOLBAT
-		db 28,SLOWPOKE
-		db 28,STARYU
-		db 38,SLOWBRO
-	ENDC
-	db $00
+	db 15 ; grass encounter rate
+	db 30, SEEL
+IF DEF(_RED)
+	db 30, SLOWPOKE
+	db 30, SHELLDER
+	db 30, HORSEA
+	db 28, HORSEA
+	db 21, ZUBAT
+	db 29, GOLBAT
+	db 28, PSYDUCK
+	db 28, SHELLDER
+	db 38, GOLDUCK
+ENDC
+IF DEF(_BLUE)
+	db 30, PSYDUCK
+	db 30, STARYU
+	db 30, KRABBY
+	db 28, KRABBY
+	db 21, ZUBAT
+	db 29, GOLBAT
+	db 28, SLOWPOKE
+	db 28, STARYU
+	db 38, SLOWBRO
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm
index 6f96f240..79762821 100755
--- a/data/wild/maps/SeafoamIslandsB1F.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
@@ -1,27 +1,28 @@
 IslandMonsB1:
-	db $0A
-	IF DEF(_RED)
-		db 30,STARYU
-		db 30,HORSEA
-		db 32,SHELLDER
-		db 32,HORSEA
-		db 28,SLOWPOKE
-		db 30,SEEL
-		db 30,SLOWPOKE
-		db 28,SEEL
-		db 38,DEWGONG
-		db 37,SEADRA
-	ENDC
-	IF DEF(_BLUE)
-		db 30,SHELLDER
-		db 30,KRABBY
-		db 32,STARYU
-		db 32,KRABBY
-		db 28,PSYDUCK
-		db 30,SEEL
-		db 30,PSYDUCK
-		db 28,SEEL
-		db 38,DEWGONG
-		db 37,KINGLER
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 30, STARYU
+	db 30, HORSEA
+	db 32, SHELLDER
+	db 32, HORSEA
+	db 28, SLOWPOKE
+	db 30, SEEL
+	db 30, SLOWPOKE
+	db 28, SEEL
+	db 38, DEWGONG
+	db 37, SEADRA
+ENDC
+IF DEF(_BLUE)
+	db 30, SHELLDER
+	db 30, KRABBY
+	db 32, STARYU
+	db 32, KRABBY
+	db 28, PSYDUCK
+	db 30, SEEL
+	db 30, PSYDUCK
+	db 28, SEEL
+	db 38, DEWGONG
+	db 37, KINGLER
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm
index 7191fea9..e68d71cc 100755
--- a/data/wild/maps/SeafoamIslandsB2F.asm
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
@@ -1,27 +1,27 @@
 IslandMonsB2:
-	db $0A
-	IF DEF(_RED)
-		db 30,SEEL
-		db 30,SLOWPOKE
-		db 32,SEEL
-		db 32,SLOWPOKE
-		db 28,HORSEA
-		db 30,STARYU
-		db 30,HORSEA
-		db 28,SHELLDER
-		db 30,GOLBAT
-		db 37,SLOWBRO
-	ENDC
-	IF DEF(_BLUE)
-		db 30,SEEL
-		db 30,PSYDUCK
-		db 32,SEEL
-		db 32,PSYDUCK
-		db 28,KRABBY
-		db 30,SHELLDER
-		db 30,KRABBY
-		db 28,STARYU
-		db 30,GOLBAT
-		db 37,GOLDUCK
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+	db 30, SEEL
+IF DEF(_RED)
+	db 30, SLOWPOKE
+	db 32, SEEL
+	db 32, SLOWPOKE
+	db 28, HORSEA
+	db 30, STARYU
+	db 30, HORSEA
+	db 28, SHELLDER
+	db 30, GOLBAT
+	db 37, SLOWBRO
+ENDC
+IF DEF(_BLUE)
+	db 30, PSYDUCK
+	db 32, SEEL
+	db 32, PSYDUCK
+	db 28, KRABBY
+	db 30, SHELLDER
+	db 30, KRABBY
+	db 28, STARYU
+	db 30, GOLBAT
+	db 37, GOLDUCK
+ENDC
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm
index 9778c0e9..35319df9 100755
--- a/data/wild/maps/SeafoamIslandsB3F.asm
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
@@ -1,27 +1,27 @@
 IslandMonsB3:
-	db $0A
-	IF DEF(_RED)
-		db 31,SLOWPOKE
-		db 31,SEEL
-		db 33,SLOWPOKE
-		db 33,SEEL
-		db 29,HORSEA
-		db 31,SHELLDER
-		db 31,HORSEA
-		db 29,SHELLDER
-		db 39,SEADRA
-		db 37,DEWGONG
-	ENDC
-	IF DEF(_BLUE)
-		db 31,PSYDUCK
-		db 31,SEEL
-		db 33,PSYDUCK
-		db 33,SEEL
-		db 29,KRABBY
-		db 31,STARYU
-		db 31,KRABBY
-		db 29,STARYU
-		db 39,KINGLER
-		db 37,DEWGONG
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 31, SLOWPOKE
+	db 31, SEEL
+	db 33, SLOWPOKE
+	db 33, SEEL
+	db 29, HORSEA
+	db 31, SHELLDER
+	db 31, HORSEA
+	db 29, SHELLDER
+	db 39, SEADRA
+ENDC
+IF DEF(_BLUE)
+	db 31, PSYDUCK
+	db 31, SEEL
+	db 33, PSYDUCK
+	db 33, SEEL
+	db 29, KRABBY
+	db 31, STARYU
+	db 31, KRABBY
+	db 29, STARYU
+	db 39, KINGLER
+ENDC
+	db 37, DEWGONG
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm
index 3948470b..c5e3766b 100755
--- a/data/wild/maps/SeafoamIslandsB4F.asm
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
@@ -1,27 +1,27 @@
 IslandMonsB4:
-	db $0A
-	IF DEF(_RED)
-		db 31,HORSEA
-		db 31,SHELLDER
-		db 33,HORSEA
-		db 33,SHELLDER
-		db 29,SLOWPOKE
-		db 31,SEEL
-		db 31,SLOWPOKE
-		db 29,SEEL
-		db 39,SLOWBRO
-		db 32,GOLBAT
-	ENDC
-	IF DEF(_BLUE)
-		db 31,KRABBY
-		db 31,STARYU
-		db 33,KRABBY
-		db 33,STARYU
-		db 29,PSYDUCK
-		db 31,SEEL
-		db 31,PSYDUCK
-		db 29,SEEL
-		db 39,GOLDUCK
-		db 32,GOLBAT
-	ENDC
-	db $00
+	db 10 ; grass encounter rate
+IF DEF(_RED)
+	db 31, HORSEA
+	db 31, SHELLDER
+	db 33, HORSEA
+	db 33, SHELLDER
+	db 29, SLOWPOKE
+	db 31, SEEL
+	db 31, SLOWPOKE
+	db 29, SEEL
+	db 39, SLOWBRO
+ENDC
+IF DEF(_BLUE)
+	db 31, KRABBY
+	db 31, STARYU
+	db 33, KRABBY
+	db 33, STARYU
+	db 29, PSYDUCK
+	db 31, SEEL
+	db 31, PSYDUCK
+	db 29, SEEL
+	db 39, GOLDUCK
+ENDC
+	db 32, GOLBAT
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm
index 60aae31a..71adde2e 100755
--- a/data/wild/maps/VictoryRoad1F.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
@@ -1,13 +1,14 @@
 PlateauMons1:
-	db $0F
-	db 24,MACHOP
-	db 26,GEODUDE
-	db 22,ZUBAT
-	db 36,ONIX
-	db 39,ONIX
-	db 42,ONIX
-	db 41,GRAVELER
-	db 41,GOLBAT
-	db 42,MACHOKE
-	db 43,MAROWAK
-	db $00
+	db 15 ; grass encounter rate
+	db 24, MACHOP
+	db 26, GEODUDE
+	db 22, ZUBAT
+	db 36, ONIX
+	db 39, ONIX
+	db 42, ONIX
+	db 41, GRAVELER
+	db 41, GOLBAT
+	db 42, MACHOKE
+	db 43, MAROWAK
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm
index 580d644d..ee660e3a 100755
--- a/data/wild/maps/VictoryRoad2F.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
@@ -1,13 +1,14 @@
 PlateauMons2:
-	db $0A
-	db 22,MACHOP
-	db 24,GEODUDE
-	db 26,ZUBAT
-	db 36,ONIX
-	db 39,ONIX
-	db 42,ONIX
-	db 41,MACHOKE
-	db 40,GOLBAT
-	db 40,MAROWAK
-	db 43,GRAVELER
-	db $00
+	db 10 ; grass encounter rate
+	db 22, MACHOP
+	db 24, GEODUDE
+	db 26, ZUBAT
+	db 36, ONIX
+	db 39, ONIX
+	db 42, ONIX
+	db 41, MACHOKE
+	db 40, GOLBAT
+	db 40, MAROWAK
+	db 43, GRAVELER
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm
index 80d7ef3e..754557bf 100755
--- a/data/wild/maps/VictoryRoad3F.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
@@ -1,13 +1,14 @@
 PlateauMons3:
-	db $0F
-	db 24,MACHOP
-	db 26,GEODUDE
-	db 22,ZUBAT
-	db 42,ONIX
-	db 40,VENOMOTH
-	db 45,ONIX
-	db 43,GRAVELER
-	db 41,GOLBAT
-	db 42,MACHOKE
-	db 45,MACHOKE
-	db $00
+	db 15 ; grass encounter rate
+	db 24, MACHOP
+	db 26, GEODUDE
+	db 22, ZUBAT
+	db 42, ONIX
+	db 40, VENOMOTH
+	db 45, ONIX
+	db 43, GRAVELER
+	db 41, GOLBAT
+	db 42, MACHOKE
+	db 45, MACHOKE
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm
index ae9a5a70..d11fc34e 100755
--- a/data/wild/maps/ViridianForest.asm
+++ b/data/wild/maps/ViridianForest.asm
@@ -1,25 +1,26 @@
 ForestMons:
-	db $08
-	IF DEF(_RED)
-		db 4,WEEDLE
-		db 5,KAKUNA
-		db 3,WEEDLE
-		db 5,WEEDLE
-		db 4,KAKUNA
-		db 6,KAKUNA
-		db 4,METAPOD
-		db 3,CATERPIE
-	ENDC
-	IF DEF(_BLUE)
-		db 4,CATERPIE
-		db 5,METAPOD
-		db 3,CATERPIE
-		db 5,CATERPIE
-		db 4,METAPOD
-		db 6,METAPOD
-		db 4,KAKUNA
-		db 3,WEEDLE
-	ENDC
-	db 3,PIKACHU
-	db 5,PIKACHU
-	db $00
+	db 8 ; grass encounter rate
+IF DEF(_RED)
+	db  4, WEEDLE
+	db  5, KAKUNA
+	db  3, WEEDLE
+	db  5, WEEDLE
+	db  4, KAKUNA
+	db  6, KAKUNA
+	db  4, METAPOD
+	db  3, CATERPIE
+ENDC
+IF DEF(_BLUE)
+	db  4, CATERPIE
+	db  5, METAPOD
+	db  3, CATERPIE
+	db  5, CATERPIE
+	db  4, METAPOD
+	db  6, METAPOD
+	db  4, KAKUNA
+	db  3, WEEDLE
+ENDC
+	db  3, PIKACHU
+	db  5, PIKACHU
+
+	db 0 ; water encounter rate
diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm
index ce7f7ede..19570b50 100755
--- a/data/wild/maps/nothing.asm
+++ b/data/wild/maps/nothing.asm
@@ -1,3 +1,4 @@
 NoMons:
-	db $00
-	db $00
+	db 0 ; grass encounter rate
+
+	db 0 ; water encounter rate