Define layout constants

2019-01-29 16:55:25 -06:00
parent 14641e916e
commit 5c1667b41a
1091 changed files with 3257 additions and 2806 deletions
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,3 +1,4 @@
+#include "constants/layouts.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/weather.h"
--- a/data/maps/AbandonedShip_CaptainsOffice/events.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
@@ -1,11 +1,11 @@
-AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
+AbandonedShip_CaptainsOffice_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY

-AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
+AbandonedShip_CaptainsOffice_MapWarps:
 	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
 	warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK

-AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
+AbandonedShip_CaptainsOffice_MapEvents::
 	map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_CaptainsOffice: @ 84845A4
+AbandonedShip_CaptainsOffice:
 	.4byte AbandonedShip_CaptainsOffice_Layout
 	.4byte AbandonedShip_CaptainsOffice_MapEvents
 	.4byte AbandonedShip_CaptainsOffice_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 195
+	.2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Corridors_1F/events.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/events.inc
@@ -1,8 +1,8 @@
-AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
+AbandonedShip_Corridors_1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
 	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0

-AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
+AbandonedShip_Corridors_1F_MapWarps:
 	warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
 	warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
 	warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
@@ -16,6 +16,6 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
 	warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F

-AbandonedShip_Corridors_1F_MapEvents:: @ 8536750
+AbandonedShip_Corridors_1F_MapEvents::
 	map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Corridors_1F: @ 84844C4
+AbandonedShip_Corridors_1F:
 	.4byte AbandonedShip_Corridors_1F_Layout
 	.4byte AbandonedShip_Corridors_1F_MapEvents
 	.4byte AbandonedShip_Corridors_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 187
+	.2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Corridors_B1F/events.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc
@@ -1,8 +1,8 @@
-AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
+AbandonedShip_Corridors_B1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
 	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0

-AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
+AbandonedShip_Corridors_B1F_MapWarps:
 	warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
 	warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F
 	warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F
@@ -12,9 +12,9 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
 	warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F

-AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
+AbandonedShip_Corridors_B1F_MapBGEvents:
 	bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8

-AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
+AbandonedShip_Corridors_B1F_MapEvents::
 	map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents

--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Corridors_B1F: @ 84844FC
+AbandonedShip_Corridors_B1F:
 	.4byte AbandonedShip_Corridors_B1F_Layout
 	.4byte AbandonedShip_Corridors_B1F_MapEvents
 	.4byte AbandonedShip_Corridors_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 189
+	.2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Deck/events.inc
+++ b/data/maps/AbandonedShip_Deck/events.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Deck_MapWarps: @ 8536684
+AbandonedShip_Deck_MapWarps:
 	warp_def 13, 15, 3, 0, MAP_ROUTE108
 	warp_def 14, 15, 3, 0, MAP_ROUTE108
 	warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE

-AbandonedShip_Deck_MapEvents:: @ 85366AC
+AbandonedShip_Deck_MapEvents::
 	map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Deck: @ 84844A8
+AbandonedShip_Deck:
 	.4byte AbandonedShip_Deck_Layout
 	.4byte AbandonedShip_Deck_MapEvents
 	.4byte AbandonedShip_Deck_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 186
+	.2byte LAYOUT_ABANDONED_SHIP_DECK
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
@@ -1,4 +1,4 @@
-AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
+AbandonedShip_HiddenFloorCorridors_MapWarps:
 	warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
 	warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
 	warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
@@ -6,12 +6,12 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
 	warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
 	warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS

-AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
+AbandonedShip_HiddenFloorCorridors_MapBGEvents:
 	bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
 	bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
 	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
 	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE

-AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
+AbandonedShip_HiddenFloorCorridors_MapEvents::
 	map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents

--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_HiddenFloorCorridors: @ 84845DC
+AbandonedShip_HiddenFloorCorridors:
 	.4byte AbandonedShip_HiddenFloorCorridors_Layout
 	.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
 	.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 289
+	.2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
@@ -1,10 +1,10 @@
-AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
+AbandonedShip_HiddenFloorRooms_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18
 	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE

-AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
+AbandonedShip_HiddenFloorRooms_MapWarps:
 	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
 	warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
 	warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -15,7 +15,7 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
 	warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
 	warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS

-AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
+AbandonedShip_HiddenFloorRooms_MapBGEvents:
 	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY
 	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY
 	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY
@@ -27,6 +27,6 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
 	bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
 	bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3

-AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
+AbandonedShip_HiddenFloorRooms_MapEvents::
 	map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents

--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_HiddenFloorRooms: @ 84845F8
+AbandonedShip_HiddenFloorRooms:
 	.4byte AbandonedShip_HiddenFloorRooms_Layout
 	.4byte AbandonedShip_HiddenFloorRooms_MapEvents
 	.4byte AbandonedShip_HiddenFloorRooms_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 310
+	.2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Room_B1F/events.inc
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Room_B1F_EventObjects: @ 853697C
+AbandonedShip_Room_B1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13

-AbandonedShip_Room_B1F_MapWarps: @ 8536994
+AbandonedShip_Room_B1F_MapWarps:
 	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F

-AbandonedShip_Room_B1F_MapEvents:: @ 85369A4
+AbandonedShip_Room_B1F_MapEvents::
 	map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Room_B1F: @ 848456C
+AbandonedShip_Room_B1F:
 	.4byte AbandonedShip_Room_B1F_Layout
 	.4byte AbandonedShip_Room_B1F_MapEvents
 	.4byte AbandonedShip_Room_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 193
+	.2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Rooms2_1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
@@ -1,15 +1,15 @@
-AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
+AbandonedShip_Rooms2_1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE
 	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
 	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0

-AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
+AbandonedShip_Rooms2_1F_MapWarps:
 	warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F

-AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48
+AbandonedShip_Rooms2_1F_MapEvents::
 	map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Rooms2_1F: @ 8484588
+AbandonedShip_Rooms2_1F:
 	.4byte AbandonedShip_Rooms2_1F_Layout
 	.4byte AbandonedShip_Rooms2_1F_MapEvents
 	.4byte AbandonedShip_Rooms2_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 194
+	.2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
@@ -1,13 +1,13 @@
-AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
+AbandonedShip_Rooms2_B1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL

-AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
+AbandonedShip_Rooms2_B1F_MapWarps:
 	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F

-AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944
+AbandonedShip_Rooms2_B1F_MapEvents::
 	map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Rooms2_B1F: @ 8484534
+AbandonedShip_Rooms2_B1F:
 	.4byte AbandonedShip_Rooms2_B1F_Layout
 	.4byte AbandonedShip_Rooms2_B1F_MapEvents
 	.4byte AbandonedShip_Rooms2_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 191
+	.2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Rooms_1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Rooms_1F_EventObjects: @ 8536764
+AbandonedShip_Rooms_1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL
 	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0

-AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
+AbandonedShip_Rooms_1F_MapWarps:
 	warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F
@@ -12,6 +12,6 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
 	warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F
 	warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F

-AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4
+AbandonedShip_Rooms_1F_MapEvents::
 	map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Rooms_1F: @ 84844E0
+AbandonedShip_Rooms_1F:
 	.4byte AbandonedShip_Rooms_1F_Layout
 	.4byte AbandonedShip_Rooms_1F_MapEvents
 	.4byte AbandonedShip_Rooms_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 188
+	.2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Rooms_B1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
@@ -1,12 +1,12 @@
-AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
+AbandonedShip_Rooms_B1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE

-AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
+AbandonedShip_Rooms_B1F_MapWarps:
 	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F

-AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0
+AbandonedShip_Rooms_B1F_MapEvents::
 	map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Rooms_B1F: @ 8484518
+AbandonedShip_Rooms_B1F:
 	.4byte AbandonedShip_Rooms_B1F_Layout
 	.4byte AbandonedShip_Rooms_B1F_MapEvents
 	.4byte AbandonedShip_Rooms_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
-	.2byte 190
+	.2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
--- a/data/maps/AbandonedShip_Underwater1/events.inc
+++ b/data/maps/AbandonedShip_Underwater1/events.inc
@@ -1,7 +1,7 @@
-AbandonedShip_Underwater1_MapWarps: @ 8536958
+AbandonedShip_Underwater1_MapWarps:
 	warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2
 	warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2

