Merge branch 'master' of https://github.com/pret/pokered

data/maps/badge_maps.asm

@@ -0,0 +1,10 @@
+MapBadgeFlags:
+	db PEWTER_GYM,    1 << BIT_BOULDERBADGE
+	db CERULEAN_GYM,  1 << BIT_CASCADEBADGE
+	db VERMILION_GYM, 1 << BIT_THUNDERBADGE
+	db CELADON_GYM,   1 << BIT_RAINBOWBADGE
+	db FUCHSIA_GYM,   1 << BIT_SOULBADGE
+	db SAFFRON_GYM,   1 << BIT_MARSHBADGE
+	db CINNABAR_GYM,  1 << BIT_VOLCANOBADGE
+	db VIRIDIAN_GYM,  1 << BIT_EARTHBADGE
+	db -1 ; end

data/maps/dungeon_maps.asm

@@ -0,0 +1,27 @@
+; GetBattleTransitionID_IsDungeonMap fails to recognize
+; VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps,
+; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT,
+; DIGLETTS_CAVE, and SILPH_CO_[9-11]F as dungeon maps
+
+; GetBattleTransitionID_IsDungeonMap checks if wCurMap
+; is equal to one of these maps
+DungeonMaps1:
+	db VIRIDIAN_FOREST
+	db ROCK_TUNNEL_1F
+	db SEAFOAM_ISLANDS_1F
+	db ROCK_TUNNEL_B1F
+	db -1 ; end
+
+; GetBattleTransitionID_IsDungeonMap checks if wCurMap
+; is in between or equal to each pair of maps
+DungeonMaps2:
+	; all MT_MOON maps
+	db MT_MOON_1F, MT_MOON_B2F
+	; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
+	db SS_ANNE_1F, HALL_OF_FAME
+	; all POKEMON_TOWER maps and Lavender Town buildings
+	db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE
+	; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
+	; CERULEAN_CAVE maps, except for SILPH_CO_1F
+	db SILPH_CO_2F, CERULEAN_CAVE_1F
+	db -1 ; end

data/maps/force_bike_surf.asm

@@ -0,0 +1,15 @@
+force_bike_surf: MACRO
+	db \1, \3, \2
+ENDM
+
+ForcedBikeOrSurfMaps:
+	; map id, x, y
+	force_bike_surf ROUTE_16,            17, 10
+	force_bike_surf ROUTE_16,            17, 11
+	force_bike_surf ROUTE_18,            33,  8
+	force_bike_surf ROUTE_18,            33,  9
+	force_bike_surf SEAFOAM_ISLANDS_B3F, 18,  7
+	force_bike_surf SEAFOAM_ISLANDS_B3F, 19,  7
+	force_bike_surf SEAFOAM_ISLANDS_B4F,  4, 14
+	force_bike_surf SEAFOAM_ISLANDS_B4F,  5, 14
+	db -1 ; end

data/maps/headers/AgathasRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0
+	end_map_header

data/maps/headers/BikeShop.asm

@@ -0,0 +1,3 @@
+
+	map_header BikeShop, BIKE_SHOP, CLUB, 0
+	end_map_header

data/maps/headers/BillsHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0
+	end_map_header

data/maps/headers/BluesHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header BluesHouse, BLUES_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/BrunosRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header BrunosRoom, BRUNOS_ROOM, GYM, 0
+	end_map_header

data/maps/headers/CeladonChiefHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0
+	end_map_header

data/maps/headers/CeladonCity.asm

@@ -0,0 +1,5 @@
+
+	map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST
+	connection west, Route16, ROUTE_16, 4
+	connection east, Route7, ROUTE_7, 4
+	end_map_header

data/maps/headers/CeladonDiner.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonDiner, CELADON_DINER, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonGym.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonGym, CELADON_GYM, GYM, 0
+	end_map_header

data/maps/headers/CeladonHotel.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0
+	end_map_header

data/maps/headers/CeladonMansion1F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0
+	end_map_header

data/maps/headers/CeladonMansion2F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0
+	end_map_header

data/maps/headers/CeladonMansion3F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0
+	end_map_header

data/maps/headers/CeladonMansionRoof.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0
+	end_map_header

data/maps/headers/CeladonMansionRoofHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/CeladonMart1F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonMart2F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonMart3F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonMart4F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonMart5F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonMartElevator.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonMartRoof.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0
+	end_map_header

