diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /data/maps/FieryPath | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'data/maps/FieryPath')
| -rw-r--r-- | data/maps/FieryPath/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index ca259993e..c9dd7aed0 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -1,13 +1,13 @@ -FieryPath_MapScripts:: @ 8230F24 +FieryPath_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition .byte 0 -FieryPath_OnTransition: @ 8230F2A +FieryPath_OnTransition: call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor setflag FLAG_LANDMARK_FIERY_PATH end -FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37 +FieryPath_EventScript_MoveScottToFallarbor:: setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT return |