diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-28 22:46:39 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-12-05 21:11:17 -0600 |
| commit | 9b3d1cfab61fff89cae64c093f28775fdbad1027 (patch) | |
| tree | d446b1559526f144906cf4fc1a13ae3da07fea43 /data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc | |
| parent | be17c1602d31d6f7d6601f27f2808b79a5644f7f (diff) | |
Set up Battle Dome and Tower macros
Diffstat (limited to 'data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 6234fffb1..e65b6bd77 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -40,8 +40,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F - setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER - special CallBattleTowerFunc + tower_setopponent addobject 3 applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96 waitmovement 0 @@ -143,17 +142,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 special LoadPlayerParty warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattleArenaFunction + arena_get ARENA_DATA_WIN_STREAK compare VAR_RESULT, MAX_STREAK goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattleArenaFunction - + arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent waitmessage |