diff --git a/data/maps/headers/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm index 882d03e01c..7bd690d81f 100644 --- a/data/maps/headers/AgathasRoom.asm +++ b/data/maps/headers/AgathasRoom.asm @@ -1,2 +1,2 @@ - map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0 + map_header AgathasRoom, AGATHAS_ROOM, CEMETERY end_map_header diff --git a/data/maps/headers/BikeShop.asm b/data/maps/headers/BikeShop.asm index a9ef30944f..29fc46bfa2 100644 --- a/data/maps/headers/BikeShop.asm +++ b/data/maps/headers/BikeShop.asm @@ -1,2 +1,2 @@ - map_header BikeShop, BIKE_SHOP, CLUB, 0 + map_header BikeShop, BIKE_SHOP, CLUB end_map_header diff --git a/data/maps/headers/BillsHouse.asm b/data/maps/headers/BillsHouse.asm index 363234fddb..fdea540f8d 100644 --- a/data/maps/headers/BillsHouse.asm +++ b/data/maps/headers/BillsHouse.asm @@ -1,2 +1,2 @@ - map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0 + map_header BillsHouse, BILLS_HOUSE, INTERIOR end_map_header diff --git a/data/maps/headers/BluesHouse.asm b/data/maps/headers/BluesHouse.asm index de4b51f4cc..11b92e5dd7 100644 --- a/data/maps/headers/BluesHouse.asm +++ b/data/maps/headers/BluesHouse.asm @@ -1,2 +1,2 @@ - map_header BluesHouse, BLUES_HOUSE, HOUSE, 0 + map_header BluesHouse, BLUES_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm index 706d5ccdb6..bafeece60d 100644 --- a/data/maps/headers/BrunosRoom.asm +++ b/data/maps/headers/BrunosRoom.asm @@ -1,2 +1,2 @@ - map_header BrunosRoom, BRUNOS_ROOM, GYM, 0 + map_header BrunosRoom, BRUNOS_ROOM, GYM end_map_header diff --git a/data/maps/headers/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm index c8225665c7..a8296c3237 100644 --- a/data/maps/headers/CeladonChiefHouse.asm +++ b/data/maps/headers/CeladonChiefHouse.asm @@ -1,2 +1,2 @@ - map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0 + map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION end_map_header diff --git a/data/maps/headers/CeladonCity.asm b/data/maps/headers/CeladonCity.asm index afd93c6292..50213fd243 100644 --- a/data/maps/headers/CeladonCity.asm +++ b/data/maps/headers/CeladonCity.asm @@ -1,4 +1,4 @@ - map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST + map_header CeladonCity, CELADON_CITY, OVERWORLD connection west, Route16, ROUTE_16, 4 connection east, Route7, ROUTE_7, 4 end_map_header diff --git a/data/maps/headers/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm index 1afd5dd93e..0d8bf9e5d0 100644 --- a/data/maps/headers/CeladonDiner.asm +++ b/data/maps/headers/CeladonDiner.asm @@ -1,2 +1,2 @@ - map_header CeladonDiner, CELADON_DINER, LOBBY, 0 + map_header CeladonDiner, CELADON_DINER, LOBBY end_map_header diff --git a/data/maps/headers/CeladonGym.asm b/data/maps/headers/CeladonGym.asm index 66cec4d3fc..7a96eef085 100644 --- a/data/maps/headers/CeladonGym.asm +++ b/data/maps/headers/CeladonGym.asm @@ -1,2 +1,2 @@ - map_header CeladonGym, CELADON_GYM, GYM, 0 + map_header CeladonGym, CELADON_GYM, GYM end_map_header diff --git a/data/maps/headers/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm index ea5cf5e173..8e9a02db0a 100644 --- a/data/maps/headers/CeladonHotel.asm +++ b/data/maps/headers/CeladonHotel.asm @@ -1,2 +1,2 @@ - map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0 + map_header CeladonHotel, CELADON_HOTEL, POKECENTER end_map_header diff --git a/data/maps/headers/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm index a35fb1dd29..426c63ee93 100644 --- a/data/maps/headers/CeladonMansion1F.asm +++ b/data/maps/headers/CeladonMansion1F.asm @@ -1,2 +1,2 @@ - map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0 + map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION end_map_header diff --git a/data/maps/headers/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm index 1450a09377..64a6c57cb1 100644 --- a/data/maps/headers/CeladonMansion2F.asm +++ b/data/maps/headers/CeladonMansion2F.asm @@ -1,2 +1,2 @@ - map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0 + map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION end_map_header diff --git a/data/maps/headers/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm index e63113ccab..e76da972f4 100644 --- a/data/maps/headers/CeladonMansion3F.asm +++ b/data/maps/headers/CeladonMansion3F.asm @@ -1,2 +1,2 @@ - map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0 + map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION end_map_header diff --git a/data/maps/headers/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm index a1ace86d05..d9ae5f26c0 100644 --- a/data/maps/headers/CeladonMansionRoof.asm +++ b/data/maps/headers/CeladonMansionRoof.asm @@ -1,2 +1,2 @@ - map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0 + map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION end_map_header diff --git a/data/maps/headers/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm index 5b155f72bc..19a73230bb 100644 --- a/data/maps/headers/CeladonMansionRoofHouse.asm +++ b/data/maps/headers/CeladonMansionRoofHouse.asm @@ -1,2 +1,2 @@ - map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0 + map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm index d13751466c..e2d28a1146 100644 --- a/data/maps/headers/CeladonMart1F.asm +++ b/data/maps/headers/CeladonMart1F.asm @@ -1,2 +1,2 @@ - map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0 + map_header CeladonMart1F, CELADON_MART_1F, LOBBY end_map_header diff --git a/data/maps/headers/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm index 2117cd7662..68fd632dea 100644 --- a/data/maps/headers/CeladonMart2F.asm +++ b/data/maps/headers/CeladonMart2F.asm @@ -1,2 +1,2 @@ - map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0 + map_header CeladonMart2F, CELADON_MART_2F, LOBBY end_map_header diff --git a/data/maps/headers/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm index d3bd42825b..c81af400c5 100644 --- a/data/maps/headers/CeladonMart3F.asm +++ b/data/maps/headers/CeladonMart3F.asm @@ -1,2 +1,2 @@ - map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0 + map_header CeladonMart3F, CELADON_MART_3F, LOBBY end_map_header diff --git a/data/maps/headers/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm index c9f170c66a..4b63b3c5c6 100644 --- a/data/maps/headers/CeladonMart4F.asm +++ b/data/maps/headers/CeladonMart4F.asm @@ -1,2 +1,2 @@ - map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0 + map_header CeladonMart4F, CELADON_MART_4F, LOBBY end_map_header diff --git a/data/maps/headers/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm index 036e3cad75..8ce1faafca 100644 --- a/data/maps/headers/CeladonMart5F.asm +++ b/data/maps/headers/CeladonMart5F.asm @@ -1,2 +1,2 @@ - map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0 + map_header CeladonMart5F, CELADON_MART_5F, LOBBY end_map_header diff --git a/data/maps/headers/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm index 709b5d349b..57050bb345 100644 --- a/data/maps/headers/CeladonMartElevator.asm +++ b/data/maps/headers/CeladonMartElevator.asm @@ -1,2 +1,2 @@ - map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0 + map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY end_map_header diff --git a/data/maps/headers/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm index 42089ef0c9..da2b19c0b9 100644 --- a/data/maps/headers/CeladonMartRoof.asm +++ b/data/maps/headers/CeladonMartRoof.asm @@ -1,2 +1,2 @@ - map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0 + map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY end_map_header diff --git a/data/maps/headers/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm index e380d1ed61..b2bbb6c996 100644 --- a/data/maps/headers/CeladonPokecenter.asm +++ b/data/maps/headers/CeladonPokecenter.asm @@ -1,2 +1,2 @@ - map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0 + map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm index c06ee71915..36d0151e5a 100644 --- a/data/maps/headers/CeruleanBadgeHouse.asm +++ b/data/maps/headers/CeruleanBadgeHouse.asm @@ -1,2 +1,2 @@ - map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0 + map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP end_map_header diff --git a/data/maps/headers/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm index 49f6f0cde3..6c247c0302 100644 --- a/data/maps/headers/CeruleanCave1F.asm +++ b/data/maps/headers/CeruleanCave1F.asm @@ -1,2 +1,2 @@ - map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0 + map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN end_map_header diff --git a/data/maps/headers/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm index 8644b8ba43..48ce554d7c 100644 --- a/data/maps/headers/CeruleanCave2F.asm +++ b/data/maps/headers/CeruleanCave2F.asm @@ -1,2 +1,2 @@ - map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0 + map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN end_map_header diff --git a/data/maps/headers/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm index f7fe5d4365..5c85b3751e 100644 --- a/data/maps/headers/CeruleanCaveB1F.asm +++ b/data/maps/headers/CeruleanCaveB1F.asm @@ -1,2 +1,2 @@ - map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0 + map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN end_map_header diff --git a/data/maps/headers/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm index cf6c45a375..cb14da2f3c 100644 --- a/data/maps/headers/CeruleanCity.asm +++ b/data/maps/headers/CeruleanCity.asm @@ -1,4 +1,4 @@ - map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + map_header CeruleanCity, CERULEAN_CITY, OVERWORLD connection north, Route24, ROUTE_24, 5 connection south, Route5, ROUTE_5, 5 connection west, Route4, ROUTE_4, 4 diff --git a/data/maps/headers/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm index 8307e2d381..68225c9487 100644 --- a/data/maps/headers/CeruleanGym.asm +++ b/data/maps/headers/CeruleanGym.asm @@ -1,2 +1,2 @@ - map_header CeruleanGym, CERULEAN_GYM, GYM, 0 + map_header CeruleanGym, CERULEAN_GYM, GYM end_map_header diff --git a/data/maps/headers/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm index d611c42b89..a7d5b556a3 100644 --- a/data/maps/headers/CeruleanMart.asm +++ b/data/maps/headers/CeruleanMart.asm @@ -1,2 +1,2 @@ - map_header CeruleanMart, CERULEAN_MART, MART, 0 + map_header CeruleanMart, CERULEAN_MART, MART end_map_header diff --git a/data/maps/headers/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm index 5075e9d90a..dddcbe681e 100644 --- a/data/maps/headers/CeruleanPokecenter.asm +++ b/data/maps/headers/CeruleanPokecenter.asm @@ -1,2 +1,2 @@ - map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0 + map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm index 5a5076752b..a173ffe3fd 100644 --- a/data/maps/headers/CeruleanTradeHouse.asm +++ b/data/maps/headers/CeruleanTradeHouse.asm @@ -1,2 +1,2 @@ - map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0 + map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm index 76d9f83fb6..ce296e71bd 100644 --- a/data/maps/headers/CeruleanTrashedHouse.asm +++ b/data/maps/headers/CeruleanTrashedHouse.asm @@ -1,2 +1,2 @@ - map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0 + map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm index 818f1fb956..b68c5957bf 100644 --- a/data/maps/headers/ChampionsRoom.asm +++ b/data/maps/headers/ChampionsRoom.asm @@ -1,2 +1,2 @@ - map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0 + map_header ChampionsRoom, CHAMPIONS_ROOM, GYM end_map_header diff --git a/data/maps/headers/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm index cf21a8f1cd..1bd2f95b38 100644 --- a/data/maps/headers/CinnabarGym.asm +++ b/data/maps/headers/CinnabarGym.asm @@ -1,2 +1,2 @@ - map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0 + map_header CinnabarGym, CINNABAR_GYM, FACILITY end_map_header diff --git a/data/maps/headers/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm index e80b8f1e18..b535998f8a 100644 --- a/data/maps/headers/CinnabarIsland.asm +++ b/data/maps/headers/CinnabarIsland.asm @@ -1,4 +1,4 @@ - map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST + map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD connection north, Route21, ROUTE_21, 0 connection east, Route20, ROUTE_20, 0 end_map_header diff --git a/data/maps/headers/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm index 8d968d06d8..1a323c6bd7 100644 --- a/data/maps/headers/CinnabarLab.asm +++ b/data/maps/headers/CinnabarLab.asm @@ -1,2 +1,2 @@ - map_header CinnabarLab, CINNABAR_LAB, LAB, 0 + map_header CinnabarLab, CINNABAR_LAB, LAB end_map_header diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm index 1d072a500f..2d26dcd967 100644 --- a/data/maps/headers/CinnabarLabFossilRoom.asm +++ b/data/maps/headers/CinnabarLabFossilRoom.asm @@ -1,2 +1,2 @@ - map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0 + map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB end_map_header diff --git a/data/maps/headers/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm index ba9ffe967c..373ffb840f 100644 --- a/data/maps/headers/CinnabarLabMetronomeRoom.asm +++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm @@ -1,2 +1,2 @@ - map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0 + map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB end_map_header diff --git a/data/maps/headers/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm index 06d3984958..a6603badcb 100644 --- a/data/maps/headers/CinnabarLabTradeRoom.asm +++ b/data/maps/headers/CinnabarLabTradeRoom.asm @@ -1,2 +1,2 @@ - map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0 + map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB end_map_header diff --git a/data/maps/headers/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm index 9fcc306f43..d77e006f90 100644 --- a/data/maps/headers/CinnabarMart.asm +++ b/data/maps/headers/CinnabarMart.asm @@ -1,2 +1,2 @@ - map_header CinnabarMart, CINNABAR_MART, MART, 0 + map_header CinnabarMart, CINNABAR_MART, MART end_map_header diff --git a/data/maps/headers/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm index 87bca04d60..4c67c5baf6 100644 --- a/data/maps/headers/CinnabarPokecenter.asm +++ b/data/maps/headers/CinnabarPokecenter.asm @@ -1,2 +1,2 @@ - map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0 + map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/Colosseum.asm b/data/maps/headers/Colosseum.asm index 81fd1c4eaa..c9ad425717 100644 --- a/data/maps/headers/Colosseum.asm +++ b/data/maps/headers/Colosseum.asm @@ -1,2 +1,2 @@ - map_header Colosseum, COLOSSEUM, CLUB, 0 + map_header Colosseum, COLOSSEUM, CLUB end_map_header diff --git a/data/maps/headers/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm index 6f835fe836..e963a035cc 100644 --- a/data/maps/headers/CopycatsHouse1F.asm +++ b/data/maps/headers/CopycatsHouse1F.asm @@ -1,2 +1,2 @@ - map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0 + map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1 end_map_header diff --git a/data/maps/headers/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm index dc47db317f..d07f47627a 100644 --- a/data/maps/headers/CopycatsHouse2F.asm +++ b/data/maps/headers/CopycatsHouse2F.asm @@ -1,2 +1,2 @@ - map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0 + map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2 end_map_header diff --git a/data/maps/headers/Daycare.asm b/data/maps/headers/Daycare.asm index d0da367699..ca4f110a15 100644 --- a/data/maps/headers/Daycare.asm +++ b/data/maps/headers/Daycare.asm @@ -1,2 +1,2 @@ - map_header Daycare, DAYCARE, HOUSE, 0 + map_header Daycare, DAYCARE, HOUSE end_map_header diff --git a/data/maps/headers/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm index 7ebf14c88f..42d517ddac 100644 --- a/data/maps/headers/DiglettsCave.asm +++ b/data/maps/headers/DiglettsCave.asm @@ -1,2 +1,2 @@ - map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0 + map_header DiglettsCave, DIGLETTS_CAVE, CAVERN end_map_header diff --git a/data/maps/headers/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm index 874481dcf6..2a07a7fe25 100644 --- a/data/maps/headers/DiglettsCaveRoute11.asm +++ b/data/maps/headers/DiglettsCaveRoute11.asm @@ -1,2 +1,2 @@ - map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0 + map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN end_map_header diff --git a/data/maps/headers/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm index e61f797215..a201b7f0fe 100644 --- a/data/maps/headers/DiglettsCaveRoute2.asm +++ b/data/maps/headers/DiglettsCaveRoute2.asm @@ -1,2 +1,2 @@ - map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0 + map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN end_map_header diff --git a/data/maps/headers/FightingDojo.asm b/data/maps/headers/FightingDojo.asm index 7702279a8e..5823fb8f05 100644 --- a/data/maps/headers/FightingDojo.asm +++ b/data/maps/headers/FightingDojo.asm @@ -1,2 +1,2 @@ - map_header FightingDojo, FIGHTING_DOJO, DOJO, 0 + map_header FightingDojo, FIGHTING_DOJO, DOJO end_map_header diff --git a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm index 944c7ac887..95de3d301d 100644 --- a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm @@ -1,2 +1,2 @@ - map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0 + map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm index 8cfec10928..8f2bbcd7c3 100644 --- a/data/maps/headers/FuchsiaCity.asm +++ b/data/maps/headers/FuchsiaCity.asm @@ -1,4 +1,4 @@ - map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST + map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD connection south, Route19, ROUTE_19, 5 connection west, Route18, ROUTE_18, 4 connection east, Route15, ROUTE_15, 4 diff --git a/data/maps/headers/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm index 2bf65a92bb..c71445f330 100644 --- a/data/maps/headers/FuchsiaGoodRodHouse.asm +++ b/data/maps/headers/FuchsiaGoodRodHouse.asm @@ -1,2 +1,2 @@ - map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0 + map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP end_map_header diff --git a/data/maps/headers/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm index 1c51b53cfb..851c5a442d 100644 --- a/data/maps/headers/FuchsiaGym.asm +++ b/data/maps/headers/FuchsiaGym.asm @@ -1,2 +1,2 @@ - map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0 + map_header FuchsiaGym, FUCHSIA_GYM, GYM end_map_header diff --git a/data/maps/headers/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm index b56dafa8fb..3fa369c548 100644 --- a/data/maps/headers/FuchsiaMart.asm +++ b/data/maps/headers/FuchsiaMart.asm @@ -1,2 +1,2 @@ - map_header FuchsiaMart, FUCHSIA_MART, MART, 0 + map_header FuchsiaMart, FUCHSIA_MART, MART end_map_header diff --git a/data/maps/headers/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm index 9bf88bbfc4..0c1cb4b738 100644 --- a/data/maps/headers/FuchsiaMeetingRoom.asm +++ b/data/maps/headers/FuchsiaMeetingRoom.asm @@ -1,2 +1,2 @@ - map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0 + map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB end_map_header diff --git a/data/maps/headers/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm index fae3c293a0..1d3243734e 100644 --- a/data/maps/headers/FuchsiaPokecenter.asm +++ b/data/maps/headers/FuchsiaPokecenter.asm @@ -1,2 +1,2 @@ - map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0 + map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/GameCorner.asm b/data/maps/headers/GameCorner.asm index 7507a364ae..34adb1574c 100644 --- a/data/maps/headers/GameCorner.asm +++ b/data/maps/headers/GameCorner.asm @@ -1,2 +1,2 @@ - map_header GameCorner, GAME_CORNER, LOBBY, 0 + map_header GameCorner, GAME_CORNER, LOBBY end_map_header diff --git a/data/maps/headers/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm index 6e08abf5d0..e764df3464 100644 --- a/data/maps/headers/GameCornerPrizeRoom.asm +++ b/data/maps/headers/GameCornerPrizeRoom.asm @@ -1,2 +1,2 @@ - map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0 + map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY end_map_header diff --git a/data/maps/headers/HallOfFame.asm b/data/maps/headers/HallOfFame.asm index bccc334ac2..c082324868 100644 --- a/data/maps/headers/HallOfFame.asm +++ b/data/maps/headers/HallOfFame.asm @@ -1,2 +1,2 @@ - map_header HallOfFame, HALL_OF_FAME, GYM, 0 + map_header HallOfFame, HALL_OF_FAME, GYM end_map_header diff --git a/data/maps/headers/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm index 7f2f1d02b5..90e6e04ab7 100644 --- a/data/maps/headers/IndigoPlateau.asm +++ b/data/maps/headers/IndigoPlateau.asm @@ -1,3 +1,3 @@ - map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH + map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU connection south, Route23, ROUTE_23, 0 end_map_header diff --git a/data/maps/headers/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm index 639faef6d2..2c1df81235 100644 --- a/data/maps/headers/IndigoPlateauLobby.asm +++ b/data/maps/headers/IndigoPlateauLobby.asm @@ -1,2 +1,2 @@ - map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0 + map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART end_map_header diff --git a/data/maps/headers/LancesRoom.asm b/data/maps/headers/LancesRoom.asm index 4075ac94c7..b848ed7a5a 100644 --- a/data/maps/headers/LancesRoom.asm +++ b/data/maps/headers/LancesRoom.asm @@ -1,2 +1,2 @@ - map_header LancesRoom, LANCES_ROOM, DOJO, 0 + map_header LancesRoom, LANCES_ROOM, DOJO end_map_header diff --git a/data/maps/headers/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm index bbb91b2ddc..36482a2c9a 100644 --- a/data/maps/headers/LavenderCuboneHouse.asm +++ b/data/maps/headers/LavenderCuboneHouse.asm @@ -1,2 +1,2 @@ - map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0 + map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/LavenderMart.asm b/data/maps/headers/LavenderMart.asm index 385e877102..81575bf25b 100644 --- a/data/maps/headers/LavenderMart.asm +++ b/data/maps/headers/LavenderMart.asm @@ -1,2 +1,2 @@ - map_header LavenderMart, LAVENDER_MART, MART, 0 + map_header LavenderMart, LAVENDER_MART, MART end_map_header diff --git a/data/maps/headers/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm index ff3ee244fb..1e694797d2 100644 --- a/data/maps/headers/LavenderPokecenter.asm +++ b/data/maps/headers/LavenderPokecenter.asm @@ -1,2 +1,2 @@ - map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0 + map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/LavenderTown.asm b/data/maps/headers/LavenderTown.asm index 27ac9eb16f..7db5750dc2 100644 --- a/data/maps/headers/LavenderTown.asm +++ b/data/maps/headers/LavenderTown.asm @@ -1,4 +1,4 @@ - map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST + map_header LavenderTown, LAVENDER_TOWN, OVERWORLD connection north, Route10, ROUTE_10, 0 connection south, Route12, ROUTE_12, 0 connection west, Route8, ROUTE_8, 0 diff --git a/data/maps/headers/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm index 862ad868cc..cdd5df4faa 100644 --- a/data/maps/headers/LoreleisRoom.asm +++ b/data/maps/headers/LoreleisRoom.asm @@ -1,2 +1,2 @@ - map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0 + map_header LoreleisRoom, LORELEIS_ROOM, GYM end_map_header diff --git a/data/maps/headers/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm index 86cfbb53c2..a250deb87a 100644 --- a/data/maps/headers/MrFujisHouse.asm +++ b/data/maps/headers/MrFujisHouse.asm @@ -1,2 +1,2 @@ - map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0 + map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm index 1d826f3aa2..cd52a76ce7 100644 --- a/data/maps/headers/MrPsychicsHouse.asm +++ b/data/maps/headers/MrPsychicsHouse.asm @@ -1,2 +1,2 @@ - map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0 + map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm index 82eca4ca65..5835155179 100644 --- a/data/maps/headers/MtMoon1F.asm +++ b/data/maps/headers/MtMoon1F.asm @@ -1,2 +1,2 @@ - map_header MtMoon1F, MT_MOON_1F, CAVERN, 0 + map_header MtMoon1F, MT_MOON_1F, CAVERN end_map_header diff --git a/data/maps/headers/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm index 66923c816f..ca1a69b932 100644 --- a/data/maps/headers/MtMoonB1F.asm +++ b/data/maps/headers/MtMoonB1F.asm @@ -1,2 +1,2 @@ - map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0 + map_header MtMoonB1F, MT_MOON_B1F, CAVERN end_map_header diff --git a/data/maps/headers/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm index 3f0595bdea..b58464f9a6 100644 --- a/data/maps/headers/MtMoonB2F.asm +++ b/data/maps/headers/MtMoonB2F.asm @@ -1,2 +1,2 @@ - map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0 + map_header MtMoonB2F, MT_MOON_B2F, CAVERN end_map_header diff --git a/data/maps/headers/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm index 2d187f5f7f..de2759328a 100644 --- a/data/maps/headers/MtMoonPokecenter.asm +++ b/data/maps/headers/MtMoonPokecenter.asm @@ -1,2 +1,2 @@ - map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0 + map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/Museum1F.asm b/data/maps/headers/Museum1F.asm index a42b8eeade..b3334f9821 100644 --- a/data/maps/headers/Museum1F.asm +++ b/data/maps/headers/Museum1F.asm @@ -1,2 +1,2 @@ - map_header Museum1F, MUSEUM_1F, MUSEUM, 0 + map_header Museum1F, MUSEUM_1F, MUSEUM end_map_header diff --git a/data/maps/headers/Museum2F.asm b/data/maps/headers/Museum2F.asm index 9d4e4273f9..20a6e3a887 100644 --- a/data/maps/headers/Museum2F.asm +++ b/data/maps/headers/Museum2F.asm @@ -1,2 +1,2 @@ - map_header Museum2F, MUSEUM_2F, MUSEUM, 0 + map_header Museum2F, MUSEUM_2F, MUSEUM end_map_header diff --git a/data/maps/headers/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm index 86e17b895f..fd2d60f2f0 100644 --- a/data/maps/headers/NameRatersHouse.asm +++ b/data/maps/headers/NameRatersHouse.asm @@ -1,2 +1,2 @@ - map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0 + map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/OaksLab.asm b/data/maps/headers/OaksLab.asm index 44483e939b..ada2e344ad 100644 --- a/data/maps/headers/OaksLab.asm +++ b/data/maps/headers/OaksLab.asm @@ -1,2 +1,2 @@ - map_header OaksLab, OAKS_LAB, DOJO, 0 + map_header OaksLab, OAKS_LAB, DOJO end_map_header diff --git a/data/maps/headers/PalletTown.asm b/data/maps/headers/PalletTown.asm index bdc43e4def..fa6049cde0 100644 --- a/data/maps/headers/PalletTown.asm +++ b/data/maps/headers/PalletTown.asm @@ -1,4 +1,4 @@ - map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH + map_header PalletTown, PALLET_TOWN, OVERWORLD connection north, Route1, ROUTE_1, 0 connection south, Route21, ROUTE_21, 0 end_map_header diff --git a/data/maps/headers/PewterCity.asm b/data/maps/headers/PewterCity.asm index bfc1f3eb9c..2b93b99dd7 100644 --- a/data/maps/headers/PewterCity.asm +++ b/data/maps/headers/PewterCity.asm @@ -1,4 +1,4 @@ - map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST + map_header PewterCity, PEWTER_CITY, OVERWORLD connection south, Route2, ROUTE_2, 5 connection east, Route3, ROUTE_3, 4 end_map_header diff --git a/data/maps/headers/PewterGym.asm b/data/maps/headers/PewterGym.asm index 272b47c5cf..75440b980c 100644 --- a/data/maps/headers/PewterGym.asm +++ b/data/maps/headers/PewterGym.asm @@ -1,2 +1,2 @@ - map_header PewterGym, PEWTER_GYM, GYM, 0 + map_header PewterGym, PEWTER_GYM, GYM end_map_header diff --git a/data/maps/headers/PewterMart.asm b/data/maps/headers/PewterMart.asm index 91b98739d6..dc74aa8152 100644 --- a/data/maps/headers/PewterMart.asm +++ b/data/maps/headers/PewterMart.asm @@ -1,2 +1,2 @@ - map_header PewterMart, PEWTER_MART, MART, 0 + map_header PewterMart, PEWTER_MART, MART end_map_header diff --git a/data/maps/headers/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm index 7dd43ee011..9485606355 100644 --- a/data/maps/headers/PewterNidoranHouse.asm +++ b/data/maps/headers/PewterNidoranHouse.asm @@ -1,2 +1,2 @@ - map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0 + map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm index 07a3716891..ca5fb31e3d 100644 --- a/data/maps/headers/PewterPokecenter.asm +++ b/data/maps/headers/PewterPokecenter.asm @@ -1,2 +1,2 @@ - map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0 + map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm index 0462ebc138..f4da18abd0 100644 --- a/data/maps/headers/PewterSpeechHouse.asm +++ b/data/maps/headers/PewterSpeechHouse.asm @@ -1,2 +1,2 @@ - map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0 + map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm index 12abe59e7f..162191e7bd 100644 --- a/data/maps/headers/PokemonFanClub.asm +++ b/data/maps/headers/PokemonFanClub.asm @@ -1,2 +1,2 @@ - map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0 + map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR end_map_header diff --git a/data/maps/headers/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm index 2cdc2ee38c..887fee1578 100644 --- a/data/maps/headers/PokemonMansion1F.asm +++ b/data/maps/headers/PokemonMansion1F.asm @@ -1,2 +1,2 @@ - map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0 + map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY end_map_header diff --git a/data/maps/headers/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm index c2ffa95c0a..364f494ed4 100644 --- a/data/maps/headers/PokemonMansion2F.asm +++ b/data/maps/headers/PokemonMansion2F.asm @@ -1,2 +1,2 @@ - map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0 + map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY end_map_header diff --git a/data/maps/headers/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm index 9588013f8a..a28e65dc0c 100644 --- a/data/maps/headers/PokemonMansion3F.asm +++ b/data/maps/headers/PokemonMansion3F.asm @@ -1,2 +1,2 @@ - map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0 + map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY end_map_header diff --git a/data/maps/headers/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm index 5e2a964676..1c96cdb114 100644 --- a/data/maps/headers/PokemonMansionB1F.asm +++ b/data/maps/headers/PokemonMansionB1F.asm @@ -1,2 +1,2 @@ - map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0 + map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY end_map_header diff --git a/data/maps/headers/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm index 51fec360bc..9d54e0019d 100644 --- a/data/maps/headers/PokemonTower1F.asm +++ b/data/maps/headers/PokemonTower1F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0 + map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY end_map_header diff --git a/data/maps/headers/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm index aa55737d02..f2b7be3707 100644 --- a/data/maps/headers/PokemonTower2F.asm +++ b/data/maps/headers/PokemonTower2F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0 + map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY end_map_header diff --git a/data/maps/headers/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm index 88717251d8..071f1f59d9 100644 --- a/data/maps/headers/PokemonTower3F.asm +++ b/data/maps/headers/PokemonTower3F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0 + map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY end_map_header diff --git a/data/maps/headers/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm index 8e54dbed6e..92cdc574ea 100644 --- a/data/maps/headers/PokemonTower4F.asm +++ b/data/maps/headers/PokemonTower4F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0 + map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY end_map_header diff --git a/data/maps/headers/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm index c070b5e630..2a49b0d496 100644 --- a/data/maps/headers/PokemonTower5F.asm +++ b/data/maps/headers/PokemonTower5F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0 + map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY end_map_header diff --git a/data/maps/headers/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm index d616e99525..767560c006 100644 --- a/data/maps/headers/PokemonTower6F.asm +++ b/data/maps/headers/PokemonTower6F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0 + map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY end_map_header diff --git a/data/maps/headers/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm index 6a6eff8247..ca86374906 100644 --- a/data/maps/headers/PokemonTower7F.asm +++ b/data/maps/headers/PokemonTower7F.asm @@ -1,2 +1,2 @@ - map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0 + map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY end_map_header diff --git a/data/maps/headers/PowerPlant.asm b/data/maps/headers/PowerPlant.asm index bf1dcd9f25..0df7c46bd7 100644 --- a/data/maps/headers/PowerPlant.asm +++ b/data/maps/headers/PowerPlant.asm @@ -1,2 +1,2 @@ - map_header PowerPlant, POWER_PLANT, FACILITY, 0 + map_header PowerPlant, POWER_PLANT, FACILITY end_map_header diff --git a/data/maps/headers/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm index 938c72d69e..751e7b0582 100644 --- a/data/maps/headers/RedsHouse1F.asm +++ b/data/maps/headers/RedsHouse1F.asm @@ -1,2 +1,2 @@ - map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1, 0 + map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1 end_map_header diff --git a/data/maps/headers/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm index 65eb0f9b52..898fb01d11 100644 --- a/data/maps/headers/RedsHouse2F.asm +++ b/data/maps/headers/RedsHouse2F.asm @@ -1,2 +1,2 @@ - map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2, $00 + map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2 end_map_header diff --git a/data/maps/headers/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm index f9cb92913f..67677edf18 100644 --- a/data/maps/headers/RockTunnel1F.asm +++ b/data/maps/headers/RockTunnel1F.asm @@ -1,2 +1,2 @@ - map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN, 0 + map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN end_map_header diff --git a/data/maps/headers/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm index f812afde5c..fda9a9ea7a 100644 --- a/data/maps/headers/RockTunnelB1F.asm +++ b/data/maps/headers/RockTunnelB1F.asm @@ -1,2 +1,2 @@ - map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN, 0 + map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN end_map_header diff --git a/data/maps/headers/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm index 8203405894..6573c5dda8 100644 --- a/data/maps/headers/RockTunnelPokecenter.asm +++ b/data/maps/headers/RockTunnelPokecenter.asm @@ -1,2 +1,2 @@ - map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER, 0 + map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm index 5c4ba0633c..eb1650d9ad 100644 --- a/data/maps/headers/RocketHideoutB1F.asm +++ b/data/maps/headers/RocketHideoutB1F.asm @@ -1,2 +1,2 @@ - map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY, 0 + map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY end_map_header diff --git a/data/maps/headers/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm index aa15717f35..01bc80b629 100644 --- a/data/maps/headers/RocketHideoutB2F.asm +++ b/data/maps/headers/RocketHideoutB2F.asm @@ -1,2 +1,2 @@ - map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY, 0 + map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY end_map_header diff --git a/data/maps/headers/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm index 737e74cf56..655493003b 100644 --- a/data/maps/headers/RocketHideoutB3F.asm +++ b/data/maps/headers/RocketHideoutB3F.asm @@ -1,2 +1,2 @@ - map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY, 0 + map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY end_map_header diff --git a/data/maps/headers/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm index 9897f7c3ea..768e868fd8 100644 --- a/data/maps/headers/RocketHideoutB4F.asm +++ b/data/maps/headers/RocketHideoutB4F.asm @@ -1,2 +1,2 @@ - map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY, 0 + map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY end_map_header diff --git a/data/maps/headers/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm index ceb4711a22..372c075fbc 100644 --- a/data/maps/headers/RocketHideoutElevator.asm +++ b/data/maps/headers/RocketHideoutElevator.asm @@ -1,2 +1,2 @@ - map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY, 0 + map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY end_map_header diff --git a/data/maps/headers/Route1.asm b/data/maps/headers/Route1.asm index 36e53d83b8..c7fa77a2ff 100644 --- a/data/maps/headers/Route1.asm +++ b/data/maps/headers/Route1.asm @@ -1,4 +1,4 @@ - map_header Route1, ROUTE_1, OVERWORLD, NORTH | SOUTH + map_header Route1, ROUTE_1, OVERWORLD connection north, ViridianCity, VIRIDIAN_CITY, -5 connection south, PalletTown, PALLET_TOWN, 0 end_map_header diff --git a/data/maps/headers/Route10.asm b/data/maps/headers/Route10.asm index c1d35489e6..ac06987f59 100644 --- a/data/maps/headers/Route10.asm +++ b/data/maps/headers/Route10.asm @@ -1,4 +1,4 @@ - map_header Route10, ROUTE_10, OVERWORLD, SOUTH | WEST + map_header Route10, ROUTE_10, OVERWORLD connection south, LavenderTown, LAVENDER_TOWN, 0 connection west, Route9, ROUTE_9, 0 end_map_header diff --git a/data/maps/headers/Route11.asm b/data/maps/headers/Route11.asm index d71eeb8286..2d365de5f9 100644 --- a/data/maps/headers/Route11.asm +++ b/data/maps/headers/Route11.asm @@ -1,4 +1,4 @@ - map_header Route11, ROUTE_11, OVERWORLD, WEST | EAST + map_header Route11, ROUTE_11, OVERWORLD connection west, VermilionCity, VERMILION_CITY, -4 connection east, Route12, ROUTE_12, -27 end_map_header diff --git a/data/maps/headers/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm index bd8a2679e1..13d5f8a474 100644 --- a/data/maps/headers/Route11Gate1F.asm +++ b/data/maps/headers/Route11Gate1F.asm @@ -1,2 +1,2 @@ - map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE, 0 + map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE end_map_header diff --git a/data/maps/headers/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm index 33ab2f90a9..e5cfae8ab9 100644 --- a/data/maps/headers/Route11Gate2F.asm +++ b/data/maps/headers/Route11Gate2F.asm @@ -1,2 +1,2 @@ - map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE, 0 + map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE end_map_header diff --git a/data/maps/headers/Route12.asm b/data/maps/headers/Route12.asm index c013784cae..531190fe6d 100644 --- a/data/maps/headers/Route12.asm +++ b/data/maps/headers/Route12.asm @@ -1,4 +1,4 @@ - map_header Route12, ROUTE_12, OVERWORLD, NORTH | SOUTH | WEST + map_header Route12, ROUTE_12, OVERWORLD connection north, LavenderTown, LAVENDER_TOWN, 0 connection south, Route13, ROUTE_13, -20 connection west, Route11, ROUTE_11, 27 diff --git a/data/maps/headers/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm index fa3c99a675..936082b1c2 100644 --- a/data/maps/headers/Route12Gate1F.asm +++ b/data/maps/headers/Route12Gate1F.asm @@ -1,2 +1,2 @@ - map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE, 0 + map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE end_map_header diff --git a/data/maps/headers/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm index 0938607f60..0919d7daf5 100644 --- a/data/maps/headers/Route12Gate2F.asm +++ b/data/maps/headers/Route12Gate2F.asm @@ -1,2 +1,2 @@ - map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE, 0 + map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE end_map_header diff --git a/data/maps/headers/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm index a904c839e8..522a840a38 100644 --- a/data/maps/headers/Route12SuperRodHouse.asm +++ b/data/maps/headers/Route12SuperRodHouse.asm @@ -1,2 +1,2 @@ - map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0 + map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/Route13.asm b/data/maps/headers/Route13.asm index 139156d5cb..1f0163d146 100644 --- a/data/maps/headers/Route13.asm +++ b/data/maps/headers/Route13.asm @@ -1,4 +1,4 @@ - map_header Route13, ROUTE_13, OVERWORLD, NORTH | WEST + map_header Route13, ROUTE_13, OVERWORLD connection north, Route12, ROUTE_12, 20 connection west, Route14, ROUTE_14, 0 end_map_header diff --git a/data/maps/headers/Route14.asm b/data/maps/headers/Route14.asm index 4b98c5f5c3..ec843302d4 100644 --- a/data/maps/headers/Route14.asm +++ b/data/maps/headers/Route14.asm @@ -1,4 +1,4 @@ - map_header Route14, ROUTE_14, OVERWORLD, WEST | EAST + map_header Route14, ROUTE_14, OVERWORLD connection west, Route15, ROUTE_15, 18 connection east, Route13, ROUTE_13, 0 end_map_header diff --git a/data/maps/headers/Route15.asm b/data/maps/headers/Route15.asm index 3253eda9da..a5ce23b52b 100644 --- a/data/maps/headers/Route15.asm +++ b/data/maps/headers/Route15.asm @@ -1,4 +1,4 @@ - map_header Route15, ROUTE_15, OVERWORLD, WEST | EAST + map_header Route15, ROUTE_15, OVERWORLD connection west, FuchsiaCity, FUCHSIA_CITY, -4 connection east, Route14, ROUTE_14, -18 end_map_header diff --git a/data/maps/headers/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm index 32d0b3bf06..7015b4e45f 100644 --- a/data/maps/headers/Route15Gate1F.asm +++ b/data/maps/headers/Route15Gate1F.asm @@ -1,2 +1,2 @@ - map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE, 0 + map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE end_map_header diff --git a/data/maps/headers/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm index 1a700146df..641a51979c 100644 --- a/data/maps/headers/Route15Gate2F.asm +++ b/data/maps/headers/Route15Gate2F.asm @@ -1,2 +1,2 @@ - map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE, 0 + map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE end_map_header diff --git a/data/maps/headers/Route16.asm b/data/maps/headers/Route16.asm index 3190be86d2..08e4455afb 100644 --- a/data/maps/headers/Route16.asm +++ b/data/maps/headers/Route16.asm @@ -1,4 +1,4 @@ - map_header Route16, ROUTE_16, OVERWORLD, SOUTH | EAST + map_header Route16, ROUTE_16, OVERWORLD connection south, Route17, ROUTE_17, 0 connection east, CeladonCity, CELADON_CITY, -4 end_map_header diff --git a/data/maps/headers/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm index df6f584561..5be2c115b2 100644 --- a/data/maps/headers/Route16FlyHouse.asm +++ b/data/maps/headers/Route16FlyHouse.asm @@ -1,2 +1,2 @@ - map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE, 0 + map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm index 05f23dd02a..b383a525b0 100644 --- a/data/maps/headers/Route16Gate1F.asm +++ b/data/maps/headers/Route16Gate1F.asm @@ -1,2 +1,2 @@ - map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE, 0 + map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE end_map_header diff --git a/data/maps/headers/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm index b2e9507e11..acefb61d8d 100644 --- a/data/maps/headers/Route16Gate2F.asm +++ b/data/maps/headers/Route16Gate2F.asm @@ -1,2 +1,2 @@ - map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE, 0 + map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE end_map_header diff --git a/data/maps/headers/Route17.asm b/data/maps/headers/Route17.asm index ff8a6be085..8cc98b2bd0 100644 --- a/data/maps/headers/Route17.asm +++ b/data/maps/headers/Route17.asm @@ -1,4 +1,4 @@ - map_header Route17, ROUTE_17, OVERWORLD, NORTH | SOUTH + map_header Route17, ROUTE_17, OVERWORLD connection north, Route16, ROUTE_16, 0 connection south, Route18, ROUTE_18, 0 end_map_header diff --git a/data/maps/headers/Route18.asm b/data/maps/headers/Route18.asm index 2068781c4e..d46ea85170 100644 --- a/data/maps/headers/Route18.asm +++ b/data/maps/headers/Route18.asm @@ -1,4 +1,4 @@ - map_header Route18, ROUTE_18, OVERWORLD, NORTH | EAST + map_header Route18, ROUTE_18, OVERWORLD connection north, Route17, ROUTE_17, 0 connection east, FuchsiaCity, FUCHSIA_CITY, -4 end_map_header diff --git a/data/maps/headers/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm index 05aa68b15a..67f0deb244 100644 --- a/data/maps/headers/Route18Gate1F.asm +++ b/data/maps/headers/Route18Gate1F.asm @@ -1,2 +1,2 @@ - map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE, 0 + map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE end_map_header diff --git a/data/maps/headers/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm index 7317384a35..2834d9ef1b 100644 --- a/data/maps/headers/Route18Gate2F.asm +++ b/data/maps/headers/Route18Gate2F.asm @@ -1,2 +1,2 @@ - map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE, 0 + map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE end_map_header diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm index 9ea5f1593e..dc5b8a79df 100644 --- a/data/maps/headers/Route19.asm +++ b/data/maps/headers/Route19.asm @@ -1,4 +1,4 @@ - map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST + map_header Route19, ROUTE_19, OVERWORLD connection north, FuchsiaCity, FUCHSIA_CITY, -5 connection west, Route20, ROUTE_20, 18 end_map_header diff --git a/data/maps/headers/Route2.asm b/data/maps/headers/Route2.asm index 5fcb3f70a2..ef6250490e 100644 --- a/data/maps/headers/Route2.asm +++ b/data/maps/headers/Route2.asm @@ -1,4 +1,4 @@ - map_header Route2, ROUTE_2, OVERWORLD, NORTH | SOUTH + map_header Route2, ROUTE_2, OVERWORLD connection north, PewterCity, PEWTER_CITY, -5 connection south, ViridianCity, VIRIDIAN_CITY, -5 end_map_header diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm index cc9ffbc794..605058b3c0 100644 --- a/data/maps/headers/Route20.asm +++ b/data/maps/headers/Route20.asm @@ -1,4 +1,4 @@ - map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST + map_header Route20, ROUTE_20, OVERWORLD connection west, CinnabarIsland, CINNABAR_ISLAND, 0 connection east, Route19, ROUTE_19, -18 end_map_header diff --git a/data/maps/headers/Route21.asm b/data/maps/headers/Route21.asm index 968af4e0bf..eb56ccb8ba 100644 --- a/data/maps/headers/Route21.asm +++ b/data/maps/headers/Route21.asm @@ -1,4 +1,4 @@ - map_header Route21, ROUTE_21, OVERWORLD, NORTH | SOUTH + map_header Route21, ROUTE_21, OVERWORLD connection north, PalletTown, PALLET_TOWN, 0 connection south, CinnabarIsland, CINNABAR_ISLAND, 0 end_map_header diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm index 8370b8e240..8afa79ce1c 100644 --- a/data/maps/headers/Route22.asm +++ b/data/maps/headers/Route22.asm @@ -1,4 +1,4 @@ - map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST + map_header Route22, ROUTE_22, OVERWORLD connection north, Route23, ROUTE_23, 0 ; unnecessary connection east, ViridianCity, VIRIDIAN_CITY, -4 end_map_header diff --git a/data/maps/headers/Route22Gate.asm b/data/maps/headers/Route22Gate.asm index bac7eb7062..5cd32f2277 100644 --- a/data/maps/headers/Route22Gate.asm +++ b/data/maps/headers/Route22Gate.asm @@ -1,2 +1,2 @@ - map_header Route22Gate, ROUTE_22_GATE, GATE, 0 + map_header Route22Gate, ROUTE_22_GATE, GATE end_map_header diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm index 7d3d8bd3ba..d0800688a5 100644 --- a/data/maps/headers/Route23.asm +++ b/data/maps/headers/Route23.asm @@ -1,4 +1,4 @@ - map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH + map_header Route23, ROUTE_23, PLATEAU connection north, IndigoPlateau, INDIGO_PLATEAU, 0 connection south, Route22, ROUTE_22, 0 ; unnecessary end_map_header diff --git a/data/maps/headers/Route24.asm b/data/maps/headers/Route24.asm index 40758e828c..49d6c43ad9 100644 --- a/data/maps/headers/Route24.asm +++ b/data/maps/headers/Route24.asm @@ -1,4 +1,4 @@ - map_header Route24, ROUTE_24, OVERWORLD, SOUTH | EAST + map_header Route24, ROUTE_24, OVERWORLD connection south, CeruleanCity, CERULEAN_CITY, -5 connection east, Route25, ROUTE_25, 0 end_map_header diff --git a/data/maps/headers/Route25.asm b/data/maps/headers/Route25.asm index f2d5ff2e41..a5a90b2f3a 100644 --- a/data/maps/headers/Route25.asm +++ b/data/maps/headers/Route25.asm @@ -1,3 +1,3 @@ - map_header Route25, ROUTE_25, OVERWORLD, WEST + map_header Route25, ROUTE_25, OVERWORLD connection west, Route24, ROUTE_24, 0 end_map_header diff --git a/data/maps/headers/Route2Gate.asm b/data/maps/headers/Route2Gate.asm index b1d1d08e83..1d8f89d910 100644 --- a/data/maps/headers/Route2Gate.asm +++ b/data/maps/headers/Route2Gate.asm @@ -1,2 +1,2 @@ - map_header Route2Gate, ROUTE_2_GATE, GATE, 0 + map_header Route2Gate, ROUTE_2_GATE, GATE end_map_header diff --git a/data/maps/headers/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm index 68482f96b8..17cfc5e8c3 100644 --- a/data/maps/headers/Route2TradeHouse.asm +++ b/data/maps/headers/Route2TradeHouse.asm @@ -1,2 +1,2 @@ - map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE, 0 + map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/Route3.asm b/data/maps/headers/Route3.asm index 1dd2b25032..9cab2a6bce 100644 --- a/data/maps/headers/Route3.asm +++ b/data/maps/headers/Route3.asm @@ -1,4 +1,4 @@ - map_header Route3, ROUTE_3, OVERWORLD, NORTH | WEST + map_header Route3, ROUTE_3, OVERWORLD connection north, Route4, ROUTE_4, 25 connection west, PewterCity, PEWTER_CITY, -4 end_map_header diff --git a/data/maps/headers/Route4.asm b/data/maps/headers/Route4.asm index ed24b466c2..938bcf0e0f 100644 --- a/data/maps/headers/Route4.asm +++ b/data/maps/headers/Route4.asm @@ -1,4 +1,4 @@ - map_header Route4, ROUTE_4, OVERWORLD, SOUTH | EAST + map_header Route4, ROUTE_4, OVERWORLD connection south, Route3, ROUTE_3, -25 connection east, CeruleanCity, CERULEAN_CITY, -4 end_map_header diff --git a/data/maps/headers/Route5.asm b/data/maps/headers/Route5.asm index 9230176327..b6512d294c 100644 --- a/data/maps/headers/Route5.asm +++ b/data/maps/headers/Route5.asm @@ -1,4 +1,4 @@ - map_header Route5, ROUTE_5, OVERWORLD, NORTH | SOUTH + map_header Route5, ROUTE_5, OVERWORLD connection north, CeruleanCity, CERULEAN_CITY, -5 connection south, SaffronCity, SAFFRON_CITY, -5 end_map_header diff --git a/data/maps/headers/Route5Gate.asm b/data/maps/headers/Route5Gate.asm index f8b8362a3f..7c333ba294 100644 --- a/data/maps/headers/Route5Gate.asm +++ b/data/maps/headers/Route5Gate.asm @@ -1,2 +1,2 @@ - map_header Route5Gate, ROUTE_5_GATE, GATE, 0 + map_header Route5Gate, ROUTE_5_GATE, GATE end_map_header diff --git a/data/maps/headers/Route6.asm b/data/maps/headers/Route6.asm index 13a686280b..f8aa0bb65a 100644 --- a/data/maps/headers/Route6.asm +++ b/data/maps/headers/Route6.asm @@ -1,4 +1,4 @@ - map_header Route6, ROUTE_6, OVERWORLD, NORTH | SOUTH + map_header Route6, ROUTE_6, OVERWORLD connection north, SaffronCity, SAFFRON_CITY, -5 connection south, VermilionCity, VERMILION_CITY, -5 end_map_header diff --git a/data/maps/headers/Route6Gate.asm b/data/maps/headers/Route6Gate.asm index 08996acbde..ba334ceec5 100644 --- a/data/maps/headers/Route6Gate.asm +++ b/data/maps/headers/Route6Gate.asm @@ -1,2 +1,2 @@ - map_header Route6Gate, ROUTE_6_GATE, GATE, 0 + map_header Route6Gate, ROUTE_6_GATE, GATE end_map_header diff --git a/data/maps/headers/Route7.asm b/data/maps/headers/Route7.asm index 27cd8b1d16..58d28b5fd6 100644 --- a/data/maps/headers/Route7.asm +++ b/data/maps/headers/Route7.asm @@ -1,4 +1,4 @@ - map_header Route7, ROUTE_7, OVERWORLD, WEST | EAST + map_header Route7, ROUTE_7, OVERWORLD connection west, CeladonCity, CELADON_CITY, -4 connection east, SaffronCity, SAFFRON_CITY, -4 end_map_header diff --git a/data/maps/headers/Route7Gate.asm b/data/maps/headers/Route7Gate.asm index a775720842..66fda01f8b 100644 --- a/data/maps/headers/Route7Gate.asm +++ b/data/maps/headers/Route7Gate.asm @@ -1,2 +1,2 @@ - map_header Route7Gate, ROUTE_7_GATE, GATE, 0 + map_header Route7Gate, ROUTE_7_GATE, GATE end_map_header diff --git a/data/maps/headers/Route8.asm b/data/maps/headers/Route8.asm index 467a8ff4de..5bf550d436 100644 --- a/data/maps/headers/Route8.asm +++ b/data/maps/headers/Route8.asm @@ -1,4 +1,4 @@ - map_header Route8, ROUTE_8, OVERWORLD, WEST | EAST + map_header Route8, ROUTE_8, OVERWORLD connection west, SaffronCity, SAFFRON_CITY, -4 connection east, LavenderTown, LAVENDER_TOWN, 0 end_map_header diff --git a/data/maps/headers/Route8Gate.asm b/data/maps/headers/Route8Gate.asm index 2c319a97b6..b666ea48f3 100644 --- a/data/maps/headers/Route8Gate.asm +++ b/data/maps/headers/Route8Gate.asm @@ -1,2 +1,2 @@ - map_header Route8Gate, ROUTE_8_GATE, GATE, 0 + map_header Route8Gate, ROUTE_8_GATE, GATE end_map_header diff --git a/data/maps/headers/Route9.asm b/data/maps/headers/Route9.asm index 4e97ee41a8..746e604214 100644 --- a/data/maps/headers/Route9.asm +++ b/data/maps/headers/Route9.asm @@ -1,4 +1,4 @@ - map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST + map_header Route9, ROUTE_9, OVERWORLD connection west, CeruleanCity, CERULEAN_CITY, -4 connection east, Route10, ROUTE_10, 0 end_map_header diff --git a/data/maps/headers/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm index c9bb5ea9e7..e731b2e263 100644 --- a/data/maps/headers/SSAnne1F.asm +++ b/data/maps/headers/SSAnne1F.asm @@ -1,2 +1,2 @@ - map_header SSAnne1F, SS_ANNE_1F, SHIP, 0 + map_header SSAnne1F, SS_ANNE_1F, SHIP end_map_header diff --git a/data/maps/headers/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm index 2f24e897d0..8c714259d2 100644 --- a/data/maps/headers/SSAnne1FRooms.asm +++ b/data/maps/headers/SSAnne1FRooms.asm @@ -1,2 +1,2 @@ - map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP, 0 + map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP end_map_header diff --git a/data/maps/headers/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm index 16a09520f2..314c2469c9 100644 --- a/data/maps/headers/SSAnne2F.asm +++ b/data/maps/headers/SSAnne2F.asm @@ -1,2 +1,2 @@ - map_header SSAnne2F, SS_ANNE_2F, SHIP, 0 + map_header SSAnne2F, SS_ANNE_2F, SHIP end_map_header diff --git a/data/maps/headers/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm index 02d5f7a357..7935fbe2d5 100644 --- a/data/maps/headers/SSAnne2FRooms.asm +++ b/data/maps/headers/SSAnne2FRooms.asm @@ -1,2 +1,2 @@ - map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP, 0 + map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP end_map_header diff --git a/data/maps/headers/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm index b8faf7c97b..e1875692fd 100644 --- a/data/maps/headers/SSAnne3F.asm +++ b/data/maps/headers/SSAnne3F.asm @@ -1,2 +1,2 @@ - map_header SSAnne3F, SS_ANNE_3F, SHIP, 0 + map_header SSAnne3F, SS_ANNE_3F, SHIP end_map_header diff --git a/data/maps/headers/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm index d3cebd1cf0..4b8e2ab837 100644 --- a/data/maps/headers/SSAnneB1F.asm +++ b/data/maps/headers/SSAnneB1F.asm @@ -1,2 +1,2 @@ - map_header SSAnneB1F, SS_ANNE_B1F, SHIP, 0 + map_header SSAnneB1F, SS_ANNE_B1F, SHIP end_map_header diff --git a/data/maps/headers/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm index 9ce96cd697..bf52e7209a 100644 --- a/data/maps/headers/SSAnneB1FRooms.asm +++ b/data/maps/headers/SSAnneB1FRooms.asm @@ -1,2 +1,2 @@ - map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP, 0 + map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP end_map_header diff --git a/data/maps/headers/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm index 7cf79f5646..ce78a5150e 100644 --- a/data/maps/headers/SSAnneBow.asm +++ b/data/maps/headers/SSAnneBow.asm @@ -1,2 +1,2 @@ - map_header SSAnneBow, SS_ANNE_BOW, SHIP, 0 + map_header SSAnneBow, SS_ANNE_BOW, SHIP end_map_header diff --git a/data/maps/headers/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm index 3f3692b5e4..f1b3676b8c 100644 --- a/data/maps/headers/SSAnneCaptainsRoom.asm +++ b/data/maps/headers/SSAnneCaptainsRoom.asm @@ -1,2 +1,2 @@ - map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP, 0 + map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP end_map_header diff --git a/data/maps/headers/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm index 807f9b7994..3920e2ee6d 100644 --- a/data/maps/headers/SSAnneKitchen.asm +++ b/data/maps/headers/SSAnneKitchen.asm @@ -1,2 +1,2 @@ - map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP, 0 + map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP end_map_header diff --git a/data/maps/headers/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm index b5636c2cd7..ae0849a5ba 100644 --- a/data/maps/headers/SafariZoneCenter.asm +++ b/data/maps/headers/SafariZoneCenter.asm @@ -1,2 +1,2 @@ - map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST, 0 + map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST end_map_header diff --git a/data/maps/headers/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm index c80abea006..25f75046e7 100644 --- a/data/maps/headers/SafariZoneCenterRestHouse.asm +++ b/data/maps/headers/SafariZoneCenterRestHouse.asm @@ -1,2 +1,2 @@ - map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0 + map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE end_map_header diff --git a/data/maps/headers/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm index 2a6c564fd6..7df2898a36 100644 --- a/data/maps/headers/SafariZoneEast.asm +++ b/data/maps/headers/SafariZoneEast.asm @@ -1,2 +1,2 @@ - map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST, 0 + map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST end_map_header diff --git a/data/maps/headers/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm index 9496475408..c02c29cc6f 100644 --- a/data/maps/headers/SafariZoneEastRestHouse.asm +++ b/data/maps/headers/SafariZoneEastRestHouse.asm @@ -1,2 +1,2 @@ - map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0 + map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE end_map_header diff --git a/data/maps/headers/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm index 3f99fec026..f4e4a78407 100644 --- a/data/maps/headers/SafariZoneGate.asm +++ b/data/maps/headers/SafariZoneGate.asm @@ -1,2 +1,2 @@ - map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE, 0 + map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE end_map_header diff --git a/data/maps/headers/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm index b871950632..50c7fa0c76 100644 --- a/data/maps/headers/SafariZoneNorth.asm +++ b/data/maps/headers/SafariZoneNorth.asm @@ -1,2 +1,2 @@ - map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST, 0 + map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST end_map_header diff --git a/data/maps/headers/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm index 7f9d5dbc8a..5025cf7c06 100644 --- a/data/maps/headers/SafariZoneNorthRestHouse.asm +++ b/data/maps/headers/SafariZoneNorthRestHouse.asm @@ -1,2 +1,2 @@ - map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0 + map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE end_map_header diff --git a/data/maps/headers/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm index 1c055f2751..d44e4c51bf 100644 --- a/data/maps/headers/SafariZoneSecretHouse.asm +++ b/data/maps/headers/SafariZoneSecretHouse.asm @@ -1,2 +1,2 @@ - map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB, 0 + map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB end_map_header diff --git a/data/maps/headers/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm index 3bf4ad6856..a876e58aee 100644 --- a/data/maps/headers/SafariZoneWest.asm +++ b/data/maps/headers/SafariZoneWest.asm @@ -1,2 +1,2 @@ - map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST, 0 + map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST end_map_header diff --git a/data/maps/headers/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm index 3d3bef7159..c58ede185f 100644 --- a/data/maps/headers/SafariZoneWestRestHouse.asm +++ b/data/maps/headers/SafariZoneWestRestHouse.asm @@ -1,2 +1,2 @@ - map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0 + map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE end_map_header diff --git a/data/maps/headers/SaffronCity.asm b/data/maps/headers/SaffronCity.asm index 42494862b3..4be292832b 100644 --- a/data/maps/headers/SaffronCity.asm +++ b/data/maps/headers/SaffronCity.asm @@ -1,4 +1,4 @@ - map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + map_header SaffronCity, SAFFRON_CITY, OVERWORLD connection north, Route5, ROUTE_5, 5 connection south, Route6, ROUTE_6, 5 connection west, Route7, ROUTE_7, 4 diff --git a/data/maps/headers/SaffronGym.asm b/data/maps/headers/SaffronGym.asm index 1abaa4ff35..fc8d59c4c6 100644 --- a/data/maps/headers/SaffronGym.asm +++ b/data/maps/headers/SaffronGym.asm @@ -1,2 +1,2 @@ - map_header SaffronGym, SAFFRON_GYM, FACILITY, 0 + map_header SaffronGym, SAFFRON_GYM, FACILITY end_map_header diff --git a/data/maps/headers/SaffronMart.asm b/data/maps/headers/SaffronMart.asm index f0ec8505e7..f6448c73bf 100644 --- a/data/maps/headers/SaffronMart.asm +++ b/data/maps/headers/SaffronMart.asm @@ -1,2 +1,2 @@ - map_header SaffronMart, SAFFRON_MART, MART, 0 + map_header SaffronMart, SAFFRON_MART, MART end_map_header diff --git a/data/maps/headers/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm index 50203da2d8..2e345d3cc7 100644 --- a/data/maps/headers/SaffronPidgeyHouse.asm +++ b/data/maps/headers/SaffronPidgeyHouse.asm @@ -1,2 +1,2 @@ - map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE, 0 + map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm index 94bf5a0bff..834f7f9e30 100644 --- a/data/maps/headers/SaffronPokecenter.asm +++ b/data/maps/headers/SaffronPokecenter.asm @@ -1,2 +1,2 @@ - map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER, 0 + map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm index 5807a8ad47..2a63b913b8 100644 --- a/data/maps/headers/SeafoamIslands1F.asm +++ b/data/maps/headers/SeafoamIslands1F.asm @@ -1,2 +1,2 @@ - map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN, 0 + map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN end_map_header diff --git a/data/maps/headers/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm index 43d6cc184a..a4a7e6e2e6 100644 --- a/data/maps/headers/SeafoamIslandsB1F.asm +++ b/data/maps/headers/SeafoamIslandsB1F.asm @@ -1,2 +1,2 @@ - map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN, 0 + map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN end_map_header diff --git a/data/maps/headers/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm index 45ab3b3697..c299dde7dc 100644 --- a/data/maps/headers/SeafoamIslandsB2F.asm +++ b/data/maps/headers/SeafoamIslandsB2F.asm @@ -1,2 +1,2 @@ - map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN, 0 + map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN end_map_header diff --git a/data/maps/headers/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm index e4452a8df6..41a42efa76 100644 --- a/data/maps/headers/SeafoamIslandsB3F.asm +++ b/data/maps/headers/SeafoamIslandsB3F.asm @@ -1,2 +1,2 @@ - map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN, 0 + map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN end_map_header diff --git a/data/maps/headers/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm index 7504f74b04..218a0d5d27 100644 --- a/data/maps/headers/SeafoamIslandsB4F.asm +++ b/data/maps/headers/SeafoamIslandsB4F.asm @@ -1,2 +1,2 @@ - map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN, 0 + map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN end_map_header diff --git a/data/maps/headers/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm index 1b4c0ea152..98a31d885d 100644 --- a/data/maps/headers/SilphCo10F.asm +++ b/data/maps/headers/SilphCo10F.asm @@ -1,2 +1,2 @@ - map_header SilphCo10F, SILPH_CO_10F, FACILITY, 0 + map_header SilphCo10F, SILPH_CO_10F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm index 9c1a3aadf4..4f1f078e5f 100644 --- a/data/maps/headers/SilphCo11F.asm +++ b/data/maps/headers/SilphCo11F.asm @@ -1,2 +1,2 @@ - map_header SilphCo11F, SILPH_CO_11F, INTERIOR, 0 + map_header SilphCo11F, SILPH_CO_11F, INTERIOR end_map_header diff --git a/data/maps/headers/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm index 49ba5a387f..b433b1e01f 100644 --- a/data/maps/headers/SilphCo1F.asm +++ b/data/maps/headers/SilphCo1F.asm @@ -1,2 +1,2 @@ - map_header SilphCo1F, SILPH_CO_1F, FACILITY, 0 + map_header SilphCo1F, SILPH_CO_1F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm index 0e6fbe2e09..31c42a0d12 100644 --- a/data/maps/headers/SilphCo2F.asm +++ b/data/maps/headers/SilphCo2F.asm @@ -1,2 +1,2 @@ - map_header SilphCo2F, SILPH_CO_2F, FACILITY, 0 + map_header SilphCo2F, SILPH_CO_2F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm index de01f9be6f..64c7c3959c 100644 --- a/data/maps/headers/SilphCo3F.asm +++ b/data/maps/headers/SilphCo3F.asm @@ -1,2 +1,2 @@ - map_header SilphCo3F, SILPH_CO_3F, FACILITY, 0 + map_header SilphCo3F, SILPH_CO_3F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm index 026007743b..783184b521 100644 --- a/data/maps/headers/SilphCo4F.asm +++ b/data/maps/headers/SilphCo4F.asm @@ -1,2 +1,2 @@ - map_header SilphCo4F, SILPH_CO_4F, FACILITY, 0 + map_header SilphCo4F, SILPH_CO_4F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm index a589d31d61..d3f81c45f8 100644 --- a/data/maps/headers/SilphCo5F.asm +++ b/data/maps/headers/SilphCo5F.asm @@ -1,2 +1,2 @@ - map_header SilphCo5F, SILPH_CO_5F, FACILITY, 0 + map_header SilphCo5F, SILPH_CO_5F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm index f8f8b94bb4..5a99d6f9c1 100644 --- a/data/maps/headers/SilphCo6F.asm +++ b/data/maps/headers/SilphCo6F.asm @@ -1,2 +1,2 @@ - map_header SilphCo6F, SILPH_CO_6F, FACILITY, 0 + map_header SilphCo6F, SILPH_CO_6F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm index feb4c08295..f4a54d9ae0 100644 --- a/data/maps/headers/SilphCo7F.asm +++ b/data/maps/headers/SilphCo7F.asm @@ -1,2 +1,2 @@ - map_header SilphCo7F, SILPH_CO_7F, FACILITY, 0 + map_header SilphCo7F, SILPH_CO_7F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm index de37e25c0b..1ee648ac59 100644 --- a/data/maps/headers/SilphCo8F.asm +++ b/data/maps/headers/SilphCo8F.asm @@ -1,2 +1,2 @@ - map_header SilphCo8F, SILPH_CO_8F, FACILITY, 0 + map_header SilphCo8F, SILPH_CO_8F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm index ec8f9bcdf7..e187fbbd95 100644 --- a/data/maps/headers/SilphCo9F.asm +++ b/data/maps/headers/SilphCo9F.asm @@ -1,2 +1,2 @@ - map_header SilphCo9F, SILPH_CO_9F, FACILITY, 0 + map_header SilphCo9F, SILPH_CO_9F, FACILITY end_map_header diff --git a/data/maps/headers/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm index 785443bcf7..b2edadbbf7 100644 --- a/data/maps/headers/SilphCoElevator.asm +++ b/data/maps/headers/SilphCoElevator.asm @@ -1,2 +1,2 @@ - map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY, 0 + map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY end_map_header diff --git a/data/maps/headers/TradeCenter.asm b/data/maps/headers/TradeCenter.asm index 75c47d0a8d..c7f45b12ea 100644 --- a/data/maps/headers/TradeCenter.asm +++ b/data/maps/headers/TradeCenter.asm @@ -1,2 +1,2 @@ - map_header TradeCenter, TRADE_CENTER, CLUB, 0 + map_header TradeCenter, TRADE_CENTER, CLUB end_map_header diff --git a/data/maps/headers/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm index c54004157d..b312fbefff 100644 --- a/data/maps/headers/UndergroundPathNorthSouth.asm +++ b/data/maps/headers/UndergroundPathNorthSouth.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND, 0 + map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND end_map_header diff --git a/data/maps/headers/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm index 733bdb5088..1d9d84e704 100644 --- a/data/maps/headers/UndergroundPathRoute5.asm +++ b/data/maps/headers/UndergroundPathRoute5.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE, 0 + map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE end_map_header diff --git a/data/maps/headers/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm index b9e56bd883..4134d232a5 100644 --- a/data/maps/headers/UndergroundPathRoute6.asm +++ b/data/maps/headers/UndergroundPathRoute6.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE, 0 + map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE end_map_header diff --git a/data/maps/headers/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm index b3de5c698f..f4bb641fd8 100644 --- a/data/maps/headers/UndergroundPathRoute7.asm +++ b/data/maps/headers/UndergroundPathRoute7.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE, 0 + map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE end_map_header diff --git a/data/maps/headers/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm index 5627e074c9..31567d533b 100644 --- a/data/maps/headers/UndergroundPathRoute7Copy.asm +++ b/data/maps/headers/UndergroundPathRoute7Copy.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE, 0 + map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE end_map_header diff --git a/data/maps/headers/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm index 748e444196..f6c543597a 100644 --- a/data/maps/headers/UndergroundPathRoute8.asm +++ b/data/maps/headers/UndergroundPathRoute8.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE, 0 + map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE end_map_header diff --git a/data/maps/headers/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm index 6dfa8832b2..00120fdc5d 100644 --- a/data/maps/headers/UndergroundPathWestEast.asm +++ b/data/maps/headers/UndergroundPathWestEast.asm @@ -1,2 +1,2 @@ - map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND, 0 + map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND end_map_header diff --git a/data/maps/headers/VermilionCity.asm b/data/maps/headers/VermilionCity.asm index b776a67f6a..a490334840 100644 --- a/data/maps/headers/VermilionCity.asm +++ b/data/maps/headers/VermilionCity.asm @@ -1,4 +1,4 @@ - map_header VermilionCity, VERMILION_CITY, OVERWORLD, NORTH | EAST + map_header VermilionCity, VERMILION_CITY, OVERWORLD connection north, Route6, ROUTE_6, 5 connection east, Route11, ROUTE_11, 4 end_map_header diff --git a/data/maps/headers/VermilionDock.asm b/data/maps/headers/VermilionDock.asm index 0234f6162e..b31a1320d1 100644 --- a/data/maps/headers/VermilionDock.asm +++ b/data/maps/headers/VermilionDock.asm @@ -1,2 +1,2 @@ - map_header VermilionDock, VERMILION_DOCK, SHIP_PORT, 0 + map_header VermilionDock, VERMILION_DOCK, SHIP_PORT end_map_header diff --git a/data/maps/headers/VermilionGym.asm b/data/maps/headers/VermilionGym.asm index f54c6bfb87..409ce2779e 100644 --- a/data/maps/headers/VermilionGym.asm +++ b/data/maps/headers/VermilionGym.asm @@ -1,2 +1,2 @@ - map_header VermilionGym, VERMILION_GYM, GYM, 0 + map_header VermilionGym, VERMILION_GYM, GYM end_map_header diff --git a/data/maps/headers/VermilionMart.asm b/data/maps/headers/VermilionMart.asm index 11f1d676a4..948d777751 100644 --- a/data/maps/headers/VermilionMart.asm +++ b/data/maps/headers/VermilionMart.asm @@ -1,2 +1,2 @@ - map_header VermilionMart, VERMILION_MART, MART, 0 + map_header VermilionMart, VERMILION_MART, MART end_map_header diff --git a/data/maps/headers/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm index 40feae757a..9c19f6df4b 100644 --- a/data/maps/headers/VermilionOldRodHouse.asm +++ b/data/maps/headers/VermilionOldRodHouse.asm @@ -1,2 +1,2 @@ - map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE, 0 + map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm index 7ddf452fa0..a8320a9df3 100644 --- a/data/maps/headers/VermilionPidgeyHouse.asm +++ b/data/maps/headers/VermilionPidgeyHouse.asm @@ -1,2 +1,2 @@ - map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE, 0 + map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm index 6b7f7d629d..343ca84587 100644 --- a/data/maps/headers/VermilionPokecenter.asm +++ b/data/maps/headers/VermilionPokecenter.asm @@ -1,2 +1,2 @@ - map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER, 0 + map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm index f948348fe4..eb19d12681 100644 --- a/data/maps/headers/VermilionTradeHouse.asm +++ b/data/maps/headers/VermilionTradeHouse.asm @@ -1,2 +1,2 @@ - map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE, 0 + map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm index c982da4b32..ee473e01f4 100644 --- a/data/maps/headers/VictoryRoad1F.asm +++ b/data/maps/headers/VictoryRoad1F.asm @@ -1,2 +1,2 @@ - map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN, 0 + map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN end_map_header diff --git a/data/maps/headers/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm index 7cb9aac5b4..067ca49c3b 100644 --- a/data/maps/headers/VictoryRoad2F.asm +++ b/data/maps/headers/VictoryRoad2F.asm @@ -1,2 +1,2 @@ - map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN, 0 + map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN end_map_header diff --git a/data/maps/headers/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm index aabde2e6f9..c46834cb9a 100644 --- a/data/maps/headers/VictoryRoad3F.asm +++ b/data/maps/headers/VictoryRoad3F.asm @@ -1,2 +1,2 @@ - map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN, 0 + map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN end_map_header diff --git a/data/maps/headers/ViridianCity.asm b/data/maps/headers/ViridianCity.asm index 1e497fc591..03c363494f 100644 --- a/data/maps/headers/ViridianCity.asm +++ b/data/maps/headers/ViridianCity.asm @@ -1,4 +1,4 @@ - map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD, NORTH | SOUTH | WEST + map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD connection north, Route2, ROUTE_2, 5 connection south, Route1, ROUTE_1, 5 connection west, Route22, ROUTE_22, 4 diff --git a/data/maps/headers/ViridianForest.asm b/data/maps/headers/ViridianForest.asm index 8086f5184d..899d828e99 100644 --- a/data/maps/headers/ViridianForest.asm +++ b/data/maps/headers/ViridianForest.asm @@ -1,2 +1,2 @@ - map_header ViridianForest, VIRIDIAN_FOREST, FOREST, 0 + map_header ViridianForest, VIRIDIAN_FOREST, FOREST end_map_header diff --git a/data/maps/headers/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm index 208b6df1ff..16276fd97f 100644 --- a/data/maps/headers/ViridianForestNorthGate.asm +++ b/data/maps/headers/ViridianForestNorthGate.asm @@ -1,2 +1,2 @@ - map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE, 0 + map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE end_map_header diff --git a/data/maps/headers/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm index 17ac155070..c042505305 100644 --- a/data/maps/headers/ViridianForestSouthGate.asm +++ b/data/maps/headers/ViridianForestSouthGate.asm @@ -1,2 +1,2 @@ - map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE, 0 + map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE end_map_header diff --git a/data/maps/headers/ViridianGym.asm b/data/maps/headers/ViridianGym.asm index 1812531fb8..75258cbe9a 100644 --- a/data/maps/headers/ViridianGym.asm +++ b/data/maps/headers/ViridianGym.asm @@ -1,2 +1,2 @@ - map_header ViridianGym, VIRIDIAN_GYM, GYM, 0 + map_header ViridianGym, VIRIDIAN_GYM, GYM end_map_header diff --git a/data/maps/headers/ViridianMart.asm b/data/maps/headers/ViridianMart.asm index ed5c4c90d0..dbfb821215 100644 --- a/data/maps/headers/ViridianMart.asm +++ b/data/maps/headers/ViridianMart.asm @@ -1,2 +1,2 @@ - map_header ViridianMart, VIRIDIAN_MART, MART, 0 + map_header ViridianMart, VIRIDIAN_MART, MART end_map_header diff --git a/data/maps/headers/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm index d0cb757cf8..735e675ace 100644 --- a/data/maps/headers/ViridianNicknameHouse.asm +++ b/data/maps/headers/ViridianNicknameHouse.asm @@ -1,2 +1,2 @@ - map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE, 0 + map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm index 79f1e3b518..dcde4d9442 100644 --- a/data/maps/headers/ViridianPokecenter.asm +++ b/data/maps/headers/ViridianPokecenter.asm @@ -1,2 +1,2 @@ - map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER, 0 + map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER end_map_header diff --git a/data/maps/headers/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm index 56cbb786e8..c45da0f274 100644 --- a/data/maps/headers/ViridianSchoolHouse.asm +++ b/data/maps/headers/ViridianSchoolHouse.asm @@ -1,2 +1,2 @@ - map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE, 0 + map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE end_map_header diff --git a/data/maps/headers/WardensHouse.asm b/data/maps/headers/WardensHouse.asm index 6f484b3b34..1bfed0585b 100644 --- a/data/maps/headers/WardensHouse.asm +++ b/data/maps/headers/WardensHouse.asm @@ -1,2 +1,2 @@ - map_header WardensHouse, WARDENS_HOUSE, LAB, 0 + map_header WardensHouse, WARDENS_HOUSE, LAB end_map_header diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 127a13adcf..f2a86f967a 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -138,8 +138,8 @@ ENDM ;\1 map name ;\2 map id ;\3 tileset -;\4 connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none MACRO map_header + REDEF CURRENT_MAP_ID EQUS "\2" DEF CURRENT_MAP_WIDTH = \2_WIDTH DEF CURRENT_MAP_HEIGHT = \2_HEIGHT DEF CURRENT_MAP_OBJECT EQUS "\1_Object" @@ -149,7 +149,10 @@ MACRO map_header dw \1_Blocks dw \1_TextPointers dw \1_Script - db \4 + db MAP_CONNECTIONS_\2 + ; Define `MAP_CONNECTIONS_\2` after `db`ing it so that the `db`ed value + ; gets updated when subsequent `connection`s modify `MAP_CONNECTIONS_\2`. + DEF MAP_CONNECTIONS_\2 = 0 ENDM ; Comes after map_header and connection macros @@ -175,6 +178,10 @@ MACRO connection ENDC IF "\1" === "north" + IF MAP_CONNECTIONS_{CURRENT_MAP_ID} & (NORTH | SOUTH | WEST | EAST) + fail "Invalid order for 'connection' (must be north, south, west, east)" + ENDC + DEF MAP_CONNECTIONS_{CURRENT_MAP_ID} |= NORTH DEF _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src DEF _map = _tgt DEF _win = (\3_WIDTH + 6) * \3_HEIGHT + 1 @@ -186,6 +193,10 @@ MACRO connection ENDC ELIF "\1" === "south" + IF MAP_CONNECTIONS_{CURRENT_MAP_ID} & (SOUTH | WEST | EAST) + fail "Invalid order for 'connection' (must be north, south, west, east)" + ENDC + DEF MAP_CONNECTIONS_{CURRENT_MAP_ID} |= SOUTH DEF _blk = _src DEF _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt DEF _win = \3_WIDTH + 7 @@ -197,6 +208,10 @@ MACRO connection ENDC ELIF "\1" === "west" + IF MAP_CONNECTIONS_{CURRENT_MAP_ID} & (WEST | EAST) + fail "Invalid order for 'connection' (must be north, south, west, east)" + ENDC + DEF MAP_CONNECTIONS_{CURRENT_MAP_ID} |= WEST DEF _blk = (\3_WIDTH * _src) + \3_WIDTH - 3 DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt DEF _win = (\3_WIDTH + 6) * 2 - 6 @@ -208,6 +223,10 @@ MACRO connection ENDC ELIF "\1" === "east" + IF MAP_CONNECTIONS_{CURRENT_MAP_ID} & EAST + fail "Invalid order for 'connection' (must be north, south, west, east)" + ENDC + DEF MAP_CONNECTIONS_{CURRENT_MAP_ID} |= EAST DEF _blk = (\3_WIDTH * _src) DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 DEF _win = \3_WIDTH + 7