diff options
Diffstat (limited to 'data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 4090b6a49..f2251165c 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -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 @@ -146,7 +145,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeNoRecord + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge @@ -155,7 +154,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0 case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeNoRecord:: @ 8257768 +BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8257768 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge @@ -255,7 +254,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4 waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeGretaNoRecord + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta @@ -264,7 +263,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4 case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon -BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeGretaNoRecord:: @ 825792B +BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 825792B multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta |