Merge pull request #5 from pret/master

Take files

3 files changed, 236 insertions, 0 deletions

diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
new file mode 100644
index 000000000..7a1c9b9f1
--- /dev/null
+++ b/data/maps/Route6/map.json
@@ -0,0 +1,157 @@
+{
+  "id": "MAP_ROUTE6",
+  "name": "Route6",
+  "layout": "LAYOUT_ROUTE6",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_6",
+  "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",
+  "connections": [
+    {
+      "map": "MAP_SAFFRON_CITY",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VERMILION_CITY",
+      "offset": -12,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "20",
+      "x": 3,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route6_EventScript_1A9999",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 12,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_EventScript_1A9A15",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 13,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_EventScript_1A9A91",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 20,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A99D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 13,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A9ACF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 13,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A9A53",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 15,
+      "elevation": 0,
+      "script": "Route6_EventScript_167FB2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_SITRUS_BERRY",
+      "flag": "118",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "119",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc
new file mode 100644
index 000000000..773e1c091
--- /dev/null
+++ b/data/maps/Route6/scripts.inc
@@ -0,0 +1,6 @@
+Route6_MapScripts:: @ 8167FB1
+	.byte 0
+
+Route6_EventScript_167FB2:: @ 8167FB2
+	msgbox gUnknown_8184067, 3
+	end
diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc
new file mode 100644
index 000000000..b8ae84e32
--- /dev/null
+++ b/data/maps/Route6/text.inc
@@ -0,0 +1,73 @@
+Text_183E04:: @ 8183E04
+    .string "Who's there?\n"
+    .string "Quit listening in on us!$"
+
+Text_183E2A:: @ 8183E2A
+    .string "I just can't win!$"
+
+Text_183E3C:: @ 8183E3C
+    .string "Whisper…\n"
+    .string "Whisper…$"
+
+Text_183E4E:: @ 8183E4E
+    .string "Excuse me!\n"
+    .string "This is a private conversation!$"
+
+Text_183E79:: @ 8183E79
+    .string "Ugh!\n"
+    .string "I hate losing.$"
+
+Text_183E8D:: @ 8183E8D
+    .string "Whisper…\n"
+    .string "Whisper…$"
+
+Text_183E9F:: @ 8183E9F
+    .string "There aren't many bugs out here.$"
+
+Text_183EC0:: @ 8183EC0
+    .string "No!\n"
+    .string "You're kidding!$"
+
+Text_183ED4:: @ 8183ED4
+    .string "I like bugs, so I'm going back to\n"
+    .string "VIRIDIAN FOREST.$"
+
+Text_183F07:: @ 8183F07
+    .string "Huh?\n"
+    .string "You want to talk to me?$"
+
+Text_183F24:: @ 8183F24
+    .string "This stinks…\n"
+    .string "I couldn't beat your challenge…$"
+
+Text_183F51:: @ 8183F51
+    .string "I should bring more POKéMON with\n"
+    .string "me. I'll feel safer that way.$"
+
+Text_183F90:: @ 8183F90
+    .string "Me?\n"
+    .string "Well, okay. I'll play!$"
+
+Text_183FAB:: @ 8183FAB
+    .string "Things just didn't work…$"
+
+Text_183FC4:: @ 8183FC4
+    .string "I want to get stronger.\n"
+    .string "What's your secret?$"
+
+Text_183FF0:: @ 8183FF0
+    .string "I've never seen you around.\n"
+    .string "Are you good?$"
+
+Text_18401A:: @ 818401A
+    .string "You're too good!$"
+
+Text_18402B:: @ 818402B
+    .string "Are my POKéMON weak?\n"
+    .string "Or, am I just bad?\l"
+    .string "Which do you think?$"
+
+gUnknown_8184067:: @ 8184067
+    .string "UNDERGROUND PATH\n"
+    .string "CERULEAN CITY - VERMILION CITY$"
+