region map locations

6 files changed, 342 insertions, 10 deletions

diff --git a/asm/charmap.s b/asm/charmap.s
index b0be6759f..4b238d3bd 100644
--- a/asm/charmap.s
+++ b/asm/charmap.s
@@ -255,6 +255,9 @@
 	.charmap_const PKMN, 0x53, 0x54
 	.charmap_const POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59
 
+	; indicates the end of a town/city name (before " TOWN" or " CITY")
+	.charmap_const NAME_END, 0xFC, 0x00
+
 ; string placeholders
 	; unknown (0xFD, 0x00)
 	.charmap_const PLAYER,             0xFD, 0x01
diff --git a/asm/macros.s b/asm/macros.s
index 590df5a20..8faccc42a 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -5,7 +5,7 @@
 	.include "asm/macros/map.s"
 	.include "asm/macros/field_effect_script.s"
 
-	.macro region_map_entry x, y, width, height, name
+	.macro region_map_location x, y, width, height, name
 	.byte \x
 	.byte \y
 	.byte \width
diff --git a/asm/rom.s b/asm/rom.s
index 69e031e1d..4497ab401 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -516453,7 +516453,7 @@ _080FB53A:
 	.align 2
 _080FB548: .4byte 0x02025748
 _080FB54C: .4byte 0x020388cc
-_080FB550: .4byte gUnknown_083E73C4
+_080FB550: .4byte gRegionMapLocations
 _080FB554:
 	cmp r5, 0x29
 	beq _080FB566
@@ -516548,7 +516548,7 @@ _080FB5E8:
 	bx r0
 	.align 2
 _080FB5F8: .4byte 0x020388cc
-_080FB5FC: .4byte gUnknown_083E73C4
+_080FB5FC: .4byte gRegionMapLocations
 	thumb_func_end sub_80FB32C
 
 	thumb_func_start sub_80FB600
@@ -516718,7 +516718,7 @@ _080FB710:
 	bx r0
 	.align 2
 _080FB750: .4byte 0x020388cc
-_080FB754: .4byte gUnknown_083E73C4
+_080FB754: .4byte gRegionMapLocations
 	thumb_func_end sub_80FB600
 
 	thumb_func_start sub_80FB758
@@ -517804,7 +517804,7 @@ _080FBFCA:
 	bl CopyString
 	b _080FBFF2
 	.align 2
-_080FBFE0: .4byte gUnknown_083E73C4
+_080FBFE0: .4byte gRegionMapLocations
 _080FBFE4:
 	cmp r2, 0
 	bne _080FBFEA
@@ -517885,7 +517885,7 @@ sub_80FC04C: ; 80FC04C
 	pop {r0}
 	bx r0
 	.align 2
-_080FC070: .4byte gUnknown_083E73C4
+_080FC070: .4byte gRegionMapLocations
 	thumb_func_end sub_80FC04C
 
 	thumb_func_start sub_80FC074
@@ -562736,7 +562736,7 @@ _0811170C:
 _08111720: .4byte gUnknown_083F858C
 _08111724: .4byte gUnknown_083F8594
 _08111728: .4byte 0x02000000
-_0811172C: .4byte gUnknown_083E73C4
+_0811172C: .4byte gRegionMapLocations
 _08111730: .4byte gUnknown_083F85A4
 _08111734: .4byte 0x02020004
 	thumb_func_end sub_8111658
diff --git a/data/data2.s b/data/data2.s
index 23efc9982..a076f4913 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -4343,10 +4343,10 @@ gUnknown_083E6B04: ; 83E6B04
 	.incbin "baserom.gba", 0x003e6b04, 0x34c
 
 gUnknown_083E6E50: ; 83E6E50
-	.incbin "baserom.gba", 0x003e6e50, 0x574
+	.incbin "baserom.gba", 0x003e6e50, 0x1A4
 
-gUnknown_083E73C4: ; 83E73C4
-	.incbin "baserom.gba", 0x003e73c4, 0x2c0
+; 83E6FF4
+	.include "data/region_map_locations.s"
 
 gUnknown_083E7684: ; 83E7684
 	.incbin "baserom.gba", 0x003e7684, 0x64
diff --git a/data/egg_moves.s b/data/egg_moves.s
index bba67ced2..453ffb2a9 100644
--- a/data/egg_moves.s
+++ b/data/egg_moves.s
@@ -1303,4 +1303,5 @@ gEggMoves: ; 82091DC
 	.2byte MOVE_CURSE
 	.2byte MOVE_HYPNOSIS
 	.2byte MOVE_DREAM_EATER
+
 	.2byte -1
