map → map_id; map_def → map; map_data → map_attributes

data/wild/johto_water.asm

@@ -2,229 +2,229 @@
 
 JohtoWaterWildMons: ; 0x2b11d
 
-	map RUINS_OF_ALPH_OUTSIDE
+	map_id RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_1F
+	map_id UNION_CAVE_1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_B1F
+	map_id UNION_CAVE_B1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_B2F
+	map_id UNION_CAVE_B2F
 	db 4 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
 
-	map SLOWPOKE_WELL_B1F
+	map_id SLOWPOKE_WELL_B1F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 10, SLOWPOKE
 
-	map SLOWPOKE_WELL_B2F
+	map_id SLOWPOKE_WELL_B2F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 20, SLOWBRO
 
-	map ILEX_FOREST
+	map_id ILEX_FOREST
 	db 2 percent ; encounter rate
 	db 15, PSYDUCK
 	db 10, PSYDUCK
 	db 15, GOLDUCK
 
-	map MOUNT_MORTAR_1F_OUTSIDE
+	map_id MOUNT_MORTAR_1F_OUTSIDE
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
 
-	map MOUNT_MORTAR_2F_INSIDE
+	map_id MOUNT_MORTAR_2F_INSIDE
 	db 2 percent ; encounter rate
 	db 20, GOLDEEN
 	db 25, MARILL
 	db 25, SEAKING
 
-	map MOUNT_MORTAR_B1F
+	map_id MOUNT_MORTAR_B1F
 	db 2 percent ; encounter rate
 	db 15, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
 
-	map WHIRL_ISLAND_SW
+	map_id WHIRL_ISLAND_SW
 	db 4 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, HORSEA
 	db 20, TENTACRUEL
 
-	map WHIRL_ISLAND_B2F
+	map_id WHIRL_ISLAND_B2F
 	db 4 percent ; encounter rate
 	db 15, HORSEA
 	db 20, HORSEA
 	db 20, TENTACRUEL
 
-	map WHIRL_ISLAND_LUGIA_CHAMBER
+	map_id WHIRL_ISLAND_LUGIA_CHAMBER
 	db 4 percent ; encounter rate
 	db 20, HORSEA
 	db 20, TENTACRUEL
 	db 20, SEADRA
 
-	map SILVER_CAVE_ROOM_2
+	map_id SILVER_CAVE_ROOM_2
 	db 2 percent ; encounter rate
 	db 35, SEAKING
 	db 35, GOLDUCK
 	db 35, GOLDEEN
 
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map DARK_CAVE_BLACKTHORN_ENTRANCE
+	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map DRAGONS_DEN_B1F
+	map_id DRAGONS_DEN_B1F
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 10, DRATINI
 
-	map OLIVINE_PORT
+	map_id OLIVINE_PORT
 	db 2 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_30
+	map_id ROUTE_30
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map ROUTE_31
+	map_id ROUTE_31
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map ROUTE_32
+	map_id ROUTE_32
 	db 6 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
 
-	map ROUTE_34
+	map_id ROUTE_34
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_35
+	map_id ROUTE_35
 	db 4 percent ; encounter rate
 	db 20, PSYDUCK
 	db 15, PSYDUCK
 	db 20, GOLDUCK
 
-	map ROUTE_40
+	map_id ROUTE_40
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_41
+	map_id ROUTE_41
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 20, TENTACRUEL
 	db 20, MANTINE
 
-	map ROUTE_42
+	map_id ROUTE_42
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 15, GOLDEEN
 	db 20, SEAKING
 
-	map ROUTE_43
+	map_id ROUTE_43
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 
-	map ROUTE_44
+	map_id ROUTE_44
 	db 2 percent ; encounter rate
 	db 25, POLIWAG
 	db 20, POLIWAG
 	db 25, POLIWHIRL
 
-	map ROUTE_45
+	map_id ROUTE_45
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 5, MAGIKARP
 
-	map NEW_BARK_TOWN
+	map_id NEW_BARK_TOWN
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map CHERRYGROVE_CITY
+	map_id CHERRYGROVE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map VIOLET_CITY
+	map_id VIOLET_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map CIANWOOD_CITY
+	map_id CIANWOOD_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map OLIVINE_CITY
+	map_id OLIVINE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ECRUTEAK_CITY
+	map_id ECRUTEAK_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map LAKE_OF_RAGE
+	map_id LAKE_OF_RAGE
 	db 6 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 15, GYARADOS
 
-	map BLACKTHORN_CITY
+	map_id BLACKTHORN_CITY
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map SILVER_CAVE_OUTSIDE
+	map_id SILVER_CAVE_OUTSIDE
 	db 2 percent ; encounter rate
 	db 35, POLIWHIRL
 	db 40, POLIWHIRL