summaryrefslogtreecommitdiff
path: root/data/maps/Route10
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route10')
-rw-r--r--data/maps/Route10/map.json67
-rw-r--r--data/maps/Route10/scripts.inc14
-rw-r--r--data/maps/Route10/text.inc42
3 files changed, 64 insertions, 59 deletions
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
index fef96485a..59d998a4b 100644
--- a/data/maps/Route10/map.json
+++ b/data/maps/Route10/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_10",
"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_LAVENDER_TOWN",
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 7,
"y": 60,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1A9FE5",
+ "script": "Route10_EventScript_Carol",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+ "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 4,
"y": 62,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route10_EventScript_1AA09F",
+ "script": "Route10_EventScript_Clark",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+ "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"x": 15,
"y": 70,
"elevation": 3,
@@ -60,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1AA061",
+ "script": "Route10_EventScript_Herman",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+ "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 4,
"y": 68,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1AA0DD",
+ "script": "Route10_EventScript_Trent",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+ "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"x": 13,
"y": 44,
"elevation": 3,
@@ -86,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route10_EventScript_1AA023",
+ "script": "Route10_EventScript_Mark",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 9,
"y": 27,
"elevation": 3,
@@ -99,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1A9FA7",
+ "script": "Route10_EventScript_Heidi",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 20,
"elevation": 0,
@@ -112,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "EventScript_InteractWithCutTreeObject",
+ "script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 22,
"elevation": 0,
@@ -125,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "EventScript_InteractWithCutTreeObject",
+ "script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 24,
"elevation": 0,
@@ -138,11 +140,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "EventScript_InteractWithCutTreeObject",
+ "script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 26,
"elevation": 0,
@@ -151,7 +153,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "EventScript_InteractWithCutTreeObject",
+ "script": "EventScript_CutTree",
"flag": "FLAG_TEMP_15"
}
],
@@ -195,25 +197,28 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 15,
"y": 59,
"elevation": 0,
- "script": "Route10_EventScript_167FE4"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route10_EventScript_SouthRockTunnelSign"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 6,
"y": 42,
"elevation": 0,
- "script": "Route10_EventScript_167FED"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route10_EventScript_PowerPlantSign"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 7,
"y": 21,
"elevation": 0,
- "script": "Route10_EventScript_167FDB"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route10_EventScript_NorthRockTunnelSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc
index 7fb5d64cd..93694dc8a 100644
--- a/data/maps/Route10/scripts.inc
+++ b/data/maps/Route10/scripts.inc
@@ -1,17 +1,17 @@
Route10_MapScripts:: @ 8167FD9
.byte 0
-Route10_EventScript_167FDA:: @ 8167FDA
+Route10_EventScript_Unused:: @ 8167FDA
end
-Route10_EventScript_167FDB:: @ 8167FDB
- msgbox gUnknown_8184EC5, MSGBOX_SIGN
+Route10_EventScript_NorthRockTunnelSign:: @ 8167FDB
+ msgbox Route10_Text_RockTunnelDetourToLavender, MSGBOX_SIGN
end
-Route10_EventScript_167FE4:: @ 8167FE4
- msgbox gUnknown_8184EE9, MSGBOX_SIGN
+Route10_EventScript_SouthRockTunnelSign:: @ 8167FE4
+ msgbox Route10_Text_RockTunnel, MSGBOX_SIGN
end
-Route10_EventScript_167FED:: @ 8167FED
- msgbox gUnknown_8184EF5, MSGBOX_SIGN
+Route10_EventScript_PowerPlantSign:: @ 8167FED
+ msgbox Route10_Text_PowerPlant, MSGBOX_SIGN
end
diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc
index af45c8923..5a2d48efb 100644
--- a/data/maps/Route10/text.inc
+++ b/data/maps/Route10/text.inc
@@ -1,86 +1,86 @@
-Text_184B8A:: @ 8184B8A
+Route10_Text_MarkIntro:: @ 8184B8A
.string "Wow, you came all the way here?\n"
.string "Maybe you're a POKéMANIAC, too?\l"
.string "Want to see my collection?$"
-Text_184BE5:: @ 8184BE5
+Route10_Text_MarkDefeat:: @ 8184BE5
.string "Humph.\n"
.string "I'm not angry!$"
-Text_184BFB:: @ 8184BFB
+Route10_Text_MarkPostBattle:: @ 8184BFB
.string "I have more rare POKéMON at home!$"
-Text_184C1D:: @ 8184C1D
+Route10_Text_ClarkIntro:: @ 8184C1D
.string "Ha-hahah-ah-ha!$"
-Text_184C2D:: @ 8184C2D
+Route10_Text_ClarkDefeat:: @ 8184C2D
.string "Ha-haha!\n"
.string "Not laughing!\l"
.string "Ha-hay fever! Haha-ha-choo!$"
-Text_184C60:: @ 8184C60
+Route10_Text_ClarkPostBattle:: @ 8184C60
.string "Haha-ha-choo!\n"
.string "Ha-choo!\l"
.string "Snort! Snivel!$"
-Text_184C86:: @ 8184C86
+Route10_Text_HermanIntro:: @ 8184C86
.string "Hi, kid!\n"
.string "Want to see my POKéMON?$"
-Text_184CA7:: @ 8184CA7
+Route10_Text_HermanDefeat:: @ 8184CA7
.string "Oh, no!\n"
.string "My POKéMON!$"
-Text_184CBB:: @ 8184CBB
+Route10_Text_HermanPostBattle:: @ 8184CBB
.string "I don't like you.\n"
.string "I don't like anyone better than me!$"
-Text_184CF1:: @ 8184CF1
+Route10_Text_HeidiIntro:: @ 8184CF1
.string "I've been out at a POKéMON GYM\n"
.string "a few times.\p"
.string "…But I always lose.$"
-Text_184D31:: @ 8184D31
+Route10_Text_HeidiDefeat:: @ 8184D31
.string "Ohh!\n"
.string "After all my training!$"
-Text_184D4D:: @ 8184D4D
+Route10_Text_HeidiPostBattle:: @ 8184D4D
.string "I noticed some POKéMANIACS\n"
.string "prowling around.\p"
.string "Can you imagine? Them?\n"
.string "Up here in the mountains?$"
-Text_184DAA:: @ 8184DAA
+Route10_Text_TrentIntro:: @ 8184DAA
.string "Ah!\n"
.string "This mountain air is delicious!$"
-Text_184DCE:: @ 8184DCE
+Route10_Text_TrentDefeat:: @ 8184DCE
.string "That cleared my head!$"
-Text_184DE4:: @ 8184DE4
+Route10_Text_TrentPostBattle:: @ 8184DE4
.string "I feel bloated on mountain air!$"
-Text_184E04:: @ 8184E04
+Route10_Text_CarolIntro:: @ 8184E04
.string "I'm feeling a bit faint.\n"
.string "I haven't hiked in some time.$"
-Text_184E3B:: @ 8184E3B
+Route10_Text_CarolDefeat:: @ 8184E3B
.string "I'm too tired.\n"
.string "I wasn't up for it.$"
-Text_184E5E:: @ 8184E5E
+Route10_Text_CarolPostBattle:: @ 8184E5E
.string "The POKéMON here in the mountains\n"
.string "are so chunky…\p"
.string "I wish there were pink POKéMON\n"
.string "with a floral pattern!$"
-gUnknown_8184EC5:: @ 8184EC5
+Route10_Text_RockTunnelDetourToLavender:: @ 8184EC5
.string "ROCK TUNNEL\n"
.string "Detour to LAVENDER TOWN$"
-gUnknown_8184EE9:: @ 8184EE9
+Route10_Text_RockTunnel:: @ 8184EE9
.string "ROCK TUNNEL$"
-gUnknown_8184EF5:: @ 8184EF5
+Route10_Text_PowerPlant:: @ 8184EF5
.string "POWER PLANT$"