summaryrefslogtreecommitdiff
path: root/data/maps/Route3
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route3')
-rw-r--r--data/maps/Route3/map.json53
-rw-r--r--data/maps/Route3/scripts.inc8
-rw-r--r--data/maps/Route3/text.inc52
3 files changed, 58 insertions, 55 deletions
diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json
index f2ad40c5e..c137d9f48 100644
--- a/data/maps/Route3/map.json
+++ b/data/maps/Route3/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_3",
"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_ROUTE4",
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 70,
"y": 13,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route3_EventScript_167F78",
+ "script": "Route3_EventScript_Youngster",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 40,
"y": 11,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route3_EventScript_1A957B",
+ "script": "Route3_EventScript_Robin",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+ "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 32,
"y": 6,
"elevation": 3,
@@ -60,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route3_EventScript_1A94C1",
+ "script": "Route3_EventScript_James",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 30,
"y": 3,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route3_EventScript_1A953D",
+ "script": "Route3_EventScript_Sally",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+ "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 25,
"y": 4,
"elevation": 3,
@@ -86,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route3_EventScript_1A9483",
+ "script": "Route3_EventScript_Greg",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 29,
"y": 10,
"elevation": 3,
@@ -99,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route3_EventScript_1A9407",
+ "script": "Route3_EventScript_Calvin",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 19,
"y": 9,
"elevation": 3,
@@ -112,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route3_EventScript_1A94FF",
+ "script": "Route3_EventScript_Janice",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+ "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 12,
"y": 6,
"elevation": 3,
@@ -125,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route3_EventScript_1A9445",
+ "script": "Route3_EventScript_Colton",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 17,
"y": 4,
"elevation": 3,
@@ -138,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route3_EventScript_1A93C9",
+ "script": "Route3_EventScript_Ben",
"flag": "0"
}
],
@@ -146,11 +148,12 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 72,
"y": 11,
"elevation": 0,
- "script": "Route3_EventScript_167F81"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route3_EventScript_RouteSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc
index bc44936d0..c8e3c1a58 100644
--- a/data/maps/Route3/scripts.inc
+++ b/data/maps/Route3/scripts.inc
@@ -1,10 +1,10 @@
Route3_MapScripts:: @ 8167F77
.byte 0
-Route3_EventScript_167F78:: @ 8167F78
- msgbox gUnknown_8183491, MSGBOX_NPC
+Route3_EventScript_Youngster:: @ 8167F78
+ msgbox Route3_Text_TunnelFromCeruleanTiring, MSGBOX_NPC
end
-Route3_EventScript_167F81:: @ 8167F81
- msgbox gUnknown_81838C0, MSGBOX_SIGN
+Route3_EventScript_RouteSign:: @ 8167F81
+ msgbox Route3_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc
index 32aa96e19..6e5ad9c69 100644
--- a/data/maps/Route3/text.inc
+++ b/data/maps/Route3/text.inc
@@ -1,104 +1,104 @@
-gUnknown_8183491:: @ 8183491
+Route3_Text_TunnelFromCeruleanTiring:: @ 8183491
.string "Whew… I better take a rest…\n"
.string "Groan…\p"
.string "That tunnel from CERULEAN takes a\n"
.string "lot out of you!$"
-Text_1834E6:: @ 81834E6
+Route3_Text_ColtonIntro:: @ 81834E6
.string "Hey!\n"
.string "I saw you in VIRIDIAN FOREST!$"
-Text_183509:: @ 8183509
+Route3_Text_ColtonDefeat:: @ 8183509
.string "You beat me again!$"
-Text_18351C:: @ 818351C
+Route3_Text_ColtonPostBattle:: @ 818351C
.string "There are other kinds of POKéMON\n"
.string "than the ones you find in forests.$"
-Text_183560:: @ 8183560
+Route3_Text_BenIntro:: @ 8183560
.string "Hi!\n"
.string "I like shorts!\p"
.string "They're delightfully comfy and\n"
.string "easy to wear!$"
-Text_1835A0:: @ 81835A0
+Route3_Text_BenDefeat:: @ 81835A0
.string "I don't believe it!$"
-Text_1835B4:: @ 81835B4
+Route3_Text_BenPostBattle:: @ 81835B4
.string "Are you using a POKéMON CENTER's\n"
.string "PC for storing your POKéMON?\p"
.string "Each BOX can hold up to\n"
.string "30 POKéMON.$"
-Text_183616:: @ 8183616
+Route3_Text_JaniceIntro:: @ 8183616
.string "Excuse me!\n"
.string "You looked at me, didn't you?$"
-Text_18363F:: @ 818363F
+Route3_Text_JaniceDefeat:: @ 818363F
.string "You're mean!$"
-Text_18364C:: @ 818364C
+Route3_Text_JanicePostBattle:: @ 818364C
.string "You shouldn't be staring if you\n"
.string "don't want to battle!$"
-Text_183682:: @ 8183682
+Route3_Text_GregIntro:: @ 8183682
.string "Are you a TRAINER?\n"
.string "Let's get with it right away!$"
-Text_1836B3:: @ 81836B3
+Route3_Text_GregDefeat:: @ 81836B3
.string "If I had new POKéMON, I would've\n"
.string "won!$"
-Text_1836D9:: @ 81836D9
+Route3_Text_GregPostBattle:: @ 81836D9
.string "If a POKéMON BOX on the PC gets\n"
.string "full, just switch to another BOX.$"
-Text_18371B:: @ 818371B
+Route3_Text_SallyIntro:: @ 818371B
.string "That look you gave me…\n"
.string "It's so intriguing!$"
-Text_183746:: @ 8183746
+Route3_Text_SallyDefeat:: @ 8183746
.string "Be nice!$"
-Text_18374F:: @ 818374F
+Route3_Text_SallyPostBattle:: @ 818374F
.string "You can avoid battles by not\n"
.string "letting TRAINERS see you.$"
-Text_183786:: @ 8183786
+Route3_Text_CalvinIntro:: @ 8183786
.string "Hey! You're not wearing shorts!\n"
.string "What's wrong with you?$"
-Text_1837BD:: @ 81837BD
+Route3_Text_CalvinDefeat:: @ 81837BD
.string "Lost!\n"
.string "Lost! Lost!$"
-Text_1837CF:: @ 81837CF
+Route3_Text_CalvinPostBattle:: @ 81837CF
.string "I always wear shorts, even in\n"
.string "winter. That's my policy.$"
-Text_183807:: @ 8183807
+Route3_Text_JamesIntro:: @ 8183807
.string "I'll battle you with the POKéMON\n"
.string "I just caught.$"
-Text_183837:: @ 8183837
+Route3_Text_JamesDefeat:: @ 8183837
.string "Done like dinner!$"
-Text_183849:: @ 8183849
+Route3_Text_JamesPostBattle:: @ 8183849
.string "Trained POKéMON are stronger than\n"
.string "the wild ones.$"
-Text_18387A:: @ 818387A
+Route3_Text_RobinIntro:: @ 818387A
.string "Eek!\n"
.string "Did you touch me?$"
-Text_183891:: @ 8183891
+Route3_Text_RobinDefeat:: @ 8183891
.string "That's it?$"
-Text_18389C:: @ 818389C
+Route3_Text_RobinPostBattle:: @ 818389C
.string "ROUTE 4 is at the foot of\n"
.string "MT. MOON.$"
-gUnknown_81838C0:: @ 81838C0
+Route3_Text_RouteSign:: @ 81838C0
.string "ROUTE 3\n"
.string "MT. MOON AHEAD$"