data/maps/headers/CeladonPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/CeruleanBadgeHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0
+	end_map_header

data/maps/headers/CeruleanCave1F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0
+	end_map_header

data/maps/headers/CeruleanCave2F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0
+	end_map_header

data/maps/headers/CeruleanCaveB1F.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0
+	end_map_header

data/maps/headers/CeruleanCity.asm

@@ -0,0 +1,7 @@
+
+	map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
+	connection north, Route24, ROUTE_24, 5
+	connection south, Route5, ROUTE_5, 5
+	connection west, Route4, ROUTE_4, 4
+	connection east, Route9, ROUTE_9, 4
+	end_map_header

data/maps/headers/CeruleanGym.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanGym, CERULEAN_GYM, GYM, 0
+	end_map_header

data/maps/headers/CeruleanMart.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanMart, CERULEAN_MART, MART, 0
+	end_map_header

data/maps/headers/CeruleanPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/CeruleanTradeHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/CeruleanTrashedHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/ChampionsRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0
+	end_map_header

data/maps/headers/CinnabarGym.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0
+	end_map_header

data/maps/headers/CinnabarIsland.asm

@@ -0,0 +1,5 @@
+
+	map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST
+	connection north, Route21, ROUTE_21, 0
+	connection east, Route20, ROUTE_20, 0
+	end_map_header

data/maps/headers/CinnabarLab.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarLab, CINNABAR_LAB, LAB, 0
+	end_map_header

data/maps/headers/CinnabarLabFossilRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0
+	end_map_header

data/maps/headers/CinnabarLabMetronomeRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0
+	end_map_header

data/maps/headers/CinnabarLabTradeRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0
+	end_map_header

data/maps/headers/CinnabarMart.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarMart, CINNABAR_MART, MART, 0
+	end_map_header

data/maps/headers/CinnabarPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/Colosseum.asm

@@ -0,0 +1,3 @@
+
+	map_header Colosseum, COLOSSEUM, CLUB, 0
+	end_map_header

data/maps/headers/CopycatsHouse1F.asm

@@ -0,0 +1,3 @@
+
+	map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0
+	end_map_header

data/maps/headers/CopycatsHouse2F.asm

@@ -0,0 +1,3 @@
+
+	map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0
+	end_map_header

data/maps/headers/Daycare.asm

@@ -0,0 +1,3 @@
+
+	map_header Daycare, DAYCARE, HOUSE, 0
+	end_map_header

data/maps/headers/DiglettsCave.asm

@@ -0,0 +1,3 @@
+
+	map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0
+	end_map_header

data/maps/headers/DiglettsCaveRoute11.asm

@@ -0,0 +1,3 @@
+
+	map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0
+	end_map_header

data/maps/headers/DiglettsCaveRoute2.asm

@@ -0,0 +1,3 @@
+
+	map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0
+	end_map_header

data/maps/headers/FightingDojo.asm

@@ -0,0 +1,3 @@
+
+	map_header FightingDojo, FIGHTING_DOJO, DOJO, 0
+	end_map_header

data/maps/headers/FuchsiaBillsGrandpasHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/FuchsiaCity.asm

@@ -0,0 +1,6 @@
+
+	map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST
+	connection south, Route19, ROUTE_19, 5
+	connection west, Route18, ROUTE_18, 4
+	connection east, Route15, ROUTE_15, 4
+	end_map_header

data/maps/headers/FuchsiaGoodRodHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0
+	end_map_header

data/maps/headers/FuchsiaGym.asm

@@ -0,0 +1,3 @@
+
+	map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0
+	end_map_header

data/maps/headers/FuchsiaMart.asm

@@ -0,0 +1,3 @@
+
+	map_header FuchsiaMart, FUCHSIA_MART, MART, 0
+	end_map_header

data/maps/headers/FuchsiaMeetingRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0
+	end_map_header

data/maps/headers/FuchsiaPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/GameCorner.asm

@@ -0,0 +1,3 @@
+
+	map_header GameCorner, GAME_CORNER, LOBBY, 0
+	end_map_header

data/maps/headers/GameCornerPrizeRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0
+	end_map_header

data/maps/headers/HallOfFame.asm