-AbandonedShip_Underwater1_MapEvents:: @ 8536968
+AbandonedShip_Underwater1_MapEvents::
 	map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Underwater1: @ 8484550
+AbandonedShip_Underwater1:
 	.4byte AbandonedShip_Underwater1_Layout
 	.4byte AbandonedShip_Underwater1_MapEvents
 	.4byte AbandonedShip_Underwater1_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
-	.2byte 192
+	.2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_BUBBLES
--- a/data/maps/AbandonedShip_Underwater2/events.inc
+++ b/data/maps/AbandonedShip_Underwater2/events.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Underwater2_MapWarps: @ 8536AB0
+AbandonedShip_Underwater2_MapWarps:
 	warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1

-AbandonedShip_Underwater2_MapEvents:: @ 8536AB8
+AbandonedShip_Underwater2_MapEvents::
 	map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0

--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Underwater2: @ 84845C0
+AbandonedShip_Underwater2:
 	.4byte AbandonedShip_Underwater2_Layout
 	.4byte AbandonedShip_Underwater2_MapEvents
 	.4byte AbandonedShip_Underwater2_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
-	.2byte 196
+	.2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_BUBBLES
--- a/data/maps/AlteringCave/events.inc
+++ b/data/maps/AlteringCave/events.inc
@@ -1,6 +1,6 @@
-AlteringCave_MapWarps: @ 8537894
+AlteringCave_MapWarps:
 	warp_def 18, 22, 0, 0, MAP_ROUTE103

-AlteringCave_MapEvents:: @ 853789C
+AlteringCave_MapEvents::
 	map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0

--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -1,10 +1,10 @@
-AlteringCave: @ 8484A58
+AlteringCave:
 	.4byte AlteringCave_Layout
 	.4byte AlteringCave_MapEvents
 	.4byte AlteringCave_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
-	.2byte 420
+	.2byte LAYOUT_ALTERING_CAVE
 	.byte MAPSEC_ALTERING_CAVE_2
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AncientTomb/events.inc
+++ b/data/maps/AncientTomb/events.inc
@@ -1,16 +1,16 @@
-AncientTomb_EventObjects: @ 8536CDC
+AncientTomb_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL

-AncientTomb_MapWarps: @ 8536CF4
+AncientTomb_MapWarps:
 	warp_def 8, 29, 3, 0, MAP_ROUTE120
 	warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB
 	warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB

-AncientTomb_MapBGEvents: @ 8536D0C
+AncientTomb_MapBGEvents:
 	bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033
 	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
 	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050

-AncientTomb_MapEvents:: @ 8536D30
+AncientTomb_MapEvents::
 	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents

--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,10 +1,10 @@
-AncientTomb: @ 8484630
+AncientTomb:
 	.4byte AncientTomb_Layout
 	.4byte AncientTomb_MapEvents
 	.4byte AncientTomb_MapScripts
 	.4byte 0x0
 	.2byte MUS_MABOROSI
-	.2byte 281
+	.2byte LAYOUT_ANCIENT_TOMB
 	.byte MAPSEC_ANCIENT_TOMB
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AquaHideout_1F/events.inc
+++ b/data/maps/AquaHideout_1F/events.inc
@@ -1,13 +1,13 @@
-AquaHideout_1F_EventObjects: @ 8535304
+AquaHideout_1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
 	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
 	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS

-AquaHideout_1F_MapWarps: @ 853534C
+AquaHideout_1F_MapWarps:
 	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
 	warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY
 	warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F

-AquaHideout_1F_MapEvents:: @ 8535364
+AquaHideout_1F_MapEvents::
 	map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0

--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,10 +1,10 @@
-AquaHideout_1F: @ 8484144
+AquaHideout_1F:
 	.4byte AquaHideout_1F_Layout
 	.4byte AquaHideout_1F_MapEvents
 	.4byte AquaHideout_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
