summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_Mart
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-03 12:53:51 -0500
committerhuderlem <huderlem@gmail.com>2019-11-04 16:42:28 -0600
commit290df23130dcdee1b33922799c180d9d6100cf8b (patch)
treee4f00c2c780364e120bdff337727485b97f27dd9 /data/maps/BattleFrontier_Mart
parent878eb523d7bc773b6efda729dac3626b85084507 (diff)
Document remaining poke marts
Diffstat (limited to 'data/maps/BattleFrontier_Mart')
-rw-r--r--data/maps/BattleFrontier_Mart/map.json8
-rw-r--r--data/maps/BattleFrontier_Mart/scripts.inc24
2 files changed, 16 insertions, 16 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"