Merge branch 'master' into event_object_movement

3 files changed, 66 insertions, 63 deletions

diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index 7cdaa105b..f3a2798a4 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ROUTE_11",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_3",
-  "unknown_18": 1,
-  "unknown_19": 6,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_VERMILION_CITY",
@@ -25,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 19,
       "y": 8,
       "elevation": 3,
@@ -34,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route11_EventScript_1A9B0D",
+      "script": "Route11_EventScript_Eddie",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 16,
       "y": 17,
       "elevation": 3,
@@ -47,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route11_EventScript_1A9C81",
+      "script": "Route11_EventScript_Hugo",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 31,
       "y": 8,
       "elevation": 3,
@@ -60,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route11_EventScript_1A9B4B",
+      "script": "Route11_EventScript_Dillon",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 28,
       "y": 10,
       "elevation": 3,
@@ -73,11 +75,11 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route11_EventScript_1A9BC7",
+      "script": "Route11_EventScript_Dave",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 38,
       "y": 15,
       "elevation": 3,
@@ -86,11 +88,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route11_EventScript_1A9CBF",
+      "script": "Route11_EventScript_Jasper",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 50,
       "y": 4,
       "elevation": 3,
@@ -99,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route11_EventScript_1A9D3B",
+      "script": "Route11_EventScript_Darian",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 42,
       "y": 8,
       "elevation": 3,
@@ -112,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route11_EventScript_1A9C05",
+      "script": "Route11_EventScript_Braxton",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 50,
       "y": 14,
       "elevation": 3,
@@ -125,11 +127,11 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route11_EventScript_1A9B89",
+      "script": "Route11_EventScript_Yasu",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 57,
       "y": 16,
       "elevation": 3,
@@ -138,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route11_EventScript_1A9CFD",
+      "script": "Route11_EventScript_Dirk",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 32,
       "y": 18,
       "elevation": 3,
@@ -151,11 +153,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "Route11_EventScript_1A9C43",
+      "script": "Route11_EventScript_Bernie",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 42,
       "y": 12,
       "elevation": 3,
@@ -168,7 +170,7 @@
       "flag": "FLAG_HIDE_ROUTE11_X_DEFEND"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 63,
       "y": 13,
       "elevation": 3,
@@ -181,7 +183,7 @@
       "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 13,
       "y": 3,
       "elevation": 3,