-	.2byte 143
+	.2byte LAYOUT_AQUA_HIDEOUT_1F
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AquaHideout_B1F/events.inc
+++ b/data/maps/AquaHideout_B1F/events.inc
@@ -1,4 +1,4 @@
-AquaHideout_B1F_EventObjects: @ 8535378
+AquaHideout_B1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR
@@ -9,7 +9,7 @@ AquaHideout_B1F_EventObjects: @ 8535378
 	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
 	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS

-AquaHideout_B1F_MapWarps: @ 8535450
+AquaHideout_B1F_MapWarps:
 	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
 	warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F
 	warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F
@@ -36,6 +36,6 @@ AquaHideout_B1F_MapWarps: @ 8535450
 	warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F
 	warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F

-AquaHideout_B1F_MapEvents:: @ 8535518
+AquaHideout_B1F_MapEvents::
 	map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0

--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,10 +1,10 @@
-AquaHideout_B1F: @ 8484160
+AquaHideout_B1F:
 	.4byte AquaHideout_B1F_Layout
 	.4byte AquaHideout_B1F_MapEvents
 	.4byte AquaHideout_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
-	.2byte 144
+	.2byte LAYOUT_AQUA_HIDEOUT_B1F
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AquaHideout_B2F/events.inc
+++ b/data/maps/AquaHideout_B2F/events.inc
@@ -1,4 +1,4 @@
-AquaHideout_B2F_EventObjects: @ 853552C
+AquaHideout_B2F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL
@@ -6,7 +6,7 @@ AquaHideout_B2F_EventObjects: @ 853552C
 	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS

-AquaHideout_B2F_MapWarps: @ 85355BC
+AquaHideout_B2F_MapWarps:
 	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
 	warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F
 	warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F
@@ -18,10 +18,10 @@ AquaHideout_B2F_MapWarps: @ 85355BC
 	warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F
 	warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F

-AquaHideout_B2F_MapCoordEvents: @ 853560C
+AquaHideout_B2F_MapCoordEvents:
 	coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
 	coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5

-AquaHideout_B2F_MapEvents:: @ 853562C
+AquaHideout_B2F_MapEvents::
 	map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0

--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,10 +1,10 @@
-AquaHideout_B2F: @ 848417C
+AquaHideout_B2F:
 	.4byte AquaHideout_B2F_Layout
 	.4byte AquaHideout_B2F_MapEvents
 	.4byte AquaHideout_B2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
-	.2byte 145
+	.2byte LAYOUT_AQUA_HIDEOUT_B2F
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc
@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC
+AquaHideout_UnusedRubyMap1_MapEvents::
 	map_events 0x0, 0x0, 0x0, 0x0

--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -1,10 +1,10 @@
-AquaHideout_UnusedRubyMap1: @ 84846D8
+AquaHideout_UnusedRubyMap1:
 	.4byte AquaHideout_UnusedRubyMap1_Layout
 	.4byte AquaHideout_UnusedRubyMap1_MapEvents
 	.4byte AquaHideout_UnusedRubyMap1_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
-	.2byte 316
+	.2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0
+AquaHideout_UnusedRubyMap2_MapEvents::
 	map_events 0x0, 0x0, 0x0, 0x0

--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -1,10 +1,10 @@
-AquaHideout_UnusedRubyMap2: @ 84846F4
+AquaHideout_UnusedRubyMap2:
 	.4byte AquaHideout_UnusedRubyMap2_Layout
 	.4byte AquaHideout_UnusedRubyMap2_MapEvents
 	.4byte AquaHideout_UnusedRubyMap2_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
-	.2byte 317
+	.2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc
@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4
+AquaHideout_UnusedRubyMap3_MapEvents::
 	map_events 0x0, 0x0, 0x0, 0x0

--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -1,10 +1,10 @@
-AquaHideout_UnusedRubyMap3: @ 8484710
+AquaHideout_UnusedRubyMap3:
 	.4byte AquaHideout_UnusedRubyMap3_Layout
 	.4byte AquaHideout_UnusedRubyMap3_MapEvents
 	.4byte AquaHideout_UnusedRubyMap3_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