@@ -0,0 +1,3 @@
+
+	map_header HallOfFame, HALL_OF_FAME, GYM, 0
+	end_map_header

data/maps/headers/IndigoPlateau.asm

@@ -0,0 +1,4 @@
+
+	map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH
+	connection south, Route23, ROUTE_23, 0
+	end_map_header

data/maps/headers/IndigoPlateauLobby.asm

@@ -0,0 +1,3 @@
+
+	map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0
+	end_map_header

data/maps/headers/LancesRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header LancesRoom, LANCES_ROOM, DOJO, 0
+	end_map_header

data/maps/headers/LavenderCuboneHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/LavenderMart.asm

@@ -0,0 +1,3 @@
+
+	map_header LavenderMart, LAVENDER_MART, MART, 0
+	end_map_header

data/maps/headers/LavenderPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/LavenderTown.asm

@@ -0,0 +1,6 @@
+
+	map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST
+	connection north, Route10, ROUTE_10, 0
+	connection south, Route12, ROUTE_12, 0
+	connection west, Route8, ROUTE_8, 0
+	end_map_header

data/maps/headers/LoreleisRoom.asm

@@ -0,0 +1,3 @@
+
+	map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0
+	end_map_header

data/maps/headers/MrFujisHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/MrPsychicsHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/MtMoon1F.asm

@@ -0,0 +1,3 @@
+
+	map_header MtMoon1F, MT_MOON_1F, CAVERN, 0
+	end_map_header

data/maps/headers/MtMoonB1F.asm

@@ -0,0 +1,3 @@
+
+	map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0
+	end_map_header

data/maps/headers/MtMoonB2F.asm

@@ -0,0 +1,3 @@
+
+	map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0
+	end_map_header

data/maps/headers/MtMoonPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/Museum1F.asm

@@ -0,0 +1,3 @@
+
+	map_header Museum1F, MUSEUM_1F, MUSEUM, 0
+	end_map_header

data/maps/headers/Museum2F.asm

@@ -0,0 +1,3 @@
+
+	map_header Museum2F, MUSEUM_2F, MUSEUM, 0
+	end_map_header

data/maps/headers/NameRatersHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/OaksLab.asm

@@ -0,0 +1,3 @@
+
+	map_header OaksLab, OAKS_LAB, DOJO, 0
+	end_map_header

data/maps/headers/PalletTown.asm

@@ -0,0 +1,5 @@
+
+	map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH
+	connection north, Route1, ROUTE_1, 0
+	connection south, Route21, ROUTE_21, 0
+	end_map_header

data/maps/headers/PewterCity.asm

@@ -0,0 +1,5 @@
+
+	map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST
+	connection south, Route2, ROUTE_2, 5
+	connection east, Route3, ROUTE_3, 4
+	end_map_header

data/maps/headers/PewterGym.asm

@@ -0,0 +1,3 @@
+
+	map_header PewterGym, PEWTER_GYM, GYM, 0
+	end_map_header

data/maps/headers/PewterMart.asm

@@ -0,0 +1,3 @@
+
+	map_header PewterMart, PEWTER_MART, MART, 0
+	end_map_header

data/maps/headers/PewterNidoranHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/PewterPokecenter.asm

@@ -0,0 +1,3 @@
+
+	map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0
+	end_map_header

data/maps/headers/PewterSpeechHouse.asm

@@ -0,0 +1,3 @@
+
+	map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0
+	end_map_header

data/maps/headers/PokemonFanClub.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0
+	end_map_header

data/maps/headers/PokemonMansion1F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0
+	end_map_header

data/maps/headers/PokemonMansion2F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0
+	end_map_header

data/maps/headers/PokemonMansion3F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0
+	end_map_header

data/maps/headers/PokemonMansionB1F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0
+	end_map_header

data/maps/headers/PokemonTower1F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0
+	end_map_header

data/maps/headers/PokemonTower2F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0
+	end_map_header

data/maps/headers/PokemonTower3F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0
+	end_map_header

data/maps/headers/PokemonTower4F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0
+	end_map_header

data/maps/headers/PokemonTower5F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0
+	end_map_header

data/maps/headers/PokemonTower6F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0
+	end_map_header

data/maps/headers/PokemonTower7F.asm

@@ -0,0 +1,3 @@
+
+	map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0
+	end_map_header