summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--battle/core.asm4
-rw-r--r--constants/map_constants.asm38
-rw-r--r--constants/pokemon_data_constants.asm6
-rw-r--r--data/wild/fish.asm72
-rw-r--r--data/wild/johto_grass.asm2808
-rw-r--r--data/wild/johto_water.asm458
-rw-r--r--data/wild/kanto_grass.asm1382
-rw-r--r--data/wild/kanto_water.asm290
-rw-r--r--data/wild/swarm_grass.asm94
-rw-r--r--data/wild/swarm_water.asm2
-rw-r--r--engine/events_2.asm16
-rw-r--r--engine/map_objects.asm2
-rw-r--r--engine/map_setup.asm2
-rw-r--r--engine/movement.asm2
-rw-r--r--engine/radio.asm8
-rw-r--r--engine/scripting.asm4
-rw-r--r--engine/spawn_points.asm68
-rw-r--r--home/map_objects.asm4
-rw-r--r--main.asm490
-rw-r--r--wram.asm2
20 files changed, 2902 insertions, 2850 deletions
diff --git a/battle/core.asm b/battle/core.asm
index e2d1cb6a6..5bb6929d7 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -8441,7 +8441,7 @@ Function3f54e: ; 3f54e
ld a, [OtherTrainerClass]
and a
jr nz, .asm_3f55a
- ld a, [wd22e]
+ ld a, [TempWildMonSpecies]
ld [CurPartySpecies], a
.asm_3f55a
@@ -8658,7 +8658,7 @@ Function3f6d0: ; 3f6d0
ld [IsInBattle], a
ld [BattleType], a
ld [AttackMissed], a
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld [OtherTrainerClass], a
ld [wd266], a
ld [wd267], a
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index dc3337b2a..49cf9c847 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -753,3 +753,41 @@ OW_RIGHT EQU $c
const SIGNPOST_IFNOTSET
const SIGNPOST_ITEM
const SIGNPOST_COPY
+
+; I'm relocating spawn constants here, so that they can be used anywhere in the disassembly.
+
+
+const_value = -1
+ const SPAWN_N_A
+
+ const SPAWN_HOME
+ const SPAWN_DEBUG
+
+ const SPAWN_PALLET
+ const SPAWN_VIRIDIAN
+ const SPAWN_PEWTER
+ const SPAWN_CERULEAN
+ const SPAWN_ROCK_TUNNEL
+ const SPAWN_VERMILION
+ const SPAWN_LAVENDER
+ const SPAWN_SAFFRON
+ const SPAWN_CELADON
+ const SPAWN_FUCHSIA
+ const SPAWN_CINNABAR
+ const SPAWN_INDIGO
+
+ const SPAWN_NEW_BARK
+ const SPAWN_CHERRYGROVE
+ const SPAWN_VIOLET
+ const SPAWN_UNION_CAVE
+ const SPAWN_AZALEA
+ const SPAWN_CIANWOOD
+ const SPAWN_GOLDENROD
+ const SPAWN_OLIVINE
+ const SPAWN_ECRUTEAK
+ const SPAWN_MAHOGANY
+ const SPAWN_LAKE
+ const SPAWN_BLACKTHORN
+ const SPAWN_MT_SILVER
+ const SPAWN_FAST_SHIP
+NUM_SPAWNS EQU const_value
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index fd84c727c..354b86b89 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -93,3 +93,9 @@ const_value SET 1
const ATK_GT_DEF
const ATK_LT_DEF
const ATK_EQ_DEF
+
+NUM_GRASSMON EQU 7
+NUM_WATERMON EQU 3
+
+GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
+WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index c44e23937..e2deb093a 100644
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -233,193 +233,193 @@ FishGroup1:
FishGroup1_Old: ; 924e3
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, KRABBY, 10
+ db -1, KRABBY, 10
FishGroup1_Good: ; 924ec
db $59, MAGIKARP, 20
db $b2, KRABBY, 20
db $e6, KRABBY, 20
- db $ff, $0, 0
+ db -1, $0, 0
FishGroup1_Super: ; 924f8
db $66, KRABBY, 40
db $b2, $0, 1
db $e6, KRABBY, 40
- db $ff, KINGLER, 40
+ db -1, KINGLER, 40
FishGroup2:
FishGroup2_Old: ; 92504
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, TENTACOOL, 10
+ db -1, TENTACOOL, 10
FishGroup2_Good: ; 9250d
db $59, MAGIKARP, 20
db $b2, TENTACOOL, 20
db $e6, CHINCHOU, 20
- db $ff, $0, 2
+ db -1, $0, 2
FishGroup2_Super: ; 92519
db $66, CHINCHOU, 40
db $b2, $0, 3
db $e6, TENTACRUEL, 40
- db $ff, LANTURN, 40
+ db -1, LANTURN, 40
FishGroup3:
FishGroup3_Old: ; 92525
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, GOLDEEN, 10
+ db -1, GOLDEEN, 10
FishGroup3_Good: ; 9252e
db $59, MAGIKARP, 20
db $b2, GOLDEEN, 20
db $e6, GOLDEEN, 20
- db $ff, $0, 4
+ db -1, $0, 4
FishGroup3_Super: ; 9253a
db $66, GOLDEEN, 40
db $b2, $0, 5
db $e6, MAGIKARP, 40
- db $ff, SEAKING, 40
+ db -1, SEAKING, 40
FishGroup4:
FishGroup4_Old: ; 92546
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, POLIWAG, 10
+ db -1, POLIWAG, 10
FishGroup4_Good: ; 9254f
db $59, MAGIKARP, 20
db $b2, POLIWAG, 20
db $e6, POLIWAG, 20
- db $ff, $0, 6
+ db -1, $0, 6
FishGroup4_Super: ; 9255b
db $66, POLIWAG, 40
db $b2, $0, 7
db $e6, MAGIKARP, 40
- db $ff, POLIWAG, 40
+ db -1, POLIWAG, 40
FishGroup5:
FishGroup5_Old: ; 92567
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, MAGIKARP, 10
+ db -1, MAGIKARP, 10
FishGroup5_Good: ; 92570
db $59, MAGIKARP, 20
db $b2, MAGIKARP, 20
db $e6, MAGIKARP, 20
- db $ff, $0, 8
+ db -1, $0, 8
FishGroup5_Super: ; 9257c
db $66, MAGIKARP, 40
db $b2, $0, 9
db $e6, MAGIKARP, 40
- db $ff, DRAGONAIR, 40
+ db -1, DRAGONAIR, 40
FishGroup6:
FishGroup6_Old: ; 92588
db $b3, MAGIKARP, 5
db $d9, MAGIKARP, 5
- db $ff, QWILFISH, 5
+ db -1, QWILFISH, 5
FishGroup6_Good: ; 92591
db $59, MAGIKARP, 20
db $b2, QWILFISH, 20
db $e6, QWILFISH, 20
- db $ff, $0, 10
+ db -1, $0, 10
FishGroup6_Super: ; 9259d
db $66, QWILFISH, 40
db $b2, $0, 11
db $e6, QWILFISH, 40
- db $ff, QWILFISH, 40
+ db -1, QWILFISH, 40
FishGroup7:
FishGroup7_Old: ; 925a9
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, REMORAID, 10
+ db -1, REMORAID, 10
FishGroup7_Good: ; 925b2
db $59, MAGIKARP, 20
db $b2, REMORAID, 20
db $e6, REMORAID, 20
- db $ff, $0, 12
+ db -1, $0, 12
FishGroup7_Super: ; 925be
db $66, REMORAID, 40
db $b2, $0, 13
db $e6, REMORAID, 40
- db $ff, REMORAID, 40
+ db -1, REMORAID, 40
FishGroup8:
FishGroup8_Old: ; 925ca
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, MAGIKARP, 10
+ db -1, MAGIKARP, 10
FishGroup8_Good: ; 925d3
db $59, MAGIKARP, 20
db $b2, MAGIKARP, 20
db $e6, MAGIKARP, 20
- db $ff, $0, 14
+ db -1, $0, 14
FishGroup8_Super: ; 925df
db $66, MAGIKARP, 40
db $b2, $0, 15
db $e6, MAGIKARP, 40
- db $ff, MAGIKARP, 40
+ db -1, MAGIKARP, 40
FishGroup9:
FishGroup9_Old: ; 925eb
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, MAGIKARP, 10
+ db -1, MAGIKARP, 10
FishGroup9_Good: ; 925f4
db $59, MAGIKARP, 10
db $b2, MAGIKARP, 10
db $e6, MAGIKARP, 10
- db $ff, $0, 16
+ db -1, $0, 16
FishGroup9_Super: ; 92600
db $66, MAGIKARP, 10
db $b2, $0, 17
db $e6, MAGIKARP, 10
- db $ff, DRAGONAIR, 10
+ db -1, DRAGONAIR, 10
FishGroup10:
FishGroup10_Old: ; 9260c
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, KRABBY, 10
+ db -1, KRABBY, 10
FishGroup10_Good: ; 92615
db $59, MAGIKARP, 20
db $b2, KRABBY, 20
db $e6, KRABBY, 20
- db $ff, $0, 18
+ db -1, $0, 18
FishGroup10_Super: ; 92621
db $66, KRABBY, 40
db $b2, $0, 19
db $e6, KINGLER, 40
- db $ff, SEADRA, 40
+ db -1, SEADRA, 40
FishGroup11:
FishGroup11_Old: ; 9262d
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, TENTACOOL, 10
+ db -1, TENTACOOL, 10
FishGroup11_Good: ; 92636
db $59, MAGIKARP, 20
db $b2, TENTACOOL, 20
db $e6, TENTACOOL, 20
- db $ff, $0, 20
+ db -1, $0, 20
FishGroup11_Super: ; 92642
db $66, TENTACOOL, 40
db $b2, $0, 21
db $e6, MAGIKARP, 40
- db $ff, QWILFISH, 40
+ db -1, QWILFISH, 40
FishGroup12:
FishGroup12_Old: ; 9264e
db $b3, MAGIKARP, 10
db $d9, MAGIKARP, 10
- db $ff, POLIWAG, 10
+ db -1, POLIWAG, 10
FishGroup12_Good: ; 92657
db $59, MAGIKARP, 20
db $b2, POLIWAG, 20
db $e6, POLIWAG, 20
- db $ff, $0, 6
+ db -1, $0, 6
FishGroup12_Super: ; 92663
db $66, POLIWAG, 40
db $b2, $0, 7
db $e6, MAGIKARP, 40
- db $ff, REMORAID, 40
+ db -1, REMORAID, 40
; 9266f
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index 619b5ff45..f241dd5d8 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -1,1650 +1,1650 @@
; Johto Pokémon in grass
- db GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map SPROUT_TOWER_2F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 3,RATTATA
- db 4,RATTATA
- db 5,RATTATA
- db 3,RATTATA
- db 6,RATTATA
- db 5,RATTATA
- db 5,RATTATA
+ db 3, RATTATA
+ db 4, RATTATA
+ db 5, RATTATA
+ db 3, RATTATA
+ db 6, RATTATA
+ db 5, RATTATA
+ db 5, RATTATA
; day
- db 3,RATTATA
- db 4,RATTATA
- db 5,RATTATA
- db 3,RATTATA
- db 6,RATTATA
- db 5,RATTATA
- db 5,RATTATA
+ db 3, RATTATA
+ db 4, RATTATA
+ db 5, RATTATA
+ db 3, RATTATA
+ db 6, RATTATA
+ db 5, RATTATA
+ db 5, RATTATA
; nite
- db 3,GASTLY
- db 4,GASTLY
- db 5,GASTLY
- db 3,RATTATA
- db 6,GASTLY
- db 5,RATTATA
- db 5,RATTATA
+ db 3, GASTLY
+ db 4, GASTLY
+ db 5, GASTLY
+ db 3, RATTATA
+ db 6, GASTLY
+ db 5, RATTATA
+ db 5, RATTATA
- db GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map SPROUT_TOWER_3F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 3,RATTATA
- db 4,RATTATA
- db 5,RATTATA
- db 3,RATTATA
- db 6,RATTATA
- db 5,RATTATA
- db 5,RATTATA
+ db 3, RATTATA
+ db 4, RATTATA
+ db 5, RATTATA
+ db 3, RATTATA
+ db 6, RATTATA
+ db 5, RATTATA
+ db 5, RATTATA
; day
- db 3,RATTATA
- db 4,RATTATA
- db 5,RATTATA
- db 3,RATTATA
- db 6,RATTATA
- db 5,RATTATA
- db 5,RATTATA
+ db 3, RATTATA
+ db 4, RATTATA
+ db 5, RATTATA
+ db 3, RATTATA
+ db 6, RATTATA
+ db 5, RATTATA
+ db 5, RATTATA
; nite
- db 3,GASTLY
- db 4,GASTLY
- db 5,GASTLY
- db 3,RATTATA
- db 6,GASTLY
- db 5,RATTATA
- db 5,RATTATA
+ db 3, GASTLY
+ db 4, GASTLY
+ db 5, GASTLY
+ db 3, RATTATA
+ db 6, GASTLY
+ db 5, RATTATA
+ db 5, RATTATA
- db GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_2F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_3F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_4F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_5F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_6F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_7F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_8F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map TIN_TOWER_9F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; day
- db 20,RATTATA
- db 21,RATTATA
- db 22,RATTATA
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, RATTATA
+ db 21, RATTATA
+ db 22, RATTATA
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
; nite
- db 20,GASTLY
- db 21,GASTLY
- db 22,GASTLY
- db 22,RATTATA
- db 23,RATTATA
- db 24,RATTATA
- db 24,RATTATA
+ db 20, GASTLY
+ db 21, GASTLY
+ db 22, GASTLY
+ db 22, RATTATA
+ db 23, RATTATA
+ db 24, RATTATA
+ db 24, RATTATA
- db GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map BURNED_TOWER_1F
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 13,RATTATA
- db 14,KOFFING
- db 15,RATTATA
- db 14,ZUBAT
- db 15,RATTATA
- db 15,RATICATE
- db 15,RATICATE
+ db 13, RATTATA
+ db 14, KOFFING
+ db 15, RATTATA
+ db 14, ZUBAT
+ db 15, RATTATA
+ db 15, RATICATE
+ db 15, RATICATE
; day
- db 13,RATTATA
- db 14,KOFFING
- db 15,RATTATA
- db 14,ZUBAT
- db 15,RATTATA
- db 15,RATICATE
- db 15,RATICATE
+ db 13, RATTATA
+ db 14, KOFFING
+ db 15, RATTATA
+ db 14, ZUBAT
+ db 15, RATTATA
+ db 15, RATICATE
+ db 15, RATICATE
; nite
- db 13,RATTATA
- db 14,KOFFING
- db 15,RATTATA
- db 14,ZUBAT
- db 15,RATTATA
- db 15,RATICATE
- db 15,RATICATE
+ db 13, RATTATA
+ db 14, KOFFING
+ db 15, RATTATA
+ db 14, ZUBAT
+ db 15, RATTATA
+ db 15, RATICATE
+ db 15, RATICATE
- db GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map BURNED_TOWER_B1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 14,RATTATA
- db 14,KOFFING
- db 16,KOFFING
- db 15,ZUBAT
- db 12,KOFFING
- db 16,KOFFING
- db 16,WEEZING
+ db 14, RATTATA
+ db 14, KOFFING
+ db 16, KOFFING
+ db 15, ZUBAT
+ db 12, KOFFING
+ db 16, KOFFING
+ db 16, WEEZING
; day
- db 14,RATTATA
- db 14,KOFFING
- db 16,KOFFING
- db 15,ZUBAT
- db 12,KOFFING
- db 16,KOFFING
- db 16,WEEZING
+ db 14, RATTATA
+ db 14, KOFFING
+ db 16, KOFFING
+ db 15, ZUBAT
+ db 12, KOFFING
+ db 16, KOFFING
+ db 16, WEEZING
; nite
- db 14,RATTATA
- db 14,KOFFING
- db 16,KOFFING
- db 15,ZUBAT
- db 12,KOFFING
- db 16,KOFFING
- db 16,WEEZING
+ db 14, RATTATA
+ db 14, KOFFING
+ db 16, KOFFING
+ db 15, ZUBAT
+ db 12, KOFFING
+ db 16, KOFFING
+ db 16, WEEZING
- db GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map NATIONAL_PARK
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 12,NIDORAN_M
- db 12,NIDORAN_F
- db 14,LEDYBA
- db 13,PIDGEY
- db 10,CATERPIE
- db 10,WEEDLE
- db 10,WEEDLE
+ db 12, NIDORAN_M
+ db 12, NIDORAN_F
+ db 14, LEDYBA
+ db 13, PIDGEY
+ db 10, CATERPIE
+ db 10, WEEDLE
+ db 10, WEEDLE
; day
- db 12,NIDORAN_F
- db 12,NIDORAN_M
- db 14,SUNKERN
- db 13,PIDGEY
- db 10,CATERPIE
- db 10,WEEDLE
- db 10,WEEDLE
+ db 12, NIDORAN_F
+ db 12, NIDORAN_M
+ db 14, SUNKERN
+ db 13, PIDGEY
+ db 10, CATERPIE
+ db 10, WEEDLE
+ db 10, WEEDLE
; nite
- db 12,PSYDUCK
- db 13,HOOTHOOT
- db 14,SPINARAK
- db 15,HOOTHOOT
- db 10,VENONAT
- db 12,VENONAT
- db 12,VENONAT
+ db 12, PSYDUCK
+ db 13, HOOTHOOT
+ db 14, SPINARAK
+ db 15, HOOTHOOT
+ db 10, VENONAT
+ db 12, VENONAT
+ db 12, VENONAT
- db GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map RUINS_OF_ALPH_OUTSIDE
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 20,NATU
- db 22,NATU
- db 18,NATU
- db 24,NATU
- db 20,SMEARGLE
- db 22,SMEARGLE
- db 22,SMEARGLE
+ db 20, NATU
+ db 22, NATU
+ db 18, NATU
+ db 24, NATU
+ db 20, SMEARGLE
+ db 22, SMEARGLE
+ db 22, SMEARGLE
; day
- db 20,NATU
- db 22,NATU
- db 18,NATU
- db 24,NATU
- db 20,SMEARGLE
- db 22,SMEARGLE
- db 22,SMEARGLE
+ db 20, NATU
+ db 22, NATU
+ db 18, NATU
+ db 24, NATU
+ db 20, SMEARGLE
+ db 22, SMEARGLE
+ db 22, SMEARGLE
; nite
- db 20,NATU
- db 22,NATU
- db 18,NATU
- db 24,NATU
- db 22,WOOPER
- db 22,QUAGSIRE
- db 22,QUAGSIRE
+ db 20, NATU
+ db 22, NATU
+ db 18, NATU
+ db 24, NATU
+ db 22, WOOPER
+ db 22, QUAGSIRE
+ db 22, QUAGSIRE
- db GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map RUINS_OF_ALPH_INNER_CHAMBER
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
; day
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
; nite
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
- db 5,UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
+ db 5, UNOWN
- db GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map UNION_CAVE_1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 6,GEODUDE
- db 6,SANDSHREW
- db 5,ZUBAT
- db 4,RATTATA
- db 7,ZUBAT
- db 6,ONIX
- db 6,ONIX
+ db 6, GEODUDE
+ db 6, SANDSHREW
+ db 5, ZUBAT
+ db 4, RATTATA
+ db 7, ZUBAT
+ db 6, ONIX
+ db 6, ONIX
; day
- db 6,GEODUDE
- db 6,SANDSHREW
- db 5,ZUBAT
- db 4,RATTATA
- db 7,ZUBAT
- db 6,ONIX
- db 6,ONIX
+ db 6, GEODUDE
+ db 6, SANDSHREW
+ db 5, ZUBAT
+ db 4, RATTATA
+ db 7, ZUBAT
+ db 6, ONIX
+ db 6, ONIX
; nite
- db 6,GEODUDE
- db 6,RATTATA
- db 5,WOOPER
- db 4,RATTATA
- db 7,ZUBAT
- db 6,ONIX
- db 6,ONIX
+ db 6, GEODUDE
+ db 6, RATTATA
+ db 5, WOOPER
+ db 4, RATTATA
+ db 7, ZUBAT
+ db 6, ONIX
+ db 6, ONIX
- db GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map UNION_CAVE_B1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 8,GEODUDE
- db 6,ZUBAT
- db 8,ZUBAT
- db 8,ONIX
- db 6,RATTATA
- db 8,RATTATA
- db 8,RATTATA
+ db 8, GEODUDE
+ db 6, ZUBAT
+ db 8, ZUBAT
+ db 8, ONIX
+ db 6, RATTATA
+ db 8, RATTATA
+ db 8, RATTATA
; day
- db 8,GEODUDE
- db 6,ZUBAT
- db 8,ZUBAT
- db 8,ONIX
- db 6,RATTATA
- db 8,RATTATA
- db 8,RATTATA
+ db 8, GEODUDE
+ db 6, ZUBAT
+ db 8, ZUBAT
+ db 8, ONIX
+ db 6, RATTATA
+ db 8, RATTATA
+ db 8, RATTATA
; nite
- db 8,GEODUDE
- db 6,ZUBAT
- db 8,WOOPER
- db 8,ONIX
- db 6,RATTATA
- db 8,RATTATA
- db 8,RATTATA
+ db 8, GEODUDE
+ db 6, ZUBAT
+ db 8, WOOPER
+ db 8, ONIX
+ db 6, RATTATA
+ db 8, RATTATA
+ db 8, RATTATA
- db GROUP_UNION_CAVE_B2F, MAP_UNION_CAVE_B2F
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map UNION_CAVE_B2F
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 22,ZUBAT
- db 22,GOLBAT
- db 22,ZUBAT
- db 21,RATICATE
- db 20,GEODUDE
- db 23,ONIX
- db 23,ONIX
+ db 22, ZUBAT
+ db 22, GOLBAT
+ db 22, ZUBAT
+ db 21, RATICATE
+ db 20, GEODUDE
+ db 23, ONIX
+ db 23, ONIX
; day
- db 22,ZUBAT
- db 22,GOLBAT
- db 22,ZUBAT
- db 21,RATICATE
- db 20,GEODUDE
- db 23,ONIX
- db 23,ONIX
+ db 22, ZUBAT
+ db 22, GOLBAT
+ db 22, ZUBAT
+ db 21, RATICATE
+ db 20, GEODUDE
+ db 23, ONIX
+ db 23, ONIX
; nite
- db 22,ZUBAT
- db 22,GOLBAT
- db 22,QUAGSIRE
- db 21,RATICATE
- db 20,GEODUDE
- db 23,ONIX
- db 23,ONIX
+ db 22, ZUBAT
+ db 22, GOLBAT
+ db 22, QUAGSIRE
+ db 21, RATICATE
+ db 20, GEODUDE
+ db 23, ONIX
+ db 23, ONIX
- db GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map SLOWPOKE_WELL_B1F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 5,ZUBAT
- db 6,ZUBAT
- db 7,ZUBAT
- db 6,SLOWPOKE
- db 8,ZUBAT
- db 8,SLOWPOKE
- db 8,SLOWPOKE
+ db 5, ZUBAT
+ db 6, ZUBAT
+ db 7, ZUBAT
+ db 6, SLOWPOKE
+ db 8, ZUBAT
+ db 8, SLOWPOKE
+ db 8, SLOWPOKE
; day
- db 5,ZUBAT
- db 6,ZUBAT
- db 7,ZUBAT
- db 6,SLOWPOKE
- db 8,ZUBAT
- db 8,SLOWPOKE
- db 8,SLOWPOKE
+ db 5, ZUBAT
+ db 6, ZUBAT
+ db 7, ZUBAT
+ db 6, SLOWPOKE
+ db 8, ZUBAT
+ db 8, SLOWPOKE
+ db 8, SLOWPOKE
; nite
- db 5,ZUBAT
- db 6,ZUBAT
- db 7,ZUBAT
- db 6,SLOWPOKE
- db 8,ZUBAT
- db 8,SLOWPOKE
- db 8,SLOWPOKE
+ db 5, ZUBAT
+ db 6, ZUBAT
+ db 7, ZUBAT
+ db 6, SLOWPOKE
+ db 8, ZUBAT
+ db 8, SLOWPOKE
+ db 8, SLOWPOKE
- db GROUP_SLOWPOKE_WELL_B2F, MAP_SLOWPOKE_WELL_B2F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map SLOWPOKE_WELL_B2F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 21,ZUBAT
- db 23,ZUBAT
- db 19,ZUBAT
- db 21,SLOWPOKE
- db 23,GOLBAT
- db 23,SLOWPOKE
- db 23,SLOWPOKE
+ db 21, ZUBAT
+ db 23, ZUBAT
+ db 19, ZUBAT
+ db 21, SLOWPOKE
+ db 23, GOLBAT
+ db 23, SLOWPOKE
+ db 23, SLOWPOKE
; day
- db 21,ZUBAT
- db 23,ZUBAT
- db 19,ZUBAT
- db 21,SLOWPOKE
- db 23,GOLBAT
- db 23,SLOWPOKE
- db 23,SLOWPOKE
+ db 21, ZUBAT
+ db 23, ZUBAT
+ db 19, ZUBAT
+ db 21, SLOWPOKE
+ db 23, GOLBAT
+ db 23, SLOWPOKE
+ db 23, SLOWPOKE
; nite
- db 21,ZUBAT
- db 23,ZUBAT
- db 19,ZUBAT
- db 21,SLOWPOKE
- db 23,GOLBAT
- db 23,SLOWPOKE
- db 23,SLOWPOKE
+ db 21, ZUBAT
+ db 23, ZUBAT
+ db 19, ZUBAT
+ db 21, SLOWPOKE
+ db 23, GOLBAT
+ db 23, SLOWPOKE
+ db 23, SLOWPOKE
- db GROUP_ILEX_FOREST, MAP_ILEX_FOREST
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map ILEX_FOREST
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 5,CATERPIE
- db 5,WEEDLE
- db 7,METAPOD
- db 7,KAKUNA
- db 7,PIDGEY
- db 6,PARAS
- db 6,PARAS
+ db 5, CATERPIE
+ db 5, WEEDLE
+ db 7, METAPOD
+ db 7, KAKUNA
+ db 7, PIDGEY
+ db 6, PARAS
+ db 6, PARAS
; day
- db 5,CATERPIE
- db 5,WEEDLE
- db 7,METAPOD
- db 7,KAKUNA
- db 7,PIDGEY
- db 6,PARAS
- db 6,PARAS
+ db 5, CATERPIE
+ db 5, WEEDLE
+ db 7, METAPOD
+ db 7, KAKUNA
+ db 7, PIDGEY
+ db 6, PARAS
+ db 6, PARAS
; nite
- db 5,ODDISH
- db 5,VENONAT
- db 7,ODDISH
- db 7,PSYDUCK
- db 7,HOOTHOOT
- db 6,PARAS
- db 6,PARAS
+ db 5, ODDISH
+ db 5, VENONAT
+ db 7, ODDISH
+ db 7, PSYDUCK
+ db 7, HOOTHOOT
+ db 6, PARAS
+ db 6, PARAS
- db GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map MOUNT_MORTAR_1F_OUTSIDE
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 14,RATTATA
- db 13,ZUBAT
- db 14,MACHOP
- db 13,GOLBAT
- db 14,GEODUDE
- db 16,RATICATE
- db 16,RATICATE
+ db 14, RATTATA
+ db 13, ZUBAT
+ db 14, MACHOP
+ db 13, GOLBAT
+ db 14, GEODUDE
+ db 16, RATICATE
+ db 16, RATICATE
; day
- db 14,RATTATA
- db 13,ZUBAT
- db 14,MACHOP
- db 13,GOLBAT
- db 14,GEODUDE
- db 16,RATICATE
- db 16,RATICATE
+ db 14, RATTATA
+ db 13, ZUBAT
+ db 14, MACHOP
+ db 13, GOLBAT
+ db 14, GEODUDE
+ db 16, RATICATE
+ db 16, RATICATE
; nite
- db 14,RATTATA
- db 13,ZUBAT
- db 14,MARILL
- db 13,GOLBAT
- db 14,GEODUDE
- db 16,RATICATE
- db 16,RATICATE
+ db 14, RATTATA
+ db 13, ZUBAT
+ db 14, MARILL
+ db 13, GOLBAT
+ db 14, GEODUDE
+ db 16, RATICATE
+ db 16, RATICATE
- db GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map MOUNT_MORTAR_1F_INSIDE
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 13,GEODUDE
- db 14,RATTATA
- db 15,MACHOP
- db 14,RATICATE
- db 15,ZUBAT
- db 15,GOLBAT
- db 15,GOLBAT
+ db 13, GEODUDE
+ db 14, RATTATA
+ db 15, MACHOP
+ db 14, RATICATE
+ db 15, ZUBAT
+ db 15, GOLBAT
+ db 15, GOLBAT
; day
- db 13,GEODUDE
- db 14,RATTATA
- db 15,MACHOP
- db 14,RATICATE
- db 15,ZUBAT
- db 15,GOLBAT
- db 15,GOLBAT
+ db 13, GEODUDE
+ db 14, RATTATA
+ db 15, MACHOP
+ db 14, RATICATE
+ db 15, ZUBAT
+ db 15, GOLBAT
+ db 15, GOLBAT
; nite
- db 13,GEODUDE
- db 14,RATTATA
- db 15,RATICATE
- db 14,ZUBAT
- db 15,MARILL
- db 15,GOLBAT
- db 15,GOLBAT
+ db 13, GEODUDE
+ db 14, RATTATA
+ db 15, RATICATE
+ db 14, ZUBAT
+ db 15, MARILL
+ db 15, GOLBAT
+ db 15, GOLBAT
- db GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map MOUNT_MORTAR_2F_INSIDE
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 31,GRAVELER
- db 32,MACHOKE
- db 31,GEODUDE
- db 30,RATICATE
- db 28,MACHOP
- db 30,GOLBAT
- db 30,GOLBAT
+ db 31, GRAVELER
+ db 32, MACHOKE
+ db 31, GEODUDE
+ db 30, RATICATE
+ db 28, MACHOP
+ db 30, GOLBAT
+ db 30, GOLBAT
; day
- db 31,GRAVELER
- db 32,MACHOKE
- db 31,GEODUDE
- db 30,RATICATE
- db 28,MACHOP
- db 30,GOLBAT
- db 30,GOLBAT
+ db 31, GRAVELER
+ db 32, MACHOKE
+ db 31, GEODUDE
+ db 30, RATICATE
+ db 28, MACHOP
+ db 30, GOLBAT
+ db 30, GOLBAT
; nite
- db 31,GRAVELER
- db 31,GEODUDE
- db 30,RATICATE
- db 30,GOLBAT
- db 28,MARILL
- db 32,GOLBAT
- db 32,GOLBAT
+ db 31, GRAVELER
+ db 31, GEODUDE
+ db 30, RATICATE
+ db 30, GOLBAT
+ db 28, MARILL
+ db 32, GOLBAT
+ db 32, GOLBAT
- db GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map MOUNT_MORTAR_B1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 15,ZUBAT
- db 17,ZUBAT
- db 17,GOLBAT
- db 16,MACHOP
- db 16,GEODUDE
- db 18,RATICATE
- db 18,RATICATE
+ db 15, ZUBAT
+ db 17, ZUBAT
+ db 17, GOLBAT
+ db 16, MACHOP
+ db 16, GEODUDE
+ db 18, RATICATE
+ db 18, RATICATE
; day
- db 15,ZUBAT
- db 17,ZUBAT
- db 17,GOLBAT
- db 16,MACHOP
- db 16,GEODUDE
- db 18,RATICATE
- db 18,RATICATE
+ db 15, ZUBAT
+ db 17, ZUBAT
+ db 17, GOLBAT
+ db 16, MACHOP
+ db 16, GEODUDE
+ db 18, RATICATE
+ db 18, RATICATE
; nite
- db 15,ZUBAT
- db 17,ZUBAT
- db 17,GOLBAT
- db 16,MARILL
- db 16,GEODUDE
- db 18,RATICATE
- db 18,RATICATE
+ db 15, ZUBAT
+ db 17, ZUBAT
+ db 17, GOLBAT
+ db 16, MARILL
+ db 16, GEODUDE
+ db 18, RATICATE
+ db 18, RATICATE
- db GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map ICE_PATH_1F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 21,SWINUB
- db 22,ZUBAT
- db 22,GOLBAT
- db 23,SWINUB
- db 24,GOLBAT
- db 22,GOLBAT
- db 22,GOLBAT
+ db 21, SWINUB
+ db 22, ZUBAT
+ db 22, GOLBAT
+ db 23, SWINUB
+ db 24, GOLBAT
+ db 22, GOLBAT
+ db 22, GOLBAT
; day
- db 21,SWINUB
- db 22,ZUBAT
- db 22,GOLBAT
- db 23,SWINUB
- db 24,GOLBAT
- db 22,GOLBAT
- db 22,GOLBAT
+ db 21, SWINUB
+ db 22, ZUBAT
+ db 22, GOLBAT
+ db 23, SWINUB
+ db 24, GOLBAT
+ db 22, GOLBAT
+ db 22, GOLBAT
; nite
- db 21,DELIBIRD
- db 22,ZUBAT
- db 22,GOLBAT
- db 23,DELIBIRD
- db 24,GOLBAT
- db 22,GOLBAT
- db 22,GOLBAT
+ db 21, DELIBIRD
+ db 22, ZUBAT
+ db 22, GOLBAT
+ db 23, DELIBIRD
+ db 24, GOLBAT
+ db 22, GOLBAT
+ db 22, GOLBAT
- db GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map ICE_PATH_B1F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 22,SWINUB
- db 23,ZUBAT
- db 23,GOLBAT
- db 24,SWINUB
- db 25,GOLBAT
- db 23,GOLBAT
- db 22,JYNX
+ db 22, SWINUB
+ db 23, ZUBAT
+ db 23, GOLBAT
+ db 24, SWINUB
+ db 25, GOLBAT
+ db 23, GOLBAT
+ db 22, JYNX
; day
- db 22,SWINUB
- db 23,ZUBAT
- db 23,GOLBAT
- db 24,SWINUB
- db 25,GOLBAT
- db 23,GOLBAT
- db 22,JYNX
+ db 22, SWINUB
+ db 23, ZUBAT
+ db 23, GOLBAT
+ db 24, SWINUB
+ db 25, GOLBAT
+ db 23, GOLBAT
+ db 22, JYNX
; nite
- db 22,DELIBIRD
- db 23,ZUBAT
- db 23,GOLBAT
- db 24,DELIBIRD
- db 25,GOLBAT
- db 23,GOLBAT
- db 22,SNEASEL
+ db 22, DELIBIRD
+ db 23, ZUBAT
+ db 23, GOLBAT
+ db 24, DELIBIRD
+ db 25, GOLBAT
+ db 23, GOLBAT
+ db 22, SNEASEL
- db GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map ICE_PATH_B2F_MAHOGANY_SIDE
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 23,SWINUB
- db 24,ZUBAT
- db 24,GOLBAT
- db 25,SWINUB
- db 26,GOLBAT
- db 22,JYNX
- db 24,JYNX
+ db 23, SWINUB
+ db 24, ZUBAT
+ db 24, GOLBAT
+ db 25, SWINUB
+ db 26, GOLBAT
+ db 22, JYNX
+ db 24, JYNX
; day
- db 23,SWINUB
- db 24,ZUBAT
- db 24,GOLBAT
- db 25,SWINUB
- db 26,GOLBAT
- db 22,JYNX
- db 24,JYNX
+ db 23, SWINUB
+ db 24, ZUBAT
+ db 24, GOLBAT
+ db 25, SWINUB
+ db 26, GOLBAT
+ db 22, JYNX
+ db 24, JYNX
; nite
- db 23,DELIBIRD
- db 24,ZUBAT
- db 24,GOLBAT
- db 25,DELIBIRD
- db 26,GOLBAT
- db 22,SNEASEL
- db 24,SNEASEL
+ db 23, DELIBIRD
+ db 24, ZUBAT
+ db 24, GOLBAT
+ db 25, DELIBIRD
+ db 26, GOLBAT
+ db 22, SNEASEL
+ db 24, SNEASEL
- db GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map ICE_PATH_B2F_BLACKTHORN_SIDE
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 23,SWINUB
- db 24,ZUBAT
- db 24,GOLBAT
- db 25,SWINUB
- db 26,GOLBAT
- db 22,JYNX
- db 24,JYNX
+ db 23, SWINUB
+ db 24, ZUBAT
+ db 24, GOLBAT
+ db 25, SWINUB
+ db 26, GOLBAT
+ db 22, JYNX
+ db 24, JYNX
; day
- db 23,SWINUB
- db 24,ZUBAT
- db 24,GOLBAT
- db 25,SWINUB
- db 26,GOLBAT
- db 22,JYNX
- db 24,JYNX
+ db 23, SWINUB
+ db 24, ZUBAT
+ db 24, GOLBAT
+ db 25, SWINUB
+ db 26, GOLBAT
+ db 22, JYNX
+ db 24, JYNX
; nite
- db 23,DELIBIRD
- db 24,ZUBAT
- db 24,GOLBAT
- db 25,DELIBIRD
- db 26,GOLBAT
- db 22,SNEASEL
- db 24,SNEASEL
+ db 23, DELIBIRD
+ db 24, ZUBAT
+ db 24, GOLBAT
+ db 25, DELIBIRD
+ db 26, GOLBAT
+ db 22, SNEASEL
+ db 24, SNEASEL
- db GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map ICE_PATH_B3F
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 24,SWINUB
- db 25,ZUBAT
- db 25,GOLBAT
- db 26,SWINUB
- db 22,JYNX
- db 24,JYNX
- db 26,JYNX
+ db 24, SWINUB
+ db 25, ZUBAT
+ db 25, GOLBAT
+ db 26, SWINUB
+ db 22, JYNX
+ db 24, JYNX
+ db 26, JYNX
; day
- db 24,SWINUB
- db 25,ZUBAT
- db 25,GOLBAT
- db 26,SWINUB
- db 22,JYNX
- db 24,JYNX
- db 26,JYNX
+ db 24, SWINUB
+ db 25, ZUBAT
+ db 25, GOLBAT
+ db 26, SWINUB
+ db 22, JYNX
+ db 24, JYNX
+ db 26, JYNX
; nite
- db 24,DELIBIRD
- db 25,ZUBAT
- db 25,GOLBAT
- db 26,DELIBIRD
- db 22,SNEASEL
- db 24,SNEASEL
- db 26,SNEASEL
+ db 24, DELIBIRD
+ db 25, ZUBAT
+ db 25, GOLBAT
+ db 26, DELIBIRD
+ db 22, SNEASEL
+ db 24, SNEASEL
+ db 26, SNEASEL
- db GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_NW
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; day
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; nite
- db 22,KRABBY
- db 23,ZUBAT
- db 22,KRABBY
- db 24,KRABBY
- db 25,GOLBAT
- db 24,GOLBAT
- db 24,GOLBAT
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, KRABBY
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, GOLBAT
+ db 24, GOLBAT
- db GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_NE
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; day
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; nite
- db 22,KRABBY
- db 23,ZUBAT
- db 22,KRABBY
- db 24,KRABBY
- db 25,GOLBAT
- db 24,GOLBAT
- db 24,GOLBAT
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, KRABBY
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, GOLBAT
+ db 24, GOLBAT
- db GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_SW
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; day
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; nite
- db 22,KRABBY
- db 23,ZUBAT
- db 22,KRABBY
- db 24,KRABBY
- db 25,GOLBAT
- db 24,GOLBAT
- db 24,GOLBAT
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, KRABBY
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, GOLBAT
+ db 24, GOLBAT
- db GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_CAVE
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; day
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; nite
- db 22,KRABBY
- db 23,ZUBAT
- db 22,KRABBY
- db 24,KRABBY
- db 25,GOLBAT
- db 24,GOLBAT
- db 24,GOLBAT
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, KRABBY
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, GOLBAT
+ db 24, GOLBAT
- db GROUP_WHIRL_ISLAND_SE, MAP_WHIRL_ISLAND_SE
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_SE
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; day
- db 22,KRABBY
- db 23,ZUBAT
- db 22,SEEL
- db 24,KRABBY
- db 25,GOLBAT
- db 24,SEEL
- db 24,SEEL
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, SEEL
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, SEEL
+ db 24, SEEL
; nite
- db 22,KRABBY
- db 23,ZUBAT
- db 22,KRABBY
- db 24,KRABBY
- db 25,GOLBAT
- db 24,GOLBAT
- db 24,GOLBAT
+ db 22, KRABBY
+ db 23, ZUBAT
+ db 22, KRABBY
+ db 24, KRABBY
+ db 25, GOLBAT
+ db 24, GOLBAT
+ db 24, GOLBAT
- db GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_B1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 23,KRABBY
- db 24,ZUBAT
- db 23,SEEL
- db 25,KRABBY
- db 26,GOLBAT
- db 25,SEEL
- db 25,SEEL
+ db 23, KRABBY
+ db 24, ZUBAT
+ db 23, SEEL
+ db 25, KRABBY
+ db 26, GOLBAT
+ db 25, SEEL
+ db 25, SEEL
; day
- db 23,KRABBY
- db 24,ZUBAT
- db 23,SEEL
- db 25,KRABBY
- db 26,GOLBAT
- db 25,SEEL
- db 25,SEEL
+ db 23, KRABBY
+ db 24, ZUBAT
+ db 23, SEEL
+ db 25, KRABBY
+ db 26, GOLBAT
+ db 25, SEEL
+ db 25, SEEL
; nite
- db 23,KRABBY
- db 24,ZUBAT
- db 23,KRABBY
- db 25,KRABBY
- db 26,GOLBAT
- db 25,GOLBAT
- db 25,GOLBAT
+ db 23, KRABBY
+ db 24, ZUBAT
+ db 23, KRABBY
+ db 25, KRABBY
+ db 26, GOLBAT
+ db 25, GOLBAT
+ db 25, GOLBAT
- db GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_B2F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 24,KRABBY
- db 25,ZUBAT
- db 24,SEEL
- db 26,KRABBY
- db 27,GOLBAT
- db 26,SEEL
- db 26,SEEL
+ db 24, KRABBY
+ db 25, ZUBAT
+ db 24, SEEL
+ db 26, KRABBY
+ db 27, GOLBAT
+ db 26, SEEL
+ db 26, SEEL
; day
- db 24,KRABBY
- db 25,ZUBAT
- db 24,SEEL
- db 26,KRABBY
- db 27,GOLBAT
- db 26,SEEL
- db 26,SEEL
+ db 24, KRABBY
+ db 25, ZUBAT
+ db 24, SEEL
+ db 26, KRABBY
+ db 27, GOLBAT
+ db 26, SEEL
+ db 26, SEEL
; nite
- db 24,KRABBY
- db 25,ZUBAT
- db 24,KRABBY
- db 26,KRABBY
- db 27,GOLBAT
- db 26,GOLBAT
- db 26,GOLBAT
+ db 24, KRABBY
+ db 25, ZUBAT
+ db 24, KRABBY
+ db 26, KRABBY
+ db 27, GOLBAT
+ db 26, GOLBAT
+ db 26, GOLBAT
- db GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map WHIRL_ISLAND_LUGIA_CHAMBER
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 25,KRABBY
- db 26,ZUBAT
- db 25,SEEL
- db 27,KRABBY
- db 28,GOLBAT
- db 27,SEEL
- db 27,SEEL
+ db 25, KRABBY
+ db 26, ZUBAT
+ db 25, SEEL
+ db 27, KRABBY
+ db 28, GOLBAT
+ db 27, SEEL
+ db 27, SEEL
; day
- db 25,KRABBY
- db 26,ZUBAT
- db 25,SEEL
- db 27,KRABBY
- db 28,GOLBAT
- db 27,SEEL
- db 27,SEEL
+ db 25, KRABBY
+ db 26, ZUBAT
+ db 25, SEEL
+ db 27, KRABBY
+ db 28, GOLBAT
+ db 27, SEEL
+ db 27, SEEL
; nite
- db 25,KRABBY
- db 26,ZUBAT
- db 25,KRABBY
- db 27,KRABBY
- db 28,GOLBAT
- db 27,GOLBAT
- db 27,GOLBAT
+ db 25, KRABBY
+ db 26, ZUBAT
+ db 25, KRABBY
+ db 27, KRABBY
+ db 28, GOLBAT
+ db 27, GOLBAT
+ db 27, GOLBAT
- db GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map SILVER_CAVE_ROOM_1
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 43,GRAVELER
- db 44,URSARING
- db 42,ONIX
- db 45,MAGMAR
- db 45,GOLBAT
- db 20,LARVITAR
- db 15,LARVITAR
+ db 43, GRAVELER
+ db 44, URSARING
+ db 42, ONIX
+ db 45, MAGMAR
+ db 45, GOLBAT
+ db 20, LARVITAR
+ db 15, LARVITAR
; day
- db 43,GRAVELER
- db 44,URSARING
- db 42,ONIX
- db 45,MAGMAR
- db 45,GOLBAT
- db 20,LARVITAR
- db 15,LARVITAR
+ db 43, GRAVELER
+ db 44, URSARING
+ db 42, ONIX
+ db 45, MAGMAR
+ db 45, GOLBAT
+ db 20, LARVITAR
+ db 15, LARVITAR
; nite
- db 43,GRAVELER
- db 44,GOLBAT
- db 42,ONIX
- db 42,GOLBAT
- db 45,GOLDUCK
- db 46,GOLBAT
- db 46,GOLBAT
+ db 43, GRAVELER
+ db 44, GOLBAT
+ db 42, ONIX
+ db 42, GOLBAT
+ db 45, GOLDUCK
+ db 46, GOLBAT
+ db 46, GOLBAT
- db GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map SILVER_CAVE_ROOM_2
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 48,GOLBAT
- db 48,MACHOKE
- db 47,URSARING
- db 46,PARASECT
- db 48,PARASECT
- db 15,LARVITAR
- db 20,LARVITAR
+ db 48, GOLBAT
+ db 48, MACHOKE
+ db 47, URSARING
+ db 46, PARASECT
+ db 48, PARASECT
+ db 15, LARVITAR
+ db 20, LARVITAR
; day
- db 48,GOLBAT
- db 48,MACHOKE
- db 47,URSARING
- db 46,PARASECT
- db 48,PARASECT
- db 15,LARVITAR
- db 20,LARVITAR
+ db 48, GOLBAT
+ db 48, MACHOKE
+ db 47, URSARING
+ db 46, PARASECT
+ db 48, PARASECT
+ db 15, LARVITAR
+ db 20, LARVITAR
; nite
- db 48,GOLBAT
- db 48,GOLDUCK
- db 46,GOLBAT
- db 46,PARASECT
- db 48,PARASECT
- db 45,MISDREAVUS
- db 45,MISDREAVUS
+ db 48, GOLBAT
+ db 48, GOLDUCK
+ db 46, GOLBAT
+ db 46, PARASECT
+ db 48, PARASECT
+ db 45, MISDREAVUS
+ db 45, MISDREAVUS
- db GROUP_SILVER_CAVE_ROOM_3, MAP_SILVER_CAVE_ROOM_3
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map SILVER_CAVE_ROOM_3
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 51,GOLBAT
- db 48,ONIX
- db 48,GRAVELER
- db 50,URSARING
- db 20,LARVITAR
- db 15,LARVITAR
- db 20,PUPITAR
+ db 51, GOLBAT
+ db 48, ONIX
+ db 48, GRAVELER
+ db 50, URSARING
+ db 20, LARVITAR
+ db 15, LARVITAR
+ db 20, PUPITAR
; day
- db 51,GOLBAT
- db 48,ONIX
- db 48,GRAVELER
- db 50,URSARING
- db 20,LARVITAR
- db 15,LARVITAR
- db 20,PUPITAR
+ db 51, GOLBAT
+ db 48, ONIX
+ db 48, GRAVELER
+ db 50, URSARING
+ db 20, LARVITAR
+ db 15, LARVITAR
+ db 20, PUPITAR
; nite
- db 51,GOLBAT
- db 48,ONIX
- db 48,GRAVELER
- db 49,GOLBAT
- db 45,GOLDUCK
- db 53,GOLBAT
- db 53,GOLBAT
+ db 51, GOLBAT
+ db 48, ONIX
+ db 48, GRAVELER
+ db 49, GOLBAT
+ db 45, GOLDUCK
+ db 53, GOLBAT
+ db 53, GOLBAT
- db GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map SILVER_CAVE_ITEM_ROOMS
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 48,GOLBAT
- db 46,GOLBAT
- db 50,GOLBAT
- db 46,PARASECT
- db 48,PARASECT
- db 50,PARASECT
- db 52,PARASECT
+ db 48, GOLBAT
+ db 46, GOLBAT
+ db 50, GOLBAT
+ db 46, PARASECT
+ db 48, PARASECT
+ db 50, PARASECT
+ db 52, PARASECT
; day
- db 48,GOLBAT
- db 46,GOLBAT
- db 50,GOLBAT
- db 46,PARASECT
- db 48,PARASECT
- db 50,PARASECT
- db 52,PARASECT
+ db 48, GOLBAT
+ db 46, GOLBAT
+ db 50, GOLBAT
+ db 46, PARASECT
+ db 48, PARASECT
+ db 50, PARASECT
+ db 52, PARASECT
; nite
- db 45,MISDREAVUS
- db 48,GOLBAT
- db 50,GOLBAT
- db 46,PARASECT
- db 48,PARASECT
- db 50,PARASECT
- db 52,PARASECT
+ db 45, MISDREAVUS
+ db 48, GOLBAT
+ db 50, GOLBAT
+ db 46, PARASECT
+ db 48, PARASECT
+ db 50, PARASECT
+ db 52, PARASECT
- db GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map DARK_CAVE_VIOLET_ENTRANCE
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 3,GEODUDE
- db 2,ZUBAT
- db 2,GEODUDE
- db 4,GEODUDE
- db 2,TEDDIURSA
- db 4,ZUBAT
- db 4,DUNSPARCE
+ db 3, GEODUDE
+ db 2, ZUBAT
+ db 2, GEODUDE
+ db 4, GEODUDE
+ db 2, TEDDIURSA
+ db 4, ZUBAT
+ db 4, DUNSPARCE
; day
- db 3,GEODUDE
- db 2,ZUBAT
- db 2,GEODUDE
- db 4,GEODUDE
- db 2,ZUBAT
- db 4,ZUBAT
- db 4,DUNSPARCE
+ db 3, GEODUDE
+ db 2, ZUBAT
+ db 2, GEODUDE
+ db 4, GEODUDE
+ db 2, ZUBAT
+ db 4, ZUBAT
+ db 4, DUNSPARCE
; nite
- db 3,GEODUDE
- db 2,ZUBAT
- db 2,GEODUDE
- db 4,GEODUDE
- db 2,ZUBAT
- db 4,ZUBAT
- db 4,DUNSPARCE
+ db 3, GEODUDE
+ db 2, ZUBAT
+ db 2, GEODUDE
+ db 4, GEODUDE
+ db 2, ZUBAT
+ db 4, ZUBAT
+ db 4, DUNSPARCE
- db GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map DARK_CAVE_BLACKTHORN_ENTRANCE
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 23,GEODUDE
- db 23,ZUBAT
- db 25,GRAVELER
- db 25,URSARING
- db 20,TEDDIURSA
- db 23,GOLBAT
- db 23,GOLBAT
+ db 23, GEODUDE
+ db 23, ZUBAT
+ db 25, GRAVELER
+ db 25, URSARING
+ db 20, TEDDIURSA
+ db 23, GOLBAT
+ db 23, GOLBAT
; day
- db 23,GEODUDE
- db 23,ZUBAT
- db 25,GRAVELER
- db 25,URSARING
- db 30,URSARING
- db 23,GOLBAT
- db 23,GOLBAT
+ db 23, GEODUDE
+ db 23, ZUBAT
+ db 25, GRAVELER
+ db 25, URSARING
+ db 30, URSARING
+ db 23, GOLBAT
+ db 23, GOLBAT
; nite
- db 23,GEODUDE
- db 23,ZUBAT
- db 25,GRAVELER
- db 20,WOBBUFFET
- db 25,WOBBUFFET
- db 23,GOLBAT
- db 23,GOLBAT
+ db 23, GEODUDE
+ db 23, ZUBAT
+ db 25, GRAVELER
+ db 20, WOBBUFFET
+ db 25, WOBBUFFET
+ db 23, GOLBAT
+ db 23, GOLBAT
- db GROUP_ROUTE_29, MAP_ROUTE_29
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_29
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 2,PIDGEY
- db 2,SENTRET
- db 3,PIDGEY
- db 3,SENTRET
- db 2,RATTATA
- db 3,HOPPIP
- db 3,HOPPIP
+ db 2, PIDGEY
+ db 2, SENTRET
+ db 3, PIDGEY
+ db 3, SENTRET
+ db 2, RATTATA
+ db 3, HOPPIP
+ db 3, HOPPIP
; day
- db 2,PIDGEY
- db 2,SENTRET
- db 3,PIDGEY
- db 3,SENTRET
- db 2,RATTATA
- db 3,HOPPIP
- db 3,HOPPIP
+ db 2, PIDGEY
+ db 2, SENTRET
+ db 3, PIDGEY
+ db 3, SENTRET
+ db 2, RATTATA
+ db 3, HOPPIP
+ db 3, HOPPIP
; nite
- db 2,HOOTHOOT
- db 2,RATTATA
- db 3,HOOTHOOT
- db 3,RATTATA
- db 2,RATTATA
- db 3,HOOTHOOT
- db 3,HOOTHOOT
+ db 2, HOOTHOOT
+ db 2, RATTATA
+ db 3, HOOTHOOT
+ db 3, RATTATA
+ db 2, RATTATA
+ db 3, HOOTHOOT
+ db 3, HOOTHOOT
- db GROUP_ROUTE_30, MAP_ROUTE_30
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_30
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 3,LEDYBA
- db 3,CATERPIE
- db 4,CATERPIE
- db 4,PIDGEY
- db 3,WEEDLE
- db 4,HOPPIP
- db 4,HOPPIP
+ db 3, LEDYBA
+ db 3, CATERPIE
+ db 4, CATERPIE
+ db 4, PIDGEY
+ db 3, WEEDLE
+ db 4, HOPPIP
+ db 4, HOPPIP
; day
- db 3,PIDGEY
- db 3,CATERPIE
- db 4,CATERPIE
- db 4,PIDGEY
- db 3,WEEDLE
- db 4,HOPPIP
- db 4,HOPPIP
+ db 3, PIDGEY
+ db 3, CATERPIE
+ db 4, CATERPIE
+ db 4, PIDGEY
+ db 3, WEEDLE
+ db 4, HOPPIP
+ db 4, HOPPIP
; nite
- db 3,SPINARAK
- db 3,HOOTHOOT
- db 4,POLIWAG
- db 4,HOOTHOOT
- db 3,ZUBAT
- db 4,HOOTHOOT
- db 4,HOOTHOOT
+ db 3, SPINARAK
+ db 3, HOOTHOOT
+ db 4, POLIWAG
+ db 4, HOOTHOOT
+ db 3, ZUBAT
+ db 4, HOOTHOOT
+ db 4, HOOTHOOT
- db GROUP_ROUTE_31, MAP_ROUTE_31
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_31
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 4,LEDYBA
- db 4,CATERPIE
- db 5,BELLSPROUT
- db 5,PIDGEY
- db 4,WEEDLE
- db 5,HOPPIP
- db 5,HOPPIP
+ db 4, LEDYBA
+ db 4, CATERPIE
+ db 5, BELLSPROUT
+ db 5, PIDGEY
+ db 4, WEEDLE
+ db 5, HOPPIP
+ db 5, HOPPIP
; day
- db 4,PIDGEY
- db 4,CATERPIE
- db 5,BELLSPROUT
- db 5,PIDGEY
- db 4,WEEDLE
- db 5,HOPPIP
- db 5,HOPPIP
+ db 4, PIDGEY
+ db 4, CATERPIE
+ db 5, BELLSPROUT
+ db 5, PIDGEY
+ db 4, WEEDLE
+ db 5, HOPPIP
+ db 5, HOPPIP
; nite
- db 4,SPINARAK
- db 4,POLIWAG
- db 5,BELLSPROUT
- db 5,HOOTHOOT
- db 4,ZUBAT
- db 5,GASTLY
- db 5,GASTLY
+ db 4, SPINARAK
+ db 4, POLIWAG
+ db 5, BELLSPROUT
+ db 5, HOOTHOOT
+ db 4, ZUBAT
+ db 5, GASTLY
+ db 5, GASTLY
- db GROUP_ROUTE_32, MAP_ROUTE_32
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_32
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 4,EKANS
- db 5,RATTATA
- db 7,BELLSPROUT
- db 6,HOPPIP
- db 7,PIDGEY
- db 7,HOPPIP
- db 7,HOPPIP
+ db 4, EKANS
+ db 5, RATTATA
+ db 7, BELLSPROUT
+ db 6, HOPPIP
+ db 7, PIDGEY
+ db 7, HOPPIP
+ db 7, HOPPIP
; day
- db 4,EKANS
- db 5,RATTATA
- db 7,BELLSPROUT
- db 6,HOPPIP
- db 7,PIDGEY
- db 7,HOPPIP
- db 7,HOPPIP
+ db 4, EKANS
+ db 5, RATTATA
+ db 7, BELLSPROUT
+ db 6, HOPPIP
+ db 7, PIDGEY
+ db 7, HOPPIP
+ db 7, HOPPIP
; nite
- db 4,WOOPER
- db 5,RATTATA
- db 7,BELLSPROUT
- db 6,ZUBAT
- db 7,HOOTHOOT
- db 7,GASTLY
- db 7,GASTLY
+ db 4, WOOPER
+ db 5, RATTATA
+ db 7, BELLSPROUT
+ db 6, ZUBAT
+ db 7, HOOTHOOT
+ db 7, GASTLY
+ db 7, GASTLY
- db GROUP_ROUTE_33, MAP_ROUTE_33
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_33
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 6,RATTATA
- db 6,SPEAROW
- db 6,GEODUDE
- db 6,HOPPIP
- db 7,EKANS
- db 7,HOPPIP
- db 7,HOPPIP
+ db 6, RATTATA
+ db 6, SPEAROW
+ db 6, GEODUDE
+ db 6, HOPPIP
+ db 7, EKANS
+ db 7, HOPPIP
+ db 7, HOPPIP
; day
- db 6,RATTATA
- db 6,SPEAROW
- db 6,GEODUDE
- db 6,HOPPIP
- db 7,EKANS
- db 7,HOPPIP
- db 7,HOPPIP
+ db 6, RATTATA
+ db 6, SPEAROW
+ db 6, GEODUDE
+ db 6, HOPPIP
+ db 7, EKANS
+ db 7, HOPPIP
+ db 7, HOPPIP
; nite
- db 6,RATTATA
- db 6,ZUBAT
- db 6,GEODUDE
- db 6,ZUBAT
- db 7,RATTATA
- db 7,RATTATA
- db 7,RATTATA
+ db 6, RATTATA
+ db 6, ZUBAT
+ db 6, GEODUDE
+ db 6, ZUBAT
+ db 7, RATTATA
+ db 7, RATTATA
+ db 7, RATTATA
- db GROUP_ROUTE_34, MAP_ROUTE_34
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_34
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 10,SNUBBULL
- db 11,RATTATA
- db 12,PIDGEY
- db 10,ABRA
- db 12,JIGGLYPUFF
- db 10,DITTO
- db 10,DITTO
+ db 10, SNUBBULL
+ db 11, RATTATA
+ db 12, PIDGEY
+ db 10, ABRA
+ db 12, JIGGLYPUFF
+ db 10, DITTO
+ db 10, DITTO
; day
- db 10,SNUBBULL
- db 11,RATTATA
- db 12,PIDGEY
- db 10,ABRA
- db 12,JIGGLYPUFF
- db 10,DITTO
- db 10,DITTO
+ db 10, SNUBBULL
+ db 11, RATTATA
+ db 12, PIDGEY
+ db 10, ABRA
+ db 12, JIGGLYPUFF
+ db 10, DITTO
+ db 10, DITTO
; nite
- db 12,DROWZEE
- db 11,RATTATA
- db 12,HOOTHOOT
- db 10,ABRA
- db 12,JIGGLYPUFF
- db 10,DITTO
- db 10,DITTO
+ db 12, DROWZEE
+ db 11, RATTATA
+ db 12, HOOTHOOT
+ db 10, ABRA
+ db 12, JIGGLYPUFF
+ db 10, DITTO
+ db 10, DITTO
- db GROUP_ROUTE_35, MAP_ROUTE_35
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_35
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 12,SNUBBULL
- db 14,PIDGEY
- db 13,GROWLITHE
- db 10,ABRA
- db 12,JIGGLYPUFF
- db 10,DITTO
- db 12,YANMA
+ db 12, SNUBBULL
+ db 14, PIDGEY
+ db 13, GROWLITHE
+ db 10, ABRA
+ db 12, JIGGLYPUFF
+ db 10, DITTO
+ db 12, YANMA
; day
- db 12,SNUBBULL
- db 14,PIDGEY
- db 13,GROWLITHE
- db 10,ABRA
- db 12,JIGGLYPUFF
- db 10,DITTO
- db 12,YANMA
+ db 12, SNUBBULL
+ db 14, PIDGEY
+ db 13, GROWLITHE
+ db 10, ABRA
+ db 12, JIGGLYPUFF
+ db 10, DITTO
+ db 12, YANMA
; nite
- db 12,DROWZEE
- db 14,HOOTHOOT
- db 13,PSYDUCK
- db 10,ABRA
- db 12,JIGGLYPUFF
- db 10,DITTO
- db 12,YANMA
+ db 12, DROWZEE
+ db 14, HOOTHOOT
+ db 13, PSYDUCK
+ db 10, ABRA
+ db 12, JIGGLYPUFF
+ db 10, DITTO
+ db 12, YANMA
- db GROUP_ROUTE_36, MAP_ROUTE_36
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_36
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 4,LEDYBA
- db 4,PIDGEY
- db 5,BELLSPROUT
- db 5,GROWLITHE
- db 5,PIDGEY
- db 6,PIDGEY
- db 6,PIDGEY
+ db 4, LEDYBA
+ db 4, PIDGEY
+ db 5, BELLSPROUT
+ db 5, GROWLITHE
+ db 5, PIDGEY
+ db 6, PIDGEY
+ db 6, PIDGEY
; day
- db 4,PIDGEY
- db 4,PIDGEY
- db 5,BELLSPROUT
- db 5,GROWLITHE
- db 5,PIDGEY
- db 6,PIDGEY
- db 6,PIDGEY
+ db 4, PIDGEY
+ db 4, PIDGEY
+ db 5, BELLSPROUT
+ db 5, GROWLITHE
+ db 5, PIDGEY
+ db 6, PIDGEY
+ db 6, PIDGEY
; nite
- db 4,SPINARAK
- db 4,HOOTHOOT
- db 5,BELLSPROUT
- db 5,HOOTHOOT
- db 5,HOOTHOOT
- db 5,GASTLY
- db 5,GASTLY
+ db 4, SPINARAK
+ db 4, HOOTHOOT
+ db 5, BELLSPROUT
+ db 5, HOOTHOOT
+ db 5, HOOTHOOT
+ db 5, GASTLY
+ db 5, GASTLY
- db GROUP_ROUTE_37, MAP_ROUTE_37
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_37
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 13,LEDYBA
- db 14,GROWLITHE
- db 15,PIDGEY
- db 16,GROWLITHE
- db 15,PIDGEOTTO
- db 15,LEDIAN
- db 15,LEDIAN
+ db 13, LEDYBA
+ db 14, GROWLITHE
+ db 15, PIDGEY
+ db 16, GROWLITHE
+ db 15, PIDGEOTTO
+ db 15, LEDIAN
+ db 15, LEDIAN
; day
- db 13,PIDGEY
- db 14,GROWLITHE
- db 15,PIDGEY
- db 16,GROWLITHE
- db 15,PIDGEOTTO
- db 15,PIDGEY
- db 15,PIDGEY
+ db 13, PIDGEY
+ db 14, GROWLITHE
+ db 15, PIDGEY
+ db 16, GROWLITHE
+ db 15, PIDGEOTTO
+ db 15, PIDGEY
+ db 15, PIDGEY
; nite
- db 13,SPINARAK
- db 14,STANTLER
- db 15,HOOTHOOT
- db 16,STANTLER
- db 15,NOCTOWL
- db 15,ARIADOS
- db 15,ARIADOS
+ db 13, SPINARAK
+ db 14, STANTLER
+ db 15, HOOTHOOT
+ db 16, STANTLER
+ db 15, NOCTOWL
+ db 15, ARIADOS
+ db 15, ARIADOS
- db GROUP_ROUTE_38, MAP_ROUTE_38
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_38
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 16,RATTATA
- db 16,RATICATE
- db 16,MAGNEMITE
- db 16,PIDGEOTTO
- db 13,TAUROS
- db 13,MILTANK
- db 13,MILTANK
+ db 16, RATTATA
+ db 16, RATICATE
+ db 16, MAGNEMITE
+ db 16, PIDGEOTTO
+ db 13, TAUROS
+ db 13, MILTANK
+ db 13, MILTANK
; day
- db 16,RATTATA
- db 16,RATICATE
- db 16,MAGNEMITE
- db 16,PIDGEOTTO
- db 13,TAUROS
- db 13,MILTANK
- db 13,MILTANK
+ db 16, RATTATA
+ db 16, RATICATE
+ db 16, MAGNEMITE
+ db 16, PIDGEOTTO
+ db 13, TAUROS
+ db 13, MILTANK
+ db 13, MILTANK
; nite
- db 16,MEOWTH
- db 16,RATICATE
- db 16,MAGNEMITE
- db 16,NOCTOWL
- db 16,MEOWTH
- db 16,MEOWTH
- db 16,MEOWTH
+ db 16, MEOWTH
+ db 16, RATICATE
+ db 16, MAGNEMITE
+ db 16, NOCTOWL
+ db 16, MEOWTH
+ db 16, MEOWTH
+ db 16, MEOWTH
- db GROUP_ROUTE_39, MAP_ROUTE_39
- db $05,$05,$05 ; encounter rates: morn/day/nite
+ map ROUTE_39
+ db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
- db 16,RATTATA
- db 16,RATICATE
- db 16,MAGNEMITE
- db 16,PIDGEOTTO
- db 15,MILTANK
- db 15,TAUROS
- db 15,TAUROS
+ db 16, RATTATA
+ db 16, RATICATE
+ db 16, MAGNEMITE
+ db 16, PIDGEOTTO
+ db 15, MILTANK
+ db 15, TAUROS
+ db 15, TAUROS
; day
- db 16,RATTATA
- db 16,RATICATE
- db 16,MAGNEMITE
- db 16,PIDGEOTTO
- db 15,MILTANK
- db 15,TAUROS
- db 15,TAUROS
+ db 16, RATTATA
+ db 16, RATICATE
+ db 16, MAGNEMITE
+ db 16, PIDGEOTTO
+ db 15, MILTANK
+ db 15, TAUROS
+ db 15, TAUROS
; nite
- db 16,MEOWTH
- db 16,RATICATE
- db 16,MAGNEMITE
- db 16,NOCTOWL
- db 18,MEOWTH
- db 18,MEOWTH
- db 18,MEOWTH
+ db 16, MEOWTH
+ db 16, RATICATE
+ db 16, MAGNEMITE
+ db 16, NOCTOWL
+ db 18, MEOWTH
+ db 18, MEOWTH
+ db 18, MEOWTH
- db GROUP_ROUTE_42, MAP_ROUTE_42
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_42
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 13,EKANS
- db 14,SPEAROW
- db 15,RATTATA
- db 16,RATICATE
- db 15,ARBOK
- db 16,FEAROW
- db 16,FEAROW
+ db 13, EKANS
+ db 14, SPEAROW
+ db 15, RATTATA
+ db 16, RATICATE
+ db 15, ARBOK
+ db 16, FEAROW
+ db 16, FEAROW
; day
- db 13,EKANS
- db 14,SPEAROW
- db 15,RATTATA
- db 16,RATICATE
- db 15,ARBOK
- db 16,FEAROW
- db 16,FEAROW
+ db 13, EKANS
+ db 14, SPEAROW
+ db 15, RATTATA
+ db 16, RATICATE
+ db 15, ARBOK
+ db 16, FEAROW
+ db 16, FEAROW
; nite
- db 13,RATTATA
- db 14,ZUBAT
- db 15,RATICATE
- db 16,GOLBAT
- db 15,MARILL
- db 16,GOLBAT
- db 16,GOLBAT
+ db 13, RATTATA
+ db 14, ZUBAT
+ db 15, RATICATE
+ db 16, GOLBAT
+ db 15, MARILL
+ db 16, GOLBAT
+ db 16, GOLBAT
- db GROUP_ROUTE_43, MAP_ROUTE_43
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_43
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 15,SENTRET
- db 16,PIDGEOTTO
- db 16,FARFETCH_D
- db 15,FURRET
- db 17,RATICATE
- db 17,FURRET
- db 17,FURRET
+ db 15, SENTRET
+ db 16, PIDGEOTTO
+ db 16, FARFETCH_D
+ db 15, FURRET
+ db 17, RATICATE
+ db 17, FURRET
+ db 17, FURRET
; day
- db 15,SENTRET
- db 16,PIDGEOTTO
- db 16,FARFETCH_D
- db 15,FURRET
- db 17,RATICATE
- db 17,FURRET
- db 17,FURRET
+ db 15, SENTRET
+ db 16, PIDGEOTTO
+ db 16, FARFETCH_D
+ db 15, FURRET
+ db 17, RATICATE
+ db 17, FURRET
+ db 17, FURRET
; nite
- db 15,VENONAT
- db 16,NOCTOWL
- db 16,RATICATE
- db 17,VENONAT
- db 17,RATICATE
- db 17,VENOMOTH
- db 17,VENOMOTH
+ db 15, VENONAT
+ db 16, NOCTOWL
+ db 16, RATICATE
+ db 17, VENONAT
+ db 17, RATICATE
+ db 17, VENOMOTH
+ db 17, VENOMOTH
- db GROUP_ROUTE_44, MAP_ROUTE_44
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_44
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 23,TANGELA
- db 22,LICKITUNG
- db 22,BELLSPROUT
- db 24,WEEPINBELL
- db 24,LICKITUNG
- db 26,LICKITUNG
- db 26,LICKITUNG
+ db 23, TANGELA
+ db 22, LICKITUNG
+ db 22, BELLSPROUT
+ db 24, WEEPINBELL
+ db 24, LICKITUNG
+ db 26, LICKITUNG
+ db 26, LICKITUNG
; day
- db 23,TANGELA
- db 22,LICKITUNG
- db 22,BELLSPROUT
- db 24,WEEPINBELL
- db 24,LICKITUNG
- db 26,LICKITUNG
- db 26,LICKITUNG
+ db 23, TANGELA
+ db 22, LICKITUNG
+ db 22, BELLSPROUT
+ db 24, WEEPINBELL
+ db 24, LICKITUNG
+ db 26, LICKITUNG
+ db 26, LICKITUNG
; nite
- db 23,TANGELA
- db 22,POLIWAG
- db 22,BELLSPROUT
- db 24,WEEPINBELL
- db 24,POLIWHIRL
- db 26,POLIWHIRL
- db 26,POLIWHIRL
+ db 23, TANGELA
+ db 22, POLIWAG
+ db 22, BELLSPROUT
+ db 24, WEEPINBELL
+ db 24, POLIWHIRL
+ db 26, POLIWHIRL
+ db 26, POLIWHIRL
- db GROUP_ROUTE_45, MAP_ROUTE_45
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_45
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 23,GEODUDE
- db 23,GRAVELER
- db 24,GLIGAR
- db 25,DONPHAN
- db 20,PHANPY
- db 27,SKARMORY
- db 27,SKARMORY
+ db 23, GEODUDE
+ db 23, GRAVELER
+ db 24, GLIGAR
+ db 25, DONPHAN
+ db 20, PHANPY
+ db 27, SKARMORY
+ db 27, SKARMORY
; day
- db 23,GEODUDE
- db 23,GRAVELER
- db 24,GLIGAR
- db 25,DONPHAN
- db 30,DONPHAN
- db 27,SKARMORY
- db 27,SKARMORY
+ db 23, GEODUDE
+ db 23, GRAVELER
+ db 24, GLIGAR
+ db 25, DONPHAN
+ db 30, DONPHAN
+ db 27, SKARMORY
+ db 27, SKARMORY
; nite
- db 23,GEODUDE
- db 23,GRAVELER
- db 24,GLIGAR
- db 25,GRAVELER
- db 27,GRAVELER
- db 27,GRAVELER
- db 27,GRAVELER
+ db 23, GEODUDE
+ db 23, GRAVELER
+ db 24, GLIGAR
+ db 25, GRAVELER
+ db 27, GRAVELER
+ db 27, GRAVELER
+ db 27, GRAVELER
- db GROUP_ROUTE_46, MAP_ROUTE_46
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_46
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 2,GEODUDE
- db 2,SPEAROW
- db 3,GEODUDE
- db 3,RATTATA
- db 2,PHANPY
- db 2,RATTATA
- db 2,RATTATA
+ db 2, GEODUDE
+ db 2, SPEAROW
+ db 3, GEODUDE
+ db 3, RATTATA
+ db 2, PHANPY
+ db 2, RATTATA
+ db 2, RATTATA
; day
- db 2,GEODUDE
- db 2,SPEAROW
- db 3,GEODUDE
- db 3,RATTATA
- db 2,RATTATA
- db 2,RATTATA
- db 2,RATTATA
+ db 2, GEODUDE
+ db 2, SPEAROW
+ db 3, GEODUDE
+ db 3, RATTATA
+ db 2, RATTATA
+ db 2, RATTATA
+ db 2, RATTATA
; nite
- db 2,GEODUDE
- db 2,RATTATA
- db 3,GEODUDE
- db 3,RATTATA
- db 2,RATTATA
- db 2,RATTATA
- db 2,RATTATA
+ db 2, GEODUDE
+ db 2, RATTATA
+ db 3, GEODUDE
+ db 3, RATTATA
+ db 2, RATTATA
+ db 2, RATTATA
+ db 2, RATTATA
- db GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map SILVER_CAVE_OUTSIDE
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 41,TANGELA
- db 42,PONYTA
- db 42,ARBOK
- db 44,RAPIDASH
- db 41,DODUO
- db 43,DODRIO
- db 43,DODRIO
+ db 41, TANGELA
+ db 42, PONYTA
+ db 42, ARBOK
+ db 44, RAPIDASH
+ db 41, DODUO
+ db 43, DODRIO
+ db 43, DODRIO
; day
- db 41,TANGELA
- db 42,PONYTA
- db 42,ARBOK
- db 44,RAPIDASH
- db 41,DODUO
- db 43,DODRIO
- db 43,DODRIO
+ db 41, TANGELA
+ db 42, PONYTA
+ db 42, ARBOK
+ db 44, RAPIDASH
+ db 41, DODUO
+ db 43, DODRIO
+ db 43, DODRIO
; nite
- db 41,TANGELA
- db 42,POLIWHIRL
- db 42,GOLBAT
- db 44,POLIWHIRL
- db 40,GOLBAT
- db 44,GOLBAT
- db 44,GOLBAT
+ db 41, TANGELA
+ db 42, POLIWHIRL
+ db 42, GOLBAT
+ db 44, POLIWHIRL
+ db 40, GOLBAT
+ db 44, GOLBAT
+ db 44, GOLBAT
- db $ff ; end
+ db -1 ; end
diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm
index d859ed986..a4d957ef0 100644
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -1,231 +1,231 @@
; Johto Pokémon in water
- db GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
- db $05 ; encounter rate
- db 15,WOOPER
- db 20,QUAGSIRE
- db 15,QUAGSIRE
-
- db GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F
- db $05 ; encounter rate
- db 15,WOOPER
- db 20,QUAGSIRE
- db 15,QUAGSIRE
-
- db GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F
- db $05 ; encounter rate
- db 15,WOOPER
- db 20,QUAGSIRE
- db 15,QUAGSIRE
-
- db GROUP_UNION_CAVE_B2F, MAP_UNION_CAVE_B2F
- db $0a ; encounter rate
- db 15,TENTACOOL
- db 20,QUAGSIRE
- db 20,TENTACRUEL
-
- db GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F
- db $05 ; encounter rate
- db 15,SLOWPOKE
- db 20,SLOWPOKE
- db 10,SLOWPOKE
-
- db GROUP_SLOWPOKE_WELL_B2F, MAP_SLOWPOKE_WELL_B2F
- db $05 ; encounter rate
- db 15,SLOWPOKE
- db 20,SLOWPOKE
- db 20,SLOWBRO
-
- db GROUP_ILEX_FOREST, MAP_ILEX_FOREST
- db $05 ; encounter rate
- db 15,PSYDUCK
- db 10,PSYDUCK
- db 15,GOLDUCK
-
- db GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE
- db $0a ; encounter rate
- db 15,GOLDEEN
- db 20,MARILL
- db 20,SEAKING
-
- db GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE
- db $05 ; encounter rate
- db 20,GOLDEEN
- db 25,MARILL
- db 25,SEAKING
-
- db GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F
- db $05 ; encounter rate
- db 15,GOLDEEN
- db 20,MARILL
- db 20,SEAKING
-
- db GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW
- db $0a ; encounter rate
- db 20,TENTACOOL
- db 15,HORSEA
- db 20,TENTACRUEL
-
- db GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F
- db $0a ; encounter rate
- db 15,HORSEA
- db 20,HORSEA
- db 20,TENTACRUEL
-
- db GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER
- db $0a ; encounter rate
- db 20,HORSEA
- db 20,TENTACRUEL
- db 20,SEADRA
-
- db GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2
- db $05 ; encounter rate
- db 35,SEAKING
- db 35,GOLDUCK
- db 35,GOLDEEN
-
- db GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
- db $05 ; encounter rate
- db 15,MAGIKARP
- db 10,MAGIKARP
- db 5,MAGIKARP
-
- db GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE
- db $05 ; encounter rate
- db 15,MAGIKARP
- db 10,MAGIKARP
- db 5,MAGIKARP
-
- db GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F
- db $0a ; encounter rate
- db 15,MAGIKARP
- db 10,MAGIKARP
- db 10,DRATINI
-
- db GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT
- db $05 ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_ROUTE_30, MAP_ROUTE_30
- db $05 ; encounter rate
- db 20,POLIWAG
- db 15,POLIWAG
- db 20,POLIWHIRL
-
- db GROUP_ROUTE_31, MAP_ROUTE_31
- db $05 ; encounter rate
- db 20,POLIWAG
- db 15,POLIWAG
- db 20,POLIWHIRL
-
- db GROUP_ROUTE_32, MAP_ROUTE_32
- db $0f ; encounter rate
- db 15,TENTACOOL
- db 20,QUAGSIRE
- db 20,TENTACRUEL
-
- db GROUP_ROUTE_34, MAP_ROUTE_34
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_ROUTE_35, MAP_ROUTE_35
- db $0a ; encounter rate
- db 20,PSYDUCK
- db 15,PSYDUCK
- db 20,GOLDUCK
-
- db GROUP_ROUTE_40, MAP_ROUTE_40
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_ROUTE_41, MAP_ROUTE_41
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 20,TENTACRUEL
- db 20,MANTINE
-
- db GROUP_ROUTE_42, MAP_ROUTE_42
- db $0a ; encounter rate
- db 20,GOLDEEN
- db 15,GOLDEEN
- db 20,SEAKING
-
- db GROUP_ROUTE_43, MAP_ROUTE_43
- db $05 ; encounter rate
- db 20,MAGIKARP
- db 15,MAGIKARP
- db 10,MAGIKARP
-
- db GROUP_ROUTE_44, MAP_ROUTE_44
- db $05 ; encounter rate
- db 25,POLIWAG
- db 20,POLIWAG
- db 25,POLIWHIRL
-
- db GROUP_ROUTE_45, MAP_ROUTE_45
- db $05 ; encounter rate
- db 20,MAGIKARP
- db 15,MAGIKARP
- db 5,MAGIKARP
-
- db GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_VIOLET_CITY, MAP_VIOLET_CITY
- db $05 ; encounter rate
- db 20,POLIWAG
- db 15,POLIWAG
- db 20,POLIWHIRL
-
- db GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
- db $05 ; encounter rate
- db 20,POLIWAG
- db 15,POLIWAG
- db 20,POLIWHIRL
-
- db GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE
- db $0f ; encounter rate
- db 15,MAGIKARP
- db 10,MAGIKARP
- db 15,GYARADOS
-
- db GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
- db $0a ; encounter rate
- db 15,MAGIKARP
- db 10,MAGIKARP
- db 5,MAGIKARP
-
- db GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE
- db $05 ; encounter rate
- db 35,POLIWHIRL
- db 40,POLIWHIRL
- db 35,POLIWAG
-
- db $ff ; end
+ map RUINS_OF_ALPH_OUTSIDE
+ db 2 percent ; encounter rate
+ db 15, WOOPER
+ db 20, QUAGSIRE
+ db 15, QUAGSIRE
+
+ map UNION_CAVE_1F
+ db 2 percent ; encounter rate
+ db 15, WOOPER
+ db 20, QUAGSIRE
+ db 15, QUAGSIRE
+
+ map UNION_CAVE_B1F
+ db 2 percent ; encounter rate
+ db 15, WOOPER
+ db 20, QUAGSIRE
+ db 15, QUAGSIRE
+
+ map UNION_CAVE_B2F
+ db 4 percent ; encounter rate
+ db 15, TENTACOOL
+ db 20, QUAGSIRE
+ db 20, TENTACRUEL
+
+ map SLOWPOKE_WELL_B1F
+ db 2 percent ; encounter rate
+ db 15, SLOWPOKE
+ db 20, SLOWPOKE
+ db 10, SLOWPOKE
+
+ map SLOWPOKE_WELL_B2F
+ db 2 percent ; encounter rate
+ db 15, SLOWPOKE
+ db 20, SLOWPOKE
+ db 20, SLOWBRO
+
+ map ILEX_FOREST
+ db 2 percent ; encounter rate
+ db 15, PSYDUCK
+ db 10, PSYDUCK
+ db 15, GOLDUCK
+
+ map MOUNT_MORTAR_1F_OUTSIDE
+ db 4 percent ; encounter rate
+ db 15, GOLDEEN
+ db 20, MARILL
+ db 20, SEAKING
+
+ map MOUNT_MORTAR_2F_INSIDE
+ db 2 percent ; encounter rate
+ db 20, GOLDEEN
+ db 25, MARILL
+ db 25, SEAKING
+
+ map MOUNT_MORTAR_B1F
+ db 2 percent ; encounter rate
+ db 15, GOLDEEN
+ db 20, MARILL
+ db 20, SEAKING
+
+ map WHIRL_ISLAND_SW
+ db 4 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, HORSEA
+ db 20, TENTACRUEL
+
+ map WHIRL_ISLAND_B2F
+ db 4 percent ; encounter rate
+ db 15, HORSEA
+ db 20, HORSEA
+ db 20, TENTACRUEL
+
+ map WHIRL_ISLAND_LUGIA_CHAMBER
+ db 4 percent ; encounter rate
+ db 20, HORSEA
+ db 20, TENTACRUEL
+ db 20, SEADRA
+
+ map SILVER_CAVE_ROOM_2
+ db 2 percent ; encounter rate
+ db 35, SEAKING
+ db 35, GOLDUCK
+ db 35, GOLDEEN
+
+ map DARK_CAVE_VIOLET_ENTRANCE
+ db 2 percent ; encounter rate
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+ db 5, MAGIKARP
+
+ map DARK_CAVE_BLACKTHORN_ENTRANCE
+ db 2 percent ; encounter rate
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+ db 5, MAGIKARP
+
+ map DRAGONS_DEN_B1F
+ db 4 percent ; encounter rate
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+ db 10, DRATINI
+
+ map OLIVINE_PORT
+ db 2 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map ROUTE_30
+ db 2 percent ; encounter rate
+ db 20, POLIWAG
+ db 15, POLIWAG
+ db 20, POLIWHIRL
+
+ map ROUTE_31
+ db 2 percent ; encounter rate
+ db 20, POLIWAG
+ db 15, POLIWAG
+ db 20, POLIWHIRL
+
+ map ROUTE_32
+ db 6 percent ; encounter rate
+ db 15, TENTACOOL
+ db 20, QUAGSIRE
+ db 20, TENTACRUEL
+
+ map ROUTE_34
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map ROUTE_35
+ db 4 percent ; encounter rate
+ db 20, PSYDUCK
+ db 15, PSYDUCK
+ db 20, GOLDUCK
+
+ map ROUTE_40
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map ROUTE_41
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 20, TENTACRUEL
+ db 20, MANTINE
+
+ map ROUTE_42
+ db 4 percent ; encounter rate
+ db 20, GOLDEEN
+ db 15, GOLDEEN
+ db 20, SEAKING
+
+ map ROUTE_43
+ db 2 percent ; encounter rate
+ db 20, MAGIKARP
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+
+ map ROUTE_44
+ db 2 percent ; encounter rate
+ db 25, POLIWAG
+ db 20, POLIWAG
+ db 25, POLIWHIRL
+
+ map ROUTE_45
+ db 2 percent ; encounter rate
+ db 20, MAGIKARP
+ db 15, MAGIKARP
+ db 5, MAGIKARP
+
+ map NEW_BARK_TOWN
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map CHERRYGROVE_CITY
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map VIOLET_CITY
+ db 2 percent ; encounter rate
+ db 20, POLIWAG
+ db 15, POLIWAG
+ db 20, POLIWHIRL
+
+ map CIANWOOD_CITY
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map OLIVINE_CITY
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map ECRUTEAK_CITY
+ db 2 percent ; encounter rate
+ db 20, POLIWAG
+ db 15, POLIWAG
+ db 20, POLIWHIRL
+
+ map LAKE_OF_RAGE
+ db 6 percent ; encounter rate
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+ db 15, GYARADOS
+
+ map BLACKTHORN_CITY
+ db 4 percent ; encounter rate
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+ db 5, MAGIKARP
+
+ map SILVER_CAVE_OUTSIDE
+ db 2 percent ; encounter rate
+ db 35, POLIWHIRL
+ db 40, POLIWHIRL
+ db 35, POLIWAG
+
+ db -1 ; end
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index 416c34363..e06627d19 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -1,813 +1,813 @@
; Kanto Pokémon in grass
- db GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE
- db $0a,$05,$14 ; encounter rates: morn/day/nite
+ map DIGLETTS_CAVE
+ db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
; morn
- db 3,DIGLETT
- db 6,DIGLETT
- db 12,DIGLETT
- db 24,DIGLETT
- db 24,DUGTRIO
- db 24,DUGTRIO
- db 24,DUGTRIO
+ db 3, DIGLETT
+ db 6, DIGLETT
+ db 12, DIGLETT
+ db 24, DIGLETT
+ db 24, DUGTRIO
+ db 24, DUGTRIO
+ db 24, DUGTRIO
; day
- db 2,DIGLETT
- db 4,DIGLETT
- db 8,DIGLETT
- db 16,DIGLETT
- db 16,DUGTRIO
- db 16,DUGTRIO
- db 16,DUGTRIO
+ db 2, DIGLETT
+ db 4, DIGLETT
+ db 8, DIGLETT
+ db 16, DIGLETT
+ db 16, DUGTRIO
+ db 16, DUGTRIO
+ db 16, DUGTRIO
; nite
- db 4,DIGLETT
- db 8,DIGLETT
- db 16,DIGLETT
- db 32,DIGLETT
- db 32,DUGTRIO
- db 32,DUGTRIO
- db 32,DUGTRIO
+ db 4, DIGLETT
+ db 8, DIGLETT
+ db 16, DIGLETT
+ db 32, DIGLETT
+ db 32, DUGTRIO
+ db 32, DUGTRIO
+ db 32, DUGTRIO
- db GROUP_MOUNT_MOON, MAP_MOUNT_MOON
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map MOUNT_MOON
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 6,ZUBAT
- db 8,GEODUDE
- db 8,SANDSHREW
- db 12,PARAS
- db 10,GEODUDE
- db 8,CLEFAIRY
- db 8,CLEFAIRY
+ db 6, ZUBAT
+ db 8, GEODUDE
+ db 8, SANDSHREW
+ db 12, PARAS
+ db 10, GEODUDE
+ db 8, CLEFAIRY
+ db 8, CLEFAIRY
; day
- db 6,ZUBAT
- db 8,GEODUDE
- db 8,SANDSHREW
- db 12,PARAS
- db 10,GEODUDE
- db 8,CLEFAIRY
- db 8,CLEFAIRY
+ db 6, ZUBAT
+ db 8, GEODUDE
+ db 8, SANDSHREW
+ db 12, PARAS
+ db 10, GEODUDE
+ db 8, CLEFAIRY
+ db 8, CLEFAIRY
; nite
- db 6,ZUBAT
- db 8,GEODUDE
- db 8,CLEFAIRY
- db 12,PARAS
- db 10,GEODUDE
- db 12,CLEFAIRY
- db 12,CLEFAIRY
+ db 6, ZUBAT
+ db 8, GEODUDE
+ db 8, CLEFAIRY
+ db 12, PARAS
+ db 10, GEODUDE
+ db 12, CLEFAIRY
+ db 12, CLEFAIRY
- db GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map ROCK_TUNNEL_1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 10,CUBONE
- db 11,GEODUDE
- db 12,MACHOP
- db 12,ZUBAT
- db 15,MACHOKE
- db 12,MAROWAK
- db 12,MAROWAK
+ db 10, CUBONE
+ db 11, GEODUDE
+ db 12, MACHOP
+ db 12, ZUBAT
+ db 15, MACHOKE
+ db 12, MAROWAK
+ db 12, MAROWAK
; day
- db 10,CUBONE
- db 11,GEODUDE
- db 12,MACHOP
- db 12,ZUBAT
- db 15,MACHOKE
- db 12,MAROWAK
- db 12,MAROWAK
+ db 10, CUBONE
+ db 11, GEODUDE
+ db 12, MACHOP
+ db 12, ZUBAT
+ db 15, MACHOKE
+ db 12, MAROWAK
+ db 12, MAROWAK
; nite
- db 12,ZUBAT
- db 11,GEODUDE
- db 12,GEODUDE
- db 17,HAUNTER
- db 15,ZUBAT
- db 15,ZUBAT
- db 15,ZUBAT
+ db 12, ZUBAT
+ db 11, GEODUDE
+ db 12, GEODUDE
+ db 17, HAUNTER
+ db 15, ZUBAT
+ db 15, ZUBAT
+ db 15, ZUBAT
- db GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map ROCK_TUNNEL_B1F
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 12,CUBONE
- db 14,GEODUDE
- db 16,ONIX
- db 12,ZUBAT
- db 15,MAROWAK
- db 15,KANGASKHAN
- db 15,KANGASKHAN
+ db 12, CUBONE
+ db 14, GEODUDE
+ db 16, ONIX
+ db 12, ZUBAT
+ db 15, MAROWAK
+ db 15, KANGASKHAN
+ db 15, KANGASKHAN
; day
- db 12,CUBONE
- db 14,GEODUDE
- db 16,ONIX
- db 12,ZUBAT
- db 15,MAROWAK
- db 15,KANGASKHAN
- db 15,KANGASKHAN
+ db 12, CUBONE
+ db 14, GEODUDE
+ db 16, ONIX
+ db 12, ZUBAT
+ db 15, MAROWAK
+ db 15, KANGASKHAN
+ db 15, KANGASKHAN
; nite
- db 12,ZUBAT
- db 14,GEODUDE
- db 16,ONIX
- db 15,ZUBAT
- db 15,HAUNTER
- db 15,GOLBAT
- db 15,GOLBAT
+ db 12, ZUBAT
+ db 14, GEODUDE
+ db 16, ONIX
+ db 15, ZUBAT
+ db 15, HAUNTER
+ db 15, GOLBAT
+ db 15, GOLBAT
- db GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map VICTORY_ROAD
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 34,GRAVELER
- db 32,RHYHORN
- db 33,ONIX
- db 34,GOLBAT
- db 35,SANDSLASH
- db 35,RHYDON
- db 35,RHYDON
+ db 34, GRAVELER
+ db 32, RHYHORN
+ db 33, ONIX
+ db 34, GOLBAT
+ db 35, SANDSLASH
+ db 35, RHYDON
+ db 35, RHYDON
; day
- db 34,GRAVELER
- db 32,RHYHORN
- db 33,ONIX
- db 34,GOLBAT
- db 35,SANDSLASH
- db 35,RHYDON
- db 35,RHYDON
+ db 34, GRAVELER
+ db 32, RHYHORN
+ db 33, ONIX
+ db 34, GOLBAT
+ db 35, SANDSLASH
+ db 35, RHYDON
+ db 35, RHYDON
; nite
- db 34,GOLBAT
- db 34,GRAVELER
- db 32,ONIX
- db 36,GRAVELER
- db 38,GRAVELER
- db 40,GRAVELER
- db 40,GRAVELER
+ db 34, GOLBAT
+ db 34, GRAVELER
+ db 32, ONIX
+ db 36, GRAVELER
+ db 38, GRAVELER
+ db 40, GRAVELER
+ db 40, GRAVELER
- db GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map TOHJO_FALLS
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 22,ZUBAT
- db 22,RATICATE
- db 24,GOLBAT
- db 21,SLOWPOKE
- db 20,RATTATA
- db 23,SLOWPOKE
- db 23,SLOWPOKE
+ db 22, ZUBAT
+ db 22, RATICATE
+ db 24, GOLBAT
+ db 21, SLOWPOKE
+ db 20, RATTATA
+ db 23, SLOWPOKE
+ db 23, SLOWPOKE
; day
- db 22,ZUBAT
- db 22,RATICATE
- db 24,GOLBAT
- db 21,SLOWPOKE
- db 20,RATTATA
- db 23,SLOWPOKE
- db 23,SLOWPOKE
+ db 22, ZUBAT
+ db 22, RATICATE
+ db 24, GOLBAT
+ db 21, SLOWPOKE
+ db 20, RATTATA
+ db 23, SLOWPOKE
+ db 23, SLOWPOKE
; nite
- db 22,ZUBAT
- db 22,RATICATE
- db 24,GOLBAT
- db 21,SLOWPOKE
- db 20,RATTATA
- db 23,SLOWPOKE
- db 23,SLOWPOKE
+ db 22, ZUBAT
+ db 22, RATICATE
+ db 24, GOLBAT
+ db 21, SLOWPOKE
+ db 20, RATTATA
+ db 23, SLOWPOKE
+ db 23, SLOWPOKE
- db GROUP_ROUTE_1, MAP_ROUTE_1
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_1
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 2,PIDGEY
- db 2,RATTATA
- db 3,SENTRET
- db 3,PIDGEY
- db 6,FURRET
- db 4,PIDGEY
- db 4,PIDGEY
+ db 2, PIDGEY
+ db 2, RATTATA
+ db 3, SENTRET
+ db 3, PIDGEY
+ db 6, FURRET
+ db 4, PIDGEY
+ db 4, PIDGEY
; day
- db 2,PIDGEY
- db 2,RATTATA
- db 3,SENTRET
- db 3,PIDGEY
- db 6,FURRET
- db 4,PIDGEY
- db 4,PIDGEY
+ db 2, PIDGEY
+ db 2, RATTATA
+ db 3, SENTRET
+ db 3, PIDGEY
+ db 6, FURRET
+ db 4, PIDGEY
+ db 4, PIDGEY
; nite
- db 2,HOOTHOOT
- db 2,RATTATA
- db 3,RATTATA
- db 3,HOOTHOOT
- db 6,RATICATE
- db 4,HOOTHOOT
- db 4,HOOTHOOT
+ db 2, HOOTHOOT
+ db 2, RATTATA
+ db 3, RATTATA
+ db 3, HOOTHOOT
+ db 6, RATICATE
+ db 4, HOOTHOOT
+ db 4, HOOTHOOT
- db GROUP_ROUTE_2, MAP_ROUTE_2
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_2
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 3,CATERPIE
- db 3,LEDYBA
- db 5,PIDGEY
- db 7,BUTTERFREE
- db 7,LEDIAN
- db 4,PIKACHU
- db 4,PIKACHU
+ db 3, CATERPIE
+ db 3, LEDYBA
+ db 5, PIDGEY
+ db 7, BUTTERFREE
+ db 7, LEDIAN
+ db 4, PIKACHU
+ db 4, PIKACHU
; day
- db 3,CATERPIE
- db 3,PIDGEY
- db 5,PIDGEY
- db 7,BUTTERFREE
- db 7,PIDGEOTTO
- db 4,PIKACHU
- db 4,PIKACHU
+ db 3, CATERPIE
+ db 3, PIDGEY
+ db 5, PIDGEY
+ db 7, BUTTERFREE
+ db 7, PIDGEOTTO
+ db 4, PIKACHU
+ db 4, PIKACHU
; nite
- db 3,HOOTHOOT
- db 3,SPINARAK
- db 5,HOOTHOOT
- db 7,NOCTOWL
- db 7,ARIADOS
- db 4,NOCTOWL
- db 4,NOCTOWL
+ db 3, HOOTHOOT
+ db 3, SPINARAK
+ db 5, HOOTHOOT
+ db 7, NOCTOWL
+ db 7, ARIADOS
+ db 4, NOCTOWL
+ db 4, NOCTOWL
- db GROUP_ROUTE_3, MAP_ROUTE_3
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_3
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 5,SPEAROW
- db 5,RATTATA
- db 8,EKANS
- db 10,RATICATE
- db 10,ARBOK
- db 10,SANDSHREW
- db 10,SANDSHREW
+ db 5, SPEAROW
+ db 5, RATTATA
+ db 8, EKANS
+ db 10, RATICATE
+ db 10, ARBOK
+ db 10, SANDSHREW
+ db 10, SANDSHREW
; day
- db 5,SPEAROW
- db 5,RATTATA
- db 8,EKANS
- db 10,RATICATE
- db 10,ARBOK
- db 10,SANDSHREW
- db 10,SANDSHREW
+ db 5, SPEAROW
+ db 5, RATTATA
+ db 8, EKANS
+ db 10, RATICATE
+ db 10, ARBOK
+ db 10, SANDSHREW
+ db 10, SANDSHREW
; nite
- db 5,RATTATA
- db 10,RATTATA
- db 10,RATICATE
- db 6,ZUBAT
- db 5,RATTATA
- db 6,CLEFAIRY
- db 6,CLEFAIRY
+ db 5, RATTATA
+ db 10, RATTATA
+ db 10, RATICATE
+ db 6, ZUBAT
+ db 5, RATTATA
+ db 6, CLEFAIRY
+ db 6, CLEFAIRY
- db GROUP_ROUTE_4, MAP_ROUTE_4
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_4
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 5,SPEAROW
- db 5,RATTATA
- db 8,EKANS
- db 10,RATICATE
- db 10,ARBOK
- db 10,SANDSHREW
- db 10,SANDSHREW
+ db 5, SPEAROW
+ db 5, RATTATA
+ db 8, EKANS
+ db 10, RATICATE
+ db 10, ARBOK
+ db 10, SANDSHREW
+ db 10, SANDSHREW
; day
- db 5,SPEAROW
- db 5,RATTATA
- db 8,EKANS
- db 10,RATICATE
- db 10,ARBOK
- db 10,SANDSHREW
- db 10,SANDSHREW
+ db 5, SPEAROW
+ db 5, RATTATA
+ db 8, EKANS
+ db 10, RATICATE
+ db 10, ARBOK
+ db 10, SANDSHREW
+ db 10, SANDSHREW
; nite
- db 5,RATTATA
- db 10,RATTATA
- db 10,RATICATE
- db 6,ZUBAT
- db 5,RATTATA
- db 6,CLEFAIRY
- db 6,CLEFAIRY
+ db 5, RATTATA
+ db 10, RATTATA
+ db 10, RATICATE
+ db 6, ZUBAT
+ db 5, RATTATA
+ db 6, CLEFAIRY
+ db 6, CLEFAIRY
- db GROUP_ROUTE_5, MAP_ROUTE_5
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_5
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 13,PIDGEY
- db 13,SNUBBULL
- db 15,PIDGEOTTO
- db 12,ABRA
- db 14,JIGGLYPUFF
- db 14,ABRA
- db 14,ABRA
+ db 13, PIDGEY
+ db 13, SNUBBULL
+ db 15, PIDGEOTTO
+ db 12, ABRA
+ db 14, JIGGLYPUFF
+ db 14, ABRA
+ db 14, ABRA
; day
- db 13,PIDGEY
- db 13,SNUBBULL
- db 15,PIDGEOTTO
- db 12,ABRA
- db 14,JIGGLYPUFF
- db 14,ABRA
- db 14,ABRA
+ db 13, PIDGEY
+ db 13, SNUBBULL
+ db 15, PIDGEOTTO
+ db 12, ABRA
+ db 14, JIGGLYPUFF
+ db 14, ABRA
+ db 14, ABRA
; nite
- db 13,HOOTHOOT
- db 13,MEOWTH
- db 15,NOCTOWL
- db 12,ABRA
- db 14,JIGGLYPUFF
- db 14,ABRA
- db 14,ABRA
+ db 13, HOOTHOOT
+ db 13, MEOWTH
+ db 15, NOCTOWL
+ db 12, ABRA
+ db 14, JIGGLYPUFF
+ db 14, ABRA
+ db 14, ABRA
- db GROUP_ROUTE_6, MAP_ROUTE_6
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_6
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 13,RATTATA
- db 13,SNUBBULL
- db 14,MAGNEMITE
- db 15,RATICATE
- db 12,JIGGLYPUFF
- db 15,GRANBULL
- db 15,GRANBULL
+ db 13, RATTATA
+ db 13, SNUBBULL
+ db 14, MAGNEMITE
+ db 15, RATICATE
+ db 12, JIGGLYPUFF
+ db 15, GRANBULL
+ db 15, GRANBULL
; day
- db 13,RATTATA
- db 13,SNUBBULL
- db 14,MAGNEMITE
- db 15,RATICATE
- db 12,JIGGLYPUFF
- db 15,GRANBULL
- db 15,GRANBULL
+ db 13, RATTATA
+ db 13, SNUBBULL
+ db 14, MAGNEMITE
+ db 15, RATICATE
+ db 12, JIGGLYPUFF
+ db 15, GRANBULL
+ db 15, GRANBULL
; nite
- db 13,MEOWTH
- db 13,DROWZEE
- db 14,MAGNEMITE
- db 15,PSYDUCK
- db 12,JIGGLYPUFF
- db 15,RATICATE
- db 15,RATICATE
+ db 13, MEOWTH
+ db 13, DROWZEE
+ db 14, MAGNEMITE
+ db 15, PSYDUCK
+ db 12, JIGGLYPUFF
+ db 15, RATICATE
+ db 15, RATICATE
- db GROUP_ROUTE_7, MAP_ROUTE_7
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_7
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 17,RATTATA
- db 17,SPEAROW
- db 18,SNUBBULL
- db 18,RATICATE
- db 18,JIGGLYPUFF
- db 16,ABRA
- db 16,ABRA
+ db 17, RATTATA
+ db 17, SPEAROW
+ db 18, SNUBBULL
+ db 18, RATICATE
+ db 18, JIGGLYPUFF
+ db 16, ABRA
+ db 16, ABRA
; day
- db 17,RATTATA
- db 17,SPEAROW
- db 18,SNUBBULL
- db 18,RATICATE
- db 18,JIGGLYPUFF
- db 16,ABRA
- db 16,ABRA
+ db 17, RATTATA
+ db 17, SPEAROW
+ db 18, SNUBBULL
+ db 18, RATICATE
+ db 18, JIGGLYPUFF
+ db 16, ABRA
+ db 16, ABRA
; nite
- db 17,MEOWTH
- db 17,MURKROW
- db 18,HOUNDOUR
- db 18,PERSIAN
- db 18,JIGGLYPUFF
- db 16,ABRA
- db 16,ABRA
+ db 17, MEOWTH
+ db 17, MURKROW
+ db 18, HOUNDOUR
+ db 18, PERSIAN
+ db 18, JIGGLYPUFF
+ db 16, ABRA
+ db 16, ABRA
- db GROUP_ROUTE_8, MAP_ROUTE_8
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_8
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 17,SNUBBULL
- db 19,PIDGEOTTO
- db 16,ABRA
- db 17,GROWLITHE
- db 16,JIGGLYPUFF
- db 18,KADABRA
- db 18,KADABRA
+ db 17, SNUBBULL
+ db 19, PIDGEOTTO
+ db 16, ABRA
+ db 17, GROWLITHE
+ db 16, JIGGLYPUFF
+ db 18, KADABRA
+ db 18, KADABRA
; day
- db 17,SNUBBULL
- db 19,PIDGEOTTO
- db 16,ABRA
- db 17,GROWLITHE
- db 16,JIGGLYPUFF
- db 18,KADABRA
- db 18,KADABRA
+ db 17, SNUBBULL
+ db 19, PIDGEOTTO
+ db 16, ABRA
+ db 17, GROWLITHE
+ db 16, JIGGLYPUFF
+ db 18, KADABRA
+ db 18, KADABRA
; nite
- db 17,MEOWTH
- db 20,NOCTOWL
- db 16,ABRA
- db 17,HAUNTER
- db 16,JIGGLYPUFF
- db 18,KADABRA
- db 18,KADABRA
+ db 17, MEOWTH
+ db 20, NOCTOWL
+ db 16, ABRA
+ db 17, HAUNTER
+ db 16, JIGGLYPUFF
+ db 18, KADABRA
+ db 18, KADABRA
- db GROUP_ROUTE_9, MAP_ROUTE_9
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_9
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 15,RATTATA
- db 15,SPEAROW
- db 15,RATICATE
- db 15,FEAROW
- db 15,FEAROW
- db 18,MAROWAK
- db 18,MAROWAK
+ db 15, RATTATA
+ db 15, SPEAROW
+ db 15, RATICATE
+ db 15, FEAROW
+ db 15, FEAROW
+ db 18, MAROWAK
+ db 18, MAROWAK
; day
- db 15,RATTATA
- db 15,SPEAROW
- db 15,RATICATE
- db 15,FEAROW
- db 15,FEAROW
- db 18,MAROWAK
- db 18,MAROWAK
+ db 15, RATTATA
+ db 15, SPEAROW
+ db 15, RATICATE
+ db 15, FEAROW
+ db 15, FEAROW
+ db 18, MAROWAK
+ db 18, MAROWAK
; nite
- db 15,RATTATA
- db 15,VENONAT
- db 15,RATICATE
- db 15,VENOMOTH
- db 15,ZUBAT
- db 18,RATICATE
- db 18,RATICATE
+ db 15, RATTATA
+ db 15, VENONAT
+ db 15, RATICATE
+ db 15, VENOMOTH
+ db 15, ZUBAT
+ db 18, RATICATE
+ db 18, RATICATE
- db GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_10_NORTH
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 15,SPEAROW
- db 17,VOLTORB
- db 15,RATICATE
- db 15,FEAROW
- db 15,MAROWAK
- db 16,ELECTABUZZ
- db 16,ELECTABUZZ
+ db 15, SPEAROW
+ db 17, VOLTORB
+ db 15, RATICATE
+ db 15, FEAROW
+ db 15, MAROWAK
+ db 16, ELECTABUZZ
+ db 16, ELECTABUZZ
; day
- db 15,SPEAROW
- db 17,VOLTORB
- db 15,RATICATE
- db 15,FEAROW
- db 15,MAROWAK
- db 18,ELECTABUZZ
- db 18,ELECTABUZZ
+ db 15, SPEAROW
+ db 17, VOLTORB
+ db 15, RATICATE
+ db 15, FEAROW
+ db 15, MAROWAK
+ db 18, ELECTABUZZ
+ db 18, ELECTABUZZ
; nite
- db 15,VENONAT
- db 17,VOLTORB
- db 15,RATICATE
- db 15,VENOMOTH
- db 15,ZUBAT
- db 16,ELECTABUZZ
- db 16,ELECTABUZZ
+ db 15, VENONAT
+ db 17, VOLTORB
+ db 15, RATICATE
+ db 15, VENOMOTH
+ db 15, ZUBAT
+ db 16, ELECTABUZZ
+ db 16, ELECTABUZZ
- db GROUP_ROUTE_11, MAP_ROUTE_11
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_11
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 14,HOPPIP
- db 13,RATICATE
- db 15,MAGNEMITE
- db 16,PIDGEOTTO
- db 16,RATTATA
- db 16,HOPPIP
- db 16,HOPPIP
+ db 14, HOPPIP
+ db 13, RATICATE
+ db 15, MAGNEMITE
+ db 16, PIDGEOTTO
+ db 16, RATTATA
+ db 16, HOPPIP
+ db 16, HOPPIP
; day
- db 14,HOPPIP
- db 13,RATICATE
- db 15,MAGNEMITE
- db 16,PIDGEOTTO
- db 16,RATTATA
- db 16,HOPPIP
- db 16,HOPPIP
+ db 14, HOPPIP
+ db 13, RATICATE
+ db 15, MAGNEMITE
+ db 16, PIDGEOTTO
+ db 16, RATTATA
+ db 16, HOPPIP
+ db 16, HOPPIP
; nite
- db 14,DROWZEE
- db 13,MEOWTH
- db 15,MAGNEMITE
- db 16,NOCTOWL
- db 16,RATICATE
- db 16,HYPNO
- db 16,HYPNO
+ db 14, DROWZEE
+ db 13, MEOWTH
+ db 15, MAGNEMITE
+ db 16, NOCTOWL
+ db 16, RATICATE
+ db 16, HYPNO
+ db 16, HYPNO
- db GROUP_ROUTE_13, MAP_ROUTE_13
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_13
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 23,NIDORINO
- db 23,NIDORINA
- db 25,PIDGEOTTO
- db 25,HOPPIP
- db 27,HOPPIP
- db 27,HOPPIP
- db 25,CHANSEY
+ db 23, NIDORINO
+ db 23, NIDORINA
+ db 25, PIDGEOTTO
+ db 25, HOPPIP
+ db 27, HOPPIP
+ db 27, HOPPIP
+ db 25, CHANSEY
; day
- db 23,NIDORINO
- db 23,NIDORINA
- db 25,PIDGEOTTO
- db 25,HOPPIP
- db 27,HOPPIP
- db 27,HOPPIP
- db 25,CHANSEY
+ db 23, NIDORINO
+ db 23, NIDORINA
+ db 25, PIDGEOTTO
+ db 25, HOPPIP
+ db 27, HOPPIP
+ db 27, HOPPIP
+ db 25, CHANSEY
; nite
- db 23,VENONAT
- db 23,QUAGSIRE
- db 25,NOCTOWL
- db 25,VENOMOTH
- db 25,QUAGSIRE
- db 25,QUAGSIRE
- db 25,CHANSEY
+ db 23, VENONAT
+ db 23, QUAGSIRE
+ db 25, NOCTOWL
+ db 25, VENOMOTH
+ db 25, QUAGSIRE
+ db 25, QUAGSIRE
+ db 25, CHANSEY
- db GROUP_ROUTE_14, MAP_ROUTE_14
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_14
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 26,NIDORINO
- db 26,NIDORINA
- db 28,PIDGEOTTO
- db 28,HOPPIP
- db 30,SKIPLOOM
- db 30,SKIPLOOM
- db 28,CHANSEY
+ db 26, NIDORINO
+ db 26, NIDORINA
+ db 28, PIDGEOTTO
+ db 28, HOPPIP
+ db 30, SKIPLOOM
+ db 30, SKIPLOOM
+ db 28, CHANSEY
; day
- db 26,NIDORINO
- db 26,NIDORINA
- db 28,PIDGEOTTO
- db 28,HOPPIP
- db 30,SKIPLOOM
- db 30,SKIPLOOM
- db 28,CHANSEY
+ db 26, NIDORINO
+ db 26, NIDORINA
+ db 28, PIDGEOTTO
+ db 28, HOPPIP
+ db 30, SKIPLOOM
+ db 30, SKIPLOOM
+ db 28, CHANSEY
; nite
- db 26,VENONAT
- db 26,QUAGSIRE
- db 28,NOCTOWL
- db 28,VENOMOTH
- db 28,QUAGSIRE
- db 28,QUAGSIRE
- db 28,CHANSEY
+ db 26, VENONAT
+ db 26, QUAGSIRE
+ db 28, NOCTOWL
+ db 28, VENOMOTH
+ db 28, QUAGSIRE
+ db 28, QUAGSIRE
+ db 28, CHANSEY
- db GROUP_ROUTE_15, MAP_ROUTE_15
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_15
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 23,NIDORINO
- db 23,NIDORINA
- db 25,PIDGEOTTO
- db 25,HOPPIP
- db 27,HOPPIP
- db 27,HOPPIP
- db 25,CHANSEY
+ db 23, NIDORINO
+ db 23, NIDORINA
+ db 25, PIDGEOTTO
+ db 25, HOPPIP
+ db 27, HOPPIP
+ db 27, HOPPIP
+ db 25, CHANSEY
; day
- db 23,NIDORINO
- db 23,NIDORINA
- db 25,PIDGEOTTO
- db 25,HOPPIP
- db 27,HOPPIP
- db 27,HOPPIP
- db 25,CHANSEY
+ db 23, NIDORINO
+ db 23, NIDORINA
+ db 25, PIDGEOTTO
+ db 25, HOPPIP
+ db 27, HOPPIP
+ db 27, HOPPIP
+ db 25, CHANSEY
; nite
- db 23,VENONAT
- db 23,QUAGSIRE
- db 25,NOCTOWL
- db 25,VENOMOTH
- db 25,QUAGSIRE
- db 25,QUAGSIRE
- db 25,CHANSEY
+ db 23, VENONAT
+ db 23, QUAGSIRE
+ db 25, NOCTOWL
+ db 25, VENOMOTH
+ db 25, QUAGSIRE
+ db 25, QUAGSIRE
+ db 25, CHANSEY
- db GROUP_ROUTE_16, MAP_ROUTE_16
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_16
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 26,GRIMER
- db 27,FEAROW
- db 28,GRIMER
- db 29,FEAROW
- db 29,FEAROW
- db 30,MUK
- db 30,MUK
+ db 26, GRIMER
+ db 27, FEAROW
+ db 28, GRIMER
+ db 29, FEAROW
+ db 29, FEAROW
+ db 30, MUK
+ db 30, MUK
; day
- db 26,GRIMER
- db 27,FEAROW
- db 28,GRIMER
- db 29,FEAROW
- db 29,SLUGMA
- db 30,MUK
- db 30,MUK
+ db 26, GRIMER
+ db 27, FEAROW
+ db 28, GRIMER
+ db 29, FEAROW
+ db 29, SLUGMA
+ db 30, MUK
+ db 30, MUK
; nite
- db 26,GRIMER
- db 27,GRIMER
- db 28,GRIMER
- db 29,MURKROW
- db 29,MURKROW
- db 30,MUK
- db 30,MUK
+ db 26, GRIMER
+ db 27, GRIMER
+ db 28, GRIMER
+ db 29, MURKROW
+ db 29, MURKROW
+ db 30, MUK
+ db 30, MUK
- db GROUP_ROUTE_17, MAP_ROUTE_17
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_17
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 30,FEAROW
- db 29,GRIMER
- db 31,GRIMER
- db 32,FEAROW
- db 33,GRIMER
- db 33,MUK
- db 33,MUK
+ db 30, FEAROW
+ db 29, GRIMER
+ db 31, GRIMER
+ db 32, FEAROW
+ db 33, GRIMER
+ db 33, MUK
+ db 33, MUK
; day
- db 30,FEAROW
- db 29,SLUGMA
- db 29,GRIMER
- db 32,FEAROW
- db 32,SLUGMA
- db 33,MUK
- db 33,MUK
+ db 30, FEAROW
+ db 29, SLUGMA
+ db 29, GRIMER
+ db 32, FEAROW
+ db 32, SLUGMA
+ db 33, MUK
+ db 33, MUK
; nite
- db 30,GRIMER
- db 29,GRIMER
- db 31,GRIMER
- db 32,GRIMER
- db 33,GRIMER
- db 33,MUK
- db 33,MUK
+ db 30, GRIMER
+ db 29, GRIMER
+ db 31, GRIMER
+ db 32, GRIMER
+ db 33, GRIMER
+ db 33, MUK
+ db 33, MUK
- db GROUP_ROUTE_18, MAP_ROUTE_18
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_18
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 26,GRIMER
- db 27,FEAROW
- db 28,GRIMER
- db 29,FEAROW
- db 29,FEAROW
- db 30,MUK
- db 30,MUK
+ db 26, GRIMER
+ db 27, FEAROW
+ db 28, GRIMER
+ db 29, FEAROW
+ db 29, FEAROW
+ db 30, MUK
+ db 30, MUK
; day
- db 26,GRIMER
- db 27,FEAROW
- db 28,GRIMER
- db 29,FEAROW
- db 29,SLUGMA
- db 30,MUK
- db 30,MUK
+ db 26, GRIMER
+ db 27, FEAROW
+ db 28, GRIMER
+ db 29, FEAROW
+ db 29, SLUGMA
+ db 30, MUK
+ db 30, MUK
; nite
- db 26,GRIMER
- db 27,GRIMER
- db 28,GRIMER
- db 29,GRIMER
- db 29,GRIMER
- db 30,MUK
- db 30,MUK
+ db 26, GRIMER
+ db 27, GRIMER
+ db 28, GRIMER
+ db 29, GRIMER
+ db 29, GRIMER
+ db 30, MUK
+ db 30, MUK
- db GROUP_ROUTE_21, MAP_ROUTE_21
- db $0f,$0f,$0f ; encounter rates: morn/day/nite
+ map ROUTE_21
+ db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
- db 30,TANGELA
- db 25,RATTATA
- db 35,TANGELA
- db 20,RATICATE
- db 30,MR__MIME
- db 28,MR__MIME
- db 28,MR__MIME
+ db 30, TANGELA
+ db 25, RATTATA
+ db 35, TANGELA
+ db 20, RATICATE
+ db 30, MR__MIME
+ db 28, MR__MIME
+ db 28, MR__MIME
; day
- db 30,TANGELA
- db 25,RATTATA
- db 35,TANGELA
- db 20,RATICATE
- db 28,MR__MIME
- db 30,MR__MIME
- db 30,MR__MIME
+ db 30, TANGELA
+ db 25, RATTATA
+ db 35, TANGELA
+ db 20, RATICATE
+ db 28, MR__MIME
+ db 30, MR__MIME
+ db 30, MR__MIME
; nite
- db 30,TANGELA
- db 25,RATTATA
- db 35,TANGELA
- db 20,RATICATE
- db 30,TANGELA
- db 28,TANGELA
- db 28,TANGELA
+ db 30, TANGELA
+ db 25, RATTATA
+ db 35, TANGELA
+ db 20, RATICATE
+ db 30, TANGELA
+ db 28, TANGELA
+ db 28, TANGELA
- db GROUP_ROUTE_22, MAP_ROUTE_22
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_22
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 3,RATTATA
- db 3,SPEAROW
- db 5,SPEAROW
- db 4,DODUO
- db 6,PONYTA
- db 7,FEAROW
- db 7,FEAROW
+ db 3, RATTATA
+ db 3, SPEAROW
+ db 5, SPEAROW
+ db 4, DODUO
+ db 6, PONYTA
+ db 7, FEAROW
+ db 7, FEAROW
; day
- db 3,RATTATA
- db 3,SPEAROW
- db 5,SPEAROW
- db 4,DODUO
- db 6,PONYTA
- db 7,FEAROW
- db 7,FEAROW
+ db 3, RATTATA
+ db 3, SPEAROW
+ db 5, SPEAROW
+ db 4, DODUO
+ db 6, PONYTA
+ db 7, FEAROW
+ db 7, FEAROW
; nite
- db 3,RATTATA
- db 3,POLIWAG
- db 5,RATTATA
- db 4,POLIWAG
- db 6,RATTATA
- db 7,RATTATA
- db 7,RATTATA
+ db 3, RATTATA
+ db 3, POLIWAG
+ db 5, RATTATA
+ db 4, POLIWAG
+ db 6, RATTATA
+ db 7, RATTATA
+ db 7, RATTATA
- db GROUP_ROUTE_24, MAP_ROUTE_24
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_24
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 8,CATERPIE
- db 10,CATERPIE
- db 12,METAPOD
- db 12,ABRA
- db 10,BELLSPROUT
- db 14,BUTTERFREE
- db 14,BUTTERFREE
+ db 8, CATERPIE
+ db 10, CATERPIE
+ db 12, METAPOD
+ db 12, ABRA
+ db 10, BELLSPROUT
+ db 14, BUTTERFREE
+ db 14, BUTTERFREE
; day
- db 8,CATERPIE
- db 12,SUNKERN
- db 10,CATERPIE
- db 12,ABRA
- db 10,BELLSPROUT
- db 14,BUTTERFREE
- db 14,BUTTERFREE
+ db 8, CATERPIE
+ db 12, SUNKERN
+ db 10, CATERPIE
+ db 12, ABRA
+ db 10, BELLSPROUT
+ db 14, BUTTERFREE
+ db 14, BUTTERFREE
; nite
- db 10,VENONAT
- db 10,ODDISH
- db 12,ODDISH
- db 12,ABRA
- db 10,BELLSPROUT
- db 14,GLOOM
- db 14,GLOOM
+ db 10, VENONAT
+ db 10, ODDISH
+ db 12, ODDISH
+ db 12, ABRA
+ db 10, BELLSPROUT
+ db 14, GLOOM
+ db 14, GLOOM
- db GROUP_ROUTE_25, MAP_ROUTE_25
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_25
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 10,CATERPIE
- db 10,PIDGEY
- db 12,PIDGEOTTO
- db 12,METAPOD
- db 10,BELLSPROUT
- db 14,BUTTERFREE
- db 14,BUTTERFREE
+ db 10, CATERPIE
+ db 10, PIDGEY
+ db 12, PIDGEOTTO
+ db 12, METAPOD
+ db 10, BELLSPROUT
+ db 14, BUTTERFREE
+ db 14, BUTTERFREE
; day
- db 10,CATERPIE
- db 10,PIDGEY
- db 12,PIDGEOTTO
- db 12,METAPOD
- db 10,BELLSPROUT
- db 14,BUTTERFREE
- db 14,BUTTERFREE
+ db 10, CATERPIE
+ db 10, PIDGEY
+ db 12, PIDGEOTTO
+ db 12, METAPOD
+ db 10, BELLSPROUT
+ db 14, BUTTERFREE
+ db 14, BUTTERFREE
; nite
- db 10,ODDISH
- db 10,HOOTHOOT
- db 10,VENONAT
- db 12,NOCTOWL
- db 10,BELLSPROUT
- db 14,NOCTOWL
- db 14,NOCTOWL
+ db 10, ODDISH
+ db 10, HOOTHOOT
+ db 10, VENONAT
+ db 12, NOCTOWL
+ db 10, BELLSPROUT
+ db 14, NOCTOWL
+ db 14, NOCTOWL
- db GROUP_ROUTE_26, MAP_ROUTE_26
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_26
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 28,DODUO
- db 28,SANDSLASH
- db 32,PONYTA
- db 30,RATICATE
- db 30,DODUO
- db 30,ARBOK
- db 30,ARBOK
+ db 28, DODUO
+ db 28, SANDSLASH
+ db 32, PONYTA
+ db 30, RATICATE
+ db 30, DODUO
+ db 30, ARBOK
+ db 30, ARBOK
; day
- db 28,DODUO
- db 28,SANDSLASH
- db 32,PONYTA
- db 30,RATICATE
- db 30,DODUO
- db 30,ARBOK
- db 30,ARBOK
+ db 28, DODUO
+ db 28, SANDSLASH
+ db 32, PONYTA
+ db 30, RATICATE
+ db 30, DODUO
+ db 30, ARBOK
+ db 30, ARBOK
; nite
- db 28,NOCTOWL
- db 28,RATICATE
- db 32,NOCTOWL
- db 30,RATICATE
- db 30,QUAGSIRE
- db 30,QUAGSIRE
- db 30,QUAGSIRE
+ db 28, NOCTOWL
+ db 28, RATICATE
+ db 32, NOCTOWL
+ db 30, RATICATE
+ db 30, QUAGSIRE
+ db 30, QUAGSIRE
+ db 30, QUAGSIRE
- db GROUP_ROUTE_27, MAP_ROUTE_27
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_27
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 28,DODUO
- db 28,ARBOK
- db 30,RATICATE
- db 30,DODUO
- db 32,PONYTA
- db 30,DODRIO
- db 30,DODRIO
+ db 28, DODUO
+ db 28, ARBOK
+ db 30, RATICATE
+ db 30, DODUO
+ db 32, PONYTA
+ db 30, DODRIO
+ db 30, DODRIO
; day
- db 28,DODUO
- db 28,ARBOK
- db 30,RATICATE
- db 30,DODUO
- db 32,PONYTA
- db 30,DODRIO
- db 30,DODRIO
+ db 28, DODUO
+ db 28, ARBOK
+ db 30, RATICATE
+ db 30, DODUO
+ db 32, PONYTA
+ db 30, DODRIO
+ db 30, DODRIO
; nite
- db 28,QUAGSIRE
- db 28,NOCTOWL
- db 30,RATICATE
- db 30,QUAGSIRE
- db 32,NOCTOWL
- db 32,NOCTOWL
- db 32,NOCTOWL
+ db 28, QUAGSIRE
+ db 28, NOCTOWL
+ db 30, RATICATE
+ db 30, QUAGSIRE
+ db 32, NOCTOWL
+ db 32, NOCTOWL
+ db 32, NOCTOWL
- db GROUP_ROUTE_28, MAP_ROUTE_28
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_28
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 39,TANGELA
- db 40,PONYTA
- db 40,RAPIDASH
- db 42,ARBOK
- db 41,DODUO
- db 43,DODRIO
- db 43,DODRIO
+ db 39, TANGELA
+ db 40, PONYTA
+ db 40, RAPIDASH
+ db 42, ARBOK
+ db 41, DODUO
+ db 43, DODRIO
+ db 43, DODRIO
; day
- db 39,TANGELA
- db 40,PONYTA
- db 40,RAPIDASH
- db 42,ARBOK
- db 41,DODUO
- db 43,DODRIO
- db 43,DODRIO
+ db 39, TANGELA
+ db 40, PONYTA
+ db 40, RAPIDASH
+ db 42, ARBOK
+ db 41, DODUO
+ db 43, DODRIO
+ db 43, DODRIO
; nite
- db 39,TANGELA
- db 40,POLIWHIRL
- db 40,GOLBAT
- db 40,POLIWHIRL
- db 42,GOLBAT
- db 42,GOLBAT
- db 42,GOLBAT
+ db 39, TANGELA
+ db 40, POLIWHIRL
+ db 40, GOLBAT
+ db 40, POLIWHIRL
+ db 42, GOLBAT
+ db 42, GOLBAT
+ db 42, GOLBAT
- db $ff ; end
+ db -1 ; end
diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm
index 011d6fd34..558d56a26 100644
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -1,147 +1,147 @@
; Kanto Pokémon in water
- db GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS
- db $0a ; encounter rate
- db 20,GOLDEEN
- db 20,SLOWPOKE
- db 20,SEAKING
-
- db GROUP_VERMILION_PORT, MAP_VERMILION_PORT
- db $05 ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db GROUP_ROUTE_4, MAP_ROUTE_4
- db $0a ; encounter rate
- db 10,GOLDEEN
- db 5,GOLDEEN
- db 10,SEAKING
-
- db GROUP_ROUTE_6, MAP_ROUTE_6
- db $05 ; encounter rate
- db 10,PSYDUCK
- db 5,PSYDUCK
- db 10,GOLDUCK
-
- db GROUP_ROUTE_9, MAP_ROUTE_9
- db $0a ; encounter rate
- db 15,GOLDEEN
- db 10,GOLDEEN
- db 15,SEAKING
-
- db GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH
- db $0a ; encounter rate
- db 15,GOLDEEN
- db 10,GOLDEEN
- db 15,SEAKING
-
- db GROUP_ROUTE_12, MAP_ROUTE_12
- db $0f ; encounter rate
- db 25,TENTACOOL
- db 25,QUAGSIRE
- db 25,TENTACRUEL
-
- db GROUP_ROUTE_13, MAP_ROUTE_13
- db $0f ; encounter rate
- db 25,TENTACOOL
- db 25,QUAGSIRE
- db 25,TENTACRUEL
-
- db GROUP_ROUTE_19, MAP_ROUTE_19
- db $0f ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db GROUP_ROUTE_20, MAP_ROUTE_20
- db $0f ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db GROUP_ROUTE_21, MAP_ROUTE_21
- db $0f ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db GROUP_ROUTE_22, MAP_ROUTE_22
- db $05 ; encounter rate
- db 10,POLIWAG
- db 5,POLIWAG
- db 10,POLIWHIRL
-
- db GROUP_ROUTE_24, MAP_ROUTE_24
- db $0a ; encounter rate
- db 10,GOLDEEN
- db 5,GOLDEEN
- db 10,SEAKING
-
- db GROUP_ROUTE_25, MAP_ROUTE_25
- db $0a ; encounter rate
- db 10,GOLDEEN
- db 5,GOLDEEN
- db 10,SEAKING
-
- db GROUP_ROUTE_26, MAP_ROUTE_26
- db $0f ; encounter rate
- db 30,TENTACOOL
- db 25,TENTACOOL
- db 30,TENTACRUEL
-
- db GROUP_ROUTE_27, MAP_ROUTE_27
- db $0f ; encounter rate
- db 20,TENTACOOL
- db 15,TENTACOOL
- db 20,TENTACRUEL
-
- db GROUP_ROUTE_28, MAP_ROUTE_28
- db $05 ; encounter rate
- db 40,POLIWAG
- db 35,POLIWAG
- db 40,POLIWHIRL
-
- db GROUP_PALLET_TOWN, MAP_PALLET_TOWN
- db $0f ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
- db $05 ; encounter rate
- db 10,POLIWAG
- db 5,POLIWAG
- db 10,POLIWHIRL
-
- db GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
- db $0a ; encounter rate
- db 10,GOLDEEN
- db 5,GOLDEEN
- db 10,SEAKING
-
- db GROUP_VERMILION_CITY, MAP_VERMILION_CITY
- db $0f ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db GROUP_CELADON_CITY, MAP_CELADON_CITY
- db $05 ; encounter rate
- db 20,GRIMER
- db 15,GRIMER
- db 15,MUK
-
- db GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
- db $05 ; encounter rate
- db 20,MAGIKARP
- db 15,MAGIKARP
- db 10,MAGIKARP
-
- db GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND
- db $0f ; encounter rate
- db 35,TENTACOOL
- db 30,TENTACOOL
- db 35,TENTACRUEL
-
- db $ff ; end
+ map TOHJO_FALLS
+ db 4 percent ; encounter rate
+ db 20, GOLDEEN
+ db 20, SLOWPOKE
+ db 20, SEAKING
+
+ map VERMILION_PORT
+ db 2 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ map ROUTE_4
+ db 4 percent ; encounter rate
+ db 10, GOLDEEN
+ db 5, GOLDEEN
+ db 10, SEAKING
+
+ map ROUTE_6
+ db 2 percent ; encounter rate
+ db 10, PSYDUCK
+ db 5, PSYDUCK
+ db 10, GOLDUCK
+
+ map ROUTE_9
+ db 4 percent ; encounter rate
+ db 15, GOLDEEN
+ db 10, GOLDEEN
+ db 15, SEAKING
+
+ map ROUTE_10_NORTH
+ db 4 percent ; encounter rate
+ db 15, GOLDEEN
+ db 10, GOLDEEN
+ db 15, SEAKING
+
+ map ROUTE_12
+ db 6 percent ; encounter rate
+ db 25, TENTACOOL
+ db 25, QUAGSIRE
+ db 25, TENTACRUEL
+
+ map ROUTE_13
+ db 6 percent ; encounter rate
+ db 25, TENTACOOL
+ db 25, QUAGSIRE
+ db 25, TENTACRUEL
+
+ map ROUTE_19
+ db 6 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ map ROUTE_20
+ db 6 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ map ROUTE_21
+ db 6 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ map ROUTE_22
+ db 2 percent ; encounter rate
+ db 10, POLIWAG
+ db 5, POLIWAG
+ db 10, POLIWHIRL
+
+ map ROUTE_24
+ db 4 percent ; encounter rate
+ db 10, GOLDEEN
+ db 5, GOLDEEN
+ db 10, SEAKING
+
+ map ROUTE_25
+ db 4 percent ; encounter rate
+ db 10, GOLDEEN
+ db 5, GOLDEEN
+ db 10, SEAKING
+
+ map ROUTE_26
+ db 6 percent ; encounter rate
+ db 30, TENTACOOL
+ db 25, TENTACOOL
+ db 30, TENTACRUEL
+
+ map ROUTE_27
+ db 6 percent ; encounter rate
+ db 20, TENTACOOL
+ db 15, TENTACOOL
+ db 20, TENTACRUEL
+
+ map ROUTE_28
+ db 2 percent ; encounter rate
+ db 40, POLIWAG
+ db 35, POLIWAG
+ db 40, POLIWHIRL
+
+ map PALLET_TOWN
+ db 6 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ map VIRIDIAN_CITY
+ db 2 percent ; encounter rate
+ db 10, POLIWAG
+ db 5, POLIWAG
+ db 10, POLIWHIRL
+
+ map CERULEAN_CITY
+ db 4 percent ; encounter rate
+ db 10, GOLDEEN
+ db 5, GOLDEEN
+ db 10, SEAKING
+
+ map VERMILION_CITY
+ db 6 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ map CELADON_CITY
+ db 2 percent ; encounter rate
+ db 20, GRIMER
+ db 15, GRIMER
+ db 15, MUK
+
+ map FUCHSIA_CITY
+ db 2 percent ; encounter rate
+ db 20, MAGIKARP
+ db 15, MAGIKARP
+ db 10, MAGIKARP
+
+ map CINNABAR_ISLAND
+ db 6 percent ; encounter rate
+ db 35, TENTACOOL
+ db 30, TENTACOOL
+ db 35, TENTACRUEL
+
+ db -1 ; end
diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm
index 319b71d3c..61d0d8532 100644
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -1,59 +1,59 @@
; swarms in grass
; Dunsparce swarm
- db GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
- db $0a,$0a,$0a ; encounter rates: morn/day/nite
+ map DARK_CAVE_VIOLET_ENTRANCE
+ db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
- db 3,GEODUDE
- db 3,DUNSPARCE
- db 2,ZUBAT
- db 2,GEODUDE
- db 2,DUNSPARCE
- db 4,DUNSPARCE
- db 4,DUNSPARCE
+ db 3, GEODUDE
+ db 3, DUNSPARCE
+ db 2, ZUBAT
+ db 2, GEODUDE
+ db 2, DUNSPARCE
+ db 4, DUNSPARCE
+ db 4, DUNSPARCE
; day
- db 3,GEODUDE
- db 3,DUNSPARCE
- db 2,ZUBAT
- db 2,GEODUDE
- db 2,DUNSPARCE
- db 4,DUNSPARCE
- db 4,DUNSPARCE
+ db 3, GEODUDE
+ db 3, DUNSPARCE
+ db 2, ZUBAT
+ db 2, GEODUDE
+ db 2, DUNSPARCE
+ db 4, DUNSPARCE
+ db 4, DUNSPARCE
; nite
- db 3,GEODUDE
- db 3,DUNSPARCE
- db 2,ZUBAT
- db 2,GEODUDE
- db 2,DUNSPARCE
- db 4,DUNSPARCE
- db 4,DUNSPARCE
+ db 3, GEODUDE
+ db 3, DUNSPARCE
+ db 2, ZUBAT
+ db 2, GEODUDE
+ db 2, DUNSPARCE
+ db 4, DUNSPARCE
+ db 4, DUNSPARCE
; Yanma swarm
- db GROUP_ROUTE_35, MAP_ROUTE_35
- db $19,$19,$19 ; encounter rates: morn/day/nite
+ map ROUTE_35
+ db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
- db 12,NIDORAN_M
- db 12,NIDORAN_F
- db 12,YANMA
- db 14,YANMA
- db 14,PIDGEY
- db 10,DITTO
- db 10,DITTO
+ db 12, NIDORAN_M
+ db 12, NIDORAN_F
+ db 12, YANMA
+ db 14, YANMA
+ db 14, PIDGEY
+ db 10, DITTO
+ db 10, DITTO
; day
- db 12,NIDORAN_M
- db 12,NIDORAN_F
- db 12,YANMA
- db 14,YANMA
- db 14,PIDGEY
- db 10,DITTO
- db 10,DITTO
+ db 12, NIDORAN_M
+ db 12, NIDORAN_F
+ db 12, YANMA
+ db 14, YANMA
+ db 14, PIDGEY
+ db 10, DITTO
+ db 10, DITTO
; nite
- db 12,NIDORAN_M
- db 12,NIDORAN_F
- db 12,YANMA
- db 14,YANMA
- db 14,HOOTHOOT
- db 10,DITTO
- db 10,DITTO
+ db 12, NIDORAN_M
+ db 12, NIDORAN_F
+ db 12, YANMA
+ db 14, YANMA
+ db 14, HOOTHOOT
+ db 10, DITTO
+ db 10, DITTO
- db $ff ; end
+ db -1 ; end
diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm
index 4199556f7..67ec6d4d7 100644
--- a/data/wild/swarm_water.asm
+++ b/data/wild/swarm_water.asm
@@ -2,4 +2,4 @@
; No swarms encountered while surfing in Crystal
- db $ff ; end
+ db -1 ; end
diff --git a/engine/events_2.asm b/engine/events_2.asm
index bca1ec27b..019894298 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -105,7 +105,7 @@ Function97cc0:: ; 97cc0
ld hl, StatusFlags2
bit 2, [hl]
jr nz, .asm_97cdb
- callba Function2a0e7
+ callba TryWildEncounter
jr nz, .asm_97ce2
jr .asm_97ce6
@@ -167,10 +167,10 @@ Function97cfd:: ; 97cfd
; 97d23
Function97d23: ; 97d23
- call Function97d64
+ call TryWildEncounter_BugContest
ret nc
call Function97d31
- callba Function2a1df
+ callba CheckRepelEffect
ret
; 97d31
@@ -196,7 +196,7 @@ Function97d31:: ; 97d31
; Species
ld a, [hli]
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
; Min level
ld a, [hli]
@@ -228,16 +228,16 @@ Function97d31:: ; 97d31
ret
; 97d64
-Function97d64: ; 97d64
+TryWildEncounter_BugContest: ; 97d64
ld a, [StandingTile]
- call Function188e
+ call CheckSuperTallGrassTile
ld b, $66
jr z, .asm_97d70
ld b, $33
.asm_97d70
- callba Function2a124
- callba Function2a138
+ callba ApplyMusicEffectOnEncounterRate
+ callba ApplyCleanseTagEffectOnEncounterRate
call Random
ld a, [hRandomAdd]
cp b
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 6cbdc87aa..0a4649384 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -626,7 +626,7 @@ Function463f: ; 463f
; 4661
Function4661: ; 4661
- call Function188e
+ call CheckSuperTallGrassTile
jr z, .set
call Function1875
jr c, .reset
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index baa45e636..0e20c2cb5 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -439,7 +439,7 @@ Function1551a: ; 1551a (5:551a)
ret
Function1554e: ; 1554e (5:554e)
- call Function1852
+ call CheckOnWater
jr nz, .ret_nc
ld a, [PlayerState]
cp PLAYER_SURF
diff --git a/engine/movement.asm b/engine/movement.asm
index f1ab0ec77..d3c570cf5 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -727,7 +727,7 @@ Function5412: ; 5412
ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
- call Function188e
+ call CheckSuperTallGrassTile
jr z, .asm_542d
call Function1875
diff --git a/engine/radio.asm b/engine/radio.asm
index 74d0383e7..737b626b6 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -218,16 +218,16 @@ endr
ld c, [hl]
push bc
- ld hl, WildMons1
+ ld hl, JohtoGrassWildMons
.greater_than_10
- ld a, BANK(WildMons1)
+ ld a, BANK(JohtoGrassWildMons)
call GetFarByte
cp -1
jr z, .done2
inc hl
cp b
jr nz, .next
- ld a, BANK(WildMons1)
+ ld a, BANK(JohtoGrassWildMons)
call GetFarByte
cp c
jr z, .done
@@ -263,7 +263,7 @@ rept 2
add hl, de
endr
inc hl
- ld a, BANK(WildMons1)
+ ld a, BANK(JohtoGrassWildMons)
call GetFarByte
ld [wd265], a
ld [CurPartySpecies], a
diff --git a/engine/scripting.asm b/engine/scripting.asm
index b01ac0c52..32d036d48 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1470,7 +1470,7 @@ Script_loadpikachudata: ; 0x973f0
; script command 0x5a
ld a, PIKACHU
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld a, 5
ld [CurPartyLevel], a
ret
@@ -1505,7 +1505,7 @@ Script_loadpokedata: ; 0x97412
ld a, $80
ld [wd459], a
call GetScriptByte
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
call GetScriptByte
ld [CurPartyLevel], a
ret
diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm
index eb42ab0d1..d5a648594 100644
--- a/engine/spawn_points.asm
+++ b/engine/spawn_points.asm
@@ -4,46 +4,42 @@ SpawnPoints: ; 0x152ab
const_def
spawn: MACRO
-; name, map, y, x
-\1\@ EQUS "SPAWN_\1"
- const \1\@
- map \2
- db \3, \4
+; map, y, x
+ map \1
+ db \2, \3
ENDM
- spawn HOME, KRISS_HOUSE_2F, 3, 3
- spawn DEBUG, VIRIDIAN_POKECENTER_1F, 5, 3
+ spawn KRISS_HOUSE_2F, 3, 3
+ spawn VIRIDIAN_POKECENTER_1F, 5, 3
- spawn PALLET, PALLET_TOWN, 5, 6
- spawn VIRIDIAN, VIRIDIAN_CITY, 23, 26
- spawn PEWTER, PEWTER_CITY, 13, 26
- spawn CERULEAN, CERULEAN_CITY, 19, 22
- spawn ROCK_TUNNEL, ROUTE_10_NORTH, 11, 2
- spawn VERMILION, VERMILION_CITY, 9, 6
- spawn LAVENDER, LAVENDER_TOWN, 5, 6
- spawn SAFFRON, SAFFRON_CITY, 9, 30
- spawn CELADON, CELADON_CITY, 29, 10
- spawn FUCHSIA, FUCHSIA_CITY, 19, 28
- spawn CINNABAR, CINNABAR_ISLAND, 11, 12
- spawn INDIGO, ROUTE_23, 9, 6
+ spawn PALLET_TOWN, 5, 6
+ spawn VIRIDIAN_CITY, 23, 26
+ spawn PEWTER_CITY, 13, 26
+ spawn CERULEAN_CITY, 19, 22
+ spawn ROUTE_10_NORTH, 11, 2
+ spawn VERMILION_CITY, 9, 6
+ spawn LAVENDER_TOWN, 5, 6
+ spawn SAFFRON_CITY, 9, 30
+ spawn CELADON_CITY, 29, 10
+ spawn FUCHSIA_CITY, 19, 28
+ spawn CINNABAR_ISLAND, 11, 12
+ spawn ROUTE_23, 9, 6
- spawn NEW_BARK, NEW_BARK_TOWN, 13, 6
- spawn CHERRYGROVE, CHERRYGROVE_CITY, 29, 4
- spawn VIOLET, VIOLET_CITY, 31, 26
- spawn UNION_CAVE, ROUTE_32, 11, 74
- spawn AZALEA, AZALEA_TOWN, 15, 10
- spawn CIANWOOD, CIANWOOD_CITY, 23, 44
- spawn GOLDENROD, GOLDENROD_CITY, 15, 28
- spawn OLIVINE, OLIVINE_CITY, 13, 22
- spawn ECRUTEAK, ECRUTEAK_CITY, 23, 28
- spawn MAHOGANY, MAHOGANY_TOWN, 15, 14
- spawn LAKE, LAKE_OF_RAGE, 21, 29
- spawn BLACKTHORN, BLACKTHORN_CITY, 21, 30
- spawn MT_SILVER, SILVER_CAVE_OUTSIDE, 23, 20
- spawn FAST_SHIP, FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
-NUM_SPAWNS EQU const_value
-const_value = -1
- spawn N_A, N_A, -1, -1
+ spawn NEW_BARK_TOWN, 13, 6
+ spawn CHERRYGROVE_CITY, 29, 4
+ spawn VIOLET_CITY, 31, 26
+ spawn ROUTE_32, 11, 74
+ spawn AZALEA_TOWN, 15, 10
+ spawn CIANWOOD_CITY, 23, 44
+ spawn GOLDENROD_CITY, 15, 28
+ spawn OLIVINE_CITY, 13, 22
+ spawn ECRUTEAK_CITY, 23, 28
+ spawn MAHOGANY_TOWN, 15, 14
+ spawn LAKE_OF_RAGE, 21, 29
+ spawn BLACKTHORN_CITY, 21, 30
+ spawn SILVER_CAVE_OUTSIDE, 23, 20
+ spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
+ spawn N_A, -1, -1
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 4f22c6203..1071ff01c 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -84,7 +84,7 @@ Function184a:: ; 184a
ret
; 1852
-Function1852:: ; 1852
+CheckOnWater:: ; 1852
ld a, [StandingTile]
call GetTileCollision
sub 1
@@ -147,7 +147,7 @@ Function1875:: ; 1875
ret
; 188e
-Function188e:: ; 188e
+CheckSuperTallGrassTile:: ; 188e
cp $14
ret z
cp $1c
diff --git a/main.asm b/main.asm
index 564308fc7..e2b99ca41 100644
--- a/main.asm
+++ b/main.asm
@@ -138,7 +138,7 @@ NewGame: ; 5b6b
ld a, 1
ld [wc2d8], a
- ld a, 0 ; SPAWN_HOME
+ ld a, SPAWN_HOME
ld [wd001], a
ld a, $f1
@@ -459,14 +459,14 @@ Continue: ; 5d65
ret
.asm_5dd7
- ld a, $e ; SPAWN_NEW_BARK
+ ld a, SPAWN_NEW_BARK
ld [wd001], a
call Function5de7
jp Function5e5d
; 5de2
Function5de2: ; 5de2
- ld a, $1a ; SPAWN_MT_SILVER
+ ld a, SPAWN_MT_SILVER
ld [wd001], a
; 5de7
@@ -6087,7 +6087,7 @@ RockSmashScript: ; cf32
disappear -2
callasm RockMonEncounter
- copybytetovar wd22e
+ copybytetovar TempWildMonSpecies
iffalse .done
battlecheck
startbattle
@@ -6199,7 +6199,7 @@ FishFunction: ; cf8e
ld a, d
and a
jr z, .nonibble
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld a, e
ld [CurPartyLevel], a
ld a, BATTLETYPE_FISH
@@ -29545,7 +29545,7 @@ Function27a28: ; 27a28
SECTION "bankA", ROMX, BANK[$A]
-Function28000: ; 28000
+LinkCommunications: ; 28000
call WhiteBGMap
ld c, $50
call DelayFrames
@@ -30352,11 +30352,11 @@ Function28595: ; 28595
ld de, OverworldMap
ld a, $fd
ld b, $6
-.asm_2859c
+.loop1
ld [de], a
inc de
dec b
- jr nz, .asm_2859c
+ jr nz, .loop1
ld hl, PlayerName
ld bc, $000b
call CopyBytes
@@ -30385,7 +30385,7 @@ Function28595: ; 28595
call GetSRAMBank
ld hl, $a600
ld b, $6
-.asm_285ef
+.loop2
push bc
ld bc, $0021
call CopyBytes
@@ -30393,10 +30393,10 @@ Function28595: ; 28595
add hl, bc
pop bc
dec b
- jr nz, .asm_285ef
+ jr nz, .loop2
ld hl, $a600
ld b, $6
-.asm_28603
+.loop3
push bc
ld bc, $0021
add hl, bc
@@ -30404,11 +30404,11 @@ Function28595: ; 28595
call CopyBytes
pop bc
dec b
- jr nz, .asm_28603
+ jr nz, .loop3
ld b, $6
ld de, $a600
ld hl, wc9f9
-.asm_2861a
+.loop4
push bc
push hl
push de
@@ -30417,18 +30417,18 @@ Function28595: ; 28595
pop de
ld a, c
or a
- jr z, .asm_2863f
+ jr z, .next
sub $3
- jr nc, .asm_28635
+ jr nc, .skip
callba Function1df1e6
- jr .asm_2863f
+ jr .next
-.asm_28635
+.skip
cp $2
- jr nc, .asm_2863f
+ jr nc, .next
callba Function1df220
-.asm_2863f
+.next
pop de
ld hl, $002f
add hl, de
@@ -30439,40 +30439,40 @@ Function28595: ; 28595
add hl, bc
pop bc
dec b
- jr nz, .asm_2861a
+ jr nz, .loop4
call CloseSRAM
ld hl, wc9f9
ld bc, $00c6
-.asm_28658
+.loop5
ld a, [hl]
cp $fe
- jr nz, .asm_2865f
+ jr nz, .skip2
ld [hl], $21
-.asm_2865f
+.skip2
inc hl
dec bc
ld a, b
or c
- jr nz, .asm_28658
+ jr nz, .loop5
ld hl, wcabf
ld de, wcb13
ld b, $54
ld c, $0
-.asm_2866f
+.loop6
inc c
ld a, [hl]
cp $fe
- jr nz, .asm_2867a
+ jr nz, .skip3
ld [hl], $ff
ld a, c
ld [de], a
inc de
-.asm_2867a
+.skip3
inc hl
dec b
- jr nz, .asm_2866f
+ jr nz, .loop6
ld a, $ff
ld [de], a
ret
@@ -30480,11 +30480,11 @@ Function28595: ; 28595
Function28682: ; 28682
ld c, $5
-.asm_28684
+.loop
ld [de], a
inc de
dec c
- jr nz, .asm_28684
+ jr nz, .loop
ret
; 2868a
@@ -30499,12 +30499,12 @@ Function2868a: ; 2868a
ld [hl], b
ld hl, OTPartyMon1Species
ld c, $6
-.asm_2869b
+.loop
push bc
call Function286ba
pop bc
dec c
- jr nz, .asm_2869b
+ jr nz, .loop
pop hl
ld bc, $0108
add hl, bc
@@ -30646,19 +30646,19 @@ Function28771: ; 28771
ret z
push hl
ld hl, .TimeCapsuleAlt
-.asm_28778
+.loop
ld a, [hli]
and a
- jr z, .asm_28783
+ jr z, .end
cp b
- jr z, .asm_28782
+ jr z, .found
inc hl
- jr .asm_28778
+ jr .loop
-.asm_28782
+.found
ld b, [hl]
-.asm_28783
+.end
pop hl
ret
@@ -33561,7 +33561,7 @@ Special_TimeCapsule: ; 29eaf
ld a, $1
ld [InLinkBattle], a
call Function2ed3
- callab Function28000
+ callab LinkCommunications
call Function2ee4
xor a
ld [hVBlank], a
@@ -33572,7 +33572,7 @@ Special_TradeCenter: ; 29ec4
ld a, $2
ld [InLinkBattle], a
call Function2ed3
- callab Function28000
+ callab LinkCommunications
call Function2ee4
xor a
ld [hVBlank], a
@@ -33583,7 +33583,7 @@ Special_Colosseum: ; 29ed9
ld a, $3
ld [InLinkBattle], a
call Function2ed3
- callab Function28000
+ callab LinkCommunications
call Function2ee4
xor a
ld [hVBlank], a
@@ -33676,7 +33676,7 @@ Function29fe4: ; 29fe4
; 29ff8
LoadWildMonData: ; 29ff8
- call Function2a205
+ call _GrassWildmonLookup
jr c, .asm_2a006
ld hl, wd25a
xor a
@@ -33693,7 +33693,7 @@ endr
ld bc, $3
call CopyBytes
.asm_2a011
- call Function2a21d
+ call _WaterWildmonLookup
ld a, $0
jr nc, .asm_2a01b
rept 2
@@ -33713,9 +33713,9 @@ Function2a01f: ; 2a01f
and a
jr nz, .asm_2a043
decoord 0, 0
- ld hl, WildMons1
+ ld hl, JohtoGrassWildMons
call Function2a052
- ld hl, WildMons2
+ ld hl, JohtoWaterWildMons
call Function2a06e
call Function2a0b7
call Function2a0cf
@@ -33723,9 +33723,9 @@ Function2a01f: ; 2a01f
.asm_2a043
decoord 0, 0
- ld hl, WildMons3
+ ld hl, KantoGrassWildMons
call Function2a052
- ld hl, WildMons4
+ ld hl, KantoWaterWildMons
jp Function2a06e
; 2a052
@@ -33859,38 +33859,38 @@ Function2a0cf: ; 2a0cf
ret
; 2a0e7
-Function2a0e7:: ; 2a0e7
+TryWildEncounter:: ; 2a0e7
; Try to trigger a wild encounter.
- call Function2a103
- jr nc, .asm_2a0f8
- call Function2a14f
- jr nz, .asm_2a0f8
- call Function2a1df
- jr nc, .asm_2a0f8
+ call .EncounterRate
+ jr nc, .no_battle
+ call ChooseWildEncounter
+ jr nz, .no_battle
+ call CheckRepelEffect
+ jr nc, .no_battle
xor a
ret
-.asm_2a0f8
+.no_battle
xor a ; BATTLETYPE_NORMAL
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld [BattleType], a
ld a, 1
and a
ret
; 2a103
-Function2a103: ; 2a103
- call Function2a111
- call Function2a124
- call Function2a138
+.EncounterRate: ; 2a103
+ call GetMapEncounterRate
+ call ApplyMusicEffectOnEncounterRate
+ call ApplyCleanseTagEffectOnEncounterRate
call Random
cp b
ret
; 2a111
-Function2a111: ; 2a111
+GetMapEncounterRate: ; 2a111
ld hl, wd25a
- call Function1852
+ call CheckOnWater
ld a, 3
jr z, .asm_2a11e
ld a, [TimeOfDay]
@@ -33902,25 +33902,25 @@ Function2a111: ; 2a111
ret
; 2a124
-Function2a124:: ; 2a124
+ApplyMusicEffectOnEncounterRate:: ; 2a124
; Pokemon March and Ruins of Alph signal double encounter rate.
; Pokemon Lullaby halves encounter rate.
ld a, [wMapMusic]
cp MUSIC_POKEMON_MARCH
- jr z, .asm_2a135
+ jr z, .double
cp MUSIC_RUINS_OF_ALPH_RADIO
- jr z, .asm_2a135
+ jr z, .double
cp MUSIC_POKEMON_LULLABY
ret nz
srl b
ret
-.asm_2a135
+.double
sla b
ret
; 2a138
-Function2a138:: ; 2a138
+ApplyCleanseTagEffectOnEncounterRate:: ; 2a138
; Cleanse Tag halves encounter rate.
ld hl, PartyMon1Item
ld de, PartyMon2 - PartyMon1
@@ -33929,140 +33929,146 @@ Function2a138:: ; 2a138
.loop
ld a, [hl]
cp CLEANSE_TAG
- jr z, .asm_2a14c
+ jr z, .cleansetag
add hl, de
dec c
jr nz, .loop
ret
-.asm_2a14c
+.cleansetag
srl b
ret
; 2a14f
-Function2a14f: ; 2a14f
- call Function2a200
- jp nc, .asm_2a1c1
- call Function2a2ce
- jp c, .asm_2a1c9
+ChooseWildEncounter: ; 2a14f
+ call LoadWildMonDataPointer
+ jp nc, .nowildbattle
+ call CheckEncounterRoamMon
+ jp c, .startwildbattle
rept 3
inc hl
endr
- call Function1852
- ld de, Unknown_2a1d9
- jr z, .asm_2a174
+ call CheckOnWater
+ ld de, .WaterMonTable
+ jr z, .watermon
rept 2
inc hl
endr
ld a, [TimeOfDay]
ld bc, $e
call AddNTimes
- ld de, Unknown_2a1cb
+ ld de, .GrassMonTable
-.asm_2a174
+.watermon
+; hl contains the pointer to the wild mon data, let's save that to the stack
push hl
-.asm_2a175
+.randomloop
call Random
cp 100
- jr nc, .asm_2a175
- inc a
+ jr nc, .randomloop
+ inc a ; 1 <= a <= 100
ld b, a
ld h, d
ld l, e
-.asm_2a180
+; This next loop chooses which mon to load up.
+.prob_bracket_loop
ld a, [hli]
cp b
- jr nc, .asm_2a187
+ jr nc, .got_it
inc hl
- jr .asm_2a180
+ jr .prob_bracket_loop
-.asm_2a187
+.got_it
ld c, [hl]
ld b, 0
pop hl
- add hl, bc
+ add hl, bc ; this selects our mon
ld a, [hli]
ld b, a
- call Function1852
- jr nz, .asm_2a1aa
-
+; If the Pokemon is encountered by surfing, we need to give the levels some variety.
+ call CheckOnWater
+ jr nz, .ok
+; Check if we buff the wild mon, and by how much.
call Random
- cp 89
- jr c, .asm_2a1aa
+ cp 35 percent
+ jr c, .ok
inc b
- cp 165
- jr c, .asm_2a1aa
+ cp 65 percent
+ jr c, .ok
inc b
- cp 216
- jr c, .asm_2a1aa
+ cp 85 percent
+ jr c, .ok
inc b
- cp 242
- jr c, .asm_2a1aa
+ cp 95 percent
+ jr c, .ok
inc b
-
-.asm_2a1aa
+; Store the level
+.ok
ld a, b
ld [CurPartyLevel], a
ld b, [hl]
- call Function2a4a0
- jr c, .asm_2a1c1
+ ; ld a, b
+ call ValidateTempWildMonSpecies
+ jr c, .nowildbattle
ld a, b
cp UNOWN
- jr nz, .asm_2a1bf
+ jr nz, .done
ld a, [UnlockedUnowns]
and a
- jr z, .asm_2a1c1
+ jr z, .nowildbattle
-.asm_2a1bf
- jr .asm_2a1c5
+.done
+ jr .loadwildmon
-.asm_2a1c1
+.nowildbattle
ld a, 1
and a
ret
-.asm_2a1c5
+.loadwildmon
ld a, b
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
-.asm_2a1c9
+.startwildbattle
xor a
ret
; 2a1cb
-Unknown_2a1cb: ; 2a1cb
- db 30, $0
- db 60, $2
- db 80, $4
- db 90, $6
- db 95, $8
- db 99, $a
- db 100, $c
+.GrassMonTable: ; 2a1cb
+ db 30, $0 ; 30% chance
+ db 60, $2 ; 30% chance
+ db 80, $4 ; 20% chance
+ db 90, $6 ; 10% chance
+ db 95, $8 ; 5% chance
+ db 99, $a ; 4% chance
+ db 100, $c ; 1% chance
; 2a1d9
-Unknown_2a1d9: ; 2a1d9
- db 60, $0
- db 90, $2
- db 100, $4
+.WaterMonTable: ; 2a1d9
+ db 60, $0 ; 60% chance
+ db 90, $2 ; 30% chance
+ db 100, $4 ; 10% chance
; 2a1df
-Function2a1df:: ; 2a1df
+CheckRepelEffect:: ; 2a1df
+; If there is no active Repel, there's no need to be here.
ld a, [wdca1]
and a
- jr z, .asm_2a1fe
+ jr z, .encounter
+; Get the first Pokemon in your party that isn't fainted.
ld hl, PartyMon1HP
ld bc, PartyMon2 - PartyMon1 - 1
-.asm_2a1eb
+.loop
ld a, [hli]
or [hl]
- jr nz, .asm_2a1f2
+ jr nz, .ok
add hl, bc
- jr .asm_2a1eb
+ jr .loop
-.asm_2a1f2
+.ok
; to PartyMonLevel
rept 4
dec hl
@@ -34070,42 +34076,42 @@ endr
ld a, [CurPartyLevel]
cp [hl]
- jr nc, .asm_2a1fe
+ jr nc, .encounter
and a
ret
-.asm_2a1fe
+.encounter
scf
ret
; 2a200
-Function2a200: ; 2a200
- call Function1852
- jr z, Function2a21d
+LoadWildMonDataPointer: ; 2a200
+ call CheckOnWater
+ jr z, _WaterWildmonLookup
-Function2a205: ; 2a205
- ld hl, WildMons5
- ld bc, $002f
- call asm_2a23d
+_GrassWildmonLookup: ; 2a205
+ ld hl, SwarmGrassWildMons
+ ld bc, GRASS_WILDDATA_LENGTH
+ call _SwarmWildmonCheck
ret c
- ld hl, WildMons1
- ld de, WildMons3
- call asm_2a235
- ld bc, $002f
- jr asm_2a27a
-
-Function2a21d: ; 2a21d
- ld hl, WildMons6
- ld bc, $0009
- call asm_2a23d
+ ld hl, JohtoGrassWildMons
+ ld de, KantoGrassWildMons
+ call _JohtoWildmonCheck
+ ld bc, GRASS_WILDDATA_LENGTH
+ jr _NormalWildmonOK
+
+_WaterWildmonLookup: ; 2a21d
+ ld hl, SwarmWaterWildMons
+ ld bc, WATER_WILDDATA_LENGTH
+ call _SwarmWildmonCheck
ret c
- ld hl, WildMons2
- ld de, WildMons4
- call asm_2a235
- ld bc, $0009
- jr asm_2a27a
+ ld hl, JohtoWaterWildMons
+ ld de, KantoWaterWildMons
+ call _JohtoWildmonCheck
+ ld bc, WATER_WILDDATA_LENGTH
+ jr _NormalWildmonOK
-asm_2a235
+_JohtoWildmonCheck
call IsInJohto
and a
ret z
@@ -34113,51 +34119,51 @@ asm_2a235
ld l, e
ret
-asm_2a23d
- call Function2a27f
+_SwarmWildmonCheck
+ call CopyCurrMapDE
push hl
ld hl, SwarmFlags
bit 2, [hl]
pop hl
- jr z, .asm_2a25c
+ jr z, .CheckYanma
ld a, [wdfcc]
cp d
- jr nz, .asm_2a25c
+ jr nz, .CheckYanma
ld a, [wdfcd]
cp e
- jr nz, .asm_2a25c
- call Function2a288
- jr nc, asm_2a278
+ jr nz, .CheckYanma
+ call LookUpWildmonsForMapDE
+ jr nc, _NoSwarmWildmon
scf
ret
-.asm_2a25c
+.CheckYanma
push hl
ld hl, SwarmFlags
bit 3, [hl]
pop hl
- jr z, asm_2a278
+ jr z, _NoSwarmWildmon
ld a, [wdc5a]
cp d
- jr nz, asm_2a278
+ jr nz, _NoSwarmWildmon
ld a, [wdc5b]
cp e
- jr nz, asm_2a278
- call Function2a288
- jr nc, asm_2a278
+ jr nz, _NoSwarmWildmon
+ call LookUpWildmonsForMapDE
+ jr nc, _NoSwarmWildmon
scf
ret
-asm_2a278
+_NoSwarmWildmon
and a
ret
-asm_2a27a
- call Function2a27f
- jr Function2a288
+_NormalWildmonOK
+ call CopyCurrMapDE
+ jr LookUpWildmonsForMapDE
; 2a27f
-Function2a27f: ; 2a27f
+CopyCurrMapDE: ; 2a27f
ld a, [MapGroup]
ld d, a
ld a, [MapNumber]
@@ -34165,30 +34171,30 @@ Function2a27f: ; 2a27f
ret
; 2a288
-Function2a288: ; 2a288
+LookUpWildmonsForMapDE: ; 2a288
push hl
ld a, [hl]
inc a
- jr z, .asm_2a29a
+ jr z, .nope
ld a, d
cp [hl]
- jr nz, .asm_2a296
+ jr nz, .next
inc hl
ld a, e
cp [hl]
- jr z, .asm_2a29d
+ jr z, .yup
-.asm_2a296
+.next
pop hl
add hl, bc
- jr Function2a288
+ jr LookUpWildmonsForMapDE
-.asm_2a29a
+.nope
pop hl
and a
ret
-.asm_2a29d
+.yup
pop hl
scf
ret
@@ -34240,34 +34246,39 @@ InitRoamMons: ; 2a2a0
; 2a2ce
-Function2a2ce: ; 2a2ce
+CheckEncounterRoamMon: ; 2a2ce
push hl
- call Function1852
- jr z, .asm_2a30a
- call Function2a27f
+; Don't trigger an encounter if we're on water.
+ call CheckOnWater
+ jr z, .DontEncounterRoamMon
+; Load the current map group and number to de
+ call CopyCurrMapDE
+; Randomly select a beast.
call Random
- cp 100
- jr nc, .asm_2a30a
- and 3
- jr z, .asm_2a30a
- dec a
+ cp 100 ; 25/64 chance
+ jr nc, .DontEncounterRoamMon
+ and %00000011 ; Of that, a 3/4 chance. Running total: 75/256, or around 29.3%.
+ jr z, .DontEncounterRoamMon
+ dec a ; 1/3 chance that it's Entei, 1/3 chance that it's Raikou
+; Compare its current location with yours
ld hl, wRoamMon1MapGroup
ld c, a
ld b, 0
- ld a, 7
+ ld a, 7 ; length of the RoamMon struct
call AddNTimes
ld a, d
cp [hl]
- jr nz, .asm_2a30a
+ jr nz, .DontEncounterRoamMon
inc hl
ld a, e
cp [hl]
- jr nz, .asm_2a30a
+ jr nz, .DontEncounterRoamMon
+; We've decided to take on a beast, so stage its information for battle.
rept 3
dec hl
endr
ld a, [hli]
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld a, [hl]
ld [CurPartyLevel], a
ld a, BATTLETYPE_ROAMING
@@ -34277,7 +34288,7 @@ endr
scf
ret
-.asm_2a30a
+.DontEncounterRoamMon
pop hl
and a
ret
@@ -34287,7 +34298,7 @@ endr
UpdateRoamMons: ; 2a30d
ld a, [wRoamMon1MapGroup]
cp $ff
- jr z, .asm_2a324
+ jr z, .SkipRaikou
ld b, a
ld a, [wRoamMon1MapNumber]
ld c, a
@@ -34297,10 +34308,10 @@ UpdateRoamMons: ; 2a30d
ld a, c
ld [wRoamMon1MapNumber], a
-.asm_2a324
+.SkipRaikou
ld a, [wRoamMon2MapGroup]
cp $ff
- jr z, .asm_2a33b
+ jr z, .SkipEntei
ld b, a
ld a, [wRoamMon2MapNumber]
ld c, a
@@ -34310,10 +34321,10 @@ UpdateRoamMons: ; 2a30d
ld a, c
ld [wRoamMon2MapNumber], a
-.asm_2a33b
+.SkipEntei
ld a, [wRoamMon3MapGroup]
cp $ff
- jr z, .asm_2a352
+ jr z, .SkipSuicune
ld b, a
ld a, [wRoamMon3MapNumber]
ld c, a
@@ -34323,7 +34334,7 @@ UpdateRoamMons: ; 2a30d
ld a, c
ld [wRoamMon3MapNumber], a
-.asm_2a352
+.SkipSuicune
jp Function2a3f6
; 2a355
@@ -34487,15 +34498,16 @@ RoamMaps: ; 2a40f
db $ff
; 2a4a0
-Function2a4a0: ; 2a4a0
- and a
- jr z, .asm_2a4a9
- cp $fc
- jr nc, .asm_2a4a9
+ValidateTempWildMonSpecies: ; 2a4a0
+; Due to a development oversight, this function is called with the wild Pokemon's level, not its species, in a.
and a
+ jr z, .nowildmon ; = 0
+ cp NUM_POKEMON + 1 ; 252
+ jr nc, .nowildmon ; >= 252
+ and a ; 1 <= Species <= 251
ret
-.asm_2a4a9
+.nowildmon
scf
ret
; 2a4ab
@@ -34504,12 +34516,12 @@ Function2a4ab: ; 2a4ab
callba Function90439
ld d, b
ld e, c
- ld hl, WildMons1
+ ld hl, JohtoGrassWildMons
ld bc, $002f
- call Function2a288
+ call LookUpWildmonsForMapDE
jr c, .asm_2a4c6
- ld hl, WildMons3
- call Function2a288
+ ld hl, KantoGrassWildMons
+ call LookUpWildmonsForMapDE
jr nc, .asm_2a514
.asm_2a4c6
@@ -34576,12 +34588,12 @@ Function2a51f: ; 2a51f
callba Function90439
ld d, b
ld e, c
- ld hl, WildMons1
+ ld hl, JohtoGrassWildMons
ld bc, $002f
- call Function2a288
+ call LookUpWildmonsForMapDE
jr c, .asm_2a538
- ld hl, WildMons3
- call Function2a288
+ ld hl, KantoGrassWildMons
+ call LookUpWildmonsForMapDE
.asm_2a538
ld bc, $0005
@@ -34698,22 +34710,22 @@ endr
; 2a5e9
-WildMons1: ; 0x2a5e9
+JohtoGrassWildMons: ; 0x2a5e9
INCLUDE "data/wild/johto_grass.asm"
-WildMons2: ; 0x2b11d
+JohtoWaterWildMons: ; 0x2b11d
INCLUDE "data/wild/johto_water.asm"
-WildMons3: ; 0x2b274
+KantoGrassWildMons: ; 0x2b274
INCLUDE "data/wild/kanto_grass.asm"
-WildMons4: ; 0x2b7f7
+KantoWaterWildMons: ; 0x2b7f7
INCLUDE "data/wild/kanto_water.asm"
-WildMons5: ; 0x2b8d0
+SwarmGrassWildMons: ; 0x2b8d0
INCLUDE "data/wild/swarm_grass.asm"
-WildMons6: ; 0x2b92f
+SwarmWaterWildMons: ; 0x2b92f
INCLUDE "data/wild/swarm_water.asm"
@@ -49429,11 +49441,11 @@ Function506ef: ; 506ef
ld hl, StatusFlags2
bit 2, [hl]
jr nz, .asm_50712
- callba Function2a111
+ callba GetMapEncounterRate
ld a, b
and a
jr z, .asm_5071e
- callba Function2a14f
+ callba ChooseWildEncounter
jr nz, .asm_5071e
jr .asm_50718
@@ -50412,42 +50424,42 @@ Function50db9: ; 50db9
ld a, [wd263]
cp $1
- jr nz, .asm_50dca
+ jr nz, .check_party_ot_name
ld hl, OTPartyCount
ld de, OTPartyMonOT
ld a, ENEMY_OT_NAME
- jr .asm_50dfc
-.asm_50dca
+ jr .done
+.check_party_ot_name
cp $4
- jr nz, .asm_50dd8
+ jr nz, .check_mon_name
ld hl, PartyCount
ld de, PartyMonOT
ld a, PARTY_OT_NAME
- jr .asm_50dfc
-.asm_50dd8
+ jr .done
+.check_mon_name
cp $5
- jr nz, .asm_50de6
+ jr nz, .check_item_name
ld hl, OBPals + 8 * 6
ld de, PokemonNames
ld a, PKMN_NAME
- jr .asm_50dfc
-.asm_50de6
+ jr .done
+.check_item_name
cp $2
- jr nz, .asm_50df4
+ jr nz, .check_ob_item_name
ld hl, NumItems
ld de, ItemNames
ld a, ITEM_NAME
- jr .asm_50dfc
-.asm_50df4
+ jr .done
+.check_ob_item_name
ld hl, OBPals + 8 * 6
ld de, ItemNames
ld a, ITEM_NAME
-.asm_50dfc
+.done
ld [wcf61], a
ld a, l
ld [wd100], a
@@ -76344,7 +76356,7 @@ TreeMonEncounter: ; b81ea
callba Function1060ef
xor a
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld [CurPartyLevel], a
ld hl, TreeMonMaps
@@ -76372,7 +76384,7 @@ TreeMonEncounter: ; b81ea
RockMonEncounter: ; b8219
xor a
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld [CurPartyLevel], a
ld hl, RockMonMaps
@@ -76697,7 +76709,7 @@ endr
jr z, NoTreeMon
ld a, [hli]
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld a, [hl]
ld [CurPartyLevel], a
scf
@@ -76705,7 +76717,7 @@ endr
NoTreeMon: ; b843b
xor a
- ld [wd22e], a
+ ld [TempWildMonSpecies], a
ld [CurPartyLevel], a
ret
; b8443
@@ -94721,4 +94733,4 @@ IF DEF(CRYSTAL11)
INCBIN "misc/stadium2_2.bin"
ELSE
INCBIN "misc/stadium2_1.bin"
-ENDC
+ENDC \ No newline at end of file
diff --git a/wram.asm b/wram.asm
index 3cae0ebd1..06f2d734c 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1711,7 +1711,7 @@ IsInBattle:: ; d22d
; 2: trainer battle
ds 1
-wd22e:: ds 1
+TempWildMonSpecies:: ds 1
OtherTrainerClass:: ; d22f
; class (Youngster, Bug Catcher, etc.) of opposing trainer
; 0 if opponent is a wild Pokémon, not a trainer