diff options
Diffstat (limited to 'data')
64 files changed, 340 insertions, 340 deletions
diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm index 530192f6..54d346a6 100644 --- a/data/battle_anims/subanimations.asm +++ b/data/battle_anims/subanimations.asm @@ -92,7 +92,7 @@ SubanimationPointers: ; subanim type, count ; REPT count ; db frame block id, base coordinate id, frame block mode -; endr +; ENDR subanim: MACRO db (\1 << 5) | \2 diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm index e235efa1..a045838e 100644 --- a/data/maps/headers/Route22.asm +++ b/data/maps/headers/Route22.asm @@ -1,5 +1,5 @@ map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST - connection north, Route23, ROUTE_23, 0 + connection north, Route23, ROUTE_23, 0 ; unnecessary connection east, ViridianCity, VIRIDIAN_CITY, -4 end_map_header diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm index e1535c9d..66c2936f 100644 --- a/data/maps/headers/Route23.asm +++ b/data/maps/headers/Route23.asm @@ -1,5 +1,5 @@ map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH connection north, IndigoPlateau, INDIGO_PLATEAU, 0 - connection south, Route22, ROUTE_22, 0 + connection south, Route22, ROUTE_22, 0 ; unnecessary end_map_header diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index fc1f34e8..375b0687 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -1,36 +1,36 @@ tileset: MACRO - db BANK(\2) ; BANK(GFX) - dw \1, \2, \3 ; Block, GFX, Coll - db \4, \5, \6 ; counter tiles - db \7 ; grass tile - db \8 ; animations (TILEANIM_* value) + db BANK(\1_GFX) + dw \1_Block, \1_GFX, \1_Coll + db \2, \3, \4 ; counter tiles + db \5 ; grass tile + db \6 ; animations (TILEANIM_* value) ENDM Tilesets: table_width 12, Tilesets - ; block, gfx, coll, 3 counter tiles, grass tile, animations - tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, TILEANIM_WATER_FLOWER - tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, TILEANIM_NONE - tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, TILEANIM_WATER - tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER - tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, TILEANIM_NONE - tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER - tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE - tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, TILEANIM_NONE - tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE - tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER - tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER - tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, TILEANIM_NONE - tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER - tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, TILEANIM_NONE - tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, TILEANIM_NONE - tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, TILEANIM_WATER - tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, TILEANIM_WATER + ; name, 3 counter tiles, grass tile, animations + tileset Overworld, -1, -1, -1, $52, TILEANIM_WATER_FLOWER + tileset RedsHouse1, -1, -1, -1, -1, TILEANIM_NONE + tileset Mart, $18,$19,$1E, -1, TILEANIM_NONE + tileset Forest, -1, -1, -1, $20, TILEANIM_WATER + tileset RedsHouse2, -1, -1, -1, -1, TILEANIM_NONE + tileset Dojo, $3A, -1, -1, -1, TILEANIM_WATER_FLOWER + tileset Pokecenter, $18,$19,$1E, -1, TILEANIM_NONE + tileset Gym, $3A, -1, -1, -1, TILEANIM_WATER_FLOWER + tileset House, -1, -1, -1, -1, TILEANIM_NONE + tileset ForestGate, $17,$32, -1, -1, TILEANIM_NONE + tileset Museum, $17,$32, -1, -1, TILEANIM_NONE + tileset Underground, -1, -1, -1, -1, TILEANIM_NONE + tileset Gate, $17,$32, -1, -1, TILEANIM_NONE + tileset Ship, -1, -1, -1, -1, TILEANIM_WATER + tileset ShipPort, -1, -1, -1, -1, TILEANIM_WATER + tileset Cemetery, $12, -1, -1, -1, TILEANIM_NONE + tileset Interior, -1, -1, -1, -1, TILEANIM_NONE + tileset Cavern, -1, -1, -1, -1, TILEANIM_WATER + tileset Lobby, $15,$36, -1, -1, TILEANIM_NONE + tileset Mansion, -1, -1, -1, -1, TILEANIM_NONE + tileset Lab, -1, -1, -1, -1, TILEANIM_NONE + tileset Club, $07,$17, -1, -1, TILEANIM_NONE + tileset Facility, $12, -1, -1, -1, TILEANIM_WATER + tileset Plateau, -1, -1, -1, $45, TILEANIM_WATER assert_table_length NUM_TILESETS diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 1dd8e049..a09fdce6 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -1,253 +1,253 @@ WildDataPointers: table_width 2, WildDataPointers - dw NoMons ; PALLET_TOWN - dw NoMons ; VIRIDIAN_CITY - dw NoMons ; PEWTER_CITY - dw NoMons ; CERULEAN_CITY - dw NoMons ; LAVENDER_TOWN - dw NoMons ; VERMILION_CITY - dw NoMons ; CELADON_CITY - dw NoMons ; FUCHSIA_CITY - dw NoMons ; CINNABAR_ISLAND - dw NoMons ; INDIGO_PLATEAU - dw NoMons ; SAFFRON_CITY - dw NoMons ; unused - dw Route1Mons ; ROUTE_1 - dw Route2Mons ; ROUTE_2 - dw Route3Mons ; ROUTE_3 - dw Route4Mons ; ROUTE_4 - dw Route5Mons ; ROUTE_5 - dw Route6Mons ; ROUTE_6 - dw Route7Mons ; ROUTE_7 - dw Route8Mons ; ROUTE_8 - dw Route9Mons ; ROUTE_9 - dw Route10Mons ; ROUTE_10 - dw Route11Mons ; ROUTE_11 - dw Route12Mons ; ROUTE_12 - dw Route13Mons ; ROUTE_13 - dw Route14Mons ; ROUTE_14 - dw Route15Mons ; ROUTE_15 - dw Route16Mons ; ROUTE_16 - dw Route17Mons ; ROUTE_17 - dw Route18Mons ; ROUTE_18 - dw WaterMons ; ROUTE_19 - dw WaterMons ; ROUTE_20 - dw Route21Mons ; ROUTE_21 - dw Route22Mons ; ROUTE_22 - dw Route23Mons ; ROUTE_23 - dw Route24Mons ; ROUTE_24 - dw Route25Mons ; ROUTE_25 - dw NoMons ; REDS_HOUSE_1F - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw ForestMons ; ViridianForest - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw MoonMons1 - dw MoonMonsB1 - dw MoonMonsB2 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw TunnelMonsB1 - dw PowerPlantMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw PlateauMons1 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw TowerMons1 - dw TowerMons2 - dw TowerMons3 - dw TowerMons4 - dw TowerMons5 - dw TowerMons6 - dw TowerMons7 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw IslandMonsB1 - dw IslandMonsB2 - dw IslandMonsB3 - dw IslandMonsB4 - dw NoMons - dw NoMons - dw MansionMons1 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw IslandMons1 - dw NoMons - dw PlateauMons2 - dw NoMons - dw NoMons - dw CaveMons - dw PlateauMons3 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw MansionMons2 - dw MansionMons3 - dw MansionMonsB1 - dw ZoneMons1 - dw ZoneMons2 - dw ZoneMons3 - dw ZoneMonsCenter - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw DungeonMons2 - dw DungeonMonsB1 - dw DungeonMons1 - dw NoMons - dw NoMons - dw NoMons - dw TunnelMonsB2 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons + dw NothingWildMons ; PALLET_TOWN + dw NothingWildMons ; VIRIDIAN_CITY + dw NothingWildMons ; PEWTER_CITY + dw NothingWildMons ; CERULEAN_CITY + dw NothingWildMons ; LAVENDER_TOWN + dw NothingWildMons ; VERMILION_CITY + dw NothingWildMons ; CELADON_CITY + dw NothingWildMons ; FUCHSIA_CITY + dw NothingWildMons ; CINNABAR_ISLAND + dw NothingWildMons ; INDIGO_PLATEAU + dw NothingWildMons ; SAFFRON_CITY + dw NothingWildMons ; unused + dw Route1WildMons ; ROUTE_1 + dw Route2WildMons ; ROUTE_2 + dw Route3WildMons ; ROUTE_3 + dw Route4WildMons ; ROUTE_4 + dw Route5WildMons ; ROUTE_5 + dw Route6WildMons ; ROUTE_6 + dw Route7WildMons ; ROUTE_7 + dw Route8WildMons ; ROUTE_8 + dw Route9WildMons ; ROUTE_9 + dw Route10WildMons ; ROUTE_10 + dw Route11WildMons ; ROUTE_11 + dw Route12WildMons ; ROUTE_12 + dw Route13WildMons ; ROUTE_13 + dw Route14WildMons ; ROUTE_14 + dw Route15WildMons ; ROUTE_15 + dw Route16WildMons ; ROUTE_16 + dw Route17WildMons ; ROUTE_17 + dw Route18WildMons ; ROUTE_18 + dw SeaRoutesWildMons ; ROUTE_19 + dw SeaRoutesWildMons ; ROUTE_20 + dw Route21WildMons ; ROUTE_21 + dw Route22WildMons ; ROUTE_22 + dw Route23WildMons ; ROUTE_23 + dw Route24WildMons ; ROUTE_24 + dw Route25WildMons ; ROUTE_25 + dw NothingWildMons ; REDS_HOUSE_1F + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw ViridianForestWildMons ; ViridianForest + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw MtMoon1FWildMons + dw MtMoonB1FWildMons + dw MtMoonB2FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw RockTunnel1FWildMons + dw PowerPlantWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw VictoryRoad1FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw PokemonTower1FWildMons + dw PokemonTower2FWildMons + dw PokemonTower3FWildMons + dw PokemonTower4FWildMons + dw PokemonTower5FWildMons + dw PokemonTower6FWildMons + dw PokemonTower7FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw SeafoamIslandsB1FWildMons + dw SeafoamIslandsB2FWildMons + dw SeafoamIslandsB3FWildMons + dw SeafoamIslandsB4FWildMons + dw NothingWildMons + dw NothingWildMons + dw PokemonMansion1FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw SeafoamIslands1FWildMons + dw NothingWildMons + dw VictoryRoad2FWildMons + dw NothingWildMons + dw NothingWildMons + dw DiglettsCaveWildMons + dw VictoryRoad3FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw PokemonMansion2FWildMons + dw PokemonMansion3FWildMons + dw PokemonMansionB1FWildMons + dw SafariZoneEastWildMons + dw SafariZoneNorthWildMons + dw SafariZoneWestWildMons + dw SafariZoneCenterWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw CeruleanCave2FWildMons + dw CeruleanCaveB1FWildMons + dw CeruleanCave1FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw RockTunnelB1FWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons + dw NothingWildMons assert_table_length NUM_MAPS dw -1 ; end diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm index ae593741..243f88bb 100644 --- a/data/wild/maps/CeruleanCave1F.asm +++ b/data/wild/maps/CeruleanCave1F.asm @@ -1,4 +1,4 @@ -DungeonMons1: +CeruleanCave1FWildMons: def_grass_wildmons 10 ; encounter rate db 46, GOLBAT db 46, HYPNO diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm index f2648150..5366fa58 100644 --- a/data/wild/maps/CeruleanCave2F.asm +++ b/data/wild/maps/CeruleanCave2F.asm @@ -1,4 +1,4 @@ -DungeonMons2: +CeruleanCave2FWildMons: def_grass_wildmons 15 ; encounter rate db 51, DODRIO db 51, VENOMOTH diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm index 10752548..a1889041 100644 --- a/data/wild/maps/CeruleanCaveB1F.asm +++ b/data/wild/maps/CeruleanCaveB1F.asm @@ -1,4 +1,4 @@ -DungeonMonsB1: +CeruleanCaveB1FWildMons: def_grass_wildmons 25 ; encounter rate db 55, RHYDON db 55, MAROWAK diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index e5ba5fa5..50ef0828 100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm @@ -1,4 +1,4 @@ -CaveMons: +DiglettsCaveWildMons: def_grass_wildmons 20 ; encounter rate db 18, DIGLETT db 19, DIGLETT diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index 6ecc8f35..a62f9817 100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -1,4 +1,4 @@ -MoonMons1: +MtMoon1FWildMons: def_grass_wildmons 10 ; encounter rate db 8, ZUBAT db 7, ZUBAT diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index ab793cf9..85645fbe 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -1,4 +1,4 @@ -MoonMonsB1: +MtMoonB1FWildMons: def_grass_wildmons 10 ; encounter rate db 8, ZUBAT db 7, ZUBAT diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index 119b414e..2e845ce3 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -1,4 +1,4 @@ -MoonMonsB2: +MtMoonB2FWildMons: def_grass_wildmons 10 ; encounter rate db 9, ZUBAT db 9, GEODUDE diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index d67ceb07..61f4262e 100644 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm @@ -1,4 +1,4 @@ -MansionMons1: +PokemonMansion1FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 32, KOFFING diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 01a48f1c..c98d3bf3 100644 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm @@ -1,4 +1,4 @@ -MansionMons2: +PokemonMansion2FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 32, GROWLITHE diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index 28c3bf88..a707687f 100644 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm @@ -1,4 +1,4 @@ -MansionMons3: +PokemonMansion3FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 31, KOFFING diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 2d0312af..767038c6 100644 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -1,4 +1,4 @@ -MansionMonsB1: +PokemonMansionB1FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 33, KOFFING diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm index 5e061298..023b996d 100644 --- a/data/wild/maps/PokemonTower1F.asm +++ b/data/wild/maps/PokemonTower1F.asm @@ -1,4 +1,4 @@ -TowerMons1: +PokemonTower1FWildMons: def_grass_wildmons 0 ; encounter rate end_grass_wildmons diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm index 39794a20..f958e167 100644 --- a/data/wild/maps/PokemonTower2F.asm +++ b/data/wild/maps/PokemonTower2F.asm @@ -1,4 +1,4 @@ -TowerMons2: +PokemonTower2FWildMons: def_grass_wildmons 0 ; encounter rate end_grass_wildmons diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index ef52127d..0d4440cb 100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm @@ -1,4 +1,4 @@ -TowerMons3: +PokemonTower3FWildMons: def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index da578f90..de278221 100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm @@ -1,4 +1,4 @@ -TowerMons4: +PokemonTower4FWildMons: def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index cbfc5b7b..507dba26 100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm @@ -1,4 +1,4 @@ -TowerMons5: +PokemonTower5FWildMons: def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index c8596bbd..f0197631 100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm @@ -1,4 +1,4 @@ -TowerMons6: +PokemonTower6FWildMons: def_grass_wildmons 15 ; encounter rate db 21, GASTLY db 22, GASTLY diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index 85289ad1..2b3d952b 100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm @@ -1,4 +1,4 @@ -TowerMons7: +PokemonTower7FWildMons: def_grass_wildmons 15 ; encounter rate db 21, GASTLY db 22, GASTLY diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index 9950a866..60b5d420 100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,4 +1,4 @@ -PowerPlantMons: +PowerPlantWildMons: def_grass_wildmons 10 ; encounter rate db 21, VOLTORB db 21, MAGNEMITE diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 0b6b07bd..6ca947c0 100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -1,4 +1,4 @@ -TunnelMonsB1: +RockTunnel1FWildMons: def_grass_wildmons 15 ; encounter rate db 16, ZUBAT db 17, ZUBAT diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index f4dad48d..4edd716c 100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -1,4 +1,4 @@ -TunnelMonsB2: +RockTunnelB1FWildMons: def_grass_wildmons 15 ; encounter rate db 16, ZUBAT db 17, ZUBAT diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index 481650a8..a9ed6a4a 100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -1,4 +1,4 @@ -Route1Mons: +Route1WildMons: def_grass_wildmons 25 ; encounter rate db 3, PIDGEY db 3, RATTATA diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index 5e5a0a95..f2d1b8f6 100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -1,4 +1,4 @@ -Route10Mons: +Route10WildMons: def_grass_wildmons 15 ; encounter rate db 16, VOLTORB db 16, SPEAROW diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index 853daebf..87cf94fa 100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm @@ -1,4 +1,4 @@ -Route11Mons: +Route11WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 14, EKANS diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index f4c7911c..4c9388d3 100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -1,4 +1,4 @@ -Route12Mons: +Route12WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index 1af1b533..c6196233 100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -1,4 +1,4 @@ -Route13Mons: +Route13WildMons: def_grass_wildmons 20 ; encounter rate IF DEF(_RED) db 24, ODDISH diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index 839834ce..dbc218fb 100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm @@ -1,4 +1,4 @@ -Route14Mons: +Route14WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 7c2a23a5..c437a97d 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -1,4 +1,4 @@ -Route15Mons: +Route15WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index d9556d72..15ef2bf1 100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm @@ -1,4 +1,4 @@ -Route16Mons: +Route16WildMons: def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, SPEAROW diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index a7a0acc3..b3b2b672 100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm @@ -1,4 +1,4 @@ -Route17Mons: +Route17WildMons: def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, SPEAROW diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index 66c203cf..d2a1269a 100644 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm @@ -1,4 +1,4 @@ -Route18Mons: +Route18WildMons: def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, SPEAROW diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 7696f5af..9ec6d912 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -1,4 +1,4 @@ -Route2Mons: +Route2WildMons: def_grass_wildmons 25 ; encounter rate db 3, RATTATA db 3, PIDGEY diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index d1ed0288..99cddd60 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -1,4 +1,4 @@ -Route21Mons: +Route21WildMons: def_grass_wildmons 25 ; encounter rate db 21, RATTATA db 23, PIDGEY diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index 387130f7..49e95bc9 100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -1,4 +1,4 @@ -Route22Mons: +Route22WildMons: def_grass_wildmons 25 ; encounter rate db 3, RATTATA IF DEF(_RED) diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index 36620813..a2cde010 100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm @@ -1,4 +1,4 @@ -Route23Mons: +Route23WildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 26, EKANS diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 63633831..3c06d810 100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm @@ -1,4 +1,4 @@ -Route24Mons: +Route24WildMons: def_grass_wildmons 25 ; encounter rate IF DEF(_RED) db 7, WEEDLE diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index 944e28a8..9c59549f 100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm @@ -1,4 +1,4 @@ -Route25Mons: +Route25WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 8, WEEDLE diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index ebb9e4b4..9a78dba7 100644 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm @@ -1,4 +1,4 @@ -Route3Mons: +Route3WildMons: def_grass_wildmons 20 ; encounter rate db 6, PIDGEY db 5, SPEAROW diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index 4f94a21a..c4f1f536 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,4 +1,4 @@ -Route4Mons: +Route4WildMons: def_grass_wildmons 20 ; encounter rate db 10, RATTATA db 10, SPEAROW diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index 6414eefe..3af2ebd9 100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -1,4 +1,4 @@ -Route5Mons: +Route5WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 13, ODDISH diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 5c843ec9..593e890b 100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -1,4 +1,4 @@ -Route6Mons: +Route6WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 13, ODDISH diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index c0bf1193..51f78880 100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm @@ -1,4 +1,4 @@ -Route7Mons: +Route7WildMons: def_grass_wildmons 15 ; encounter rate db 19, PIDGEY IF DEF(_RED) diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 8d2771af..52995d1b 100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm @@ -1,4 +1,4 @@ -Route8Mons: +Route8WildMons: def_grass_wildmons 15 ; encounter rate db 18, PIDGEY IF DEF(_RED) diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index 6a1cdca5..e771040a 100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm @@ -1,4 +1,4 @@ -Route9Mons: +Route9WildMons: def_grass_wildmons 15 ; encounter rate db 16, RATTATA db 16, SPEAROW diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 72be93e0..f0599e4b 100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm @@ -1,4 +1,4 @@ -ZoneMonsCenter: +SafariZoneCenterWildMons: def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 22, NIDORAN_M diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index ea7cbc22..883f181d 100644 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm @@ -1,4 +1,4 @@ -ZoneMons1: +SafariZoneEastWildMons: def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 24, NIDORAN_M diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 864124c3..40b4adcc 100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm @@ -1,4 +1,4 @@ -ZoneMons2: +SafariZoneNorthWildMons: def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 22, NIDORAN_M diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index fb8962da..821c0ed0 100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -1,4 +1,4 @@ -ZoneMons3: +SafariZoneWestWildMons: def_grass_wildmons 30 ; encounter rate IF DEF(_RED) db 25, NIDORAN_M diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm index badf0bed..7ec50889 100644 --- a/data/wild/maps/SeaRoutes.asm +++ b/data/wild/maps/SeaRoutes.asm @@ -1,4 +1,4 @@ -WaterMons: +SeaRoutesWildMons: def_grass_wildmons 0 ; encounter rate end_grass_wildmons diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index 67c87ce2..42949942 100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -1,4 +1,4 @@ -IslandMons1: +SeafoamIslands1FWildMons: def_grass_wildmons 15 ; encounter rate db 30, SEEL IF DEF(_RED) diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index b2f0f699..86cabb9e 100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -1,4 +1,4 @@ -IslandMonsB1: +SeafoamIslandsB1FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 30, STARYU diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index 4237fcd1..0375bd51 100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -1,4 +1,4 @@ -IslandMonsB2: +SeafoamIslandsB2FWildMons: def_grass_wildmons 10 ; encounter rate db 30, SEEL IF DEF(_RED) diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 3d29664f..1706f520 100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -1,4 +1,4 @@ -IslandMonsB3: +SeafoamIslandsB3FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 31, SLOWPOKE diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index 9bc08333..fd1d7cb9 100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -1,4 +1,4 @@ -IslandMonsB4: +SeafoamIslandsB4FWildMons: def_grass_wildmons 10 ; encounter rate IF DEF(_RED) db 31, HORSEA diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 162fef86..055b61bc 100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm @@ -1,4 +1,4 @@ -PlateauMons1: +VictoryRoad1FWildMons: def_grass_wildmons 15 ; encounter rate db 24, MACHOP db 26, GEODUDE diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index 4cb9e8da..47fc4041 100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm @@ -1,4 +1,4 @@ -PlateauMons2: +VictoryRoad2FWildMons: def_grass_wildmons 10 ; encounter rate db 22, MACHOP db 24, GEODUDE diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index c525839c..ae12d403 100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -1,4 +1,4 @@ -PlateauMons3: +VictoryRoad3FWildMons: def_grass_wildmons 15 ; encounter rate db 24, MACHOP db 26, GEODUDE diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index 71319e71..82a63569 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,4 +1,4 @@ -ForestMons: +ViridianForestWildMons: def_grass_wildmons 8 ; encounter rate IF DEF(_RED) db 4, WEEDLE diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm index 1ccba991..47b94a28 100644 --- a/data/wild/maps/nothing.asm +++ b/data/wild/maps/nothing.asm @@ -1,4 +1,4 @@ -NoMons: +NothingWildMons: def_grass_wildmons 0 ; encounter rate end_grass_wildmons |