diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index 2567e9fcf..3172d0a57 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -2,7 +2,7 @@ JohtoGrassWildMons: - map_id SPROUT_TOWER_2F + def_grass_wildmons SPROUT_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 3, RATTATA @@ -28,8 +28,9 @@ JohtoGrassWildMons: db 6, GASTLY db 5, RATTATA db 5, RATTATA + end_grass_wildmons - map_id SPROUT_TOWER_3F + def_grass_wildmons SPROUT_TOWER_3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 3, RATTATA @@ -55,8 +56,9 @@ JohtoGrassWildMons: db 6, GASTLY db 5, RATTATA db 5, RATTATA + end_grass_wildmons - map_id TIN_TOWER_2F + def_grass_wildmons TIN_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -82,8 +84,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_3F + def_grass_wildmons TIN_TOWER_3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -109,8 +112,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_4F + def_grass_wildmons TIN_TOWER_4F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -136,8 +140,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_5F + def_grass_wildmons TIN_TOWER_5F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -163,8 +168,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_6F + def_grass_wildmons TIN_TOWER_6F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -190,8 +196,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_7F + def_grass_wildmons TIN_TOWER_7F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -217,8 +224,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_8F + def_grass_wildmons TIN_TOWER_8F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -244,8 +252,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id TIN_TOWER_9F + def_grass_wildmons TIN_TOWER_9F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -271,8 +280,9 @@ JohtoGrassWildMons: db 23, RATTATA db 24, RATTATA db 24, RATTATA + end_grass_wildmons - map_id BURNED_TOWER_1F + def_grass_wildmons BURNED_TOWER_1F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 13, RATTATA @@ -298,8 +308,9 @@ JohtoGrassWildMons: db 15, RATTATA db 15, RATICATE db 15, RATICATE + end_grass_wildmons - map_id BURNED_TOWER_B1F + def_grass_wildmons BURNED_TOWER_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 14, RATTATA @@ -325,8 +336,9 @@ JohtoGrassWildMons: db 12, KOFFING db 16, KOFFING db 16, WEEZING + end_grass_wildmons - map_id NATIONAL_PARK + def_grass_wildmons NATIONAL_PARK db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 12, NIDORAN_M @@ -352,8 +364,9 @@ JohtoGrassWildMons: db 10, VENONAT db 12, VENONAT db 12, VENONAT + end_grass_wildmons - map_id RUINS_OF_ALPH_OUTSIDE + def_grass_wildmons RUINS_OF_ALPH_OUTSIDE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 20, NATU @@ -379,8 +392,9 @@ JohtoGrassWildMons: db 22, WOOPER db 22, QUAGSIRE db 22, QUAGSIRE + end_grass_wildmons - map_id RUINS_OF_ALPH_INNER_CHAMBER + def_grass_wildmons RUINS_OF_ALPH_INNER_CHAMBER db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 5, UNOWN @@ -406,8 +420,9 @@ JohtoGrassWildMons: db 5, UNOWN db 5, UNOWN db 5, UNOWN + end_grass_wildmons - map_id UNION_CAVE_1F + def_grass_wildmons UNION_CAVE_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 6, GEODUDE @@ -433,8 +448,9 @@ JohtoGrassWildMons: db 7, ZUBAT db 6, ONIX db 6, ONIX + end_grass_wildmons - map_id UNION_CAVE_B1F + def_grass_wildmons UNION_CAVE_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 8, GEODUDE @@ -460,8 +476,9 @@ JohtoGrassWildMons: db 6, RATTATA db 8, RATTATA db 8, RATTATA + end_grass_wildmons - map_id UNION_CAVE_B2F + def_grass_wildmons UNION_CAVE_B2F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 22, ZUBAT @@ -487,8 +504,9 @@ JohtoGrassWildMons: db 20, GEODUDE db 23, ONIX db 23, ONIX + end_grass_wildmons - map_id SLOWPOKE_WELL_B1F + def_grass_wildmons SLOWPOKE_WELL_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 5, ZUBAT @@ -514,8 +532,9 @@ JohtoGrassWildMons: db 8, ZUBAT db 8, SLOWPOKE db 8, SLOWPOKE + end_grass_wildmons - map_id SLOWPOKE_WELL_B2F + def_grass_wildmons SLOWPOKE_WELL_B2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 21, ZUBAT @@ -541,8 +560,9 @@ JohtoGrassWildMons: db 23, GOLBAT db 23, SLOWPOKE db 23, SLOWPOKE + end_grass_wildmons - map_id ILEX_FOREST + def_grass_wildmons ILEX_FOREST db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 5, CATERPIE @@ -568,8 +588,9 @@ JohtoGrassWildMons: db 7, HOOTHOOT db 6, PARAS db 6, PARAS + end_grass_wildmons - map_id MOUNT_MORTAR_1F_OUTSIDE + def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 14, RATTATA @@ -595,8 +616,9 @@ JohtoGrassWildMons: db 14, GEODUDE db 16, RATICATE db 16, RATICATE + end_grass_wildmons - map_id MOUNT_MORTAR_1F_INSIDE + def_grass_wildmons MOUNT_MORTAR_1F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 13, GEODUDE @@ -622,8 +644,9 @@ JohtoGrassWildMons: db 15, MARILL db 15, GOLBAT db 15, GOLBAT + end_grass_wildmons - map_id MOUNT_MORTAR_2F_INSIDE + def_grass_wildmons MOUNT_MORTAR_2F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 31, GRAVELER @@ -649,8 +672,9 @@ JohtoGrassWildMons: db 28, MARILL db 32, GOLBAT db 32, GOLBAT + end_grass_wildmons - map_id MOUNT_MORTAR_B1F + def_grass_wildmons MOUNT_MORTAR_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 15, ZUBAT @@ -676,8 +700,9 @@ JohtoGrassWildMons: db 16, GEODUDE db 18, RATICATE db 18, RATICATE + end_grass_wildmons - map_id ICE_PATH_1F + def_grass_wildmons ICE_PATH_1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 21, SWINUB @@ -703,8 +728,9 @@ JohtoGrassWildMons: db 24, GOLBAT db 22, GOLBAT db 22, GOLBAT + end_grass_wildmons - map_id ICE_PATH_B1F + def_grass_wildmons ICE_PATH_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 22, SWINUB @@ -730,8 +756,9 @@ JohtoGrassWildMons: db 25, GOLBAT db 23, GOLBAT db 22, SNEASEL + end_grass_wildmons - map_id ICE_PATH_B2F_MAHOGANY_SIDE + def_grass_wildmons ICE_PATH_B2F_MAHOGANY_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 23, SWINUB @@ -757,8 +784,9 @@ JohtoGrassWildMons: db 26, GOLBAT db 22, SNEASEL db 24, SNEASEL + end_grass_wildmons - map_id ICE_PATH_B2F_BLACKTHORN_SIDE + def_grass_wildmons ICE_PATH_B2F_BLACKTHORN_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 23, SWINUB @@ -784,8 +812,9 @@ JohtoGrassWildMons: db 26, GOLBAT db 22, SNEASEL db 24, SNEASEL + end_grass_wildmons - map_id ICE_PATH_B3F + def_grass_wildmons ICE_PATH_B3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 24, SWINUB @@ -811,8 +840,9 @@ JohtoGrassWildMons: db 22, SNEASEL db 24, SNEASEL db 26, SNEASEL + end_grass_wildmons - map_id WHIRL_ISLAND_NW + def_grass_wildmons WHIRL_ISLAND_NW db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -838,8 +868,9 @@ JohtoGrassWildMons: db 25, GOLBAT db 24, GOLBAT db 24, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_NE + def_grass_wildmons WHIRL_ISLAND_NE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -865,8 +896,9 @@ JohtoGrassWildMons: db 25, GOLBAT db 24, GOLBAT db 24, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_SW + def_grass_wildmons WHIRL_ISLAND_SW db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -892,8 +924,9 @@ JohtoGrassWildMons: db 25, GOLBAT db 24, GOLBAT db 24, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_CAVE + def_grass_wildmons WHIRL_ISLAND_CAVE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -919,8 +952,9 @@ JohtoGrassWildMons: db 25, GOLBAT db 24, GOLBAT db 24, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_SE + def_grass_wildmons WHIRL_ISLAND_SE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -946,8 +980,9 @@ JohtoGrassWildMons: db 25, GOLBAT db 24, GOLBAT db 24, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_B1F + def_grass_wildmons WHIRL_ISLAND_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 23, KRABBY @@ -973,8 +1008,9 @@ JohtoGrassWildMons: db 26, GOLBAT db 25, GOLBAT db 25, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_B2F + def_grass_wildmons WHIRL_ISLAND_B2F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 24, KRABBY @@ -1000,8 +1036,9 @@ JohtoGrassWildMons: db 27, GOLBAT db 26, GOLBAT db 26, GOLBAT + end_grass_wildmons - map_id WHIRL_ISLAND_LUGIA_CHAMBER + def_grass_wildmons WHIRL_ISLAND_LUGIA_CHAMBER db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 25, KRABBY @@ -1027,8 +1064,9 @@ JohtoGrassWildMons: db 28, GOLBAT db 27, GOLBAT db 27, GOLBAT + end_grass_wildmons - map_id SILVER_CAVE_ROOM_1 + def_grass_wildmons SILVER_CAVE_ROOM_1 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 43, GRAVELER @@ -1054,8 +1092,9 @@ JohtoGrassWildMons: db 45, GOLDUCK db 46, GOLBAT db 46, GOLBAT + end_grass_wildmons - map_id SILVER_CAVE_ROOM_2 + def_grass_wildmons SILVER_CAVE_ROOM_2 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 48, GOLBAT @@ -1081,8 +1120,9 @@ JohtoGrassWildMons: db 48, PARASECT db 45, MISDREAVUS db 45, MISDREAVUS + end_grass_wildmons - map_id SILVER_CAVE_ROOM_3 + def_grass_wildmons SILVER_CAVE_ROOM_3 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 51, GOLBAT @@ -1108,8 +1148,9 @@ JohtoGrassWildMons: db 45, GOLDUCK db 53, GOLBAT db 53, GOLBAT + end_grass_wildmons - map_id SILVER_CAVE_ITEM_ROOMS + def_grass_wildmons SILVER_CAVE_ITEM_ROOMS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 48, GOLBAT @@ -1135,8 +1176,9 @@ JohtoGrassWildMons: db 48, PARASECT db 50, PARASECT db 52, PARASECT + end_grass_wildmons - map_id DARK_CAVE_VIOLET_ENTRANCE + def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 3, GEODUDE @@ -1162,8 +1204,9 @@ JohtoGrassWildMons: db 2, ZUBAT db 4, ZUBAT db 4, DUNSPARCE + end_grass_wildmons - map_id DARK_CAVE_BLACKTHORN_ENTRANCE + def_grass_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 23, GEODUDE @@ -1189,8 +1232,9 @@ JohtoGrassWildMons: db 25, WOBBUFFET db 23, GOLBAT db 23, GOLBAT + end_grass_wildmons - map_id ROUTE_29 + def_grass_wildmons ROUTE_29 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 2, PIDGEY @@ -1216,8 +1260,9 @@ JohtoGrassWildMons: db 2, RATTATA db 3, HOOTHOOT db 3, HOOTHOOT + end_grass_wildmons - map_id ROUTE_30 + def_grass_wildmons ROUTE_30 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 3, LEDYBA @@ -1243,8 +1288,9 @@ JohtoGrassWildMons: db 3, ZUBAT db 4, HOOTHOOT db 4, HOOTHOOT + end_grass_wildmons - map_id ROUTE_31 + def_grass_wildmons ROUTE_31 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 4, LEDYBA @@ -1270,8 +1316,9 @@ JohtoGrassWildMons: db 4, ZUBAT db 5, GASTLY db 5, GASTLY + end_grass_wildmons - map_id ROUTE_32 + def_grass_wildmons ROUTE_32 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 4, EKANS @@ -1297,8 +1344,9 @@ JohtoGrassWildMons: db 7, HOOTHOOT db 7, GASTLY db 7, GASTLY + end_grass_wildmons - map_id ROUTE_33 + def_grass_wildmons ROUTE_33 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 6, RATTATA @@ -1324,8 +1372,9 @@ JohtoGrassWildMons: db 7, RATTATA db 7, RATTATA db 7, RATTATA + end_grass_wildmons - map_id ROUTE_34 + def_grass_wildmons ROUTE_34 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 10, SNUBBULL @@ -1351,8 +1400,9 @@ JohtoGrassWildMons: db 12, JIGGLYPUFF db 10, DITTO db 10, DITTO + end_grass_wildmons - map_id ROUTE_35 + def_grass_wildmons ROUTE_35 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 12, SNUBBULL @@ -1378,8 +1428,9 @@ JohtoGrassWildMons: db 12, JIGGLYPUFF db 10, DITTO db 12, YANMA + end_grass_wildmons - map_id ROUTE_36 + def_grass_wildmons ROUTE_36 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 4, LEDYBA @@ -1405,8 +1456,9 @@ JohtoGrassWildMons: db 5, HOOTHOOT db 5, GASTLY db 5, GASTLY + end_grass_wildmons - map_id ROUTE_37 + def_grass_wildmons ROUTE_37 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, LEDYBA @@ -1432,8 +1484,9 @@ JohtoGrassWildMons: db 15, NOCTOWL db 15, ARIADOS db 15, ARIADOS + end_grass_wildmons - map_id ROUTE_38 + def_grass_wildmons ROUTE_38 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 16, RATTATA @@ -1459,8 +1512,9 @@ JohtoGrassWildMons: db 16, MEOWTH db 16, MEOWTH db 16, MEOWTH + end_grass_wildmons - map_id ROUTE_39 + def_grass_wildmons ROUTE_39 db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 16, RATTATA @@ -1486,8 +1540,9 @@ JohtoGrassWildMons: db 18, MEOWTH db 18, MEOWTH db 18, MEOWTH + end_grass_wildmons - map_id ROUTE_42 + def_grass_wildmons ROUTE_42 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, EKANS @@ -1513,8 +1568,9 @@ JohtoGrassWildMons: db 15, MARILL db 16, GOLBAT db 16, GOLBAT + end_grass_wildmons - map_id ROUTE_43 + def_grass_wildmons ROUTE_43 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 15, SENTRET @@ -1540,8 +1596,9 @@ JohtoGrassWildMons: db 17, RATICATE db 17, VENOMOTH db 17, VENOMOTH + end_grass_wildmons - map_id ROUTE_44 + def_grass_wildmons ROUTE_44 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, TANGELA @@ -1567,8 +1624,9 @@ JohtoGrassWildMons: db 24, POLIWHIRL db 26, POLIWHIRL db 26, POLIWHIRL + end_grass_wildmons - map_id ROUTE_45 + def_grass_wildmons ROUTE_45 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, GEODUDE @@ -1594,8 +1652,9 @@ JohtoGrassWildMons: db 27, GRAVELER db 27, GRAVELER db 27, GRAVELER + end_grass_wildmons - map_id ROUTE_46 + def_grass_wildmons ROUTE_46 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 2, GEODUDE @@ -1621,8 +1680,9 @@ JohtoGrassWildMons: db 2, RATTATA db 2, RATTATA db 2, RATTATA + end_grass_wildmons - map_id SILVER_CAVE_OUTSIDE + def_grass_wildmons SILVER_CAVE_OUTSIDE db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 41, TANGELA @@ -1648,5 +1708,6 @@ JohtoGrassWildMons: db 40, GOLBAT db 44, GOLBAT db 44, GOLBAT + end_grass_wildmons db -1 ; end diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 83e33b2d5..7d6fe2cfb 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -2,232 +2,270 @@ JohtoWaterWildMons: - map_id RUINS_OF_ALPH_OUTSIDE + def_water_wildmons RUINS_OF_ALPH_OUTSIDE db 2 percent ; encounter rate db 15, WOOPER db 20, QUAGSIRE db 15, QUAGSIRE + end_water_wildmons - map_id UNION_CAVE_1F + def_water_wildmons UNION_CAVE_1F db 2 percent ; encounter rate db 15, WOOPER db 20, QUAGSIRE db 15, QUAGSIRE + end_water_wildmons - map_id UNION_CAVE_B1F + def_water_wildmons UNION_CAVE_B1F db 2 percent ; encounter rate db 15, WOOPER db 20, QUAGSIRE db 15, QUAGSIRE + end_water_wildmons - map_id UNION_CAVE_B2F + def_water_wildmons UNION_CAVE_B2F db 4 percent ; encounter rate db 15, TENTACOOL db 20, QUAGSIRE db 20, TENTACRUEL + end_water_wildmons - map_id SLOWPOKE_WELL_B1F + def_water_wildmons SLOWPOKE_WELL_B1F db 2 percent ; encounter rate db 15, SLOWPOKE db 20, SLOWPOKE db 10, SLOWPOKE + end_water_wildmons - map_id SLOWPOKE_WELL_B2F + def_water_wildmons SLOWPOKE_WELL_B2F db 2 percent ; encounter rate db 15, SLOWPOKE db 20, SLOWPOKE db 20, SLOWBRO + end_water_wildmons - map_id ILEX_FOREST + def_water_wildmons ILEX_FOREST db 2 percent ; encounter rate db 15, PSYDUCK db 10, PSYDUCK db 15, GOLDUCK + end_water_wildmons - map_id MOUNT_MORTAR_1F_OUTSIDE + def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE db 4 percent ; encounter rate db 15, GOLDEEN db 20, MARILL db 20, SEAKING + end_water_wildmons - map_id MOUNT_MORTAR_2F_INSIDE + def_water_wildmons MOUNT_MORTAR_2F_INSIDE db 2 percent ; encounter rate db 20, GOLDEEN db 25, MARILL db 25, SEAKING + end_water_wildmons - map_id MOUNT_MORTAR_B1F + def_water_wildmons MOUNT_MORTAR_B1F db 2 percent ; encounter rate db 15, GOLDEEN db 20, MARILL db 20, SEAKING + end_water_wildmons - map_id WHIRL_ISLAND_SW + def_water_wildmons WHIRL_ISLAND_SW db 4 percent ; encounter rate db 20, TENTACOOL db 15, HORSEA db 20, TENTACRUEL + end_water_wildmons - map_id WHIRL_ISLAND_B2F + def_water_wildmons WHIRL_ISLAND_B2F db 4 percent ; encounter rate db 15, HORSEA db 20, HORSEA db 20, TENTACRUEL + end_water_wildmons - map_id WHIRL_ISLAND_LUGIA_CHAMBER + def_water_wildmons WHIRL_ISLAND_LUGIA_CHAMBER db 4 percent ; encounter rate db 20, HORSEA db 20, TENTACRUEL db 20, SEADRA + end_water_wildmons - map_id SILVER_CAVE_ROOM_2 + def_water_wildmons SILVER_CAVE_ROOM_2 db 2 percent ; encounter rate db 35, SEAKING db 35, GOLDUCK db 35, GOLDEEN + end_water_wildmons - map_id DARK_CAVE_VIOLET_ENTRANCE + def_water_wildmons DARK_CAVE_VIOLET_ENTRANCE db 2 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 5, MAGIKARP + end_water_wildmons - map_id DARK_CAVE_BLACKTHORN_ENTRANCE + def_water_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE db 2 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 5, MAGIKARP + end_water_wildmons - map_id DRAGONS_DEN_B1F + def_water_wildmons DRAGONS_DEN_B1F db 4 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 10, DRATINI + end_water_wildmons - map_id OLIVINE_PORT + def_water_wildmons OLIVINE_PORT db 2 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id ROUTE_30 + def_water_wildmons ROUTE_30 db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL + end_water_wildmons - map_id ROUTE_31 + def_water_wildmons ROUTE_31 db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL + end_water_wildmons - map_id ROUTE_32 + def_water_wildmons ROUTE_32 db 6 percent ; encounter rate db 15, TENTACOOL db 20, QUAGSIRE db 20, TENTACRUEL + end_water_wildmons - map_id ROUTE_34 + def_water_wildmons ROUTE_34 db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id ROUTE_35 + def_water_wildmons ROUTE_35 db 4 percent ; encounter rate db 20, PSYDUCK db 15, PSYDUCK db 20, GOLDUCK + end_water_wildmons - map_id ROUTE_40 + def_water_wildmons ROUTE_40 db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id ROUTE_41 + def_water_wildmons ROUTE_41 db 6 percent ; encounter rate db 20, TENTACOOL db 20, TENTACRUEL db 20, MANTINE + end_water_wildmons - map_id ROUTE_42 + def_water_wildmons ROUTE_42 db 4 percent ; encounter rate db 20, GOLDEEN db 15, GOLDEEN db 20, SEAKING + end_water_wildmons - map_id ROUTE_43 + def_water_wildmons ROUTE_43 db 2 percent ; encounter rate db 20, MAGIKARP db 15, MAGIKARP db 10, MAGIKARP + end_water_wildmons - map_id ROUTE_44 + def_water_wildmons ROUTE_44 db 2 percent ; encounter rate db 25, POLIWAG db 20, POLIWAG db 25, POLIWHIRL + end_water_wildmons - map_id ROUTE_45 + def_water_wildmons ROUTE_45 db 2 percent ; encounter rate db 20, MAGIKARP db 15, MAGIKARP db 5, MAGIKARP + end_water_wildmons - map_id NEW_BARK_TOWN + def_water_wildmons NEW_BARK_TOWN db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id CHERRYGROVE_CITY + def_water_wildmons CHERRYGROVE_CITY db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id VIOLET_CITY + def_water_wildmons VIOLET_CITY db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL + end_water_wildmons - map_id CIANWOOD_CITY + def_water_wildmons CIANWOOD_CITY db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id OLIVINE_CITY + def_water_wildmons OLIVINE_CITY db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id ECRUTEAK_CITY + def_water_wildmons ECRUTEAK_CITY db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL + end_water_wildmons - map_id LAKE_OF_RAGE + def_water_wildmons LAKE_OF_RAGE db 6 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 15, GYARADOS + end_water_wildmons - map_id BLACKTHORN_CITY + def_water_wildmons BLACKTHORN_CITY db 4 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 5, MAGIKARP + end_water_wildmons - map_id SILVER_CAVE_OUTSIDE + def_water_wildmons SILVER_CAVE_OUTSIDE db 2 percent ; encounter rate db 35, POLIWHIRL db 40, POLIWHIRL db 35, POLIWAG + end_water_wildmons db -1 ; end diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index ff1720972..27e93c847 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -2,7 +2,7 @@ KantoGrassWildMons: - map_id DIGLETTS_CAVE + def_grass_wildmons DIGLETTS_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite ; morn db 3, DIGLETT @@ -28,8 +28,9 @@ KantoGrassWildMons: db 32, DUGTRIO db 32, DUGTRIO db 32, DUGTRIO + end_grass_wildmons - map_id MOUNT_MOON + def_grass_wildmons MOUNT_MOON db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 6, ZUBAT @@ -55,8 +56,9 @@ KantoGrassWildMons: db 10, GEODUDE db 12, CLEFAIRY db 12, CLEFAIRY + end_grass_wildmons - map_id ROCK_TUNNEL_1F + def_grass_wildmons ROCK_TUNNEL_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 10, CUBONE @@ -82,8 +84,9 @@ KantoGrassWildMons: db 15, ZUBAT db 15, ZUBAT db 15, ZUBAT + end_grass_wildmons - map_id ROCK_TUNNEL_B1F + def_grass_wildmons ROCK_TUNNEL_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 12, CUBONE @@ -109,8 +112,9 @@ KantoGrassWildMons: db 15, HAUNTER db 15, GOLBAT db 15, GOLBAT + end_grass_wildmons - map_id VICTORY_ROAD + def_grass_wildmons VICTORY_ROAD db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 34, GRAVELER @@ -136,8 +140,9 @@ KantoGrassWildMons: db 38, GRAVELER db 40, GRAVELER db 40, GRAVELER + end_grass_wildmons - map_id TOHJO_FALLS + def_grass_wildmons TOHJO_FALLS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, ZUBAT @@ -163,8 +168,9 @@ KantoGrassWildMons: db 20, RATTATA db 23, SLOWPOKE db 23, SLOWPOKE + end_grass_wildmons - map_id ROUTE_1 + def_grass_wildmons ROUTE_1 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 2, PIDGEY @@ -190,8 +196,9 @@ KantoGrassWildMons: db 6, RATICATE db 4, HOOTHOOT db 4, HOOTHOOT + end_grass_wildmons - map_id ROUTE_2 + def_grass_wildmons ROUTE_2 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 3, CATERPIE @@ -217,8 +224,9 @@ KantoGrassWildMons: db 7, ARIADOS db 4, NOCTOWL db 4, NOCTOWL + end_grass_wildmons - map_id ROUTE_3 + def_grass_wildmons ROUTE_3 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 5, SPEAROW @@ -244,8 +252,9 @@ KantoGrassWildMons: db 5, RATTATA db 6, CLEFAIRY db 6, CLEFAIRY + end_grass_wildmons - map_id ROUTE_4 + def_grass_wildmons ROUTE_4 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 5, SPEAROW @@ -271,8 +280,9 @@ KantoGrassWildMons: db 5, RATTATA db 6, CLEFAIRY db 6, CLEFAIRY + end_grass_wildmons - map_id ROUTE_5 + def_grass_wildmons ROUTE_5 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, PIDGEY @@ -298,8 +308,9 @@ KantoGrassWildMons: db 14, JIGGLYPUFF db 14, ABRA db 14, ABRA + end_grass_wildmons - map_id ROUTE_6 + def_grass_wildmons ROUTE_6 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, RATTATA @@ -325,8 +336,9 @@ KantoGrassWildMons: db 12, JIGGLYPUFF db 15, RATICATE db 15, RATICATE + end_grass_wildmons - map_id ROUTE_7 + def_grass_wildmons ROUTE_7 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 17, RATTATA @@ -352,8 +364,9 @@ KantoGrassWildMons: db 18, JIGGLYPUFF db 16, ABRA db 16, ABRA + end_grass_wildmons - map_id ROUTE_8 + def_grass_wildmons ROUTE_8 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 17, SNUBBULL @@ -379,8 +392,9 @@ KantoGrassWildMons: db 16, JIGGLYPUFF db 18, KADABRA db 18, KADABRA + end_grass_wildmons - map_id ROUTE_9 + def_grass_wildmons ROUTE_9 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 15, RATTATA @@ -406,8 +420,9 @@ KantoGrassWildMons: db 15, ZUBAT db 18, RATICATE db 18, RATICATE + end_grass_wildmons - map_id ROUTE_10_NORTH + def_grass_wildmons ROUTE_10_NORTH db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 15, SPEAROW @@ -433,8 +448,9 @@ KantoGrassWildMons: db 15, ZUBAT db 16, ELECTABUZZ db 16, ELECTABUZZ + end_grass_wildmons - map_id ROUTE_11 + def_grass_wildmons ROUTE_11 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 14, HOPPIP @@ -460,8 +476,9 @@ KantoGrassWildMons: db 16, RATICATE db 16, HYPNO db 16, HYPNO + end_grass_wildmons - map_id ROUTE_13 + def_grass_wildmons ROUTE_13 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, NIDORINO @@ -487,8 +504,9 @@ KantoGrassWildMons: db 25, QUAGSIRE db 25, QUAGSIRE db 25, CHANSEY + end_grass_wildmons - map_id ROUTE_14 + def_grass_wildmons ROUTE_14 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 26, NIDORINO @@ -514,8 +532,9 @@ KantoGrassWildMons: db 28, QUAGSIRE db 28, QUAGSIRE db 28, CHANSEY + end_grass_wildmons - map_id ROUTE_15 + def_grass_wildmons ROUTE_15 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, NIDORINO @@ -541,8 +560,9 @@ KantoGrassWildMons: db 25, QUAGSIRE db 25, QUAGSIRE db 25, CHANSEY + end_grass_wildmons - map_id ROUTE_16 + def_grass_wildmons ROUTE_16 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 26, GRIMER @@ -568,8 +588,9 @@ KantoGrassWildMons: db 29, MURKROW db 30, MUK db 30, MUK + end_grass_wildmons - map_id ROUTE_17 + def_grass_wildmons ROUTE_17 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 30, FEAROW @@ -595,8 +616,9 @@ KantoGrassWildMons: db 33, GRIMER db 33, MUK db 33, MUK + end_grass_wildmons - map_id ROUTE_18 + def_grass_wildmons ROUTE_18 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 26, GRIMER @@ -622,8 +644,9 @@ KantoGrassWildMons: db 29, GRIMER db 30, MUK db 30, MUK + end_grass_wildmons - map_id ROUTE_21 + def_grass_wildmons ROUTE_21 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 30, TANGELA @@ -649,8 +672,9 @@ KantoGrassWildMons: db 30, TANGELA db 28, TANGELA db 28, TANGELA + end_grass_wildmons - map_id ROUTE_22 + def_grass_wildmons ROUTE_22 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 3, RATTATA @@ -676,8 +700,9 @@ KantoGrassWildMons: db 6, RATTATA db 7, RATTATA db 7, RATTATA + end_grass_wildmons - map_id ROUTE_24 + def_grass_wildmons ROUTE_24 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 8, CATERPIE @@ -703,8 +728,9 @@ KantoGrassWildMons: db 10, BELLSPROUT db 14, GLOOM db 14, GLOOM + end_grass_wildmons - map_id ROUTE_25 + def_grass_wildmons ROUTE_25 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 10, CATERPIE @@ -730,8 +756,9 @@ KantoGrassWildMons: db 10, BELLSPROUT db 14, NOCTOWL db 14, NOCTOWL + end_grass_wildmons - map_id ROUTE_26 + def_grass_wildmons ROUTE_26 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 28, DODUO @@ -757,8 +784,9 @@ KantoGrassWildMons: db 30, QUAGSIRE db 30, QUAGSIRE db 30, QUAGSIRE + end_grass_wildmons - map_id ROUTE_27 + def_grass_wildmons ROUTE_27 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 28, DODUO @@ -784,8 +812,9 @@ KantoGrassWildMons: db 32, NOCTOWL db 32, NOCTOWL db 32, NOCTOWL + end_grass_wildmons - map_id ROUTE_28 + def_grass_wildmons ROUTE_28 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 39, TANGELA @@ -811,5 +840,6 @@ KantoGrassWildMons: db 42, GOLBAT db 42, GOLBAT db 42, GOLBAT + end_grass_wildmons db -1 ; end diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index c9abda73d..c9854a354 100644 --- a/data/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm @@ -2,148 +2,172 @@ KantoWaterWildMons: - map_id TOHJO_FALLS + def_water_wildmons TOHJO_FALLS db 4 percent ; encounter rate db 20, GOLDEEN db 20, SLOWPOKE db 20, SEAKING + end_water_wildmons - map_id VERMILION_PORT + def_water_wildmons VERMILION_PORT db 2 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons - map_id ROUTE_4 + def_water_wildmons ROUTE_4 db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING + end_water_wildmons - map_id ROUTE_6 + def_water_wildmons ROUTE_6 db 2 percent ; encounter rate db 10, PSYDUCK db 5, PSYDUCK db 10, GOLDUCK + end_water_wildmons - map_id ROUTE_9 + def_water_wildmons ROUTE_9 db 4 percent ; encounter rate db 15, GOLDEEN db 10, GOLDEEN db 15, SEAKING + end_water_wildmons - map_id ROUTE_10_NORTH + def_water_wildmons ROUTE_10_NORTH db 4 percent ; encounter rate db 15, GOLDEEN db 10, GOLDEEN db 15, SEAKING + end_water_wildmons - map_id ROUTE_12 + def_water_wildmons ROUTE_12 db 6 percent ; encounter rate db 25, TENTACOOL db 25, QUAGSIRE db 25, TENTACRUEL + end_water_wildmons - map_id ROUTE_13 + def_water_wildmons ROUTE_13 db 6 percent ; encounter rate db 25, TENTACOOL db 25, QUAGSIRE db 25, TENTACRUEL + end_water_wildmons - map_id ROUTE_19 + def_water_wildmons ROUTE_19 db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons - map_id ROUTE_20 + def_water_wildmons ROUTE_20 db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons - map_id ROUTE_21 + def_water_wildmons ROUTE_21 db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons - map_id ROUTE_22 + def_water_wildmons ROUTE_22 db 2 percent ; encounter rate db 10, POLIWAG db 5, POLIWAG db 10, POLIWHIRL + end_water_wildmons - map_id ROUTE_24 + def_water_wildmons ROUTE_24 db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING + end_water_wildmons - map_id ROUTE_25 + def_water_wildmons ROUTE_25 db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING + end_water_wildmons - map_id ROUTE_26 + def_water_wildmons ROUTE_26 db 6 percent ; encounter rate db 30, TENTACOOL db 25, TENTACOOL db 30, TENTACRUEL + end_water_wildmons - map_id ROUTE_27 + def_water_wildmons ROUTE_27 db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL + end_water_wildmons - map_id ROUTE_28 + def_water_wildmons ROUTE_28 db 2 percent ; encounter rate db 40, POLIWAG db 35, POLIWAG db 40, POLIWHIRL + end_water_wildmons - map_id PALLET_TOWN + def_water_wildmons PALLET_TOWN db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons - map_id VIRIDIAN_CITY + def_water_wildmons VIRIDIAN_CITY db 2 percent ; encounter rate db 10, POLIWAG db 5, POLIWAG db 10, POLIWHIRL + end_water_wildmons - map_id CERULEAN_CITY + def_water_wildmons CERULEAN_CITY db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING + end_water_wildmons - map_id VERMILION_CITY + def_water_wildmons VERMILION_CITY db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons - map_id CELADON_CITY + def_water_wildmons CELADON_CITY db 2 percent ; encounter rate db 20, GRIMER db 15, GRIMER db 15, MUK + end_water_wildmons - map_id FUCHSIA_CITY + def_water_wildmons FUCHSIA_CITY db 2 percent ; encounter rate db 20, MAGIKARP db 15, MAGIKARP db 10, MAGIKARP + end_water_wildmons - map_id CINNABAR_ISLAND + def_water_wildmons CINNABAR_ISLAND db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL + end_water_wildmons db -1 ; end diff --git a/macros/asserts.asm b/macros/asserts.asm index e045e2f56..306fc4c34 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -18,3 +18,41 @@ x = \1 assert x * CURRENT_TABLE_WIDTH == @ - CURRENT_TABLE_START, \ "{CURRENT_TABLE_START}: expected {d:x} entries, each {d:CURRENT_TABLE_WIDTH} bytes" ENDM + +def_grass_wildmons: MACRO +;\1: map id +if DEF(CURRENT_GRASS_WILDMONS_MAP) +PURGE CURRENT_GRASS_WILDMONS_MAP +endc +if DEF(CURRENT_GRASS_WILDMONS_LABEL) +PURGE CURRENT_GRASS_WILDMONS_LABEL +endc +CURRENT_GRASS_WILDMONS_MAP EQUS "\1" +CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" +CURRENT_GRASS_WILDMONS_LABEL: + map_id \1 +ENDM + +end_grass_wildmons: MACRO + assert GRASS_WILDDATA_LENGTH == @ - CURRENT_GRASS_WILDMONS_LABEL, \ + "def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes" +ENDM + +def_water_wildmons: MACRO +;\1: map id +if DEF(CURRENT_WATER_WILDMONS_MAP) +PURGE CURRENT_WATER_WILDMONS_MAP +endc +if DEF(CURRENT_WATER_WILDMONS_LABEL) +PURGE CURRENT_WATER_WILDMONS_LABEL +endc +CURRENT_WATER_WILDMONS_MAP EQUS "\1" +CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" +CURRENT_WATER_WILDMONS_LABEL: + map_id \1 +ENDM + +end_water_wildmons: MACRO + assert WATER_WILDDATA_LENGTH == @ - CURRENT_WATER_WILDMONS_LABEL, \ + "def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes" +ENDM