diff --git a/data/region_map_locations.s b/data/region_map_locations.s
new file mode 100644
index 000000000..101f4faac
--- /dev/null
+++ b/data/region_map_locations.s
@@ -0,0 +1,328 @@
+gMapName_LittlerootTown: ; 83E6FF4
+	.string "LITTLEROOT{NAME_END} TOWN$"
+
+gMapName_OldaleTown: ; 83E7006
+	.string "OLDALE{NAME_END} TOWN$"
+
+gMapName_DewfordTown: ; 83E7014
+	.string "DEWFORD{NAME_END} TOWN$"
+
+gMapName_LavaridgeTown: ; 83E7023
+	.string "LAVARIDGE{NAME_END} TOWN$"
+
+gMapName_FallarborTown: ; 83E7034
+	.string "FALLARBOR{NAME_END} TOWN$"
+
+gMapName_VerdanturfTown: ; 83E7045
+	.string "VERDANTURF{NAME_END} TOWN$"
+
+gMapName_PacifidlogTown: ; 83E7057
+	.string "PACIFIDLOG{NAME_END} TOWN$"
+
+gMapName_PetalburgCity: ; 83E7069
+	.string "PETALBURG{NAME_END} CITY$"
+
+gMapName_SlateportCity: ; 83E707A
+	.string "SLATEPORT{NAME_END} CITY$"
+
+gMapName_MauvilleCity: ; 83E708B
+	.string "MAUVILLE{NAME_END} CITY$"
+
+gMapName_RustboroCity: ; 83E709B
+	.string "RUSTBORO{NAME_END} CITY$"
+
+gMapName_FortreeCity: ; 83E70AB
+	.string "FORTREE{NAME_END} CITY$"
+
+gMapName_LilycoveCity: ; 83E70BA
+	.string "LILYCOVE{NAME_END} CITY$"
+
+gMapName_MossdeepCity: ; 83E70CA
+	.string "MOSSDEEP{NAME_END} CITY$"
+
+gMapName_SootopolisCity: ; 83E70DA
+	.string "SOOTOPOLIS{NAME_END} CITY$"
+
+gMapName_EverGrandeCity: ; 83E70EC
+	.string "EVER GRANDE{NAME_END} CITY$"
+
+gMapName_Route101: ; 83E70FF
+	.string "ROUTE 101$"
+
+gMapName_Route102: ; 83E7109
+	.string "ROUTE 102$"
+
+gMapName_Route103: ; 83E7113
+	.string "ROUTE 103$"
+
+gMapName_Route104: ; 83E711D
+	.string "ROUTE 104$"
+
+gMapName_Route105: ; 83E7127
+	.string "ROUTE 105$"
+
+gMapName_Route106: ; 83E7131
+	.string "ROUTE 106$"
+
+gMapName_Route107: ; 83E713B
+	.string "ROUTE 107$"
+
+gMapName_Route108: ; 83E7145
+	.string "ROUTE 108$"
+
+gMapName_Route109: ; 83E714F
+	.string "ROUTE 109$"
+
+gMapName_Route110: ; 83E7159
+	.string "ROUTE 110$"
+
+gMapName_Route111: ; 83E7163
+	.string "ROUTE 111$"
+
+gMapName_Route112: ; 83E716D
+	.string "ROUTE 112$"
+
+gMapName_Route113: ; 83E7177
+	.string "ROUTE 113$"
+
+gMapName_Route114: ; 83E7181
+	.string "ROUTE 114$"
+
+gMapName_Route115: ; 83E718B
+	.string "ROUTE 115$"
+
+gMapName_Route116: ; 83E7195
+	.string "ROUTE 116$"
+
+gMapName_Route117: ; 83E719F
+	.string "ROUTE 117$"
+
+gMapName_Route118: ; 83E71A9
+	.string "ROUTE 118$"
+
+gMapName_Route119: ; 83E71B3
+	.string "ROUTE 119$"
+
+gMapName_Route120: ; 83E71BD
+	.string "ROUTE 120$"
+
+gMapName_Route121: ; 83E71C7
+	.string "ROUTE 121$"
+
+gMapName_Route122: ; 83E71D1
+	.string "ROUTE 122$"
+
+gMapName_Route123: ; 83E71DB
+	.string "ROUTE 123$"
+
+gMapName_Route124: ; 83E71E5
+	.string "ROUTE 124$"
+
+gMapName_Route125: ; 83E71EF
+	.string "ROUTE 125$"
+
+gMapName_Route126: ; 83E71F9
+	.string "ROUTE 126$"
+
+gMapName_Route127: ; 83E7203
+	.string "ROUTE 127$"
+
+gMapName_Route128: ; 83E720D
+	.string "ROUTE 128$"
+
+gMapName_Route129: ; 83E7217
+	.string "ROUTE 129$"
+
+gMapName_Route130: ; 83E7221
+	.string "ROUTE 130$"
+
+gMapName_Route131: ; 83E722B
+	.string "ROUTE 131$"
+
+gMapName_Route132: ; 83E7235
+	.string "ROUTE 132$"
+
+gMapName_Route133: ; 83E723F
+	.string "ROUTE 133$"
+
+gMapName_Route134: ; 83E7249
+	.string "ROUTE 134$"
+
+gMapName_Underwater: ; 83E7253
+	.string "UNDERWATER$"
+
+gMapName_GraniteCave: ; 83E725E
+	.string "GRANITE CAVE$"
+
+gMapName_MtChimney: ; 83E726B
+	.string "MT. CHIMNEY$"
+
+gMapName_SafariZone: ; 83E7277
+	.string "SAFARI ZONE$"
+
+gMapName_BattleTower: ; 83E7283
+	.string "BATTLE TOWER$"
+
+gMapName_PetalburgWoods: ; 83E7290
+	.string "PETALBURG WOODS$"
+
+gMapName_RusturfTunnel: ; 83E72A0
+	.string "RUSTURF TUNNEL$"
+
+gMapName_AbandonedShip: ; 83E72AF
+	.string "ABANDONED SHIP$"
+
+gMapName_NewMauville: ; 83E72BE
+	.string "NEW MAUVILLE$"
+
+gMapName_MeteorFalls: ; 83E72CB
+	.string "METEOR FALLS$"
+
+gMapName_MtPyre: ; 83E72D8
+	.string "MT. PYRE$"
+
+gMapName_EvilTeamHideout: ; 83E72E1
+	.string "{EVIL_TEAM} HIDEOUT$"
+
+gMapName_ShoalCave: ; 83E72EC
+	.string "SHOAL CAVE$"
+
+gMapName_SeafloorCavern: ; 83E72F7
+	.string "SEAFLOOR CAVERN$"
+
+gMapName_VictoryRoad: ; 83E7307
+	.string "VICTORY ROAD$"
+
+gMapName_MirageIsland: ; 83E7314
+	.string "MIRAGE ISLAND$"
+
+gMapName_CaveOfOrigin: ; 83E7322
+	.string "CAVE OF ORIGIN$"
+
+gMapName_SouthernIsland: ; 83E7331
+	.string "SOUTHERN ISLAND$"
+
+gMapName_FieryPath: ; 83E7341
+	.string "FIERY PATH$"
+
+gMapName_JaggedPass: ; 83E734C
+	.string "JAGGED PASS$"
+
+gMapName_SealedChamber: ; 83E7358
+	.string "SEALED CHAMBER$"
+
+gMapName_ScorchedSlab: ; 83E7367
+	.string "SCORCHED SLAB$"
+
+gMapName_IslandCave: ; 83E7375
+	.string "ISLAND CAVE$"
+
+gMapName_DesertRuins: ; 83E7381
+	.string "DESERT RUINS$"
+
+gMapName_AncientTomb: ; 83E738E
+	.string "ANCIENT TOMB$"
+
+gMapName_InsideOfTruck: ; 83E739B
+	.string "INSIDE OF TRUCK$"
+
+gMapName_SkyPillar: ; 83E73AB
+	.string "SKY PILLAR$"
+
+gMapName_SecretBase: ; 83E73B6
+	.string "SECRET BASE$"
+
+gMapName_None: ; 83E73C2
+	.string "$"
+
+	.align 2
+
+gRegionMapLocations: ; 83E73C4
+	region_map_location  4, 11, 1, 1, LittlerootTown
+	region_map_location  4,  9, 1, 1, OldaleTown
+	region_map_location  2, 14, 1, 1, DewfordTown
+	region_map_location  5,  3, 1, 1, LavaridgeTown
+	region_map_location  3,  0, 1, 1, FallarborTown
+	region_map_location  4,  6, 1, 1, VerdanturfTown
+	region_map_location 17, 10, 1, 1, PacifidlogTown
+	region_map_location  1,  9, 1, 1, PetalburgCity
+	region_map_location  8, 10, 1, 2, SlateportCity
+	region_map_location  8,  6, 2, 1, MauvilleCity
+	region_map_location  0,  5, 1, 2, RustboroCity
+	region_map_location 12,  0, 1, 1, FortreeCity
+	region_map_location 18,  3, 2, 1, LilycoveCity
+	region_map_location 24,  5, 2, 1, MossdeepCity
+	region_map_location 21,  7, 1, 1, SootopolisCity
+	region_map_location 27,  8, 1, 2, EverGrandeCity
+	region_map_location  4, 10, 1, 1, Route101
+	region_map_location  2,  9, 2, 1, Route102
+	region_map_location  4,  8, 4, 1, Route103
+	region_map_location  0,  7, 1, 3, Route104
+	region_map_location  0, 10, 1, 3, Route105
+	region_map_location  0, 13, 2, 1, Route106
+	region_map_location  3, 14, 3, 1, Route107
+	region_map_location  6, 14, 2, 1, Route108
+	region_map_location  8, 12, 1, 3, Route109
+	region_map_location  8,  7, 1, 3, Route110
+	region_map_location  8,  0, 1, 6, Route111
+	region_map_location  6,  3, 2, 1, Route112
+	region_map_location  4,  0, 4, 1, Route113
+	region_map_location  1,  0, 2, 3, Route114
+	region_map_location  0,  2, 1, 3, Route115
+	region_map_location  1,  5, 4, 1, Route116
+	region_map_location  5,  6, 3, 1, Route117
+	region_map_location 10,  6, 2, 1, Route118
+	region_map_location 11,  0, 1, 6, Route119
+	region_map_location 13,  0, 1, 4, Route120
+	region_map_location 14,  3, 4, 1, Route121
+	region_map_location 16,  4, 1, 2, Route122
+	region_map_location 12,  6, 5, 1, Route123
+	region_map_location 20,  3, 4, 3, Route124
+	region_map_location 24,  3, 2, 2, Route125
+	region_map_location 20,  6, 3, 3, Route126
+	region_map_location 23,  6, 3, 3, Route127
+	region_map_location 23,  9, 4, 1, Route128
+	region_map_location 24, 10, 2, 1, Route129
+	region_map_location 21, 10, 3, 1, Route130
+	region_map_location 18, 10, 3, 1, Route131
+	region_map_location 15, 10, 2, 1, Route132
+	region_map_location 12, 10, 3, 1, Route133
+	region_map_location  9, 10, 3, 1, Route134
+	region_map_location 20,  3, 4, 3, Underwater
+	region_map_location 20,  6, 3, 3, Underwater
+	region_map_location 23,  6, 3, 3, Underwater
+	region_map_location 23,  9, 4, 1, Underwater
+	region_map_location 21,  7, 1, 1, Underwater
+	region_map_location  1, 13, 1, 1, GraniteCave
+	region_map_location  6,  2, 1, 1, MtChimney
+	region_map_location 16,  2, 1, 1, SafariZone
+	region_map_location 22, 12, 1, 1, BattleTower
+	region_map_location  0,  8, 1, 1, PetalburgWoods
+	region_map_location  2,  5, 1, 1, RusturfTunnel
+	region_map_location  6, 14, 1, 1, AbandonedShip
+	region_map_location  8,  7, 1, 1, NewMauville
+	region_map_location  0,  3, 1, 1, MeteorFalls
+	region_map_location  1,  2, 1, 1, MeteorFalls
+	region_map_location 16,  4, 1, 1, MtPyre
+	region_map_location 19,  3, 1, 1, EvilTeamHideout
+	region_map_location 24,  4, 1, 1, ShoalCave
+	region_map_location 24,  9, 1, 1, SeafloorCavern
+	region_map_location 24,  9, 1, 1, Underwater
+	region_map_location 27,  9, 1, 1, VictoryRoad
+	region_map_location 17, 10, 1, 1, MirageIsland
+	region_map_location 21,  7, 1, 1, CaveOfOrigin
+	region_map_location 12, 14, 1, 1, SouthernIsland
+	region_map_location  6,  3, 1, 1, FieryPath
+	region_map_location  7,  3, 1, 1, FieryPath
+	region_map_location  6,  3, 1, 1, JaggedPass
+	region_map_location  7,  2, 1, 1, JaggedPass
+	region_map_location 11, 10, 1, 1, SealedChamber
+	region_map_location 11, 10, 1, 1, Underwater
+	region_map_location 13,  0, 1, 1, ScorchedSlab
+	region_map_location  0, 10, 1, 1, IslandCave
+	region_map_location  8,  3, 1, 1, DesertRuins
+	region_map_location 13,  2, 1, 1, AncientTomb
+	region_map_location  0,  0, 1, 1, InsideOfTruck
+	region_map_location 19, 10, 1, 1, SkyPillar
+	region_map_location  0,  0, 1, 1, SecretBase
+	region_map_location  0,  0, 1, 1, None