Fix merge conflicts

2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 7
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518
 	.byte WEATHER_SHADE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550
 	.byte WEATHER_BUBBLES
 	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
-	.byte 13
+	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0
 	.byte WEATHER_BUBBLES
 	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
-	.byte 13
+	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -10,6 +10,6 @@ AlteringCave: @ 8484A58
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -10,6 +10,6 @@ AncientTomb: @ 8484630
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 8
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
 	.byte MAP_BATTLE_SCENE_AQUA

--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 8
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
 	.byte MAP_BATTLE_SCENE_AQUA

--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 8
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
 	.byte MAP_BATTLE_SCENE_AQUA

--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_MAGMA

--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_MAGMA

--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_MAGMA

--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
-	.byte 15
+	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
@@ -5,8 +5,8 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
 	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
 	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
-	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
+	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
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0

 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
 	return

--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
@@ -11,9 +11,9 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
 	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	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_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 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
 	map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
 BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
 	return

--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
@@ -1,12 +1,12 @@
 BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
 	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_HIPSTER, 0, 7, 4, 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
 	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	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, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 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
 	map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
 	setvar VAR_0x8004, 5
 	special CallFrontierUtilFunc
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
 	setvar VAR_0x8004, 9
 	special CallFrontierUtilFunc
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
-	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	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
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825

 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
 	return

--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
-	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
+	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
 	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	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

--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_FRONTIER

--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
@@ -1,10 +1,10 @@
 BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	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
-	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
-	object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	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
 	map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_FRONTIER

--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
-	object_event 1, 255, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	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, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 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
 	map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
@@ -4,7 +4,7 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
 	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
 	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
-	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
+	object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
 	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
 	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
 	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
@@ -1,13 +1,13 @@
 BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
-	object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
-	object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2

 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
 	map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 4
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
 	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
 	setvar VAR_0x8008, 3
 	copyvar VAR_0x8004, VAR_0x8008
-	specialvar VAR_RESULT, sub_807E73C
+	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
 	msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
 	compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
 	compare VAR_0x8004, 255
 	goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
 	copyvar VAR_0x8005, VAR_0x800A
-	specialvar VAR_RESULT, sub_807E9D4
+	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare VAR_RESULT, VAR_0x8009
 	goto_if_ne BattleFrontier_Lounge6_EventScript_265075
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
-	special sub_807EA10
-	special sub_807F0E4
+	special CreateInGameTradePokemon
+	special DoInGameTradeScene
 	waitstate
 	msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
 	setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_Mart: @ 8485740
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_OutsideEast: @ 84852C4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_ROUTE
 	.2byte 0
-	.byte 13
+	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_OutsideWest: @ 84851AC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_ROUTE
 	.2byte 0
-	.byte 13
+	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_RankingHall: @ 848559C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_ReceptionGate: @ 84856B4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -10,6 +10,6 @@ BattleFrontier_ScottsHouse: @ 8485644
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_NORMAL

--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare01: @ 8484F60
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare02: @ 8484F7C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare03: @ 8484F98
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare04: @ 8484FB4
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare05: @ 8484FD0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare06: @ 8484FEC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare07: @ 8485008
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare08: @ 8485024
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare09: @ 8485040
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare10: @ 848505C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare11: @ 8485078
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare12: @ 8485094
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare13: @ 84850B0
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare14: @ 84850CC
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -10,6 +10,6 @@ BattlePyramidSquare15: @ 84850E8
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_INDOOR
 	.2byte 0
-	.byte 0
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
 	.byte MAP_BATTLE_SCENE_GYM

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