diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /data/scripts/maps/BattleTower_Outside.inc | |
parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'data/scripts/maps/BattleTower_Outside.inc')
-rw-r--r-- | data/scripts/maps/BattleTower_Outside.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index e0aba0b9c..3992ffd2c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -4,7 +4,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 BattleTower_Outside_MapScript1_16015C:: @ 816015C setflag FLAG_LANDMARK_BATTLE_TOWER - setvar 0x40bc, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar 0x8004, 4 + setvar VAR_SPECIAL_4, 4 call BattleTower_Outside_EventScript_1A047C return |