diff options
Diffstat (limited to 'data/maps/Route14')
-rw-r--r-- | data/maps/Route14/map.json | 77 | ||||
-rw-r--r-- | data/maps/Route14/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route14/text.inc | 92 |
3 files changed, 103 insertions, 70 deletions
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index cf88cbf8a..ec17c5556 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_14", "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_ROUTE15", @@ -25,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -34,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA9B5", + "script": "Route14_EventScript_Gerald", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -47,11 +49,11 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AA9F3", + "script": "Route14_EventScript_Donald", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -60,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route14_EventScript_1AAAEB", + "script": "Route14_EventScript_Beck", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -73,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route14_EventScript_1AAB29", + "script": "Route14_EventScript_Marlon", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -86,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA977", + "script": "Route14_EventScript_Isaac", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -99,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA8FB", + "script": "Route14_EventScript_Malik", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -112,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAAAD", + "script": "Route14_EventScript_Mitch", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -125,11 +127,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAA6F", + "script": "Route14_EventScript_Carter", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BIKER", + "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -138,11 +140,11 @@ "movement_range_y": 6, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AA939", + "script": "Route14_EventScript_Lukas", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -151,11 +153,11 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAA31", + "script": "Route14_EventScript_Benny", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 7, "y": 26, "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_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -177,11 +179,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_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -190,11 +192,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -203,11 +205,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AABAD", + "script": "Route14_EventScript_Jan", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, @@ -216,7 +218,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAB67", + "script": "Route14_EventScript_Kiri", "flag": "0" } ], @@ -224,11 +226,12 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 12, "elevation": 0, - "script": "Route14_EventScript_1680D2" + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route14_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 551940250..46e3774ee 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -1,6 +1,6 @@ Route14_MapScripts:: @ 81680D1 .byte 0 -Route14_EventScript_1680D2:: @ 81680D2 - msgbox gUnknown_8186399, MSGBOX_SIGN +Route14_EventScript_RouteSign:: @ 81680D2 + msgbox Route14_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc index 37008ab3b..320c250ee 100644 --- a/data/maps/Route14/text.inc +++ b/data/maps/Route14/text.inc @@ -1,126 +1,156 @@ -Text_185E4D:: @ 8185E4D +Route14_Text_CarterIntro:: @ 8185E4D .string "You need to use TMs to teach good\n" .string "moves to POKéMON.$" -Text_185E81:: @ 8185E81 +Route14_Text_CarterDefeat:: @ 8185E81 .string "Not good enough quite yet.$" -Text_185E9C:: @ 8185E9C +Route14_Text_CarterPostBattle:: @ 8185E9C .string "You have some HMs, right? POKéMON\n" .string "can't forget those moves easily.$" -Text_185EDF:: @ 8185EDF +Route14_Text_MitchIntro:: @ 8185EDF .string "My bird POKéMON should be ready\n" .string "for battle.$" -Text_185F0B:: @ 8185F0B +Route14_Text_MitchDefeat:: @ 8185F0B .string "Not ready yet!$" -Text_185F1A:: @ 8185F1A +Route14_Text_MitchPostBattle:: @ 8185F1A .string "My bird POKéMON need to learn\n" .string "better moves.$" -Text_185F46:: @ 8185F46 +Route14_Text_BeckIntro:: @ 8185F46 .string "They have TMs on sale at the\n" .string "CELADON DEPT. STORE.\p" .string "TMs aren't really rare, but not\n" .string "many people have HMs.$" -Text_185FAE:: @ 8185FAE +Route14_Text_BeckDefeat:: @ 8185FAE .string "Aww, bummer!$" -Text_185FBB:: @ 8185FBB +Route14_Text_BeckPostBattle:: @ 8185FBB .string "Try teaching POKéMON a move that's\n" .string "the same type as it.\p" .string "That apparently boosts the power\n" .string "of the move.$" -Text_186021:: @ 8186021 +Route14_Text_MarlonIntro:: @ 8186021 .string "Have you taught your bird POKéMON\n" .string "how to FLY?\p" .string "You'll be able to soar with it into\n" .string "the sky!$" -Text_18607C:: @ 818607C +Route14_Text_MarlonDefeat:: @ 818607C .string "Shot down in flames!$" -Text_186091:: @ 8186091 +Route14_Text_MarlonPostBattle:: @ 8186091 .string "Bird POKéMON are my one true love.\n" .string "I don't want to raise anything else.$" -Text_1860D9:: @ 81860D9 +Route14_Text_DonaldIntro:: @ 81860D9 .string "Have you heard the legend of the\n" .string "winged mirages?$" -Text_18610A:: @ 818610A +Route14_Text_DonaldDefeat:: @ 818610A .string "Why?\n" .string "Why'd I lose?$" -Text_18611D:: @ 818611D +Route14_Text_DonaldPostBattle:: @ 818611D .string "Well, the winged mirages are the\n" .string "legendary bird POKéMON.\p" .string "There are three of them: ARTICUNO,\n" .string "ZAPDOS, and MOLTRES.$" -Text_18618E:: @ 818618E +Route14_Text_BennyIntro:: @ 818618E .string "I'm not into it, but okay.\n" .string "Let's go!$" -Text_1861B3:: @ 81861B3 +Route14_Text_BennyDefeat:: @ 81861B3 .string "I knew it!$" -Text_1861BE:: @ 81861BE +Route14_Text_BennyPostBattle:: @ 81861BE .string "Winning, losing… It's insignificant\n" .string "under this huge sky.$" -Text_1861F7:: @ 81861F7 +Route14_Text_LukasIntro:: @ 81861F7 .string "C'mon, c'mon.\n" .string "Let's go, let's go, let's go!$" -Text_186223:: @ 8186223 +Route14_Text_LukasDefeat:: @ 8186223 .string "Arrg!\n" .string "Lost! Get lost!$" -Text_186239:: @ 8186239 +Route14_Text_LukasPostBattle:: @ 8186239 .string "What, what, what?\n" .string "What do you want still?$" -Text_186263:: @ 8186263 +Route14_Text_IsaacIntro:: @ 8186263 .string "I need to burn some time.\n" .string "Shut up and battle.$" -Text_186291:: @ 8186291 +Route14_Text_IsaacDefeat:: @ 8186291 .string "What?\n" .string "You!?$" -Text_18629D:: @ 818629D +Route14_Text_IsaacPostBattle:: @ 818629D .string "Raising POKéMON is a drag, man.$" -Text_1862BD:: @ 81862BD +Route14_Text_GeraldIntro:: @ 81862BD .string "We ride out here because of the\n" .string "wide-open spaces.$" -Text_1862EF:: @ 81862EF +Route14_Text_GeraldDefeat:: @ 81862EF .string "Wipeout!$" -Text_1862F8:: @ 81862F8 +Route14_Text_GeraldPostBattle:: @ 81862F8 .string "It's cool you made your POKéMON so\n" .string "strong.\p" .string "Might is right!\n" .string "And you know it!$" -Text_186344:: @ 8186344 +Route14_Text_MalikIntro:: @ 8186344 .string "POKéMON battle?\n" .string "Cool! Rumble!$" -Text_186362:: @ 8186362 +Route14_Text_MalikDefeat:: @ 8186362 .string "Blown away!$" -Text_18636E:: @ 818636E +Route14_Text_MalikPostBattle:: @ 818636E .string "You know who'd win, you and me\n" .string "one-on-one!$" -gUnknown_8186399:: @ 8186399 +Route14_Text_RouteSign:: @ 8186399 .string "ROUTE 14\n" .string "West to FUCHSIA CITY$" +Route14_Text_KiriIntro:: @ 81863B7 + .string "KIRI: JAN, let's try really,\n" + .string "really hard together.$" + +Route14_Text_KiriDefeat:: @ 81863EA + .string "KIRI: Whimper…\n" + .string "We lost, didn't we?$" + +Route14_Text_KiriPostBattle:: @ 818640D + .string "KIRI: Did we lose because of me?$" + +Route14_Text_KiriNotEnoughMons:: @ 818642E + .string "KIRI: We can battle if you have\n" + .string "two POKéMON.$" + +Route14_Text_JanIntro:: @ 818645B + .string "JAN: KIRI, here we go!\n" + .string "We have to try hard!$" + +Route14_Text_JanDefeat:: @ 8186487 + .string "JAN: Eeeeh!\n" + .string "No fair!$" + +Route14_Text_JanPostBattle:: @ 818649C + .string "JAN: KIRI, don't cry!\n" + .string "We'll just try harder next time.$" + +Route14_Text_JanNotEnoughMons:: @ 81864D3 + .string "JAN: You want to battle?\n" + .string "You don't have enough POKéMON.$" |