diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
| commit | 7b8b5b5c8c02156d7cdaa76212ad68f01b1600c9 (patch) | |
| tree | 32b1c3ce14f272708fdc4b5b944a8dc9c14d07e3 /data/scripts/pokeblocks.inc | |
| parent | 27aae9da9a570b6787171e33fa29c43c507187c1 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into gflib
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 a26ecb4c9..7b3932341 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 |