summaryrefslogtreecommitdiff
path: root/data/maps/Route4
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route4')
-rw-r--r--data/maps/Route4/map.json43
-rw-r--r--data/maps/Route4/scripts.inc14
-rw-r--r--data/maps/Route4/text.inc67
3 files changed, 92 insertions, 32 deletions
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index b992a7d89..af04e21a8 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_4",
"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_ROUTE3",
@@ -25,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+ "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
"x": 9,
"y": 8,
"elevation": 3,
@@ -34,11 +36,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route4_EventScript_167F8C",
+ "script": "Route4_EventScript_Woman",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 75,
"y": 3,
"elevation": 3,
@@ -47,11 +49,11 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route4_EventScript_1A95B9",
+ "script": "Route4_EventScript_Crissy",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 67,
"y": 5,
"elevation": 3,
@@ -64,7 +66,7 @@
"flag": "FLAG_HIDE_ROUTE4_TM05"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BOY",
+ "graphics_id": "OBJ_EVENT_GFX_BOY",
"x": 15,
"y": 14,
"elevation": 3,
@@ -73,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route4_EventScript_1ACDEA",
+ "script": "Route4_EventScript_Boy",
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+ "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"x": 47,
"y": 3,
"elevation": 3,
@@ -90,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+ "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"x": 50,
"y": 3,
"elevation": 3,
@@ -103,7 +105,8 @@
"flag": "0"
},
{
- "graphics_id": "65321",
+ "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
+ "in_connection": true,
"x": 109,
"y": 3,
"elevation": 12,
@@ -142,18 +145,20 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 18,
"y": 7,
"elevation": 0,
- "script": "Route4_EventScript_167F95"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route4_EventScript_MtMoonSign"
},
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 34,
"y": 7,
"elevation": 0,
- "script": "Route4_EventScript_167F9E"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route4_EventScript_RouteSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc
index 9055722eb..c6c7e6bbd 100644
--- a/data/maps/Route4/scripts.inc
+++ b/data/maps/Route4/scripts.inc
@@ -1,17 +1,17 @@
Route4_MapScripts:: @ 8167F8A
.byte 0
-Route4_EventScript_167F8B:: @ 8167F8B
+Route4_EventScript_Unused:: @ 8167F8B
end
-Route4_EventScript_167F8C:: @ 8167F8C
- msgbox gUnknown_81838D7, MSGBOX_NPC
+Route4_EventScript_Woman:: @ 8167F8C
+ msgbox Route4_Text_TrippedOverGeodude, MSGBOX_NPC
end
-Route4_EventScript_167F95:: @ 8167F95
- msgbox gUnknown_818399B, MSGBOX_SIGN
+Route4_EventScript_MtMoonSign:: @ 8167F95
+ msgbox Route4_Text_MtMoonEntrance, MSGBOX_SIGN
end
-Route4_EventScript_167F9E:: @ 8167F9E
- msgbox gUnknown_81839B4, MSGBOX_SIGN
+Route4_EventScript_RouteSign:: @ 8167F9E
+ msgbox Route4_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc
index 49648cde0..a6bd24787 100644
--- a/data/maps/Route4/text.inc
+++ b/data/maps/Route4/text.inc
@@ -1,24 +1,79 @@
-gUnknown_81838D7:: @ 81838D7
+Route4_Text_TrippedOverGeodude:: @ 81838D7
.string "Ouch! I tripped over a rocky\n"
.string "POKéMON, GEODUDE!$"
-Text_183906:: @ 8183906
+Route4_Text_CrissyIntro:: @ 8183906
.string "I came to MT. MOON in search of\n"
.string "mushroom POKéMON.$"
-Text_183938:: @ 8183938
+Route4_Text_CrissyDefeat:: @ 8183938
.string "After all I did to catch them!$"
-Text_183957:: @ 8183957
+Route4_Text_CrissyPostBattle:: @ 8183957
.string "There might not be any more\n"
.string "mushrooms here.\p"
.string "I think I got them all.$"
-gUnknown_818399B:: @ 818399B
+Route4_Text_MtMoonEntrance:: @ 818399B
.string "MT. MOON\n"
.string "Tunnel Entrance$"
-gUnknown_81839B4:: @ 81839B4
+Route4_Text_RouteSign:: @ 81839B4
.string "ROUTE 4\n"
.string "MT. MOON - CERULEAN CITY$"
+Text_MegaPunchTeach:: @ 81839D5
+ .string "A punch of roaring ferocity!\p"
+ .string "Packed with destructive power!\p"
+ .string "When the chips are down,\n"
+ .string "MEGA PUNCH is the ultimate attack!\l"
+ .string "You agree, yes?\p"
+ .string "Now!\n"
+ .string "Let me teach it to your POKéMON!$"
+
+Text_MegaPunchDeclined:: @ 8183A83
+ .string "You'll be back when you understand\n"
+ .string "the worth of MEGA PUNCH.$"
+
+Text_MegaPunchWhichMon:: @ 8183ABF
+ .string "Fine!\n"
+ .string "Which POKéMON will learn it?$"
+
+Text_MegaPunchTaught:: @ 8183AE2
+ .string "Now, we are comrades in the way of\n"
+ .string "punching!\p"
+ .string "You should go before you're seen\n"
+ .string "by the misguided fool who trains\l"
+ .string "only his silly kicking over there.$"
+
+Text_MegaKickTeach:: @ 8183B74
+ .string "A kick of brutal ferocity!\p"
+ .string "Packed with destructive power!\p"
+ .string "When you get right down to it,\n"
+ .string "MEGA KICK is the ultimate attack!\l"
+ .string "Don't you agree?\p"
+ .string "Okay!\n"
+ .string "I'll teach it to your POKéMON!$"
+
+Text_MegaKickDeclined:: @ 8183C25
+ .string "You'll come crawling back when you\n"
+ .string "realize the value of MEGA KICK.$"
+
+Text_MegaKickWhichMon:: @ 8183C68
+ .string "All right!\n"
+ .string "Which POKéMON wants to learn it?$"
+
+Text_MegaKickTaught:: @ 8183C94
+ .string "Now, we are soul mates in the way\n"
+ .string "of kicking!\p"
+ .string "You should run before you're seen\n"
+ .string "by the deluded nitwit who trains\l"
+ .string "only simple punching over there.$"
+
+Route4_Text_PeopleLikeAndRespectBrock:: @ 8183D26
+ .string "Oh, wow, that's the BOULDERBADGE!\n"
+ .string "You got it from BROCK, didn't you?\p"
+ .string "BROCK is cool. He's not just tough.\n"
+ .string "People like and respect him.\p"
+ .string "I want to become a GYM LEADER\n"
+ .string "like him.$"