summaryrefslogtreecommitdiff
path: root/data/maps/Route8
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route8')
-rw-r--r--data/maps/Route8/map.json79
-rw-r--r--data/maps/Route8/scripts.inc4
-rw-r--r--data/maps/Route8/text.inc108
3 files changed, 123 insertions, 68 deletions
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 7ed8e635d..ffc181a4d 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -6,14 +6,16 @@
"region_map_section": "MAPSEC_ROUTE_8",
"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": -10,
"direction": "left"
},
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 62,
"y": 14,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "Route8_EventScript_1AA1D5",
+ "script": "Route8_EventScript_Julia",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+ "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
"x": 55,
"y": 15,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route8_EventScript_1AA30B",
+ "script": "Route8_EventScript_Rich",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+ "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 51,
"y": 6,
"elevation": 3,
@@ -60,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route8_EventScript_1AA251",
+ "script": "Route8_EventScript_Glenn",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 29,
"y": 3,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route8_EventScript_1AA11B",
+ "script": "Route8_EventScript_Paige",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+ "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 29,
"y": 4,
"elevation": 3,
@@ -86,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "Route8_EventScript_1AA28F",
+ "script": "Route8_EventScript_Leslie",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 29,
"y": 5,
"elevation": 3,
@@ -99,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route8_EventScript_1AA159",
+ "script": "Route8_EventScript_Andrea",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 29,
"y": 6,
"elevation": 3,
@@ -112,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "Route8_EventScript_1AA197",
+ "script": "Route8_EventScript_Megan",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+ "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
"x": 21,
"y": 3,
"elevation": 3,
@@ -125,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route8_EventScript_1AA2CD",
+ "script": "Route8_EventScript_Stan",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+ "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 9,
"y": 6,
"elevation": 3,
@@ -138,11 +140,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route8_EventScript_1AA213",
+ "script": "Route8_EventScript_Aidan",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"x": 33,
"y": 15,
"elevation": 3,
@@ -151,11 +153,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": 47,
"y": 12,
"elevation": 3,
@@ -164,11 +166,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_LITTLE_GIRL",
+ "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 40,
"y": 3,
"elevation": 3,
@@ -177,11 +179,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route8_EventScript_1AA349",
+ "script": "Route8_EventScript_Eli",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 41,
"y": 3,
"elevation": 3,
@@ -190,11 +192,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route8_EventScript_1AA38F",
+ "script": "Route8_EventScript_Anne",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 14,
"y": 16,
"elevation": 3,
@@ -203,11 +205,11 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route8_EventScript_1AA3D5",
+ "script": "Route8_EventScript_Ricardo",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 24,
"y": 17,
"elevation": 3,
@@ -216,7 +218,7 @@
"movement_range_y": 5,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route8_EventScript_1AA413",
+ "script": "Route8_EventScript_Jaren",
"flag": "0"
}
],
@@ -239,11 +241,12 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 16,
"y": 5,
"elevation": 0,
- "script": "Route8_EventScript_167FC6"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route8_EventScript_UndergroundPathSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc
index c0f7475f3..93e0aa38a 100644
--- a/data/maps/Route8/scripts.inc
+++ b/data/maps/Route8/scripts.inc
@@ -1,6 +1,6 @@
Route8_MapScripts:: @ 8167FC5
.byte 0
-Route8_EventScript_167FC6:: @ 8167FC6
- msgbox gUnknown_8184576, MSGBOX_SIGN
+Route8_EventScript_UndergroundPathSign:: @ 8167FC6
+ msgbox Route8_Text_UndergroundPathSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc
index 83f725c6a..c9891575c 100644
--- a/data/maps/Route8/text.inc
+++ b/data/maps/Route8/text.inc
@@ -1,110 +1,162 @@
-Text_1840C5:: @ 81840C5
+Route8_Text_AidanIntro:: @ 81840C5
.string "You look good at POKéMON, but how\n"
.string "is your chemistry grade?$"
-Text_184100:: @ 8184100
+Route8_Text_AidanDefeat:: @ 8184100
.string "Ow!\n"
.string "Meltdown!$"
-Text_18410E:: @ 818410E
+Route8_Text_AidanPostBattle:: @ 818410E
.string "I am better at school than this!$"
-Text_18412F:: @ 818412F
+Route8_Text_StanIntro:: @ 818412F
.string "All right!\n"
.string "Let's play a game!$"
-Text_18414D:: @ 818414D
+Route8_Text_StanDefeat:: @ 818414D
.string "Drat!\n"
.string "Came up short!$"
-Text_184162:: @ 8184162
+Route8_Text_StanPostBattle:: @ 8184162
.string "Things didn't work today.$"
-Text_18417C:: @ 818417C
+Route8_Text_GlennIntro:: @ 818417C
.string "You should be informed.\n"
.string "You need strategy to win at this!$"
-Text_1841B6:: @ 81841B6
+Route8_Text_GlennDefeat:: @ 81841B6
.string "It's not logical!$"
-Text_1841C8:: @ 81841C8
+Route8_Text_GlennPostBattle:: @ 81841C8
.string "Go with GRIMER first…and…\n"
.string "…and…then…$"
-Text_1841ED:: @ 81841ED
+Route8_Text_PaigeIntro:: @ 81841ED
.string "I like NIDORAN, so I collect them!$"
-Text_184210:: @ 8184210
+Route8_Text_PaigeDefeat:: @ 8184210
.string "Why?\n"
.string "Why??$"
-Text_18421B:: @ 818421B
+Route8_Text_PaigePostBattle:: @ 818421B
.string "When POKéMON grow up, they get\n"
.string "ugly! They shouldn't evolve.$"
-Text_184257:: @ 8184257
+Route8_Text_LeslieIntro:: @ 8184257
.string "School is fun, but so are POKéMON.$"
-Text_18427A:: @ 818427A
+Route8_Text_LeslieDefeat:: @ 818427A
.string "You made it clear to me that\n"
.string "I should stick with school.$"
-Text_1842B3:: @ 81842B3
+Route8_Text_LesliePostBattle:: @ 81842B3
.string "I was planning on getting some\n"
.string "fresh air for a change, but…\p"
.string "We're stuck here because of the\n"
.string "gates at SAFFRON.$"
-Text_184321:: @ 8184321
+Route8_Text_AndreaIntro:: @ 8184321
.string "MEOWTH is so cute, meow, meow,\n"
.string "meow!$"
-Text_184346:: @ 8184346
+Route8_Text_AndreaDefeat:: @ 8184346
.string "Meeeeyow!$"
-Text_184350:: @ 8184350
+Route8_Text_AndreaPostBattle:: @ 8184350
.string "I think PIDGEY and RATTATA are\n"
.string "cute, too!$"
-Text_18437A:: @ 818437A
+Route8_Text_MeganIntro:: @ 818437A
.string "We must look silly standing here\n"
.string "like this.$"
-Text_1843A6:: @ 81843A6
+Route8_Text_MeganDefeat:: @ 81843A6
.string "Look what you did to my poor, cute\n"
.string "POKéMON!$"
-Text_1843D2:: @ 81843D2
+Route8_Text_MeganPostBattle:: @ 81843D2
.string "SAFFRON's gatekeeper won't let us\n"
.string "go through.\p"
.string "I know he's doing his job, but I\n"
.string "think he's mean.$"
-Text_184432:: @ 8184432
+Route8_Text_RichIntro:: @ 8184432
.string "I'm a rambling, gaming dude!$"
-Text_18444F:: @ 818444F
+Route8_Text_RichDefeat:: @ 818444F
.string "Missed the big chance!$"
-Text_184466:: @ 8184466
+Route8_Text_RichPostBattle:: @ 8184466
.string "Playing games and POKéMON are like\n"
.string "eating peanuts! I just can't stop!$"
-Text_1844AC:: @ 81844AC
+Route8_Text_JuliaIntro:: @ 81844AC
.string "What's a cute, round, and fluffy\n"
.string "POKéMON?$"
-Text_1844D6:: @ 81844D6
+Route8_Text_JuliaDefeat:: @ 81844D6
.string "Stop!\p"
.string "Don't be so mean to my CLEFAIRY!$"
-Text_1844FD:: @ 81844FD
+Route8_Text_JuliaPostBattle:: @ 81844FD
.string "I read that CLEFAIRY evolves when\n"
.string "it's exposed to a MOON STONE.\p"
.string "I read that in a POKéMON JOURNAL.\n"
.string "I wonder if it's true?$"
-gUnknown_8184576:: @ 8184576
+Route8_Text_UndergroundPathSign:: @ 8184576
.string "UNDERGROUND PATH\n"
.string "CELADON CITY - LAVENDER TOWN$"
+Route8_Text_EliIntro:: @ 81845A4
+ .string "ELI: Twin power is fantastic.\n"
+ .string "Did you know?$"
+
+Route8_Text_EliDefeat:: @ 81845D0
+ .string "ELI: But…\n"
+ .string "We used our twin power…$"
+
+Route8_Text_EliPostBattle:: @ 81845F2
+ .string "ELI: I caught my POKéMON with\n"
+ .string "ANNE!$"
+
+Route8_Text_EliNotEnoughMons:: @ 8184616
+ .string "ELI: We can't battle if you don't\n"
+ .string "have two POKéMON.$"
+
+Route8_Text_AnneIntro:: @ 818464A
+ .string "ANNE: We'll shock you with our twin\n"
+ .string "power!$"
+
+Route8_Text_AnneDefeat:: @ 8184675
+ .string "ANNE: Our twin power…$"
+
+Route8_Text_AnnePostBattle:: @ 818468B
+ .string "ANNE: I'm raising POKéMON with\n"
+ .string "ELI.$"
+
+Route8_Text_AnneNotEnoughMons:: @ 81846AF
+ .string "ANNE: Hi, hi! Let's battle!\n"
+ .string "But bring two POKéMON.$"
+
+Route8_Text_RicardoIntro:: @ 81846E2
+ .string "My bike's acting up, man.$"
+
+Route8_Text_RicardoDefeat:: @ 81846FC
+ .string "Aww, man.\n"
+ .string "I'm not into this.$"
+
+Route8_Text_RicardoPostBattle:: @ 8184719
+ .string "I got grass caught up in my\n"
+ .string "spokes, man.$"
+
+Route8_Text_JarenIntro:: @ 8184742
+ .string "Clear the way, or I'll run you\n"
+ .string "down!$"
+
+Route8_Text_JarenDefeat:: @ 8184767
+ .string "You for real, kid?$"
+
+Route8_Text_JarenPostBattle:: @ 818477A
+ .string "Don't think you're all special and\n"
+ .string "all just because of this.$"