diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
| commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
| tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /data/maps/BattleFrontier_BattlePikeThreePathRoom | |
| parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
| parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index a9da7a092..46edebce6 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_HINT_GIVER, 2 + BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnFrame @@ -159,12 +161,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint:: @ 825CA91 end BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97 - applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer + applymovement LOCALID_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer waitmovement 0 lockall msgbox BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent, MSGBOX_DEFAULT releaseall - applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos + applymovement LOCALID_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos waitmovement 0 setvar VAR_TEMP_5, 255 end |