diff options
| -rw-r--r-- | data/wild/johto_grass.asm | 1763 | ||||
| -rw-r--r-- | data/wild/johto_water.asm | 36 | ||||
| -rw-r--r-- | data/wild/kanto_grass.asm | 1195 | ||||
| -rw-r--r-- | data/wild/kanto_water.asm | 24 | ||||
| -rw-r--r-- | data/wild/swarm_grass.asm | 133 | ||||
| -rw-r--r-- | data/wild/swarm_water.asm | 7 | ||||
| -rw-r--r-- | engine/overworld/wildmons.asm | 12 | ||||
| -rw-r--r-- | main.asm | 12 | ||||
| -rw-r--r-- | wram.asm | 6 |
9 files changed, 2231 insertions, 957 deletions
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index 2567e9fc..ebc95c3f 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -279,7 +279,7 @@ JohtoGrassWildMons: db 14, KOFFING db 15, RATTATA db 14, ZUBAT - db 15, RATTATA + db 16, KOFFING db 15, RATICATE db 15, RATICATE ; day @@ -287,7 +287,7 @@ JohtoGrassWildMons: db 14, KOFFING db 15, RATTATA db 14, ZUBAT - db 15, RATTATA + db 16, KOFFING db 15, RATICATE db 15, RATICATE ; nite @@ -295,7 +295,7 @@ JohtoGrassWildMons: db 14, KOFFING db 15, RATTATA db 14, ZUBAT - db 15, RATTATA + db 16, KOFFING db 15, RATICATE db 15, RATICATE @@ -305,53 +305,75 @@ JohtoGrassWildMons: db 14, RATTATA db 14, KOFFING db 16, KOFFING + db 16, RATTATA db 15, ZUBAT - db 12, KOFFING - db 16, KOFFING - db 16, WEEZING + db 14, MAGMAR + db 14, MAGMAR ; day db 14, RATTATA db 14, KOFFING db 16, KOFFING + db 16, MAGMAR db 15, ZUBAT - db 12, KOFFING - db 16, KOFFING - db 16, WEEZING + db 14, RATTATA + db 14, RATTATA ; nite db 14, RATTATA db 14, KOFFING db 16, KOFFING + db 16, RATTATA db 15, ZUBAT - db 12, KOFFING - db 16, KOFFING - db 16, WEEZING + db 14, MAGMAR + db 14, MAGMAR map_id NATIONAL_PARK db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; 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 10, METAPOD + db 12, CATERPIE + db 12, PIDGEY + db 10, PIDGEY + db 14, PIDGEY + db 14, PIDGEY ; day - db 12, NIDORAN_F - db 12, NIDORAN_M - db 14, SUNKERN - db 13, PIDGEY db 10, CATERPIE + db 10, METAPOD + db 11, SUNKERN + db 12, PIDGEY + db 13, SUNKERN + db 14, PIDGEY + db 14, PIDGEY + + ELIF DEF(_SILVER) + ; morn db 10, WEEDLE + db 10, KAKUNA + db 12, WEEDLE + db 12, PIDGEY + db 10, PIDGEY + db 14, PIDGEY + db 14, PIDGEY + ; day db 10, WEEDLE + db 10, KAKUNA + db 11, SUNKERN + db 12, PIDGEY + db 13, SUNKERN + db 14, PIDGEY + db 14, PIDGEY + ENDC + ; nite - db 12, PSYDUCK - db 13, HOOTHOOT - db 14, SPINARAK - db 15, HOOTHOOT - db 10, VENONAT - db 12, VENONAT - db 12, VENONAT + db 10, HOOTHOOT + db 10, HOOTHOOT + db 12, HOOTHOOT + db 12, HOOTHOOT + db 10, HOOTHOOT + db 14, HOOTHOOT + db 14, HOOTHOOT map_id RUINS_OF_ALPH_OUTSIDE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite @@ -376,9 +398,9 @@ JohtoGrassWildMons: db 22, NATU db 18, NATU db 24, NATU - db 22, WOOPER - db 22, QUAGSIRE - db 22, QUAGSIRE + db 20, SMEARGLE + db 22, SMEARGLE + db 22, SMEARGLE map_id RUINS_OF_ALPH_INNER_CHAMBER db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite @@ -409,6 +431,8 @@ JohtoGrassWildMons: map_id UNION_CAVE_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 6, GEODUDE db 6, SANDSHREW @@ -427,64 +451,120 @@ JohtoGrassWildMons: db 6, ONIX ; nite db 6, GEODUDE + db 6, SANDSHREW + db 5, ZUBAT + db 4, RATTATA + db 7, ZUBAT + db 6, ONIX + db 6, ONIX + + ELIF DEF(_SILVER) + ; morn + db 6, GEODUDE db 6, RATTATA - db 5, WOOPER + db 5, ZUBAT db 4, RATTATA db 7, ZUBAT db 6, ONIX db 6, ONIX + ; day + db 6, GEODUDE + db 6, RATTATA + db 5, ZUBAT + db 4, RATTATA + db 7, ZUBAT + db 6, ONIX + db 6, ONIX + ; nite + db 6, GEODUDE + db 6, RATTATA + db 5, ZUBAT + db 4, RATTATA + db 7, ZUBAT + db 6, ONIX + db 6, ONIX + ENDC map_id UNION_CAVE_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 8, GEODUDE - db 6, ZUBAT - db 8, ZUBAT + db 8, SANDSHREW + db 7, ZUBAT db 8, ONIX + db 9, ZUBAT + db 6, RATTATA db 6, RATTATA - db 8, RATTATA - db 8, RATTATA ; day db 8, GEODUDE - db 6, ZUBAT - db 8, ZUBAT + db 8, SANDSHREW + db 7, ZUBAT db 8, ONIX + db 9, ZUBAT + db 6, RATTATA db 6, RATTATA - db 8, RATTATA - db 8, RATTATA ; nite db 8, GEODUDE - db 6, ZUBAT - db 8, WOOPER + db 8, SANDSHREW + db 7, ZUBAT db 8, ONIX + db 9, ZUBAT + db 6, RATTATA db 6, RATTATA + + ELIF DEF(_SILVER) + ; morn + db 8, GEODUDE db 8, RATTATA + db 7, ZUBAT + db 8, ONIX + db 9, ZUBAT + db 6, RATTATA + db 6, RATTATA + ; day + db 8, GEODUDE + db 8, RATTATA + db 7, ZUBAT + db 8, ONIX + db 9, ZUBAT + db 6, RATTATA + db 6, RATTATA + ; nite + db 8, GEODUDE db 8, RATTATA + db 7, ZUBAT + db 8, ONIX + db 9, ZUBAT + db 6, RATTATA + db 6, RATTATA + ENDC map_id UNION_CAVE_B2F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 22, ZUBAT + db 22, RATICATE db 22, GOLBAT - db 22, ZUBAT - db 21, RATICATE - db 20, GEODUDE + db 21, GEODUDE + db 20, RATTATA db 23, ONIX db 23, ONIX ; day db 22, ZUBAT + db 22, RATICATE db 22, GOLBAT - db 22, ZUBAT - db 21, RATICATE - db 20, GEODUDE + db 21, GEODUDE + db 20, RATTATA db 23, ONIX db 23, ONIX ; nite db 22, ZUBAT + db 22, RATICATE db 22, GOLBAT - db 22, QUAGSIRE - db 21, RATICATE - db 20, GEODUDE + db 21, GEODUDE + db 20, RATTATA db 23, ONIX db 23, ONIX @@ -544,84 +624,106 @@ JohtoGrassWildMons: map_id ILEX_FOREST db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 5, CATERPIE - db 5, WEEDLE - db 7, METAPOD - db 7, KAKUNA - db 7, PIDGEY + db 6, METAPOD + db 6, CATERPIE + db 5, PARAS + db 5, ZUBAT db 6, PARAS db 6, PARAS ; day db 5, CATERPIE + db 6, CATERPIE + db 5, METAPOD + db 6, METAPOD + db 5, ZUBAT + db 6, PARAS + db 6, PARAS + + ELIF DEF(_SILVER) + ; morn db 5, WEEDLE - db 7, METAPOD - db 7, KAKUNA - db 7, PIDGEY + db 6, KAKUNA + db 6, WEEDLE + db 5, PARAS + db 5, ZUBAT + db 6, PARAS db 6, PARAS + ; day + db 5, WEEDLE + db 6, WEEDLE + db 5, KAKUNA + db 6, KAKUNA + db 5, ZUBAT db 6, PARAS + db 6, PARAS + ENDC + ; nite db 5, ODDISH - db 5, VENONAT - db 7, ODDISH - db 7, PSYDUCK - db 7, HOOTHOOT + db 6, ODDISH + db 6, ZUBAT + db 5, PARAS + db 5, ZUBAT db 6, PARAS db 6, PARAS map_id MOUNT_MORTAR_1F_OUTSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - db 14, RATTATA db 13, ZUBAT + db 15, ZUBAT db 14, MACHOP - db 13, GOLBAT + db 14, RATTATA db 14, GEODUDE - db 16, RATICATE - db 16, RATICATE + db 16, RATTATA + db 15, MARILL ; day - db 14, RATTATA db 13, ZUBAT + db 15, ZUBAT db 14, MACHOP - db 13, GOLBAT + db 14, RATTATA db 14, GEODUDE - db 16, RATICATE - db 16, RATICATE + db 16, RATTATA + db 15, MARILL ; nite - db 14, RATTATA db 13, ZUBAT - db 14, MARILL - db 13, GOLBAT + db 15, ZUBAT + db 14, MACHOP + db 14, RATTATA db 14, GEODUDE - db 16, RATICATE - db 16, RATICATE + db 16, RATTATA + db 15, MARILL map_id MOUNT_MORTAR_1F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 13, GEODUDE + db 13, MACHOP + db 15, GEODUDE db 14, RATTATA db 15, MACHOP - db 14, RATICATE - db 15, ZUBAT - db 15, GOLBAT - db 15, GOLBAT + db 14, ZUBAT + db 14, ZUBAT ; day db 13, GEODUDE + db 13, MACHOP + db 15, GEODUDE db 14, RATTATA db 15, MACHOP - db 14, RATICATE - db 15, ZUBAT - db 15, GOLBAT - db 15, GOLBAT + db 14, ZUBAT + db 14, ZUBAT ; nite db 13, GEODUDE + db 13, MACHOP + db 15, GEODUDE db 14, RATTATA - db 15, RATICATE + db 15, MACHOP + db 14, ZUBAT db 14, ZUBAT - db 15, MARILL - db 15, GOLBAT - db 15, GOLBAT map_id MOUNT_MORTAR_2F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite @@ -643,498 +745,759 @@ JohtoGrassWildMons: db 30, GOLBAT ; nite db 31, GRAVELER + db 32, MACHOKE db 31, GEODUDE db 30, RATICATE + db 28, MACHOP + db 30, GOLBAT db 30, GOLBAT - db 28, MARILL - db 32, GOLBAT - db 32, GOLBAT map_id 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, RATTATA db 16, MACHOP db 16, GEODUDE - db 18, RATICATE - db 18, RATICATE + db 16, RATICATE + db 16, RATICATE ; day db 15, ZUBAT db 17, ZUBAT - db 17, GOLBAT + db 16, RATTATA db 16, MACHOP db 16, GEODUDE - db 18, RATICATE - db 18, RATICATE + db 16, RATICATE + db 16, RATICATE ; nite db 15, ZUBAT db 17, ZUBAT - db 17, GOLBAT - db 16, MARILL + db 16, RATTATA + db 16, MACHOP db 16, GEODUDE - db 18, RATICATE - db 18, RATICATE + db 16, RATICATE + db 16, RATICATE map_id ICE_PATH_1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 21, SWINUB + db 22, GOLBAT + db 22, ZUBAT + db 23, SWINUB db 22, ZUBAT + db 22, JYNX + db 22, JYNX + ; day + db 21, SWINUB db 22, GOLBAT + db 22, ZUBAT db 23, SWINUB - db 24, GOLBAT + db 22, JYNX + db 20, JYNX + db 20, JYNX + ; nite + db 21, SWINUB db 22, GOLBAT + db 22, ZUBAT + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX + + ELIF DEF(_SILVER) + ; morn + db 21, SWINUB db 22, GOLBAT + db 22, DELIBIRD + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX ; day db 21, SWINUB - db 22, ZUBAT db 22, GOLBAT + db 22, DELIBIRD db 23, SWINUB - db 24, GOLBAT + db 22, JYNX + db 20, JYNX + db 20, JYNX + ; nite + db 21, SWINUB db 22, GOLBAT + db 22, DELIBIRD + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX + ENDC + + map_id ICE_PATH_B1F + db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) + ; morn + db 21, SWINUB db 22, GOLBAT + db 22, ZUBAT + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX + ; day + db 21, SWINUB + db 22, GOLBAT + db 22, ZUBAT + db 23, SWINUB + db 22, JYNX + db 20, JYNX + db 20, JYNX ; nite - db 21, DELIBIRD + db 21, SWINUB + db 22, GOLBAT db 22, ZUBAT + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX + + ELIF DEF(_SILVER) + ; morn + db 21, SWINUB db 22, GOLBAT - db 23, DELIBIRD - db 24, GOLBAT + db 22, DELIBIRD + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX + ; day + db 21, SWINUB db 22, GOLBAT + db 22, DELIBIRD + db 23, SWINUB + db 22, JYNX + db 20, JYNX + db 20, JYNX + ; nite + db 21, SWINUB db 22, GOLBAT + db 22, DELIBIRD + db 23, SWINUB + db 22, ZUBAT + db 22, JYNX + db 22, JYNX + ENDC - map_id ICE_PATH_B1F + map_id ICE_PATH_B2F_MAHOGANY_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 22, SWINUB + db 23, GOLBAT db 23, ZUBAT + db 24, SWINUB + db 23, ZUBAT + db 23, JYNX + db 23, JYNX + ; day + db 22, SWINUB db 23, GOLBAT + db 23, ZUBAT db 24, SWINUB - db 25, GOLBAT + db 23, JYNX + db 21, JYNX + db 21, JYNX + ; nite + db 22, SWINUB db 23, GOLBAT - db 22, JYNX + db 23, ZUBAT + db 24, SWINUB + db 23, ZUBAT + db 23, JYNX + db 23, JYNX + + ELIF DEF(_SILVER) + ; morn + db 22, SWINUB + db 23, GOLBAT + db 23, DELIBIRD + db 24, SWINUB + db 23, ZUBAT + db 23, JYNX + db 23, JYNX ; day db 22, SWINUB + db 23, GOLBAT + db 23, DELIBIRD + db 24, SWINUB + db 23, JYNX + db 21, JYNX + db 21, JYNX + ; nite + db 22, SWINUB + db 23, GOLBAT + db 23, DELIBIRD + db 24, SWINUB db 23, ZUBAT + db 23, JYNX + db 23, JYNX + ENDC + + map_id ICE_PATH_B2F_BLACKTHORN_SIDE + db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) + ; morn + db 22, SWINUB db 23, GOLBAT + db 23, ZUBAT db 24, SWINUB - db 25, GOLBAT + db 23, ZUBAT + db 23, JYNX + db 23, JYNX + ; day + db 22, SWINUB db 23, GOLBAT - db 22, JYNX + db 23, ZUBAT + db 24, SWINUB + db 23, JYNX + db 21, JYNX + db 21, JYNX ; nite - db 22, DELIBIRD + db 22, SWINUB + db 23, GOLBAT + db 23, ZUBAT + db 24, SWINUB db 23, ZUBAT + db 23, JYNX + db 23, JYNX + + ELIF DEF(_SILVER) + ; morn + db 22, SWINUB db 23, GOLBAT - db 24, DELIBIRD - db 25, GOLBAT + db 23, DELIBIRD + db 24, SWINUB + db 23, ZUBAT + db 23, JYNX + db 23, JYNX + ; day + db 22, SWINUB db 23, GOLBAT - db 22, SNEASEL + db 23, DELIBIRD + db 24, SWINUB + db 23, JYNX + db 21, JYNX + db 21, JYNX + ; nite + db 22, SWINUB + db 23, GOLBAT + db 23, DELIBIRD + db 24, SWINUB + db 23, ZUBAT + db 23, JYNX + db 23, JYNX + ENDC - map_id ICE_PATH_B2F_MAHOGANY_SIDE + map_id ICE_PATH_B3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 23, SWINUB - db 24, ZUBAT db 24, GOLBAT + db 24, ZUBAT db 25, SWINUB - db 26, GOLBAT - db 22, JYNX + db 24, ZUBAT + db 24, JYNX db 24, JYNX ; day db 23, SWINUB - db 24, ZUBAT db 24, GOLBAT + db 24, ZUBAT db 25, SWINUB - db 26, GOLBAT - db 22, JYNX db 24, JYNX + db 22, JYNX + db 22, JYNX ; nite - db 23, DELIBIRD - db 24, ZUBAT + db 23, SWINUB db 24, GOLBAT - db 25, DELIBIRD - db 26, GOLBAT - db 22, SNEASEL - db 24, SNEASEL + db 24, ZUBAT + db 25, SWINUB + db 24, ZUBAT + db 24, JYNX + db 24, JYNX - map_id ICE_PATH_B2F_BLACKTHORN_SIDE - db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + ELIF DEF(_SILVER) ; morn db 23, SWINUB - db 24, ZUBAT db 24, GOLBAT + db 24, DELIBIRD db 25, SWINUB - db 26, GOLBAT - db 22, JYNX + db 24, ZUBAT + db 24, JYNX db 24, JYNX ; day db 23, SWINUB - db 24, ZUBAT db 24, GOLBAT + db 24, DELIBIRD 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 - - map_id 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 - ; day - db 24, SWINUB - db 25, ZUBAT - db 25, GOLBAT - db 26, SWINUB db 22, JYNX - db 24, JYNX - db 26, JYNX ; nite + db 23, SWINUB + db 24, GOLBAT db 24, DELIBIRD - db 25, ZUBAT - db 25, GOLBAT - db 26, DELIBIRD - db 22, SNEASEL - db 24, SNEASEL - db 26, SNEASEL + db 25, SWINUB + db 24, ZUBAT + db 24, JYNX + db 24, JYNX + ENDC map_id 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 22, SEEL + db 23, GOLBAT db 24, SEEL db 24, SEEL ; day db 22, KRABBY db 23, ZUBAT - db 22, SEEL db 24, KRABBY - db 25, GOLBAT + db 22, SEEL + db 23, 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, SEEL + db 23, GOLBAT + db 24, SEEL + db 24, SEEL map_id 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 22, SEEL + db 23, GOLBAT db 24, SEEL db 24, SEEL ; day db 22, KRABBY db 23, ZUBAT - db 22, SEEL db 24, KRABBY - db 25, GOLBAT + db 22, SEEL + db 23, 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, SEEL + db 23, GOLBAT + db 24, SEEL + db 24, SEEL map_id 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 22, SEEL + db 23, GOLBAT db 24, SEEL db 24, SEEL ; day db 22, KRABBY db 23, ZUBAT - db 22, SEEL db 24, KRABBY - db 25, GOLBAT + db 22, SEEL + db 23, 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, SEEL + db 23, GOLBAT + db 24, SEEL + db 24, SEEL map_id 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 22, SEEL + db 23, GOLBAT db 24, SEEL db 24, SEEL ; day db 22, KRABBY db 23, ZUBAT - db 22, SEEL db 24, KRABBY - db 25, GOLBAT + db 22, SEEL + db 23, 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, SEEL + db 23, GOLBAT + db 24, SEEL + db 24, SEEL map_id 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 22, SEEL + db 23, GOLBAT db 24, SEEL db 24, SEEL ; day db 22, KRABBY db 23, ZUBAT - db 22, SEEL db 24, KRABBY - db 25, GOLBAT + db 22, SEEL + db 23, 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, SEEL + db 23, GOLBAT + db 24, SEEL + db 24, SEEL map_id 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 23, SEEL + db 24, GOLBAT db 25, SEEL db 25, SEEL ; day db 23, KRABBY db 24, ZUBAT - db 23, SEEL db 25, KRABBY - db 26, GOLBAT + db 23, SEEL + db 24, 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, SEEL + db 24, GOLBAT + db 25, SEEL + db 25, SEEL map_id WHIRL_ISLAND_B2F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn + db 23, KRABBY + db 24, ZUBAT + db 25, KRABBY + db 23, SEEL + db 24, GOLBAT + db 25, SEEL + db 25, SEEL + ; day + db 23, KRABBY + db 24, ZUBAT + db 25, KRABBY + db 23, SEEL + db 24, GOLBAT + db 25, SEEL + db 25, SEEL + ; nite + db 23, KRABBY + db 24, ZUBAT + db 25, KRABBY + db 23, SEEL + db 24, GOLBAT + db 25, SEEL + db 25, SEEL + + map_id WHIRL_ISLAND_LUGIA_CHAMBER + 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 24, SEEL + db 25, GOLBAT db 26, SEEL db 26, SEEL ; day db 24, KRABBY db 25, ZUBAT - db 24, SEEL db 26, KRABBY - db 27, GOLBAT + db 24, SEEL + db 25, 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, SEEL + db 25, GOLBAT + db 26, SEEL + db 26, SEEL - map_id WHIRL_ISLAND_LUGIA_CHAMBER + map_id SILVER_CAVE_ROOM_1 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 25, KRABBY - db 26, ZUBAT - db 25, SEEL - db 27, KRABBY - db 28, GOLBAT - db 27, SEEL - db 27, SEEL + db 42, ONIX + db 44, URSARING + db 43, GRAVELER + db 43, GRAVELER + db 45, GOLBAT + db 20, LARVITAR + db 15, LARVITAR ; day - db 25, KRABBY - db 26, ZUBAT - db 25, SEEL - db 27, KRABBY - db 28, GOLBAT - db 27, SEEL - db 27, SEEL + db 42, ONIX + db 44, URSARING + db 43, GRAVELER + db 43, GRAVELER + db 45, GOLBAT + db 20, LARVITAR + db 15, LARVITAR ; nite - db 25, KRABBY - db 26, ZUBAT - db 25, KRABBY - db 27, KRABBY - db 28, GOLBAT - db 27, GOLBAT - db 27, GOLBAT + db 42, ONIX + db 44, URSARING + db 43, GRAVELER + db 43, GRAVELER + db 45, GOLBAT + db 20, LARVITAR + db 15, LARVITAR - map_id SILVER_CAVE_ROOM_1 - db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + ELIF DEF(_SILVER) ; morn - db 43, GRAVELER - db 44, URSARING db 42, ONIX - db 45, MAGMAR + db 44, DONPHAN + db 43, GRAVELER + db 43, GRAVELER db 45, GOLBAT db 20, LARVITAR db 15, LARVITAR ; day - db 43, GRAVELER - db 44, URSARING db 42, ONIX - db 45, MAGMAR + db 44, DONPHAN + db 43, GRAVELER + db 43, GRAVELER 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 44, DONPHAN + db 43, GRAVELER + db 43, GRAVELER + db 45, GOLBAT + db 20, LARVITAR + db 15, LARVITAR + ENDC map_id SILVER_CAVE_ROOM_2 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 48, GOLBAT - db 48, MACHOKE + db 45, QUAGSIRE + db 48, GOLDUCK db 47, URSARING - db 46, PARASECT - db 48, PARASECT - db 15, LARVITAR + db 45, QUAGSIRE + db 48, GOLBAT db 20, LARVITAR + db 15, LARVITAR ; day + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, URSARING + db 45, QUAGSIRE db 48, GOLBAT - db 48, MACHOKE + db 20, LARVITAR + db 15, LARVITAR + ; nite + db 45, QUAGSIRE + db 48, GOLDUCK db 47, URSARING - db 46, PARASECT - db 48, PARASECT + db 45, MISDREAVUS + db 48, GOLBAT + db 20, LARVITAR db 15, LARVITAR + + ELIF DEF(_SILVER) + ; morn + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, DONPHAN + db 45, QUAGSIRE + db 48, GOLBAT db 20, LARVITAR - ; nite + db 15, LARVITAR + ; day + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, DONPHAN + db 45, QUAGSIRE db 48, GOLBAT + db 20, LARVITAR + db 15, LARVITAR + ; nite + db 45, QUAGSIRE db 48, GOLDUCK - db 46, GOLBAT - db 46, PARASECT - db 48, PARASECT - db 45, MISDREAVUS + db 47, DONPHAN db 45, MISDREAVUS + db 48, GOLBAT + db 20, LARVITAR + db 15, LARVITAR + ENDC map_id SILVER_CAVE_ROOM_3 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 51, GOLBAT db 48, ONIX - db 48, GRAVELER + db 48, GOLBAT db 50, URSARING + db 51, GOLDUCK db 20, LARVITAR db 15, LARVITAR - db 20, PUPITAR ; day db 51, GOLBAT db 48, ONIX - db 48, GRAVELER + db 48, GOLBAT db 50, URSARING + db 51, GOLDUCK 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 48, GOLBAT + db 50, URSARING + db 51, GOLDUCK + db 20, LARVITAR + db 15, LARVITAR + + ELIF DEF(_SILVER) + ; morn + db 51, GOLBAT + db 48, ONIX + db 48, GOLBAT + db 50, DONPHAN + db 51, GOLDUCK + db 20, LARVITAR + db 15, LARVITAR + ; day + db 51, GOLBAT + db 48, ONIX + db 48, GOLBAT + db 50, DONPHAN + db 51, GOLDUCK + db 20, LARVITAR + db 15, LARVITAR + ; nite + db 51, GOLBAT + db 48, ONIX + db 48, GOLBAT + db 50, DONPHAN + db 51, GOLDUCK + db 20, LARVITAR + db 15, LARVITAR + ENDC map_id SILVER_CAVE_ITEM_ROOMS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, URSARING + db 45, QUAGSIRE db 48, GOLBAT - db 46, GOLBAT - db 50, GOLBAT - db 46, PARASECT - db 48, PARASECT - db 50, PARASECT - db 52, PARASECT + db 20, LARVITAR + db 15, LARVITAR ; day + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, URSARING + db 45, QUAGSIRE db 48, GOLBAT - db 46, GOLBAT - db 50, GOLBAT - db 46, PARASECT - db 48, PARASECT - db 50, PARASECT - db 52, PARASECT + db 20, LARVITAR + db 15, LARVITAR ; nite db 45, MISDREAVUS + db 48, GOLDUCK + db 47, URSARING + db 45, QUAGSIRE db 48, GOLBAT - db 50, GOLBAT - db 46, PARASECT - db 48, PARASECT - db 50, PARASECT - db 52, PARASECT + db 20, LARVITAR + db 15, LARVITAR + + ELIF DEF(_SILVER) + ; morn + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, DONPHAN + db 45, QUAGSIRE + db 48, GOLBAT + db 20, LARVITAR + db 15, LARVITAR + ; day + db 45, QUAGSIRE + db 48, GOLDUCK + db 47, DONPHAN + db 45, QUAGSIRE + db 48, GOLBAT + db 20, LARVITAR + db 15, LARVITAR + ; nite + db 45, MISDREAVUS + db 48, GOLDUCK + db 47, DONPHAN + db 45, QUAGSIRE + db 48, GOLBAT + db 20, LARVITAR + db 15, LARVITAR + ENDC map_id DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite @@ -1143,7 +1506,7 @@ JohtoGrassWildMons: db 2, ZUBAT db 2, GEODUDE db 4, GEODUDE - db 2, TEDDIURSA + db 3, ZUBAT db 4, ZUBAT db 4, DUNSPARCE ; day @@ -1151,7 +1514,7 @@ JohtoGrassWildMons: db 2, ZUBAT db 2, GEODUDE db 4, GEODUDE - db 2, ZUBAT + db 3, ZUBAT db 4, ZUBAT db 4, DUNSPARCE ; nite @@ -1159,7 +1522,7 @@ JohtoGrassWildMons: db 2, ZUBAT db 2, GEODUDE db 4, GEODUDE - db 2, ZUBAT + db 3, ZUBAT db 4, ZUBAT db 4, DUNSPARCE @@ -1169,16 +1532,16 @@ JohtoGrassWildMons: db 23, GEODUDE db 23, ZUBAT db 25, GRAVELER - db 25, URSARING - db 20, TEDDIURSA + db 20, WOBBUFFET + db 25, WOBBUFFET db 23, GOLBAT db 23, GOLBAT ; day db 23, GEODUDE db 23, ZUBAT db 25, GRAVELER - db 25, URSARING - db 30, URSARING + db 20, WOBBUFFET + db 25, WOBBUFFET db 23, GOLBAT db 23, GOLBAT ; nite @@ -1194,440 +1557,761 @@ JohtoGrassWildMons: 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 3, PIDGEY + db 2, SENTRET + db 4, RATTATA + db 4, PIDGEY + db 4, PIDGEY ; day db 2, PIDGEY - db 2, SENTRET - db 3, PIDGEY db 3, SENTRET - db 2, RATTATA - db 3, HOPPIP - db 3, HOPPIP + db 3, PIDGEY + db 2, SENTRET + db 4, RATTATA + db 4, PIDGEY + db 4, PIDGEY ; nite db 2, HOOTHOOT - db 2, RATTATA - db 3, HOOTHOOT - db 3, RATTATA - db 2, RATTATA db 3, HOOTHOOT db 3, HOOTHOOT + db 2, RATTATA + db 4, RATTATA + db 4, HOOTHOOT + db 4, HOOTHOOT map_id ROUTE_30 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 3, LEDYBA + db 2, PIDGEY db 3, CATERPIE db 4, CATERPIE + db 4, METAPOD + db 4, PIDGEY + db 4, PIDGEY db 4, PIDGEY - db 3, WEEDLE - db 4, HOPPIP - db 4, HOPPIP ; day - db 3, PIDGEY + db 2, PIDGEY db 3, CATERPIE + db 4, PIDGEY + db 4, METAPOD db 4, CATERPIE + db 5, METAPOD + db 5, METAPOD + ; nite + db 3, SPINARAK + db 3, RATTATA + db 4, HOOTHOOT + db 4, RATTATA + db 4, HOOTHOOT + db 4, HOOTHOOT + db 4, HOOTHOOT + + ELIF DEF(_SILVER) + ; morn + db 3, LEDYBA + db 3, WEEDLE + db 4, WEEDLE + db 4, KAKUNA + db 4, PIDGEY db 4, PIDGEY + db 4, PIDGEY + ; day + db 2, PIDGEY db 3, WEEDLE - db 4, HOPPIP - db 4, HOPPIP + db 4, PIDGEY + db 4, KAKUNA + db 4, WEEDLE + db 5, KAKUNA + db 5, KAKUNA ; nite - db 3, SPINARAK - db 3, HOOTHOOT - db 4, POLIWAG + db 2, HOOTHOOT + db 3, RATTATA + db 4, HOOTHOOT + db 4, RATTATA db 4, HOOTHOOT - db 3, ZUBAT db 4, HOOTHOOT db 4, HOOTHOOT + ENDC map_id ROUTE_31 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 4, LEDYBA + db 3, PIDGEY db 4, CATERPIE - db 5, BELLSPROUT - db 5, PIDGEY - db 4, WEEDLE - db 5, HOPPIP - db 5, HOPPIP + db 3, BELLSPROUT + db 5, METAPOD + db 5, CATERPIE + db 5, METAPOD + db 5, METAPOD ; day - db 4, PIDGEY + db 3, PIDGEY db 4, CATERPIE - db 5, BELLSPROUT + db 3, BELLSPROUT + db 5, METAPOD + db 5, CATERPIE + db 6, METAPOD + db 6, METAPOD + ; nite + db 4, SPINARAK + db 4, RATTATA + db 3, BELLSPROUT + db 5, RATTATA + db 5, HOOTHOOT + db 5, HOOTHOOT + db 5, HOOTHOOT + + ELIF DEF(_SILVER) + ; morn + db 4, LEDYBA + db 4, WEEDLE + db 3, BELLSPROUT + db 5, KAKUNA + db 5, PIDGEY db 5, PIDGEY + db 5, PIDGEY + ; day + db 3, PIDGEY db 4, WEEDLE - db 5, HOPPIP - db 5, HOPPIP + db 3, BELLSPROUT + db 5, KAKUNA + db 5, WEEDLE + db 6, KAKUNA + db 6, KAKUNA ; nite - db 4, SPINARAK - db 4, POLIWAG - db 5, BELLSPROUT + db 3, HOOTHOOT + db 4, RATTATA + db 3, BELLSPROUT + db 5, RATTATA db 5, HOOTHOOT - db 4, ZUBAT - db 5, GASTLY - db 5, GASTLY + db 5, HOOTHOOT + db 5, HOOTHOOT + ENDC map_id ROUTE_32 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn + db 6, BELLSPROUT + db 4, RATTATA + db 6, MAREEP + db 6, HOPPIP + db 6, RATTATA + db 4, WOOPER + db 4, ZUBAT + ; day + db 6, BELLSPROUT + db 4, RATTATA + db 6, MAREEP + db 6, HOPPIP + db 6, RATTATA + db 8, RATTATA + db 8, RATTATA + ; nite + db 6, WOOPER + db 4, RATTATA + db 6, BELLSPROUT + db 6, MAREEP + db 8, WOOPER + db 8, ZUBAT + db 8, ZUBAT + + ELIF DEF(_SILVER) + ; morn + db 6, BELLSPROUT db 4, EKANS - db 5, RATTATA - db 7, BELLSPROUT + db 6, MAREEP db 6, HOPPIP - db 7, PIDGEY - db 7, HOPPIP - db 7, HOPPIP + db 6, RATTATA + db 4, WOOPER + db 4, ZUBAT ; day + db 6, BELLSPROUT db 4, EKANS - db 5, RATTATA - db 7, BELLSPROUT + db 6, MAREEP db 6, HOPPIP - db 7, PIDGEY - db 7, HOPPIP - db 7, HOPPIP + db 6, RATTATA + db 8, RATTATA + db 8, RATTATA ; nite - db 4, WOOPER - db 5, RATTATA - db 7, BELLSPROUT - db 6, ZUBAT - db 7, HOOTHOOT - db 7, GASTLY - db 7, GASTLY + db 6, WOOPER + db 4, EKANS + db 6, BELLSPROUT + db 6, MAREEP + db 8, WOOPER + db 8, ZUBAT + db 8, ZUBAT + ENDC map_id ROUTE_33 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn + db 6, HOPPIP + db 7, RATTATA + db 6, SPEAROW db 6, RATTATA + db 8, HOPPIP + db 4, ZUBAT + db 4, ZUBAT + ; day + db 6, HOPPIP + db 7, RATTATA db 6, SPEAROW - db 6, GEODUDE + db 6, RATTATA + db 8, HOPPIP + db 8, RATTATA + db 8, RATTATA + ; nite + db 6, ZUBAT + db 7, RATTATA + db 6, RATTATA + db 6, RATTATA + db 8, ZUBAT + db 8, ZUBAT + db 8, ZUBAT + + ELIF DEF(_SILVER) + ; morn db 6, HOPPIP db 7, EKANS - db 7, HOPPIP - db 7, HOPPIP - ; day - db 6, RATTATA db 6, SPEAROW - db 6, GEODUDE + db 6, RATTATA + db 8, HOPPIP + db 4, ZUBAT + db 4, ZUBAT + ; day db 6, HOPPIP db 7, EKANS - db 7, HOPPIP - db 7, HOPPIP - ; nite + db 6, SPEAROW db 6, RATTATA + db 8, HOPPIP + db 8, RATTATA + db 8, RATTATA + ; nite db 6, ZUBAT - db 6, GEODUDE - db 6, ZUBAT - db 7, RATTATA - db 7, RATTATA - db 7, RATTATA + db 7, EKANS + db 6, RATTATA + db 6, RATTATA + db 8, ZUBAT + db 8, ZUBAT + db 8, ZUBAT + ENDC map_id ROUTE_34 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - db 10, SNUBBULL + db 10, DROWZEE db 11, RATTATA - db 12, PIDGEY + db 12, DROWZEE db 10, ABRA - db 12, JIGGLYPUFF + db 13, RATTATA db 10, DITTO db 10, DITTO ; day - db 10, SNUBBULL + db 10, DROWZEE db 11, RATTATA - db 12, PIDGEY + db 12, DROWZEE db 10, ABRA - db 12, JIGGLYPUFF + db 13, RATTATA db 10, DITTO db 10, DITTO ; nite - db 12, DROWZEE + db 10, DROWZEE db 11, RATTATA - db 12, HOOTHOOT + db 12, DROWZEE db 10, ABRA - db 12, JIGGLYPUFF + db 13, RATTATA db 10, DITTO db 10, DITTO map_id ROUTE_35 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 12, SNUBBULL - db 14, PIDGEY - db 13, GROWLITHE + db 12, NIDORAN_M + db 12, NIDORAN_F + db 14, DROWZEE db 10, ABRA - db 12, JIGGLYPUFF + db 14, PIDGEY db 10, DITTO db 12, YANMA ; day - db 12, SNUBBULL - db 14, PIDGEY - db 13, GROWLITHE + db 12, NIDORAN_M + db 12, NIDORAN_F + db 14, DROWZEE db 10, ABRA - db 12, JIGGLYPUFF + db 14, PIDGEY db 10, DITTO db 12, YANMA ; nite - db 12, DROWZEE + db 12, NIDORAN_M + db 12, NIDORAN_F + db 14, DROWZEE + db 10, ABRA db 14, HOOTHOOT - db 13, PSYDUCK + db 10, DITTO + db 12, YANMA + + ELIF DEF(_SILVER) + ; morn + db 12, NIDORAN_F + db 12, NIDORAN_M + db 14, DROWZEE + db 10, ABRA + db 14, PIDGEY + db 10, DITTO + db 12, YANMA + ; day + db 12, NIDORAN_F + db 12, NIDORAN_M + db 14, DROWZEE + db 10, ABRA + db 14, PIDGEY + db 10, DITTO + db 12, YANMA + ; nite + db 12, NIDORAN_F + db 12, NIDORAN_M + db 14, DROWZEE db 10, ABRA - db 12, JIGGLYPUFF + db 14, HOOTHOOT db 10, DITTO db 12, YANMA + ENDC map_id ROUTE_36 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 4, LEDYBA - db 4, PIDGEY - db 5, BELLSPROUT - db 5, GROWLITHE - db 5, PIDGEY - db 6, PIDGEY - db 6, PIDGEY + db 12, NIDORAN_M + db 12, NIDORAN_F + db 13, PIDGEY + db 13, GROWLITHE + db 13, STANTLER + db 15, PIDGEY + db 15, PIDGEY ; day - db 4, PIDGEY - db 4, PIDGEY - db 5, BELLSPROUT - db 5, GROWLITHE - db 5, PIDGEY - db 6, PIDGEY - db 6, PIDGEY + db 12, NIDORAN_M + db 12, NIDORAN_F + db 14, PIDGEY + db 13, GROWLITHE + db 13, STANTLER + db 15, GROWLITHE + db 15, GROWLITHE ; nite - db 4, SPINARAK - db 4, HOOTHOOT - db 5, BELLSPROUT - db 5, HOOTHOOT - db 5, HOOTHOOT - db 5, GASTLY - db 5, GASTLY + db 12, NIDORAN_M + db 12, NIDORAN_F + db 13, HOOTHOOT + db 13, GROWLITHE + db 13, STANTLER + db 15, HOOTHOOT + db 15, HOOTHOOT + + ELIF DEF(_SILVER) + ; morn + db 12, NIDORAN_F + db 12, NIDORAN_M + db 13, PIDGEY + db 13, VULPIX + db 13, STANTLER + db 15, PIDGEY + db 15, PIDGEY + ; day + db 12, NIDORAN_F + db 12, NIDORAN_M + db 14, PIDGEY + db 13, VULPIX + db 13, STANTLER + db 15, VULPIX + db 15, VULPIX + ; nite + db 12, NIDORAN_F + db 12, NIDORAN_M + db 13, HOOTHOOT + db 13, VULPIX + db 13, STANTLER + db 15, HOOTHOOT + db 15, HOOTHOOT + ENDC map_id ROUTE_37 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 13, LEDYBA + db 13, PIDGEY + db 15, STANTLER + db 15, PIDGEY db 14, GROWLITHE db 15, PIDGEY - db 16, GROWLITHE - db 15, PIDGEOTTO - db 15, LEDIAN - db 15, LEDIAN + db 15, PIDGEY + db 15, PIDGEY ; day db 13, PIDGEY - db 14, GROWLITHE + db 15, STANTLER db 15, PIDGEY - db 16, GROWLITHE + db 14, GROWLITHE db 15, PIDGEOTTO + db 16, GROWLITHE + db 16, GROWLITHE + ; nite + db 13, SPINARAK + db 15, STANTLER + db 15, HOOTHOOT + db 14, GROWLITHE + db 15, SPINARAK + db 15, SPINARAK + db 15, SPINARAK + + ELIF DEF(_SILVER) + ; morn + db 13, LEDYBA + db 15, STANTLER db 15, PIDGEY + db 14, VULPIX + db 15, LEDYBA + db 15, LEDYBA + db 15, LEDYBA + ; day + db 13, PIDGEY + db 15, STANTLER db 15, PIDGEY + db 14, VULPIX + db 15, PIDGEOTTO + db 16, VULPIX + db 16, VULPIX ; nite - db 13, SPINARAK - db 14, STANTLER + db 13, HOOTHOOT + db 15, STANTLER + db 15, HOOTHOOT + db 14, VULPIX + db 15, HOOTHOOT + db 15, HOOTHOOT db 15, HOOTHOOT - db 16, STANTLER - db 15, NOCTOWL - db 15, ARIADOS - db 15, ARIADOS + ENDC map_id ROUTE_38 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 16, RATTATA db 16, RATICATE db 16, MAGNEMITE - db 16, PIDGEOTTO - db 13, TAUROS - db 13, MILTANK + db 16, FARFETCH_D db 13, MILTANK + db 13, TAUROS + db 13, SNUBBULL ; day db 16, RATTATA db 16, RATICATE db 16, MAGNEMITE - db 16, PIDGEOTTO - db 13, TAUROS - db 13, MILTANK + db 16, FARFETCH_D db 13, MILTANK + db 13, TAUROS + db 13, SNUBBULL ; nite + db 16, RATTATA + db 16, RATICATE + db 16, MAGNEMITE + db 16, RATTATA + db 13, MILTANK + db 13, TAUROS + db 13, SNUBBULL + + ELIF DEF(_SILVER) + ; morn db 16, MEOWTH db 16, RATICATE db 16, MAGNEMITE - db 16, NOCTOWL + db 16, FARFETCH_D + db 13, MILTANK + db 13, TAUROS + db 13, SNUBBULL + ; day db 16, MEOWTH + db 16, RATICATE + db 16, MAGNEMITE + db 16, FARFETCH_D + db 13, MILTANK + db 13, TAUROS + db 13, SNUBBULL + ; nite db 16, MEOWTH + db 16, RATICATE + db 16, MAGNEMITE db 16, MEOWTH + db 13, MILTANK + db 13, TAUROS + db 13, SNUBBULL + ENDC map_id ROUTE_39 - db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + IF DEF(_GOLD) + db 2 percent, 2 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 16, RATTATA - db 16, RATICATE + db 17, RATICATE db 16, MAGNEMITE - db 16, PIDGEOTTO + db 16, FARFETCH_D db 15, MILTANK db 15, TAUROS db 15, TAUROS ; day db 16, RATTATA - db 16, RATICATE + db 17, RATICATE db 16, MAGNEMITE - db 16, PIDGEOTTO + db 16, FARFETCH_D db 15, MILTANK db 15, TAUROS db 15, TAUROS ; nite + db 16, RATTATA + db 17, RATICATE + db 16, MAGNEMITE + db 16, RATTATA + db 15, MILTANK + db 15, TAUROS + db 15, TAUROS + + ELIF DEF(_SILVER) + db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite + ; morn db 16, MEOWTH - db 16, RATICATE + db 17, RATICATE db 16, MAGNEMITE - db 16, NOCTOWL - db 18, MEOWTH - db 18, MEOWTH - db 18, MEOWTH + db 16, FARFETCH_D + db 15, MILTANK + db 15, TAUROS + db 15, TAUROS + ; day + db 16, MEOWTH + db 17, RATICATE + db 16, MAGNEMITE + db 16, FARFETCH_D + db 15, MILTANK + db 15, TAUROS + db 15, TAUROS + ; nite + db 16, MEOWTH + db 17, RATICATE + db 16, MAGNEMITE + db 16, MEOWTH + db 15, MILTANK + db 15, TAUROS + db 15, TAUROS + ENDC map_id ROUTE_42 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 13, EKANS + db 15, MANKEY + db 13, MAREEP db 14, SPEAROW - db 15, RATTATA - db 16, RATICATE - db 15, ARBOK - db 16, FEAROW - db 16, FEAROW + db 16, SPEAROW + db 15, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY ; day - db 13, EKANS + db 15, MANKEY + db 13, MAREEP db 14, SPEAROW - db 15, RATTATA - db 16, RATICATE - db 15, ARBOK - db 16, FEAROW - db 16, FEAROW + db 16, SPEAROW + db 15, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY ; nite - db 13, RATTATA + db 15, MANKEY + db 13, MAREEP db 14, ZUBAT - db 15, RATICATE - db 16, GOLBAT - db 15, MARILL - db 16, GOLBAT - db 16, GOLBAT + db 16, ZUBAT + db 15, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY + + ELIF DEF(_SILVER) + ; morn + db 13, MAREEP + db 14, SPEAROW + db 15, MAREEP + db 16, SPEAROW + db 15, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY + ; day + db 13, MAREEP + db 14, SPEAROW + db 15, MAREEP + db 16, SPEAROW + db 15, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY + ; nite + db 13, MAREEP + db 14, ZUBAT + db 15, MAREEP + db 16, ZUBAT + db 15, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY + ENDC map_id 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, FLAAFFY + db 15, GIRAFARIG + db 17, PIDGEOTTO + db 15, MAREEP + db 16, VENONAT + db 17, PIDGEOTTO + db 17, PIDGEOTTO ; 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, FLAAFFY + db 15, GIRAFARIG + db 17, PIDGEOTTO + db 15, MAREEP + db 17, FLAAFFY + db 17, FLAAFFY + db 17, FLAAFFY ; nite - db 15, VENONAT - db 16, NOCTOWL - db 16, RATICATE - db 17, VENONAT - db 17, RATICATE - db 17, VENOMOTH - db 17, VENOMOTH + db 15, FLAAFFY + db 15, GIRAFARIG + db 17, NOCTOWL + db 16, VENONAT + db 15, MAREEP + db 16, VENONAT + db 16, VENONAT map_id ROUTE_44 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, TANGELA - db 22, LICKITUNG + db 22, WEEPINBELL db 22, BELLSPROUT - db 24, WEEPINBELL db 24, LICKITUNG + db 24, WEEPINBELL db 26, LICKITUNG db 26, LICKITUNG ; day db 23, TANGELA - db 22, LICKITUNG + db 22, WEEPINBELL db 22, BELLSPROUT - db 24, WEEPINBELL db 24, LICKITUNG + db 24, WEEPINBELL db 26, LICKITUNG db 26, LICKITUNG ; nite db 23, TANGELA - db 22, POLIWAG + db 22, WEEPINBELL db 22, BELLSPROUT + db 24, LICKITUNG db 24, WEEPINBELL - db 24, POLIWHIRL - db 26, POLIWHIRL - db 26, POLIWHIRL + db 26, LICKITUNG + db 26, LICKITUNG map_id ROUTE_45 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 23, GEODUDE db 23, GRAVELER db 24, GLIGAR - db 25, DONPHAN + db 20, TEDDIURSA + db 25, GRAVELER + db 27, GRAVELER + db 27, GRAVELER + ; day + db 23, GEODUDE + db 23, GRAVELER + db 24, GLIGAR + db 20, TEDDIURSA + db 25, GRAVELER + db 27, GRAVELER + db 27, GRAVELER + ; nite + db 23, GEODUDE + db 23, GRAVELER + db 24, GLIGAR + db 20, TEDDIURSA + db 25, GRAVELER + db 27, GRAVELER + db 27, GRAVELER + + ELIF DEF(_SILVER) + ; morn + db 23, GEODUDE + db 23, GRAVELER + db 24, GRAVELER db 20, PHANPY + db 25, GRAVELER db 27, SKARMORY db 27, SKARMORY ; day db 23, GEODUDE db 23, GRAVELER - db 24, GLIGAR - db 25, DONPHAN - db 30, DONPHAN + db 24, GRAVELER + db 20, PHANPY + db 25, GRAVELER db 27, SKARMORY db 27, SKARMORY ; nite db 23, GEODUDE db 23, GRAVELER - db 24, GLIGAR + db 24, GRAVELER + db 20, PHANPY db 25, GRAVELER - db 27, GRAVELER - db 27, GRAVELER - db 27, GRAVELER + db 27, SKARMORY + db 27, SKARMORY + ENDC map_id 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, SPEAROW db 2, RATTATA - ; day db 2, GEODUDE - db 2, SPEAROW + db 3, SPEAROW + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + ; day db 3, GEODUDE - db 3, RATTATA - db 2, RATTATA - db 2, RATTATA + db 2, SPEAROW db 2, RATTATA - ; nite db 2, GEODUDE - db 2, RATTATA + db 3, SPEAROW + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + ; nite db 3, GEODUDE db 3, RATTATA db 2, RATTATA - db 2, RATTATA - db 2, RATTATA + db 2, GEODUDE + db 4, GEODUDE + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF map_id SILVER_CAVE_OUTSIDE db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 41, TANGELA db 42, PONYTA - db 42, ARBOK + db 42, URSARING db 44, RAPIDASH db 41, DODUO db 43, DODRIO @@ -1635,18 +2319,45 @@ JohtoGrassWildMons: ; day db 41, TANGELA db 42, PONYTA - db 42, ARBOK + db 42, URSARING 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 42, PONYTA + db 42, URSARING + db 44, RAPIDASH + db 38, SNEASEL + db 42, SNEASEL + db 42, SNEASEL + + ELIF DEF(_SILVER) + ; morn + db 41, TANGELA + db 42, PONYTA + db 42, DONPHAN + db 44, RAPIDASH + db 41, DODUO + db 43, DODRIO + db 43, DODRIO + ; day + db 41, TANGELA + db 42, PONYTA + db 42, DONPHAN + db 44, RAPIDASH + db 41, DODUO + db 43, DODRIO + db 43, DODRIO + ; nite + db 41, TANGELA + db 42, PONYTA + db 42, DONPHAN + db 44, RAPIDASH + db 38, SNEASEL + db 42, SNEASEL + db 42, SNEASEL + ENDC db -1 ; end diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 83e33b2d..0924807c 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -33,7 +33,11 @@ JohtoWaterWildMons: db 10, SLOWPOKE map_id SLOWPOKE_WELL_B2F + IF DEF(_GOLD) + db 4 percent ; encounter rate + ELIF DEF(_SILVER) db 2 percent ; encounter rate + ENDC db 15, SLOWPOKE db 20, SLOWPOKE db 20, SLOWBRO @@ -46,20 +50,20 @@ JohtoWaterWildMons: map_id MOUNT_MORTAR_1F_OUTSIDE db 4 percent ; encounter rate + db 20, GOLDEEN db 15, GOLDEEN - db 20, MARILL db 20, SEAKING map_id MOUNT_MORTAR_2F_INSIDE db 2 percent ; encounter rate db 20, GOLDEEN - db 25, MARILL + db 25, GOLDEEN db 25, SEAKING map_id MOUNT_MORTAR_B1F db 2 percent ; encounter rate + db 20, GOLDEEN db 15, GOLDEEN - db 20, MARILL db 20, SEAKING map_id WHIRL_ISLAND_SW @@ -83,7 +87,7 @@ JohtoWaterWildMons: map_id SILVER_CAVE_ROOM_2 db 2 percent ; encounter rate db 35, SEAKING - db 35, GOLDUCK + db 40, SEAKING db 35, GOLDEEN map_id DARK_CAVE_VIOLET_ENTRANCE @@ -104,12 +108,6 @@ JohtoWaterWildMons: db 10, MAGIKARP db 10, DRATINI - map_id OLIVINE_PORT - db 2 percent ; encounter rate - db 20, TENTACOOL - db 15, TENTACOOL - db 20, TENTACRUEL - map_id ROUTE_30 db 2 percent ; encounter rate db 20, POLIWAG @@ -148,10 +146,18 @@ JohtoWaterWildMons: map_id ROUTE_41 db 6 percent ; encounter rate + + IF DEF(_GOLD) db 20, TENTACOOL db 20, TENTACRUEL db 20, MANTINE + ELIF DEF(_SILVER) + db 20, TENTACOOL + db 20, TENTACRUEL + db 15, TENTACOOL + ENDC + map_id ROUTE_42 db 4 percent ; encounter rate db 20, GOLDEEN @@ -213,7 +219,11 @@ JohtoWaterWildMons: db 20, POLIWHIRL map_id LAKE_OF_RAGE + IF DEF(_GOLD) + db 4 percent ; encounter rate + ELIF DEF(_SILVER) db 6 percent ; encounter rate + ENDC db 15, MAGIKARP db 10, MAGIKARP db 15, GYARADOS @@ -230,4 +240,10 @@ JohtoWaterWildMons: db 40, POLIWHIRL db 35, POLIWAG + map_id OLIVINE_PORT + db 2 percent ; encounter rate + db 20, TENTACOOL + db 15, TENTACOOL + db 20, TENTACRUEL + db -1 ; end diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index ff172097..2884d010 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -5,38 +5,40 @@ KantoGrassWildMons: map_id 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 15, DIGLETT + db 17, DIGLETT + db 19, DIGLETT + db 13, DIGLETT + db 19, DUGTRIO db 24, DUGTRIO + db 29, DUGTRIO + ; day + db 15, DIGLETT + db 17, DIGLETT + db 19, DIGLETT + db 13, DIGLETT + db 19, DUGTRIO db 24, DUGTRIO + db 29, DUGTRIO + ; nite + db 15, DIGLETT + db 17, DIGLETT + db 19, DIGLETT + db 13, DIGLETT + db 19, 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 - ; nite - db 4, DIGLETT - db 8, DIGLETT - db 16, DIGLETT - db 32, DIGLETT - db 32, DUGTRIO - db 32, DUGTRIO - db 32, DUGTRIO + db 29, DUGTRIO map_id MOUNT_MOON db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 6, ZUBAT db 8, GEODUDE db 8, SANDSHREW db 12, PARAS - db 10, GEODUDE + db 10, SANDSLASH db 8, CLEFAIRY db 8, CLEFAIRY ; day @@ -44,105 +46,165 @@ KantoGrassWildMons: db 8, GEODUDE db 8, SANDSHREW db 12, PARAS - db 10, GEODUDE + db 10, SANDSLASH db 8, CLEFAIRY db 8, CLEFAIRY ; nite db 6, ZUBAT db 8, GEODUDE + db 8, SANDSHREW + db 12, PARAS + db 10, SANDSLASH + db 8, CLEFAIRY db 8, CLEFAIRY + + ELIF DEF(_SILVER) + ; morn + db 6, ZUBAT + db 8, GEODUDE + db 8, ZUBAT + db 12, PARAS + db 10, GEODUDE + db 8, CLEFAIRY + db 8, CLEFAIRY + ; day + db 6, ZUBAT + db 8, GEODUDE + db 8, ZUBAT + db 12, PARAS + db 10, GEODUDE + db 8, CLEFAIRY + db 8, CLEFAIRY + ; nite + db 6, ZUBAT + db 8, GEODUDE + db 8, ZUBAT db 12, PARAS db 10, GEODUDE - db 12, CLEFAIRY - db 12, CLEFAIRY + db 8, CLEFAIRY + db 8, CLEFAIRY + ENDC map_id ROCK_TUNNEL_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 10, CUBONE - db 11, GEODUDE + db 10, GEODUDE db 12, MACHOP - db 12, ZUBAT - db 15, MACHOKE - db 12, MAROWAK - db 12, MAROWAK + db 8, ZUBAT + db 14, MACHOKE + db 13, CUBONE + db 13, CUBONE ; day db 10, CUBONE - db 11, GEODUDE + db 10, GEODUDE db 12, MACHOP - db 12, ZUBAT - db 15, MACHOKE - db 12, MAROWAK - db 12, MAROWAK + db 8, ZUBAT + db 14, MACHOKE + db 13, CUBONE + db 13, CUBONE ; nite - db 12, ZUBAT - db 11, GEODUDE - db 12, GEODUDE - db 17, HAUNTER - db 15, ZUBAT - db 15, ZUBAT - db 15, ZUBAT + db 10, CUBONE + db 10, GEODUDE + db 12, MACHOP + db 8, ZUBAT + db 14, MACHOKE + db 13, CUBONE + db 13, CUBONE map_id ROCK_TUNNEL_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 12, CUBONE - db 14, GEODUDE + db 12, GEODUDE db 16, ONIX - db 12, ZUBAT - db 15, MAROWAK - db 15, KANGASKHAN - db 15, KANGASKHAN + db 10, ZUBAT + db 14, MAROWAK + db 14, KANGASKHAN + db 14, KANGASKHAN ; day db 12, CUBONE - db 14, GEODUDE + db 12, GEODUDE db 16, ONIX - db 12, ZUBAT - db 15, MAROWAK - db 15, KANGASKHAN - db 15, KANGASKHAN + db 10, ZUBAT + db 14, MAROWAK + db 14, KANGASKHAN + db 14, KANGASKHAN ; nite - db 12, ZUBAT - db 14, GEODUDE + db 12, CUBONE + db 12, GEODUDE db 16, ONIX - db 15, ZUBAT - db 15, HAUNTER - db 15, GOLBAT - db 15, GOLBAT + db 10, ZUBAT + db 14, MAROWAK + db 14, KANGASKHAN + db 14, KANGASKHAN map_id VICTORY_ROAD db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - 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 - ; nite - db 34, GOLBAT - db 34, GRAVELER - db 32, ONIX - db 36, GRAVELER - db 38, GRAVELER - db 40, GRAVELER - db 40, GRAVELER + db 32, GRAVELER + db 32, GOLBAT + db 33, URSARING + db 34, ONIX + db 36, ONIX + db 35, RHYHORN + db 35, RHYHORN + ; day + db 32, GRAVELER + db 32, GOLBAT + db 33, URSARING + db 34, ONIX + db 36, ONIX + db 35, RHYHORN + db 35, RHYHORN + ; nite + db 32, GRAVELER + db 32, GOLBAT + db 33, URSARING + db 34, ONIX + db 36, ONIX + db 35, RHYHORN + db 35, RHYHORN + + ELIF DEF(_SILVER) + ; morn + db 32, GRAVELER + db 32, GOLBAT + db 33, DONPHAN + db 34, ONIX + db 36, ONIX + db 35, RHYHORN + db 35, RHYHORN + ; day + db 32, GRAVELER + db 32, GOLBAT + db 33, DONPHAN + db 34, ONIX + db 36, ONIX + db 35, RHYHORN + db 35, RHYHORN + ; nite + db 32, GRAVELER + db 32, GOLBAT + db 33, DONPHAN + db 34, ONIX + db 36, ONIX + db 35, RHYHORN + db 35, RHYHORN + ENDC map_id TOHJO_FALLS + IF DEF(_GOLD) + db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite + ELIF DEF(_SILVER) db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + ENDC ; morn db 22, ZUBAT db 22, RATICATE - db 24, GOLBAT + db 22, GOLBAT db 21, SLOWPOKE db 20, RATTATA db 23, SLOWPOKE @@ -150,7 +212,7 @@ KantoGrassWildMons: ; day db 22, ZUBAT db 22, RATICATE - db 24, GOLBAT + db 22, GOLBAT db 21, SLOWPOKE db 20, RATTATA db 23, SLOWPOKE @@ -158,7 +220,7 @@ KantoGrassWildMons: ; nite db 22, ZUBAT db 22, RATICATE - db 24, GOLBAT + db 22, GOLBAT db 21, SLOWPOKE db 20, RATTATA db 23, SLOWPOKE @@ -187,25 +249,27 @@ KantoGrassWildMons: db 2, RATTATA db 3, RATTATA db 3, HOOTHOOT - db 6, RATICATE + db 6, RATTATA db 4, HOOTHOOT db 4, HOOTHOOT map_id ROUTE_2 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 3, CATERPIE - db 3, LEDYBA - db 5, PIDGEY + db 3, PIDGEY + db 5, METAPOD db 7, BUTTERFREE - db 7, LEDIAN + db 7, PIDGEOTTO db 4, PIKACHU db 4, PIKACHU ; day db 3, CATERPIE db 3, PIDGEY - db 5, PIDGEY - db 7, BUTTERFREE + db 5, METAPOD + db 7, PIDGEY db 7, PIDGEOTTO db 4, PIKACHU db 4, PIKACHU @@ -215,332 +279,650 @@ KantoGrassWildMons: db 5, HOOTHOOT db 7, NOCTOWL db 7, ARIADOS - db 4, NOCTOWL - db 4, NOCTOWL + db 4, PIKACHU + db 4, PIKACHU + + ELIF DEF(_SILVER) + ; morn + db 3, WEEDLE + db 3, LEDYBA + db 5, KAKUNA + db 7, BEEDRILL + db 7, LEDIAN + db 4, PIKACHU + db 4, PIKACHU + ; day + db 3, WEEDLE + db 3, PIDGEY + db 5, KAKUNA + db 7, PIDGEY + db 7, PIDGEOTTO + db 4, PIKACHU + db 4, PIKACHU + ; nite + db 3, HOOTHOOT + db 3, HOOTHOOT + db 5, HOOTHOOT + db 7, NOCTOWL + db 7, NOCTOWL + db 4, PIKACHU + db 4, PIKACHU + ENDC map_id ROUTE_3 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) + ; morn + db 5, SPEAROW + db 5, RATTATA + db 8, SPEAROW + db 6, JIGGLYPUFF + db 10, RATTATA + db 8, SPEAROW + db 8, SPEAROW + ; day + db 5, SPEAROW + db 5, RATTATA + db 8, SPEAROW + db 6, JIGGLYPUFF + db 10, RATTATA + db 8, SPEAROW + db 8, SPEAROW + ; nite + db 5, RATTATA + db 5, ZUBAT + db 8, RATTATA + db 6, JIGGLYPUFF + db 10, RATTATA + db 8, RATTATA + db 8, RATTATA + + ELIF DEF(_SILVER) ; morn db 5, SPEAROW db 5, RATTATA db 8, EKANS - db 10, RATICATE + db 6, JIGGLYPUFF db 10, ARBOK - db 10, SANDSHREW - db 10, SANDSHREW + db 8, SPEAROW + db 8, SPEAROW ; day db 5, SPEAROW db 5, RATTATA db 8, EKANS - db 10, RATICATE + db 6, JIGGLYPUFF db 10, ARBOK - db 10, SANDSHREW - db 10, SANDSHREW + db 8, SPEAROW + db 8, SPEAROW ; nite db 5, RATTATA - db 10, RATTATA - db 10, RATICATE - db 6, ZUBAT - db 5, RATTATA - db 6, CLEFAIRY - db 6, CLEFAIRY + db 5, ZUBAT + db 8, EKANS + db 6, JIGGLYPUFF + db 10, ARBOK + db 8, RATTATA + db 8, RATTATA + ENDC map_id ROUTE_4 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn + + IF DEF(_GOLD) + ; morn + db 5, SPEAROW + db 5, RATTATA + db 8, SPEAROW + db 6, JIGGLYPUFF + db 10, RATTATA + db 8, SPEAROW + db 8, SPEAROW + ; day + db 5, SPEAROW + db 5, RATTATA + db 8, SPEAROW + db 6, JIGGLYPUFF + db 10, RATTATA + db 8, SPEAROW + db 8, SPEAROW + ; nite + db 5, SPEAROW + db 5, ZUBAT + db 8, RATTATA + db 6, JIGGLYPUFF + db 10, RATTATA + db 8, RATTATA + db 8, RATTATA + + ELIF DEF(_SILVER) + ; morn db 5, SPEAROW db 5, RATTATA db 8, EKANS - db 10, RATICATE + db 6, JIGGLYPUFF db 10, ARBOK - db 10, SANDSHREW - db 10, SANDSHREW + db 8, SPEAROW + db 8, SPEAROW ; day db 5, SPEAROW db 5, RATTATA db 8, EKANS - db 10, RATICATE + db 6, JIGGLYPUFF db 10, ARBOK - db 10, SANDSHREW - db 10, SANDSHREW + db 8, SPEAROW + db 8, SPEAROW ; nite db 5, RATTATA - db 10, RATTATA - db 10, RATICATE - db 6, ZUBAT - db 5, RATTATA - db 6, CLEFAIRY - db 6, CLEFAIRY + db 5, ZUBAT + db 8, EKANS + db 6, JIGGLYPUFF + db 10, ARBOK + db 8, RATTATA + db 8, RATTATA + ENDC map_id ROUTE_5 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 13, PIDGEY - db 13, SNUBBULL - db 15, PIDGEOTTO + db 13, BELLSPROUT + db 14, PIDGEY + db 15, PIDGEY db 12, ABRA - db 14, JIGGLYPUFF db 14, ABRA db 14, ABRA ; day db 13, PIDGEY - db 13, SNUBBULL - db 15, PIDGEOTTO + db 13, BELLSPROUT + db 14, PIDGEY + db 15, PIDGEY db 12, ABRA - db 14, JIGGLYPUFF db 14, ABRA db 14, ABRA ; nite - db 13, HOOTHOOT - db 13, MEOWTH - db 15, NOCTOWL + db 13, ODDISH + db 14, ODDISH + db 13, BELLSPROUT + db 15, GLOOM db 12, ABRA - db 14, JIGGLYPUFF db 14, ABRA db 14, ABRA + ELIF DEF(_SILVER) + ; morn + db 13, PIDGEY + db 13, BELLSPROUT + db 14, MEOWTH + db 15, PIDGEY + db 12, ABRA + db 14, ABRA + db 14, ABRA + ; day + db 13, PIDGEY + db 13, BELLSPROUT + db 14, MEOWTH + db 15, PIDGEY + db 12, ABRA + db 14, ABRA + db 14, ABRA + ; nite + db 13, ODDISH + db 14, MEOWTH + db 13, BELLSPROUT + db 15, GLOOM + db 12, ABRA + db 14, ABRA + db 14, ABRA + ENDC + map_id ROUTE_6 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 13, RATTATA - db 13, SNUBBULL - db 14, MAGNEMITE - db 15, RATICATE - db 12, JIGGLYPUFF - db 15, GRANBULL - db 15, GRANBULL + db 13, PIDGEY + db 13, BELLSPROUT + db 14, PIDGEY + db 15, MAGNEMITE + db 12, ABRA + db 14, ABRA + db 14, ABRA ; day - 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, PIDGEY + db 13, BELLSPROUT + db 14, PIDGEY + db 15, MAGNEMITE + db 12, ABRA + db 14, ABRA + db 14, ABRA + ; nite + db 13, ODDISH + db 14, ODDISH + db 13, BELLSPROUT + db 15, MAGNEMITE + db 12, ABRA + db 14, ABRA + db 14, ABRA + + ELIF DEF(_SILVER) + ; morn + db 13, PIDGEY + db 13, BELLSPROUT + db 14, MEOWTH + db 15, MAGNEMITE + db 12, ABRA + db 14, ABRA + db 14, ABRA + ; day + db 13, PIDGEY + db 13, BELLSPROUT + db 14, MEOWTH + db 15, MAGNEMITE + db 12, ABRA + db 14, ABRA + db 14, ABRA + ; nite + db 13, ODDISH + db 14, MEOWTH + db 13, BELLSPROUT + db 15, MAGNEMITE + db 12, ABRA + db 14, ABRA + db 14, ABRA + ENDC map_id ROUTE_7 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 17, RATTATA db 17, SPEAROW - db 18, SNUBBULL - db 18, RATICATE - db 18, JIGGLYPUFF - db 16, ABRA - db 16, ABRA + db 18, GROWLITHE + db 19, RATICATE + db 19, RATTATA + db 15, RATTATA + db 15, RATTATA ; day db 17, RATTATA db 17, SPEAROW - db 18, SNUBBULL - db 18, RATICATE - db 18, JIGGLYPUFF - db 16, ABRA - db 16, ABRA + db 18, GROWLITHE + db 19, RATICATE + db 19, RATTATA + db 15, GROWLITHE + db 15, GROWLITHE + ; nite + db 17, RATTATA + db 17, MURKROW + db 18, GROWLITHE + db 19, RATICATE + db 19, MURKROW + db 15, HOUNDOUR + db 15, HOUNDOUR + + ELIF DEF(_SILVER) + ; morn + db 17, MEOWTH + db 17, SPEAROW + db 18, VULPIX + db 19, RATICATE + db 19, PERSIAN + db 15, RATTATA + db 15, RATTATA + ; day + db 17, MEOWTH + db 17, SPEAROW + db 18, VULPIX + db 19, RATICATE + db 19, PERSIAN + db 15, VULPIX + db 15, VULPIX ; nite db 17, MEOWTH db 17, MURKROW - db 18, HOUNDOUR - db 18, PERSIAN - db 18, JIGGLYPUFF - db 16, ABRA - db 16, ABRA + db 18, VULPIX + db 19, RATICATE + db 19, PERSIAN + db 15, HOUNDOUR + db 15, HOUNDOUR + ENDC map_id ROUTE_8 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - db 17, SNUBBULL + db 17, PIDGEOTTO db 19, PIDGEOTTO - db 16, ABRA - db 17, GROWLITHE - db 16, JIGGLYPUFF - db 18, KADABRA - db 18, KADABRA + db 15, ABRA + db 18, GROWLITHE + db 17, PIDGEOTTO + db 15, KADABRA + db 15, KADABRA ; day - db 17, SNUBBULL + db 17, PIDGEOTTO db 19, PIDGEOTTO - db 16, ABRA - db 17, GROWLITHE - db 16, JIGGLYPUFF - db 18, KADABRA - db 18, KADABRA + db 15, ABRA + db 18, GROWLITHE + db 17, PIDGEOTTO + db 15, KADABRA + db 15, KADABRA ; nite + db 17, NOCTOWL + db 20, HAUNTER + db 15, ABRA + db 19, NOCTOWL + db 18, GROWLITHE + db 15, KADABRA + db 15, KADABRA + + ELIF DEF(_SILVER) + ; morn db 17, MEOWTH - db 20, NOCTOWL - db 16, ABRA - db 17, HAUNTER - db 16, JIGGLYPUFF - db 18, KADABRA - db 18, KADABRA + db 19, PIDGEOTTO + db 15, ABRA + db 18, VULPIX + db 17, PIDGEOTTO + db 15, KADABRA + db 15, KADABRA + ; day + db 17, MEOWTH + db 19, PIDGEOTTO + db 15, ABRA + db 18, VULPIX + db 17, PIDGEOTTO + db 15, KADABRA + db 15, KADABRA + ; nite + db 17, MEOWTH + db 20, HAUNTER + db 15, ABRA + db 19, NOCTOWL + db 18, VULPIX + db 15, KADABRA + db 15, KADABRA + ENDC map_id ROUTE_9 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn + db 13, MANKEY db 15, RATTATA - db 15, SPEAROW + db 13, SPEAROW db 15, RATICATE db 15, FEAROW - db 15, FEAROW - db 18, MAROWAK - db 18, MAROWAK + db 15, PRIMEAPE + db 15, PRIMEAPE ; day + db 13, MANKEY db 15, RATTATA - db 15, SPEAROW + db 13, SPEAROW db 15, RATICATE db 15, FEAROW - db 15, FEAROW - db 18, MAROWAK - db 18, MAROWAK + db 15, PRIMEAPE + db 15, PRIMEAPE ; nite + db 13, MANKEY db 15, RATTATA - db 15, VENONAT db 15, RATICATE - db 15, VENOMOTH - db 15, ZUBAT - db 18, RATICATE - db 18, RATICATE + db 13, RATTATA + db 15, RATICATE + db 15, PRIMEAPE + db 15, PRIMEAPE - map_id ROUTE_10_NORTH - db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + ELIF DEF(_SILVER) ; morn + db 13, RATTATA db 15, SPEAROW - db 17, VOLTORB + db 13, SPEAROW db 15, RATICATE db 15, FEAROW - db 15, MAROWAK - db 16, ELECTABUZZ - db 16, ELECTABUZZ + db 15, RATICATE + db 15, RATICATE ; day + db 13, RATTATA db 15, SPEAROW - db 17, VOLTORB + db 13, SPEAROW db 15, RATICATE db 15, FEAROW - db 15, MAROWAK - db 18, ELECTABUZZ - db 18, ELECTABUZZ + db 15, RATICATE + db 15, RATICATE ; nite - db 15, VENONAT - db 17, VOLTORB + db 13, RATTATA + db 15, RATTATA + db 15, RATICATE + db 13, RATTATA + db 15, RATICATE db 15, RATICATE - db 15, VENOMOTH - db 15, ZUBAT - db 16, ELECTABUZZ - db 16, ELECTABUZZ + db 15, RATICATE + ENDC + + map_id ROUTE_10_NORTH + db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + ; morn + db 16, SPEAROW + db 17, VOLTORB + db 16, RATICATE + db 18, FEAROW + db 16, QUAGSIRE + db 15, ELECTABUZZ + db 15, ELECTABUZZ + ; day + db 16, SPEAROW + db 17, VOLTORB + db 17, RATICATE + db 18, FEAROW + db 15, ELECTABUZZ + db 17, ELECTABUZZ + db 17, ELECTABUZZ + ; nite + db 16, QUAGSIRE + db 17, VOLTORB + db 16, RATICATE + db 17, QUAGSIRE + db 18, RATICATE + db 15, ELECTABUZZ + db 15, ELECTABUZZ map_id ROUTE_11 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - db 14, HOPPIP - db 13, RATICATE + db 14, DROWZEE + db 15, RATTATA db 15, MAGNEMITE - db 16, PIDGEOTTO - db 16, RATTATA - db 16, HOPPIP - db 16, HOPPIP + db 16, DROWZEE + db 16, HYPNO + db 16, HYPNO + db 16, HYPNO ; day - db 14, HOPPIP - db 13, RATICATE + db 14, DROWZEE + db 15, RATTATA db 15, MAGNEMITE - db 16, PIDGEOTTO - db 16, RATTATA - db 16, HOPPIP - db 16, HOPPIP + db 16, DROWZEE + db 16, HYPNO + db 16, HYPNO + db 16, HYPNO ; nite db 14, DROWZEE - db 13, MEOWTH + db 15, RATTATA db 15, MAGNEMITE - db 16, NOCTOWL - db 16, RATICATE + db 16, DROWZEE + db 16, HYPNO db 16, HYPNO db 16, HYPNO map_id ROUTE_13 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn + db 23, NIDORINA db 23, NIDORINO + db 25, PIDGEOTTO + db 22, HOPPIP + db 24, HOPPIP + db 22, QUAGSIRE + db 25, CHANSEY + ; day db 23, NIDORINA + db 23, NIDORINO db 25, PIDGEOTTO - db 25, HOPPIP - db 27, HOPPIP - db 27, HOPPIP + db 22, HOPPIP + db 24, HOPPIP + db 24, HOPPIP + db 25, CHANSEY + ; nite + db 23, NIDORINA + db 23, NIDORINO + db 25, NOCTOWL + db 22, QUAGSIRE + db 24, QUAGSIRE + db 24, QUAGSIRE + db 25, CHANSEY + + ELIF DEF(_SILVER) + ; morn + db 23, NIDORINO + db 23, NIDORINA + db 25, PIDGEOTTO + db 22, HOPPIP + db 24, HOPPIP + db 22, QUAGSIRE db 25, CHANSEY ; day db 23, NIDORINO db 23, NIDORINA db 25, PIDGEOTTO - db 25, HOPPIP - db 27, HOPPIP - db 27, HOPPIP + db 22, HOPPIP + db 24, HOPPIP + db 24, HOPPIP db 25, CHANSEY ; nite - db 23, VENONAT - db 23, QUAGSIRE + db 23, NIDORINO + db 23, NIDORINA db 25, NOCTOWL - db 25, VENOMOTH - db 25, QUAGSIRE - db 25, QUAGSIRE + db 22, QUAGSIRE + db 24, QUAGSIRE + db 24, QUAGSIRE db 25, CHANSEY + ENDC map_id ROUTE_14 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn - 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 - ; nite - db 26, VENONAT - db 26, QUAGSIRE - db 28, NOCTOWL - db 28, VENOMOTH - db 28, QUAGSIRE - db 28, QUAGSIRE - db 28, CHANSEY + db 23, NIDORINA + db 23, NIDORINO + db 25, PIDGEOTTO + db 24, HOPPIP + db 26, SKIPLOOM + db 22, QUAGSIRE + db 25, CHANSEY + ; day + db 23, NIDORINA + db 23, NIDORINO + db 25, PIDGEOTTO + db 24, HOPPIP + db 26, SKIPLOOM + db 26, SKIPLOOM + db 25, CHANSEY + ; nite + db 23, NIDORINA + db 23, NIDORINO + db 25, NOCTOWL + db 22, QUAGSIRE + db 24, QUAGSIRE + db 24, QUAGSIRE + db 25, CHANSEY + + ELIF DEF(_SILVER) + ; morn + db 23, NIDORINO + db 23, NIDORINA + db 25, PIDGEOTTO + db 24, HOPPIP + db 26, SKIPLOOM + db 22, QUAGSIRE + db 25, CHANSEY + ; day + db 23, NIDORINO + db 23, NIDORINA + db 25, PIDGEOTTO + db 24, HOPPIP + db 26, SKIPLOOM + db 26, SKIPLOOM + db 25, CHANSEY + ; nite + db 23, NIDORINO + db 23, NIDORINA + db 25, NOCTOWL + db 22, QUAGSIRE + db 24, QUAGSIRE + db 24, QUAGSIRE + db 25, CHANSEY + ENDC map_id ROUTE_15 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) + ; morn + db 23, NIDORINA + db 23, NIDORINO + db 25, PIDGEOTTO + db 22, HOPPIP + db 24, HOPPIP + db 22, QUAGSIRE + db 25, CHANSEY + ; day + db 23, NIDORINA + db 23, NIDORINO + db 25, PIDGEOTTO + db 22, HOPPIP + db 24, HOPPIP + db 24, HOPPIP + db 25, CHANSEY + ; nite + db 23, NIDORINA + db 23, NIDORINO + db 25, NOCTOWL + db 22, QUAGSIRE + db 24, QUAGSIRE + db 24, QUAGSIRE + db 25, CHANSEY + + ELIF DEF(_SILVER) ; morn db 23, NIDORINO db 23, NIDORINA db 25, PIDGEOTTO - db 25, HOPPIP - db 27, HOPPIP - db 27, HOPPIP + db 22, HOPPIP + db 24, HOPPIP + db 22, QUAGSIRE db 25, CHANSEY ; day db 23, NIDORINO db 23, NIDORINA db 25, PIDGEOTTO - db 25, HOPPIP - db 27, HOPPIP - db 27, HOPPIP + db 22, HOPPIP + db 24, HOPPIP + db 24, HOPPIP db 25, CHANSEY ; nite - db 23, VENONAT - db 23, QUAGSIRE + db 23, NIDORINO + db 23, NIDORINA db 25, NOCTOWL - db 25, VENOMOTH - db 25, QUAGSIRE - db 25, QUAGSIRE + db 22, QUAGSIRE + db 24, QUAGSIRE + db 24, QUAGSIRE db 25, CHANSEY + ENDC map_id ROUTE_16 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite @@ -549,7 +931,7 @@ KantoGrassWildMons: db 27, FEAROW db 28, GRIMER db 29, FEAROW - db 29, FEAROW + db 27, SLUGMA db 30, MUK db 30, MUK ; day @@ -557,44 +939,44 @@ KantoGrassWildMons: db 27, FEAROW db 28, GRIMER db 29, FEAROW - db 29, SLUGMA + db 27, SLUGMA db 30, MUK db 30, MUK ; nite db 26, GRIMER db 27, GRIMER db 28, GRIMER - db 29, MURKROW - db 29, MURKROW + db 28, MURKROW + db 27, SLUGMA db 30, MUK db 30, MUK map_id ROUTE_17 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - db 30, FEAROW + db 28, FEAROW + db 27, GRIMER 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 32, MUK + db 32, MUK + ; day + db 28, FEAROW + db 27, SLUGMA db 29, GRIMER - db 32, FEAROW - db 32, SLUGMA - db 33, MUK - db 33, MUK + db 30, FEAROW + db 25, SLUGMA + db 32, MUK + db 32, MUK ; nite - db 30, GRIMER + db 28, GRIMER + db 27, GRIMER db 29, GRIMER - db 31, GRIMER - db 32, GRIMER - db 33, GRIMER - db 33, MUK - db 33, MUK + db 30, MUK + db 29, SLUGMA + db 32, MUK + db 32, MUK map_id ROUTE_18 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite @@ -603,7 +985,7 @@ KantoGrassWildMons: db 27, FEAROW db 28, GRIMER db 29, FEAROW - db 29, FEAROW + db 27, SLUGMA db 30, MUK db 30, MUK ; day @@ -611,15 +993,15 @@ KantoGrassWildMons: db 27, FEAROW db 28, GRIMER db 29, FEAROW - db 29, SLUGMA + db 27, SLUGMA db 30, MUK db 30, MUK ; nite db 26, GRIMER db 27, GRIMER db 28, GRIMER - db 29, GRIMER - db 29, GRIMER + db 28, MUK + db 27, SLUGMA db 30, MUK db 30, MUK @@ -627,28 +1009,28 @@ KantoGrassWildMons: db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 30, TANGELA - db 25, RATTATA + db 25, TANGELA db 35, TANGELA - db 20, RATICATE - db 30, MR__MIME + db 20, TANGELA + db 30, TANGELA db 28, MR__MIME db 28, MR__MIME ; day db 30, TANGELA - db 25, RATTATA + db 25, TANGELA db 35, TANGELA - db 20, RATICATE + db 20, TANGELA db 28, MR__MIME db 30, MR__MIME db 30, MR__MIME ; nite db 30, TANGELA - db 25, RATTATA + db 25, TANGELA db 35, TANGELA - db 20, RATICATE + db 20, TANGELA db 30, TANGELA - db 28, TANGELA - db 28, TANGELA + db 28, MR__MIME + db 28, MR__MIME map_id ROUTE_22 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite @@ -670,146 +1052,233 @@ KantoGrassWildMons: db 7, FEAROW ; nite db 3, RATTATA - db 3, POLIWAG + db 3, RATTATA db 5, RATTATA - db 4, POLIWAG - db 6, RATTATA + db 4, RATTATA + db 6, PONYTA db 7, RATTATA db 7, RATTATA map_id 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 8, BELLSPROUT db 10, BELLSPROUT - db 14, BUTTERFREE - db 14, BUTTERFREE + db 9, ABRA + db 12, WEEPINBELL + db 8, VENONAT + db 14, WEEPINBELL + db 14, WEEPINBELL ; day - db 8, CATERPIE - db 12, SUNKERN - db 10, CATERPIE - db 12, ABRA + db 8, BELLSPROUT + db 10, SUNKERN + db 9, ABRA + db 12, WEEPINBELL db 10, BELLSPROUT - db 14, BUTTERFREE - db 14, BUTTERFREE + db 14, WEEPINBELL + db 14, WEEPINBELL ; nite - db 10, VENONAT + db 8, VENONAT db 10, ODDISH - db 12, ODDISH - db 12, ABRA + db 9, ABRA + db 13, WEEPINBELL db 10, BELLSPROUT - db 14, GLOOM - db 14, GLOOM + db 10, VENOMOTH + db 10, VENOMOTH map_id 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 8, PIDGEY db 10, BELLSPROUT - db 14, BUTTERFREE - db 14, BUTTERFREE + db 8, VENONAT + db 9, ABRA + db 10, PIDGEOTTO + db 14, WEEPINBELL + db 14, WEEPINBELL ; day - db 10, CATERPIE + db 8, PIDGEY + db 10, BELLSPROUT db 10, PIDGEY + db 9, ABRA db 12, PIDGEOTTO - db 12, METAPOD - db 10, BELLSPROUT - db 14, BUTTERFREE - db 14, BUTTERFREE + db 14, WEEPINBELL + db 14, WEEPINBELL ; nite + db 8, VENONAT db 10, ODDISH - db 10, HOOTHOOT - db 10, VENONAT - db 12, NOCTOWL + db 10, VENOMOTH + db 9, ABRA + db 14, WEEPINBELL + db 10, BELLSPROUT db 10, BELLSPROUT - db 14, NOCTOWL - db 14, NOCTOWL map_id ROUTE_26 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 28, DODUO db 28, SANDSLASH db 32, PONYTA - db 30, RATICATE db 30, DODUO - db 30, ARBOK - db 30, ARBOK + db 30, DODRIO + db 30, RATICATE + db 30, QUAGSIRE ; day db 28, DODUO db 28, SANDSLASH db 32, PONYTA + db 30, DODUO + db 30, RATICATE + db 30, DODRIO + db 30, DODRIO + ; nite + db 28, RATICATE + db 28, SANDSLASH + db 32, PONYTA + db 30, RATICATE + db 30, QUAGSIRE + db 32, QUAGSIRE + db 32, QUAGSIRE + + ELIF DEF(_SILVER) + ; morn + db 28, DODUO + db 28, RATICATE + db 32, PONYTA + db 30, DODUO + db 30, ARBOK db 30, RATICATE + db 30, QUAGSIRE + ; day + db 28, DODUO + db 28, RATICATE + db 32, PONYTA db 30, DODUO + db 30, RATICATE db 30, ARBOK db 30, ARBOK ; nite - db 28, NOCTOWL db 28, RATICATE - db 32, NOCTOWL + db 28, RATICATE + db 32, PONYTA db 30, RATICATE db 30, QUAGSIRE - db 30, QUAGSIRE - db 30, QUAGSIRE + db 30, ARBOK + db 30, ARBOK + ENDC map_id ROUTE_27 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) ; morn db 28, DODUO - db 28, ARBOK + db 28, RATICATE + db 30, DODUO + db 28, QUAGSIRE + db 32, PONYTA + db 30, SANDSLASH + db 30, SANDSLASH + ; day + db 28, DODUO + db 28, RATICATE + db 30, DODUO db 30, RATICATE + db 32, PONYTA + db 30, SANDSLASH + db 30, SANDSLASH + ; nite + db 28, QUAGSIRE + db 28, RATICATE + db 30, QUAGSIRE + db 30, RATICATE + db 32, PONYTA + db 30, SANDSLASH + db 30, SANDSLASH + + ELIF DEF(_SILVER) + ; morn + db 28, DODUO + db 28, ARBOK db 30, DODUO + db 28, QUAGSIRE db 32, PONYTA db 30, DODRIO db 30, DODRIO ; day db 28, DODUO db 28, ARBOK - db 30, RATICATE db 30, DODUO + db 30, RATICATE db 32, PONYTA db 30, DODRIO db 30, DODRIO ; nite db 28, QUAGSIRE - db 28, NOCTOWL - db 30, RATICATE + db 28, ARBOK db 30, QUAGSIRE - db 32, NOCTOWL - db 32, NOCTOWL - db 32, NOCTOWL + db 30, RATICATE + db 32, PONYTA + db 32, QUAGSIRE + db 32, QUAGSIRE + ENDC map_id ROUTE_28 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) + ; morn + db 39, TANGELA + db 40, PONYTA + db 40, URSARING + db 42, RAPIDASH + db 41, DODUO + db 43, DODRIO + db 43, DODRIO + ; day + db 39, TANGELA + db 40, PONYTA + db 40, URSARING + db 42, RAPIDASH + db 41, DODUO + db 43, DODRIO + db 43, DODRIO + ; nite + db 39, TANGELA + db 40, PONYTA + db 40, URSARING + db 40, SNEASEL + db 42, RAPIDASH + db 42, RAPIDASH + db 42, RAPIDASH + + ELIF DEF(_SILVER) ; morn db 39, TANGELA db 40, PONYTA - db 40, RAPIDASH - db 42, ARBOK + db 40, DONPHAN + db 42, RAPIDASH db 41, DODUO db 43, DODRIO db 43, DODRIO ; day db 39, TANGELA db 40, PONYTA - db 40, RAPIDASH - db 42, ARBOK + db 40, DONPHAN + db 42, RAPIDASH 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 40, PONYTA + db 40, DONPHAN + db 40, SNEASEL + db 42, RAPIDASH + db 42, RAPIDASH + db 42, RAPIDASH + ENDC db -1 ; end diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index c9abda73..1f91e95e 100644 --- a/data/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm @@ -2,18 +2,6 @@ KantoWaterWildMons: - map_id TOHJO_FALLS - db 4 percent ; encounter rate - db 20, GOLDEEN - db 20, SLOWPOKE - db 20, SEAKING - - map_id VERMILION_PORT - db 2 percent ; encounter rate - db 35, TENTACOOL - db 30, TENTACOOL - db 35, TENTACRUEL - map_id ROUTE_4 db 4 percent ; encounter rate db 10, GOLDEEN @@ -98,6 +86,12 @@ KantoWaterWildMons: db 15, TENTACOOL db 20, TENTACRUEL + map_id TOHJO_FALLS + db 4 percent ; encounter rate + db 20, GOLDEEN + db 20, SLOWPOKE + db 20, SEAKING + map_id ROUTE_28 db 2 percent ; encounter rate db 40, POLIWAG @@ -146,4 +140,10 @@ KantoWaterWildMons: db 30, TENTACOOL db 35, TENTACRUEL + map_id VERMILION_PORT + db 2 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 dd7110e1..954ec7bb 100644 --- a/data/wild/swarm_grass.asm +++ b/data/wild/swarm_grass.asm @@ -2,6 +2,91 @@ SwarmGrassWildMons: +; Yanma swarm + map_id 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 + ; day + 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 + +; Snubbull swarm + map_id ROUTE_38 + db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + + IF DEF(_GOLD) + ; morn + db 16, SNUBBULL + db 16, RATICATE + db 16, MAGNEMITE + db 16, FARFETCH_D + db 13, MILTANK + db 13, TAUROS + db 13, TAUROS + ; day + db 16, SNUBBULL + db 16, RATICATE + db 16, MAGNEMITE + db 16, FARFETCH_D + db 13, MILTANK + db 13, TAUROS + db 13, TAUROS + ; nite + db 16, SNUBBULL + db 16, RATICATE + db 16, MAGNEMITE + db 16, RATTATA + db 13, MILTANK + db 13, TAUROS + db 13, TAUROS + + ELIF DEF(_SILVER) + ; morn + db 16, SNUBBULL + db 16, MEOWTH + db 16, MAGNEMITE + db 16, FARFETCH_D + db 13, MILTANK + db 13, TAUROS + db 13, TAUROS + ; day + db 16, SNUBBULL + db 16, MEOWTH + db 16, MAGNEMITE + db 16, FARFETCH_D + db 13, MILTANK + db 13, TAUROS + db 13, TAUROS + ; nite + db 16, SNUBBULL + db 16, MEOWTH + db 16, MAGNEMITE + db 16, MEOWTH + db 13, MILTANK + db 13, TAUROS + db 13, TAUROS + ENDC + ; Dunsparce swarm map_id DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite @@ -30,32 +115,32 @@ SwarmGrassWildMons: db 4, DUNSPARCE db 4, DUNSPARCE -; Yanma swarm - map_id ROUTE_35 - db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite +; Marill swarm + map_id MOUNT_MORTAR_1F_OUTSIDE + db 6 percent, 6 percent, 6 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 13, MARILL + db 15, ZUBAT + db 14, MACHOP + db 15, MARILL + db 14, GEODUDE + db 16, RATTATA + db 16, RATTATA ; 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 13, MARILL + db 15, ZUBAT + db 14, MACHOP + db 15, MARILL + db 14, GEODUDE + db 16, RATTATA + db 16, RATTATA ; 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 13, MARILL + db 15, ZUBAT + db 14, MACHOP + db 15, MARILL + db 14, GEODUDE + db 16, RATTATA + db 16, RATTATA db -1 ; end diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm index ec105c00..d535dc6d 100644 --- a/data/wild/swarm_water.asm +++ b/data/wild/swarm_water.asm @@ -2,6 +2,11 @@ SwarmWaterWildMons: - ; No swarms encountered while surfing in Crystal +; Marill swarm + map_id MOUNT_MORTAR_1F_OUTSIDE + db 4 percent ; encounter rate + db 20, GOLDEEN + db 20, MARILL + db 20, SEAKING db -1 ; end diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 4be921fd..bd839dae 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -963,9 +963,9 @@ RandomPhoneMon: ld bc, MON_NAME_LENGTH jp CopyBytes -;INCLUDE "data/wild/johto_grass.asm" -;INCLUDE "data/wild/johto_water.asm" -;INCLUDE "data/wild/kanto_grass.asm" -;INCLUDE "data/wild/kanto_water.asm" -;INCLUDE "data/wild/swarm_grass.asm" -;INCLUDE "data/wild/swarm_water.asm" +INCLUDE "data/wild/johto_grass.asm" +INCLUDE "data/wild/johto_water.asm" +INCLUDE "data/wild/kanto_grass.asm" +INCLUDE "data/wild/kanto_water.asm" +INCLUDE "data/wild/swarm_grass.asm" +INCLUDE "data/wild/swarm_water.asm" @@ -255,18 +255,6 @@ INCLUDE "engine/link/link.asm" INCLUDE "engine/link/mystery_gift.asm" INCLUDE "engine/overworld/wildmons.asm" -JohtoGrassWildMons:: - dr $2ab35, $2b669 -JohtoWaterWildMons:: - dr $2b669, $2b7c0 -KantoGrassWildMons:: - dr $2b7c0, $2bd43 -KantoWaterWildMons:: - dr $2bd43, $2be1c -SwarmGrassWildMons:: - dr $2be1c, $2bed9 -SwarmWaterWildMons:: - dr $2bed9, $2bee3 SECTION "bankB", ROMX @@ -1708,9 +1708,9 @@ wd140:: ds 1 ; d140 wCurDamage:: ds 2 ; d141 wd143:: ds 1 ; d143 wd144:: ds 1 ; d144 -wMornEncounterRate:: db ; d145 -wd146:: ds 1 ; d146 -wd147:: ds 1 ; d147 +wMornEncounterRate:: db ; d145 +wDayEncounterRate:: db ; d146 +wNiteEncounterRate:: db ; d147 wWaterEncounterRate:: db ; d148 wListMoves_MoveIndicesBuffer:: ds NUM_MOVES wPutativeTMHMMove:: db ; d14d |