diff options
Diffstat (limited to 'data/maps/ThreeIsland_Mart')
| -rw-r--r-- | data/maps/ThreeIsland_Mart/map.json | 8 | ||||
| -rw-r--r-- | data/maps/ThreeIsland_Mart/scripts.inc | 18 | ||||
| -rw-r--r-- | data/maps/ThreeIsland_Mart/text.inc | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 84c4d70c5..d46aaa0f0 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_17188D", + "script": "ThreeIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718C4", + "script": "ThreeIsland_Mart_EventScript_Picnicker", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718CD", + "script": "ThreeIsland_Mart_EventScript_BugCatcher", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718D6", + "script": "ThreeIsland_Mart_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 02afb8eb4..337bb2709 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ ThreeIsland_Mart_MapScripts:: @ 817188C .byte 0 -ThreeIsland_Mart_EventScript_17188D:: @ 817188D +ThreeIsland_Mart_EventScript_Clerk:: @ 817188D goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_1718B4 + pokemart ThreeIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_1718B4:: @ 81718B4 +ThreeIsland_Mart_Items:: @ 81718B4 .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE @@ -24,14 +24,14 @@ Items_1718B4:: @ 81718B4 release end -ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - msgbox gUnknown_81A3114, MSGBOX_NPC +ThreeIsland_Mart_EventScript_Picnicker:: @ 81718C4 + msgbox ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - msgbox gUnknown_81A315C, MSGBOX_NPC +ThreeIsland_Mart_EventScript_BugCatcher:: @ 81718CD + msgbox ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - msgbox gUnknown_81A31F0, MSGBOX_NPC +ThreeIsland_Mart_EventScript_Youngster:: @ 81718D6 + msgbox ThreeIsland_Mart_Text_BikersWereAboutToTrashMart, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Mart/text.inc b/data/maps/ThreeIsland_Mart/text.inc index 2618bf28e..8123f1e9c 100644 --- a/data/maps/ThreeIsland_Mart/text.inc +++ b/data/maps/ThreeIsland_Mart/text.inc @@ -1,16 +1,16 @@ -gUnknown_81A3114:: @ 81A3114 +ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger:: @ 81A3114 .string "Is it true?\p" .string "CELADON DEPT. STORE is several\n" .string "times bigger than this shop?$" -gUnknown_81A315C:: @ 81A315C +ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest:: @ 81A315C .string "I sometimes buy medicine here.\p" .string "But a lot of people heal POKéMON\n" .string "with BERRIES from BERRY FOREST.\p" .string "After all, BERRIES are free and\n" .string "they never run out.$" -gUnknown_81A31F0:: @ 81A31F0 +ThreeIsland_Mart_Text_BikersWereAboutToTrashMart:: @ 81A31F0 .string "Those BIKERS were about to trash\n" .string "this POKéMON MART.\p" .string "Am I glad they decided to leave!$" |