Merge branch 'master' into event_object_movement

3 files changed, 25 insertions, 23 deletions

diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
index ede9d59ab..596ea41cb 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
@@ -6,15 +6,17 @@
   "region_map_section": "MAPSEC_THREE_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 0,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 0,
@@ -23,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841",
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 12,
       "y": 2,
       "elevation": 3,
@@ -36,11 +38,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C",
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_Rocker",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 4,
       "elevation": 3,
@@ -49,11 +51,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853",
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_Lass",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 11,
       "y": 5,
       "elevation": 3,
@@ -62,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A",
+      "script": "ThreeIsland_PokemonCenter_1F_EventScript_Sailor",
       "flag": "0"
     }
   ],
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
index 15d568a6f..1f66b557d 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D
 	setrespawn SPAWN_THREE_ISLAND
 	end
 
-ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841
+ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171841
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A
-	msgbox gUnknown_81A303B, MSGBOX_NPC
+ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: @ 817184A
+	msgbox ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands, MSGBOX_NPC
 	end
 
-ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853
-	msgbox gUnknown_81A30A3, MSGBOX_NPC
+ThreeIsland_PokemonCenter_1F_EventScript_Lass:: @ 8171853
+	msgbox ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest, MSGBOX_NPC
 	end
 
-ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C
-	msgbox gUnknown_81A2FB5, MSGBOX_NPC
+ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: @ 817185C
+	msgbox ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto, MSGBOX_NPC
 	end
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc
index 449f80d70..a9d553efd 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc
@@ -1,17 +1,17 @@
-gUnknown_81A2FB5:: @ 81A2FB5
+ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: @ 81A2FB5
     .string "Hey, did you hear the news?\p"
     .string "The PC network here can now link\n"
     .string "with PCs in KANTO.\p"
     .string "I don't know how that came about,\n"
     .string "but it's fantastic!$"
 
-gUnknown_81A303B:: @ 81A303B
+ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: @ 81A303B
     .string "It's impossible to SURF between the\n"
     .string "islands around these parts.\p"
     .string "The tides are too fast and\n"
     .string "treacherous.$"
 
-gUnknown_81A30A3:: @ 81A30A3
+ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: @ 81A30A3
     .string "Let's crush BERRIES!\n"
     .string "…That'd be wasting BERRIES?\p"
     .string "You can always find some BERRIES\n"