-	.2byte 318
+	.2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/ArtisanCave_1F/events.inc
+++ b/data/maps/ArtisanCave_1F/events.inc
@@ -1,10 +1,10 @@
-ArtisanCave_1F_EventObjects: @ 8537774
+ArtisanCave_1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS

-ArtisanCave_1F_MapWarps: @ 853778C
+ArtisanCave_1F_MapWarps:
 	warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F

-ArtisanCave_1F_MapEvents:: @ 853779C
+ArtisanCave_1F_MapEvents::
 	map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0

--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -1,10 +1,10 @@
-ArtisanCave_1F: @ 84849B0
+ArtisanCave_1F:
 	.4byte ArtisanCave_1F_Layout
 	.4byte ArtisanCave_1F_MapEvents
 	.4byte ArtisanCave_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
-	.2byte 401
+	.2byte LAYOUT_ARTISAN_CAVE_1F
 	.byte MAPSEC_ARTISAN_CAVE
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/ArtisanCave_B1F/events.inc
+++ b/data/maps/ArtisanCave_B1F/events.inc
@@ -1,16 +1,16 @@
-ArtisanCave_B1F_EventObjects: @ 8537708
+ArtisanCave_B1F_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP

-ArtisanCave_B1F_MapWarps: @ 8537720
+ArtisanCave_B1F_MapWarps:
 	warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F

-ArtisanCave_B1F_MapBGEvents: @ 8537730
+ArtisanCave_B1F_MapBGEvents:
 	bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC
 	bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM
 	bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN
 	bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON

-ArtisanCave_B1F_MapEvents:: @ 8537760
+ArtisanCave_B1F_MapEvents::
 	map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents

--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -1,10 +1,10 @@
-ArtisanCave_B1F: @ 8484994
+ArtisanCave_B1F:
 	.4byte ArtisanCave_B1F_Layout
 	.4byte ArtisanCave_B1F_MapEvents
 	.4byte ArtisanCave_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
-	.2byte 400
+	.2byte LAYOUT_ARTISAN_CAVE_B1F
 	.byte MAPSEC_ARTISAN_CAVE
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
+BattleFrontier_BattleArenaBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
@@ -9,6 +9,6 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
 	object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
 	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
+BattleFrontier_BattleArenaBattleRoom_MapEvents::
 	map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleArenaBattleRoom: @ 8485484
+BattleFrontier_BattleArenaBattleRoom:
 	.4byte BattleFrontier_BattleArenaBattleRoom_Layout
 	.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_ARENA
-	.2byte 356
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
+BattleFrontier_BattleArenaCorridor_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
+BattleFrontier_BattleArenaCorridor_MapEvents::
 	map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleArenaCorridor: @ 8485468
+BattleFrontier_BattleArenaCorridor:
 	.4byte BattleFrontier_BattleArenaCorridor_Layout
 	.4byte BattleFrontier_BattleArenaCorridor_MapEvents
 	.4byte BattleFrontier_BattleArenaCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_ARENA
-	.2byte 355
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
@@ -1,17 +1,17 @@
-BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
+BattleFrontier_BattleArenaLobby_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
 	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
 	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0

-BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
+BattleFrontier_BattleArenaLobby_MapWarps:
 	warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST

-BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
+BattleFrontier_BattleArenaLobby_MapBGEvents:
 	bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092
 	bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA

-BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
+BattleFrontier_BattleArenaLobby_MapEvents::
 	map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents

--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleArenaLobby: @ 848544C
+BattleFrontier_BattleArenaLobby:
 	.4byte BattleFrontier_BattleArenaLobby_Layout
 	.4byte BattleFrontier_BattleArenaLobby_MapEvents
 	.4byte BattleFrontier_BattleArenaLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_ARENA
-	.2byte 354
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
+BattleFrontier_BattleDomeBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
@@ -15,6 +15,6 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
 	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
+BattleFrontier_BattleDomeBattleRoom_MapEvents::
 	map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeBattleRoom: @ 8485388
+BattleFrontier_BattleDomeBattleRoom:
 	.4byte BattleFrontier_BattleDomeBattleRoom_Layout
 	.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME
-	.2byte 335
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
+BattleFrontier_BattleDomeCorridor_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
+BattleFrontier_BattleDomeCorridor_MapWarps:
 	warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

-BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
+BattleFrontier_BattleDomeCorridor_MapEvents::
 	map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeCorridor: @ 8485350
+BattleFrontier_BattleDomeCorridor:
 	.4byte BattleFrontier_BattleDomeCorridor_Layout
 	.4byte BattleFrontier_BattleDomeCorridor_MapEvents
 	.4byte BattleFrontier_BattleDomeCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME1
-	.2byte 333
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
+BattleFrontier_BattleDomeLobby_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
 	object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
@@ -6,16 +6,16 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
 	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
 	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0

-BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
+BattleFrontier_BattleDomeLobby_MapWarps:
 	warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

-BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
+BattleFrontier_BattleDomeLobby_MapBGEvents:
 	bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52
 	bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84
 	bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B
 	bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34

-BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
+BattleFrontier_BattleDomeLobby_MapEvents::
 	map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents

--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeLobby: @ 8485334
+BattleFrontier_BattleDomeLobby:
 	.4byte BattleFrontier_BattleDomeLobby_Layout
 	.4byte BattleFrontier_BattleDomeLobby_MapEvents
 	.4byte BattleFrontier_BattleDomeLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME1
-	.2byte 332
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
+BattleFrontier_BattleDomePreBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
+BattleFrontier_BattleDomePreBattleRoom_MapWarps:
 	warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

-BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
+BattleFrontier_BattleDomePreBattleRoom_MapEvents::
 	map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomePreBattleRoom: @ 848536C
+BattleFrontier_BattleDomePreBattleRoom:
 	.4byte BattleFrontier_BattleDomePreBattleRoom_Layout
 	.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME
-	.2byte 334
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
+BattleFrontier_BattleFactoryBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
@@ -8,6 +8,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
 	object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
+BattleFrontier_BattleFactoryBattleRoom_MapEvents::
 	map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
+BattleFrontier_BattleFactoryBattleRoom:
 	.4byte BattleFrontier_BattleFactoryBattleRoom_Layout
 	.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_FACTORY
-	.2byte 348
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
+BattleFrontier_BattleFactoryLobby_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
 	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
@@ -6,15 +6,15 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
 	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
 	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0

-BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
+BattleFrontier_BattleFactoryLobby_MapWarps:
 	warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

-BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
+BattleFrontier_BattleFactoryLobby_MapBGEvents:
 	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
 	bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
 	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839

-BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
+BattleFrontier_BattleFactoryLobby_MapEvents::
 	map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents

--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleFactoryLobby: @ 84854A0
+BattleFrontier_BattleFactoryLobby:
 	.4byte BattleFrontier_BattleFactoryLobby_Layout
 	.4byte BattleFrontier_BattleFactoryLobby_MapEvents
 	.4byte BattleFrontier_BattleFactoryLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_FACTORY
-	.2byte 346
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
+BattleFrontier_BattleFactoryPreBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
+BattleFrontier_BattleFactoryPreBattleRoom_MapEvents::
 	map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
+BattleFrontier_BattleFactoryPreBattleRoom:
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_FACTORY
-	.2byte 347
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
@@ -1,14 +1,14 @@
-BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
+BattleFrontier_BattlePalaceBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
+BattleFrontier_BattlePalaceBattleRoom_MapWarps:
 	warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
 	warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR

-BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
+BattleFrontier_BattlePalaceBattleRoom_MapEvents::
 	map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
+BattleFrontier_BattlePalaceBattleRoom:
 	.4byte BattleFrontier_BattlePalaceBattleRoom_Layout
 	.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
 	.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_PALACE
-	.2byte 344
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
+BattleFrontier_BattlePalaceCorridor_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
@@ -7,12 +7,12 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
 	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0
 	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0

-BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
+BattleFrontier_BattlePalaceCorridor_MapWarps:
 	warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
 	warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
 	warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM

-BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
+BattleFrontier_BattlePalaceCorridor_MapEvents::
 	map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePalaceCorridor: @ 84853C0
