summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc')
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index 48d2bcc3a..3d3f2faee 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -105,7 +105,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
- multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
+ multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle
@@ -114,7 +114,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8259CC6
- multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
+ multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
@@ -124,7 +124,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecor
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CFC
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle
waitmessage
- multichoicedefault 20, 8, MULTI_YESNO, 1, 0
+ multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle
@@ -144,7 +144,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge:: @ 8259
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 8259D66
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
waitmessage
- multichoicedefault 20, 8, MULTI_YESNO, 1, 0
+ multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
@@ -168,7 +168,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
fadescreen FADE_TO_BLACK
factory_swapmons
waitstate
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE @ Did player keep current pokemon
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
factory_setswapped
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
@@ -396,7 +396,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
- multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
+ multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle
@@ -405,7 +405,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord:: @ 825A110
- multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
+ multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge