Merge pull request #8 from pret/master

Merge master

6 files changed, 586 insertions, 18 deletions

diff --git a/constants.asm b/constants.asm
index c4e77ed..fcd408f 100644
--- a/constants.asm
+++ b/constants.asm
@@ -22,6 +22,8 @@ INCLUDE "constants/palette_constants.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/landmark_constants.asm"
 INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/tileset_constants.asm"
+INCLUDE "constants/map_data_constants.asm"
 
 INCLUDE "constants/serial_constants.asm"
 
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 3b386e6..d5e130e 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -21,23 +21,23 @@
 	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 OLD_CITY_MUSEUM
+	const OLD_CITY_GYM
+	const OLD_CITY_TOWER_1F
+	const OLD_CITY_TOWER_2F
+	const OLD_CITY_TOWER_3F
+	const OLD_CITY_TOWER_4F
+	const OLD_CITY_TOWER_5F
+	const OLD_CITY_BILLS_HOUSE
+	const OLD_CITY_MART
+	const OLD_CITY_HOUSE
+	const OLD_CITY_POKECENTER_1F
+	const OLD_CITY_POKECENTER_2F
+	const OLD_CITY_POKECENTER_TRADE
+	const OLD_CITY_POKECENTER_BATTLE
+	const OLD_CITY_POKECENTER_TIME_MACHINE
+	const OLD_CITY_KURTS_HOUSE
+	const OLD_CITY_SCHOOL
 	const WEST
 	const WEST_MART_1F
 	const WEST_MART_2F
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
new file mode 100644
index 0000000..075a7f1
--- /dev/null
+++ b/constants/map_data_constants.asm
@@ -0,0 +1,9 @@
+; map environments (wEnvironment)
+	const_def 1
+	const TOWN
+	const ROUTE
+	const INDOOR
+	const CAVE
+	const ENVIRONMENT_5
+	const GATE
+	const DUNGEON
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
new file mode 100644
index 0000000..aac5db4
--- /dev/null
+++ b/constants/tileset_constants.asm
@@ -0,0 +1,31 @@
+; Tilesets indexes
+; TODO: Temporary placeholders
+	const_def
+	const TILESET_00
+	const TILESET_01
+	const TILESET_02
+	const TILESET_03
+	const TILESET_04
+	const TILESET_05
+	const TILESET_06
+	const TILESET_07
+	const TILESET_08
+	const TILESET_09
+	const TILESET_0A
+	const TILESET_0B
+	const TILESET_0C
+	const TILESET_0D
+	const TILESET_0E
+	const TILESET_0F
+	const TILESET_10
+	const TILESET_11
+	const TILESET_12
+	const TILESET_13
+	const TILESET_14
+	const TILESET_15
+	const TILESET_16
+	const TILESET_17
+	const TILESET_18
+	const TILESET_19
+	const TILESET_1A
+	const TILESET_1B
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
new file mode 100644
index 0000000..83f619d
--- /dev/null
+++ b/data/maps/maps.asm
@@ -0,0 +1,297 @@
+INCLUDE "constants.asm"
+
+map: MACRO
+;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm)
+;\2: tileset: a TILESET_* constant
+;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
+;\4: location: from constants/landmark_constants.asm
+	db BANK(\1_MapAttributes), \2, \3
+	dw \1_MapAttributes
+	db \4
+	db 0, 0 ; ???
+ENDM
+
+SECTION "Map Data", ROMX[$4000], BANK[$04]
+
+	db 0 ; ???
+
+MapGroupPointers:
+	dw MapGroup_SilentHill
+	dw MapGroup_OldCity
+	dw MapGroup_West
+	dw MapGroup_Haiteku
+	dw MapGroup_Fonto
+	dw MapGroup_Baadon
+	dw MapGroup_Newtype
+	dw MapGroup_Sugar
+	dw MapGroup_Bull
+	dw MapGroup_Stand
+	dw MapGroup_Kanto
+	dw MapGroup_Prince
+	dw MapGroup_MtFuji
+	dw MapGroup_South
+	dw MapGroup_North
+	dw MapGroup_Misc
+	dw MapGroup_Empty
+
+MapGroup_SilentHill:
+	map Route1P1, TILESET_00, ROUTE, LANDMARK_MT_FUJI
+	map Route1P2, TILESET_00, ROUTE, LANDMARK_SOUTH
+	map RouteSilentEast, TILESET_00, ROUTE, LANDMARK_BLUE_FOREST
+	map SilentHill, TILESET_00, TOWN, LANDMARK_STAND
+	map Route1Gate1F, TILESET_11, GATE, LANDMARK_SOUTH
+	map Route1Gate2F, TILESET_11, GATE, LANDMARK_SOUTH
+	map RouteSilentEastGate, TILESET_11, GATE, LANDMARK_BLUE_FOREST
+	map PlayerHouse1F, TILESET_09, INDOOR, LANDMARK_STAND
+	map PlayerHouse2F, TILESET_09, INDOOR, LANDMARK_STAND
+	map SilentPokecenter, TILESET_0C, INDOOR, LANDMARK_STAND
+	map SilentHillHouse, TILESET_09, INDOOR, LANDMARK_STAND
+	map SilentHillLab, TILESET_0A, INDOOR, LANDMARK_STAND
+	map SilentHillLab2, TILESET_0A, INDOOR, LANDMARK_STAND
+	map Unused13, TILESET_0A, INDOOR, LANDMARK_STAND
+	map ShizukanaOka, TILESET_1B, CAVE, LANDMARK_NONE
+
+MapGroup_OldCity:
+	map Route2, TILESET_01, ROUTE, LANDMARK_ROUTE_15
+	map OldCity, TILESET_01, TOWN, LANDMARK_NORTH
+	map Route2Gate1F, TILESET_11, GATE, LANDMARK_ROUTE_15
+	map Route2Gate2F, TILESET_11, GATE, LANDMARK_ROUTE_15
+	map Route2House, TILESET_09, INDOOR, LANDMARK_ROUTE_15
+	map OldCityMuseum, TILESET_0F, INDOOR, LANDMARK_NORTH
+	map OldCityGym, TILESET_14, INDOOR, LANDMARK_NORTH
+	map OldCityTower1F, TILESET_0F, INDOOR, LANDMARK_NORTH
+	map OldCityTower2F, TILESET_0F, INDOOR, LANDMARK_NORTH
+	map OldCityTower3F, TILESET_0F, INDOOR, LANDMARK_NORTH
+	map OldCityTower4F, TILESET_0F, INDOOR, LANDMARK_NORTH
+	map OldCityTower5F, TILESET_0F, INDOOR, LANDMARK_NORTH
+	map OldCityBillsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH
+	map OldCityMart, TILESET_0D, INDOOR, LANDMARK_NORTH
+	map OldCityHouse, TILESET_0B, INDOOR, LANDMARK_NORTH
+	map OldCityPokecenter1F, TILESET_0C, INDOOR, LANDMARK_NORTH
+	map OldCityPokecenter2F, TILESET_0C, INDOOR, LANDMARK_NORTH
+	map OldCityPokecenterTrade, TILESET_11, GATE, LANDMARK_NORTH
+	map OldCityPokecenterBattle, TILESET_11, GATE, LANDMARK_NORTH
+	map OldCityPokecenterTimeMachine, TILESET_0C, INDOOR, LANDMARK_NORTH
+	map OldCityKurtsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH
+	map OldCitySchool, TILESET_0F, INDOOR, LANDMARK_NORTH
+
+MapGroup_West:
+	map West, TILESET_02, TOWN, LANDMARK_ROUTE_18
+	map WestMart1F, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestMart2F, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestMart3F, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestMart4F, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestMart5F, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestMart6F, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestMartElevator, TILESET_10, INDOOR, LANDMARK_ROUTE_18
+	map WestRadioTower1F, TILESET_12, INDOOR, LANDMARK_ROUTE_18
+	map WestRadioTower2F, TILESET_12, INDOOR, LANDMARK_ROUTE_18
+	map WestRadioTower3F, TILESET_12, INDOOR, LANDMARK_ROUTE_18
+	map WestRadioTower4F, TILESET_12, INDOOR, LANDMARK_ROUTE_18
+	map WestRadioTower5F, TILESET_12, INDOOR, LANDMARK_ROUTE_18
+	map WestRocketRaidedHouse, TILESET_09, INDOOR, LANDMARK_ROUTE_18
+	map WestPokecenter1F, TILESET_0C, INDOOR, LANDMARK_ROUTE_18
+	map WestPokecenter2F, TILESET_0C, INDOOR, LANDMARK_ROUTE_18
+	map WestGym, TILESET_14, INDOOR, LANDMARK_ROUTE_18
+	map WestHouse1, TILESET_09, INDOOR, LANDMARK_ROUTE_18
+	map WestHouse2, TILESET_09, INDOOR, LANDMARK_ROUTE_18
+
+MapGroup_Haiteku:
+	map HaitekuWestRoute, TILESET_03, ROUTE, LANDMARK_POKEMON_LEAGUE_3
+	map HaitekuWestRouteOcean, TILESET_03, ROUTE, LANDMARK_POKEMON_LEAGUE_2
+	map Haiteku, TILESET_03, TOWN, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuWestRouteGate, TILESET_11, GATE, LANDMARK_POKEMON_LEAGUE_2
+	map HaitekuPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuPokecenter2F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuLeague1F, TILESET_0F, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuLeague2F, TILESET_14, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuMart, TILESET_0D, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuHouse1, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuHouse2, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuImposterOakHouse, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuAquarium1F, TILESET_0E, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuAquarium2F, TILESET_0E, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+
+MapGroup_Fonto:
+	map FontoRoute1, TILESET_05, ROUTE, LANDMARK_POKEMON_LEAGUE_1_2
+	map FontoRoute2, TILESET_05, ROUTE, LANDMARK_HIDEOUT_3
+	map FontoRoute3, TILESET_05, ROUTE, LANDMARK_HIDEOUT_1
+	map FontoRoute4, TILESET_05, ROUTE, LANDMARK_POKEMON_LEAGUE_6
+	map FontoRoute5, TILESET_05, ROUTE, LANDMARK_SLOWPOKE_WELL_2
+	map FontoRoute6, TILESET_05, ROUTE, LANDMARK_SLOWPOKE_WELL_1
+	map Fonto, TILESET_05, TOWN, LANDMARK_HIDEOUT_2
+	map FontoRouteGate1, TILESET_11, GATE, LANDMARK_POKEMON_LEAGUE_1_2
+	map FontoRouteGate2, TILESET_11, GATE, LANDMARK_POKEMON_LEAGUE_6
+	map FontoRouteGate3, TILESET_11, GATE, LANDMARK_SLOWPOKE_WELL_2
+	map FontoRocketHouse, TILESET_13, INDOOR, LANDMARK_HIDEOUT_2
+	map FontoMart, TILESET_0D, INDOOR, LANDMARK_HIDEOUT_2
+	map FontoHouse, TILESET_09, INDOOR, LANDMARK_HIDEOUT_2
+	map FontoPokecenter1F, TILESET_0C, INDOOR, LANDMARK_HIDEOUT_2
+	map FontoPokecenter2F, TILESET_0C, INDOOR, LANDMARK_HIDEOUT_2
+	map FontoLab, TILESET_0A, INDOOR, LANDMARK_HIDEOUT_2
+
+MapGroup_Baadon:
+	map BaadonRoute1, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_1
+	map BaadonRoute2, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_3
+	map BaadonRoute3, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_4
+	map Baadon, TILESET_04, TOWN, LANDMARK_POWER_PLANT_2
+	map BaadonRouteGateWest, TILESET_11, GATE, LANDMARK_POWER_PLANT_1
+	map BaadonRouteGateNewtype, TILESET_11, GATE, LANDMARK_POWER_PLANT_4
+	map BaadonMart, TILESET_0D, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonPokecenter2F, TILESET_0C, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonHouse1, TILESET_0B, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonWallpaperHouse, TILESET_0E, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonHouse2, TILESET_09, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonLeague1F, TILESET_0F, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonLeague2F, TILESET_14, INDOOR, LANDMARK_POWER_PLANT_2
+
+MapGroup_Newtype:
+	map Route15, TILESET_00, ROUTE, LANDMARK_RUINS_1
+	map NewtypeRoute, TILESET_00, ROUTE, LANDMARK_MINES_3
+	map Route18, TILESET_00, ROUTE, LANDMARK_MINES_4
+	map Newtype, TILESET_00, TOWN, LANDMARK_RUINS_2
+	map Route15Pokecenter1F, TILESET_0C, INDOOR, LANDMARK_RUINS_1
+	map Route15Pokecenter2F, TILESET_0C, INDOOR, LANDMARK_RUINS_1
+	map NewtypeRouteGate, TILESET_11, GATE, LANDMARK_MINES_4
+	map Route18Pokecenter1F, TILESET_0C, INDOOR, LANDMARK_MINES_4
+	map Route18Pokecenter2F, TILESET_0C, INDOOR, LANDMARK_MINES_4
+	map NewtypePokecenter1F, TILESET_0C, INDOOR, LANDMARK_RUINS_2
+	map NewtypePokecenter2F, TILESET_0C, INDOOR, LANDMARK_RUINS_2
+	map NewtypeLeague1F, TILESET_0F, INDOOR, LANDMARK_RUINS_2
+	map NewtypeLeague2F, TILESET_14, INDOOR, LANDMARK_RUINS_2
+	map NewtypeSailorHouse, TILESET_09, INDOOR, LANDMARK_RUINS_2
+	map NewtypeMart, TILESET_0D, INDOOR, LANDMARK_RUINS_2
+	map NewtypeDojo, TILESET_0B, INDOOR, LANDMARK_RUINS_2
+	map NewtypeHouse1, TILESET_09, INDOOR, LANDMARK_RUINS_2
+	map NewtypeDiner, TILESET_0E, INDOOR, LANDMARK_RUINS_2
+	map NewtypeHouse2, TILESET_09, INDOOR, LANDMARK_RUINS_2
+	map NewtypeHouse3, TILESET_09, INDOOR, LANDMARK_RUINS_2
+
+MapGroup_Sugar:
+	map SugarRoute, TILESET_03, ROUTE, LANDMARK_MINES_1
+	map Sugar, TILESET_03, TOWN, LANDMARK_MINES_2
+	map SugarRouteGate, TILESET_11, GATE, LANDMARK_MINES_1
+	map SugarHouse, TILESET_14, INDOOR, LANDMARK_MINES_2
+	map SugarHouse2, TILESET_0B, INDOOR, LANDMARK_MINES_2
+	map SugarMart, TILESET_0D, INDOOR, LANDMARK_MINES_2
+	map SugarPokecenter1F, TILESET_0C, INDOOR, LANDMARK_MINES_2
+	map SugarPokecenter2F, TILESET_0C, INDOOR, LANDMARK_MINES_2
+
+MapGroup_Bull:
+	map BullForestRoute1, TILESET_06, ROUTE, LANDMARK_MINES_5
+	map BullForestRoute2, TILESET_06, ROUTE, LANDMARK_HIGH_TECH
+	map BullForestRoute3, TILESET_06, ROUTE, LANDMARK_OLD
+	map BullForest, TILESET_06, TOWN, LANDMARK_WEST
+	map BullForestRoute1House, TILESET_09, INDOOR, LANDMARK_MINES_5
+	map BullForestRouteGateStand, TILESET_11, GATE, LANDMARK_HIGH_TECH
+	map BullMart, TILESET_0D, INDOOR, LANDMARK_WEST
+	map BullHouse1, TILESET_0B, INDOOR, LANDMARK_WEST
+	map BullHouse2, TILESET_09, INDOOR, LANDMARK_WEST
+	map BullHouse3, TILESET_09, INDOOR, LANDMARK_WEST
+	map BullPokecenter1F, TILESET_0C, INDOOR, LANDMARK_WEST
+	map BullPokecenter2F, TILESET_0C, INDOOR, LANDMARK_WEST
+	map BullLeague1F, TILESET_0F, INDOOR, LANDMARK_WEST
+	map BullLeague2F, TILESET_14, INDOOR, LANDMARK_WEST
+	map BullHouse4, TILESET_09, INDOOR, LANDMARK_WEST
+
+MapGroup_Stand:
+	map StandRoute, TILESET_00, ROUTE, LANDMARK_BIRDON
+	map Stand, TILESET_00, TOWN, LANDMARK_FOUNT
+	map StandRouteGateKanto, TILESET_11, GATE, LANDMARK_BIRDON
+	map StandLab, TILESET_0C, INDOOR, LANDMARK_FOUNT
+	map StandPokecenter1F, TILESET_0C, INDOOR, LANDMARK_FOUNT
+	map StandPokecenter2F, TILESET_0C, INDOOR, LANDMARK_FOUNT
+	map StandOffice, TILESET_12, INDOOR, LANDMARK_FOUNT
+	map StandMart, TILESET_0D, INDOOR, LANDMARK_FOUNT
+	map StandHouse, TILESET_09, INDOOR, LANDMARK_FOUNT
+	map StandRocketHouse1F, TILESET_13, INDOOR, LANDMARK_FOUNT
+	map StandRocketHouse2F, TILESET_13, INDOOR, LANDMARK_FOUNT
+	map StandLeague1F, TILESET_0F, INDOOR, LANDMARK_FOUNT
+	map StandLeague2F, TILESET_14, INDOOR, LANDMARK_FOUNT
+
+MapGroup_Kanto:
+	map KantoEastRoute, TILESET_07, ROUTE, LANDMARK_NEW_TYPE
+	map Kanto, TILESET_07, TOWN, LANDMARK_SUGAR
+	map KantoCeruleanHouse, TILESET_11, GATE, LANDMARK_SUGAR
+	map KantoPokecenter1F, TILESET_0C, INDOOR, LANDMARK_SUGAR
+	map KantoPokecenter2F, TILESET_0C, INDOOR, LANDMARK_SUGAR
+	map KantoLeague1F, TILESET_0F, INDOOR, LANDMARK_SUGAR
+	map KantoLeague2F, TILESET_14, INDOOR, LANDMARK_SUGAR
+	map KantoLavenderHouse, TILESET_09, INDOOR, LANDMARK_SUGAR
+	map KantoCeladonMart1F, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoCeladonMart2F, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoCeladonMart3F, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoCeladonMart4F, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoCeladonMart5F, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoCeladonElevator, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoMart, TILESET_0D, INDOOR, LANDMARK_SUGAR
+	map KantoGamefreakHQ1, TILESET_0A, INDOOR, LANDMARK_SUGAR
+	map KantoGamefreakHQ2, TILESET_0A, INDOOR, LANDMARK_SUGAR
+	map KantoGamefreakHQ3, TILESET_0A, INDOOR, LANDMARK_SUGAR
+	map KantoGamefreakHQ4, TILESET_0D, INDOOR, LANDMARK_SUGAR
+	map KantoGamefreakHQ5, TILESET_0A, INDOOR, LANDMARK_SUGAR
+	map KantoSilphCo, TILESET_13, INDOOR, LANDMARK_SUGAR
+	map KantoViridianHouse, TILESET_09, INDOOR, LANDMARK_SUGAR
+	map KantoGameCorner, TILESET_0E, INDOOR, LANDMARK_SUGAR
+	map KantoUnusedArea, TILESET_11, INDOOR, LANDMARK_SUGAR
+	map KantoGameCornerPrizes, TILESET_0E, INDOOR, LANDMARK_SUGAR
+	map KantoDiner, TILESET_0E, INDOOR, LANDMARK_SUGAR
+	map KantoSchool, TILESET_0F, INDOOR, LANDMARK_SUGAR
+	map KantoHospital, TILESET_10, INDOOR, LANDMARK_SUGAR
+	map KantoPokecenter21F, TILESET_0C, INDOOR, LANDMARK_SUGAR
+	map KantoPokecenter22F, TILESET_0C, INDOOR, LANDMARK_SUGAR
+	map KantoRedsHouse, TILESET_09, INDOOR, LANDMARK_SUGAR
+	map KantoGreensHouse1F, TILESET_09, INDOOR, LANDMARK_SUGAR
+	map KantoGreensHouse2F, TILESET_09, INDOOR, LANDMARK_SUGAR
+	map KantoEldersHouse, TILESET_09, INDOOR, LANDMARK_SUGAR
+	map KantoOaksLab, TILESET_0A, INDOOR, LANDMARK_SUGAR
+	map KantoLeague21F, TILESET_0F, INDOOR, LANDMARK_SUGAR
+	map KantoLeague22F, TILESET_14, INDOOR, LANDMARK_SUGAR
+	map KantoFishingGuru, TILESET_09, INDOOR, LANDMARK_SUGAR
+
+MapGroup_Prince:
+	map PrinceRoute, TILESET_00, ROUTE, LANDMARK_KANTO
+	map Prince, TILESET_00, TOWN, LANDMARK_KANTO
+
+MapGroup_MtFuji:
+	map MtFujiRoute, TILESET_00, ROUTE, LANDMARK_PRINCE
+	map MtFuji, TILESET_00, TOWN, LANDMARK_PRINCE
+
+MapGroup_South:
+	map South, TILESET_08, TOWN, LANDMARK_POKEMON_LEAGUE_1
+	map SouthHouse1, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_1
+	map SouthPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_1
+	map SouthPokecenter2F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_1
+	map SouthMart, TILESET_0D, INDOOR, LANDMARK_POKEMON_LEAGUE_1
+	map SouthHouse2, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_1
+
+MapGroup_North:
+	map North, TILESET_06, TOWN, LANDMARK_SILENT
+	map NorthHouse1, TILESET_09, INDOOR, LANDMARK_SILENT
+	map NorthMart, TILESET_0D, INDOOR, LANDMARK_SILENT
+	map NorthHouse2, TILESET_09, INDOOR, LANDMARK_SILENT
+	map NorthPokecenter1F, TILESET_0C, INDOOR, LANDMARK_SILENT
+	map NorthPokecenter2F, TILESET_0C, INDOOR, LANDMARK_SILENT
+
+MapGroup_Misc:
+	map PowerPlant1, TILESET_18, INDOOR, LANDMARK_NONE
+	map PowerPlant2, TILESET_18, INDOOR, LANDMARK_NONE
+	map PowerPlant3, TILESET_18, INDOOR, LANDMARK_NONE
+	map PowerPlant4, TILESET_18, INDOOR, LANDMARK_NONE
+	map RuinsOfAlphEntrance, TILESET_16, CAVE, LANDMARK_NONE
+	map RuinsOfAlphMain, TILESET_16, CAVE, LANDMARK_NONE
+	map CaveMinecarts1, TILESET_17, CAVE, LANDMARK_NONE
+	map CaveMinecarts2, TILESET_17, CAVE, LANDMARK_NONE
+	map CaveMinecarts3, TILESET_17, CAVE, LANDMARK_NONE
+	map CaveMinecarts4, TILESET_17, CAVE, LANDMARK_NONE
+	map CaveMinecarts5, TILESET_17, CAVE, LANDMARK_NONE
+	map CaveMinecarts6, TILESET_17, CAVE, LANDMARK_NONE
+	map CaveMinecarts7, TILESET_17, CAVE, LANDMARK_NONE
+	map Office1, TILESET_15, INDOOR, LANDMARK_NONE
+	map Office2, TILESET_15, INDOOR, LANDMARK_NONE
+	map Office3, TILESET_15, INDOOR, LANDMARK_NONE
+	map SlowpokeWellEntrance, TILESET_17, CAVE, LANDMARK_NONE
+	map SlowpokeWellMain, TILESET_17, CAVE, LANDMARK_NONE
+
+MapGroup_Empty:
diff --git a/shim.sym b/shim.sym
index 0c6ab65..1a6cac0 100644
--- a/shim.sym
+++ b/shim.sym
@@ -89,7 +89,6 @@
 03:5F7D Function_df7d
 03:5F91 Function_df91
 
