Merge pull request #258 from GriffinRichards/doc-headers

Document some header properties

asm/macros/map.inc

@@ -88,3 +88,8 @@
 	map \map
 	.space 2
 	.endm
+
+	.macro map_header_flags allow_cycling:req, allow_escaping:req, allow_running:req, show_map_name:req
+	.byte \allow_cycling
+	.byte ((\show_map_name & 1) << 2) | ((\allow_running & 1) << 1) | ((\allow_escaping & 1) << 0)
+	.endm

data/maps.s

@@ -1,5 +1,4 @@
 #include "constants/layouts.h"
-@#include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/region_map.h"
 #include "constants/songs.h"

data/maps/BattleColosseum_2P/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_8",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_LINK",
   "connections": null,
   "object_events": [
     {

data/maps/BattleColosseum_4P/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_SPECIAL_AREA",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_8",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_LINK",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/BirthIsland_Exterior/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_3",
+  "map_type": "MAP_TYPE_ROUTE",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/BirthIsland_Harbor/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
+  "map_type": "MAP_TYPE_TOWN",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_ROUTE16",

data/maps/CeladonCity_Condominiums_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_Condominiums_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_Condominiums_3F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_Condominiums_Roof/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/CeladonCity_Condominiums_RoofRoom/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_DepartmentStore_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 4,
+  "allow_escaping": false,
-  "elevator_flag": 1,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 1,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_DepartmentStore_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 4,
+  "allow_escaping": false,
-  "elevator_flag": 2,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 2,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_DepartmentStore_3F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 4,
+  "allow_escaping": false,
-  "elevator_flag": 3,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 3,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_DepartmentStore_4F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 4,
+  "allow_escaping": false,
-  "elevator_flag": 4,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 4,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_DepartmentStore_5F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 4,
+  "allow_escaping": false,
-  "elevator_flag": 5,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 5,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_DepartmentStore_Elevator/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/CeladonCity_DepartmentStore_Roof/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 4,
+  "allow_escaping": false,
-  "elevator_flag": 127,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 127,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_GameCorner/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_GameCorner_PrizeRoom/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_Gym/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_1",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_Hotel/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_House1/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_PokemonCenter_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_PokemonCenter_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeladonCity_Restaurant/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCave_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCave_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCave_B1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
+  "map_type": "MAP_TYPE_TOWN",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_ROUTE24",

data/maps/CeruleanCity_BikeShop/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_Gym/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_1",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_House1/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_House2/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_House3/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_House4/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_House5/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_Mart/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_PokemonCenter_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CeruleanCity_PokemonCenter_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CERULEAN_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
+  "map_type": "MAP_TYPE_TOWN",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_ROUTE21_SOUTH",

data/maps/CinnabarIsland_Gym/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_1",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_Mart/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_PokemonCenter_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_PokemonCenter_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_PokemonLab_Entrance/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_PokemonLab_Lounge/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_CINNABAR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/DiglettsCave_B1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_DIGLETTS_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/DiglettsCave_NorthEntrance/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_DIGLETTS_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/DiglettsCave_SouthEntrance/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_DIGLETTS_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
+  "map_type": "MAP_TYPE_TOWN",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH",

data/maps/FiveIsland_Harbor/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_House1/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_House2/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Entrance/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room1/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room10/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room11/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room12/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room13/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room14/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room2/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room3/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room4/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_LostCave_Room5/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room6/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room7/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room8/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_LostCave_Room9/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_LOST_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FiveIsland_Meadow/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_3",
+  "map_type": "MAP_TYPE_ROUTE",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_FIVE_ISLAND",

data/maps/FiveIsland_MemorialPillar/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_MEMORIAL_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_3",
+  "map_type": "MAP_TYPE_ROUTE",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_FIVE_ISLAND_MEADOW",

data/maps/FiveIsland_PokemonCenter_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_PokemonCenter_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FIVE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_ResortGorgeous/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_RESORT_GORGEOUS",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_3",
+  "map_type": "MAP_TYPE_ROUTE",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH",

data/maps/FiveIsland_ResortGorgeous_House/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_RESORT_GORGEOUS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_RocketWarehouse/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ROCKET_WAREHOUSE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 5,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_3",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2",
   "connections": null,
   "object_events": [
     {

data/maps/FiveIsland_WaterLabyrinth/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_WATER_LABYRINTH",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_3",
+  "map_type": "MAP_TYPE_ROUTE",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",

data/maps/FourIsland/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
+  "map_type": "MAP_TYPE_TOWN",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_Harbor/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_House1/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_House2/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_IcefallCave_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_IcefallCave_B1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_IcefallCave_Back/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_IcefallCave_Entrance/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ICEFALL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_4",
+  "map_type": "MAP_TYPE_UNDERGROUND",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 7,
+  "allow_escaping": true,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [],
   "warp_events": [

data/maps/FourIsland_LoreleisHouse/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_Mart/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_PokemonCenter_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_PokemonCenter_2F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FourIsland_PokemonDayCare/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FOUR_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FuchsiaCity/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
+  "map_type": "MAP_TYPE_TOWN",
-  "unknown_18": 1,
+  "allow_cycling": true,
-  "unknown_19": 6,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": true,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_ROUTE19",

data/maps/FuchsiaCity_Gym/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_1",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
   "object_events": [
     {

data/maps/FuchsiaCity_House1/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FuchsiaCity_House2/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FuchsiaCity_House3/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FuchsiaCity_Mart/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {

data/maps/FuchsiaCity_PokemonCenter_1F/map.json

@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_FUCHSIA_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
+  "map_type": "MAP_TYPE_INDOOR",
-  "unknown_18": 0,
+  "allow_cycling": false,
-  "unknown_19": 0,
+  "allow_escaping": false,
-  "elevator_flag": 0,
+  "allow_running": false,
-  "battle_scene": "BATTLE_SCENE_0",
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {