diff options
Diffstat (limited to 'data/wild')
58 files changed, 549 insertions, 955 deletions
diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 1dd8e049..4858ab5d 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -30,8 +30,8 @@ WildDataPointers: dw Route16Mons ; ROUTE_16 dw Route17Mons ; ROUTE_17 dw Route18Mons ; ROUTE_18 - dw WaterMons ; ROUTE_19 - dw WaterMons ; ROUTE_20 + dw Route19Mons ; ROUTE_19 + dw Route20Mons ; ROUTE_20 dw Route21Mons ; ROUTE_21 dw Route22Mons ; ROUTE_22 dw Route23Mons ; ROUTE_23 @@ -248,6 +248,7 @@ WildDataPointers: dw NoMons dw NoMons dw NoMons + dw NoMons assert_table_length NUM_MAPS dw -1 ; end @@ -301,7 +302,8 @@ INCLUDE "data/wild/maps/SafariZoneCenter.asm" INCLUDE "data/wild/maps/SafariZoneEast.asm" INCLUDE "data/wild/maps/SafariZoneNorth.asm" INCLUDE "data/wild/maps/SafariZoneWest.asm" -INCLUDE "data/wild/maps/SeaRoutes.asm" +INCLUDE "data/wild/maps/Route19.asm" +INCLUDE "data/wild/maps/Route20.asm" INCLUDE "data/wild/maps/SeafoamIslands1F.asm" INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm" INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm" diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm index ae593741..f8a830de 100644 --- a/data/wild/maps/CeruleanCave1F.asm +++ b/data/wild/maps/CeruleanCave1F.asm @@ -1,20 +1,15 @@ DungeonMons1: def_grass_wildmons 10 ; encounter rate - db 46, GOLBAT - db 46, HYPNO - db 46, MAGNETON - db 49, DODRIO - db 49, VENOMOTH -IF DEF(_RED) - db 52, ARBOK -ENDC -IF DEF(_BLUE) + db 50, GOLBAT + db 55, GOLBAT + db 45, GRAVELER + db 55, GLOOM + db 55, WEEPINBELL db 52, SANDSLASH -ENDC - db 49, KADABRA - db 52, PARASECT - db 53, RAICHU - db 53, DITTO + db 54, VENOMOTH + db 54, PARASECT + db 55, DITTO + db 60, DITTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm index f2648150..712d8cec 100644 --- a/data/wild/maps/CeruleanCave2F.asm +++ b/data/wild/maps/CeruleanCave2F.asm @@ -1,15 +1,15 @@ DungeonMons2: def_grass_wildmons 15 ; encounter rate - db 51, DODRIO - db 51, VENOMOTH - db 51, KADABRA - db 52, RHYDON - db 52, MAROWAK - db 52, ELECTRODE - db 56, CHANSEY - db 54, WIGGLYTUFF - db 55, DITTO + db 52, GOLBAT + db 57, GOLBAT + db 50, GRAVELER + db 56, SANDSLASH + db 50, RHYHORN db 60, DITTO + db 58, GLOOM + db 58, WEEPINBELL + db 60, RHYDON + db 58, RHYDON end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm index 10752548..5787d240 100644 --- a/data/wild/maps/CeruleanCaveB1F.asm +++ b/data/wild/maps/CeruleanCaveB1F.asm @@ -1,20 +1,15 @@ DungeonMonsB1: def_grass_wildmons 25 ; encounter rate - db 55, RHYDON - db 55, MAROWAK - db 55, ELECTRODE - db 64, CHANSEY - db 64, PARASECT - db 64, RAICHU -IF DEF(_RED) - db 57, ARBOK -ENDC -IF DEF(_BLUE) - db 57, SANDSLASH -ENDC + db 54, GOLBAT + db 59, GOLBAT + db 55, GRAVELER + db 52, RHYHORN + db 62, RHYDON + db 60, DITTO + db 56, CHANSEY db 65, DITTO - db 63, DITTO - db 67, DITTO + db 55, LICKITUNG + db 50, LICKITUNG end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index 6ecc8f35..93edc040 100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -1,15 +1,15 @@ MoonMons1: def_grass_wildmons 10 ; encounter rate db 8, ZUBAT - db 7, ZUBAT db 9, ZUBAT - db 8, GEODUDE + db 10, GEODUDE db 6, ZUBAT + db 7, ZUBAT db 10, ZUBAT db 10, GEODUDE - db 8, PARAS db 11, ZUBAT - db 8, CLEFAIRY + db 12, SANDSHREW + db 11, CLEFAIRY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index ab793cf9..d729dc6f 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -1,15 +1,15 @@ MoonMonsB1: def_grass_wildmons 10 ; encounter rate db 8, ZUBAT - db 7, ZUBAT - db 7, GEODUDE - db 8, GEODUDE db 9, ZUBAT - db 10, PARAS db 10, ZUBAT + db 10, GEODUDE + db 11, GEODUDE db 11, ZUBAT - db 9, CLEFAIRY - db 9, GEODUDE + db 9, PARAS + db 11, PARAS + db 10, CLEFAIRY + db 12, CLEFAIRY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index 119b414e..63671cbe 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -1,15 +1,15 @@ MoonMonsB2: def_grass_wildmons 10 ; encounter rate - db 9, ZUBAT - db 9, GEODUDE db 10, ZUBAT - db 10, GEODUDE + db 11, GEODUDE + db 13, PARAS + db 11, ZUBAT db 11, ZUBAT - db 10, PARAS - db 12, PARAS - db 10, CLEFAIRY db 12, ZUBAT - db 12, CLEFAIRY + db 13, ZUBAT + db 9, CLEFAIRY + db 11, CLEFAIRY + db 13, CLEFAIRY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index d67ceb07..8aea3fac 100644 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm @@ -1,29 +1,15 @@ MansionMons1: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 32, KOFFING - db 30, KOFFING - db 34, PONYTA - db 30, PONYTA + db 34, RATTATA + db 34, RATICATE + db 23, GRIMER + db 26, GROWLITHE + db 37, RATTATA + db 37, RATICATE + db 30, GROWLITHE + db 26, GRIMER db 34, GROWLITHE - db 32, PONYTA - db 30, GRIMER - db 28, PONYTA - db 37, WEEZING - db 39, MUK -ENDC -IF DEF(_BLUE) - db 32, GRIMER - db 30, GRIMER - db 34, PONYTA - db 30, PONYTA - db 34, VULPIX - db 32, PONYTA - db 30, KOFFING - db 28, PONYTA - db 37, MUK - db 39, WEEZING -ENDC + db 38, GROWLITHE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 01a48f1c..818e705b 100644 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm @@ -1,29 +1,15 @@ MansionMons2: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 32, GROWLITHE - db 34, KOFFING - db 34, KOFFING - db 30, PONYTA - db 30, KOFFING - db 32, PONYTA - db 30, GRIMER - db 28, PONYTA - db 39, WEEZING - db 37, MUK -ENDC -IF DEF(_BLUE) - db 32, VULPIX - db 34, GRIMER - db 34, GRIMER - db 30, PONYTA - db 30, GRIMER - db 32, PONYTA - db 30, KOFFING - db 28, PONYTA - db 39, MUK - db 37, WEEZING -ENDC + db 37, RATTATA + db 37, RATICATE + db 26, GRIMER + db 29, GRIMER + db 40, RATTATA + db 40, RATICATE + db 32, GRIMER + db 35, GRIMER + db 35, MUK + db 38, MUK end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index 28c3bf88..36eb701b 100644 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm @@ -1,29 +1,15 @@ MansionMons3: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 31, KOFFING - db 33, GROWLITHE - db 35, KOFFING - db 32, PONYTA - db 34, PONYTA - db 40, WEEZING - db 34, GRIMER - db 38, WEEZING - db 36, PONYTA - db 42, MUK -ENDC -IF DEF(_BLUE) - db 31, GRIMER - db 33, VULPIX + db 40, RATTATA + db 40, RATICATE + db 32, GRIMER db 35, GRIMER - db 32, PONYTA - db 34, MAGMAR - db 40, MUK - db 34, KOFFING + db 43, RATTATA + db 43, RATICATE + db 38, GRIMER + db 38, GRIMER db 38, MUK - db 36, PONYTA - db 42, WEEZING -ENDC + db 41, MUK end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 2d0312af..1954695c 100644 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -1,29 +1,15 @@ MansionMonsB1: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 33, KOFFING - db 31, KOFFING - db 35, GROWLITHE - db 32, PONYTA - db 31, KOFFING - db 40, WEEZING - db 34, PONYTA db 35, GRIMER - db 42, WEEZING - db 42, MUK -ENDC -IF DEF(_BLUE) - db 33, GRIMER - db 31, GRIMER - db 35, VULPIX - db 32, PONYTA - db 31, GRIMER - db 40, MUK - db 34, PONYTA - db 35, KOFFING - db 38, MAGMAR - db 42, WEEZING -ENDC + db 38, GRIMER + db 37, RATICATE + db 40, RATICATE + db 41, MUK + db 43, RATICATE + db 24, DITTO + db 46, RATICATE + db 18, DITTO + db 12, DITTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index ef52127d..42ee5a6f 100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm @@ -4,11 +4,11 @@ TowerMons3: db 21, GASTLY db 22, GASTLY db 23, GASTLY + db 24, GASTLY db 19, GASTLY db 18, GASTLY - db 24, GASTLY - db 20, CUBONE - db 22, CUBONE + db 25, GASTLY + db 20, HAUNTER db 25, HAUNTER end_grass_wildmons diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index da578f90..b81bc541 100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm @@ -4,12 +4,12 @@ TowerMons4: db 21, GASTLY db 22, GASTLY db 23, GASTLY + db 24, GASTLY db 19, GASTLY db 18, GASTLY + db 25, GASTLY + db 20, HAUNTER db 25, HAUNTER - db 20, CUBONE - db 22, CUBONE - db 24, GASTLY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index cbfc5b7b..66af9751 100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm @@ -1,15 +1,15 @@ TowerMons5: - def_grass_wildmons 10 ; encounter rate - db 20, GASTLY - db 21, GASTLY + def_grass_wildmons 15 ; encounter rate db 22, GASTLY db 23, GASTLY - db 19, GASTLY - db 18, GASTLY - db 25, HAUNTER - db 20, CUBONE - db 22, CUBONE db 24, GASTLY + db 25, GASTLY + db 26, GASTLY + db 21, GASTLY + db 20, CUBONE + db 27, GASTLY + db 22, HAUNTER + db 27, HAUNTER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index c8596bbd..1ddafd84 100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm @@ -1,15 +1,15 @@ TowerMons6: def_grass_wildmons 15 ; encounter rate - db 21, GASTLY db 22, GASTLY db 23, GASTLY db 24, GASTLY - db 20, GASTLY - db 19, GASTLY - db 26, HAUNTER + db 25, GASTLY + db 26, GASTLY + db 21, GASTLY db 22, CUBONE - db 24, CUBONE - db 28, HAUNTER + db 27, GASTLY + db 22, HAUNTER + db 27, HAUNTER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index 85289ad1..5c859a00 100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm @@ -1,15 +1,15 @@ TowerMons7: - def_grass_wildmons 15 ; encounter rate - db 21, GASTLY - db 22, GASTLY - db 23, GASTLY + def_grass_wildmons 20 ; encounter rate db 24, GASTLY - db 20, GASTLY - db 28, HAUNTER - db 22, CUBONE + db 25, GASTLY + db 26, GASTLY + db 27, GASTLY + db 28, GASTLY + db 23, GASTLY db 24, CUBONE - db 28, HAUNTER - db 30, HAUNTER + db 29, GASTLY + db 24, HAUNTER + db 29, HAUNTER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index 9950a866..fde69fcd 100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,21 +1,15 @@ PowerPlantMons: def_grass_wildmons 10 ; encounter rate - db 21, VOLTORB - db 21, MAGNEMITE - db 20, PIKACHU - db 24, PIKACHU - db 23, MAGNEMITE - db 23, VOLTORB - db 32, MAGNETON - db 35, MAGNETON -IF DEF(_RED) - db 33, ELECTABUZZ - db 36, ELECTABUZZ -ENDC -IF DEF(_BLUE) - db 33, RAICHU - db 36, RAICHU -ENDC + db 30, MAGNEMITE + db 35, MAGNEMITE + db 33, MAGNETON + db 33, VOLTORB + db 37, VOLTORB + db 33, GRIMER + db 37, GRIMER + db 38, MAGNETON + db 33, MUK + db 37, MUK end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 0b6b07bd..98785e39 100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -1,15 +1,15 @@ TunnelMonsB1: def_grass_wildmons 15 ; encounter rate - db 16, ZUBAT - db 17, ZUBAT - db 17, GEODUDE - db 15, MACHOP - db 16, GEODUDE - db 18, ZUBAT db 15, ZUBAT + db 16, GEODUDE + db 17, ZUBAT + db 19, ZUBAT + db 18, GEODUDE + db 20, GEODUDE + db 21, ZUBAT db 17, MACHOP - db 13, ONIX - db 15, ONIX + db 19, MACHOP + db 21, MACHOP end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index f4dad48d..035574ef 100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -1,15 +1,15 @@ TunnelMonsB2: def_grass_wildmons 15 ; encounter rate - db 16, ZUBAT - db 17, ZUBAT + db 20, ZUBAT db 17, GEODUDE - db 15, MACHOP - db 16, GEODUDE - db 18, ZUBAT - db 17, MACHOP - db 17, ONIX - db 13, ONIX - db 18, GEODUDE + db 18, MACHOP + db 21, ZUBAT + db 22, ZUBAT + db 21, GEODUDE + db 20, MACHOP + db 14, ONIX + db 18, ONIX + db 22, ONIX end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index 481650a8..7634f3b4 100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -1,15 +1,15 @@ Route1Mons: def_grass_wildmons 25 ; encounter rate db 3, PIDGEY - db 3, RATTATA - db 3, RATTATA + db 4, PIDGEY db 2, RATTATA + db 3, RATTATA db 2, PIDGEY db 3, PIDGEY - db 3, PIDGEY - db 4, RATTATA - db 4, PIDGEY db 5, PIDGEY + db 4, RATTATA + db 6, PIDGEY + db 7, PIDGEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index 5e5a0a95..bd9ba28f 100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -1,26 +1,15 @@ Route10Mons: def_grass_wildmons 15 ; encounter rate - db 16, VOLTORB - db 16, SPEAROW - db 14, VOLTORB -IF DEF(_RED) - db 11, EKANS - db 13, SPEAROW - db 15, EKANS - db 17, VOLTORB - db 17, SPEAROW - db 13, EKANS - db 17, EKANS -ENDC -IF DEF(_BLUE) - db 11, SANDSHREW - db 13, SPEAROW - db 15, SANDSHREW - db 17, VOLTORB - db 17, SPEAROW - db 13, SANDSHREW - db 17, SANDSHREW -ENDC + db 16, MAGNEMITE + db 18, RATTATA + db 18, MAGNEMITE + db 20, MAGNEMITE + db 17, NIDORAN_M + db 17, NIDORAN_F + db 22, MAGNEMITE + db 20, RATICATE + db 16, MACHOP + db 18, MACHOP end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index 853daebf..e564296a 100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm @@ -1,26 +1,15 @@ Route11Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 14, EKANS - db 15, SPEAROW - db 12, EKANS - db 9, DROWZEE - db 13, SPEAROW - db 13, DROWZEE - db 15, EKANS -ENDC -IF DEF(_BLUE) - db 14, SANDSHREW - db 15, SPEAROW - db 12, SANDSHREW - db 9, DROWZEE - db 13, SPEAROW - db 13, DROWZEE - db 15, SANDSHREW -ENDC - db 17, SPEAROW - db 11, DROWZEE + db 16, PIDGEY + db 15, RATTATA + db 18, PIDGEY db 15, DROWZEE + db 17, RATTATA + db 17, DROWZEE + db 18, PIDGEOTTO + db 20, PIDGEOTTO + db 19, DROWZEE + db 17, RATICATE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index f4c7911c..40fd8e07 100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -1,30 +1,26 @@ Route12Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 24, ODDISH - db 25, PIDGEY - db 23, PIDGEY - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT - db 26, ODDISH - db 27, PIDGEY - db 28, GLOOM - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 25, PIDGEY - db 23, PIDGEY - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT - db 26, BELLSPROUT - db 27, PIDGEY - db 28, WEEPINBELL - db 30, WEEPINBELL -ENDC + db 25, ODDISH + db 25, BELLSPROUT + db 28, PIDGEY + db 28, PIDGEOTTO + db 27, ODDISH + db 27, BELLSPROUT + db 29, GLOOM + db 29, WEEPINBELL + db 26, FARFETCHD + db 31, FARFETCHD end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 3 ; encounter rate + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWBRO + db 20, SLOWBRO end_water_wildmons diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index 1af1b533..33e097cd 100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -1,30 +1,26 @@ Route13Mons: - def_grass_wildmons 20 ; encounter rate -IF DEF(_RED) - db 24, ODDISH - db 25, PIDGEY - db 27, PIDGEY - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT - db 26, ODDISH - db 25, DITTO - db 28, GLOOM - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 25, PIDGEY - db 27, PIDGEY - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT - db 26, BELLSPROUT - db 25, DITTO - db 28, WEEPINBELL - db 30, WEEPINBELL -ENDC + def_grass_wildmons 15 ; encounter rate + db 25, ODDISH + db 25, BELLSPROUT + db 28, PIDGEOTTO + db 28, PIDGEY + db 27, ODDISH + db 27, BELLSPROUT + db 29, GLOOM + db 29, WEEPINBELL + db 26, FARFETCHD + db 31, FARFETCHD end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 3 ; encounter rate + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWBRO + db 20, SLOWBRO end_water_wildmons diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index 839834ce..98b1f4e3 100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm @@ -1,27 +1,15 @@ Route14Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 24, ODDISH - db 26, PIDGEY - db 23, DITTO - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT db 26, ODDISH - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 26, PIDGEY - db 23, DITTO - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT db 26, BELLSPROUT - db 30, WEEPINBELL -ENDC - db 28, PIDGEOTTO + db 24, VENONAT db 30, PIDGEOTTO + db 28, ODDISH + db 28, BELLSPROUT + db 30, GLOOM + db 30, WEEPINBELL + db 27, VENONAT + db 30, VENOMOTH end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 7c2a23a5..87392fa4 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -1,27 +1,15 @@ Route15Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 24, ODDISH - db 26, DITTO - db 23, PIDGEY - db 26, VENONAT - db 22, ODDISH - db 28, VENONAT db 26, ODDISH - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 26, DITTO - db 23, PIDGEY - db 26, VENONAT - db 22, BELLSPROUT - db 28, VENONAT db 26, BELLSPROUT + db 24, VENONAT + db 32, PIDGEOTTO + db 28, ODDISH + db 28, BELLSPROUT + db 30, GLOOM db 30, WEEPINBELL -ENDC - db 28, PIDGEOTTO - db 30, PIDGEOTTO + db 27, VENONAT + db 30, VENOMOTH end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index d9556d72..4265809a 100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm @@ -1,15 +1,15 @@ Route16Mons: def_grass_wildmons 25 ; encounter rate - db 20, SPEAROW db 22, SPEAROW - db 18, RATTATA - db 20, DODUO - db 20, RATTATA - db 18, DODUO db 22, DODUO - db 22, RATTATA - db 23, RATICATE + db 23, RATTATA + db 24, DODUO + db 24, RATTATA + db 26, DODUO + db 23, SPEAROW + db 24, FEAROW db 25, RATICATE + db 26, RATICATE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index a7a0acc3..4c167abe 100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm @@ -1,15 +1,15 @@ Route17Mons: def_grass_wildmons 25 ; encounter rate - db 20, SPEAROW - db 22, SPEAROW - db 25, RATICATE - db 24, DODUO - db 27, RATICATE db 26, DODUO - db 28, DODUO - db 29, RATICATE - db 25, FEAROW db 27, FEAROW + db 27, DODUO + db 28, DODUO + db 28, PONYTA + db 30, PONYTA + db 29, FEAROW + db 28, DODUO + db 32, PONYTA + db 29, DODRIO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index 66c203cf..04b4dbfa 100644 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm @@ -1,15 +1,15 @@ Route18Mons: def_grass_wildmons 25 ; encounter rate - db 20, SPEAROW db 22, SPEAROW - db 25, RATICATE + db 22, DODUO + db 23, RATTATA db 24, DODUO - db 25, FEAROW + db 24, RATTATA db 26, DODUO - db 28, DODUO - db 29, RATICATE - db 27, FEAROW - db 29, FEAROW + db 23, SPEAROW + db 24, FEAROW + db 25, RATICATE + db 26, RATICATE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/Route19.asm index badf0bed..c09ba290 100644 --- a/data/wild/maps/SeaRoutes.asm +++ b/data/wild/maps/Route19.asm @@ -1,4 +1,4 @@ -WaterMons: +Route19Mons: def_grass_wildmons 0 ; encounter rate end_grass_wildmons diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 7696f5af..eda91039 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -2,23 +2,14 @@ Route2Mons: def_grass_wildmons 25 ; encounter rate db 3, RATTATA db 3, PIDGEY - db 4, PIDGEY db 4, RATTATA + db 4, NIDORAN_M + db 4, NIDORAN_F db 5, PIDGEY -IF DEF(_RED) - db 3, WEEDLE - db 2, RATTATA - db 5, RATTATA - db 4, WEEDLE - db 5, WEEDLE -ENDC -IF DEF(_BLUE) - db 3, CATERPIE - db 2, RATTATA - db 5, RATTATA - db 4, CATERPIE - db 5, CATERPIE -ENDC + db 6, NIDORAN_M + db 6, NIDORAN_F + db 7, PIDGEY + db 7, PIDGEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route20.asm b/data/wild/maps/Route20.asm new file mode 100644 index 00000000..b0f5b85a --- /dev/null +++ b/data/wild/maps/Route20.asm @@ -0,0 +1,16 @@ +Route20Mons: + def_grass_wildmons 0 ; encounter rate + end_grass_wildmons + + def_water_wildmons 5 ; encounter rate + db 5, TENTACOOL + db 10, TENTACOOL + db 15, TENTACOOL + db 5, TENTACOOL + db 10, TENTACOOL + db 15, TENTACOOL + db 20, TENTACOOL + db 30, TENTACOOL + db 35, TENTACOOL + db 40, TENTACOOL + end_water_wildmons diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index d1ed0288..54a647f9 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -1,15 +1,15 @@ Route21Mons: def_grass_wildmons 25 ; encounter rate - db 21, RATTATA - db 23, PIDGEY - db 30, RATICATE - db 23, RATTATA - db 21, PIDGEY - db 30, PIDGEOTTO - db 32, PIDGEOTTO - db 28, TANGELA - db 30, TANGELA - db 32, TANGELA + db 15, PIDGEY + db 13, RATTATA + db 13, PIDGEY + db 11, PIDGEY + db 17, PIDGEY + db 15, RATTATA + db 15, RATICATE + db 17, PIDGEOTTO + db 19, PIDGEOTTO + db 15, PIDGEOTTO end_grass_wildmons def_water_wildmons 5 ; encounter rate diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index 387130f7..9398fafc 100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -1,28 +1,15 @@ Route22Mons: def_grass_wildmons 25 ; encounter rate - db 3, RATTATA -IF DEF(_RED) - db 3, NIDORAN_M - db 4, RATTATA - db 4, NIDORAN_M - db 2, RATTATA db 2, NIDORAN_M - db 3, SPEAROW - db 5, SPEAROW - db 3, NIDORAN_F - db 4, NIDORAN_F -ENDC -IF DEF(_BLUE) - db 3, NIDORAN_F - db 4, RATTATA - db 4, NIDORAN_F - db 2, RATTATA db 2, NIDORAN_F - db 3, SPEAROW - db 5, SPEAROW - db 3, NIDORAN_M + db 3, MANKEY + db 3, RATTATA db 4, NIDORAN_M -ENDC + db 4, NIDORAN_F + db 5, MANKEY + db 2, SPEAROW + db 4, SPEAROW + db 6, SPEAROW end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index 36620813..99e3c548 100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm @@ -1,25 +1,15 @@ Route23Mons: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 26, EKANS -ENDC -IF DEF(_BLUE) - db 26, SANDSHREW -ENDC - db 33, DITTO - db 26, SPEAROW - db 38, FEAROW - db 38, DITTO - db 38, FEAROW -IF DEF(_RED) - db 41, ARBOK -ENDC -IF DEF(_BLUE) - db 41, SANDSLASH -ENDC - db 43, DITTO - db 41, FEAROW - db 43, FEAROW + db 41, NIDORINO + db 41, NIDORINA + db 36, MANKEY + db 44, NIDORINO + db 44, NIDORINA + db 40, FEAROW + db 41, MANKEY + db 45, FEAROW + db 41, PRIMEAPE + db 46, PRIMEAPE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 63633831..852137f4 100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm @@ -1,26 +1,15 @@ Route24Mons: def_grass_wildmons 25 ; encounter rate -IF DEF(_RED) - db 7, WEEDLE - db 8, KAKUNA - db 12, PIDGEY db 12, ODDISH - db 13, ODDISH - db 10, ABRA - db 14, ODDISH -ENDC -IF DEF(_BLUE) - db 7, CATERPIE - db 8, METAPOD - db 12, PIDGEY db 12, BELLSPROUT - db 13, BELLSPROUT - db 10, ABRA - db 14, BELLSPROUT -ENDC db 13, PIDGEY - db 8, ABRA - db 12, ABRA + db 14, ODDISH + db 14, BELLSPROUT + db 15, PIDGEY + db 13, VENONAT + db 16, VENONAT + db 17, PIDGEY + db 17, PIDGEOTTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index 944e28a8..22b68eb0 100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm @@ -1,29 +1,15 @@ Route25Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 8, WEEDLE - db 9, KAKUNA - db 13, PIDGEY db 12, ODDISH - db 13, ODDISH - db 12, ABRA - db 14, ODDISH - db 10, ABRA - db 7, METAPOD - db 8, CATERPIE -ENDC -IF DEF(_BLUE) - db 8, CATERPIE - db 9, METAPOD - db 13, PIDGEY db 12, BELLSPROUT - db 13, BELLSPROUT - db 12, ABRA + db 13, PIDGEY + db 14, ODDISH db 14, BELLSPROUT - db 10, ABRA - db 7, KAKUNA - db 8, WEEDLE -ENDC + db 15, PIDGEY + db 13, VENONAT + db 16, VENONAT + db 17, PIDGEY + db 17, PIDGEOTTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index ebb9e4b4..49dde638 100644 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm @@ -1,15 +1,15 @@ Route3Mons: def_grass_wildmons 20 ; encounter rate - db 6, PIDGEY - db 5, SPEAROW - db 7, PIDGEY - db 6, SPEAROW - db 7, SPEAROW - db 8, PIDGEY db 8, SPEAROW - db 3, JIGGLYPUFF - db 5, JIGGLYPUFF - db 7, JIGGLYPUFF + db 9, SPEAROW + db 9, MANKEY + db 10, SPEAROW + db 8, SANDSHREW + db 10, RATTATA + db 10, SANDSHREW + db 12, RATTATA + db 11, SPEAROW + db 12, SPEAROW end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index 4f94a21a..7aa1f37b 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,26 +1,15 @@ Route4Mons: def_grass_wildmons 20 ; encounter rate - db 10, RATTATA - db 10, SPEAROW - db 8, RATTATA -IF DEF(_RED) - db 6, EKANS - db 8, SPEAROW - db 10, EKANS - db 12, RATTATA - db 12, SPEAROW - db 8, EKANS - db 12, EKANS -ENDC -IF DEF(_BLUE) - db 6, SANDSHREW db 8, SPEAROW + db 9, SPEAROW + db 9, MANKEY + db 10, SPEAROW + db 8, SANDSHREW + db 10, RATTATA db 10, SANDSHREW db 12, RATTATA + db 11, SPEAROW db 12, SPEAROW - db 8, SANDSHREW - db 12, SANDSHREW -ENDC end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index 6414eefe..dc2ee194 100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -1,29 +1,15 @@ Route5Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 13, ODDISH - db 13, PIDGEY db 15, PIDGEY - db 10, MANKEY - db 12, MANKEY - db 15, ODDISH - db 16, ODDISH + db 14, RATTATA + db 7, ABRA db 16, PIDGEY - db 14, MANKEY - db 16, MANKEY -ENDC -IF DEF(_BLUE) - db 13, BELLSPROUT - db 13, PIDGEY - db 15, PIDGEY - db 10, MEOWTH - db 12, MEOWTH - db 15, BELLSPROUT - db 16, BELLSPROUT - db 16, PIDGEY - db 14, MEOWTH - db 16, MEOWTH -ENDC + db 16, RATTATA + db 17, PIDGEY + db 17, PIDGEOTTO + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + db 7, JIGGLYPUFF end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 5c843ec9..df91e521 100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -1,30 +1,26 @@ Route6Mons: def_grass_wildmons 15 ; encounter rate -IF DEF(_RED) - db 13, ODDISH - db 13, PIDGEY db 15, PIDGEY - db 10, MANKEY - db 12, MANKEY - db 15, ODDISH - db 16, ODDISH + db 14, RATTATA + db 7, ABRA db 16, PIDGEY - db 14, MANKEY - db 16, MANKEY -ENDC -IF DEF(_BLUE) - db 13, BELLSPROUT - db 13, PIDGEY - db 15, PIDGEY - db 10, MEOWTH - db 12, MEOWTH - db 15, BELLSPROUT - db 16, BELLSPROUT - db 16, PIDGEY - db 14, MEOWTH - db 16, MEOWTH -ENDC + db 16, RATTATA + db 17, PIDGEY + db 17, PIDGEOTTO + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + db 7, JIGGLYPUFF end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 3 ; encounter rate + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, GOLDUCK + db 20, GOLDUCK end_water_wildmons diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index c0bf1193..e0e78991 100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm @@ -1,28 +1,15 @@ Route7Mons: def_grass_wildmons 15 ; encounter rate - db 19, PIDGEY -IF DEF(_RED) - db 19, ODDISH - db 17, MANKEY - db 22, ODDISH + db 20, PIDGEY db 22, PIDGEY - db 18, MANKEY - db 18, GROWLITHE - db 20, GROWLITHE - db 19, MANKEY - db 20, MANKEY -ENDC -IF DEF(_BLUE) - db 19, BELLSPROUT - db 17, MEOWTH - db 22, BELLSPROUT - db 22, PIDGEY - db 18, MEOWTH - db 18, VULPIX - db 20, VULPIX - db 19, MEOWTH - db 20, MEOWTH -ENDC + db 20, RATTATA + db 15, ABRA + db 19, ABRA + db 24, PIDGEOTTO + db 26, ABRA + db 19, JIGGLYPUFF + db 24, JIGGLYPUFF + db 24, JIGGLYPUFF end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 8d2771af..a55d5e79 100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm @@ -1,28 +1,15 @@ Route8Mons: def_grass_wildmons 15 ; encounter rate - db 18, PIDGEY -IF DEF(_RED) - db 18, MANKEY - db 17, EKANS - db 16, GROWLITHE db 20, PIDGEY - db 20, MANKEY - db 19, EKANS - db 17, GROWLITHE - db 15, GROWLITHE - db 18, GROWLITHE -ENDC -IF DEF(_BLUE) - db 18, MEOWTH - db 17, SANDSHREW - db 16, VULPIX - db 20, PIDGEY - db 20, MEOWTH - db 19, SANDSHREW - db 17, VULPIX - db 15, VULPIX - db 18, VULPIX -ENDC + db 22, PIDGEY + db 20, RATTATA + db 15, ABRA + db 19, ABRA + db 24, PIDGEOTTO + db 19, JIGGLYPUFF + db 24, JIGGLYPUFF + db 20, KADABRA + db 27, KADABRA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index 6a1cdca5..273452c9 100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm @@ -1,26 +1,15 @@ Route9Mons: def_grass_wildmons 15 ; encounter rate - db 16, RATTATA - db 16, SPEAROW - db 14, RATTATA -IF DEF(_RED) - db 11, EKANS - db 13, SPEAROW - db 15, EKANS - db 17, RATTATA + db 16, NIDORAN_M + db 16, NIDORAN_F + db 18, RATTATA + db 18, NIDORAN_M + db 18, NIDORAN_F db 17, SPEAROW - db 13, EKANS - db 17, EKANS -ENDC -IF DEF(_BLUE) - db 11, SANDSHREW - db 13, SPEAROW - db 15, SANDSHREW - db 17, RATTATA - db 17, SPEAROW - db 13, SANDSHREW - db 17, SANDSHREW -ENDC + db 18, NIDORINO + db 18, NIDORINA + db 20, RATICATE + db 19, FEAROW end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 72be93e0..5573d8b8 100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm @@ -1,28 +1,15 @@ ZoneMonsCenter: def_grass_wildmons 30 ; encounter rate -IF DEF(_RED) - db 22, NIDORAN_M - db 25, RHYHORN - db 22, VENONAT + db 14, NIDORAN_M + db 36, NIDORAN_F db 24, EXEGGCUTE - db 31, NIDORINO - db 25, EXEGGCUTE - db 31, NIDORINA - db 30, PARASECT - db 23, SCYTHER -ENDC -IF DEF(_BLUE) - db 22, NIDORAN_F - db 25, RHYHORN - db 22, VENONAT - db 24, EXEGGCUTE - db 31, NIDORINA - db 25, EXEGGCUTE - db 31, NIDORINO - db 30, PARASECT - db 23, PINSIR -ENDC - db 23, CHANSEY + db 20, RHYHORN + db 23, NIDORINO + db 27, PARASECT + db 27, PARAS + db 32, PARASECT + db 22, TANGELA + db 7, CHANSEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index ea7cbc22..1b634058 100644 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm @@ -1,29 +1,15 @@ ZoneMons1: def_grass_wildmons 30 ; encounter rate -IF DEF(_RED) - db 24, NIDORAN_M - db 26, DODUO - db 22, PARAS - db 25, EXEGGCUTE - db 33, NIDORINO - db 23, EXEGGCUTE - db 24, NIDORAN_F - db 25, PARASECT - db 25, KANGASKHAN - db 28, SCYTHER -ENDC -IF DEF(_BLUE) - db 24, NIDORAN_F - db 26, DODUO - db 22, PARAS - db 25, EXEGGCUTE - db 33, NIDORINA - db 23, EXEGGCUTE - db 24, NIDORAN_M - db 25, PARASECT - db 25, KANGASKHAN - db 28, PINSIR -ENDC + db 21, NIDORAN_M + db 29, NIDORAN_F + db 22, EXEGGCUTE + db 21, TAUROS + db 32, NIDORINA + db 19, CUBONE + db 26, EXEGGCUTE + db 24, MAROWAK + db 21, CHANSEY + db 15, SCYTHER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 864124c3..6ce432ef 100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm @@ -1,26 +1,15 @@ ZoneMons2: def_grass_wildmons 30 ; encounter rate -IF DEF(_RED) - db 22, NIDORAN_M - db 26, RHYHORN - db 23, PARAS - db 25, EXEGGCUTE - db 30, NIDORINO - db 27, EXEGGCUTE - db 30, NIDORINA -ENDC -IF DEF(_BLUE) - db 22, NIDORAN_F - db 26, RHYHORN - db 23, PARAS - db 25, EXEGGCUTE - db 30, NIDORINA - db 27, EXEGGCUTE - db 30, NIDORINO -ENDC - db 32, VENOMOTH - db 26, CHANSEY - db 28, TAUROS + db 36, NIDORAN_M + db 14, NIDORAN_F + db 20, EXEGGCUTE + db 25, RHYHORN + db 23, NIDORINA + db 28, KANGASKHAN + db 16, CUBONE + db 33, KANGASKHAN + db 25, SCYTHER + db 15, PINSIR end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index fb8962da..42a4d3a3 100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -1,26 +1,15 @@ ZoneMons3: def_grass_wildmons 30 ; encounter rate -IF DEF(_RED) - db 25, NIDORAN_M - db 26, DODUO - db 23, VENONAT - db 24, EXEGGCUTE - db 33, NIDORINO + db 29, NIDORAN_M + db 21, NIDORAN_F + db 22, EXEGGCUTE + db 21, TAUROS + db 32, NIDORINO + db 19, CUBONE db 26, EXEGGCUTE - db 25, NIDORAN_F -ENDC -IF DEF(_BLUE) - db 25, NIDORAN_F - db 26, DODUO - db 23, VENONAT - db 24, EXEGGCUTE - db 33, NIDORINA - db 26, EXEGGCUTE - db 25, NIDORAN_M -ENDC - db 31, VENOMOTH - db 26, TAUROS - db 28, KANGASKHAN + db 24, MAROWAK + db 25, PINSIR + db 27, TANGELA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index 67c87ce2..bc14de89 100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -1,28 +1,15 @@ IslandMons1: def_grass_wildmons 15 ; encounter rate - db 30, SEEL -IF DEF(_RED) - db 30, SLOWPOKE - db 30, SHELLDER - db 30, HORSEA - db 28, HORSEA - db 21, ZUBAT - db 29, GOLBAT - db 28, PSYDUCK - db 28, SHELLDER - db 38, GOLDUCK -ENDC -IF DEF(_BLUE) - db 30, PSYDUCK - db 30, STARYU - db 30, KRABBY - db 28, KRABBY - db 21, ZUBAT - db 29, GOLBAT + db 18, ZUBAT + db 25, KRABBY + db 27, KRABBY + db 27, ZUBAT + db 36, ZUBAT db 28, SLOWPOKE - db 28, STARYU - db 38, SLOWBRO -ENDC + db 30, SLOWPOKE + db 9, ZUBAT + db 27, GOLBAT + db 36, GOLBAT end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index b2f0f699..b213df3d 100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -1,29 +1,15 @@ IslandMonsB1: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 30, STARYU - db 30, HORSEA - db 32, SHELLDER - db 32, HORSEA - db 28, SLOWPOKE - db 30, SEEL - db 30, SLOWPOKE - db 28, SEEL - db 38, DEWGONG - db 37, SEADRA -ENDC -IF DEF(_BLUE) - db 30, SHELLDER - db 30, KRABBY - db 32, STARYU - db 32, KRABBY - db 28, PSYDUCK - db 30, SEEL - db 30, PSYDUCK - db 28, SEEL - db 38, DEWGONG - db 37, KINGLER -ENDC + db 27, ZUBAT + db 26, KRABBY + db 36, ZUBAT + db 28, KRABBY + db 27, GOLBAT + db 29, SLOWPOKE + db 18, ZUBAT + db 28, KINGLER + db 22, SEEL + db 26, SEEL end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index 4237fcd1..4cb4805c 100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -1,28 +1,15 @@ IslandMonsB2: def_grass_wildmons 10 ; encounter rate - db 30, SEEL -IF DEF(_RED) - db 30, SLOWPOKE - db 32, SEEL - db 32, SLOWPOKE - db 28, HORSEA - db 30, STARYU - db 30, HORSEA - db 28, SHELLDER - db 30, GOLBAT - db 37, SLOWBRO -ENDC -IF DEF(_BLUE) - db 30, PSYDUCK - db 32, SEEL - db 32, PSYDUCK - db 28, KRABBY - db 30, SHELLDER - db 30, KRABBY - db 28, STARYU - db 30, GOLBAT - db 37, GOLDUCK -ENDC + db 27, ZUBAT + db 27, KRABBY + db 36, ZUBAT + db 27, GOLBAT + db 28, KINGLER + db 24, SEEL + db 29, KRABBY + db 36, GOLBAT + db 31, SLOWPOKE + db 31, SLOWBRO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 3d29664f..e58c306f 100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -1,29 +1,26 @@ IslandMonsB3: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 31, SLOWPOKE - db 31, SEEL - db 33, SLOWPOKE - db 33, SEEL - db 29, HORSEA - db 31, SHELLDER - db 31, HORSEA - db 29, SHELLDER - db 39, SEADRA -ENDC -IF DEF(_BLUE) - db 31, PSYDUCK - db 31, SEEL - db 33, PSYDUCK - db 33, SEEL + db 27, GOLBAT + db 36, ZUBAT db 29, KRABBY - db 31, STARYU + db 27, ZUBAT + db 30, KINGLER + db 26, SEEL db 31, KRABBY - db 29, STARYU - db 39, KINGLER -ENDC - db 37, DEWGONG + db 30, SEEL + db 28, DEWGONG + db 32, DEWGONG end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 5 ; encounter rate + db 25, TENTACOOL + db 30, TENTACOOL + db 20, TENTACOOL + db 30, STARYU + db 35, TENTACOOL + db 30, STARYU + db 40, TENTACOOL + db 30, STARYU + db 30, STARYU + db 30, STARYU end_water_wildmons diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index 9bc08333..84d4ba5d 100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -1,29 +1,26 @@ IslandMonsB4: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 31, HORSEA - db 31, SHELLDER - db 33, HORSEA - db 33, SHELLDER - db 29, SLOWPOKE - db 31, SEEL - db 31, SLOWPOKE - db 29, SEEL - db 39, SLOWBRO -ENDC -IF DEF(_BLUE) - db 31, KRABBY - db 31, STARYU - db 33, KRABBY - db 33, STARYU - db 29, PSYDUCK - db 31, SEEL - db 31, PSYDUCK - db 29, SEEL - db 39, GOLDUCK -ENDC - db 32, GOLBAT + db 36, GOLBAT + db 36, ZUBAT + db 30, KRABBY + db 32, KINGLER + db 28, SEEL + db 32, SEEL + db 27, GOLBAT + db 45, ZUBAT + db 30, DEWGONG + db 34, DEWGONG end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 5 ; encounter rate + db 25, TENTACOOL + db 30, TENTACOOL + db 20, TENTACOOL + db 30, STARYU + db 35, TENTACOOL + db 30, STARYU + db 40, TENTACOOL + db 30, STARYU + db 30, STARYU + db 30, STARYU end_water_wildmons diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 162fef86..17ece17a 100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm @@ -1,15 +1,15 @@ PlateauMons1: def_grass_wildmons 15 ; encounter rate - db 24, MACHOP db 26, GEODUDE - db 22, ZUBAT - db 36, ONIX - db 39, ONIX - db 42, ONIX + db 31, GEODUDE + db 36, GEODUDE + db 39, ZUBAT + db 44, ZUBAT + db 41, GEODUDE + db 43, ONIX + db 45, ONIX db 41, GRAVELER - db 41, GOLBAT - db 42, MACHOKE - db 43, MAROWAK + db 47, GRAVELER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index 4cb9e8da..04ebaa6e 100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm @@ -1,15 +1,15 @@ PlateauMons2: def_grass_wildmons 10 ; encounter rate - db 22, MACHOP - db 24, GEODUDE - db 26, ZUBAT - db 36, ONIX - db 39, ONIX - db 42, ONIX - db 41, MACHOKE - db 40, GOLBAT - db 40, MAROWAK - db 43, GRAVELER + db 31, GEODUDE + db 36, GEODUDE + db 41, GEODUDE + db 44, ZUBAT + db 39, GOLBAT + db 44, GRAVELER + db 45, ONIX + db 47, ONIX + db 39, MACHOKE + db 42, MACHOKE end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index c525839c..cf56245e 100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -1,15 +1,15 @@ PlateauMons3: def_grass_wildmons 15 ; encounter rate - db 24, MACHOP - db 26, GEODUDE - db 22, ZUBAT - db 42, ONIX - db 40, VENOMOTH - db 45, ONIX - db 43, GRAVELER - db 41, GOLBAT + db 36, GEODUDE + db 44, GOLBAT + db 41, GEODUDE + db 49, ONIX + db 46, GEODUDE + db 41, GRAVELER db 42, MACHOKE db 45, MACHOKE + db 47, GRAVELER + db 47, GRAVELER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index 71319e71..93286607 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,27 +1,15 @@ ForestMons: - def_grass_wildmons 8 ; encounter rate -IF DEF(_RED) - db 4, WEEDLE - db 5, KAKUNA - db 3, WEEDLE - db 5, WEEDLE - db 4, KAKUNA - db 6, KAKUNA - db 4, METAPOD + def_grass_wildmons 25 ; encounter rate db 3, CATERPIE -ENDC -IF DEF(_BLUE) + db 4, METAPOD db 4, CATERPIE - db 5, METAPOD - db 3, CATERPIE db 5, CATERPIE - db 4, METAPOD + db 4, PIDGEY + db 6, PIDGEY + db 6, CATERPIE db 6, METAPOD - db 4, KAKUNA - db 3, WEEDLE -ENDC - db 3, PIKACHU - db 5, PIKACHU + db 8, PIDGEY + db 9, PIDGEOTTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 20a52a6c..7b3b6407 100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -1,101 +1,33 @@ -; super rod encounters -SuperRodData: - ; map, fishing group - dbw PALLET_TOWN, .Group1 - dbw VIRIDIAN_CITY, .Group1 - dbw CERULEAN_CITY, .Group3 - dbw VERMILION_CITY, .Group4 - dbw CELADON_CITY, .Group5 - dbw FUCHSIA_CITY, .Group10 - dbw CINNABAR_ISLAND, .Group8 - dbw ROUTE_4, .Group3 - dbw ROUTE_6, .Group4 - dbw ROUTE_10, .Group5 - dbw ROUTE_11, .Group4 - dbw ROUTE_12, .Group7 - dbw ROUTE_13, .Group7 - dbw ROUTE_17, .Group7 - dbw ROUTE_18, .Group7 - dbw ROUTE_19, .Group8 - dbw ROUTE_20, .Group8 - dbw ROUTE_21, .Group8 - dbw ROUTE_22, .Group2 - dbw ROUTE_23, .Group9 - dbw ROUTE_24, .Group3 - dbw ROUTE_25, .Group3 - dbw CERULEAN_GYM, .Group3 - dbw VERMILION_DOCK, .Group4 - dbw SEAFOAM_ISLANDS_B3F, .Group8 - dbw SEAFOAM_ISLANDS_B4F, .Group8 - dbw SAFARI_ZONE_EAST, .Group6 - dbw SAFARI_ZONE_NORTH, .Group6 - dbw SAFARI_ZONE_WEST, .Group6 - dbw SAFARI_ZONE_CENTER, .Group6 - dbw CERULEAN_CAVE_2F, .Group9 - dbw CERULEAN_CAVE_B1F, .Group9 - dbw CERULEAN_CAVE_1F, .Group9 +SuperRodFishingSlots:: + db PALLET_TOWN, STARYU, 10, TENTACOOL, 10, STARYU, 5, TENTACOOL, 20 + db VIRIDIAN_CITY, POLIWAG, 5, POLIWAG, 10, POLIWAG, 15, POLIWAG, 10 + db CERULEAN_CITY, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30, SEAKING, 40 + db VERMILION_CITY, TENTACOOL, 15, TENTACOOL, 20, TENTACOOL, 10, HORSEA, 5 + db CELADON_CITY, GOLDEEN, 5, GOLDEEN, 10, GOLDEEN, 15, GOLDEEN, 20 + db FUCHSIA_CITY, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, GYARADOS, 15 + db CINNABAR_ISLAND, STARYU, 15, TENTACOOL, 15, STARYU, 10, TENTACOOL, 30 + db ROUTE_4, GOLDEEN, 20, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30 + db ROUTE_6, GOLDEEN, 5, GOLDEEN, 10, GOLDEEN, 15, GOLDEEN, 20 + db ROUTE_24, GOLDEEN, 20, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30 + db ROUTE_25, KRABBY, 10, KRABBY, 15, KINGLER, 15, KINGLER, 25 + db ROUTE_10, KRABBY, 15, KRABBY, 20, HORSEA, 10, KINGLER, 25 + db ROUTE_11, TENTACOOL, 15, TENTACOOL, 20, TENTACOOL, 10, HORSEA, 5 + db ROUTE_12, HORSEA, 20, HORSEA, 25, SEADRA, 25, SEADRA, 35 + db ROUTE_13, HORSEA, 15, HORSEA, 20, TENTACOOL, 10, SEADRA, 20 + db ROUTE_17, TENTACOOL, 5, TENTACOOL, 15, SHELLDER, 25, SHELLDER, 35 + db ROUTE_18, TENTACOOL, 15, SHELLDER, 20, SHELLDER, 30, SHELLDER, 40 + db ROUTE_19, TENTACOOL, 15, STARYU, 20, TENTACOOL, 30, TENTACRUEL, 30 + db ROUTE_20, TENTACOOL, 20, TENTACRUEL, 20, STARYU, 30, TENTACRUEL, 40 + db ROUTE_21, TENTACOOL, 15, STARYU, 20, TENTACOOL, 30, TENTACRUEL, 30 + db ROUTE_22, POLIWAG, 5, POLIWAG, 10, POLIWAG, 15, POLIWHIRL, 15 + db ROUTE_23, POLIWAG, 25, POLIWAG, 30, POLIWHIRL, 30, POLIWHIRL, 40 + db VERMILION_DOCK, TENTACOOL, 10, TENTACOOL, 15, STARYU, 15, SHELLDER, 10 + db SAFARI_ZONE_CENTER, MAGIKARP, 5, MAGIKARP, 10, DRATINI, 10, DRAGONAIR, 15 + db SAFARI_ZONE_EAST, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, DRATINI, 15 + db SAFARI_ZONE_NORTH, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, DRATINI, 15 + db SAFARI_ZONE_WEST, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, DRATINI, 15 + db SEAFOAM_ISLANDS_B3F, KRABBY, 25, STARYU, 20, KINGLER, 35, STARYU, 40 + db SEAFOAM_ISLANDS_B4F, KRABBY, 25, STARYU, 20, KINGLER, 35, STARYU, 40 + db CERULEAN_CAVE_1F, GOLDEEN, 25, SEAKING, 35, SEAKING, 45, SEAKING, 55 + db CERULEAN_CAVE_B1F, GOLDEEN, 30, SEAKING, 40, SEAKING, 50, SEAKING, 60 db -1 ; end - -; fishing groups -; number of monsters, followed by level/monster pairs - -.Group1: - db 2 - db 15, TENTACOOL - db 15, POLIWAG - -.Group2: - db 2 - db 15, GOLDEEN - db 15, POLIWAG - -.Group3: - db 3 - db 15, PSYDUCK - db 15, GOLDEEN - db 15, KRABBY - -.Group4: - db 2 - db 15, KRABBY - db 15, SHELLDER - -.Group5: - db 2 - db 23, POLIWHIRL - db 15, SLOWPOKE - -.Group6: - db 4 - db 15, DRATINI - db 15, KRABBY - db 15, PSYDUCK - db 15, SLOWPOKE - -.Group7: - db 4 - db 5, TENTACOOL - db 15, KRABBY - db 15, GOLDEEN - db 15, MAGIKARP - -.Group8: - db 4 - db 15, STARYU - db 15, HORSEA - db 15, SHELLDER - db 15, GOLDEEN - -.Group9: - db 4 - db 23, SLOWBRO - db 23, SEAKING - db 23, KINGLER - db 23, SEADRA - -.Group10: - db 4 - db 23, SEAKING - db 15, KRABBY - db 15, GOLDEEN - db 15, MAGIKARP |