summaryrefslogtreecommitdiff
path: root/data/maps/DesertUnderpass
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-06 14:06:06 -0500
committerhuderlem <huderlem@gmail.com>2019-11-06 17:01:23 -0600
commitfbc3eee1f2a432d497e1213aef3b6b7b369ec871 (patch)
treeb3bef776f565321e377c3bdcd520c5318eb6eda9 /data/maps/DesertUnderpass
parent7d5d12877ef14d693602f0dec543b4c262677808 (diff)
Document Fossil Maniac and Berry Master route houses
Diffstat (limited to 'data/maps/DesertUnderpass')
-rw-r--r--data/maps/DesertUnderpass/map.json2
-rw-r--r--data/maps/DesertUnderpass/scripts.inc16
2 files changed, 10 insertions, 8 deletions
diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json
index ca4b894d4..a3a80d41e 100644
--- a/data/maps/DesertUnderpass/map.json
+++ b/data/maps/DesertUnderpass/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "DesertUnderpass_EventScript_23AF41",
+ "script": "DesertUnderpass_EventScript_Fossil",
"flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL"
}
],
diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc
index 8e89075e5..437f5de4b 100644
--- a/data/maps/DesertUnderpass/scripts.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
@@ -6,29 +6,31 @@ DesertUnderpass_OnTransition: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS
end
-DesertUnderpass_EventScript_23AF41:: @ 823AF41
+DesertUnderpass_EventScript_Fossil:: @ 823AF41
lock
faceplayer
- goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57
- goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68
+ goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil
+ goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_GiveRootFossil
release
end
-DesertUnderpass_EventScript_23AF57:: @ 823AF57
+DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57
giveitem_std ITEM_CLAW_FOSSIL
removeobject 1
release
end
-DesertUnderpass_EventScript_23AF68:: @ 823AF68
+DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68
giveitem_std ITEM_ROOT_FOSSIL
removeobject 1
release
end
-DesertUnderpass_Text_23AF79:: @ 823AF79
+@ Unused
+DesertUnderpass_Text_FoundRootFossil:: @ 823AF79
.string "{PLAYER} found the ROOT FOSSIL.$"
-DesertUnderpass_Text_23AF93:: @ 823AF93
+@ Unused
+DesertUnderpass_Text_FoundClawFossil:: @ 823AF93
.string "{PLAYER} found the CLAW FOSSIL.$"