Merge pull request #6 from pret/master

Merge master

2 files changed, 232 insertions, 0 deletions

diff --git a/constants.asm b/constants.asm
index 4c8d1e5..c4e77ed 100644
--- a/constants.asm
+++ b/constants.asm
@@ -21,6 +21,7 @@ INCLUDE "constants/battle_constants.asm"
 INCLUDE "constants/palette_constants.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/landmark_constants.asm"
+INCLUDE "constants/map_constants.asm"
 
 INCLUDE "constants/serial_constants.asm"
 
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
new file mode 100644
index 0000000..3b386e6
--- /dev/null
+++ b/constants/map_constants.asm
@@ -0,0 +1,231 @@
+; Map IDs
+
+	const_def
+	const ROUTE_1_P1
+	const ROUTE_1_P2
+	const ROUTE_SILENT_EAST
+	const SILENT_HILL
+	const ROUTE_1_GATE_1F
+	const ROUTE_1_GATE_2F
+	const ROUTE_SILENT_EAST_GATE
+	const PLAYER_HOUSE_1F
+	const PLAYER_HOUSE_2F
+	const SILENT_POKECENTER
+	const SILENT_HILL_HOUSE
+	const SILENT_HILL_LAB
+	const SILENT_HILL_LAB_2
+	const UNUSED_13
+	const SHIZUKANA_OKA
+	const ROUTE_2
+	const OLD_CITY
+	const ROUTE_2_GATE_1F
+	const ROUTE_2_GATE_2F
+	const ROUTE_2_HOUSE
+	const OLD_MUSEUM
+	const OLD_GYM
+	const OLD_TOWER_1F
+	const OLD_TOWER_2F
+	const OLD_TOWER_3F
+	const OLD_TOWER_4F
+	const OLD_TOWER_5F
+	const OLD_BILLS_HOUSE
+	const OLD_MART
+	const OLD_HOUSE
+	const OLD_POKECENTER_1F
+	const OLD_POKECENTER_2F
+	const OLD_POKECENTER_TRADE
+	const OLD_POKECENTER_BATTLE
+	const OLD_POKECENTER_TIME_MACHINE
+	const OLD_KURTS_HOUSE
+	const OLD_SCHOOL
+	const WEST
+	const WEST_MART_1F
+	const WEST_MART_2F
+	const WEST_MART_3F
+	const WEST_MART_4F
+	const WEST_MART_5F
+	const WEST_MART_6F
+	const WEST_MART_ELEVATOR
+	const WEST_RADIO_TOWER_1F
+	const WEST_RADIO_TOWER_2F
+	const WEST_RADIO_TOWER_3F
+	const WEST_RADIO_TOWER_4F
+	const WEST_RADIO_TOWER_5F
+	const WEST_ROCKET_RAIDED_HOUSE
+	const WEST_POKECENTER_1F
+	const WEST_POKECENTER_2F
+	const WEST_GYM
+	const WEST_HOUSE_1
+	const WEST_HOUSE_2
+	const HAITEKU_WEST_ROUTE
+	const HAITEKU_WEST_ROUTE_OCEAN
+	const HAITEKU
+	const HAITEKU_WEST_ROUTE_GATE
+	const HAITEKU_POKECENTER_1F
+	const HAITEKU_POKECENTER_2F
+	const HAITEKU_LEAGUE_1F
+	const HAITEKU_LEAGUE_2F
+	const HAITEKU_MART
+	const HAITEKU_HOUSE_1
+	const HAITEKU_HOUSE_2
+	const HAITEKU_IMPOSTER_OAK_HOUSE
+	const HAITEKU_AQUARIUM_1F
+	const HAITEKU_AQUARIUM_2F
+	const FONTO_ROUTE_1
+	const FONTO_ROUTE_2
+	const FONTO_ROUTE_3
+	const FONTO_ROUTE_4
+	const FONTO_ROUTE_5
+	const FONTO_ROUTE_6
+	const FONTO
+	const FONTO_ROUTE_GATE_1
+	const FONTO_ROUTE_GATE_2
+	const FONTO_ROUTE_GATE_3
+	const FONTO_ROCKET_HOUSE
+	const FONTO_MART
+	const FONTO_HOUSE
+	const FONTO_POKECENTER_1F
+	const FONTO_POKECENTER_2F
+	const FONTO_LAB
+	const BAADON_ROUTE_1
+	const BAADON_ROUTE_2
+	const BAADON_ROUTE_3
+	const BAADON
+	const BAADON_ROUTE_GATE_WEST
+	const BAADON_ROUTE_GATE_NEWTYPE
+	const BAADON_MART
+	const BAADON_POKECENTER_1F
+	const BAADON_POKECENTER_2F
+	const BAADON_HOUSE_1
+	const BAADON_WALLPAPER_HOUSE
+	const BAADON_HOUSE_2
+	const BAADON_LEAGUE_1F
+	const BAADON_LEAGUE_2F
+	const ROUTE_15
+	const NEWTYPE_ROUTE
+	const ROUTE_18
+	const NEWTYPE
+	const ROUTE_15_POKECENTER_1F
+	const ROUTE_15_POKECENTER_2F
+	const NEWTYPE_ROUTE_GATE
+	const ROUTE_18_POKECENTER_1F
+	const ROUTE_18_POKECENTER_2F
+	const NEWTYPE_POKECENTER_1F
+	const NEWTYPE_POKECENTER_2F
+	const NEWTYPE_LEAGUE_1F
+	const NEWTYPE_LEAGUE_2F
+	const NEWTYPE_SAILOR_HOUSE
+	const NEWTYPE_MART
+	const NEWTYPE_DOJO
+	const NEWTYPE_HOUSE_1
+	const NEWTYPE_DINER
+	const NEWTYPE_HOUSE_2
+	const NEWTYPE_HOUSE_3
+	const SUGAR_ROUTE
+	const SUGAR
+	const SUGAR_ROUTE_GATE
+	const SUGAR_HOUSE
+	const SUGAR_HOUSE_2
+	const SUGAR_MART
+	const SUGAR_POKECENTER_1F
+	const SUGAR_POKECENTER_2F
+	const BULL_FOREST_ROUTE_1
+	const BULL_FOREST_ROUTE_2
+	const BULL_FOREST_ROUTE_3
+	const BULL_FOREST
+	const BULL_FOREST_ROUTE_1_HOUSE
+	const BULL_FOREST_ROUTE_GATE_STAND
+	const BULL_MART
+	const BULL_HOUSE_1
+	const BULL_HOUSE_2
+	const BULL_HOUSE_3
+	const BULL_POKECENTER_1F
+	const BULL_POKECENTER_2F
+	const BULL_LEAGUE_1F
+	const BULL_LEAGUE_2F
+	const BULL_HOUSE_4
+	const STAND_ROUTE
+	const STAND
+	const STAND_ROUTE_GATE_KANTO
+	const STAND_LAB
+	const STAND_POKECENTER_1F
+	const STAND_POKECENTER_2F
+	const STAND_OFFICE
+	const STAND_MART
+	const STAND_HOUSE
+	const STAND_ROCKET_HOUSE_1F
+	const STAND_ROCKET_HOUSE_2F
+	const STAND_LEAGUE_1F
+	const STAND_LEAGUE_2F
+	const KANTO_EAST_ROUTE
+	const KANTO
+	const KANTO_CERULEAN_HOUSE
+	const KANTO_POKECENTER_1F
+	const KANTO_POKECENTER_2F
+	const KANTO_LEAGUE_1F
+	const KANTO_LEAGUE_2F
+	const KANTO_LAVENDER_HOUSE
+	const KANTO_CELADON_MART_1F
+	const KANTO_CELADON_MART_2F
+	const KANTO_CELADON_MART_3F
+	const KANTO_CELADON_MART_4F
+	const KANTO_CELADON_MART_5F
+	const KANTO_CELADON_ELEVATOR
+	const KANTO_MART
+	const KANTO_GAMEFREAK_HQ_1
+	const KANTO_GAMEFREAK_HQ_2
+	const KANTO_GAMEFREAK_HQ_3
+	const KANTO_GAMEFREAK_HQ_4
+	const KANTO_GAMEFREAK_HQ_5
+	const KANTO_SILPH_CO
+	const KANTO_VIRIDIAN_HOUSE
+	const KANTO_GAME_CORNER
+	const KANTO_UNUSED_AREA
+	const KANTO_GAME_CORNER_PRIZES
+	const KANTO_DINER
+	const KANTO_SCHOOL
+	const KANTO_HOSPITAL
+	const KANTO_POKECENTER_2_1F
+	const KANTO_POKECENTER_2_2F
+	const KANTO_REDS_HOUSE
+	const KANTO_GREENS_HOUSE_1F
+	const KANTO_GREENS_HOUSE_2F
+	const KANTO_ELDERS_HOUSE
+	const KANTO_OAKS_LAB
+	const KANTO_LEAGUE_2_1F
+	const KANTO_LEAGUE_2_2F
+	const KANTO_FISHING_GURU
+	const PRINCE_ROUTE
+	const PRINCE
+	const MT_FUJI_ROUTE
+	const MT_FUJI
+	const SOUTH
+	const SOUTH_HOUSE_1
+	const SOUTH_POKECENTER_1F
+	const SOUTH_POKECENTER_2F
+	const SOUTH_MART
+	const SOUTH_HOUSE_2
+	const NORTH
+	const NORTH_HOUSE_1
+	const NORTH_MART
+	const NORTH_HOUSE_2
+	const NORTH_POKECENTER_1F
+	const NORTH_POKECENTER_2F
+	const POWER_PLANT_1
+	const POWER_PLANT_2
+	const POWER_PLANT_3
+	const POWER_PLANT_4
+	const RUINS_OF_ALPH_ENTRANCE
+	const RUINS_OF_ALPH_MAIN
+	const CAVE_MINECARTS_1
+	const CAVE_MINECARTS_2
+	const CAVE_MINECARTS_3
+	const CAVE_MINECARTS_4
+	const CAVE_MINECARTS_5
+	const CAVE_MINECARTS_6
+	const CAVE_MINECARTS_7
+	const OFFICE_1
+	const OFFICE_2
+	const OFFICE_3
+	const SLOWPOKE_WELL_ENTRANCE
+	const SLOWPOKE_WELL_MAIN