summaryrefslogtreecommitdiff
path: root/data/maps/FieryPath/scripts.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
committerMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
commit5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch)
tree6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/FieryPath/scripts.inc
parent5007d279fea5326b41b877703c74fcaa56223364 (diff)
parent22931846d680de2bc585093678db3f5721aab891 (diff)
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/FieryPath/scripts.inc')
-rw-r--r--data/maps/FieryPath/scripts.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index 0aa5769a0..ca259993e 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -3,12 +3,12 @@ FieryPath_MapScripts:: @ 8230F24
.byte 0
FieryPath_OnTransition: @ 8230F2A
- call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
+ call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor
setflag FLAG_LANDMARK_FIERY_PATH
end
-FieryPath_EventScript_230F37:: @ 8230F37
+FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
- clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+ clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
return