diff options
Diffstat (limited to 'data/maps/Route5')
-rw-r--r-- | data/maps/Route5/map.json | 19 | ||||
-rw-r--r-- | data/maps/Route5/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route5/text.inc | 58 |
3 files changed, 14 insertions, 67 deletions
diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 8b047231e..a178efdc2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "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_CERULEAN_CITY", @@ -18,7 +20,7 @@ "direction": "up" }, { - "map": "MAP_SAFFRON_CITY_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": 0, "direction": "down" } @@ -57,11 +59,12 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 32, "y": 32, "elevation": 0, - "script": "Route5_EventScript_167FA8" + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route5_EventScript_UndergroundPathSign" } ] } diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 3e1b507d2..cc5b0d1d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -1,6 +1,6 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 -Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, MSGBOX_SIGN +Route5_EventScript_UndergroundPathSign:: @ 8167FA8 + msgbox Route5_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 0a3e80874..1aab5cc6b 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,60 +1,4 @@ -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.$" - -Text_183D26:: @ 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.$" - -gUnknown_8183DD4:: @ 8183DD4 +Route5_Text_UndergroundPathSign:: @ 8183DD4 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" |