Merge branch 'master' into event_object_movement

3 files changed, 47 insertions, 43 deletions

diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json
index dc1543ef0..203ae9295 100644
--- a/data/maps/Route10_PokemonCenter_1F/map.json
+++ b/data/maps/Route10_PokemonCenter_1F/map.json
@@ -6,15 +6,17 @@
   "region_map_section": "MAPSEC_ROUTE_10",
   "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": "Route10_PokemonCenter_1F_EventScript_16FC41",
+      "script": "Route10_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -36,11 +38,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route10_PokemonCenter_1F_EventScript_16FC53",
+      "script": "Route10_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 2,
       "y": 3,
       "elevation": 3,
@@ -49,11 +51,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route10_PokemonCenter_1F_EventScript_16FC4A",
+      "script": "Route10_PokemonCenter_1F_EventScript_FatMan",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -62,11 +64,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route10_PokemonCenter_1F_EventScript_16FC5C",
+      "script": "Route10_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -75,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route10_PokemonCenter_1F_EventScript_16FC65",
+      "script": "Route10_PokemonCenter_1F_EventScript_Aide",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
index 56e0b448e..aa59cd95b 100644
--- a/data/maps/Route10_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -1,3 +1,5 @@
+.equ REQUIRED_OWNED_MONS, 20
+
 Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
 	map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -8,55 +10,55 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A
 	setrespawn SPAWN_ROUTE10
 	end
 
-Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41
+Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A
-	msgbox gUnknown_819E59D, MSGBOX_NPC
+Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A
+	msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC
 	end
 
-Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53
-	msgbox gUnknown_819E523, MSGBOX_NPC
+Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53
+	msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC
 	end
 
-Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C
-	msgbox gUnknown_819E5D2, MSGBOX_NPC
+Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C
+	msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC
 	end
 
-Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
+Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
 	lock
 	faceplayer
-	call EventScript_16FCF1
-	goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7
-	msgbox gUnknown_819E5FB, MSGBOX_YESNO
+	call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
+	goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone
+	msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
-	call EventScript_16FCF1
-	compare VAR_0x8006, 20
+	call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
+	compare VAR_0x8006, REQUIRED_OWNED_MONS
 	goto_if_lt Aide_EventScript_HaventCaughtEnough
-	msgbox gUnknown_819E733
+	msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo
 	checkitemspace ITEM_EVERSTONE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq Aide_EventScript_NoRoomForItem
-	giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
+	giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE
 	setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
-	msgbox gUnknown_819E7AF
+	msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
 	release
 	end
 
-EventScript_16FCE7:: @ 816FCE7
-	msgbox gUnknown_819E7AF
+Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7
+	msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
 	release
 	end
 
-EventScript_16FCF1:: @ 816FCF1
-	getnumberstring 0, 20
+Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1
+	getnumberstring 0, REQUIRED_OWNED_MONS
 	getitemname 1, ITEM_EVERSTONE
 	return
diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc
index 3360854fe..7c63407ae 100644
--- a/data/maps/Route10_PokemonCenter_1F/text.inc
+++ b/data/maps/Route10_PokemonCenter_1F/text.inc
@@ -1,18 +1,18 @@
-gUnknown_819E523:: @ 819E523
+Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523
     .string "The types of POKéMON match up\n"
     .string "differently with each other.\p"
     .string "Every type is stronger than some\n"
     .string "types and weaker than others.$"
 
-gUnknown_819E59D:: @ 819E59D
+Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D
     .string "A NUGGET is totally useless.\n"
     .string "So I sold it for ¥5000.$"
 
-gUnknown_819E5D2:: @ 819E5D2
+Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2
     .string "I heard that ghosts haunt\n"
     .string "LAVENDER TOWN.$"
 
-gUnknown_819E5FB:: @ 819E5FB
+Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB
     .string "Oh… {PLAYER}!\n"
     .string "I've been looking for you!\p"
     .string "It's me, one of the ever-present\n"
@@ -26,17 +26,17 @@ gUnknown_819E5FB:: @ 819E5FB
     .string "Have you gathered data on at least\n"
     .string "twenty kinds of POKéMON?$"
 
-gUnknown_819E733:: @ 819E733
+Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733
     .string "Great! You have caught or owned\n"
     .string "{STR_VAR_3} kinds of POKéMON!\p"
     .string "Congratulations!\n"
     .string "Here you go!$"
 
-gUnknown_819E786:: @ 819E786
+Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786
     .string "{PLAYER} received the EVERSTONE\n"
     .string "from the AIDE.$"
 
-gUnknown_819E7AF:: @ 819E7AF
+Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF
     .string "Making POKéMON evolve certainly\n"
     .string "can add to the POKéDEX.\p"
     .string "However, at times, you may not\n"