summaryrefslogtreecommitdiff
path: root/data/wild
diff options
context:
space:
mode:
Diffstat (limited to 'data/wild')
-rw-r--r--data/wild/fish.asm76
-rw-r--r--data/wild/johto_grass.asm122
-rw-r--r--data/wild/johto_water.asm76
-rw-r--r--data/wild/kanto_grass.asm60
-rw-r--r--data/wild/kanto_water.asm48
-rw-r--r--data/wild/roammon_maps.asm42
-rw-r--r--data/wild/swarm_grass.asm4
-rw-r--r--data/wild/treemon_maps.asm8
-rw-r--r--data/wild/treemons.asm4
-rw-r--r--data/wild/unlocked_unowns.asm24
10 files changed, 247 insertions, 217 deletions
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index 91a887b53..ee8299ccb 100644
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -1,19 +1,25 @@
time_group EQUS "0," ; use the nth TimeFishGroups entry
+fishgroup: MACRO
+; chance, old rod, good rod, super rod
+ dbwww \1, \2, \3, \4
+ENDM
+
FishGroups: ; 92488
- dbwww 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super
- dbwww 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super
- dbwww 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super
- dbwww 50 percent + 1, .Pond_Old, .Pond_Good, .Pond_Super
- dbwww 50 percent + 1, .Dratini_Old, .Dratini_Good, .Dratini_Super
- dbwww 50 percent + 1, .Qwilfish_Swarm_Old, .Qwilfish_Swarm_Good, .Qwilfish_Swarm_Super
- dbwww 50 percent + 1, .Remoraid_Swarm_Old, .Remoraid_Swarm_Good, .Remoraid_Swarm_Super
- dbwww 50 percent + 1, .Gyarados_Old, .Gyarados_Good, .Gyarados_Super
- dbwww 50 percent + 1, .Dratini_2_Old, .Dratini_2_Good, .Dratini_2_Super
- dbwww 50 percent + 1, .WhirlIslands_Old, .WhirlIslands_Good, .WhirlIslands_Super
- dbwww 50 percent + 1, .Qwilfish_Old, .Qwilfish_Good, .Qwilfish_Super
- dbwww 50 percent + 1, .Remoraid_Old, .Remoraid_Good, .Remoraid_Super
- dbwww 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super
+; entries correspond to FISHGROUP_* constants
+ fishgroup 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super
+ fishgroup 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super
+ fishgroup 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super
+ fishgroup 50 percent + 1, .Pond_Old, .Pond_Good, .Pond_Super
+ fishgroup 50 percent + 1, .Dratini_Old, .Dratini_Good, .Dratini_Super
+ fishgroup 50 percent + 1, .Qwilfish_Swarm_Old, .Qwilfish_Swarm_Good, .Qwilfish_Swarm_Super
+ fishgroup 50 percent + 1, .Remoraid_Swarm_Old, .Remoraid_Swarm_Good, .Remoraid_Swarm_Super
+ fishgroup 50 percent + 1, .Gyarados_Old, .Gyarados_Good, .Gyarados_Super
+ fishgroup 50 percent + 1, .Dratini_2_Old, .Dratini_2_Good, .Dratini_2_Super
+ fishgroup 50 percent + 1, .WhirlIslands_Old, .WhirlIslands_Good, .WhirlIslands_Super
+ fishgroup 50 percent + 1, .Qwilfish_Old, .Qwilfish_Good, .Qwilfish_Super
+ fishgroup 50 percent + 1, .Remoraid_Old, .Remoraid_Good, .Remoraid_Super
+ fishgroup 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super
.Shore_Old: ; 924e3
db 70 percent + 1, MAGIKARP, 10
@@ -202,26 +208,26 @@ FishGroups: ; 92488
TimeFishGroups: ; 9266f
; day nite
- db CORSOLA, 20, STARYU, 20
- db CORSOLA, 40, STARYU, 40
- db SHELLDER, 20, SHELLDER, 20
- db SHELLDER, 40, SHELLDER, 40
- db GOLDEEN, 20, GOLDEEN, 20
- db GOLDEEN, 40, GOLDEEN, 40
- db POLIWAG, 20, POLIWAG, 20
- db POLIWAG, 40, POLIWAG, 40
- db DRATINI, 20, DRATINI, 20
- db DRATINI, 40, DRATINI, 40
- db QWILFISH, 20, QWILFISH, 20
- db QWILFISH, 40, QWILFISH, 40
- db REMORAID, 20, REMORAID, 20
- db REMORAID, 40, REMORAID, 40
- db GYARADOS, 20, GYARADOS, 20
- db GYARADOS, 40, GYARADOS, 40
- db DRATINI, 10, DRATINI, 10
- db DRATINI, 10, DRATINI, 10
- db HORSEA, 20, HORSEA, 20
- db HORSEA, 40, HORSEA, 40
- db TENTACOOL, 20, TENTACOOL, 20
- db TENTACOOL, 40, TENTACOOL, 40
+ db CORSOLA, 20, STARYU, 20 ; 0
+ db CORSOLA, 40, STARYU, 40 ; 1
+ db SHELLDER, 20, SHELLDER, 20 ; 2
+ db SHELLDER, 40, SHELLDER, 40 ; 3
+ db GOLDEEN, 20, GOLDEEN, 20 ; 4
+ db GOLDEEN, 40, GOLDEEN, 40 ; 5
+ db POLIWAG, 20, POLIWAG, 20 ; 6
+ db POLIWAG, 40, POLIWAG, 40 ; 7
+ db DRATINI, 20, DRATINI, 20 ; 8
+ db DRATINI, 40, DRATINI, 40 ; 9
+ db QWILFISH, 20, QWILFISH, 20 ; 10
+ db QWILFISH, 40, QWILFISH, 40 ; 11
+ db REMORAID, 20, REMORAID, 20 ; 12
+ db REMORAID, 40, REMORAID, 40 ; 13
+ db GYARADOS, 20, GYARADOS, 20 ; 14
+ db GYARADOS, 40, GYARADOS, 40 ; 15
+ db DRATINI, 10, DRATINI, 10 ; 16
+ db DRATINI, 10, DRATINI, 10 ; 17
+ db HORSEA, 20, HORSEA, 20 ; 18
+ db HORSEA, 40, HORSEA, 40 ; 19
+ db TENTACOOL, 20, TENTACOOL, 20 ; 20
+ db TENTACOOL, 40, TENTACOOL, 40 ; 21
; 926c7
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index be435b048..c48de0408 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -2,7 +2,7 @@
JohtoGrassWildMons: ; 0x2a5e9
- map SPROUT_TOWER_2F
+ map_id SPROUT_TOWER_2F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 3, RATTATA
@@ -29,7 +29,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 5, RATTATA
db 5, RATTATA
- map SPROUT_TOWER_3F
+ map_id SPROUT_TOWER_3F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 3, RATTATA
@@ -56,7 +56,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 5, RATTATA
db 5, RATTATA
- map TIN_TOWER_2F
+ map_id TIN_TOWER_2F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -83,7 +83,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_3F
+ map_id TIN_TOWER_3F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -110,7 +110,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_4F
+ map_id TIN_TOWER_4F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -137,7 +137,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_5F
+ map_id TIN_TOWER_5F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -164,7 +164,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_6F
+ map_id TIN_TOWER_6F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -191,7 +191,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_7F
+ map_id TIN_TOWER_7F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -218,7 +218,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_8F
+ map_id TIN_TOWER_8F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -245,7 +245,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map TIN_TOWER_9F
+ map_id TIN_TOWER_9F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 20, RATTATA
@@ -272,7 +272,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, RATTATA
db 24, RATTATA
- map BURNED_TOWER_1F
+ map_id BURNED_TOWER_1F
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 13, RATTATA
@@ -299,7 +299,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 15, RATICATE
db 15, RATICATE
- map BURNED_TOWER_B1F
+ map_id BURNED_TOWER_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 14, RATTATA
@@ -326,7 +326,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 16, KOFFING
db 16, WEEZING
- map NATIONAL_PARK
+ map_id NATIONAL_PARK
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 12, NIDORAN_M
@@ -353,7 +353,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 12, VENONAT
db 12, VENONAT
- map RUINS_OF_ALPH_OUTSIDE
+ map_id RUINS_OF_ALPH_OUTSIDE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 20, NATU
@@ -380,7 +380,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 22, QUAGSIRE
db 22, QUAGSIRE
- map RUINS_OF_ALPH_INNER_CHAMBER
+ map_id RUINS_OF_ALPH_INNER_CHAMBER
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 5, UNOWN
@@ -407,7 +407,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 5, UNOWN
db 5, UNOWN
- map UNION_CAVE_1F
+ map_id UNION_CAVE_1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 6, GEODUDE
@@ -434,7 +434,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 6, ONIX
db 6, ONIX
- map UNION_CAVE_B1F
+ map_id UNION_CAVE_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 8, GEODUDE
@@ -461,7 +461,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 8, RATTATA
db 8, RATTATA
- map UNION_CAVE_B2F
+ map_id UNION_CAVE_B2F
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 22, ZUBAT
@@ -488,7 +488,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 23, ONIX
db 23, ONIX
- map SLOWPOKE_WELL_B1F
+ map_id SLOWPOKE_WELL_B1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 5, ZUBAT
@@ -515,7 +515,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 8, SLOWPOKE
db 8, SLOWPOKE
- map SLOWPOKE_WELL_B2F
+ map_id SLOWPOKE_WELL_B2F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 21, ZUBAT
@@ -542,7 +542,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 23, SLOWPOKE
db 23, SLOWPOKE
- map ILEX_FOREST
+ map_id ILEX_FOREST
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 5, CATERPIE
@@ -569,7 +569,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 6, PARAS
db 6, PARAS
- map MOUNT_MORTAR_1F_OUTSIDE
+ map_id MOUNT_MORTAR_1F_OUTSIDE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 14, RATTATA
@@ -596,7 +596,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 16, RATICATE
db 16, RATICATE
- map MOUNT_MORTAR_1F_INSIDE
+ map_id MOUNT_MORTAR_1F_INSIDE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 13, GEODUDE
@@ -623,7 +623,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 15, GOLBAT
db 15, GOLBAT
- map MOUNT_MORTAR_2F_INSIDE
+ map_id MOUNT_MORTAR_2F_INSIDE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 31, GRAVELER
@@ -650,7 +650,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 32, GOLBAT
db 32, GOLBAT
- map MOUNT_MORTAR_B1F
+ map_id MOUNT_MORTAR_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 15, ZUBAT
@@ -677,7 +677,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 18, RATICATE
db 18, RATICATE
- map ICE_PATH_1F
+ map_id ICE_PATH_1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 21, SWINUB
@@ -704,7 +704,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 22, GOLBAT
db 22, GOLBAT
- map ICE_PATH_B1F
+ map_id ICE_PATH_B1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 22, SWINUB
@@ -731,7 +731,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 23, GOLBAT
db 22, SNEASEL
- map ICE_PATH_B2F_MAHOGANY_SIDE
+ map_id ICE_PATH_B2F_MAHOGANY_SIDE
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 23, SWINUB
@@ -758,7 +758,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 22, SNEASEL
db 24, SNEASEL
- map ICE_PATH_B2F_BLACKTHORN_SIDE
+ map_id ICE_PATH_B2F_BLACKTHORN_SIDE
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 23, SWINUB
@@ -785,7 +785,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 22, SNEASEL
db 24, SNEASEL
- map ICE_PATH_B3F
+ map_id ICE_PATH_B3F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 24, SWINUB
@@ -812,7 +812,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, SNEASEL
db 26, SNEASEL
- map WHIRL_ISLAND_NW
+ map_id WHIRL_ISLAND_NW
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, KRABBY
@@ -839,7 +839,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, GOLBAT
db 24, GOLBAT
- map WHIRL_ISLAND_NE
+ map_id WHIRL_ISLAND_NE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, KRABBY
@@ -866,7 +866,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, GOLBAT
db 24, GOLBAT
- map WHIRL_ISLAND_SW
+ map_id WHIRL_ISLAND_SW
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, KRABBY
@@ -893,7 +893,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, GOLBAT
db 24, GOLBAT
- map WHIRL_ISLAND_CAVE
+ map_id WHIRL_ISLAND_CAVE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, KRABBY
@@ -920,7 +920,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, GOLBAT
db 24, GOLBAT
- map WHIRL_ISLAND_SE
+ map_id WHIRL_ISLAND_SE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, KRABBY
@@ -947,7 +947,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 24, GOLBAT
db 24, GOLBAT
- map WHIRL_ISLAND_B1F
+ map_id WHIRL_ISLAND_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 23, KRABBY
@@ -974,7 +974,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 25, GOLBAT
db 25, GOLBAT
- map WHIRL_ISLAND_B2F
+ map_id WHIRL_ISLAND_B2F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 24, KRABBY
@@ -1001,7 +1001,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 26, GOLBAT
db 26, GOLBAT
- map WHIRL_ISLAND_LUGIA_CHAMBER
+ map_id WHIRL_ISLAND_LUGIA_CHAMBER
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 25, KRABBY
@@ -1028,7 +1028,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 27, GOLBAT
db 27, GOLBAT
- map SILVER_CAVE_ROOM_1
+ map_id SILVER_CAVE_ROOM_1
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 43, GRAVELER
@@ -1055,7 +1055,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 46, GOLBAT
db 46, GOLBAT
- map SILVER_CAVE_ROOM_2
+ map_id SILVER_CAVE_ROOM_2
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 48, GOLBAT
@@ -1082,7 +1082,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 45, MISDREAVUS
db 45, MISDREAVUS
- map SILVER_CAVE_ROOM_3
+ map_id SILVER_CAVE_ROOM_3
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 51, GOLBAT
@@ -1109,7 +1109,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 53, GOLBAT
db 53, GOLBAT
- map SILVER_CAVE_ITEM_ROOMS
+ map_id SILVER_CAVE_ITEM_ROOMS
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 48, GOLBAT
@@ -1136,7 +1136,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 50, PARASECT
db 52, PARASECT
- map DARK_CAVE_VIOLET_ENTRANCE
+ map_id DARK_CAVE_VIOLET_ENTRANCE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 3, GEODUDE
@@ -1163,7 +1163,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 4, ZUBAT
db 4, DUNSPARCE
- map DARK_CAVE_BLACKTHORN_ENTRANCE
+ map_id DARK_CAVE_BLACKTHORN_ENTRANCE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 23, GEODUDE
@@ -1190,7 +1190,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 23, GOLBAT
db 23, GOLBAT
- map ROUTE_29
+ map_id ROUTE_29
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 2, PIDGEY
@@ -1217,7 +1217,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 3, HOOTHOOT
db 3, HOOTHOOT
- map ROUTE_30
+ map_id ROUTE_30
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 3, LEDYBA
@@ -1244,7 +1244,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 4, HOOTHOOT
db 4, HOOTHOOT
- map ROUTE_31
+ map_id ROUTE_31
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 4, LEDYBA
@@ -1271,7 +1271,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 5, GASTLY
db 5, GASTLY
- map ROUTE_32
+ map_id ROUTE_32
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 4, EKANS
@@ -1298,7 +1298,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 7, GASTLY
db 7, GASTLY
- map ROUTE_33
+ map_id ROUTE_33
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 6, RATTATA
@@ -1325,7 +1325,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 7, RATTATA
db 7, RATTATA
- map ROUTE_34
+ map_id ROUTE_34
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 10, SNUBBULL
@@ -1352,7 +1352,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 10, DITTO
db 10, DITTO
- map ROUTE_35
+ map_id ROUTE_35
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 12, SNUBBULL
@@ -1379,7 +1379,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 10, DITTO
db 12, YANMA
- map ROUTE_36
+ map_id ROUTE_36
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 4, LEDYBA
@@ -1406,7 +1406,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 5, GASTLY
db 5, GASTLY
- map ROUTE_37
+ map_id ROUTE_37
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 13, LEDYBA
@@ -1433,7 +1433,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 15, ARIADOS
db 15, ARIADOS
- map ROUTE_38
+ map_id ROUTE_38
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 16, RATTATA
@@ -1460,7 +1460,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 16, MEOWTH
db 16, MEOWTH
- map ROUTE_39
+ map_id ROUTE_39
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
db 16, RATTATA
@@ -1487,7 +1487,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 18, MEOWTH
db 18, MEOWTH
- map ROUTE_42
+ map_id ROUTE_42
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 13, EKANS
@@ -1514,7 +1514,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 16, GOLBAT
db 16, GOLBAT
- map ROUTE_43
+ map_id ROUTE_43
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 15, SENTRET
@@ -1541,7 +1541,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 17, VENOMOTH
db 17, VENOMOTH
- map ROUTE_44
+ map_id ROUTE_44
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 23, TANGELA
@@ -1568,7 +1568,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 26, POLIWHIRL
db 26, POLIWHIRL
- map ROUTE_45
+ map_id ROUTE_45
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 23, GEODUDE
@@ -1595,7 +1595,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 27, GRAVELER
db 27, GRAVELER
- map ROUTE_46
+ map_id ROUTE_46
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 2, GEODUDE
@@ -1622,7 +1622,7 @@ JohtoGrassWildMons: ; 0x2a5e9
db 2, RATTATA
db 2, RATTATA
- map SILVER_CAVE_OUTSIDE
+ map_id SILVER_CAVE_OUTSIDE
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 41, TANGELA
diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm
index d6e11c3a0..778d5f409 100644
--- a/data/wild/johto_water.asm
+++ b/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
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index 415514748..bc9e2cae9 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -2,7 +2,7 @@
KantoGrassWildMons: ; 0x2b274
- map DIGLETTS_CAVE
+ map_id DIGLETTS_CAVE
db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
; morn
db 3, DIGLETT
@@ -29,7 +29,7 @@ KantoGrassWildMons: ; 0x2b274
db 32, DUGTRIO
db 32, DUGTRIO
- map MOUNT_MOON
+ map_id MOUNT_MOON
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 6, ZUBAT
@@ -56,7 +56,7 @@ KantoGrassWildMons: ; 0x2b274
db 12, CLEFAIRY
db 12, CLEFAIRY
- map ROCK_TUNNEL_1F
+ map_id ROCK_TUNNEL_1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 10, CUBONE
@@ -83,7 +83,7 @@ KantoGrassWildMons: ; 0x2b274
db 15, ZUBAT
db 15, ZUBAT
- map ROCK_TUNNEL_B1F
+ map_id ROCK_TUNNEL_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 12, CUBONE
@@ -110,7 +110,7 @@ KantoGrassWildMons: ; 0x2b274
db 15, GOLBAT
db 15, GOLBAT
- map VICTORY_ROAD
+ map_id VICTORY_ROAD
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 34, GRAVELER
@@ -137,7 +137,7 @@ KantoGrassWildMons: ; 0x2b274
db 40, GRAVELER
db 40, GRAVELER
- map TOHJO_FALLS
+ map_id TOHJO_FALLS
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, ZUBAT
@@ -164,7 +164,7 @@ KantoGrassWildMons: ; 0x2b274
db 23, SLOWPOKE
db 23, SLOWPOKE
- map ROUTE_1
+ map_id ROUTE_1
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 2, PIDGEY
@@ -191,7 +191,7 @@ KantoGrassWildMons: ; 0x2b274
db 4, HOOTHOOT
db 4, HOOTHOOT
- map ROUTE_2
+ map_id ROUTE_2
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 3, CATERPIE
@@ -218,7 +218,7 @@ KantoGrassWildMons: ; 0x2b274
db 4, NOCTOWL
db 4, NOCTOWL
- map ROUTE_3
+ map_id ROUTE_3
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 5, SPEAROW
@@ -245,7 +245,7 @@ KantoGrassWildMons: ; 0x2b274
db 6, CLEFAIRY
db 6, CLEFAIRY
- map ROUTE_4
+ map_id ROUTE_4
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 5, SPEAROW
@@ -272,7 +272,7 @@ KantoGrassWildMons: ; 0x2b274
db 6, CLEFAIRY
db 6, CLEFAIRY
- map ROUTE_5
+ map_id ROUTE_5
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 13, PIDGEY
@@ -299,7 +299,7 @@ KantoGrassWildMons: ; 0x2b274
db 14, ABRA
db 14, ABRA
- map ROUTE_6
+ map_id ROUTE_6
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 13, RATTATA
@@ -326,7 +326,7 @@ KantoGrassWildMons: ; 0x2b274
db 15, RATICATE
db 15, RATICATE
- map ROUTE_7
+ map_id ROUTE_7
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 17, RATTATA
@@ -353,7 +353,7 @@ KantoGrassWildMons: ; 0x2b274
db 16, ABRA
db 16, ABRA
- map ROUTE_8
+ map_id ROUTE_8
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 17, SNUBBULL
@@ -380,7 +380,7 @@ KantoGrassWildMons: ; 0x2b274
db 18, KADABRA
db 18, KADABRA
- map ROUTE_9
+ map_id ROUTE_9
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 15, RATTATA
@@ -407,7 +407,7 @@ KantoGrassWildMons: ; 0x2b274
db 18, RATICATE
db 18, RATICATE
- map ROUTE_10_NORTH
+ map_id ROUTE_10_NORTH
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 15, SPEAROW
@@ -434,7 +434,7 @@ KantoGrassWildMons: ; 0x2b274
db 16, ELECTABUZZ
db 16, ELECTABUZZ
- map ROUTE_11
+ map_id ROUTE_11
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 14, HOPPIP
@@ -461,7 +461,7 @@ KantoGrassWildMons: ; 0x2b274
db 16, HYPNO
db 16, HYPNO
- map ROUTE_13
+ map_id ROUTE_13
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 23, NIDORINO
@@ -488,7 +488,7 @@ KantoGrassWildMons: ; 0x2b274
db 25, QUAGSIRE
db 25, CHANSEY
- map ROUTE_14
+ map_id ROUTE_14
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 26, NIDORINO
@@ -515,7 +515,7 @@ KantoGrassWildMons: ; 0x2b274
db 28, QUAGSIRE
db 28, CHANSEY
- map ROUTE_15
+ map_id ROUTE_15
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 23, NIDORINO
@@ -542,7 +542,7 @@ KantoGrassWildMons: ; 0x2b274
db 25, QUAGSIRE
db 25, CHANSEY
- map ROUTE_16
+ map_id ROUTE_16
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 26, GRIMER
@@ -569,7 +569,7 @@ KantoGrassWildMons: ; 0x2b274
db 30, MUK
db 30, MUK
- map ROUTE_17
+ map_id ROUTE_17
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 30, FEAROW
@@ -596,7 +596,7 @@ KantoGrassWildMons: ; 0x2b274
db 33, MUK
db 33, MUK
- map ROUTE_18
+ map_id ROUTE_18
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 26, GRIMER
@@ -623,7 +623,7 @@ KantoGrassWildMons: ; 0x2b274
db 30, MUK
db 30, MUK
- map ROUTE_21
+ map_id ROUTE_21
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 30, TANGELA
@@ -650,7 +650,7 @@ KantoGrassWildMons: ; 0x2b274
db 28, TANGELA
db 28, TANGELA
- map ROUTE_22
+ map_id ROUTE_22
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 3, RATTATA
@@ -677,7 +677,7 @@ KantoGrassWildMons: ; 0x2b274
db 7, RATTATA
db 7, RATTATA
- map ROUTE_24
+ map_id ROUTE_24
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 8, CATERPIE
@@ -704,7 +704,7 @@ KantoGrassWildMons: ; 0x2b274
db 14, GLOOM
db 14, GLOOM
- map ROUTE_25
+ map_id ROUTE_25
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 10, CATERPIE
@@ -731,7 +731,7 @@ KantoGrassWildMons: ; 0x2b274
db 14, NOCTOWL
db 14, NOCTOWL
- map ROUTE_26
+ map_id ROUTE_26
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 28, DODUO
@@ -758,7 +758,7 @@ KantoGrassWildMons: ; 0x2b274
db 30, QUAGSIRE
db 30, QUAGSIRE
- map ROUTE_27
+ map_id ROUTE_27
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 28, DODUO
@@ -785,7 +785,7 @@ KantoGrassWildMons: ; 0x2b274
db 32, NOCTOWL
db 32, NOCTOWL
- map ROUTE_28
+ map_id ROUTE_28
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 39, TANGELA
diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm
index 71fab48fb..1cbd473a0 100644
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -2,145 +2,145 @@
KantoWaterWildMons: ; 0x2b7f7
- map TOHJO_FALLS
+ map_id TOHJO_FALLS
db 4 percent ; encounter rate
db 20, GOLDEEN
db 20, SLOWPOKE
db 20, SEAKING
- map VERMILION_PORT
+ map_id VERMILION_PORT
db 2 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
db 35, TENTACRUEL
- map ROUTE_4
+ map_id ROUTE_4
db 4 percent ; encounter rate
db 10, GOLDEEN
db 5, GOLDEEN
db 10, SEAKING
- map ROUTE_6
+ map_id ROUTE_6
db 2 percent ; encounter rate
db 10, PSYDUCK
db 5, PSYDUCK
db 10, GOLDUCK
- map ROUTE_9
+ map_id ROUTE_9
db 4 percent ; encounter rate
db 15, GOLDEEN
db 10, GOLDEEN
db 15, SEAKING
- map ROUTE_10_NORTH
+ map_id ROUTE_10_NORTH
db 4 percent ; encounter rate
db 15, GOLDEEN
db 10, GOLDEEN
db 15, SEAKING
- map ROUTE_12
+ map_id ROUTE_12
db 6 percent ; encounter rate
db 25, TENTACOOL
db 25, QUAGSIRE
db 25, TENTACRUEL
- map ROUTE_13
+ map_id ROUTE_13
db 6 percent ; encounter rate
db 25, TENTACOOL
db 25, QUAGSIRE
db 25, TENTACRUEL
- map ROUTE_19
+ map_id ROUTE_19
db 6 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
db 35, TENTACRUEL
- map ROUTE_20
+ map_id ROUTE_20
db 6 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
db 35, TENTACRUEL
- map ROUTE_21
+ map_id ROUTE_21
db 6 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
db 35, TENTACRUEL
- map ROUTE_22
+ map_id ROUTE_22
db 2 percent ; encounter rate
db 10, POLIWAG
db 5, POLIWAG
db 10, POLIWHIRL
- map ROUTE_24
+ map_id ROUTE_24
db 4 percent ; encounter rate
db 10, GOLDEEN
db 5, GOLDEEN
db 10, SEAKING
- map ROUTE_25
+ map_id ROUTE_25
db 4 percent ; encounter rate
db 10, GOLDEEN
db 5, GOLDEEN
db 10, SEAKING
- map ROUTE_26
+ map_id ROUTE_26
db 6 percent ; encounter rate
db 30, TENTACOOL
db 25, TENTACOOL
db 30, TENTACRUEL
- map ROUTE_27
+ map_id ROUTE_27
db 6 percent ; encounter rate
db 20, TENTACOOL
db 15, TENTACOOL
db 20, TENTACRUEL
- map ROUTE_28
+ map_id ROUTE_28
db 2 percent ; encounter rate
db 40, POLIWAG
db 35, POLIWAG
db 40, POLIWHIRL
- map PALLET_TOWN
+ map_id PALLET_TOWN
db 6 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
db 35, TENTACRUEL
- map VIRIDIAN_CITY
+ map_id VIRIDIAN_CITY
db 2 percent ; encounter rate
db 10, POLIWAG
db 5, POLIWAG
db 10, POLIWHIRL
- map CERULEAN_CITY
+ map_id CERULEAN_CITY
db 4 percent ; encounter rate
db 10, GOLDEEN
db 5, GOLDEEN
db 10, SEAKING
- map VERMILION_CITY
+ map_id VERMILION_CITY
db 6 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
db 35, TENTACRUEL
- map CELADON_CITY
+ map_id CELADON_CITY
db 2 percent ; encounter rate
db 20, GRIMER
db 15, GRIMER
db 15, MUK
- map FUCHSIA_CITY
+ map_id FUCHSIA_CITY
db 2 percent ; encounter rate
db 20, MAGIKARP
db 15, MAGIKARP
db 10, MAGIKARP
- map CINNABAR_ISLAND
+ map_id CINNABAR_ISLAND
db 6 percent ; encounter rate
db 35, TENTACOOL
db 30, TENTACOOL
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index 07bb7a9d9..a57f561b2 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
+ map_id \1
+ db _NARG - 1
+rept _NARG + -1
+ map_id \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/swarm_grass.asm b/data/wild/swarm_grass.asm
index a26417f64..408a0157e 100644
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -3,7 +3,7 @@
SwarmGrassWildMons: ; 0x2b8d0
; Dunsparce swarm
- map DARK_CAVE_VIOLET_ENTRANCE
+ map_id DARK_CAVE_VIOLET_ENTRANCE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
db 3, GEODUDE
@@ -31,7 +31,7 @@ SwarmGrassWildMons: ; 0x2b8d0
db 4, DUNSPARCE
; Yanma swarm
- map ROUTE_35
+ map_id ROUTE_35
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 12, NIDORAN_M
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 7860110ca..59eba43cc 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -1,5 +1,5 @@
treemon_map: MACRO
- map \1
+ map_id \1
db \2 ; treemon set
ENDM
@@ -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
diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm
new file mode 100644
index 000000000..d09064c4b
--- /dev/null
+++ b/data/wild/unlocked_unowns.asm
@@ -0,0 +1,24 @@
+unown_set: MACRO
+rept _NARG
+ db UNOWN_\1
+ shift
+endr
+ db -1
+ENDM
+
+UnlockedUnownLetterSets:
+; entries correspond to wUnlockedUnowns bits
+ dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K
+ dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R
+ dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W
+ dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z
+.End
+
+.Set_A_K:
+ unown_set A, B, C, D, E, F, G, H, I, J, K
+.Set_L_R:
+ unown_set L, M, N, O, P, Q, R
+.Set_S_W:
+ unown_set S, T, U, V, W
+.Set_X_Z:
+ unown_set X, Y, Z
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 14:39:04 +0000