@@ -220,11 +222,12 @@
   "coord_events": [],
   "bg_events": [
     {
-      "type": "bg_event_type_0",
+      "type": "sign",
       "x": 3,
       "y": 7,
       "elevation": 3,
-      "script": "Route11_EventScript_167FF7"
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route11_EventScript_DiglettsCaveSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc
index 11f052030..821b8256f 100644
--- a/data/maps/Route11/scripts.inc
+++ b/data/maps/Route11/scripts.inc
@@ -1,6 +1,6 @@
 Route11_MapScripts:: @ 8167FF6
 	.byte 0
 
-Route11_EventScript_167FF7:: @ 8167FF7
-	msgbox gUnknown_8185308, MSGBOX_SIGN
+Route11_EventScript_DiglettsCaveSign:: @ 8167FF7
+	msgbox Route11_Text_DiglettsCave, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc
index 19515d010..2f7c7fc6d 100644
--- a/data/maps/Route11/text.inc
+++ b/data/maps/Route11/text.inc
@@ -1,113 +1,113 @@
-Text_184F01:: @ 8184F01
+Route11_Text_HugoIntro:: @ 8184F01
     .string "Win, lose, or draw!$"
 
-Text_184F15:: @ 8184F15
+Route11_Text_HugoDefeat:: @ 8184F15
     .string "Atcha!\n"
     .string "Didn't go my way!$"
 
-Text_184F2E:: @ 8184F2E
+Route11_Text_HugoPostBattle:: @ 8184F2E
     .string "POKéMON is life!\n"
     .string "And to live is to play games!$"
 
-Text_184F5D:: @ 8184F5D
+Route11_Text_JasperIntro:: @ 8184F5D
     .string "Competition!\n"
     .string "I can't get enough!$"
 
-Text_184F7E:: @ 8184F7E
+Route11_Text_JasperDefeat:: @ 8184F7E
     .string "I had a chance!$"
 
-Text_184F8E:: @ 8184F8E
+Route11_Text_JasperPostBattle:: @ 8184F8E
     .string "You can't be a coward in the world\n"
     .string "of POKéMON!$"
 
-Text_184FBD:: @ 8184FBD
+Route11_Text_EddieIntro:: @ 8184FBD
     .string "Let's go, but don't cheat!$"
 
-Text_184FD8:: @ 8184FD8
+Route11_Text_EddieDefeat:: @ 8184FD8
     .string "Huh?\n"
     .string "That's not right!$"
 
-Text_184FEF:: @ 8184FEF
+Route11_Text_EddiePostBattle:: @ 8184FEF
     .string "I did my best.\n"
     .string "I have no regrets.$"
 
-Text_185011:: @ 8185011
+Route11_Text_BraxtonIntro:: @ 8185011
     .string "Careful!\n"
     .string "I'm laying down some cables!$"
 
-Text_185037:: @ 8185037
+Route11_Text_BraxtonDefeat:: @ 8185037
     .string "That was electric!$"
 
-Text_18504A:: @ 818504A
+Route11_Text_BraxtonPostBattle:: @ 818504A
     .string "Spread the word to save energy!$"
 
-Text_18506A:: @ 818506A
+Route11_Text_DillonIntro:: @ 818506A
     .string "I just became a TRAINER.\n"
     .string "But, I think I can win.$"
 
-Text_18509B:: @ 818509B
+Route11_Text_DillonDefeat:: @ 818509B
     .string "My POKéMON couldn't win…\n"
     .string "Haven't they grown enough?$"
 
-Text_1850CF:: @ 81850CF
+Route11_Text_DillonPostBattle:: @ 81850CF
     .string "What now?\n"
     .string "Leave me alone!$"
 
-Text_1850E9:: @ 81850E9
+Route11_Text_DirkIntro:: @ 81850E9
     .string "Fwahaha!\n"
     .string "I have never lost!$"
 
-Text_185105:: @ 8185105
+Route11_Text_DirkDefeat:: @ 8185105
     .string "My first loss!$"
 
-Text_185114:: @ 8185114
+Route11_Text_DirkPostBattle:: @ 8185114
     .string "You were just lucky, that's all.$"
 
-Text_185135:: @ 8185135
+Route11_Text_DarianIntro:: @ 8185135
     .string "I have never won before…$"
 
-Text_18514E:: @ 818514E
+Route11_Text_DarianDefeat:: @ 818514E
     .string "I saw this coming…$"
 
-Text_185161:: @ 8185161
+Route11_Text_DarianPostBattle:: @ 8185161
     .string "I was unlucky, as always.$"
 
-Text_18517B:: @ 818517B
+Route11_Text_YasuIntro:: @ 818517B
     .string "I'm the best in my class.\n"
     .string "I train every morning.$"
 
-Text_1851AC:: @ 81851AC
+Route11_Text_YasuDefeat:: @ 81851AC
     .string "Darn!\n"
     .string "My POKéMON need to be stronger!$"
 
-Text_1851D2:: @ 81851D2
+Route11_Text_YasuPostBattle:: @ 81851D2
     .string "There's a fat POKéMON that comes\n"
     .string "down from the mountains.\p"
     .string "I bet it'd be strong if you can\n"
     .string "catch it.$"
 
-Text_185236:: @ 8185236
+Route11_Text_BernieIntro:: @ 8185236
     .string "Watch out for live wires!$"
 
-Text_185250:: @ 8185250
+Route11_Text_BernieDefeat:: @ 8185250
     .string "Whoa!\n"
     .string "You spark plug!$"
 
-Text_185266:: @ 8185266
+Route11_Text_BerniePostBattle:: @ 8185266
     .string "Well, better get back to work.$"
 
-Text_185285:: @ 8185285
+Route11_Text_DaveIntro:: @ 8185285
     .string "I raised my POKéMON carefully.\n"
     .string "They should be ready by now!$"
 
-Text_1852C1:: @ 81852C1
+Route11_Text_DaveDefeat:: @ 81852C1
     .string "Bye-bye!\n"
     .string "Thank you, and good-bye!$"
 
-Text_1852E3:: @ 81852E3
+Route11_Text_DavePostBattle:: @ 81852E3
     .string "Tch…\n"
     .string "I better go find stronger ones!$"
 
-gUnknown_8185308:: @ 8185308
+Route11_Text_DiglettsCave:: @ 8185308
     .string "DIGLETT'S CAVE$"