summaryrefslogtreecommitdiff
path: root/data/maps/Route25
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route25')
-rw-r--r--data/maps/Route25/map.json67
-rw-r--r--data/maps/Route25/scripts.inc8
-rw-r--r--data/maps/Route25/text.inc126
3 files changed, 69 insertions, 132 deletions
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index d49d76361..82c80ddf4 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_25",
"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_ROUTE24",
@@ -20,7 +22,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+ "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 11,
"y": 4,
"elevation": 3,
@@ -29,11 +31,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route25_EventScript_1A98A1",
+ "script": "Route25_EventScript_Franklin",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 18,
"y": 2,
"elevation": 3,
@@ -42,11 +44,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A976B",
+ "script": "Route25_EventScript_Joey",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+ "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 17,
"y": 7,
"elevation": 3,
@@ -55,11 +57,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A991D",
+ "script": "Route25_EventScript_Wayne",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 22,
"y": 4,
"elevation": 3,
@@ -68,11 +70,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A97A9",
+ "script": "Route25_EventScript_Dan",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -81,11 +83,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A9825",
+ "script": "Route25_EventScript_Kelsey",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+ "graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 27,
"y": 9,
"elevation": 3,
@@ -94,11 +96,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route25_EventScript_1A98DF",
+ "script": "Route25_EventScript_Nob",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 28,
"y": 4,
"elevation": 3,
@@ -107,11 +109,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route25_EventScript_1A995B",
+ "script": "Route25_EventScript_Flint",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 36,
"y": 4,
"elevation": 3,
@@ -120,11 +122,11 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A97E7",
+ "script": "Route25_EventScript_Chad",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 42,
"y": 5,
"elevation": 3,
@@ -133,11 +135,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route25_EventScript_1A9863",
+ "script": "Route25_EventScript_Haley",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 26,
"y": 2,
"elevation": 3,
@@ -150,7 +152,7 @@
"flag": "FLAG_HIDE_ROUTE25_TM43"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 30,
"y": 3,
"elevation": 3,
@@ -159,11 +161,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_BEAUTY",
+ "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 49,
"y": 10,
"elevation": 3,
@@ -172,11 +174,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route25_EventScript_1ACE4F",
+ "script": "Route25_EventScript_Beauty",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_MAN",
+ "graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 49,
"y": 11,
"elevation": 3,
@@ -185,7 +187,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route25_EventScript_16874F",
+ "script": "Route25_EventScript_Man",
"flag": "0"
}
],
@@ -201,11 +203,12 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 48,
"y": 4,
"elevation": 0,
- "script": "Route25_EventScript_168746"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route25_EventScript_SeaCottageSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc
index d214cdbf6..4dc03b3e9 100644
--- a/data/maps/Route25/scripts.inc
+++ b/data/maps/Route25/scripts.inc
@@ -1,10 +1,10 @@
Route25_MapScripts:: @ 8168745
.byte 0
-Route25_EventScript_168746:: @ 8168746
- msgbox gUnknown_818954C, MSGBOX_SIGN
+Route25_EventScript_SeaCottageSign:: @ 8168746
+ msgbox Route25_Text_SeaCottageSign, MSGBOX_SIGN
end
-Route25_EventScript_16874F:: @ 816874F
- msgbox gUnknown_81895C2, MSGBOX_NPC
+Route25_EventScript_Man:: @ 816874F
+ msgbox Route25_Text_AreYouHereAlone, MSGBOX_NPC
end
diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc
index cdc124108..56bf3df94 100644
--- a/data/maps/Route25/text.inc
+++ b/data/maps/Route25/text.inc
@@ -1,184 +1,118 @@
-Text_188E74:: @ 8188E74
- .string "I saw your feat from the grass!$"
-
-Text_188E94:: @ 8188E94
- .string "I thought not!$"
-
-Text_188EA3:: @ 8188EA3
- .string "I hid because the people on the\n"
- .string "bridge frightened me.$"
-
-Text_188ED9:: @ 8188ED9
- .string "Okay! I'm No. 5!\n"
- .string "I'll stomp you!$"
-
-Text_188EFA:: @ 8188EFA
- .string "Whoa!\n"
- .string "Too much!$"
-
-Text_188F0A:: @ 8188F0A
- .string "I did my best. I have no regrets!$"
-
-Text_188F2C:: @ 8188F2C
- .string "I'm No. 4!\n"
- .string "Getting tired?$"
-
-Text_188F46:: @ 8188F46
- .string "I lost, too!$"
-
-Text_188F53:: @ 8188F53
- .string "I did my best, so I've no regrets!$"
-
-Text_188F76:: @ 8188F76
- .string "Here's No. 3!\n"
- .string "I won't be easy!$"
-
-Text_188F95:: @ 8188F95
- .string "Ow!\n"
- .string "Stomped flat!$"
-
-Text_188FA7:: @ 8188FA7
- .string "I did my best. I have no regrets!$"
-
-Text_188FC9:: @ 8188FC9
- .string "I'm second!\n"
- .string "Now it's serious!$"
-
-Text_188FE7:: @ 8188FE7
- .string "How could I lose?$"
-
-Text_188FF9:: @ 8188FF9
- .string "I did my best. I have no regrets!$"
-
-Text_18901B:: @ 818901B
- .string "People call this the NUGGET\n"
- .string "BRIDGE!\p"
- .string "Beat us five TRAINERS and win\n"
- .string "a fabulous prize!\p"
- .string "Think you got what it takes?$"
-
-Text_18908C:: @ 818908C
- .string "Whoo!\n"
- .string "Good stuff!$"
-
-Text_18909E:: @ 818909E
- .string "I did my best. I have no regrets!$"
-
-Text_1890C0:: @ 81890C0
+Route25_Text_JoeyIntro:: @ 81890C0
.string "Local TRAINERS come here to\n"
.string "practice.$"
-Text_1890E6:: @ 81890E6
+Route25_Text_JoeyDefeat:: @ 81890E6
.string "You're decent.$"
-Text_1890F5:: @ 81890F5
+Route25_Text_JoeyPostBattle:: @ 81890F5
.string "All POKéMON have weaknesses.\n"
.string "Even the strongest ones.\p"
.string "That's why it's best to raise\n"
.string "POKéMON of different types.$"
-Text_189165:: @ 8189165
+Route25_Text_DanIntro:: @ 8189165
.string "Dad took me to a great party on\n"
.string "the S.S. ANNE at VERMILION CITY.$"
-Text_1891A6:: @ 81891A6
+Route25_Text_DanDefeat:: @ 81891A6
.string "I'm not mad!$"
-Text_1891B3:: @ 81891B3
+Route25_Text_DanPostBattle:: @ 81891B3
.string "On the S.S. ANNE, I saw TRAINERS\n"
.string "from around the world.$"
-Text_1891EB:: @ 81891EB
+Route25_Text_FlintIntro:: @ 81891EB
.string "I'm a cool guy.\n"
.string "I've got a girlfriend!$"
-Text_189212:: @ 8189212
+Route25_Text_FlintDefeat:: @ 8189212
.string "Aww, darn…$"
-Text_18921D:: @ 818921D
+Route25_Text_FlintPostBattle:: @ 818921D
.string "Oh, well.\n"
.string "My girlfriend will cheer me up.$"
-Text_189247:: @ 8189247
+Route25_Text_KelseyIntro:: @ 8189247
.string "Hi!\n"
.string "My boyfriend is cool!$"
-Text_189261:: @ 8189261
+Route25_Text_KelseyDefeat:: @ 8189261
.string "My conditioning isn't the best…$"
-Text_189281:: @ 8189281
+Route25_Text_KelseyPostBattle:: @ 8189281
.string "I wish my boyfriend was as good\n"
.string "as you.$"
-Text_1892A9:: @ 81892A9
+Route25_Text_ChadIntro:: @ 81892A9
.string "I had this feeling…\n"
.string "I knew I had to battle you!$"
-Text_1892D9:: @ 81892D9
+Route25_Text_ChadDefeat:: @ 81892D9
.string "I knew I'd lose, too!$"
-Text_1892EF:: @ 81892EF
+Route25_Text_ChadPostBattle:: @ 81892EF
.string "If your POKéMON gets confused,\n"
.string "switch it out.\p"
.string "That's a good tactic.$"
-Text_189333:: @ 8189333
+Route25_Text_HaleyIntro:: @ 8189333
.string "My friend has many cute POKéMON.\n"
.string "I'm so jealous!$"
-Text_189364:: @ 8189364
+Route25_Text_HaleyDefeat:: @ 8189364
.string "I'm not so jealous!$"
-Text_189378:: @ 8189378
+Route25_Text_HaleyPostBattle:: @ 8189378
.string "You came from MT. MOON?\n"
.string "May I have a CLEFAIRY?$"
-Text_1893A7:: @ 81893A7
+Route25_Text_FranklinIntro:: @ 81893A7
.string "I just got down from MT. MOON,\n"
.string "but I've still got gas in the tank!$"
-Text_1893EA:: @ 81893EA
+Route25_Text_FranklinDefeat:: @ 81893EA
.string "You worked hard!$"
-Text_1893FB:: @ 81893FB
+Route25_Text_FranklinPostBattle:: @ 81893FB
.string "Drat!\n"
.string "A ZUBAT bit me back in that cave.$"
-Text_189423:: @ 8189423
+Route25_Text_NobIntro:: @ 8189423
.string "I'm off to see a POKéMANIAC's\n"
.string "collection at the cape.$"
-Text_189459:: @ 8189459
+Route25_Text_NobDefeat:: @ 8189459
.string "You done got me, and real good,\n"
.string "too!$"
-Text_18947E:: @ 818947E
+Route25_Text_NobPostBattle:: @ 818947E
.string "The POKéMANIAC sure lives up to\n"
.string "his name.\p"
.string "His collection includes many rare\n"
.string "species of POKéMON.$"
-Text_1894DE:: @ 81894DE
+Route25_Text_WayneIntro:: @ 81894DE
.string "You're going to see BILL?\n"
.string "First, we battle!$"
-Text_18950A:: @ 818950A
+Route25_Text_WayneDefeat:: @ 818950A
.string "You're something.$"
-Text_18951C:: @ 818951C
+Route25_Text_WaynePostBattle:: @ 818951C
.string "The trail below is a shortcut to\n"
.string "CERULEAN CITY.$"
-gUnknown_818954C:: @ 818954C
+Route25_Text_SeaCottageSign:: @ 818954C
.string "SEA COTTAGE\n"
.string "BILL lives here!$"
-Text_189569:: @ 8189569
+Route25_Text_MistyHighHopesAboutThisPlace:: @ 8189569
.string "This cape is a famous date spot.\p"
.string "MISTY, the GYM LEADER, has high\n"
.string "hopes about this place.$"
-gUnknown_81895C2:: @ 81895C2
+Route25_Text_AreYouHereAlone:: @ 81895C2
.string "Hello, are you here alone?\p"
.string "If you're out at CERULEAN's cape…\n"
.string "Well, it should be as a couple.$"