+BattleFrontier_BattlePalaceCorridor:
 	.4byte BattleFrontier_BattlePalaceCorridor_Layout
 	.4byte BattleFrontier_BattlePalaceCorridor_MapEvents
 	.4byte BattleFrontier_BattlePalaceCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_PALACE
-	.2byte 343
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
+BattleFrontier_BattlePalaceLobby_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
 	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
 	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
@@ -6,16 +6,16 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
 	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
 	object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0

-BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
+BattleFrontier_BattlePalaceLobby_MapWarps:
 	warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR

-BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
+BattleFrontier_BattlePalaceLobby_MapBGEvents:
 	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
 	bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
 	bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6

-BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
+BattleFrontier_BattlePalaceLobby_MapEvents::
 	map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents

--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePalaceLobby: @ 84853A4
+BattleFrontier_BattlePalaceLobby:
 	.4byte BattleFrontier_BattlePalaceLobby_Layout
 	.4byte BattleFrontier_BattlePalaceLobby_MapEvents
 	.4byte BattleFrontier_BattlePalaceLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_PALACE
-	.2byte 342
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
+BattleFrontier_BattlePikeCorridor_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
+BattleFrontier_BattlePikeCorridor_MapEvents::
 	map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeCorridor: @ 8485510
+BattleFrontier_BattlePikeCorridor:
 	.4byte BattleFrontier_BattlePikeCorridor_Layout
 	.4byte BattleFrontier_BattlePikeCorridor_MapEvents
 	.4byte BattleFrontier_BattlePikeCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
-	.2byte 350
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
@@ -1,18 +1,18 @@
-BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
+BattleFrontier_BattlePikeLobby_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
 	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
 	object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
 	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0

-BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
+BattleFrontier_BattlePikeLobby_MapWarps:
 	warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

-BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
+BattleFrontier_BattlePikeLobby_MapBGEvents:
 	bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80
 	bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6

-BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
+BattleFrontier_BattlePikeLobby_MapEvents::
 	map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents

--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeLobby: @ 84854F4
+BattleFrontier_BattlePikeLobby:
 	.4byte BattleFrontier_BattlePikeLobby_Layout
 	.4byte BattleFrontier_BattlePikeLobby_MapEvents
 	.4byte BattleFrontier_BattlePikeLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
-	.2byte 349
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
@@ -1,8 +1,8 @@
-BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
+BattleFrontier_BattlePikeRandomRoom1_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
 	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0

-BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
+BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents:
 	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
 	coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
 	coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
@@ -11,6 +11,6 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
 	coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
 	coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D

-BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
+BattleFrontier_BattlePikeRandomRoom1_MapEvents::
 	map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0

--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeRandomRoom1: @ 8485548
+BattleFrontier_BattlePikeRandomRoom1:
 	.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
-	.2byte 352
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
+BattleFrontier_BattlePikeRandomRoom2_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
+BattleFrontier_BattlePikeRandomRoom2_MapEvents::
 	map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeRandomRoom2: @ 8485564
+BattleFrontier_BattlePikeRandomRoom2:
 	.4byte BattleFrontier_BattlePikeRandomRoom2_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
-	.2byte 353
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
+BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents:
 	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
 	coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
 	coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
@@ -7,6 +7,6 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
 	coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
 	coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D

-BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
+BattleFrontier_BattlePikeRandomRoom3_MapEvents::
 	map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0

--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeRandomRoom3: @ 8485580
+BattleFrontier_BattlePikeRandomRoom3:
 	.4byte BattleFrontier_BattlePikeRandomRoom3_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
-	.2byte 358
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
@@ -1,8 +1,8 @@
-BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
+BattleFrontier_BattlePikeThreePathRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
 	object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0

-BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
+BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents:
 	coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
 	coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
 	coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
@@ -13,6 +13,6 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
 	coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
 	coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D

-BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
+BattleFrontier_BattlePikeThreePathRoom_MapEvents::
 	map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0

--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeThreePathRoom: @ 848552C
+BattleFrontier_BattlePikeThreePathRoom:
 	.4byte BattleFrontier_BattlePikeThreePathRoom_Layout
 	.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
 	.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
