Rename "city" treemon set to "none", since it has no encounters

Rangi42 · Rangi42 · commit 098944485b76 · 2025-04-21T12:42:57.000-04:00
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
@@ -181,7 +181,7 @@ DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.as
 ; treemon sets
 ; TreeMons indexes (see data/wild/treemons.asm)
 	const_def
-	const TREEMON_SET_CITY
+	const TREEMON_SET_NONE
 	const TREEMON_SET_CANYON
 	const TREEMON_SET_TOWN
 	const TREEMON_SET_ROUTE
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
@@ -6,7 +6,7 @@ ENDM
 TreeMonMaps:
 	treemon_map ROUTE_26,                  TREEMON_SET_KANTO
 	treemon_map ROUTE_27,                  TREEMON_SET_KANTO
-	treemon_map ROUTE_28,                  TREEMON_SET_CITY
+	treemon_map ROUTE_28,                  TREEMON_SET_NONE
 	treemon_map ROUTE_29,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_30,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_31,                  TREEMON_SET_ROUTE
@@ -18,25 +18,25 @@ TreeMonMaps:
 	treemon_map ROUTE_37,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_38,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_39,                  TREEMON_SET_ROUTE
-	treemon_map ROUTE_40,                  TREEMON_SET_CITY
-	treemon_map ROUTE_41,                  TREEMON_SET_CITY
+	treemon_map ROUTE_40,                  TREEMON_SET_NONE
+	treemon_map ROUTE_41,                  TREEMON_SET_NONE
 	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
 	treemon_map ROUTE_46,                  TREEMON_SET_CANYON
-	treemon_map NEW_BARK_TOWN,             TREEMON_SET_CITY
-	treemon_map CHERRYGROVE_CITY,          TREEMON_SET_CITY
-	treemon_map VIOLET_CITY,               TREEMON_SET_CITY
+	treemon_map NEW_BARK_TOWN,             TREEMON_SET_NONE
+	treemon_map CHERRYGROVE_CITY,          TREEMON_SET_NONE
+	treemon_map VIOLET_CITY,               TREEMON_SET_NONE
 	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
-	treemon_map ECRUTEAK_CITY,             TREEMON_SET_CITY
-	treemon_map MAHOGANY_TOWN,             TREEMON_SET_CITY
+	treemon_map CIANWOOD_CITY,             TREEMON_SET_NONE
+	treemon_map GOLDENROD_CITY,            TREEMON_SET_NONE
+	treemon_map OLIVINE_CITY,              TREEMON_SET_NONE
+	treemon_map ECRUTEAK_CITY,             TREEMON_SET_NONE
+	treemon_map MAHOGANY_TOWN,             TREEMON_SET_NONE
 	treemon_map LAKE_OF_RAGE,              TREEMON_SET_LAKE
-	treemon_map BLACKTHORN_CITY,           TREEMON_SET_CITY
-	treemon_map SILVER_CAVE_OUTSIDE,       TREEMON_SET_CITY
+	treemon_map BLACKTHORN_CITY,           TREEMON_SET_NONE
+	treemon_map SILVER_CAVE_OUTSIDE,       TREEMON_SET_NONE
 	treemon_map ILEX_FOREST,               TREEMON_SET_FOREST
 	db -1
 
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
@@ -1,7 +1,7 @@
 TreeMons:
 ; entries correspond to TREEMON_SET_* constants
 	table_width 2
-	dw TreeMonSet_City
+	dw TreeMonSet_None
 	dw TreeMonSet_Canyon
 	dw TreeMonSet_Town
 	dw TreeMonSet_Route
@@ -10,13 +10,15 @@ TreeMons:
 	dw TreeMonSet_Forest
 	dw TreeMonSet_Rock
 	assert_table_length NUM_TREEMON_SETS
-	dw TreeMonSet_City ; unused
+	dw TreeMonSet_None ; unused
 
 ; Two tables each (common, rare).
 ; Structure:
 ;	db  %, species, level
 
-TreeMonSet_City:
+TreeMonSet_None:
+; no encounter data
+
 TreeMonSet_Canyon:
 ; common
 	db 50, SPEAROW,    10
diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm
@@ -100,7 +100,7 @@ GetTreeMons:
 	cp NUM_TREEMON_SETS
 	jr nc, .quit
 
-	assert TREEMON_SET_CITY == 0
+	assert TREEMON_SET_NONE == 0
 	and a
 	jr z, .quit
 
