diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 22:42:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 22:42:43 -0500 |
| commit | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (patch) | |
| tree | a619369a0d8b263f82d660ad7800f4b42328bb07 /data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | |
| parent | 635267ce32bd696fe15391449efdf07fa35cf449 (diff) | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerLobby/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 132c1615a..843cacef4 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B .byte 0 BattleFrontier_BattleTowerLobby_OnResume: @ 823E690 - special sub_81653CC + special TryHideBattleTowerReporter end BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694 @@ -857,7 +857,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF waitstate playse SE_SAVE waitse - special sub_80B3BC4 + special TrySetBattleTowerLinkType goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end |