Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump

2 files changed, 12 insertions, 41 deletions

diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json
index 3ce14e08d..e97d95544 100644
--- a/data/maps/Route20/map.json
+++ b/data/maps/Route20/map.json
@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ROUTE_20",
   "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_CINNABAR_ISLAND",
diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc
index 070575cc7..3abceaeba 100644
--- a/data/maps/Route20/text.inc
+++ b/data/maps/Route20/text.inc
@@ -1,39 +1,3 @@
-Text_187C32:: @ 8187C32
-    .string "LIA: I'm looking after my brother.\n"
-    .string "He just became a TRAINER.$"
-
-Text_187C6F:: @ 8187C6F
-    .string "LIA: That's no way to treat my\n"
-    .string "little brother!$"
-
-Text_187C9E:: @ 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.$"
-
-Text_187CF2:: @ 8187CF2
-    .string "LIA: I want to battle together\n"
-    .string "with my little brother.\p"
-    .string "Don't you have two POKéMON?$"
-
-Text_187D45:: @ 8187D45
-    .string "LUC: My big sis taught me how\n"
-    .string "to swim and train POKéMON.$"
-
-Text_187D7E:: @ 8187D7E
-    .string "LUC: Oh, wow!\n"
-    .string "Someone tougher than my big sis!$"
-
-Text_187DAD:: @ 8187DAD
-    .string "LUC: My big sis is strong and nice.\n"
-    .string "I think she's awesome!$"
-
-Text_187DE8:: @ 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?$"
-
 Text_187E40:: @ 8187E40
     .string "The water is shallow here.\n"
     .string "There are many people swimming.$"
@@ -149,3 +113,8 @@ Text_18827B:: @ 818827B
 gUnknown_81882D1:: @ 81882D1
     .string "SEAFOAM ISLANDS$"
 
+Text_1882E1:: @ 81882E1
+    .string "Strong TRAINERS and WATER POKéMON\n"
+    .string "are common sights in these parts.\p"
+    .string "They say that MISTY of the\n"
+    .string "CERULEAN GYM trains here.$"