dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-inc

Browse Source
This commit is contained in:
GriffinR
2019-10-13 15:26:44 -04:00
committed by GitHub
parent 2368f57669 e47b3efdfe
commit a081124a20
118 changed files with 7369 additions and 7975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1750
data/scripts/cable_club.inc
View File

File diff suppressed because it is too large Load Diff

10
data/scripts/pokeblocks.inc
View File

@@ -667,13 +667,13 @@ EventScript_PblocLink_NoPokeblock: @ 829416C
EventScript_PblocLink_SomeoneNotReady: @ 8294176
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT
msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_DifferentSelections: @ 8294183
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
releaseall
end
@@ -685,7 +685,7 @@ EventScript_PblocLink_CloseLink: @ 8294190
EventScript_PblocLink_LinkError: @ 829419D
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
releaseall
end
@@ -745,12 +745,12 @@ EventScript_PblocLink_TryJoinGroup: @ 829425D
end
EventScript_PblocLink_BecomeLeader: @ 8294285
special BerryBlenderLinkBecomeLeader
special TryBecomeLinkLeader
waitstate
return
EventScript_PblocLink_JoinGroup: @ 829428A
special BerryBlenderLinkJoinGroup
special TryJoinLinkGroup
waitstate
return