Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-06 02:34:54 -05:00
committed by GitHub
106 changed files with 1965 additions and 1418 deletions

View File

@@ -52,8 +52,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 7
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
waitmovement 0