summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc6
-rw-r--r--data/scripts/gift_altering_cave.inc (renamed from data/scripts/mevent_altering_cave.inc)8
-rw-r--r--data/scripts/gift_aurora_ticket.inc (renamed from data/scripts/mevent_aurora_ticket.inc)4
-rw-r--r--data/scripts/gift_battle_card.inc (renamed from data/scripts/mevent_battle_card.inc)14
-rw-r--r--data/scripts/gift_mystic_ticket.inc (renamed from data/scripts/mevent_mystic_ticket.inc)4
-rw-r--r--data/scripts/gift_old_sea_map.inc (renamed from data/scripts/mevent_old_sea_map.inc)4
-rw-r--r--data/scripts/gift_pichu.inc (renamed from data/scripts/mevent_pichu.inc)26
-rw-r--r--data/scripts/gift_stamp_card.inc (renamed from data/scripts/mevent_stamp_card.inc)8
-rw-r--r--data/scripts/gift_trainer.inc (renamed from data/scripts/mevent_trainer.inc)8
-rw-r--r--data/scripts/mauville_man.inc53
-rw-r--r--data/scripts/mevent.inc62
-rw-r--r--data/scripts/questionnaire.inc62
12 files changed, 130 insertions, 129 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 5cecb60d8..ab7642899 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -6,7 +6,7 @@ CableClub_EventScript_HideOrShowMysteryGiftMan::
specialvar VAR_RESULT, ShouldDistributeEonTicket
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_ShowMysteryGiftMan
- specialvar VAR_RESULT, ValidateReceivedWonderCard
+ specialvar VAR_RESULT, ValidateSavedWonderCard
compare VAR_RESULT, FALSE
goto_if_eq CableClub_EventScript_HideMysteryGiftMan
goto CableClub_EventScript_ShowMysteryGiftMan
@@ -40,11 +40,11 @@ CableClub_EventScript_DistributeEonTicket::
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_AlreadyGotEonTicket
goto_if_set FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, CableClub_EventScript_AlreadyGotEonTicket
- msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT
+ msgbox MysteryGift_Text_TheresATicketForYou, MSGBOX_DEFAULT
giveitem ITEM_EON_TICKET
setflag FLAG_ENABLE_SHIP_SOUTHERN_ISLAND
setvar VAR_DISTRIBUTE_EON_TICKET, 0
- msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT
+ msgbox MysteryGift_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT
release
end
diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/gift_altering_cave.inc
index 7e9b0a758..8761b5fa4 100644
--- a/data/scripts/mevent_altering_cave.inc
+++ b/data/scripts/gift_altering_cave.inc
@@ -1,10 +1,10 @@
-MysteryEventScript_AlteringCave::
- setvaddress MysteryEventScript_AlteringCave
+MysteryGiftScript_AlteringCave::
+ setvaddress MysteryGiftScript_AlteringCave
addvar VAR_ALTERING_CAVE_WILD_SET, 1
compare VAR_ALTERING_CAVE_WILD_SET, 10
- vgoto_if_ne MysteryEventScript_AlteringCave_
+ vgoto_if_ne MysteryGiftScript_AlteringCave_
setvar VAR_ALTERING_CAVE_WILD_SET, 0
-MysteryEventScript_AlteringCave_:
+MysteryGiftScript_AlteringCave_:
lock
faceplayer
vmessage sText_MysteryGiftAlteringCave
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/gift_aurora_ticket.inc
index 9d7334638..c9250b9f9 100644
--- a/data/scripts/mevent_aurora_ticket.inc
+++ b/data/scripts/gift_aurora_ticket.inc
@@ -1,5 +1,5 @@
-MysteryEventScript_AuroraTicket::
- setvaddress MysteryEventScript_AuroraTicket
+MysteryGiftScript_AuroraTicket::
+ setvaddress MysteryGiftScript_AuroraTicket
lock
faceplayer
vgoto_if_set FLAG_RECEIVED_AURORA_TICKET, AuroraTicket_Obtained
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/gift_battle_card.inc
index 3a66297e1..80b4ba26e 100644
--- a/data/scripts/mevent_battle_card.inc
+++ b/data/scripts/gift_battle_card.inc
@@ -1,10 +1,10 @@
-MysteryEventScript_BattleCard::
- setvaddress MysteryEventScript_BattleCard
- vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo
+MysteryGiftScript_BattleCard::
+ setvaddress MysteryGiftScript_BattleCard
+ vgoto_if_set FLAG_MYSTERY_GIFT_DONE, MysteryGiftScript_BattleCardInfo
setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
- specialvar VAR_0x8008, GetMysteryEventCardVal
+ specialvar VAR_0x8008, GetMysteryGiftCardStat
compare VAR_0x8008, REQUIRED_CARD_BATTLES
- vgoto_if_ne MysteryEventScript_BattleCardInfo
+ vgoto_if_ne MysteryGiftScript_BattleCardInfo
lock
faceplayer
vmessage sText_MysteryGiftBattleCountCard_WonPrize
@@ -12,10 +12,10 @@ MysteryEventScript_BattleCard::
waitbuttonpress
giveitem ITEM_POTION
release
- setflag FLAG_MYSTERY_EVENT_DONE
+ setflag FLAG_MYSTERY_GIFT_DONE
end
-MysteryEventScript_BattleCardInfo:
+MysteryGiftScript_BattleCardInfo:
lock
faceplayer
vmessage sText_MysteryGiftBattleCountCard
diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/gift_mystic_ticket.inc
index e085c5a59..29c325f72 100644
--- a/data/scripts/mevent_mystic_ticket.inc
+++ b/data/scripts/gift_mystic_ticket.inc
@@ -1,5 +1,5 @@
-MysteryEventScript_MysticTicket::
- setvaddress MysteryEventScript_MysticTicket
+MysteryGiftScript_MysticTicket::
+ setvaddress MysteryGiftScript_MysticTicket
lock
faceplayer
vgoto_if_set FLAG_RECEIVED_MYSTIC_TICKET, MysticTicket_Obtained
diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/gift_old_sea_map.inc
index 68714117b..5e47a10df 100644
--- a/data/scripts/mevent_old_sea_map.inc
+++ b/data/scripts/gift_old_sea_map.inc
@@ -1,5 +1,5 @@
-MysteryEventScript_OldSeaMap::
- setvaddress MysteryEventScript_OldSeaMap
+MysteryGiftScript_OldSeaMap::
+ setvaddress MysteryGiftScript_OldSeaMap
lock
faceplayer
vgoto_if_set FLAG_RECEIVED_OLD_SEA_MAP, OldSeaMap_Obtained
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/gift_pichu.inc
index 02b47b41f..e62fc4536 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/gift_pichu.inc
@@ -1,13 +1,13 @@
-MysteryEventScript_SurfPichu::
- setvaddress MysteryEventScript_SurfPichu
- vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible
+MysteryGiftScript_SurfPichu::
+ setvaddress MysteryGiftScript_SurfPichu
+ vgoto_if_unset FLAG_MYSTERY_GIFT_DONE, SurfPichu_GiveIfPossible
returnram
SurfPichu_GiveIfPossible:
- specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
- compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE
+ specialvar VAR_GIFT_PICHU_SLOT, CalculatePlayerPartyCount
+ compare VAR_GIFT_PICHU_SLOT, PARTY_SIZE
vgoto_if_eq SurfPichu_FullParty
- setflag FLAG_MYSTERY_EVENT_DONE
+ setflag FLAG_MYSTERY_GIFT_DONE
vcall SurfPichu_GiveEgg
lock
faceplayer
@@ -30,17 +30,17 @@ SurfPichu_FullParty:
SurfPichu_GiveEgg:
giveegg SPECIES_PICHU
- setmoneventlegal VAR_EVENT_PICHU_SLOT
- setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
- compare VAR_EVENT_PICHU_SLOT, 1
+ setmoneventlegal VAR_GIFT_PICHU_SLOT
+ setmonmetlocation VAR_GIFT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
+ compare VAR_GIFT_PICHU_SLOT, 1
vgoto_if_eq SurfPichu_Slot1
- compare VAR_EVENT_PICHU_SLOT, 2
+ compare VAR_GIFT_PICHU_SLOT, 2
vgoto_if_eq SurfPichu_Slot2
- compare VAR_EVENT_PICHU_SLOT, 3
+ compare VAR_GIFT_PICHU_SLOT, 3
vgoto_if_eq SurfPichu_Slot3
- compare VAR_EVENT_PICHU_SLOT, 4
+ compare VAR_GIFT_PICHU_SLOT, 4
vgoto_if_eq SurfPichu_Slot4
- compare VAR_EVENT_PICHU_SLOT, 5
+ compare VAR_GIFT_PICHU_SLOT, 5
vgoto_if_eq SurfPichu_Slot5
return
diff --git a/data/scripts/mevent_stamp_card.inc b/data/scripts/gift_stamp_card.inc
index eeb361854..f6e1eb7c7 100644
--- a/data/scripts/mevent_stamp_card.inc
+++ b/data/scripts/gift_stamp_card.inc
@@ -1,9 +1,9 @@
-MysteryEventScript_StampCard::
- setvaddress MysteryEventScript_StampCard
+MysteryGiftScript_StampCard::
+ setvaddress MysteryGiftScript_StampCard
setorcopyvar VAR_RESULT, GET_MAX_STAMPS
- specialvar VAR_0x8008, GetMysteryEventCardVal
+ specialvar VAR_0x8008, GetMysteryGiftCardStat
setorcopyvar VAR_RESULT, GET_NUM_STAMPS
- specialvar VAR_0x8009, GetMysteryEventCardVal
+ specialvar VAR_0x8009, GetMysteryGiftCardStat
subvar VAR_0x8008, VAR_0x8009
buffernumberstring 0, VAR_0x8008
lock
diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/gift_trainer.inc
index f4318408d..2dbc86d53 100644
--- a/data/scripts/mevent_trainer.inc
+++ b/data/scripts/gift_trainer.inc
@@ -1,8 +1,8 @@
-MysteryEventScript_VisitingTrainer::
- setvaddress MysteryEventScript_VisitingTrainer
+MysteryGiftScript_VisitingTrainer::
+ setvaddress MysteryGiftScript_VisitingTrainer
special ValidateEReaderTrainer
compare VAR_RESULT, 0
- vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
+ vgoto_if_eq MysteryGiftScript_VisitingTrainerArrived
lock
faceplayer
vmessage sText_MysteryGiftVisitingTrainerInstructions
@@ -11,7 +11,7 @@ MysteryEventScript_VisitingTrainer::
release
end
-MysteryEventScript_VisitingTrainerArrived:
+MysteryGiftScript_VisitingTrainerArrived:
lock
faceplayer
vmessage sText_MysteryGiftVisitingTrainerArrived
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index a9c008e5e..b34f84e8e 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan::
- special ScrSpecial_GetCurrentMauvilleMan
+ special Script_GetCurrentMauvilleMan
switch VAR_RESULT
case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard
case MAUVILLE_MAN_HIPSTER, MauvilleCity_PokemonCenter_1F_EventScript_Hipster
@@ -21,9 +21,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard::
MauvilleCity_PokemonCenter_1F_EventScript_PlaySong::
setvar VAR_0x8004, 0
- special ScrSpecial_PlayBardSong
+ special PlayBardSong
delay 60
- special ScrSpecial_HasBardSongBeenChanged
+ special HasBardSongBeenChanged
compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers, MSGBOX_DEFAULT
@@ -52,12 +52,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics::
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT
setvar VAR_0x8004, 1
- special ScrSpecial_PlayBardSong
+ special PlayBardSong
delay 60
msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
- special ScrSpecial_SaveBardSongLyrics
+ special SaveBardSongLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT
release
end
@@ -73,7 +73,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
faceplayer
setflag FLAG_SYS_HIPSTER_MEET
msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT
- special ScrSpecial_GetHipsterSpokenFlag
+ special GetHipsterSpokenFlag
compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord
msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT
@@ -81,7 +81,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
end
MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
- special ScrSpecial_HipsterTeachWord
+ special HipsterTryTeachWord
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord
msgbox MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach, MSGBOX_DEFAULT
@@ -90,7 +90,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
MauvilleCity_PokemonCenter_1F_EventScript_TeachWord::
msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT
- special ScrSpecial_SetHipsterSpokenFlag
+ special SetHipsterSpokenFlag
release
end
@@ -160,7 +160,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Trader::
msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade
- special ScrSpecial_GetTraderTradedFlag
+ special GetTraderTradedFlag
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded
message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem
@@ -179,7 +179,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded::
end
MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive::
- special ScrSpecial_TraderMenuGetDecoration
+ special TraderMenuGetDecoration
waitstate
compare VAR_0x8004, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor
@@ -188,7 +188,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive::
msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor
- special ScrSpecial_DoesPlayerHaveNoDecorations
+ special DoesPlayerHaveNoDecorations
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor
goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
@@ -218,19 +218,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor::
MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive::
msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT
- special ScrSpecial_TraderMenuGiveDecoration
+ special TraderShowDecorationMenu
waitstate
compare VAR_0x8006, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor
compare VAR_0x8006, 0xFFFF
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse
- special ScrSpecial_IsDecorationFull
+ special IsDecorationCategoryFull
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor
msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
- special ScrSpecial_TraderDoDecorationTrade
+ special TraderDoDecorationTrade
msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT
release
end
@@ -818,20 +818,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_Storyteller::
msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
- specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+ specialvar VAR_RESULT, StorytellerGetFreeStorySlot
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales
message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell
waitmessage
- special ScrSpecial_StorytellerStoryListMenu
+ special StorytellerStoryListMenu
waitstate
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection
setvar VAR_0x8008, 1
- special ScrSpecial_StorytellerDisplayStory
+ special Script_StorytellerDisplayStory
waitmessage
waitbuttonpress
- specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat
+ specialvar VAR_RESULT, StorytellerUpdateStat
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales
goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
@@ -842,7 +842,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection::
MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales::
msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT
- specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
+ specialvar VAR_RESULT, HasStorytellerAlreadyRecorded
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd
goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales
@@ -853,7 +853,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales::
msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
- specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
+ specialvar VAR_RESULT, Script_StorytellerInitializeRandomStat
compare VAR_RESULT, 1
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
msgbox MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend, MSGBOX_DEFAULT
@@ -909,7 +909,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Giddy::
end
MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale::
- special ScrSpecial_GiddyShouldTellAnotherTale
+ special GiddyShouldTellAnotherTale
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
compare VAR_RESULT, FALSE
@@ -917,7 +917,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale::
end
MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale::
- special ScrSpecial_GiddyShouldTellAnotherTale
+ special GiddyShouldTellAnotherTale
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale
compare VAR_RESULT, FALSE
@@ -929,15 +929,16 @@ MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale::
goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
end
-@ Regardless of whether yes or no is selected below, Giddy will continue to tell stories until he's told 10
+@ Giddy will continue to tell stories regardless of whether yes or no is selected below.
+@ Each story there is a 10% chance it will be his last. Otherwise he will stop at 10 stories.
MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale::
- special ScrSpecial_GenerateGiddyLine
+ special GenerateGiddyLine
special ShowFieldMessageStringVar4
waitmessage
yesnobox 20, 8
- compare VAR_RESULT, 1
+ compare VAR_RESULT, YES
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
- compare VAR_RESULT, 0
+ compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
end
diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc
deleted file mode 100644
index b33a33270..000000000
--- a/data/scripts/mevent.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-EventScript_Questionnaire::
- lockall
- msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq Mevent_EventScript_Release
- setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
- call Common_ShowEasyChatScreen
- lock
- faceplayer
- specialvar VAR_0x8008, GetMartEmployeeObjectEventId
- compare VAR_0x8004, 1
- goto_if_eq Mevent_EventScript_PlayerInputMysteryEventPhrase
- compare VAR_0x8004, 2
- goto_if_eq Mevent_EventScript_PlayerInputMysteryGiftPhrase
- compare VAR_RESULT, 0
- goto_if_eq Mevent_EventScript_Release
- compare VAR_RESULT, 1
- goto_if_eq Mevent_EventScript_QuestionnaireThankYou
- end
-
-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
- waitmovement 0
- playse SE_PIN
- applymovement VAR_0x8008, Common_Movement_ExclamationMark
- waitmovement 0
- applymovement VAR_0x8008, Common_Movement_Delay48
- waitmovement 0
- msgbox Mevent_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT
- setflag FLAG_SYS_MYSTERY_EVENT_ENABLE
- msgbox Mevent_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT
- releaseall
- end
-
-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
- waitmovement 0
- playse SE_PIN
- applymovement VAR_0x8008, Common_Movement_ExclamationMark
- waitmovement 0
- applymovement VAR_0x8008, Common_Movement_Delay48
- waitmovement 0
- msgbox Mevent_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT
- setflag FLAG_SYS_MYSTERY_GIFT_ENABLE
- msgbox Mevent_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT
- releaseall
- end
-
-Mevent_EventScript_Release::
- releaseall
- end
-
-Mevent_EventScript_QuestionnaireThankYou::
- applymovement VAR_0x8008, Common_Movement_FaceDown
- waitmovement 0
- msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT
- releaseall
- end
diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc
new file mode 100644
index 000000000..62e149bb7
--- /dev/null
+++ b/data/scripts/questionnaire.inc
@@ -0,0 +1,62 @@
+EventScript_Questionnaire::
+ lockall
+ msgbox Questionnaire_Text_FillOut, MSGBOX_YESNO
+ compare VAR_RESULT, NO
+ goto_if_eq Questionnaire_EventScript_Release
+ setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+ call Common_ShowEasyChatScreen
+ lock
+ faceplayer
+ specialvar VAR_0x8008, GetMartEmployeeObjectEventId
+ compare VAR_0x8004, 1
+ goto_if_eq Questionnaire_EventScript_PlayerInputMysteryEventPhrase
+ compare VAR_0x8004, 2
+ goto_if_eq Questionnaire_EventScript_PlayerInputMysteryGiftPhrase
+ compare VAR_RESULT, 0
+ goto_if_eq Questionnaire_EventScript_Release
+ compare VAR_RESULT, 1
+ goto_if_eq Questionnaire_EventScript_ThankYou
+ end
+
+Questionnaire_EventScript_PlayerInputMysteryEventPhrase::
+ goto_if_unset FLAG_SYS_POKEDEX_GET, Questionnaire_EventScript_ThankYou
+ goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Questionnaire_EventScript_ThankYou
+ applymovement VAR_0x8008, Common_Movement_FaceDown
+ waitmovement 0
+ playse SE_PIN
+ applymovement VAR_0x8008, Common_Movement_ExclamationMark
+ waitmovement 0
+ applymovement VAR_0x8008, Common_Movement_Delay48
+ waitmovement 0
+ msgbox Questionnaire_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT
+ setflag FLAG_SYS_MYSTERY_EVENT_ENABLE
+ msgbox Questionnaire_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT
+ releaseall
+ end
+
+Questionnaire_EventScript_PlayerInputMysteryGiftPhrase::
+ goto_if_unset FLAG_SYS_POKEDEX_GET, Questionnaire_EventScript_ThankYou
+ goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Questionnaire_EventScript_ThankYou
+ applymovement VAR_0x8008, Common_Movement_FaceDown
+ waitmovement 0
+ playse SE_PIN
+ applymovement VAR_0x8008, Common_Movement_ExclamationMark
+ waitmovement 0
+ applymovement VAR_0x8008, Common_Movement_Delay48
+ waitmovement 0
+ msgbox Questionnaire_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT
+ setflag FLAG_SYS_MYSTERY_GIFT_ENABLE
+ msgbox Questionnaire_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT
+ releaseall
+ end
+
+Questionnaire_EventScript_Release::
+ releaseall
+ end
+
+Questionnaire_EventScript_ThankYou::
+ applymovement VAR_0x8008, Common_Movement_FaceDown
+ waitmovement 0
+ msgbox Questionnaire_Text_ThankYou, MSGBOX_DEFAULT
+ releaseall
+ end
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-12 10:53:07 +0000