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