Cleaner roammon and treemon data

3 files changed, 25 insertions, 25 deletions

diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index 07bb7a9d9..c94ebfce0 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -2,11 +2,10 @@
 ; Notably missing are Route 40 and Route 41, which are water routes.
 
 roam_map: MACRO
-; map, # of other maps, other maps
 	map \1
-	db  \2
-rept \2
-	map \3
+	db _NARG - 1
+rept _NARG +- 1
+	map \2
 	shift
 endr
 	db 0
@@ -14,21 +13,22 @@ ENDM
 
 RoamMaps: ; 2a40f
 ; there are NUM_ROAMMON_MAPS entries
-	roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46
-	roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31
-	roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36
-	roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33
-	roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34
-	roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35
-	roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36
-	roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37
-	roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42
-	roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42
-	roam_map ROUTE_39, 1, ROUTE_38
-	roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38
-	roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44
-	roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45
-	roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46
-	roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29
+	; start map, ...other maps
+	roam_map ROUTE_29, ROUTE_30, ROUTE_46
+	roam_map ROUTE_30, ROUTE_29, ROUTE_31
+	roam_map ROUTE_31, ROUTE_30, ROUTE_32, ROUTE_36
+	roam_map ROUTE_32, ROUTE_36, ROUTE_31, ROUTE_33
+	roam_map ROUTE_33, ROUTE_32, ROUTE_34
+	roam_map ROUTE_34, ROUTE_33, ROUTE_35
+	roam_map ROUTE_35, ROUTE_34, ROUTE_36
+	roam_map ROUTE_36, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37
+	roam_map ROUTE_37, ROUTE_36, ROUTE_38, ROUTE_42
+	roam_map ROUTE_38, ROUTE_37, ROUTE_39, ROUTE_42
+	roam_map ROUTE_39, ROUTE_38
+	roam_map ROUTE_42, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38
+	roam_map ROUTE_43, ROUTE_42, ROUTE_44
+	roam_map ROUTE_44, ROUTE_42, ROUTE_43, ROUTE_45
+	roam_map ROUTE_45, ROUTE_44, ROUTE_46
+	roam_map ROUTE_46, ROUTE_45, ROUTE_29
 	db -1 ; end
 ; 2a4a0
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 7860110ca..4e30a51a5 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -11,7 +11,7 @@ TreeMonMaps: ; b825e
 	treemon_map ROUTE_30,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_31,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_32,                  TREEMON_SET_KANTO
-	treemon_map ROUTE_33,                  TREEMON_SET_AZALEA
+	treemon_map ROUTE_33,                  TREEMON_SET_TOWN
 	treemon_map ROUTE_34,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_35,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_36,                  TREEMON_SET_ROUTE
@@ -20,7 +20,7 @@ TreeMonMaps: ; b825e
 	treemon_map ROUTE_39,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_40,                  TREEMON_SET_CITY
 	treemon_map ROUTE_41,                  TREEMON_SET_CITY
-	treemon_map ROUTE_42,                  TREEMON_SET_AZALEA
+	treemon_map ROUTE_42,                  TREEMON_SET_TOWN
 	treemon_map ROUTE_43,                  TREEMON_SET_LAKE
 	treemon_map ROUTE_44,                  TREEMON_SET_CANYON
 	treemon_map ROUTE_45,                  TREEMON_SET_CANYON
@@ -28,7 +28,7 @@ TreeMonMaps: ; b825e
 	treemon_map NEW_BARK_TOWN,             TREEMON_SET_CITY
 	treemon_map CHERRYGROVE_CITY,          TREEMON_SET_CITY
 	treemon_map VIOLET_CITY,               TREEMON_SET_CITY
-	treemon_map AZALEA_TOWN,               TREEMON_SET_AZALEA
+	treemon_map AZALEA_TOWN,               TREEMON_SET_TOWN
 	treemon_map CIANWOOD_CITY,             TREEMON_SET_CITY
 	treemon_map GOLDENROD_CITY,            TREEMON_SET_CITY
 	treemon_map OLIVINE_CITY,              TREEMON_SET_CITY
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
index 21cef29ec..5a29d675c 100644
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -2,7 +2,7 @@ TreeMons: ; b82e8
 ; entries correspond to TREEMON_SET_* constants
 	dw TreeMonSet_City
 	dw TreeMonSet_Canyon
-	dw TreeMonSet_Azalea
+	dw TreeMonSet_Town
 	dw TreeMonSet_Route
 	dw TreeMonSet_Kanto
 	dw TreeMonSet_Lake
@@ -33,7 +33,7 @@ TreeMonSet_Canyon: ; b82fa
 	db  5, AIPOM,      10
 	db -1
 
-TreeMonSet_Azalea: ; b8320
+TreeMonSet_Town: ; b8320
 ; common
 	db 50, SPEAROW,    10
 	db 15, EKANS,      10