Name allow_escaping, allow_running, show_map_name header properties

Missingmew · Feb 18, 2020 · e94f9c1 · e94f9c1
1 parent 4643330
commit e94f9c1
Show file tree

Hide file tree

Showing 427 changed files with 1,711 additions and 858 deletions.
diff --git a/asm/macros/map.inc b/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
diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_8",
   "connections": null,
   "object_events": [

diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_8",
   "connections": null,
   "object_events": [],

diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "allow_cycling": false,
-  "unknown_19": 6,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "allow_cycling": true,
-  "unknown_19": 6,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {

diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [],

diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 4,
-  "elevator_flag": 1,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "floor_number": 1,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 4,
-  "elevator_flag": 2,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "floor_number": 2,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 4,
-  "elevator_flag": 3,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "floor_number": 3,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 4,
-  "elevator_flag": 4,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "floor_number": 4,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 4,
-  "elevator_flag": 5,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "floor_number": 5,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [],

diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 4,
-  "elevator_flag": 127,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "floor_number": 127,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_1",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "allow_cycling": true,
-  "unknown_19": 7,
-  "elevator_flag": 0,
+  "allow_escaping": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "allow_cycling": true,
-  "unknown_19": 7,
-  "elevator_flag": 0,
+  "allow_escaping": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_4",
   "allow_cycling": true,
-  "unknown_19": 7,
-  "elevator_flag": 0,
+  "allow_escaping": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [

diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "allow_cycling": true,
-  "unknown_19": 6,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {

diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json
@@ -8,8 +8,10 @@
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "allow_cycling": false,
-  "unknown_19": 0,
-  "elevator_flag": 0,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
   "battle_scene": "BATTLE_SCENE_0",
   "connections": null,
   "object_events": [