diff options
Diffstat (limited to 'data/wild')
60 files changed, 238 insertions, 118 deletions
diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 56ef25c4..1dd8e049 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -1,4 +1,5 @@ WildDataPointers: + table_width 2, WildDataPointers dw NoMons ; PALLET_TOWN dw NoMons ; VIRIDIAN_CITY dw NoMons ; PEWTER_CITY @@ -247,6 +248,7 @@ WildDataPointers: dw NoMons dw NoMons dw NoMons + assert_table_length NUM_MAPS dw -1 ; end ; wild pokemon data is divided into two parts. diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm index eb39c525..ae593741 100644 --- a/data/wild/maps/CeruleanCave1F.asm +++ b/data/wild/maps/CeruleanCave1F.asm @@ -1,5 +1,5 @@ DungeonMons1: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 46, GOLBAT db 46, HYPNO db 46, MAGNETON @@ -15,5 +15,7 @@ ENDC db 52, PARASECT db 53, RAICHU db 53, DITTO + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm index cbdb2eaf..f2648150 100644 --- a/data/wild/maps/CeruleanCave2F.asm +++ b/data/wild/maps/CeruleanCave2F.asm @@ -1,5 +1,5 @@ DungeonMons2: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 51, DODRIO db 51, VENOMOTH db 51, KADABRA @@ -10,5 +10,7 @@ DungeonMons2: db 54, WIGGLYTUFF db 55, DITTO db 60, DITTO + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm index 86e8fba2..10752548 100644 --- a/data/wild/maps/CeruleanCaveB1F.asm +++ b/data/wild/maps/CeruleanCaveB1F.asm @@ -1,5 +1,5 @@ DungeonMonsB1: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 55, RHYDON db 55, MAROWAK db 55, ELECTRODE @@ -15,5 +15,7 @@ ENDC db 65, DITTO db 63, DITTO db 67, DITTO + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index d1e73af4..e5ba5fa5 100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm @@ -1,5 +1,5 @@ CaveMons: - db 20 ; grass encounter rate + def_grass_wildmons 20 ; encounter rate db 18, DIGLETT db 19, DIGLETT db 17, DIGLETT @@ -10,5 +10,7 @@ CaveMons: db 22, DIGLETT db 29, DUGTRIO db 31, DUGTRIO + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index d8c9ba1b..6ecc8f35 100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -1,5 +1,5 @@ MoonMons1: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 8, ZUBAT db 7, ZUBAT db 9, ZUBAT @@ -10,5 +10,7 @@ MoonMons1: db 8, PARAS db 11, ZUBAT db 8, CLEFAIRY + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 875a7256..ab793cf9 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -1,5 +1,5 @@ MoonMonsB1: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 8, ZUBAT db 7, ZUBAT db 7, GEODUDE @@ -10,5 +10,7 @@ MoonMonsB1: db 11, ZUBAT db 9, CLEFAIRY db 9, GEODUDE + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index ae90ed1e..119b414e 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -1,5 +1,5 @@ MoonMonsB2: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 9, ZUBAT db 9, GEODUDE db 10, ZUBAT @@ -10,5 +10,7 @@ MoonMonsB2: db 10, CLEFAIRY db 12, ZUBAT db 12, CLEFAIRY + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index 3be7fb18..d67ceb07 100644 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm @@ -1,5 +1,5 @@ MansionMons1: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 32, KOFFING db 30, KOFFING @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 37, MUK db 39, WEEZING ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 494973b2..01a48f1c 100644 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm @@ -1,5 +1,5 @@ MansionMons2: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 32, GROWLITHE db 34, KOFFING @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 39, MUK db 37, WEEZING ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index bbb14213..28c3bf88 100644 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm @@ -1,5 +1,5 @@ MansionMons3: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 31, KOFFING db 33, GROWLITHE @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 36, PONYTA db 42, WEEZING ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 77f989b2..2d0312af 100644 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -1,5 +1,5 @@ MansionMonsB1: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 33, KOFFING db 31, KOFFING @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 38, MAGMAR db 42, WEEZING ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm index 95bef4a3..5e061298 100644 --- a/data/wild/maps/PokemonTower1F.asm +++ b/data/wild/maps/PokemonTower1F.asm @@ -1,4 +1,6 @@ TowerMons1: - db 0 ; grass encounter rate + def_grass_wildmons 0 ; encounter rate + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm index 77b7d415..39794a20 100644 --- a/data/wild/maps/PokemonTower2F.asm +++ b/data/wild/maps/PokemonTower2F.asm @@ -1,4 +1,6 @@ TowerMons2: - db 0 ; grass encounter rate + def_grass_wildmons 0 ; encounter rate + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index 177497e9..ef52127d 100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm @@ -1,5 +1,5 @@ TowerMons3: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY db 22, GASTLY @@ -10,5 +10,7 @@ TowerMons3: db 20, CUBONE db 22, CUBONE db 25, HAUNTER + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index b6e82d14..da578f90 100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm @@ -1,5 +1,5 @@ TowerMons4: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY db 22, GASTLY @@ -10,5 +10,7 @@ TowerMons4: db 20, CUBONE db 22, CUBONE db 24, GASTLY + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 03c41eba..cbfc5b7b 100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm @@ -1,5 +1,5 @@ TowerMons5: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY db 22, GASTLY @@ -10,5 +10,7 @@ TowerMons5: db 20, CUBONE db 22, CUBONE db 24, GASTLY + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index 38898de1..c8596bbd 100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm @@ -1,5 +1,5 @@ TowerMons6: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 21, GASTLY db 22, GASTLY db 23, GASTLY @@ -10,5 +10,7 @@ TowerMons6: db 22, CUBONE db 24, CUBONE db 28, HAUNTER + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index b2faa100..85289ad1 100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm @@ -1,5 +1,5 @@ TowerMons7: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 21, GASTLY db 22, GASTLY db 23, GASTLY @@ -10,5 +10,7 @@ TowerMons7: db 24, CUBONE db 28, HAUNTER db 30, HAUNTER + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index f70dfbcb..9950a866 100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,5 +1,5 @@ PowerPlantMons: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 21, VOLTORB db 21, MAGNEMITE db 20, PIKACHU @@ -16,5 +16,7 @@ IF DEF(_BLUE) db 33, RAICHU db 36, RAICHU ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 42a6d58b..0b6b07bd 100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -1,5 +1,5 @@ TunnelMonsB1: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 16, ZUBAT db 17, ZUBAT db 17, GEODUDE @@ -10,5 +10,7 @@ TunnelMonsB1: db 17, MACHOP db 13, ONIX db 15, ONIX + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 2f970332..f4dad48d 100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -1,5 +1,5 @@ TunnelMonsB2: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 16, ZUBAT db 17, ZUBAT db 17, GEODUDE @@ -10,5 +10,7 @@ TunnelMonsB2: db 17, ONIX db 13, ONIX db 18, GEODUDE + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index e75ded3b..481650a8 100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -1,5 +1,5 @@ Route1Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 3, PIDGEY db 3, RATTATA db 3, RATTATA @@ -10,5 +10,7 @@ Route1Mons: db 4, RATTATA db 4, PIDGEY db 5, PIDGEY + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index 603dc389..5e5a0a95 100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -1,5 +1,5 @@ Route10Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 16, VOLTORB db 16, SPEAROW db 14, VOLTORB @@ -21,5 +21,7 @@ IF DEF(_BLUE) db 13, SANDSHREW db 17, SANDSHREW ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index ea053c07..853daebf 100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm @@ -1,5 +1,5 @@ Route11Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 14, EKANS db 15, SPEAROW @@ -21,5 +21,7 @@ ENDC db 17, SPEAROW db 11, DROWZEE db 15, DROWZEE + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index acdfe6b6..f4c7911c 100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -1,5 +1,5 @@ Route12Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH db 25, PIDGEY @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 28, WEEPINBELL db 30, WEEPINBELL ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index 4d0c0a46..1af1b533 100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -1,5 +1,5 @@ Route13Mons: - db 20 ; grass encounter rate + def_grass_wildmons 20 ; encounter rate IF DEF(_RED) db 24, ODDISH db 25, PIDGEY @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 28, WEEPINBELL db 30, WEEPINBELL ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index a91631a8..839834ce 100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm @@ -1,5 +1,5 @@ Route14Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH db 26, PIDGEY @@ -22,5 +22,7 @@ IF DEF(_BLUE) ENDC db 28, PIDGEOTTO db 30, PIDGEOTTO + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 13bd7f32..7c2a23a5 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -1,5 +1,5 @@ Route15Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH db 26, DITTO @@ -22,5 +22,7 @@ IF DEF(_BLUE) ENDC db 28, PIDGEOTTO db 30, PIDGEOTTO + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index ecab87c1..d9556d72 100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm @@ -1,5 +1,5 @@ Route16Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, SPEAROW db 18, RATTATA @@ -10,5 +10,7 @@ Route16Mons: db 22, RATTATA db 23, RATICATE db 25, RATICATE + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index 762b5449..a7a0acc3 100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm @@ -1,5 +1,5 @@ Route17Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, SPEAROW db 25, RATICATE @@ -10,5 +10,7 @@ Route17Mons: db 29, RATICATE db 25, FEAROW db 27, FEAROW + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index d8123c5e..66c203cf 100644 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm @@ -1,5 +1,5 @@ Route18Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, SPEAROW db 25, RATICATE @@ -10,5 +10,7 @@ Route18Mons: db 29, RATICATE db 27, FEAROW db 29, FEAROW + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 035e5b28..7696f5af 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -1,5 +1,5 @@ Route2Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 3, RATTATA db 3, PIDGEY db 4, PIDGEY @@ -19,5 +19,7 @@ IF DEF(_BLUE) db 4, CATERPIE db 5, CATERPIE ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index 13ffe445..d1ed0288 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -1,5 +1,5 @@ Route21Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 21, RATTATA db 23, PIDGEY db 30, RATICATE @@ -10,8 +10,9 @@ Route21Mons: db 28, TANGELA db 30, TANGELA db 32, TANGELA + end_grass_wildmons - db 5 ; water encounter rate + def_water_wildmons 5 ; encounter rate db 5, TENTACOOL db 10, TENTACOOL db 15, TENTACOOL @@ -22,3 +23,4 @@ Route21Mons: db 30, TENTACOOL db 35, TENTACOOL db 40, TENTACOOL + end_water_wildmons diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index c8f72608..387130f7 100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -1,5 +1,5 @@ Route22Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate db 3, RATTATA IF DEF(_RED) db 3, NIDORAN_M @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 3, NIDORAN_M db 4, NIDORAN_M ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index 77f019a3..36620813 100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm @@ -1,5 +1,5 @@ Route23Mons: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 26, EKANS ENDC @@ -20,5 +20,7 @@ ENDC db 43, DITTO db 41, FEAROW db 43, FEAROW + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 8ba7d232..63633831 100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm @@ -1,5 +1,5 @@ Route24Mons: - db 25 ; grass encounter rate + def_grass_wildmons 25 ; encounter rate IF DEF(_RED) db 7, WEEDLE db 8, KAKUNA @@ -21,5 +21,7 @@ ENDC db 13, PIDGEY db 8, ABRA db 12, ABRA + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index 7e0ded65..944e28a8 100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm @@ -1,5 +1,5 @@ Route25Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 8, WEEDLE db 9, KAKUNA @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 7, KAKUNA db 8, WEEDLE ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index b397b1d1..ebb9e4b4 100644 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm @@ -1,5 +1,5 @@ Route3Mons: - db 20 ; grass encounter rate + def_grass_wildmons 20 ; encounter rate db 6, PIDGEY db 5, SPEAROW db 7, PIDGEY @@ -10,5 +10,7 @@ Route3Mons: db 3, JIGGLYPUFF db 5, JIGGLYPUFF db 7, JIGGLYPUFF + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index d4f4763b..4f94a21a 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,5 +1,5 @@ Route4Mons: - db 20 ; grass encounter rate + def_grass_wildmons 20 ; encounter rate db 10, RATTATA db 10, SPEAROW db 8, RATTATA @@ -21,4 +21,7 @@ IF DEF(_BLUE) db 8, SANDSHREW db 12, SANDSHREW ENDC - db 0 ; water encounter rate + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index dd200378..6414eefe 100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -1,5 +1,5 @@ Route5Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 13, ODDISH db 13, PIDGEY @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 14, MEOWTH db 16, MEOWTH ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 15585ea4..5c843ec9 100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -1,5 +1,5 @@ Route6Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 13, ODDISH db 13, PIDGEY @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 14, MEOWTH db 16, MEOWTH ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index 39508bf0..c0bf1193 100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm @@ -1,5 +1,5 @@ Route7Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 19, PIDGEY IF DEF(_RED) db 19, ODDISH @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 19, MEOWTH db 20, MEOWTH ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 005ee677..8d2771af 100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm @@ -1,5 +1,5 @@ Route8Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 18, PIDGEY IF DEF(_RED) db 18, MANKEY @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 15, VULPIX db 18, VULPIX ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index a38fc35f..6a1cdca5 100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm @@ -1,5 +1,5 @@ Route9Mons: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 16, RATTATA db 16, SPEAROW db 14, RATTATA @@ -21,5 +21,7 @@ IF DEF(_BLUE) db 13, SANDSHREW db 17, SANDSHREW ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 4661b927..72be93e0 100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm @@ -1,5 +1,5 @@ ZoneMonsCenter: - db 30 ; grass encounter rate + def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 22, NIDORAN_M db 25, RHYHORN @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 23, PINSIR ENDC db 23, CHANSEY + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index 9910bf12..ea7cbc22 100644 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm @@ -1,5 +1,5 @@ ZoneMons1: - db 30 ; grass encounter rate + def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 24, NIDORAN_M db 26, DODUO @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 25, KANGASKHAN db 28, PINSIR ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 4482571b..864124c3 100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm @@ -1,5 +1,5 @@ ZoneMons2: - db 30 ; grass encounter rate + def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 22, NIDORAN_M db 26, RHYHORN @@ -21,5 +21,7 @@ ENDC db 32, VENOMOTH db 26, CHANSEY db 28, TAUROS + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index c9989cc9..fb8962da 100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -1,5 +1,5 @@ ZoneMons3: - db 30 ; grass encounter rate + def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 25, NIDORAN_M db 26, DODUO @@ -21,5 +21,7 @@ ENDC db 31, VENOMOTH db 26, TAUROS db 28, KANGASKHAN + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm index 72ea781d..27793b10 100644 --- a/data/wild/maps/SeaRoutes.asm +++ b/data/wild/maps/SeaRoutes.asm @@ -1,7 +1,8 @@ WaterMons: - db 0 ; grass encounter rate + def_grass_wildmons 0 ; encounter rate + end_grass_wildmons - db 5 ; water encounter rate + def_water_wildmons 5 ; encounter rate db 5, TENTACOOL db 10, TENTACOOL db 15, TENTACOOL diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index b191de13..67c87ce2 100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -1,5 +1,5 @@ IslandMons1: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 30, SEEL IF DEF(_RED) db 30, SLOWPOKE @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 28, STARYU db 38, SLOWBRO ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index 79762821..b2f0f699 100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -1,5 +1,5 @@ IslandMonsB1: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 30, STARYU db 30, HORSEA @@ -24,5 +24,7 @@ IF DEF(_BLUE) db 38, DEWGONG db 37, KINGLER ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index e68d71cc..4237fcd1 100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -1,5 +1,5 @@ IslandMonsB2: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 30, SEEL IF DEF(_RED) db 30, SLOWPOKE @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 30, GOLBAT db 37, GOLDUCK ENDC + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 35319df9..3d29664f 100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -1,5 +1,5 @@ IslandMonsB3: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 31, SLOWPOKE db 31, SEEL @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 39, KINGLER ENDC db 37, DEWGONG + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index c5e3766b..9bc08333 100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -1,5 +1,5 @@ IslandMonsB4: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 31, HORSEA db 31, SHELLDER @@ -23,5 +23,7 @@ IF DEF(_BLUE) db 39, GOLDUCK ENDC db 32, GOLBAT + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 71adde2e..162fef86 100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm @@ -1,5 +1,5 @@ PlateauMons1: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 24, MACHOP db 26, GEODUDE db 22, ZUBAT @@ -10,5 +10,7 @@ PlateauMons1: db 41, GOLBAT db 42, MACHOKE db 43, MAROWAK + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index ee660e3a..4cb9e8da 100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm @@ -1,5 +1,5 @@ PlateauMons2: - db 10 ; grass encounter rate + def_grass_wildmons 10 ; encounter rate db 22, MACHOP db 24, GEODUDE db 26, ZUBAT @@ -10,5 +10,7 @@ PlateauMons2: db 40, GOLBAT db 40, MAROWAK db 43, GRAVELER + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index 754557bf..c525839c 100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -1,5 +1,5 @@ PlateauMons3: - db 15 ; grass encounter rate + def_grass_wildmons 15 ; encounter rate db 24, MACHOP db 26, GEODUDE db 22, ZUBAT @@ -10,5 +10,7 @@ PlateauMons3: db 41, GOLBAT db 42, MACHOKE db 45, MACHOKE + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index d11fc34e..71319e71 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,5 +1,5 @@ ForestMons: - db 8 ; grass encounter rate + def_grass_wildmons 8 ; encounter rate IF DEF(_RED) db 4, WEEDLE db 5, KAKUNA @@ -22,5 +22,7 @@ IF DEF(_BLUE) ENDC db 3, PIKACHU db 5, PIKACHU + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm index 19570b50..1ccba991 100644 --- a/data/wild/maps/nothing.asm +++ b/data/wild/maps/nothing.asm @@ -1,4 +1,6 @@ NoMons: - db 0 ; grass encounter rate + def_grass_wildmons 0 ; encounter rate + end_grass_wildmons - db 0 ; water encounter rate + def_water_wildmons 0 ; encounter rate + end_water_wildmons |