Merge branch 'master' into event_object_movement

3 files changed, 102 insertions, 64 deletions

diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
index 308f98b54..da02ab12c 100644
--- a/data/maps/Route19/map.json
+++ b/data/maps/Route19/map.json
@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ROUTE_19",
   "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_FUCHSIA_CITY",
@@ -25,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 15,
       "y": 10,
       "elevation": 3,
@@ -34,11 +36,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB44F",
+      "script": "Route19_EventScript_Reece",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -47,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB411",
+      "script": "Route19_EventScript_Richard",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 12,
       "y": 17,
       "elevation": 1,
@@ -60,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB547",
+      "script": "Route19_EventScript_Tony",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 18,
       "y": 33,
       "elevation": 1,
@@ -73,11 +75,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB48D",
+      "script": "Route19_EventScript_Matthew",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 8,
       "y": 27,
       "elevation": 1,
@@ -86,11 +88,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB4CB",
+      "script": "Route19_EventScript_Douglas",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 16,
       "y": 22,
       "elevation": 1,
@@ -99,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "Route19_EventScript_1AB509",
+      "script": "Route19_EventScript_David",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 11,
       "y": 47,
       "elevation": 1,
@@ -112,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB585",
+      "script": "Route19_EventScript_Axle",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 14,
       "y": 48,
       "elevation": 1,
@@ -125,11 +127,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB601",
+      "script": "Route19_EventScript_Alice",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 12,
       "y": 49,
       "elevation": 1,
@@ -138,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB63F",
+      "script": "Route19_EventScript_Connie",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 9,
       "y": 48,
       "elevation": 1,
@@ -151,11 +153,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB5C3",
+      "script": "Route19_EventScript_Anya",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 8,
       "y": 41,
       "elevation": 1,
@@ -164,11 +166,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB67D",
+      "script": "Route19_EventScript_Lia",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
       "x": 9,
       "y": 41,
       "elevation": 1,
@@ -177,7 +179,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB6C3",
+      "script": "Route19_EventScript_Luc",
       "flag": "0"
     }
   ],
