diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-09-22 12:18:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-22 12:18:48 -0400 |
commit | a180d2af49250b9cf005ce1635e5e59c7e6848c4 (patch) | |
tree | a457673d0bbfe61da83b59a08b256dadaa4b4821 /data/scripts/pokeblocks.inc | |
parent | 58b8d7c297576846aeef4173bbe8a6a71608ad98 (diff) | |
parent | 9d4fc9234be10ccad76987e08512373bb097d8e0 (diff) |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'data/scripts/pokeblocks.inc')
-rw-r--r-- | data/scripts/pokeblocks.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 3269ec233..10ced77c4 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -714,12 +714,12 @@ LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED EventScript_PblocLink_DecideLeader: @ 82941F8 message Text_DecideLinkLeader waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, EventScript_PblocLink_TryJoinGroup case 1, EventScript_PblocLink_TryBecomeLeader case 2, EventScript_PblocLink_CloseLink - case 127, EventScript_PblocLink_CloseLink + case MULTI_B_PRESSED, EventScript_PblocLink_CloseLink end EventScript_PblocLink_TryBecomeLeader: @ 8294235 |