summaryrefslogtreecommitdiff
path: root/data/scripts/mevent.inc
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-07 16:10:35 -0400
committerGitHub <noreply@github.com>2021-10-07 16:10:35 -0400
commita2655ba9ab82646a54f60abc6078df372179f8d4 (patch)
tree95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/scripts/mevent.inc
parente86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff)
parent001a25e49cd6acdac89a62f4230aef80422e78f2 (diff)
Merge branch 'master' into doc-union
Diffstat (limited to 'data/scripts/mevent.inc')
-rw-r--r--data/scripts/mevent.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc
index 731154315..b33a33270 100644
--- a/data/scripts/mevent.inc
+++ b/data/scripts/mevent.inc
@@ -1,4 +1,4 @@
-EventScript_Questionnaire:: @ 827381B
+EventScript_Questionnaire::
lockall
msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
compare VAR_RESULT, NO
@@ -18,7 +18,7 @@ EventScript_Questionnaire:: @ 827381B
goto_if_eq Mevent_EventScript_QuestionnaireThankYou
end
-Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
+Mevent_EventScript_PlayerInputMysteryEventPhrase::
goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
applymovement VAR_0x8008, Common_Movement_FaceDown
@@ -34,7 +34,7 @@ Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
releaseall
end
-Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
+Mevent_EventScript_PlayerInputMysteryGiftPhrase::
goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
applymovement VAR_0x8008, Common_Movement_FaceDown
@@ -50,11 +50,11 @@ Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
releaseall
end
-Mevent_EventScript_Release:: @ 82738FD
+Mevent_EventScript_Release::
releaseall
end
-Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF
+Mevent_EventScript_QuestionnaireThankYou::
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT