ref: 47c2d1a1a5e0c46fe9913179a944c2952c04fb4a
parent: c2ad19728aad7df0f5ed7a39dc7dc37fe21c2c74
parent: 21c266b950e5f4379bb7c3f605689b9070c8f48d
author: Daniel Harding <33dannye@gmail.com>
date: Mon May 31 08:16:54 EDT 2021
Merge pull request #324 from KqesaR/clean_label_wild_map_pointer Standardize names of wild maps entities
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@@ -1,253 +1,253 @@
WildDataPointers:
table_width 2, WildDataPointers
- dw NoMons ; PALLET_TOWN
- dw NoMons ; VIRIDIAN_CITY
- dw NoMons ; PEWTER_CITY
- dw NoMons ; CERULEAN_CITY
- dw NoMons ; LAVENDER_TOWN
- dw NoMons ; VERMILION_CITY
- dw NoMons ; CELADON_CITY
- dw NoMons ; FUCHSIA_CITY
- dw NoMons ; CINNABAR_ISLAND
- dw NoMons ; INDIGO_PLATEAU
- dw NoMons ; SAFFRON_CITY
- dw NoMons ; unused
- dw Route1Mons ; ROUTE_1
- dw Route2Mons ; ROUTE_2
- dw Route3Mons ; ROUTE_3
- dw Route4Mons ; ROUTE_4
- dw Route5Mons ; ROUTE_5
- dw Route6Mons ; ROUTE_6
- dw Route7Mons ; ROUTE_7
- dw Route8Mons ; ROUTE_8
- dw Route9Mons ; ROUTE_9
- dw Route10Mons ; ROUTE_10
- dw Route11Mons ; ROUTE_11
- dw Route12Mons ; ROUTE_12
- dw Route13Mons ; ROUTE_13
- dw Route14Mons ; ROUTE_14
- dw Route15Mons ; ROUTE_15
- dw Route16Mons ; ROUTE_16
- dw Route17Mons ; ROUTE_17
- dw Route18Mons ; ROUTE_18
- dw WaterMons ; ROUTE_19
- dw WaterMons ; ROUTE_20
- dw Route21Mons ; ROUTE_21
- dw Route22Mons ; ROUTE_22
- dw Route23Mons ; ROUTE_23
- dw Route24Mons ; ROUTE_24
- dw Route25Mons ; ROUTE_25
- dw NoMons ; REDS_HOUSE_1F
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw ForestMons ; ViridianForest
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw MoonMons1
- dw MoonMonsB1
- dw MoonMonsB2
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw TunnelMonsB1
- dw PowerPlantMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw PlateauMons1
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw TowerMons1
- dw TowerMons2
- dw TowerMons3
- dw TowerMons4
- dw TowerMons5
- dw TowerMons6
- dw TowerMons7
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw IslandMonsB1
- dw IslandMonsB2
- dw IslandMonsB3
- dw IslandMonsB4
- dw NoMons
- dw NoMons
- dw MansionMons1
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw IslandMons1
- dw NoMons
- dw PlateauMons2
- dw NoMons
- dw NoMons
- dw CaveMons
- dw PlateauMons3
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw MansionMons2
- dw MansionMons3
- dw MansionMonsB1
- dw ZoneMons1
- dw ZoneMons2
- dw ZoneMons3
- dw ZoneMonsCenter
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw DungeonMons2
- dw DungeonMonsB1
- dw DungeonMons1
- dw NoMons
- dw NoMons
- dw NoMons
- dw TunnelMonsB2
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
- dw NoMons
+ dw NothingWildMons ; PALLET_TOWN
+ dw NothingWildMons ; VIRIDIAN_CITY
+ dw NothingWildMons ; PEWTER_CITY
+ dw NothingWildMons ; CERULEAN_CITY
+ dw NothingWildMons ; LAVENDER_TOWN
+ dw NothingWildMons ; VERMILION_CITY
+ dw NothingWildMons ; CELADON_CITY
+ dw NothingWildMons ; FUCHSIA_CITY
+ dw NothingWildMons ; CINNABAR_ISLAND
+ dw NothingWildMons ; INDIGO_PLATEAU
+ dw NothingWildMons ; SAFFRON_CITY
+ dw NothingWildMons ; unused
+ dw Route1WildMons ; ROUTE_1
+ dw Route2WildMons ; ROUTE_2
+ dw Route3WildMons ; ROUTE_3
+ dw Route4WildMons ; ROUTE_4
+ dw Route5WildMons ; ROUTE_5
+ dw Route6WildMons ; ROUTE_6
+ dw Route7WildMons ; ROUTE_7
+ dw Route8WildMons ; ROUTE_8
+ dw Route9WildMons ; ROUTE_9
+ dw Route10WildMons ; ROUTE_10
+ dw Route11WildMons ; ROUTE_11
+ dw Route12WildMons ; ROUTE_12
+ dw Route13WildMons ; ROUTE_13
+ dw Route14WildMons ; ROUTE_14
+ dw Route15WildMons ; ROUTE_15
+ dw Route16WildMons ; ROUTE_16
+ dw Route17WildMons ; ROUTE_17
+ dw Route18WildMons ; ROUTE_18
+ dw SeaRoutesWildMons ; ROUTE_19
+ dw SeaRoutesWildMons ; ROUTE_20
+ dw Route21WildMons ; ROUTE_21
+ dw Route22WildMons ; ROUTE_22
+ dw Route23WildMons ; ROUTE_23
+ dw Route24WildMons ; ROUTE_24
+ dw Route25WildMons ; ROUTE_25
+ dw NothingWildMons ; REDS_HOUSE_1F
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw ViridianForestWildMons ; ViridianForest
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw MtMoon1FWildMons
+ dw MtMoonB1FWildMons
+ dw MtMoonB2FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw RockTunnel1FWildMons
+ dw PowerPlantWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw VictoryRoad1FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw PokemonTower1FWildMons
+ dw PokemonTower2FWildMons
+ dw PokemonTower3FWildMons
+ dw PokemonTower4FWildMons
+ dw PokemonTower5FWildMons
+ dw PokemonTower6FWildMons
+ dw PokemonTower7FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw SeafoamIslandsB1FWildMons
+ dw SeafoamIslandsB2FWildMons
+ dw SeafoamIslandsB3FWildMons
+ dw SeafoamIslandsB4FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw PokemonMansion1FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw SeafoamIslands1FWildMons
+ dw NothingWildMons
+ dw VictoryRoad2FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw DiglettsCaveWildMons
+ dw VictoryRoad3FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw PokemonMansion2FWildMons
+ dw PokemonMansion3FWildMons
+ dw PokemonMansionB1FWildMons
+ dw SafariZoneEastWildMons
+ dw SafariZoneNorthWildMons
+ dw SafariZoneWestWildMons
+ dw SafariZoneCenterWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw CeruleanCave2FWildMons
+ dw CeruleanCaveB1FWildMons
+ dw CeruleanCave1FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw RockTunnelB1FWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
+ dw NothingWildMons
assert_table_length NUM_MAPS
dw -1 ; end
--- a/data/wild/maps/CeruleanCave1F.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
@@ -1,4 +1,4 @@
-DungeonMons1:
+CeruleanCave1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 46, GOLBAT
db 46, HYPNO
--- a/data/wild/maps/CeruleanCave2F.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
@@ -1,4 +1,4 @@
-DungeonMons2:
+CeruleanCave2FWildMons:
def_grass_wildmons 15 ; encounter rate
db 51, DODRIO
db 51, VENOMOTH
--- a/data/wild/maps/CeruleanCaveB1F.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
@@ -1,4 +1,4 @@
-DungeonMonsB1:
+CeruleanCaveB1FWildMons:
def_grass_wildmons 25 ; encounter rate
db 55, RHYDON
db 55, MAROWAK
--- a/data/wild/maps/DiglettsCave.asm
+++ b/data/wild/maps/DiglettsCave.asm
@@ -1,4 +1,4 @@
-CaveMons:
+DiglettsCaveWildMons:
def_grass_wildmons 20 ; encounter rate
db 18, DIGLETT
db 19, DIGLETT
--- a/data/wild/maps/MtMoon1F.asm
+++ b/data/wild/maps/MtMoon1F.asm
@@ -1,4 +1,4 @@
-MoonMons1:
+MtMoon1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, ZUBAT
db 7, ZUBAT
--- a/data/wild/maps/MtMoonB1F.asm
+++ b/data/wild/maps/MtMoonB1F.asm
@@ -1,4 +1,4 @@
-MoonMonsB1:
+MtMoonB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, ZUBAT
db 7, ZUBAT
--- a/data/wild/maps/MtMoonB2F.asm
+++ b/data/wild/maps/MtMoonB2F.asm
@@ -1,4 +1,4 @@
-MoonMonsB2:
+MtMoonB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 9, ZUBAT
db 9, GEODUDE
--- a/data/wild/maps/PokemonMansion1F.asm
+++ b/data/wild/maps/PokemonMansion1F.asm
@@ -1,4 +1,4 @@
-MansionMons1:
+PokemonMansion1FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 32, KOFFING
--- a/data/wild/maps/PokemonMansion2F.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
@@ -1,4 +1,4 @@
-MansionMons2:
+PokemonMansion2FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 32, GROWLITHE
--- a/data/wild/maps/PokemonMansion3F.asm
+++ b/data/wild/maps/PokemonMansion3F.asm
@@ -1,4 +1,4 @@
-MansionMons3:
+PokemonMansion3FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 31, KOFFING
--- a/data/wild/maps/PokemonMansionB1F.asm
+++ b/data/wild/maps/PokemonMansionB1F.asm
@@ -1,4 +1,4 @@
-MansionMonsB1:
+PokemonMansionB1FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 33, KOFFING
--- a/data/wild/maps/PokemonTower1F.asm
+++ b/data/wild/maps/PokemonTower1F.asm
@@ -1,4 +1,4 @@
-TowerMons1:
+PokemonTower1FWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons
--- a/data/wild/maps/PokemonTower2F.asm
+++ b/data/wild/maps/PokemonTower2F.asm
@@ -1,4 +1,4 @@
-TowerMons2:
+PokemonTower2FWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons
--- a/data/wild/maps/PokemonTower3F.asm
+++ b/data/wild/maps/PokemonTower3F.asm
@@ -1,4 +1,4 @@
-TowerMons3:
+PokemonTower3FWildMons:
def_grass_wildmons 10 ; encounter rate
db 20, GASTLY
db 21, GASTLY
--- a/data/wild/maps/PokemonTower4F.asm
+++ b/data/wild/maps/PokemonTower4F.asm
@@ -1,4 +1,4 @@
-TowerMons4:
+PokemonTower4FWildMons:
def_grass_wildmons 10 ; encounter rate
db 20, GASTLY
db 21, GASTLY
--- a/data/wild/maps/PokemonTower5F.asm
+++ b/data/wild/maps/PokemonTower5F.asm
@@ -1,4 +1,4 @@
-TowerMons5:
+PokemonTower5FWildMons:
def_grass_wildmons 10 ; encounter rate
db 20, GASTLY
db 21, GASTLY
--- a/data/wild/maps/PokemonTower6F.asm
+++ b/data/wild/maps/PokemonTower6F.asm
@@ -1,4 +1,4 @@
-TowerMons6:
+PokemonTower6FWildMons:
def_grass_wildmons 15 ; encounter rate
db 21, GASTLY
db 22, GASTLY
--- a/data/wild/maps/PokemonTower7F.asm
+++ b/data/wild/maps/PokemonTower7F.asm
@@ -1,4 +1,4 @@
-TowerMons7:
+PokemonTower7FWildMons:
def_grass_wildmons 15 ; encounter rate
db 21, GASTLY
db 22, GASTLY
--- a/data/wild/maps/PowerPlant.asm
+++ b/data/wild/maps/PowerPlant.asm
@@ -1,4 +1,4 @@
-PowerPlantMons:
+PowerPlantWildMons:
def_grass_wildmons 10 ; encounter rate
db 21, VOLTORB
db 21, MAGNEMITE
--- a/data/wild/maps/RockTunnel1F.asm
+++ b/data/wild/maps/RockTunnel1F.asm
@@ -1,4 +1,4 @@
-TunnelMonsB1:
+RockTunnel1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 16, ZUBAT
db 17, ZUBAT
--- a/data/wild/maps/RockTunnelB1F.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
@@ -1,4 +1,4 @@
-TunnelMonsB2:
+RockTunnelB1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 16, ZUBAT
db 17, ZUBAT
--- a/data/wild/maps/Route1.asm
+++ b/data/wild/maps/Route1.asm
@@ -1,4 +1,4 @@
-Route1Mons:
+Route1WildMons:
def_grass_wildmons 25 ; encounter rate
db 3, PIDGEY
db 3, RATTATA
--- a/data/wild/maps/Route10.asm
+++ b/data/wild/maps/Route10.asm
@@ -1,4 +1,4 @@
-Route10Mons:
+Route10WildMons:
def_grass_wildmons 15 ; encounter rate
db 16, VOLTORB
db 16, SPEAROW
--- a/data/wild/maps/Route11.asm
+++ b/data/wild/maps/Route11.asm
@@ -1,4 +1,4 @@
-Route11Mons:
+Route11WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 14, EKANS
--- a/data/wild/maps/Route12.asm
+++ b/data/wild/maps/Route12.asm
@@ -1,4 +1,4 @@
-Route12Mons:
+Route12WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 24, ODDISH
--- a/data/wild/maps/Route13.asm
+++ b/data/wild/maps/Route13.asm
@@ -1,4 +1,4 @@
-Route13Mons:
+Route13WildMons:
def_grass_wildmons 20 ; encounter rate
IF DEF(_RED)
db 24, ODDISH
--- a/data/wild/maps/Route14.asm
+++ b/data/wild/maps/Route14.asm
@@ -1,4 +1,4 @@
-Route14Mons:
+Route14WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 24, ODDISH
--- a/data/wild/maps/Route15.asm
+++ b/data/wild/maps/Route15.asm
@@ -1,4 +1,4 @@
-Route15Mons:
+Route15WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 24, ODDISH
--- a/data/wild/maps/Route16.asm
+++ b/data/wild/maps/Route16.asm
@@ -1,4 +1,4 @@
-Route16Mons:
+Route16WildMons:
def_grass_wildmons 25 ; encounter rate
db 20, SPEAROW
db 22, SPEAROW
--- a/data/wild/maps/Route17.asm
+++ b/data/wild/maps/Route17.asm
@@ -1,4 +1,4 @@
-Route17Mons:
+Route17WildMons:
def_grass_wildmons 25 ; encounter rate
db 20, SPEAROW
db 22, SPEAROW
--- a/data/wild/maps/Route18.asm
+++ b/data/wild/maps/Route18.asm
@@ -1,4 +1,4 @@
-Route18Mons:
+Route18WildMons:
def_grass_wildmons 25 ; encounter rate
db 20, SPEAROW
db 22, SPEAROW
--- a/data/wild/maps/Route2.asm
+++ b/data/wild/maps/Route2.asm
@@ -1,4 +1,4 @@
-Route2Mons:
+Route2WildMons:
def_grass_wildmons 25 ; encounter rate
db 3, RATTATA
db 3, PIDGEY
--- a/data/wild/maps/Route21.asm
+++ b/data/wild/maps/Route21.asm
@@ -1,4 +1,4 @@
-Route21Mons:
+Route21WildMons:
def_grass_wildmons 25 ; encounter rate
db 21, RATTATA
db 23, PIDGEY
--- a/data/wild/maps/Route22.asm
+++ b/data/wild/maps/Route22.asm
@@ -1,4 +1,4 @@
-Route22Mons:
+Route22WildMons:
def_grass_wildmons 25 ; encounter rate
db 3, RATTATA
IF DEF(_RED)
--- a/data/wild/maps/Route23.asm
+++ b/data/wild/maps/Route23.asm
@@ -1,4 +1,4 @@
-Route23Mons:
+Route23WildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 26, EKANS
--- a/data/wild/maps/Route24.asm
+++ b/data/wild/maps/Route24.asm
@@ -1,4 +1,4 @@
-Route24Mons:
+Route24WildMons:
def_grass_wildmons 25 ; encounter rate
IF DEF(_RED)
db 7, WEEDLE
--- a/data/wild/maps/Route25.asm
+++ b/data/wild/maps/Route25.asm
@@ -1,4 +1,4 @@
-Route25Mons:
+Route25WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 8, WEEDLE
--- a/data/wild/maps/Route3.asm
+++ b/data/wild/maps/Route3.asm
@@ -1,4 +1,4 @@
-Route3Mons:
+Route3WildMons:
def_grass_wildmons 20 ; encounter rate
db 6, PIDGEY
db 5, SPEAROW
--- a/data/wild/maps/Route4.asm
+++ b/data/wild/maps/Route4.asm
@@ -1,4 +1,4 @@
-Route4Mons:
+Route4WildMons:
def_grass_wildmons 20 ; encounter rate
db 10, RATTATA
db 10, SPEAROW
--- a/data/wild/maps/Route5.asm
+++ b/data/wild/maps/Route5.asm
@@ -1,4 +1,4 @@
-Route5Mons:
+Route5WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 13, ODDISH
--- a/data/wild/maps/Route6.asm
+++ b/data/wild/maps/Route6.asm
@@ -1,4 +1,4 @@
-Route6Mons:
+Route6WildMons:
def_grass_wildmons 15 ; encounter rate
IF DEF(_RED)
db 13, ODDISH
--- a/data/wild/maps/Route7.asm
+++ b/data/wild/maps/Route7.asm
@@ -1,4 +1,4 @@
-Route7Mons:
+Route7WildMons:
def_grass_wildmons 15 ; encounter rate
db 19, PIDGEY
IF DEF(_RED)
--- a/data/wild/maps/Route8.asm
+++ b/data/wild/maps/Route8.asm
@@ -1,4 +1,4 @@
-Route8Mons:
+Route8WildMons:
def_grass_wildmons 15 ; encounter rate
db 18, PIDGEY
IF DEF(_RED)
--- a/data/wild/maps/Route9.asm
+++ b/data/wild/maps/Route9.asm
@@ -1,4 +1,4 @@
-Route9Mons:
+Route9WildMons:
def_grass_wildmons 15 ; encounter rate
db 16, RATTATA
db 16, SPEAROW
--- a/data/wild/maps/SafariZoneCenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
@@ -1,4 +1,4 @@
-ZoneMonsCenter:
+SafariZoneCenterWildMons:
def_grass_wildmons 30 ; encounter rate
IF DEF(_RED)
db 22, NIDORAN_M
--- a/data/wild/maps/SafariZoneEast.asm
+++ b/data/wild/maps/SafariZoneEast.asm
@@ -1,4 +1,4 @@
-ZoneMons1:
+SafariZoneEastWildMons:
def_grass_wildmons 30 ; encounter rate
IF DEF(_RED)
db 24, NIDORAN_M
--- a/data/wild/maps/SafariZoneNorth.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
@@ -1,4 +1,4 @@
-ZoneMons2:
+SafariZoneNorthWildMons:
def_grass_wildmons 30 ; encounter rate
IF DEF(_RED)
db 22, NIDORAN_M
--- a/data/wild/maps/SafariZoneWest.asm
+++ b/data/wild/maps/SafariZoneWest.asm
@@ -1,4 +1,4 @@
-ZoneMons3:
+SafariZoneWestWildMons:
def_grass_wildmons 30 ; encounter rate
IF DEF(_RED)
db 25, NIDORAN_M
--- a/data/wild/maps/SeaRoutes.asm
+++ b/data/wild/maps/SeaRoutes.asm
@@ -1,4 +1,4 @@
-WaterMons:
+SeaRoutesWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons
--- a/data/wild/maps/SeafoamIslands1F.asm
+++ b/data/wild/maps/SeafoamIslands1F.asm
@@ -1,4 +1,4 @@
-IslandMons1:
+SeafoamIslands1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 30, SEEL
IF DEF(_RED)
--- a/data/wild/maps/SeafoamIslandsB1F.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
@@ -1,4 +1,4 @@
-IslandMonsB1:
+SeafoamIslandsB1FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 30, STARYU
--- a/data/wild/maps/SeafoamIslandsB2F.asm
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
@@ -1,4 +1,4 @@
-IslandMonsB2:
+SeafoamIslandsB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 30, SEEL
IF DEF(_RED)
--- a/data/wild/maps/SeafoamIslandsB3F.asm
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
@@ -1,4 +1,4 @@
-IslandMonsB3:
+SeafoamIslandsB3FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 31, SLOWPOKE
--- a/data/wild/maps/SeafoamIslandsB4F.asm
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
@@ -1,4 +1,4 @@
-IslandMonsB4:
+SeafoamIslandsB4FWildMons:
def_grass_wildmons 10 ; encounter rate
IF DEF(_RED)
db 31, HORSEA
--- a/data/wild/maps/VictoryRoad1F.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
@@ -1,4 +1,4 @@
-PlateauMons1:
+VictoryRoad1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 24, MACHOP
db 26, GEODUDE
--- a/data/wild/maps/VictoryRoad2F.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
@@ -1,4 +1,4 @@
-PlateauMons2:
+VictoryRoad2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 22, MACHOP
db 24, GEODUDE
--- a/data/wild/maps/VictoryRoad3F.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
@@ -1,4 +1,4 @@
-PlateauMons3:
+VictoryRoad3FWildMons:
def_grass_wildmons 15 ; encounter rate
db 24, MACHOP
db 26, GEODUDE
--- a/data/wild/maps/ViridianForest.asm
+++ b/data/wild/maps/ViridianForest.asm
@@ -1,4 +1,4 @@
-ForestMons:
+ViridianForestWildMons:
def_grass_wildmons 8 ; encounter rate
IF DEF(_RED)
db 4, WEEDLE
--- a/data/wild/maps/nothing.asm
+++ b/data/wild/maps/nothing.asm
@@ -1,4 +1,4 @@
-NoMons:
+NothingWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons