Merge branch 'master' into event_object_movement

3 files changed, 20 insertions, 18 deletions

diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json
index d8abc60f9..18b930dfa 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json
@@ -6,15 +6,17 @@
   "region_map_section": "MAPSEC_TWO_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": 3,
@@ -23,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717C3",
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 11,
       "y": 5,
       "elevation": 3,
@@ -36,11 +38,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717CC",
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_GBAKid",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -49,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717D5",
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_BugCatcher",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
index 6661a61eb..4fbc3bce9 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
@@ -7,17 +7,17 @@ TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF
 	setrespawn SPAWN_TWO_ISLAND
 	end
 
-TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3
+TwoIsland_PokemonCenter_1F_EventScript_Nurse:: @ 81717C3
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC
-	msgbox gUnknown_81A2E59, MSGBOX_NPC
+TwoIsland_PokemonCenter_1F_EventScript_GBAKid:: @ 81717CC
+	msgbox TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner, MSGBOX_NPC
 	end
 
-TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5
-	msgbox gUnknown_81A2EBE, MSGBOX_NPC
+TwoIsland_PokemonCenter_1F_EventScript_BugCatcher:: @ 81717D5
+	msgbox TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape, MSGBOX_NPC
 	end
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/text.inc b/data/maps/TwoIsland_PokemonCenter_1F/text.inc
index 514825cdf..c7c5561c0 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/TwoIsland_PokemonCenter_1F/text.inc
@@ -1,10 +1,10 @@
-gUnknown_81A2E59:: @ 81A2E59
+TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner:: @ 81A2E59
     .string "Have you visited the GAME CORNER\n"
     .string "already?\p"
     .string "It's no good to go alone.\n"
     .string "You have to take a friend along.$"
 
-gUnknown_81A2EBE:: @ 81A2EBE
+TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape:: @ 81A2EBE
     .string "Not many people live on\n"
     .string "TWO ISLAND.\p"
     .string "There is this old lady who lives\n"