summaryrefslogtreecommitdiff
path: root/data/scripts/contest_hall.inc
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-05-23 10:51:26 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-05-23 10:51:26 -0400
commitc723d980e772f7e7ab82dbcb7ad07132c09ab5b4 (patch)
tree0bed002b2990b9e837220618a321f3b6517a1099 /data/scripts/contest_hall.inc
parentc50a21fba07db80ac44c6f09fd202ba4b2e2c7d3 (diff)
parentffbbc88801de3fc56d0bf5f0af1418ca7cfcfa4f (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data/scripts/contest_hall.inc')
-rw-r--r--data/scripts/contest_hall.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 1ef723c37..db43dfdd0 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -60,7 +60,7 @@ LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B
LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
message LilycoveCity_ContestLobby_Text_EnterContest1
waitmessage
- multichoice 0, 0, MULTI_ENTERINFO, 0
+ multichoice 0, 0, MULTI_ENTERINFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ChooseContestRank
case 1, LilycoveCity_ContestLobby_EventScript_ContestInfo
@@ -71,7 +71,7 @@ LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
message LilycoveCity_ContestLobby_Text_WhichTopic1
waitmessage
- multichoice 0, 0, MULTI_CONTEST_INFO, 0
+ multichoice 0, 0, MULTI_CONTEST_INFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ExplainContests
case 1, LilycoveCity_ContestLobby_EventScript_ExplainContestTypes
@@ -121,7 +121,7 @@ LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
message LilycoveCity_ContestLobby_Text_EnterWhichRank
waitmessage
- multichoice 0, 0, MULTI_CONTEST_RANK, 0
+ multichoice 0, 0, MULTI_CONTEST_RANK, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_EnterNormalRank
case 1, LilycoveCity_ContestLobby_EventScript_EnterSuperRank
@@ -156,7 +156,7 @@ LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6
LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
message LilycoveCity_ContestLobby_Text_EnterWhichContest1
waitmessage
- multichoice 0, 0, MULTI_CONTEST_TYPE, 0
+ multichoice 0, 0, MULTI_CONTEST_TYPE, FALSE
switch VAR_RESULT
case 5, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
@@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
- playbgm MUS_CONTEST_WINNER, 0
+ playbgm MUS_CONTEST_WINNER, FALSE
return
ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB