diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/BattleFrontier_BattlePikeRandomRoom2 | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 4f0d4632b..83031af95 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -14,9 +14,9 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc lockall - msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, MSGBOX_DEFAULT closemessage releaseall warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 |