-	.2byte 351
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
+BattleFrontier_BattlePointExchangeServiceCorner_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
 	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
 	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
@@ -9,11 +9,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
 	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
 	object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0

-BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
+BattleFrontier_BattlePointExchangeServiceCorner_MapWarps:
 	warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST

-BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
+BattleFrontier_BattlePointExchangeServiceCorner_MapEvents::
 	map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
+BattleFrontier_BattlePointExchangeServiceCorner:
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
-	.2byte 398
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
+BattleFrontier_BattlePyramidEmptySquare_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
@@ -16,6 +16,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
 	object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
 	object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
+BattleFrontier_BattlePyramidEmptySquare_MapEvents::
 	map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidEmptySquare: @ 8485414
+BattleFrontier_BattlePyramidEmptySquare:
 	.4byte BattleFrontier_BattlePyramidEmptySquare_Layout
 	.4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents
 	.4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts
 	.4byte 0x0
 	.2byte 65535
-	.2byte 361
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
@@ -1,16 +1,16 @@
-BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
+BattleFrontier_BattlePyramidLobby_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
 	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
 	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
 	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0

-BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
+BattleFrontier_BattlePyramidLobby_MapWarps:
 	warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST

-BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
+BattleFrontier_BattlePyramidLobby_MapBGEvents:
 	bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42
 	bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95

-BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
+BattleFrontier_BattlePyramidLobby_MapEvents::
 	map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents

--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidLobby: @ 84853F8
+BattleFrontier_BattlePyramidLobby:
 	.4byte BattleFrontier_BattlePyramidLobby_Layout
 	.4byte BattleFrontier_BattlePyramidLobby_MapEvents
 	.4byte BattleFrontier_BattlePyramidLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_PYRAMID
-	.2byte 360
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
+BattleFrontier_BattlePyramidTop_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
 	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
+BattleFrontier_BattlePyramidTop_MapCoordEvents:
 	coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256

-BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
+BattleFrontier_BattlePyramidTop_MapEvents::
 	map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0

--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidTop: @ 8485430
+BattleFrontier_BattlePyramidTop:
 	.4byte BattleFrontier_BattlePyramidTop_Layout
 	.4byte BattleFrontier_BattlePyramidTop_MapEvents
 	.4byte BattleFrontier_BattlePyramidTop_MapScripts
 	.4byte 0x0
 	.2byte 65535
-	.2byte 378
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
@@ -1,12 +1,12 @@
-BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
+BattleFrontier_BattleTowerBattleRoom_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0

-BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
+BattleFrontier_BattleTowerBattleRoom_MapWarps:
 	warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
 	warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY

-BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
+BattleFrontier_BattleTowerBattleRoom_MapEvents::
 	map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleTowerBattleRoom: @ 848521C
+BattleFrontier_BattleTowerBattleRoom:
 	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
-	.2byte 268
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
@@ -1,4 +1,4 @@
-BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
+BattleFrontier_BattleTowerBattleRoom2_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
@@ -6,6 +6,6 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
 	object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
 	object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0

-BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
+BattleFrontier_BattleTowerBattleRoom2_MapEvents::
 	map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleTowerBattleRoom2: @ 8485318
+BattleFrontier_BattleTowerBattleRoom2:
 	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
 	.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
-	.2byte 268
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
+BattleFrontier_BattleTowerCorridor_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0

-BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
+BattleFrontier_BattleTowerCorridor_MapEvents::
 	map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0

--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleTowerCorridor: @ 8485200
+BattleFrontier_BattleTowerCorridor:
 	.4byte BattleFrontier_BattleTowerCorridor_Layout
 	.4byte BattleFrontier_BattleTowerCorridor_MapEvents
 	.4byte BattleFrontier_BattleTowerCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
-	.2byte 267
+	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
@@ -1,9 +1,9 @@
-BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
+BattleFrontier_BattleTowerCorridor2_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

-BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
+BattleFrontier_BattleTowerCorridor2_MapEvents::
 	map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0

--- a/Show More
+++ b/Show More