diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
| commit | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (patch) | |
| tree | 5b507a61b43ecfe02bf4b474b0857ac92e0992a8 /data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc | |
| parent | f559fa3fe26910056e84315370cb13ec8501af18 (diff) | |
| parent | 70d1f54ab96235b0e0d07d40526f16449e7cb1e7 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 5e41c7ddb..54a935b06 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -77,8 +77,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C - setvar VAR_0x8004, 5 - special CallBattlePalaceFunction + palace_getopponentintro lockall msgbox gStringVar4, MSGBOX_DEFAULT waitmessage |