@@ -185,11 +187,12 @@
   "coord_events": [],
   "bg_events": [
     {
-      "type": "bg_event_type_0",
+      "type": "sign",
       "x": 13,
       "y": 12,
       "elevation": 0,
-      "script": "Route19_EventScript_168232"
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route19_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc
index 16d6e4669..10b361e83 100644
--- a/data/maps/Route19/scripts.inc
+++ b/data/maps/Route19/scripts.inc
@@ -1,6 +1,6 @@
 Route19_MapScripts:: @ 8168231
 	.byte 0
 
-Route19_EventScript_168232:: @ 8168232
-	msgbox gUnknown_8187C06, MSGBOX_SIGN
+Route19_EventScript_RouteSign:: @ 8168232
+	msgbox Route19_Text_RouteSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc
index a76ff89d7..a414146b4 100644
--- a/data/maps/Route19/text.inc
+++ b/data/maps/Route19/text.inc
@@ -1,119 +1,154 @@
-Text_1877A3:: @ 81877A3
+Route19_Text_RichardIntro:: @ 81877A3
     .string "I have to exercise and warm up\n"
     .string "before going out for a swim.$"
 
-Text_1877DF:: @ 81877DF
+Route19_Text_RichardDefeat:: @ 81877DF
     .string "All warmed up!$"
 
-Text_1877EE:: @ 81877EE
+Route19_Text_RichardPostBattle:: @ 81877EE
     .string "Thanks, kid!\n"
     .string "I'm ready for a swim.$"
 
-Text_187811:: @ 8187811
+Route19_Text_ReeceIntro:: @ 8187811
     .string "Wait! Slow down!\n"
     .string "You'll have a heart attack!$"
 
-Text_18783E:: @ 818783E
+Route19_Text_ReeceDefeat:: @ 818783E
     .string "Ooh!\n"
     .string "That's chilly!$"
 
-Text_187852:: @ 8187852
+Route19_Text_ReecePostBattle:: @ 8187852
     .string "Watch out for TENTACOOL.\n"
     .string "They sting so painfully.$"
 
-Text_187884:: @ 8187884
+Route19_Text_MatthewIntro:: @ 8187884
     .string "I love swimming!\n"
     .string "What about you?$"
 
-Text_1878A5:: @ 81878A5
+Route19_Text_MatthewDefeat:: @ 81878A5
     .string "Belly flop!$"
 
-Text_1878B1:: @ 81878B1
+Route19_Text_MatthewPostBattle:: @ 81878B1
     .string "I can beat even marine POKéMON\n"
     .string "at swimming.$"
 
-Text_1878DD:: @ 81878DD
+Route19_Text_DouglasIntro:: @ 81878DD
     .string "What's beyond the horizon?$"
 
-Text_1878F8:: @ 81878F8
+Route19_Text_DouglasDefeat:: @ 81878F8
     .string "Glub!$"
 
-Text_1878FE:: @ 81878FE
+Route19_Text_DouglasPostBattle:: @ 81878FE
     .string "I see a couple of islands over\n"
     .string "yonder!$"
 
-Text_187925:: @ 8187925
+Route19_Text_DavidIntro:: @ 8187925
     .string "I tried diving for POKéMON, but it\n"
     .string "was a no-go.$"
 
-Text_187955:: @ 8187955
+Route19_Text_DavidDefeat:: @ 8187955
     .string "Help!$"
 
-Text_18795B:: @ 818795B
+Route19_Text_DavidPostBattle:: @ 818795B
     .string "I guess you have to fish for sea\n"
     .string "POKéMON.$"
 
-Text_187985:: @ 8187985
+Route19_Text_TonyIntro:: @ 8187985
     .string "I look at the sea to forget all\n"
     .string "the bad things that happened.$"
 
-Text_1879C3:: @ 81879C3
+Route19_Text_TonyDefeat:: @ 81879C3
     .string "Ooh!\n"
     .string "Traumatic!$"
 
-Text_1879D3:: @ 81879D3
+Route19_Text_TonyPostBattle:: @ 81879D3
     .string "I'm looking at the sea to forget\n"
     .string "the bad thing that happened!$"
 
-Text_187A11:: @ 8187A11
+Route19_Text_AnyaIntro:: @ 8187A11
     .string "Oh, I just love your ride!\n"
     .string "Can I have it if I win?$"
 
-Text_187A44:: @ 8187A44
+Route19_Text_AnyaDefeat:: @ 8187A44
     .string "Oh! I lost!$"
 
-Text_187A50:: @ 8187A50
+Route19_Text_AnyaPostBattle:: @ 8187A50
     .string "It's still a long way to go to\n"
     .string "SEAFOAM ISLANDS…\p"
     .string "I want to go back to FUCHSIA…$"
 
-Text_187A9E:: @ 8187A9E
+Route19_Text_AliceIntro:: @ 8187A9E
     .string "Swimming's great!\n"
     .string "Sunburns aren't!$"
 
-Text_187AC1:: @ 8187AC1
+Route19_Text_AliceDefeat:: @ 8187AC1
     .string "Shocker!$"
 
-Text_187ACA:: @ 8187ACA
+Route19_Text_AlicePostBattle:: @ 8187ACA
     .string "My boyfriend wanted to swim to\n"
     .string "SEAFOAM ISLANDS.$"
 
-Text_187AFA:: @ 8187AFA
+Route19_Text_AxleIntro:: @ 8187AFA
     .string "Ahoy, there!\n"
     .string "These waters are treacherous!$"
 
-Text_187B25:: @ 8187B25
+Route19_Text_AxleDefeat:: @ 8187B25
     .string "Ooh!\n"
     .string "Dangerous!$"
 
-Text_187B35:: @ 8187B35
+Route19_Text_AxlePostBattle:: @ 8187B35
     .string "M-my legs! They cramped up!\n"
     .string "Glub, glub…$"
 
-Text_187B5D:: @ 8187B5D
+Route19_Text_ConnieIntro:: @ 8187B5D
     .string "I swam here with my friends…\n"
     .string "I'm tired…$"
 
-Text_187B85:: @ 8187B85
+Route19_Text_ConnieDefeat:: @ 8187B85
     .string "I'm exhausted…$"
 
-Text_187B94:: @ 8187B94
+Route19_Text_ConniePostBattle:: @ 8187B94
     .string "If I were to ride a POKéMON on\n"
     .string "the sea, I'd like a LAPRAS.\p"
     .string "LAPRAS is so big, I bet it\n"
     .string "would keep me dry on water.$"
 
-gUnknown_8187C06:: @ 8187C06
+Route19_Text_RouteSign:: @ 8187C06
     .string "SEA ROUTE 19\n"
     .string "FUCHSIA CITY - SEAFOAM ISLANDS$"
 
+Route19_Text_LiaIntro:: @ 8187C32
+    .string "LIA: I'm looking after my brother.\n"
+    .string "He just became a TRAINER.$"
+
+Route19_Text_LiaDefeat:: @ 8187C6F
+    .string "LIA: That's no way to treat my\n"
+    .string "little brother!$"
+
+Route19_Text_LiaPostBattle:: @ 8187C9E
+    .string "LIA: Do you have a younger\n"
+    .string "brother?\p"
+    .string "I hope you're teaching him all\n"
+    .string "sorts of things.$"
+
+Route19_Text_LiaNotEnoughMons:: @ 8187CF2
+    .string "LIA: I want to battle together\n"
+    .string "with my little brother.\p"
+    .string "Don't you have two POKéMON?$"
+
+Route19_Text_LucIntro:: @ 8187D45
+    .string "LUC: My big sis taught me how\n"
+    .string "to swim and train POKéMON.$"
+
+Route19_Text_LucDefeat:: @ 8187D7E
+    .string "LUC: Oh, wow!\n"
+    .string "Someone tougher than my big sis!$"
+
+Route19_Text_LucPostBattle:: @ 8187DAD
+    .string "LUC: My big sis is strong and nice.\n"
+    .string "I think she's awesome!$"
+
+Route19_Text_LucNotEnoughMons:: @ 8187DE8
+    .string "LUC: I don't want to if I can't\n"
+    .string "battle you with my big sis.\p"
+    .string "Don't you have two POKéMON?$"