diff options
Diffstat (limited to 'data/maps/Route1')
| -rw-r--r-- | data/maps/Route1/map.json | 6 | ||||
| -rw-r--r-- | data/maps/Route1/scripts.inc | 20 | ||||
| -rw-r--r-- | data/maps/Route1/text.inc | 10 |
3 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 8d636de9a..1a2426066 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route1_EventScript_167EFE", + "script": "Route1_EventScript_MartClerk", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route1_EventScript_167F52", + "script": "Route1_EventScript_Boy", "flag": "0" } ], @@ -59,7 +59,7 @@ "x": 9, "y": 31, "elevation": 0, - "script": "Route1_EventScript_167F5B" + "script": "Route1_EventScript_RouteSign" } ] } diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 8d5617e3f..36a42f65e 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -1,11 +1,11 @@ Route1_MapScripts:: @ 8167EFD .byte 0 -Route1_EventScript_167EFE:: @ 8167EFE +Route1_EventScript_MartClerk:: @ 8167EFE lock faceplayer - goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48 - msgbox gUnknown_818329D + goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion + msgbox Route1_Text_WorkAtPokeMartTakeSample textcolor 3 checkitemspace ITEM_POTION, 1 compare VAR_RESULT, FALSE @@ -16,21 +16,21 @@ Route1_EventScript_167EFE:: @ 8167EFE waitmessage waitfanfare additem ITEM_POTION - msgbox gUnknown_8183387 + msgbox Route1_Text_PutPotionAway call EventScript_1A6675 setflag FLAG_GOT_POTION_ON_ROUTE_1 release end -EventScript_167F48:: @ 8167F48 - msgbox gUnknown_8183347 +Route1_EventScript_AlreadyGotPotion:: @ 8167F48 + msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls release end -Route1_EventScript_167F52:: @ 8167F52 - msgbox gUnknown_81833B9, MSGBOX_NPC +Route1_EventScript_Boy:: @ 8167F52 + msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC end -Route1_EventScript_167F5B:: @ 8167F5B - msgbox gUnknown_818343A, MSGBOX_SIGN +Route1_EventScript_RouteSign:: @ 8167F5B + msgbox Route1_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route1/text.inc b/data/maps/Route1/text.inc index 7b4150b03..57ebecb86 100644 --- a/data/maps/Route1/text.inc +++ b/data/maps/Route1/text.inc @@ -1,4 +1,4 @@ -gUnknown_818329D:: @ 818329D +Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D .string "Hi!\n" .string "I work at a POKéMON MART.\p" .string "It's part of a convenient chain\n" @@ -7,22 +7,22 @@ gUnknown_818329D:: @ 818329D .string "I know, I'll give you a sample.\n" .string "Here you go!$" -gUnknown_8183347:: @ 8183347 +Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347 .string "Please come see us if you need\n" .string "POKé BALLS for catching POKéMON.$" -gUnknown_8183387:: @ 8183387 +Route1_Text_PutPotionAway:: @ 8183387 .string "{PLAYER} put the POTION away in\n" .string "the BAG's ITEMS POCKET.$" -gUnknown_81833B9:: @ 81833B9 +Route1_Text_CanJumpFromLedges:: @ 81833B9 .string "See those ledges along the road?\p" .string "It's a bit scary, but you can jump\n" .string "from them.\p" .string "You can get back to PALLET TOWN\n" .string "quicker that way.$" -gUnknown_818343A:: @ 818343A +Route1_Text_RouteSign:: @ 818343A .string "ROUTE 1\n" .string "PALLET TOWN - VIRIDIAN CITY$" |