diff options
20 files changed, 160 insertions, 160 deletions
diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index 46f6de9af..f4adf6c36 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_Mart_EventScript_267ACC", + "script": "BattleFrontier_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_Mart_EventScript_267B0B", + "script": "BattleFrontier_Mart_EventScript_OldWoman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_Mart_EventScript_267B02", + "script": "BattleFrontier_Mart_EventScript_OldMan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_Mart_EventScript_267B20", + "script": "BattleFrontier_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 59ba707d8..e04a2e6d3 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -1,18 +1,18 @@ BattleFrontier_Mart_MapScripts:: @ 8267ACB .byte 0 -BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC +BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart BattleFrontier_Mart_Pokemart_267AE4 + pokemart BattleFrontier_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 +BattleFrontier_Mart_Pokemart: @ 8267AE4 .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_MAX_POTION @@ -30,35 +30,35 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 release end -BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 - msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC +BattleFrontier_Mart_EventScript_OldMan:: @ 8267B02 + msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC end -BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B +BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B lock applymovement 2, Common_Movement_FaceDown waitmovement 0 - msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT + msgbox BattleFrontier_Mart_Text_ProteinMakeNiceGift, MSGBOX_DEFAULT release end -BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 - msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC +BattleFrontier_Mart_EventScript_Boy:: @ 8267B20 + msgbox BattleFrontier_Mart_Text_FacilitiesDontAllowItems, MSGBOX_NPC end -BattleFrontier_Mart_Text_267B29: @ 8267B29 +BattleFrontier_Mart_Text_ChaperonGrandson: @ 8267B29 .string "We came here to chaperon our\n" .string "grandson.\p" .string "But since we're here, we thought\n" .string "we should get some souvenirs.$" -BattleFrontier_Mart_Text_267B8F: @ 8267B8F +BattleFrontier_Mart_Text_ProteinMakeNiceGift: @ 8267B8F .string "Dear, what do you think of this?\n" .string "Wouldn't this make a nice gift?\p" .string "It's…PRO…TE…IN?\n" .string "It sounds delicious, doesn't it?$" -BattleFrontier_Mart_Text_267C01: @ 8267C01 +BattleFrontier_Mart_Text_FacilitiesDontAllowItems: @ 8267C01 .string "A lot of the BATTLE FRONTIER's\n" .string "facilities don't allow the use of items\l" .string "during battles.\p" diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 60b0be26a..f58c0d9e2 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1FFCBF", + "script": "FallarborTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1FFCF4", + "script": "FallarborTown_Mart_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1FFCFD", + "script": "FallarborTown_Mart_EventScript_PokefanM", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1FFD06", + "script": "FallarborTown_Mart_EventScript_Skitty", "flag": "0" }, { diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index 3ae8dc9dd..bf106781a 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -1,18 +1,18 @@ FallarborTown_Mart_MapScripts:: @ 81FFCBE .byte 0 -FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF +FallarborTown_Mart_EventScript_Clerk:: @ 81FFCBF lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart FallarborTown_Mart_Pokemart_1FFCD8 + pokemart FallarborTown_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 +FallarborTown_Mart_Pokemart: @ 81FFCD8 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_ANTIDOTE @@ -29,25 +29,25 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 release end -FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4 - msgbox FallarborTown_Mart_Text_1FFD19, MSGBOX_NPC +FallarborTown_Mart_EventScript_Woman:: @ 81FFCF4 + msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC end -FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD - msgbox FallarborTown_Mart_Text_1FFE09, MSGBOX_NPC +FallarborTown_Mart_EventScript_PokefanM:: @ 81FFCFD + msgbox FallarborTown_Mart_Text_SellNuggetIFound, MSGBOX_NPC end -FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 +FallarborTown_Mart_EventScript_Skitty:: @ 81FFD06 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1FFDFA, MSGBOX_DEFAULT + msgbox FallarborTown_Mart_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -FallarborTown_Mart_Text_1FFD19: @ 81FFD19 +FallarborTown_Mart_Text_DecidingSkittyEvolve: @ 81FFD19 .string "I'm having a hard time deciding if I\n" .string "should make my SKITTY evolve or not.\p" .string "I only have to use this MOON STONE,\n" @@ -56,10 +56,10 @@ FallarborTown_Mart_Text_1FFD19: @ 81FFD19 .string "much stronger.\p" .string "But it will look so different, too.$" -FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA +FallarborTown_Mart_Text_Skitty: @ 81FFDFA .string "SKITTY: Miyao?$" -FallarborTown_Mart_Text_1FFE09: @ 81FFE09 +FallarborTown_Mart_Text_SellNuggetIFound: @ 81FFE09 .string "This NUGGET I found here…\n" .string "I suppose I'll have to sell it, seeing\l" .string "as how it has no other use.$" diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index c1bb6df86..a8bca3743 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_217666", + "script": "FortreeCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_217698", + "script": "FortreeCity_Mart_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_2176A1", + "script": "FortreeCity_Mart_EventScript_Girl", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_2176AA", + "script": "FortreeCity_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 30caaeff3..05318e7bd 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -1,18 +1,18 @@ FortreeCity_Mart_MapScripts:: @ 8217665 .byte 0 -FortreeCity_Mart_EventScript_217666:: @ 8217666 +FortreeCity_Mart_EventScript_Clerk:: @ 8217666 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart FortreeCity_Mart_Pokemart_217680 + pokemart FortreeCity_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -FortreeCity_Mart_Pokemart_217680: @ 8217680 +FortreeCity_Mart_Pokemart: @ 8217680 .2byte ITEM_GREAT_BALL .2byte ITEM_ULTRA_BALL .2byte ITEM_SUPER_POTION @@ -27,31 +27,31 @@ FortreeCity_Mart_Pokemart_217680: @ 8217680 release end -FortreeCity_Mart_EventScript_217698:: @ 8217698 - msgbox FortreeCity_Mart_Text_2176B3, MSGBOX_NPC +FortreeCity_Mart_EventScript_Woman:: @ 8217698 + msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC end -FortreeCity_Mart_EventScript_2176A1:: @ 82176A1 - msgbox FortreeCity_Mart_Text_217715, MSGBOX_NPC +FortreeCity_Mart_EventScript_Girl:: @ 82176A1 + msgbox FortreeCity_Mart_Text_StockUpOnItems, MSGBOX_NPC end -FortreeCity_Mart_EventScript_2176AA:: @ 82176AA - msgbox FortreeCity_Mart_Text_21778E, MSGBOX_NPC +FortreeCity_Mart_EventScript_Boy:: @ 82176AA + msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC end -FortreeCity_Mart_Text_2176B3: @ 82176B3 +FortreeCity_Mart_Text_SuperRepelBetter: @ 82176B3 .string "SUPER REPEL lasts a long time,\n" .string "and it gets the job done.\p" .string "It's much better than an ordinary\n" .string "REPEL.$" -FortreeCity_Mart_Text_217715: @ 8217715 +FortreeCity_Mart_Text_StockUpOnItems: @ 8217715 .string "I always stock up on more items than\n" .string "I'm sure I'll need.\p" .string "You never know what might happen.\n" .string "Better to be safe than sorry!$" -FortreeCity_Mart_Text_21778E: @ 821778E +FortreeCity_Mart_Text_RareCandyMakesMonGrow: @ 821778E .string "A RARE CANDY makes a POKéMON grow\n" .string "immediately by one level.$" diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 2f8d1278f..d55b562db 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Mart_EventScript_1FF9CE", + "script": "LavaridgeTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Mart_EventScript_1FF9FE", + "script": "LavaridgeTown_Mart_EventScript_ExpertM", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Mart_EventScript_1FFA07", + "script": "LavaridgeTown_Mart_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index d1d2ec4d2..b5b3cb6f1 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -1,18 +1,18 @@ LavaridgeTown_Mart_MapScripts:: @ 81FF9CD .byte 0 -LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE +LavaridgeTown_Mart_EventScript_Clerk:: @ 81FF9CE lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 + pokemart LavaridgeTown_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 +LavaridgeTown_Mart_Pokemart: @ 81FF9E8 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_ANTIDOTE @@ -26,21 +26,21 @@ LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 release end -LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE - msgbox LavaridgeTown_Mart_Text_1FFA10, MSGBOX_NPC +LavaridgeTown_Mart_EventScript_ExpertM:: @ 81FF9FE + msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC end -LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 - msgbox LavaridgeTown_Mart_Text_1FFA83, MSGBOX_NPC +LavaridgeTown_Mart_EventScript_OldWoman:: @ 81FFA07 + msgbox LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney, MSGBOX_NPC end -LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 +LavaridgeTown_Mart_Text_XSpeedFirstStrike: @ 81FFA10 .string "Use X SPEED to add to a POKéMON's\n" .string "SPEED in battle.\p" .string "That will help it get in the first\n" .string "strike--a decided advantage!$" -LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83 +LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney: @ 81FFA83 .string "On MT. CHIMNEY's peak, there's a local\n" .string "specialty that you can buy only there.\p" .string "Give it to a POKéMON--it will be elated.$" diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 598ed6e52..72e323bfe 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Mart_EventScript_2110E6", + "script": "MauvilleCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Mart_EventScript_21111C", + "script": "MauvilleCity_Mart_EventScript_ExpertM", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Mart_EventScript_211125", + "script": "MauvilleCity_Mart_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 25d52e015..b288d42b7 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -1,18 +1,18 @@ MauvilleCity_Mart_MapScripts:: @ 82110E5 .byte 0 -MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 +MauvilleCity_Mart_EventScript_Clerk:: @ 82110E6 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart MauvilleCity_Mart_Pokemart_211100 + pokemart MauvilleCity_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -MauvilleCity_Mart_Pokemart_211100: @ 8211100 +MauvilleCity_Mart_Pokemart: @ 8211100 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION @@ -29,15 +29,15 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100 release end -MauvilleCity_Mart_EventScript_21111C:: @ 821111C - msgbox MauvilleCity_Mart_Text_21112E, MSGBOX_NPC +MauvilleCity_Mart_EventScript_ExpertM:: @ 821111C + msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC end -MauvilleCity_Mart_EventScript_211125:: @ 8211125 - msgbox MauvilleCity_Mart_Text_2111D8, MSGBOX_NPC +MauvilleCity_Mart_EventScript_Man:: @ 8211125 + msgbox MauvilleCity_Mart_Text_DecisionsDetermineBattle, MSGBOX_NPC end -MauvilleCity_Mart_Text_21112E: @ 821112E +MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats: @ 821112E .string "There are items that temporarily\n" .string "elevate the stats of POKéMON.\p" .string "The ones I know you use in battle\n" @@ -45,7 +45,7 @@ MauvilleCity_Mart_Text_21112E: @ 821112E .string "I do believe that there are others\n" .string "like them.$" -MauvilleCity_Mart_Text_2111D8: @ 82111D8 +MauvilleCity_Mart_Text_DecisionsDetermineBattle: @ 82111D8 .string "Use a certain move, or use an item\n" .string "instead…\p" .string "The TRAINER's decisions determine how\n" diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index bd14a30c1..8be148fad 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_2223C8", + "script": "MossdeepCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_2223F6", + "script": "MossdeepCity_Mart_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_2223FF", + "script": "MossdeepCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_222408", + "script": "MossdeepCity_Mart_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index 1a555af48..c0d0ae311 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -1,18 +1,18 @@ MossdeepCity_Mart_MapScripts:: @ 82223C7 .byte 0 -MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 +MossdeepCity_Mart_EventScript_Clerk:: @ 82223C8 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart MossdeepCity_Mart_Pokemart_2223E0 + pokemart MossdeepCity_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 +MossdeepCity_Mart_Pokemart: @ 82223E0 .2byte ITEM_ULTRA_BALL .2byte ITEM_NET_BALL .2byte ITEM_DIVE_BALL @@ -26,31 +26,31 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 release end -MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6 - msgbox MossdeepCity_Mart_Text_222411, MSGBOX_NPC +MossdeepCity_Mart_EventScript_Woman:: @ 82223F6 + msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC end -MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF - msgbox MossdeepCity_Mart_Text_2224A0, MSGBOX_NPC +MossdeepCity_Mart_EventScript_Boy:: @ 82223FF + msgbox MossdeepCity_Mart_Text_MaxRepelLastsLongest, MSGBOX_NPC end -MossdeepCity_Mart_EventScript_222408:: @ 8222408 - msgbox MossdeepCity_Mart_Text_2224FA, MSGBOX_NPC +MossdeepCity_Mart_EventScript_Sailor:: @ 8222408 + msgbox MossdeepCity_Mart_Text_NetAndDiveBallsRare, MSGBOX_NPC end -MossdeepCity_Mart_Text_222411: @ 8222411 +MossdeepCity_Mart_Text_ReviveIsFantastic: @ 8222411 .string "REVIVE is fantastic!\p" .string "Give it to a fainted POKéMON,\n" .string "and the POKéMON will arise.\p" .string "But be careful, REVIVE doesn't restore\n" .string "the used-up PP of moves.$" -MossdeepCity_Mart_Text_2224A0: @ 82224A0 +MossdeepCity_Mart_Text_MaxRepelLastsLongest: @ 82224A0 .string "MAX REPEL keeps all weak POKéMON away.\p" .string "Out of all the REPEL sprays, it lasts\n" .string "the longest.$" -MossdeepCity_Mart_Text_2224FA: @ 82224FA +MossdeepCity_Mart_Text_NetAndDiveBallsRare: @ 82224FA .string "The NET and DIVE BALLS are rare POKé\n" .string "BALLS that are only made in MOSSDEEP.\p" .string "A NET BALL is effective against\n" diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index a2a5a846f..d56aa3095 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_214F06", + "script": "RustboroCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_214F7D", + "script": "RustboroCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_214F74", + "script": "RustboroCity_Mart_EventScript_PokefanF", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_214F86", + "script": "RustboroCity_Mart_EventScript_BugCatcher", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index 88a540356..063c5b64f 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -1,22 +1,22 @@ RustboroCity_Mart_MapScripts:: @ 8214F05 .byte 0 -RustboroCity_Mart_EventScript_214F06:: @ 8214F06 +RustboroCity_Mart_EventScript_Clerk:: @ 8214F06 lock faceplayer message gText_HowMayIServeYou waitmessage - goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21 - goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartBasic + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded end -RustboroCity_Mart_EventScript_214F21:: @ 8214F21 - pokemart RustboroCity_Mart_Pokemart_214F30 +RustboroCity_Mart_EventScript_PokemartBasic:: @ 8214F21 + pokemart RustboroCity_Mart_Pokemart_Basic msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -RustboroCity_Mart_Pokemart_214F30: @ 8214F30 +RustboroCity_Mart_Pokemart_Basic: @ 8214F30 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_SUPER_POTION @@ -31,14 +31,14 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30 release end -RustboroCity_Mart_EventScript_214F48:: @ 8214F48 - pokemart RustboroCity_Mart_Pokemart_214F58 +RustboroCity_Mart_EventScript_PokemartExpanded:: @ 8214F48 + pokemart RustboroCity_Mart_Pokemart_Expanded msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -RustboroCity_Mart_Pokemart_214F58: @ 8214F58 +RustboroCity_Mart_Pokemart_Expanded: @ 8214F58 .2byte ITEM_POKE_BALL .2byte ITEM_TIMER_BALL .2byte ITEM_REPEAT_BALL @@ -55,31 +55,31 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58 release end -RustboroCity_Mart_EventScript_214F74:: @ 8214F74 - msgbox RustboroCity_Mart_Text_214F8F, MSGBOX_NPC +RustboroCity_Mart_EventScript_PokefanF:: @ 8214F74 + msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC end -RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D - msgbox RustboroCity_Mart_Text_214FF1, MSGBOX_NPC +RustboroCity_Mart_EventScript_Boy:: @ 8214F7D + msgbox RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead, MSGBOX_NPC end -RustboroCity_Mart_EventScript_214F86:: @ 8214F86 - msgbox RustboroCity_Mart_Text_21505C, MSGBOX_NPC +RustboroCity_Mart_EventScript_BugCatcher:: @ 8214F86 + msgbox RustboroCity_Mart_Text_GettingEscapeRopeJustInCase, MSGBOX_NPC end -RustboroCity_Mart_Text_214F8F: @ 8214F8F +RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish: @ 8214F8F .string "I'm buying some PARLYZ HEALS and\n" .string "ANTIDOTES.\p" .string "Just in case I run into SHROOMISH\n" .string "in PETALBURG WOODS.$" -RustboroCity_Mart_Text_214FF1: @ 8214FF1 +RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead: @ 8214FF1 .string "My POKéMON evolved.\n" .string "It has a lot of HP now.\p" .string "I should buy SUPER POTIONS for it\n" .string "instead of ordinary POTIONS.$" -RustboroCity_Mart_Text_21505C: @ 821505C +RustboroCity_Mart_Text_GettingEscapeRopeJustInCase: @ 821505C .string "I'm getting an ESCAPE ROPE just in\n" .string "case I get lost in a cave.\p" .string "I just need to use it to get back to\n" diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 597abbf06..ca1c23717 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Mart_EventScript_20DC49", + "script": "SlateportCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Mart_EventScript_20DC76", + "script": "SlateportCity_Mart_EventScript_BlackBelt", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Mart_EventScript_20DC7F", + "script": "SlateportCity_Mart_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index 63042338b..a1c557ad2 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -1,17 +1,17 @@ SlateportCity_Mart_MapScripts:: @ 820DC48 .byte 0 -SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 +SlateportCity_Mart_EventScript_Clerk:: @ 820DC49 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart SlateportCity_Mart_Pokemart_20DC60 + pokemart SlateportCity_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 +SlateportCity_Mart_Pokemart: @ 820DC60 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_POTION @@ -25,21 +25,21 @@ SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 release end -SlateportCity_Mart_EventScript_20DC76:: @ 820DC76 - msgbox SlateportCity_Mart_Text_20DC88, MSGBOX_NPC +SlateportCity_Mart_EventScript_BlackBelt:: @ 820DC76 + msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC end -SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F - msgbox SlateportCity_Mart_Text_20DCF8, MSGBOX_NPC +SlateportCity_Mart_EventScript_Man:: @ 820DC7F + msgbox SlateportCity_Mart_Text_GreatBallIsBetter, MSGBOX_NPC end -SlateportCity_Mart_Text_20DC88: @ 820DC88 +SlateportCity_Mart_Text_SomeItemsOnlyAtMart: @ 820DC88 .string "The MARKET does have some interesting\n" .string "merchandise.\p" .string "But there are some items you can only\n" .string "get at a POKéMON MART.$" -SlateportCity_Mart_Text_20DCF8: @ 820DCF8 +SlateportCity_Mart_Text_GreatBallIsBetter: @ 820DCF8 .string "A GREAT BALL is better than a POKé BALL\n" .string "at catching POKéMON.\p" .string "With this, I should be able to get that\n" diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index e9b978013..9d8ef277d 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Mart_EventScript_226795", + "script": "SootopolisCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Mart_EventScript_2267C2", + "script": "SootopolisCity_Mart_EventScript_FatMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Mart_EventScript_2267EC", + "script": "SootopolisCity_Mart_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 0b477ce47..f7856916c 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -1,17 +1,17 @@ SootopolisCity_Mart_MapScripts:: @ 8226794 .byte 0 -SootopolisCity_Mart_EventScript_226795:: @ 8226795 +SootopolisCity_Mart_EventScript_Clerk:: @ 8226795 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart SootopolisCity_Mart_Pokemart_2267AC + pokemart SootopolisCity_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC +SootopolisCity_Mart_Pokemart: @ 82267AC .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_MAX_POTION @@ -25,54 +25,54 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC release end -SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 +SootopolisCity_Mart_EventScript_FatMan:: @ 82267C2 lock faceplayer compare VAR_SKY_PILLAR_STATE, 2 - goto_if_ge SootopolisCity_Mart_EventScript_2267E2 - goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2 - msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT + goto_if_ge SootopolisCity_Mart_EventScript_FatManNoLegendaries + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_FatManNoLegendaries + msgbox SootopolisCity_Mart_Text_TooScaryOutside, MSGBOX_DEFAULT release end -SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 - msgbox SootopolisCity_Mart_Text_226816, MSGBOX_DEFAULT +SootopolisCity_Mart_EventScript_FatManNoLegendaries:: @ 82267E2 + msgbox SootopolisCity_Mart_Text_PPUpIsGreat, MSGBOX_DEFAULT release end -SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC +SootopolisCity_Mart_EventScript_Gentleman:: @ 82267EC lock faceplayer compare VAR_SKY_PILLAR_STATE, 2 - goto_if_ge SootopolisCity_Mart_EventScript_22680C - goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C - msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT + goto_if_ge SootopolisCity_Mart_EventScript_GentlemanNoLegendaries + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_GentlemanNoLegendaries + msgbox SootopolisCity_Mart_Text_DidSomethingAwaken, MSGBOX_DEFAULT release end -SootopolisCity_Mart_EventScript_22680C:: @ 822680C - msgbox SootopolisCity_Mart_Text_2268AF, MSGBOX_DEFAULT +SootopolisCity_Mart_EventScript_GentlemanNoLegendaries:: @ 822680C + msgbox SootopolisCity_Mart_Text_FullRestoreItemOfDreams, MSGBOX_DEFAULT release end -SootopolisCity_Mart_Text_226816: @ 8226816 +SootopolisCity_Mart_Text_PPUpIsGreat: @ 8226816 .string "PP UP is great!\p" .string "It raises the POWER POINTS, the PP,\n" .string "of a POKéMON move.$" -SootopolisCity_Mart_Text_22685D: @ 822685D +SootopolisCity_Mart_Text_TooScaryOutside: @ 822685D .string "What…\n" .string "What is happening?\p" .string "I really want to know, but it's too\n" .string "scary to go outside.$" -SootopolisCity_Mart_Text_2268AF: @ 82268AF +SootopolisCity_Mart_Text_FullRestoreItemOfDreams: @ 82268AF .string "Do you know FULL RESTORE?\p" .string "Full restoration of HP!\n" .string "Eradication of all status problems!\p" .string "It's truly an item of your dreams!$" -SootopolisCity_Mart_Text_226928: @ 8226928 +SootopolisCity_Mart_Text_DidSomethingAwaken: @ 8226928 .string "This weather…\n" .string "Did something awaken?$" diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 4f9b8296e..702a70f3d 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_202587", + "script": "VerdanturfTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_2025BA", + "script": "VerdanturfTown_Mart_EventScript_Boy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_2025C3", + "script": "VerdanturfTown_Mart_EventScript_ExpertF", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_2025CC", + "script": "VerdanturfTown_Mart_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 2b3ccfc3a..cc4694fe1 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -1,18 +1,18 @@ VerdanturfTown_Mart_MapScripts:: @ 8202586 .byte 0 -VerdanturfTown_Mart_EventScript_202587:: @ 8202587 +VerdanturfTown_Mart_EventScript_Clerk:: @ 8202587 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart VerdanturfTown_Mart_Pokemart_2025A0 + pokemart VerdanturfTown_Mart_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 +VerdanturfTown_Mart_Pokemart: @ 82025A0 .2byte ITEM_GREAT_BALL .2byte ITEM_NEST_BALL .2byte ITEM_SUPER_POTION @@ -28,31 +28,31 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 release end -VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA - msgbox VerdanturfTown_Mart_Text_2025D5, MSGBOX_NPC +VerdanturfTown_Mart_EventScript_Boy:: @ 82025BA + msgbox VerdanturfTown_Mart_Text_XSpecialIsCrucial, MSGBOX_NPC end -VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3 - msgbox VerdanturfTown_Mart_Text_20264C, MSGBOX_NPC +VerdanturfTown_Mart_EventScript_ExpertF:: @ 82025C3 + msgbox VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent, MSGBOX_NPC end -VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC - msgbox VerdanturfTown_Mart_Text_2026C9, MSGBOX_NPC +VerdanturfTown_Mart_EventScript_Lass:: @ 82025CC + msgbox VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon, MSGBOX_NPC end -VerdanturfTown_Mart_Text_2025D5: @ 82025D5 +VerdanturfTown_Mart_Text_XSpecialIsCrucial: @ 82025D5 .string "For any POKéMON match, X SPECIAL\n" .string "is crucial.\p" .string "It jacks up the power of some moves\n" .string "even though it's only for one battle.$" -VerdanturfTown_Mart_Text_20264C: @ 820264C +VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent: @ 820264C .string "They don't seem to sell any winning\n" .string "strategy guides for the BATTLE TENT…\p" .string "It seems one must rely on one's\n" .string "own wits after all…$" -VerdanturfTown_Mart_Text_2026C9: @ 82026C9 +VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon: @ 82026C9 .string "The NEST BALL works better on\n" .string "weakened POKéMON.\p" .string "VERDANTURF is the only place you can\n" |