diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index a62f9817..b3694c6e 100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -1,14 +1,14 @@ MtMoon1FWildMons: def_grass_wildmons 10 ; encounter rate - db 8, ZUBAT - db 7, ZUBAT - db 9, ZUBAT + db 8, BITTYBAT + db 7, BITTYBAT + db 9, BITTYBAT db 8, GEODUDE - db 6, ZUBAT - db 10, ZUBAT + db 6, BITTYBAT + db 10, BETOBEBII db 10, GEODUDE - db 8, PARAS - db 11, ZUBAT + db 8, PARA + db 11, BITTYBAT db 8, CLEFAIRY end_grass_wildmons diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 85645fbe..84a8863a 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -1,15 +1,15 @@ MtMoonB1FWildMons: def_grass_wildmons 10 ; encounter rate - db 8, ZUBAT - db 7, ZUBAT + db 8, BITTYBAT + db 7, BITTYBAT db 7, GEODUDE db 8, GEODUDE - db 9, ZUBAT - db 10, PARAS - db 10, ZUBAT - db 11, ZUBAT - db 9, CLEFAIRY db 9, GEODUDE + db 10, PARA + db 10, BITTYBAT + db 11, BETOBEBII + db 9, CLEFAIRY + db 9, BETOBEBII end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index 2e845ce3..27f23ff7 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -1,15 +1,15 @@ MtMoonB2FWildMons: def_grass_wildmons 10 ; encounter rate - db 9, ZUBAT + db 9, BITTYBAT db 9, GEODUDE - db 10, ZUBAT + db 10, BITTYBAT db 10, GEODUDE - db 11, ZUBAT - db 10, PARAS - db 12, PARAS + db 11, BITTYBAT + db 10, PARA + db 12, PARA db 10, CLEFAIRY + db 12, BETOBEBII db 12, ZUBAT - db 12, CLEFAIRY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index a9ed6a4a..36050078 100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -1,15 +1,15 @@ Route1WildMons: def_grass_wildmons 25 ; encounter rate - db 3, PIDGEY + db 4, PIDGEY db 3, RATTATA db 3, RATTATA - db 2, RATTATA - db 2, PIDGEY - db 3, PIDGEY + db 3, RATTATA + db 2, KONYA + db 3, KONYA db 3, PIDGEY db 4, RATTATA - db 4, PIDGEY - db 5, PIDGEY + db 6, PIDGEY + db 7, PIDGEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index 87cf94fa..7177ffbf 100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm @@ -4,19 +4,19 @@ IF DEF(_RED) db 14, EKANS db 15, SPEAROW db 12, EKANS - db 9, DROWZEE - db 13, SPEAROW db 13, DROWZEE - db 15, EKANS + db 13, MAGNEMITE + db 13, DROWZEE + db 15, SANDSHREW 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 + db 13, MAGNEMITE + db 13, DROWZEE + db 15, EKANS ENDC db 17, SPEAROW db 11, DROWZEE diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 9ec6d912..0a3e3819 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -1,23 +1,23 @@ Route2WildMons: def_grass_wildmons 25 ; encounter rate - db 3, RATTATA - db 3, PIDGEY - db 4, PIDGEY db 4, RATTATA db 5, PIDGEY + db 4, PIDGEY + db 4, RATTATA + db 5, PARA IF DEF(_RED) - db 3, WEEDLE - db 2, RATTATA - db 5, RATTATA db 4, WEEDLE + db 3, RATTATA + db 5, RATTATA db 5, WEEDLE + db 6, WEEDLE ENDC IF DEF(_BLUE) - db 3, CATERPIE - db 2, RATTATA - db 5, RATTATA db 4, CATERPIE + db 3, RATTATA + db 5, RATTATA db 5, CATERPIE + db 6, CATERPIE ENDC end_grass_wildmons diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index 49e95bc9..ecc9e227 100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -1,25 +1,25 @@ Route22WildMons: def_grass_wildmons 25 ; encounter rate - db 3, RATTATA + db 5, RATTATA IF DEF(_RED) db 3, NIDORAN_M - db 4, RATTATA + db 4, PUDI db 4, NIDORAN_M db 2, RATTATA db 2, NIDORAN_M db 3, SPEAROW - db 5, SPEAROW + db 5, MIKON db 3, NIDORAN_F db 4, NIDORAN_F ENDC IF DEF(_BLUE) db 3, NIDORAN_F - db 4, RATTATA + db 4, MIKON db 4, NIDORAN_F db 2, RATTATA db 2, NIDORAN_F db 3, SPEAROW - db 5, SPEAROW + db 5, PUDI db 3, NIDORAN_M db 4, NIDORAN_M ENDC diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 3c06d810..5fee0f9b 100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm @@ -1,26 +1,26 @@ Route24WildMons: def_grass_wildmons 25 ; encounter rate IF DEF(_RED) - db 7, WEEDLE - db 8, KAKUNA + db 13, BEEDRILL + db 12, ODDISH db 12, PIDGEY db 12, ODDISH db 13, ODDISH db 10, ABRA - db 14, ODDISH + db 14, BELLSPROUT ENDC IF DEF(_BLUE) - db 7, CATERPIE - db 8, METAPOD + db 13, BUTTERFREE + db 12, BELLSPROUT db 12, PIDGEY db 12, BELLSPROUT db 13, BELLSPROUT db 10, ABRA - db 14, BELLSPROUT + db 14, ODDISH ENDC db 13, PIDGEY - db 8, ABRA db 12, ABRA + db 16, 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 9c59549f..4150e49c 100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm @@ -1,28 +1,28 @@ Route25WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) - db 8, WEEDLE - db 9, KAKUNA + db 14, BEEDRILL + db 13, ODDISH 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 13, PARAS db 12, ABRA db 14, BELLSPROUT db 10, ABRA - db 7, KAKUNA - db 8, WEEDLE + db 10, SKIMPER + db 15, BUTTERFREE +ENDC +IF DEF(_BLUE) + db 14, BUTTERFREE + db 13, BELLSPROUT + db 13, PIDGEY + db 12, BELLSPROUT + db 13, PARAS + db 12, ABRA + db 14, ODDISH + db 10, ABRA + db 10, SKIMPER + db 15, BEEDRILL ENDC end_grass_wildmons diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index c4f1f536..d61fd1c1 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,25 +1,25 @@ Route4WildMons: def_grass_wildmons 20 ; encounter rate db 10, RATTATA - db 10, SPEAROW - db 8, RATTATA + db 10, RIBITTO + db 8, KONYA IF DEF(_RED) db 6, EKANS db 8, SPEAROW db 10, EKANS db 12, RATTATA - db 12, SPEAROW - db 8, EKANS - db 12, EKANS + db 12, PUDI + db 8, SANDSHREW + db 12, SANDSHREW ENDC IF DEF(_BLUE) db 6, SANDSHREW db 8, SPEAROW db 10, SANDSHREW db 12, RATTATA - db 12, SPEAROW - db 8, SANDSHREW - db 12, SANDSHREW + db 12, MIKON + db 8, EKANS + db 12, EKANS ENDC end_grass_wildmons diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index 3af2ebd9..e719f70b 100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -2,27 +2,27 @@ Route5WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 13, ODDISH - db 13, PIDGEY - db 15, PIDGEY + db 13, KOTORA + db 15, BETOBEBII db 10, MANKEY db 12, MANKEY - db 15, ODDISH - db 16, ODDISH - db 16, PIDGEY - db 14, MANKEY - db 16, MANKEY + db 15, BELLSPROUT + db 16, BELLSPROUT + db 16, PIDGEOTTO + db 14, MEOWTH + db 16, MEOWTH ENDC IF DEF(_BLUE) db 13, BELLSPROUT - db 13, PIDGEY - db 15, PIDGEY + db 13, KOTORA + db 15, BETOBEBII db 10, MEOWTH db 12, MEOWTH - db 15, BELLSPROUT - db 16, BELLSPROUT - db 16, PIDGEY - db 14, MEOWTH - db 16, MEOWTH + db 15, ODDISH + db 16, ODDISH + db 16, PIDGEOTTO + db 14, MANKEY + db 16, MANKEY ENDC end_grass_wildmons diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index 82a63569..8bf90a7c 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,27 +1,29 @@ ViridianForestWildMons: 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 - db 3, CATERPIE + db 6, WEEDLE + db 9, KAKUNA + db 6, WEEDLE + db 6, WEEDLE + db 5, MONJA + db 9, KAKUNA + db 9, METAPOD + db 6, CATERPIE + db 5, PIKACHU + db 10, BEEDRILL ENDC IF DEF(_BLUE) - db 4, CATERPIE - db 5, METAPOD - db 3, CATERPIE - db 5, CATERPIE - db 4, METAPOD - db 6, METAPOD - db 4, KAKUNA - db 3, WEEDLE -ENDC - db 3, PIKACHU + db 6, CATERPIE + db 9, METAPOD + db 6, CATERPIE + db 6, CATERPIE + db 5, MONJA + db 9, METAPOD + db 9, KAKUNA + db 6, WEEDLE db 5, PIKACHU + db 10, BUTTERFREE +ENDC 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..4e660f59 100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -41,61 +41,82 @@ SuperRodData: .Group1: db 2 - db 15, TENTACOOL - db 15, POLIWAG + db 10, MAGIKARP + db 5, GYOPIN .Group2: db 2 - db 15, GOLDEEN - db 15, POLIWAG + db 10, MAGIKARP + db 7, POLIWAG + db 10, GYOPIN .Group3: db 3 - db 15, PSYDUCK - db 15, GOLDEEN + db 15, SKIMPER + db 19, MAGIKARP db 15, KRABBY + db 15, BLOTTLE + db 15, CHEEP .Group4: db 2 - db 15, KRABBY - db 15, SHELLDER + db 20, KRABBY + db 20, SHELLDER + db 20, TENTACOOL + db 20, BLOTTLE + db 20, HORSEA .Group5: db 2 - db 23, POLIWHIRL - db 15, SLOWPOKE + db 25, POLIWHIRL + db 20, SLOWPOKE + db 20, SKIMPER + db 20, CHEEP .Group6: db 4 db 15, DRATINI - db 15, KRABBY - db 15, PSYDUCK - db 15, SLOWPOKE + db 28, KRABBY + db 25, CHEEP + db 25, POLIWHIRL + db 35, DRAGONAIR + db 32, BAWLIGUA .Group7: db 4 - db 5, TENTACOOL - db 15, KRABBY - db 15, GOLDEEN - db 15, MAGIKARP + db 40, TENTACRUEL + db 40, KINGLER + db 40, SEAKING + db 40, GYARADOS + db 40, PENDRAKEN + db 40, JABETTA .Group8: db 4 - db 15, STARYU - db 15, HORSEA - db 15, SHELLDER - db 15, GOLDEEN + db 40, STARYU + db 40, SEADRA + db 40, SHELLDER + db 40, PENDRAKEN .Group9: db 4 - db 23, SLOWBRO - db 23, SEAKING - db 23, KINGLER - db 23, SEADRA + db 50, GYARADOS + db 50, SEAKING + db 50, KINGLER + db 50, SEADRA + db 50, PENDRAKEN .Group10: db 4 - db 23, SEAKING - db 15, KRABBY - db 15, GOLDEEN - db 15, MAGIKARP + db 50, KINGLER + db 50, PENDRAKEN + db 50, SEAKING + db 100, MAGIKARP + db 50, SEADRA + db 50, STARYU + db 50, SHELLDER + db 50, SLOWBRO + db 50, GOLDUCK + db 50, JABETTA + db 50, POLIWHIRL + db 60, CRYITHAN