-04:4001 MapGroupPointers
 04:528F Function_1128f
 04:52C1 Function_112c1
 04:5677 DoPlayerMovement
@@ -219,3 +218,233 @@
 01:d657 wMapId
 01:D7D2 wPartyMonOT
 01:DA3B wOTPartyMonOT
+
+; MapAttributes
+36:59DF Route1P1_MapAttributes
+36:5ABE Route1P2_MapAttributes
+36:724D RouteSilentEast_MapAttributes
+36:4014 SilentHill_MapAttributes
+26:4000 Route1Gate1F_MapAttributes
+26:40DA Route1Gate2F_MapAttributes
+34:4000 RouteSilentEastGate_MapAttributes
+34:4042 PlayerHouse1F_MapAttributes
+34:4132 PlayerHouse2F_MapAttributes
+34:45FF SilentPokecenter_MapAttributes
+34:47D5 SilentHillHouse_MapAttributes
+34:4AAC SilentHillLab_MapAttributes
+34:5BE6 SilentHillLab2_MapAttributes
+34:605D Unused13_MapAttributes
+2F:53DD ShizukanaOka_MapAttributes
+36:5BD4 Route2_MapAttributes
+36:410D OldCity_MapAttributes
+25:4000 Route2Gate1F_MapAttributes
+25:407C Route2Gate2F_MapAttributes
+25:40DC Route2House_MapAttributes
+25:414A OldCityMuseum_MapAttributes
+25:41CD OldCityGym_MapAttributes
+25:4289 OldCityTower1F_MapAttributes
+25:4319 OldCityTower2F_MapAttributes
+25:439E OldCityTower3F_MapAttributes
+25:4423 OldCityTower4F_MapAttributes
+25:44A8 OldCityTower5F_MapAttributes
+25:44FC OldCityBillsHouse_MapAttributes
+25:456A OldCityMart_MapAttributes
+25:45EE OldCityHouse_MapAttributes
+25:466E OldCityPokecenter1F_MapAttributes
+25:46FE OldCityPokecenter2F_MapAttributes
+25:4826 OldCityPokecenterTrade_MapAttributes
+25:48AC OldCityPokecenterBattle_MapAttributes
+25:492F OldCityPokecenterTimeMachine_MapAttributes
+25:49AC OldCityKurtsHouse_MapAttributes
+25:4A26 OldCitySchool_MapAttributes
+36:4372 West_MapAttributes
+26:4224 WestMart1F_MapAttributes
+26:42A0 WestMart2F_MapAttributes
+26:4374 WestMart3F_MapAttributes
+26:4433 WestMart4F_MapAttributes
+26:44F2 WestMart5F_MapAttributes
+26:4581 WestMart6F_MapAttributes
+26:460E WestMartElevator_MapAttributes
+26:464B WestRadioTower1F_MapAttributes
+26:46CA WestRadioTower2F_MapAttributes
+26:4772 WestRadioTower3F_MapAttributes
+26:4827 WestRadioTower4F_MapAttributes
+26:48E9 WestRadioTower5F_MapAttributes
+26:499F WestRocketRaidedHouse_MapAttributes
+26:4A49 WestPokecenter1F_MapAttributes
+26:4AE1 WestPokecenter2F_MapAttributes
+26:4B5E WestGym_MapAttributes
+26:4C1A WestHouse1_MapAttributes
+26:4C9E WestHouse2_MapAttributes
+36:5CC6 HaitekuWestRoute_MapAttributes
+36:5DD1 HaitekuWestRouteOcean_MapAttributes
+36:45D2 Haiteku_MapAttributes
+27:4000 HaitekuWestRouteGate_MapAttributes
+27:405B HaitekuPokecenter1F_MapAttributes
+27:40EF HaitekuPokecenter2F_MapAttributes
+27:4168 HaitekuLeague1F_MapAttributes
+27:4209 HaitekuLeague2F_MapAttributes
+27:42A9 HaitekuMart_MapAttributes
+27:4329 HaitekuHouse1_MapAttributes
+27:4383 HaitekuHouse2_MapAttributes
+27:43DD HaitekuImposterOakHouse_MapAttributes
+27:4444 HaitekuAquarium1F_MapAttributes
+27:44CB HaitekuAquarium2F_MapAttributes
+36:5F17 FontoRoute1_MapAttributes
+36:61E8 FontoRoute2_MapAttributes
+36:63B2 FontoRoute3_MapAttributes
+36:62C6 FontoRoute4_MapAttributes
+36:7444 FontoRoute5_MapAttributes
+36:6083 FontoRoute6_MapAttributes
+36:47F8 Fonto_MapAttributes
+27:4537 FontoRouteGate1_MapAttributes
+27:4592 FontoRouteGate2_MapAttributes
+27:45ED FontoRouteGate3_MapAttributes
+27:4648 FontoRocketHouse_MapAttributes
+27:46D5 FontoMart_MapAttributes
+27:4755 FontoHouse_MapAttributes
+27:47AF FontoPokecenter1F_MapAttributes
+27:4843 FontoPokecenter2F_MapAttributes
+27:48BC FontoLab_MapAttributes
+36:64BD BaadonRoute1_MapAttributes
+36:6603 BaadonRoute2_MapAttributes
+36:67EF BaadonRoute3_MapAttributes
+36:48F3 Baadon_MapAttributes
+27:4CDD BaadonRouteGateWest_MapAttributes
+27:4D38 BaadonRouteGateNewtype_MapAttributes
+27:4923 BaadonMart_MapAttributes
+27:49A3 BaadonPokecenter1F_MapAttributes
+27:4A2A BaadonPokecenter2F_MapAttributes
+27:4AA3 BaadonHouse1_MapAttributes
+27:4AF9 BaadonWallpaperHouse_MapAttributes
+27:4B42 BaadonHouse2_MapAttributes
+27:4B9C BaadonLeague1F_MapAttributes
+27:4C3D BaadonLeague2F_MapAttributes
+36:68DB Route15_MapAttributes
+36:69BD NewtypeRoute_MapAttributes
+36:6A6E Route18_MapAttributes
+36:49F9 Newtype_MapAttributes
+27:52E0 Route15Pokecenter1F_MapAttributes
+27:5374 Route15Pokecenter2F_MapAttributes
+27:53C6 NewtypeRouteGate_MapAttributes
+27:5421 Route18Pokecenter1F_MapAttributes
+27:54B5 Route18Pokecenter2F_MapAttributes
+27:4D93 NewtypePokecenter1F_MapAttributes
+27:4E27 NewtypePokecenter2F_MapAttributes
+27:4EA0 NewtypeLeague1F_MapAttributes
+27:4F41 NewtypeLeague2F_MapAttributes
+27:4FE1 NewtypeSailorHouse_MapAttributes
+27:503B NewtypeMart_MapAttributes
+27:50BB NewtypeDojo_MapAttributes
+27:5155 NewtypeHouse1_MapAttributes
+27:51AF NewtypeDiner_MapAttributes
+27:522C NewtypeHouse2_MapAttributes
+27:5286 NewtypeHouse3_MapAttributes
+36:6D8F SugarRoute_MapAttributes
+36:4C3A Sugar_MapAttributes
+27:5507 SugarRouteGate_MapAttributes
+27:5562 SugarHouse_MapAttributes
+27:55E2 SugarHouse2_MapAttributes
+27:5638 SugarMart_MapAttributes
+27:56B8 SugarPokecenter1F_MapAttributes
+27:574C SugarPokecenter2F_MapAttributes
+36:6C6F BullForestRoute1_MapAttributes
+36:6ED5 BullForestRoute2_MapAttributes
+36:7530 BullForestRoute3_MapAttributes
+36:4D05 BullForest_MapAttributes
+27:57C5 BullForestRoute1House_MapAttributes
+27:581F BullForestRouteGateStand_MapAttributes
+27:587A BullMart_MapAttributes
+27:58FA BullHouse1_MapAttributes
+27:5950 BullHouse2_MapAttributes
+27:59AA BullHouse3_MapAttributes
+27:5A04 BullPokecenter1F_MapAttributes
+27:5A98 BullPokecenter2F_MapAttributes
+27:5B11 BullLeague1F_MapAttributes
+27:5BB2 BullLeague2F_MapAttributes
+27:5C52 BullHouse4_MapAttributes
+36:701B StandRoute_MapAttributes
+36:4F28 Stand_MapAttributes
+27:5C9F StandRouteGateKanto_MapAttributes
+27:5CFA StandLab_MapAttributes
+27:5D50 StandPokecenter1F_MapAttributes
+27:5DE4 StandPokecenter2F_MapAttributes
+27:5E5D StandOffice_MapAttributes
+27:5EDD StandMart_MapAttributes
+27:5F5D StandHouse_MapAttributes
+27:5FB7 StandRocketHouse1F_MapAttributes
+27:6024 StandRocketHouse2F_MapAttributes
+27:6083 StandLeague1F_MapAttributes
+27:6124 StandLeague2F_MapAttributes
+36:7161 KantoEastRoute_MapAttributes
+36:519D Kanto_MapAttributes
+27:61C4 KantoCeruleanHouse_MapAttributes
+27:621E KantoPokecenter1F_MapAttributes
+27:62B2 KantoPokecenter2F_MapAttributes
+27:632B KantoLeague1F_MapAttributes
+27:63CC KantoLeague2F_MapAttributes
+27:646C KantoLavenderHouse_MapAttributes
+27:64D3 KantoCeladonMart1F_MapAttributes
+27:6547 KantoCeladonMart2F_MapAttributes
+27:65C1 KantoCeladonMart3F_MapAttributes
+27:663B KantoCeladonMart4F_MapAttributes
+27:66C2 KantoCeladonMart5F_MapAttributes
+27:6742 KantoCeladonElevator_MapAttributes
+27:677F KantoMart_MapAttributes
+27:67FF KantoGamefreakHQ1_MapAttributes
+27:6899 KantoGamefreakHQ2_MapAttributes
+27:6905 KantoGamefreakHQ3_MapAttributes
+27:698B KantoGamefreakHQ4_MapAttributes
+27:69E3 KantoGamefreakHQ5_MapAttributes
+27:6A2C KantoSilphCo_MapAttributes
+27:6ADF KantoViridianHouse_MapAttributes
+27:6B46 KantoGameCorner_MapAttributes
+27:6C55 KantoUnusedArea_MapAttributes
+27:6C90 KantoGameCornerPrizes_MapAttributes
+27:6D04 KantoDiner_MapAttributes
+27:6D51 KantoSchool_MapAttributes
+27:6DEB KantoHospital_MapAttributes
+27:6E6B KantoPokecenter21F_MapAttributes
+27:6EFF KantoPokecenter22F_MapAttributes
+27:6F78 KantoRedsHouse_MapAttributes
+27:6FDF KantoGreensHouse1F_MapAttributes
+27:703C KantoGreensHouse2F_MapAttributes
+27:707E KantoEldersHouse_MapAttributes
+27:70E5 KantoOaksLab_MapAttributes
+27:713B KantoLeague21F_MapAttributes
+27:71DC KantoLeague22F_MapAttributes
+27:727C KantoFishingGuru_MapAttributes
+36:738C PrinceRoute_MapAttributes
+36:55F3 Prince_MapAttributes
+36:73E8 MtFujiRoute_MapAttributes
+36:5677 MtFuji_MapAttributes
+36:56EF South_MapAttributes
+27:72D6 SouthHouse1_MapAttributes
+27:7330 SouthPokecenter1F_MapAttributes
+27:73C4 SouthPokecenter2F_MapAttributes
+27:743D SouthMart_MapAttributes
+27:74BD SouthHouse2_MapAttributes
+36:5914 North_MapAttributes
+27:7517 NorthHouse1_MapAttributes
+27:7571 NorthMart_MapAttributes
+27:75F1 NorthHouse2_MapAttributes
+27:764B NorthPokecenter1F_MapAttributes
+27:76DF NorthPokecenter2F_MapAttributes
+2F:4000 PowerPlant1_MapAttributes
+2F:407D PowerPlant2_MapAttributes
+2F:40FA PowerPlant3_MapAttributes
+2F:422B PowerPlant4_MapAttributes
+2F:435C RuinsOfAlphEntrance_MapAttributes
+2F:43D9 RuinsOfAlphMain_MapAttributes
+2F:469F CaveMinecarts1_MapAttributes
+2F:482A CaveMinecarts2_MapAttributes
+2F:49B5 CaveMinecarts3_MapAttributes
+2F:4B40 CaveMinecarts4_MapAttributes
+2F:4CCB CaveMinecarts5_MapAttributes
+2F:4E56 CaveMinecarts6_MapAttributes
+2F:4F2D CaveMinecarts7_MapAttributes
+2F:5004 Office1_MapAttributes
+2F:5081 Office2_MapAttributes
+2F:51B2 Office3_MapAttributes
+2F:5289 SlowpokeWellEntrance_MapAttributes
+2F:5306 SlowpokeWellMain_MapAttributes