summaryrefslogtreecommitdiff
path: root/data/maps/FallarborTown_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/FallarborTown_Mart
parent878eb523d7bc773b6efda729dac3626b85084507 (diff)
Document remaining poke marts
Diffstat (limited to 'data/maps/FallarborTown_Mart')
-rw-r--r--data/maps/FallarborTown_Mart/map.json8
-rw-r--r--data/maps/FallarborTown_Mart/scripts.inc24
2 files changed, 16 insertions, 16 deletions
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.$"