summaryrefslogtreecommitdiff
path: root/data/maps/Route6
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route6')
-rw-r--r--data/maps/Route6/map.json43
-rw-r--r--data/maps/Route6/scripts.inc4
-rw-r--r--data/maps/Route6/text.inc38
3 files changed, 44 insertions, 41 deletions
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index f67590481..fd7a985b5 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -6,14 +6,16 @@
"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",
+ "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_SAFFRON_CITY_CLASSIC",
+ "map": "MAP_SAFFRON_CITY_CONNECTION",
"offset": 0,
"direction": "up"
},
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+ "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 3,
"y": 16,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route6_EventScript_1A9999",
+ "script": "Route6_EventScript_Keigo",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 12,
"y": 21,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route6_EventScript_1A9A15",
+ "script": "Route6_EventScript_Ricky",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 13,
"y": 21,
"elevation": 3,
@@ -60,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route6_EventScript_1A9A91",
+ "script": "Route6_EventScript_Nancy",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+ "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 20,
"y": 25,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route6_EventScript_1A99D7",
+ "script": "Route6_EventScript_Elijah",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 13,
"y": 32,
"elevation": 3,
@@ -86,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route6_EventScript_1A9ACF",
+ "script": "Route6_EventScript_Isabelle",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 13,
"y": 33,
"elevation": 3,
@@ -99,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route6_EventScript_1A9A53",
+ "script": "Route6_EventScript_Jeff",
"flag": "0"
}
],
@@ -129,11 +131,12 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 21,
"y": 15,
"elevation": 0,
- "script": "Route6_EventScript_167FB2"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route6_EventScript_UndergroundPathSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc
index 00b3efb56..575c05fe6 100644
--- a/data/maps/Route6/scripts.inc
+++ b/data/maps/Route6/scripts.inc
@@ -1,6 +1,6 @@
Route6_MapScripts:: @ 8167FB1
.byte 0
-Route6_EventScript_167FB2:: @ 8167FB2
- msgbox gUnknown_8184067, MSGBOX_SIGN
+Route6_EventScript_UndergroundPathSign:: @ 8167FB2
+ msgbox Route6_Text_UndergroundPathSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc
index b8ae84e32..0242ceee8 100644
--- a/data/maps/Route6/text.inc
+++ b/data/maps/Route6/text.inc
@@ -1,73 +1,73 @@
-Text_183E04:: @ 8183E04
+Route6_Text_RickyIntro:: @ 8183E04
.string "Who's there?\n"
.string "Quit listening in on us!$"
-Text_183E2A:: @ 8183E2A
+Route6_Text_RickyDefeat:: @ 8183E2A
.string "I just can't win!$"
-Text_183E3C:: @ 8183E3C
+Route6_Text_RickyPostBattle:: @ 8183E3C
.string "Whisper…\n"
.string "Whisper…$"
-Text_183E4E:: @ 8183E4E
+Route6_Text_NancyIntro:: @ 8183E4E
.string "Excuse me!\n"
.string "This is a private conversation!$"
-Text_183E79:: @ 8183E79
+Route6_Text_NancyDefeat:: @ 8183E79
.string "Ugh!\n"
.string "I hate losing.$"
-Text_183E8D:: @ 8183E8D
+Route6_Text_NancyPostBattle:: @ 8183E8D
.string "Whisper…\n"
.string "Whisper…$"
-Text_183E9F:: @ 8183E9F
+Route6_Text_KeigoIntro:: @ 8183E9F
.string "There aren't many bugs out here.$"
-Text_183EC0:: @ 8183EC0
+Route6_Text_KeigoDefeat:: @ 8183EC0
.string "No!\n"
.string "You're kidding!$"
-Text_183ED4:: @ 8183ED4
+Route6_Text_KeigoPostBattle:: @ 8183ED4
.string "I like bugs, so I'm going back to\n"
.string "VIRIDIAN FOREST.$"
-Text_183F07:: @ 8183F07
+Route6_Text_JeffIntro:: @ 8183F07
.string "Huh?\n"
.string "You want to talk to me?$"
-Text_183F24:: @ 8183F24
+Route6_Text_JeffDefeat:: @ 8183F24
.string "This stinks…\n"
.string "I couldn't beat your challenge…$"
-Text_183F51:: @ 8183F51
+Route6_Text_JeffPostBattle:: @ 8183F51
.string "I should bring more POKéMON with\n"
.string "me. I'll feel safer that way.$"
-Text_183F90:: @ 8183F90
+Route6_Text_IsabelleIntro:: @ 8183F90
.string "Me?\n"
.string "Well, okay. I'll play!$"
-Text_183FAB:: @ 8183FAB
+Route6_Text_IsabelleDefeat:: @ 8183FAB
.string "Things just didn't work…$"
-Text_183FC4:: @ 8183FC4
+Route6_Text_IsabellePostBattle:: @ 8183FC4
.string "I want to get stronger.\n"
.string "What's your secret?$"
-Text_183FF0:: @ 8183FF0
+Route6_Text_ElijahIntro:: @ 8183FF0
.string "I've never seen you around.\n"
.string "Are you good?$"
-Text_18401A:: @ 818401A
+Route6_Text_ElijahDefeat:: @ 818401A
.string "You're too good!$"
-Text_18402B:: @ 818402B
+Route6_Text_ElijahPostBattle:: @ 818402B
.string "Are my POKéMON weak?\n"
.string "Or, am I just bad?\l"
.string "Which do you think?$"
-gUnknown_8184067:: @ 8184067
+Route6_Text_UndergroundPathSign:: @ 8184067
.string "UNDERGROUND PATH\n"
.string "CERULEAN CITY - VERMILION CITY$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 08:37:28 +0000