summaryrefslogtreecommitdiff
path: root/data/scripts/pokeblocks.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/pokeblocks.inc')
-rw-r--r--data/scripts/pokeblocks.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 7b3932341..c223bc1c7 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -252,7 +252,7 @@ EventScript_Pblock1_Ask:: @ 8293C3E
applymovement 16, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
msgbox Text_Pblock1_Ask, MSGBOX_YESNO
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq EventScript_Pblock1_Yes
goto EventScript_Pblock1_No
end
@@ -283,7 +283,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
EventScript_Pblock1_KnowHow: @ 8293CB9
msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq EventScript_Pblock1_Start
goto EventScript_Pblock1_Explain
end
@@ -337,7 +337,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
applymovement 3, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6
goto LilycoveCity_ContestLobby_EventScript_293D7D
end
@@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87
LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91
msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA
goto LilycoveCity_ContestLobby_EventScript_293DB8
end
@@ -403,7 +403,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3
goto LilycoveCity_ContestLobby_EventScript_293E5A
end
@@ -420,7 +420,7 @@ LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64
LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E
msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87
goto LilycoveCity_ContestLobby_EventScript_293E95
end
@@ -667,25 +667,25 @@ 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
EventScript_PblocLink_CloseLink: @ 8294190
special CloseLink
- msgbox gUnknown_08272D9C, MSGBOX_DEFAULT
+ msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
releaseall
end
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