From ecf2097abb1481109578b7b8260fd40606f27abe Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 14 Aug 2019 23:38:42 -0400 Subject: initial event_scripts documentation --- data/scripts/cable_club.inc | 22 +++++++++++----------- data/scripts/pokeblocks.inc | 2 +- data/scripts/secret_base.inc | 14 +++++++------- data/scripts/tv.inc | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index eeecf2d75..dd024ecff 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -47,7 +47,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 gotoram OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A - msgbox gUnknown_08273178, MSGBOX_NPC + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 @@ -64,7 +64,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 end OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 - msgbox gUnknown_08273178, MSGBOX_DEFAULT + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end @@ -707,13 +707,13 @@ OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 release end -OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335 - msgbox gUnknown_0827306F, MSGBOX_DEFAULT +CableClub_EventScript_WirelessClubAdjustements:: @ 8277335 + msgbox gText_SorryWirelessClubAdjustments, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F - msgbox gUnknown_082730BC, MSGBOX_DEFAULT + msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT releaseall end @@ -977,7 +977,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B @@ -1052,12 +1052,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 + goto EventScript_CableClub_SetVarResult0 end OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 + goto EventScript_CableClub_SetVarResult0 end OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 @@ -1068,7 +1068,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A @@ -1085,7 +1085,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B @@ -1856,7 +1856,7 @@ OldaleTown_PokemonCenter_2F_Text_278A39: @ 8278A39 .string "Oh…\n" .string "Excuse me!$" -OldaleTown_PokemonCenter_1F_Text_278A48: @ 8278A48 +CableClub_Text_PlayerIsWaiting: @ 8278A48 .string "It appears as if {STR_VAR_1} is playing\n" .string "right now.\l" .string "Go for it!$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index a26ecb4c9..3269ec233 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -679,7 +679,7 @@ EventScript_PblocLink_DifferentSelections: @ 8294183 EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink - msgbox gUnknown_08272D9C, MSGBOX_DEFAULT + msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 81bd388f8..02d331611 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -336,7 +336,7 @@ EventScript_275A50:: @ 8275A50 compare VAR_RESULT, 6 goto_if_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, MSGBOX_YESNO + msgbox gText_UseSecretPower, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE msgbox Text_MonUsedHM, MSGBOX_DEFAULT @@ -354,12 +354,12 @@ EventScript_275A86:: @ 8275A86 end EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, MSGBOX_DEFAULT + msgbox gText_SmallIndentInWall, MSGBOX_DEFAULT releaseall end EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, MSGBOX_DEFAULT + msgbox gText_DiscoveredSmallCavern, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -1087,19 +1087,19 @@ Text_276835: @ 8276835 .string "Up to ten SECRET BASE locations\n" .string "may be registered.$" -Text_27692B: @ 827692B +SecretBase_Text_BattleTowerShield: @ 827692B .string "A shield of {STR_VAR_2} that marks winning\n" .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" -Text_276974: @ 8276974 +SecretBase_Text_ToyTV: @ 8276974 .string "A realistic toy TV. It could be easily\n" .string "mistaken for the real thing.$" -Text_2769B8: @ 82769B8 +SecretBase_Text_SeedotTV: @ 82769B8 .string "A toy TV shaped like a SEEDOT.\n" .string "It looks ready to roll away on its own…$" -Text_2769FF: @ 82769FF +SecretBase_Text_SkittyTV: @ 82769FF .string "A toy TV shaped like a SKITTY.\n" .string "It looks ready to stroll away…$" diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 4a276ffc0..a91237257 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -30,7 +30,7 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end @@ -69,7 +69,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT goto EventScript_27EED0 end -- cgit v1.2.3 From 1d703e786bd56bc33fe3cc3ff672e7d31d74319d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 5 Sep 2019 14:56:34 -0400 Subject: move some data out of event_scripts, use game stat constants --- data/scripts/berry_tree.inc | 2 +- data/scripts/contest_hall.inc | 2 +- data/scripts/day_care.inc | 2 +- data/scripts/lilycove_lady.inc | 856 +++++++++++++++++++++++++++++++++++++ data/scripts/pkmn_center_nurse.inc | 135 ++++++ data/scripts/players_house.inc | 4 +- data/scripts/tv.inc | 2 +- 7 files changed, 997 insertions(+), 6 deletions(-) create mode 100644 data/scripts/lilycove_lady.inc create mode 100644 data/scripts/pkmn_center_nurse.inc (limited to 'data/scripts') diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 2dc016a52..63d1f0bcc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -184,7 +184,7 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 BerryTree_EventScript_PlantBerry:: @ 82744DD special EventObjectInteractionPlantBerryTree - incrementgamestat 3 + incrementgamestat GAME_STAT_PLANTED_BERRIES special sub_80EED10 special EventObjectInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6c19cdc0c..f86853a16 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1232,7 +1232,7 @@ LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF special sub_80F7FFC - incrementgamestat 42 + incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 057a2fa07..8c4f14327 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -116,7 +116,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 msgbox Route117_PokemonDayCare_Text_292370, MSGBOX_DEFAULT waitmoncry special StoreSelectedPokemonInDaycare - incrementgamestat 47 + incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_291DD4 diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc new file mode 100644 index 000000000..9ee7adc7c --- /dev/null +++ b/data/scripts/lilycove_lady.inc @@ -0,0 +1,856 @@ +LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B + special Script_GetLilycoveLadyId + switch VAR_RESULT + case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_2A8554 + case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_2A8395 + case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_2A882A + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 + lock + faceplayer + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT + specialvar VAR_RESULT, GetFavorLadyState + compare VAR_RESULT, LILYCOVE_LADY_STATE_READY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 + compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 + compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT + specialvar VAR_RESULT, HasAnotherPlayerGivenFavorLadyItem + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 + special BufferFavorLadyItemName + special BufferFavorLadyPlayerName + specialvar VAR_RESULT, DidFavorLadyLikeItem + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C + fadescreen 1 + setvar VAR_RESULT, 0 + special Script_FavorLadyOpenBagMenu + waitstate + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD + specialvar VAR_RESULT, Script_DoesFavorLadyLikeItem + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 + specialvar VAR_RESULT, IsFavorLadyThresholdMet + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 + setvar VAR_0x8004, 0 + specialvar VAR_0x8004, FavorLadyGetPrize + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT + giveitem_std VAR_0x8004 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F + special SetFavorLadyState_Complete + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 + lock + faceplayer + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT + specialvar VAR_RESULT, GetQuizLadyState + compare VAR_RESULT, LILYCOVE_LADY_STATE_READY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 + compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC + compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 + specialvar VAR_RESULT, GetQuizAuthor + compare VAR_RESULT, QUIZ_AUTHOR_PLAYER + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + compare VAR_RESULT, QUIZ_AUTHOR_OTHER_PLAYER + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 + compare VAR_RESULT, QUIZ_AUTHOR_LADY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC + specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE + setvar VAR_0x8004, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C + special ClearQuizLadyPlayerAnswer + compare VAR_0x8004, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C + compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 + +LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C + special QuizLadyShowQuizQuestion + waitstate + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 + special QuizLadyGetPlayerAnswer + waitstate + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 + special SetQuizLadyState_Complete + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT + specialvar VAR_RESULT, IsQuizAnswerCorrect + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 + playse SE_SEIKAI + delay 10 + playse SE_SEIKAI + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 + special BufferQuizCorrectAnswer + special BufferQuizPrizeName + playse SE_HAZURE + delay 10 + playse SE_HAZURE + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + end + +@ VAR_RESULT is essentially ignored, both jumps are identical +LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC + specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 + setvar VAR_0x8005, 0 + special BufferQuizPrizeItem + special SetQuizLadyState_Complete + giveitem_std VAR_0x8005 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C + msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT + special SetQuizLadyState_GivePrize + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 + special QuizLadyPickNewQuestion + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT + +LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D + fadescreen 1 + setvar VAR_RESULT, 0 + special Script_QuizLadyOpenBagMenu + waitstate + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT + special ClearQuizLadyQuestionAndAnswer + special ClearQuizLadyPlayerAnswer + setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION + +LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 + fadescreen 1 + special QuizLadySetCustomQuestion + waitstate + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 + goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 + special QuizLadyTakePrizeForCustomQuiz + special QuizLadyRecordCustomQuizData + special QuizLadySetWaitingForChallenger + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A + lock + faceplayer + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT + specialvar VAR_RESULT, HasPlayerGivenContestLadyPokeblock + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + end + +@ Redundant with above script, VAR_RESULT will always be 0 here +LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 + specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 + special Script_BufferContestLadyCategoryAndMonName + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE + msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA + fadescreen 1 + special OpenPokeblockCaseForContestLady + waitstate + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 + compare VAR_RESULT, 65535 + goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT + special SetContestLadyGivenPokeblock + special GetContestLadyMonSpecies + goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A + end + +@ VAR_0x8004 here is the return value from GivePokeblockToContestLady +LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89B8 + waitmovement 0 + delay 60 + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89BB + waitmovement 0 + delay 60 + waitse + playmoncry VAR_0x8005, 0 + delay 120 + waitmoncry + compare VAR_0x8004, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F + goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A893F:: @ 82A893F + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89C2 + waitmovement 0 + delay 60 + +@ VAR_0x8004 here is the return value from GivePokeblockToContestLady +LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89C0 + waitmovement 0 + delay 60 + compare VAR_0x8004, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 + compare VAR_0x8004, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E + special Script_BufferContestLadyCategoryAndMonName + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F + specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT + special PutLilycoveContestLadyShowOnTheAir + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 + face_right + delay_8 + step_end + +LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB + face_left + delay_8 + step_end + +LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE + face_down + step_end + +LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 + face_player + step_end + +LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 + disable_jump_landing_ground_effect + jump_in_place_left + disable_jump_landing_ground_effect + jump_in_place_left + step_end + +LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 + specialvar VAR_RESULT, GetContestLadyCategory + special Script_BufferContestLadyCategoryAndMonName + special GetContestLadyMonSpecies + compare VAR_RESULT, CONTEST_CATEGORY_COOL + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A + compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D + compare VAR_RESULT, CONTEST_CATEGORY_CUTE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 + compare VAR_RESULT, CONTEST_CATEGORY_SMART + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 + compare VAR_RESULT, CONTEST_CATEGORY_TOUGH + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30 + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43 + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_Text_2A8A69: @ 82A8A69 + .string "I'm the FAVOR LADY…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8A7D: @ 82A8A7D + .string "I've recently developed an obsession\n" + .string "for {STR_VAR_1} things…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8AB1: @ 82A8AB1 + .string "Oh…\n" + .string "Thank you for last time…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8ACE: @ 82A8ACE + .string "Before, I think it was {STR_VAR_3}…\p" + .string "{STR_VAR_3} gave me one {STR_VAR_2},\n" + .string "saying it was {STR_VAR_1}.\p" + .string "But it wasn't {STR_VAR_1}.\n" + .string "Not in the least bit.$" + +LilycoveCity_PokemonCenter_1F_Text_2A8B36: @ 82A8B36 + .string "Before, {STR_VAR_3} gave me a very\n" + .string "{STR_VAR_1} {STR_VAR_2}.\p" + .string "I cherish it now.$" + +LilycoveCity_PokemonCenter_1F_Text_2A8B69: @ 82A8B69 + .string "Listen, if you have anything that\n" + .string "is {STR_VAR_1}, will you share it\l" + .string "with me?$" + +LilycoveCity_PokemonCenter_1F_Text_2A8BAD: @ 82A8BAD + .string "…Really?\n" + .string "What will you give me?$" + +LilycoveCity_PokemonCenter_1F_Text_2A8BCD: @ 82A8BCD + .string "Is that so?\n" + .string "Then, it's good-bye…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8BEE: @ 82A8BEE + .string "Oh…\n" + .string "You're not willing to share?$" + +LilycoveCity_PokemonCenter_1F_Text_2A8C0F: @ 82A8C0F + .string "Oh?\n" + .string "That {STR_VAR_2} is {STR_VAR_1}?\p" + .string "…Oh, is that right?\p" + .string "Well, I owe you a thanks anyway.\n" + .string "I'll try to cherish it…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F + .string "Oh…\p" + .string "That's a quite {STR_VAR_1}\n" + .string "{STR_VAR_2}…\p" + .string "Isn't it nice?\n" + .string "It's so dreamy…\p" + .string "Thank you…\n" + .string "I will cherish this…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 + .string "…Oh, oh, oh…\p" + .string "This is amazing!\n" + .string "This really is {STR_VAR_1}!\p" + .string "I never knew that one {STR_VAR_2}\n" + .string "could be this {STR_VAR_1}!\p" + .string "Thank you!\p" + .string "I will treasure this for the rest\n" + .string "of my life!$" + +LilycoveCity_PokemonCenter_1F_Text_2A8D5D: @ 82A8D5D + .string "I'll give you this wonderful item in\n" + .string "return for your fabulous gift.\p" + .string "I hope you will cherish it…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8DBD: @ 82A8DBD + .string "Oh, you can't have it if you don't have\n" + .string "the space for it.\p" + .string "Please come see me when you get\n" + .string "your BAG organized…$" + +LilycoveCity_PokemonCenter_1F_Text_2A8E2B: @ 82A8E2B + .string "I'm the QUIZ LADY!\n" + .string "I love quizzes!$" + +LilycoveCity_PokemonCenter_1F_Text_2A8E4E: @ 82A8E4E + .string "Oh?\p" + .string "I'm waiting for a challenger to answer\n" + .string "the quiz you made.\p" + .string "We can chat another time, okay?$" + +LilycoveCity_PokemonCenter_1F_Text_2A8EAC: @ 82A8EAC + .string "I'm waiting for someone to challenge\n" + .string "a quiz this {STR_VAR_1} thought up!$" + +LilycoveCity_PokemonCenter_1F_Text_2A8EEC: @ 82A8EEC + .string "If you answer correctly, you can win\n" + .string "fabulous prizes!\p" + .string "Would you like to take the quiz\n" + .string "challenge?$" + +LilycoveCity_PokemonCenter_1F_Text_2A8F4D: @ 82A8F4D + .string "… … … … … …\n" + .string "… … … … … …$" + +LilycoveCity_PokemonCenter_1F_Text_2A8F65: @ 82A8F65 + .string "Oh, how boring!\n" + .string "Bye-bye!$" + +LilycoveCity_PokemonCenter_1F_Text_2A8F7E: @ 82A8F7E + .string "Awww!\n" + .string "You're going to quit?$" + +LilycoveCity_PokemonCenter_1F_Text_2A8F9A: @ 82A8F9A + .string "Please take the quiz challenge\n" + .string "another time!$" + +LilycoveCity_PokemonCenter_1F_Text_2A8FC7: @ 82A8FC7 + .string "You're amazing! You've got it right!\n" + .string "You're one sharp customer!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9007: @ 82A9007 + .string "Congratulations!\n" + .string "You've got the quiz right!\p" + .string "You've won a prize provided by\n" + .string "{STR_VAR_1}!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9056: @ 82A9056 + .string "{STR_VAR_1} received\n" + .string "one {STR_VAR_2}!$" + +LilycoveCity_PokemonCenter_1F_Text_2A906A: @ 82A906A + .string "Oh? Your BAG is filled up!\n" + .string "Come see me when you have room.$" + +LilycoveCity_PokemonCenter_1F_Text_2A90A5: @ 82A90A5 + .string "Hmm… Wrong!\n" + .string "The correct answer is “{STR_VAR_3}”!$" + +LilycoveCity_PokemonCenter_1F_Text_2A90CD: @ 82A90CD + .string "Too bad!\p" + .string "I get to keep the quiz prize\n" + .string "{STR_VAR_1} now!$" + +LilycoveCity_PokemonCenter_1F_Text_2A90FB: @ 82A90FB + .string "Listen, listen!\n" + .string "Would you like to make your own quiz?$" + +LilycoveCity_PokemonCenter_1F_Text_2A9131: @ 82A9131 + .string "Oh, I see…\n" + .string "Well, maybe next time!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 + .string "Okay, the first thing you have to do\n" + .string "is pick the prize for the person that\l" + .string "answers your quiz correctly.\p" + .string "But beware, if the person taking\n" + .string "the quiz can't get it right, I get to\l" + .string "keep the prize!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9212: @ 82A9212 + .string "If you don't choose a prize,\n" + .string "your quiz can't be made.\p" + .string "Are you going to quit making\n" + .string "your quiz?$" + +LilycoveCity_PokemonCenter_1F_Text_2A9270: @ 82A9270 + .string "Oh, how nice!\n" + .string "That's a wonderful prize!\p" + .string "Next, you need to write your quiz\n" + .string "question and its answer.$" + +LilycoveCity_PokemonCenter_1F_Text_2A92D3: @ 82A92D3 + .string "Are you going to quit writing\n" + .string "your quiz question?$" + +LilycoveCity_PokemonCenter_1F_Text_2A9305: @ 82A9305 + .string "Are you going to quit choosing\n" + .string "your quiz answer?$" + +LilycoveCity_PokemonCenter_1F_Text_2A9336: @ 82A9336 + .string "Thank you!\n" + .string "You've put together a nice quiz.\p" + .string "I'll go look for someone who'll take\n" + .string "your quiz challenge right away.$" + +LilycoveCity_PokemonCenter_1F_Text_2A93A7: @ 82A93A7 + .string "I'm the CONTEST LADY!\n" + .string "I sure do love CONTESTS!$" + +LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6 + .string "Thanks for your {POKEBLOCK} before!$" + +LilycoveCity_PokemonCenter_1F_Text_2A93F4: @ 82A93F4 + .string "This is my friend {STR_VAR_1}!\n" + .string "It's the epitome of {STR_VAR_2}!\p" + .string "But I think that it will display\n" + .string "even more {STR_VAR_2}!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451 + .string "So, I need your help!\p" + .string "Please, may I have one {POKEBLOCK}?\n" + .string "All I'm asking for is one!\p" + .string "…Oh, but…\n" + .string "Don't you have a {POKEBLOCK} CASE?\l" + .string "That's no good. Next time, then!$" + +LilycoveCity_PokemonCenter_1F_Text_2A94E8: @ 82A94E8 + .string "So, I need your help!\p" + .string "Please, may I have one {POKEBLOCK}?\n" + .string "All I'm asking for is one!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9537: @ 82A9537 + .string "Awww!\n" + .string "I can't have one {POKEBLOCK}?!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556 + .string "Sheesh!\n" + .string "What a cheapskate!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9571: @ 82A9571 + .string "Yay!\n" + .string "Thank you!\p" + .string "I'll feed my POKéMON your {POKEBLOCK}\n" + .string "right away.$" + +LilycoveCity_PokemonCenter_1F_Text_2A95AD: @ 82A95AD + .string "…It doesn't seem to have changed\n" + .string "in any way at all…\p" + .string "Hmm…\p" + .string "Oh, well!\n" + .string "Thank you very much!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9605: @ 82A9605 + .string "Oh, yay!\n" + .string "It's really delighted!\p" + .string "I think it really improved {STR_VAR_1}'s\n" + .string "{STR_VAR_2} quality, too.\p" + .string "Thank you so much!$" + +LilycoveCity_PokemonCenter_1F_Text_2A9669: @ 82A9669 + .string "Hmm…\p" + .string "I think we may be ready to enter\n" + .string "some CONTESTS.\p" + .string "If you see us in one somewhere,\n" + .string "I hope you'll cheer for us.$" + +LilycoveCity_PokemonCenter_1F_Text_2A96DA: @ 82A96DA + .string "{STR_VAR_1}: Guguuh!$" + +LilycoveCity_PokemonCenter_1F_Text_2A96E6: @ 82A96E6 + .string "{STR_VAR_1}: Igigigiiih!$" + +LilycoveCity_PokemonCenter_1F_Text_2A96F6: @ 82A96F6 + .string "{STR_VAR_1}: Baaarun…$" + +LilycoveCity_PokemonCenter_1F_Text_2A9703: @ 82A9703 + .string "{STR_VAR_1}: Pikka!$" + +LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E + .string "{STR_VAR_1}: Umyaaaan!$" diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc new file mode 100644 index 000000000..9b1b576b4 --- /dev/null +++ b/data/scripts/pkmn_center_nurse.inc @@ -0,0 +1,135 @@ +Common_EventScript_PkmnCenterNurse:: @ 827191E + lock + faceplayer + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, CountPlayerTrainerStars + compare VAR_RESULT, 4 + goto_if_eq EventScript_PkmnCenterNurse_GoldCard + msgbox gText_WouldYouLikeToRestYourPkmn, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq EventScript_PkmnCenterNurse_HealPkmn + compare VAR_RESULT, 0 + goto_if_eq EventScript_PkmnCenterNurse_Goodbye + end + +EventScript_PkmnCenterNurse_Goodbye:: @ 8271954 + message gText_WeHopeToSeeYouAgain + return + +@ VAR_0x8004 is 1 when player has Gold Card; jumps are identical +EventScript_PkmnCenterNurse_HealPkmn:: @ 827195A + incrementgamestat GAME_STAT_USED_POKECENTER + compare VAR_0x8004, 0 + call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn + compare VAR_0x8004, 1 + call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn2 + waitmessage + call EventScript_PkmnCenterNurse_TakeAndHealPkmn + goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus + goto EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom + end + +EventScript_PkmnCenterNurse_IllTakeYourPkmn:: @ 8271987 + message gText_IllTakeYourPkmn + return + +EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D + message gText_IllTakeYourPkmn2 + return + +EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft + waitmovement 0 + dofieldeffect FLDEFF_POKECENTER_HEAL + waitfieldeffect FLDEFF_POKECENTER_HEAL + applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown + waitmovement 0 + special HealPlayerParty + return + +EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1 + specialvar VAR_RESULT, PlayerAtTrainerHillEntrance + compare VAR_RESULT, 0 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn + specialvar VAR_RESULT, BufferUnionRoomPlayerName + copyvar VAR_0x8008, VAR_RESULT + compare VAR_0x8008, 0 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn + compare VAR_0x8008, 1 + goto_if_eq EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom + end + +@ VAR_0x8004 is 1 when player has Gold Card +EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2 + compare VAR_0x8004, 1 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2 + message gText_RestoredPkmnToFullHealth + waitmessage + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + waitmovement 0 + message gText_WeHopeToSeeYouAgain + return + +EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03 + message gText_ThankYouForWaiting + waitmessage + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + waitmovement 0 + message gText_WeHopeToSeeYouAgain2 + return + +EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19 + goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, EventScript_PkmnCenterNurse_ReturnPkmn + msgbox gText_RestoredPkmnToFullHealth, MSGBOX_DEFAULT + setflag FLAG_NURSE_UNION_ROOM_REMINDER + message CableClub_Text_PlayerIsWaiting + waitmessage + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + waitmovement 0 + message gText_WeHopeToSeeYouAgain + return + +EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43 + specialvar VAR_RESULT, IsPokerusInParty + compare VAR_RESULT, 1 + goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus + compare VAR_RESULT, 0 + goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom + end + +EventScript_PkmnCenterNurse_ExplainPokerus:: @ 8271A5F + message gText_PokerusExplanation + setflag FLAG_POKERUS_EXPLAINED + return + +EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68 + goto_if_set FLAG_NURSE_MENTIONS_GOLD_CARD, EventScript_PkmnCenterNurse_AskForUsual + setflag FLAG_NURSE_MENTIONS_GOLD_CARD + msgbox gText_WelcomeCutShort, MSGBOX_DEFAULT + playse SE_PIN + applymovement VAR_0x800B, Common_Movement_ExclamationMark + waitmovement 0 + applymovement VAR_0x800B, Common_Movement_Delay48 + waitmovement 0 + msgbox gText_NoticesGoldCard, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn + message gText_WeHopeToSeeYouAgain2 + return + +EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC + msgbox gText_YouWantTheUsual, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn + message gText_WeHopeToSeeYouAgain2 + return + +EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5 + setvar VAR_0x8004, 1 + goto EventScript_PkmnCenterNurse_HealPkmn + end + +EventScript_PkmnCenterNurse_Bow: @ 8271AD0 + nurse_joy_bow + delay_4 + step_end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index c4a5ffe86..438355c31 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -104,7 +104,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F return LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F - incrementgamestat 45 + incrementgamestat GAME_STAT_CHECKED_CLOCK fadescreen 1 special Special_ViewWallClock waitstate @@ -374,7 +374,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E closemessage call Common_EventScript_OutOfCenterPartyHeal - incrementgamestat 16 + incrementgamestat GAME_STAT_RESTED_AT_HOME msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index a91237257..ed279d478 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,6 +1,6 @@ EventScript_TV:: @ 827EE0B lockall - incrementgamestat 44 + incrementgamestat GAME_STAT_WATCHED_TV special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare VAR_RESULT, 2 -- cgit v1.2.3 From 8c6b5648d4186022e674e5782aad01d3e8dd32e6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 5 Sep 2019 16:16:21 -0400 Subject: document secret_base_1.inc --- data/scripts/secret_base.inc | 1113 ---------------------------------------- data/scripts/secret_base_1.inc | 199 +++++++ data/scripts/secret_base_2.inc | 1113 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1312 insertions(+), 1113 deletions(-) delete mode 100644 data/scripts/secret_base.inc create mode 100644 data/scripts/secret_base_1.inc create mode 100644 data/scripts/secret_base_2.inc (limited to 'data/scripts') diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc deleted file mode 100644 index 02d331611..000000000 --- a/data/scripts/secret_base.inc +++ /dev/null @@ -1,1113 +0,0 @@ -Text_274746: @ 8274746 - .string "If some vines drop down, this tree can\n" - .string "be climbed.$" - -Text_274779: @ 8274779 - .string "If some vines drop down, this tree can\n" - .string "be climbed.\p" - .string "Use the SECRET POWER?$" - -Text_2747C2: @ 82747C2 - .string "A thick vine dropped down!$" - -Text_2747DD: @ 82747DD - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.$" - -Text_274825: @ 8274825 - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.\p" - .string "Use the SECRET POWER?$" - -Text_274883: @ 8274883 - .string "Discovered a small entrance!$" - -SecretBase_RedCave1_Text_2748A0: @ 82748A0 - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Since you're already here, how would\n" - .string "you like to battle?$" - -SecretBase_RedCave1_Text_274939: @ 8274939 - .string "Okay!\n" - .string "Here we come!$" - -SecretBase_RedCave1_Text_27494D: @ 827494D - .string "Hunh?\n" - .string "Oh, you can't now…$" - -SecretBase_RedCave1_Text_274966:: @ 8274966 - .string "Waaargh! You're too strong!\n" - .string "About me losing… Please keep it secret!$" - -SecretBase_RedCave1_Text_2749AA: @ 82749AA - .string "What do you think of my SECRET BASE?\n" - .string "Come visit me again tomorrow.$" - -SecretBase_RedCave1_Text_2749ED: @ 82749ED - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Feel free to hang out!$" - -SecretBase_RedCave1_Text_274A64: @ 8274A64 - .string "There're a lot of places where\n" - .string "you can make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?\p" - .string "Oh, would you like to have a battle?$" - -SecretBase_RedCave1_Text_274AFA: @ 8274AFA - .string "Okay, here goes!$" - -SecretBase_RedCave1_Text_274B0B: @ 8274B0B - .string "Oh…\n" - .string "You can't now, okay.$" - -SecretBase_RedCave1_Text_274B24:: @ 8274B24 - .string "Hmmm… It's our loss…\n" - .string "But don't tell anyone!\l" - .string "It's a confidential secret!$" - -SecretBase_RedCave1_Text_274B6C: @ 8274B6C - .string "If you're in this area again,\n" - .string "I hope you'll visit me.$" - -SecretBase_RedCave1_Text_274BA2: @ 8274BA2 - .string "There're a lot of places where you can\n" - .string "make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?$" - -SecretBase_RedCave1_Text_274C13: @ 8274C13 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "Oh! Were you thinking about\n" - .string "taking this spot, too?\p" - .string "I'll tell you what, you can have this\n" - .string "spot if you can beat me.$" - -SecretBase_RedCave1_Text_274CB0: @ 8274CB0 - .string "Okay!\n" - .string "I'm going to defend my SECRET BASE!$" - -SecretBase_RedCave1_Text_274CDA: @ 8274CDA - .string "Hunh? Is that right?\n" - .string "You're not interested in this spot?$" - -SecretBase_RedCave1_Text_274D13:: @ 8274D13 - .string "I can't keep going!\n" - .string "I surrender!$" - -SecretBase_RedCave1_Text_274D34: @ 8274D34 - .string "Okay, when I move one day,\n" - .string "this place will be yours!$" - -SecretBase_RedCave1_Text_274D69: @ 8274D69 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "I waited a long time for it to open.\n" - .string "I finally got to use it!$" - -SecretBase_RedCave1_Text_274DD2: @ 8274DD2 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.\p" - .string "Would you like to see how strong I am?$" - -SecretBase_RedCave1_Text_274E41: @ 8274E41 - .string "I'm going to go all out!$" - -SecretBase_RedCave1_Text_274E5A: @ 8274E5A - .string "Oh.\n" - .string "Some other time, then!$" - -SecretBase_RedCave1_Text_274E75:: @ 8274E75 - .string "Hmm… I've still got lots to learn.\n" - .string "I have to study some more.$" - -SecretBase_RedCave1_Text_274EB3: @ 8274EB3 - .string "Thanks for battling with me.\n" - .string "Please come back again tomorrow.$" - -SecretBase_RedCave1_Text_274EF1: @ 8274EF1 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.$" - -SecretBase_RedCave1_Text_274F39: @ 8274F39 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.\p" - .string "So, how would you like a battle?$" - -SecretBase_RedCave1_Text_274FCA: @ 8274FCA - .string "That's the way!$" - -SecretBase_RedCave1_Text_274FDA: @ 8274FDA - .string "When you're ready, give me a shout!$" - -SecretBase_RedCave1_Text_274FFE:: @ 8274FFE - .string "Aww! Done in!\n" - .string "But it's still fun to battle!$" - -SecretBase_RedCave1_Text_27502A: @ 827502A - .string "Well, anyway, I should go buy some\n" - .string "decorations and furniture.\p" - .string "I want my SECRET BASE to be a place\n" - .string "other people can enjoy.$" - -SecretBase_RedCave1_Text_2750A4: @ 82750A4 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.$" - -SecretBase_RedCave1_Text_275114: @ 8275114 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.\p" - .string "If you would be so kind, will you battle\n" - .string "with my POKéMON?$" - -SecretBase_RedCave1_Text_2751AF: @ 82751AF - .string "Thank you.\n" - .string "Shall we begin?$" - -SecretBase_RedCave1_Text_2751CA: @ 82751CA - .string "Oh.\n" - .string "How disappointing…$" - -SecretBase_RedCave1_Text_2751E1:: @ 82751E1 - .string "I concede…$" - -SecretBase_RedCave1_Text_2751EC: @ 82751EC - .string "That was all in good fun!\n" - .string "I should go enjoy shopping now.$" - -SecretBase_RedCave1_Text_275226: @ 8275226 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.$" - -SecretBase_RedCave1_Text_275287: @ 8275287 - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?\p" - .string "But since you found me, how about we\n" - .string "have a battle?$" - -SecretBase_RedCave1_Text_275315: @ 8275315 - .string "I'm not going down easily!$" - -SecretBase_RedCave1_Text_275330: @ 8275330 - .string "Oh… Are you maybe tired from searching\n" - .string "for this place?$" - -SecretBase_RedCave1_Text_275367:: @ 8275367 - .string "I went down…$" - -SecretBase_RedCave1_Text_275374: @ 8275374 - .string "Where's your SECRET BASE?\n" - .string "I should go visit you there.$" - -SecretBase_RedCave1_Text_2753AB: @ 82753AB - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?$" - -SecretBase_RedCave1_Text_275405: @ 8275405 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!\p" - .string "In the meantime, want to battle?$" - -SecretBase_RedCave1_Text_2754B2: @ 82754B2 - .string "This is my SECRET BASE.\n" - .string "I can't lose!$" - -SecretBase_RedCave1_Text_2754D8: @ 82754D8 - .string "I'll battle with you anytime.$" - -SecretBase_RedCave1_Text_2754F6:: @ 82754F6 - .string "Huh?\n" - .string "Did I just lose?$" - -SecretBase_RedCave1_Text_27550C: @ 827550C - .string "I won't lose at collecting decorations.\n" - .string "Come visit again!$" - -SecretBase_RedCave1_Text_275546: @ 8275546 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!$" - -SecretBase_RedCave1_Text_2755D2: @ 82755D2 - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "That's what I do.\n" - .string "Want to battle with me?$" - -SecretBase_RedCave1_Text_275679: @ 8275679 - .string "Show me what you're made of!$" - -SecretBase_RedCave1_Text_275696: @ 8275696 - .string "I guess there are times when you're not\n" - .string "into it.$" - -SecretBase_RedCave1_Text_2756C7:: @ 82756C7 - .string "I know exactly what you're made of now.$" - -SecretBase_RedCave1_Text_2756EF: @ 82756EF - .string "We can both become stronger.\n" - .string "Let's keep at it!$" - -SecretBase_RedCave1_Text_27571E: @ 827571E - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "Every day is a great day.$" - -SecretBase_RedCave1_Text_2757B5: @ 82757B5 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?\p" - .string "Want to see my taste in battling?$" - -SecretBase_RedCave1_Text_275884: @ 8275884 - .string "There's no holding back!$" - -SecretBase_RedCave1_Text_27589D: @ 827589D - .string "I'll be happy to demonstrate my style\n" - .string "anytime.$" - -SecretBase_RedCave1_Text_2758CC:: @ 82758CC - .string "You're supremely talented!\n" - .string "Your power seems to be limitless…$" - -SecretBase_RedCave1_Text_275909: @ 8275909 - .string "What did you think of my style?\n" - .string "I'll keep on polishing it!$" - -SecretBase_RedCave1_Text_275944: @ 8275944 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?$" - -EventScript_2759F1:: @ 82759F1 - special GetSecretBaseTypeInFrontOfPlayer - special CheckPlayerHasSecretBase - compare VAR_RESULT, 1 - goto_if_eq EventScript_275BE8 - checkpartymove MOVE_SECRET_POWER - setfieldeffectargument 0, VAR_RESULT - buffermovename 1, MOVE_SECRET_POWER - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275AA9 - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B02 - end - -EventScript_275A50:: @ 8275A50 - lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275A91 - bufferpartymonnick 0, VAR_RESULT - msgbox gText_UseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE - waitstate - goto EventScript_275A9B - end - -EventScript_275A86:: @ 8275A86 - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE - waitstate - goto EventScript_275A9B - end - -EventScript_275A91:: @ 8275A91 - msgbox gText_SmallIndentInWall, MSGBOX_DEFAULT - releaseall - end - -EventScript_275A9B:: @ 8275A9B - msgbox gText_DiscoveredSmallCavern, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275AA9:: @ 8275AA9 - lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275AEA - bufferpartymonnick 0, VAR_RESULT - msgbox Text_274779, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_TREE - waitstate - goto EventScript_275AF4 - end - -EventScript_275ADF:: @ 8275ADF - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_TREE - waitstate - goto EventScript_275AF4 - end - -EventScript_275AEA:: @ 8275AEA - msgbox Text_274746, MSGBOX_DEFAULT - releaseall - end - -EventScript_275AF4:: @ 8275AF4 - msgbox Text_2747C2, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275B02:: @ 8275B02 - lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275B43 - bufferpartymonnick 0, VAR_RESULT - msgbox Text_274825, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB - waitstate - goto EventScript_275B4D - end - -EventScript_275B38:: @ 8275B38 - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB - waitstate - goto EventScript_275B4D - end - -EventScript_275B43:: @ 8275B43 - msgbox Text_2747DD, MSGBOX_DEFAULT - releaseall - end - -EventScript_275B4D:: @ 8275B4D - msgbox Text_274883, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275B5B:: @ 8275B5B - closemessage - playse SE_KAIDAN - setvar VAR_INIT_SECRET_BASE, 0 - setflag FLAG_DECORATION_0 - special SetPlayerSecretBase - special EnterSecretBase - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special InitSecretBaseDecorationSprites - setvar VAR_SECRET_BASE_INITIALIZED, 1 - waitstate - end - -SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 - applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 - waitmovement 0 - setvar VAR_INIT_SECRET_BASE, 1 - msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275BAB - closemessage - playse SE_KAIDAN - special ClearAndLeaveSecretBase - end - -SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB - closemessage - setflag FLAG_RECEIVED_SECRET_POWER - special EnterNewlyCreatedSecretBase - waitstate - end - -SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 - walk_up - walk_up - step_end - -EventScript_275BB7:: @ 8275BB7 - lockall - setvar VAR_INIT_SECRET_BASE, 1 - playse SE_KAIDAN - special IsCurSecretBaseOwnedByAnotherPlayer - compare VAR_RESULT, 0 - goto_if_eq EventScript_275BDB - clearflag FLAG_DECORATION_0 - special EnterSecretBase - setvar VAR_SECRET_BASE_INITIALIZED, 0 - waitstate - end - -EventScript_275BDB:: @ 8275BDB - setflag FLAG_DECORATION_0 - special EnterSecretBase - setvar VAR_SECRET_BASE_INITIALIZED, 0 - waitstate - end - -EventScript_275BE8:: @ 8275BE8 - checkpartymove MOVE_SECRET_POWER - compare VAR_RESULT, 6 - goto_if_eq EventScript_275C9A - setfieldeffectargument 0, VAR_RESULT - setorcopyvar VAR_0x8004, VAR_RESULT - lockall - special GetSecretBaseNearbyMapName - msgbox Text_276A3D, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_2766AA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - fadescreenswapbuffers 1 - special MoveOutOfSecretBaseFromOutside - closemessage - fadescreenswapbuffers 0 - msgbox Text_276A95, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - bufferpartymonnick 0, VAR_0x8004 - buffermovename 1, MOVE_SECRET_POWER - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - closemessage - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275ADF - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B38 - releaseall - end - -EventScript_275C9A:: @ 8275C9A - lockall - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275AEA - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B43 - end - -EventScript_275CDE:: @ 8275CDE - closemessage - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 -LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 -SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 - setflag FLAG_DECORATION_1 - setflag FLAG_DECORATION_2 - setflag FLAG_DECORATION_3 - setflag FLAG_DECORATION_4 - setflag FLAG_DECORATION_5 - setflag FLAG_DECORATION_6 - setflag FLAG_DECORATION_7 - setflag FLAG_DECORATION_8 - setflag FLAG_DECORATION_9 - setflag FLAG_DECORATION_10 - setflag FLAG_DECORATION_11 - setflag FLAG_DECORATION_12 - setflag FLAG_DECORATION_13 - setflag FLAG_DECORATION_14 - return - -EventScript_275D0C:: @ 8275D0C - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special InitSecretBaseDecorationSprites - setvar VAR_SECRET_BASE_INITIALIZED, 1 - end - -EventScript_275D1F:: @ 8275D1F - setvar VAR_0x8005, 0 - goto EventScript_275D2A - end - -EventScript_275D2A:: @ 8275D2A - special sub_8127E18 - end - -EventScript_275D2E:: @ 8275D2E - setvar VAR_0x8004, 0 - goto EventScript_275D39 - end - -EventScript_275D39:: @ 8275D39 - special sub_8129708 - compare VAR_RESULT, 1 - goto_if_eq EventScript_275D63 - addvar VAR_0x8004, 1 - compare VAR_0x8005, 0 - goto_if_eq EventScript_275D39 - removeobject VAR_0x8006 - setflag 0x8005 - goto EventScript_275D39 - end - -EventScript_275D63:: @ 8275D63 - end - -SecretBase_BlueCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave4_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave4_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave1_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave2_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave3_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave4_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub1_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub2_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub3_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub4_EventScript_275D64:: @ 8275D64 -SecretBase_Tree1_EventScript_275D64:: @ 8275D64 -SecretBase_Tree2_EventScript_275D64:: @ 8275D64 -SecretBase_Tree3_EventScript_275D64:: @ 8275D64 -SecretBase_Tree4_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 - special GetSecretBaseOwnerInteractionState - compare VAR_0x8004, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275DD6 - compare VAR_0x8004, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275E4E - compare VAR_0x8004, 2 - goto_if_eq SecretBase_RedCave1_EventScript_275EC6 - compare VAR_0x8004, 3 - goto_if_eq SecretBase_RedCave1_EventScript_275F3E - compare VAR_0x8004, 4 - goto_if_eq SecretBase_RedCave1_EventScript_275FB6 - compare VAR_0x8004, 5 - goto_if_eq SecretBase_RedCave1_EventScript_27602E - compare VAR_0x8004, 6 - goto_if_eq SecretBase_RedCave1_EventScript_2760A6 - compare VAR_0x8004, 7 - goto_if_eq SecretBase_RedCave1_EventScript_27611E - compare VAR_0x8004, 8 - goto_if_eq SecretBase_RedCave1_EventScript_276196 - compare VAR_0x8004, 9 - goto_if_eq SecretBase_RedCave1_EventScript_27620E - end - -SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E25 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275E44 - msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275E2F - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275E2F - msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 - msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 - msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E9D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275EBC - msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275EA7 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275EA7 - msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D - msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC - msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F15 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275F34 - msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F1F - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F1F - msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 - msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 - msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F8D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275FAC - msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F97 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F97 - msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D - msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC - msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_276005 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276024 - msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_27600F - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_27600F - msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_276005:: @ 8276005 - msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27600F:: @ 827600F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276024:: @ 8276024 - msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27602E:: @ 827602E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27607D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27609C - msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276087 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276087 - msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27607D:: @ 827607D - msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276087:: @ 8276087 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27609C:: @ 827609C - msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2760F5 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276114 - msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2760FF - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2760FF - msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 - msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276114:: @ 8276114 - msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27611E:: @ 827611E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27616D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27618C - msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276177 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276177 - msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27616D:: @ 827616D - msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276177:: @ 8276177 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27618C:: @ 827618C - msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276196:: @ 8276196 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2761E5 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276204 - msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2761EF - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2761EF - msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 - msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276204:: @ 8276204 - msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27620E:: @ 827620E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27625D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27627C - msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276267 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276267 - msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27625D:: @ 827625D - msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276267:: @ 8276267 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27627C:: @ 827627C - msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276286:: @ 8276286 - special PrepSecretBaseBattleFlags - setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - compare VAR_RESULT, 3 - call_if_eq SecretBase_RedCave1_EventScript_2762BD - compare VAR_RESULT, 1 - call_if_eq SecretBase_RedCave1_EventScript_2762C1 - compare VAR_RESULT, 2 - call_if_eq SecretBase_RedCave1_EventScript_2762C5 - special HealPlayerParty - release - end - -SecretBase_RedCave1_EventScript_2762BD:: @ 82762BD - special sub_80EB438 - return - -SecretBase_RedCave1_EventScript_2762C1:: @ 82762C1 - special sub_80EB368 - return - -SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 - special sub_80EB3D0 - return - - .include "data/scripts/secret_power_tm.inc" - -SecretBase_EventScript_DollInteract:: @ 82766A2 - special sub_80EB290 - end - -SecretBase_EventScript_CushionInteract:: @ 82766A6 - special sub_80EB2C8 - end - -Text_2766AA: @ 82766AA - .string "All decorations and furniture in your\n" - .string "SECRET BASE will be returned to your PC.\p" - .string "Is that okay?$" - -Text_WantToRegisterSecretBase: @ 8276707 - .string "Do you want to register\n" - .string "{STR_VAR_1}'s SECRET BASE?$" - -Text_276731: @ 8276731 - .string "This data is already registered.\n" - .string "Would you like to delete it?$" - -Text_TooManyBasesDeleteSome: @ 827676F - .string "Up to 10 locations can be registered.\p" - .string "Delete a location if you want to\n" - .string "register another location.$" - -Text_2767D1: @ 82767D1 - .string "Registration completed.$" - -Text_2767E9: @ 82767E9 - .string "Data has been unregistered.$" - -Text_SecretBaseBootUpPC: @ 8276805 - .string "{PLAYER} booted up the PC.$" - -Text_SecretBasePCStartMenu: @ 827681A - .string "What would you like to do?$" - -Text_276835: @ 8276835 - .string "Once registered, a SECRET BASE will not\n" - .string "disappear unless the other TRAINER\l" - .string "moves it to a different location.\p" - .string "If a SECRET BASE is deleted from the\n" - .string "registered list, another one may take\l" - .string "its place.\p" - .string "Up to ten SECRET BASE locations\n" - .string "may be registered.$" - -SecretBase_Text_BattleTowerShield: @ 827692B - .string "A shield of {STR_VAR_2} that marks winning\n" - .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" - -SecretBase_Text_ToyTV: @ 8276974 - .string "A realistic toy TV. It could be easily\n" - .string "mistaken for the real thing.$" - -SecretBase_Text_SeedotTV: @ 82769B8 - .string "A toy TV shaped like a SEEDOT.\n" - .string "It looks ready to roll away on its own…$" - -SecretBase_Text_SkittyTV: @ 82769FF - .string "A toy TV shaped like a SKITTY.\n" - .string "It looks ready to stroll away…$" - -Text_276A3D: @ 8276A3D - .string "You may only make one SECRET BASE.\p" - .string "Would you like to move from the SECRET\n" - .string "BASE near {STR_VAR_1}?$" - -Text_276A95: @ 8276A95 - .string "Moving completed.\p" - .string "Would you like to use the SECRET POWER?$" diff --git a/data/scripts/secret_base_1.inc b/data/scripts/secret_base_1.inc new file mode 100644 index 000000000..dfe990dfd --- /dev/null +++ b/data/scripts/secret_base_1.inc @@ -0,0 +1,199 @@ +SecretBase_EventScript_PC:: @ 823B4BB + lockall + playse SE_PC_LOGIN + message SecretBase_Text_BootUpPC + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCShowMainMenu:: @ 823B4D3 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister + goto SecretBase_EventScript_PCMainMenuWithoutRegister + end + +SecretBase_EventScript_PCCancel:: @ 823B4E8 + lockall + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF + multichoice 0, 0, 6, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCRegistryMenu + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 + multichoice 0, 0, 5, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCPackUp:: @ 823B568 + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCShowMainMenu + closemessage + special MoveOutOfSecretBase + releaseall + end + +SecretBase_EventScript_PCDecorationMenu:: @ 823B581 + special ShowSecretBaseDecorationMenu + end + +SecretBase_EventScript_PCRegistryMenu:: @ 823B585 + special ShowSecretBaseRegistryMenu + end + +SecretBase_EventScript_RecordMixingPC:: @ 823B589 + lockall + message SecretBase_Text_BootUpPC + playse SE_PC_LOGIN + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + multichoice 0, 0, 7, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCRegister + case 1, SecretBase_EventScript_PCRegistryMenu + case 2, SecretBase_EventScript_PCRegistryInfo + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 + lockall + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegister:: @ 823B5F0 + special GetCurSecretBaseRegistrationValidity + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_AlreadyRegistered + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases + special CopyCurSecretBaseOwnerName_StrVar1 + msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_AlreadyRegistered:: @ 823B62F + msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_CantRegisterTooManyBases:: @ 823B652 + msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +SecretBase_EventScript_PCRegistryInfo:: @ 823B660 + msgbox SecretBase_Text_RegistryInfo, MSGBOX_DEFAULT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCTurnOff:: @ 823B66E + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +@ Unused +SecretBase_EventScript_23B674:: @ 823B674 + special SetSecretBaseSecretsTvFlags_Poster + end + +@ Unused +SecretBase_EventScript_23B678:: @ 823B678 + special SetSecretBaseSecretsTvFlags_MiscFurnature + end + +@ Unused +SecretBase_EventScript_23B67C:: @ 823B67C + special SetSecretBaseSecretsTvFlags_LargeDecorationSpot + end + +@ Unused +SecretBase_EventScript_23B680:: @ 823B680 + special SetSecretBaseSecretsTvFlags_SmallDecorationSpot + end + +SecretBase_EventScript_SandOrnament:: @ 823B684 + special SetSecretBaseSecretsTvFlags_SandOrnament + dofieldeffect FLDEFF_SAND_PILLAR + waitstate + end + +SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C + special GetShieldToyTVDecorationInfo + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_BattleTowerShield + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_ToyTV + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_SeedotTV + compare VAR_RESULT, 3 + goto_if_eq SecretBase_EventScript_SkittyTV + end + +SecretBase_EventScript_BattleTowerShield:: @ 823B6BC + msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN + end + +SecretBase_EventScript_ToyTV:: @ 823B6C5 + msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SeedotTV:: @ 823B6CE + msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SkittyTV:: @ 823B6D7 + msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN + end + +SecretBase_Text_SmallIndentInWall:: @ 823B6E0 + .string "There's a small indent in the wall.$" + +SecretBase_Text_UseSecretPower:: @ 823B704 + .string "There's a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_DiscoveredSmallCavern:: @ 823B73E + .string "Discovered a small cavern!$" + +SecretBase_Text_WantToMakeYourSecretBaseHere: @ 823B759 + .string "Want to make your SECRET BASE here?$" diff --git a/data/scripts/secret_base_2.inc b/data/scripts/secret_base_2.inc new file mode 100644 index 000000000..28b382bd0 --- /dev/null +++ b/data/scripts/secret_base_2.inc @@ -0,0 +1,1113 @@ +Text_274746: @ 8274746 + .string "If some vines drop down, this tree can\n" + .string "be climbed.$" + +Text_274779: @ 8274779 + .string "If some vines drop down, this tree can\n" + .string "be climbed.\p" + .string "Use the SECRET POWER?$" + +Text_2747C2: @ 82747C2 + .string "A thick vine dropped down!$" + +Text_2747DD: @ 82747DD + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.$" + +Text_274825: @ 8274825 + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.\p" + .string "Use the SECRET POWER?$" + +Text_274883: @ 8274883 + .string "Discovered a small entrance!$" + +SecretBase_RedCave1_Text_2748A0: @ 82748A0 + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Since you're already here, how would\n" + .string "you like to battle?$" + +SecretBase_RedCave1_Text_274939: @ 8274939 + .string "Okay!\n" + .string "Here we come!$" + +SecretBase_RedCave1_Text_27494D: @ 827494D + .string "Hunh?\n" + .string "Oh, you can't now…$" + +SecretBase_RedCave1_Text_274966:: @ 8274966 + .string "Waaargh! You're too strong!\n" + .string "About me losing… Please keep it secret!$" + +SecretBase_RedCave1_Text_2749AA: @ 82749AA + .string "What do you think of my SECRET BASE?\n" + .string "Come visit me again tomorrow.$" + +SecretBase_RedCave1_Text_2749ED: @ 82749ED + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Feel free to hang out!$" + +SecretBase_RedCave1_Text_274A64: @ 8274A64 + .string "There're a lot of places where\n" + .string "you can make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don't you think it's nice?\p" + .string "Oh, would you like to have a battle?$" + +SecretBase_RedCave1_Text_274AFA: @ 8274AFA + .string "Okay, here goes!$" + +SecretBase_RedCave1_Text_274B0B: @ 8274B0B + .string "Oh…\n" + .string "You can't now, okay.$" + +SecretBase_RedCave1_Text_274B24:: @ 8274B24 + .string "Hmmm… It's our loss…\n" + .string "But don't tell anyone!\l" + .string "It's a confidential secret!$" + +SecretBase_RedCave1_Text_274B6C: @ 8274B6C + .string "If you're in this area again,\n" + .string "I hope you'll visit me.$" + +SecretBase_RedCave1_Text_274BA2: @ 8274BA2 + .string "There're a lot of places where you can\n" + .string "make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don't you think it's nice?$" + +SecretBase_RedCave1_Text_274C13: @ 8274C13 + .string "This is a popular spot.\n" + .string "It's always taken.\p" + .string "Oh! Were you thinking about\n" + .string "taking this spot, too?\p" + .string "I'll tell you what, you can have this\n" + .string "spot if you can beat me.$" + +SecretBase_RedCave1_Text_274CB0: @ 8274CB0 + .string "Okay!\n" + .string "I'm going to defend my SECRET BASE!$" + +SecretBase_RedCave1_Text_274CDA: @ 8274CDA + .string "Hunh? Is that right?\n" + .string "You're not interested in this spot?$" + +SecretBase_RedCave1_Text_274D13:: @ 8274D13 + .string "I can't keep going!\n" + .string "I surrender!$" + +SecretBase_RedCave1_Text_274D34: @ 8274D34 + .string "Okay, when I move one day,\n" + .string "this place will be yours!$" + +SecretBase_RedCave1_Text_274D69: @ 8274D69 + .string "This is a popular spot.\n" + .string "It's always taken.\p" + .string "I waited a long time for it to open.\n" + .string "I finally got to use it!$" + +SecretBase_RedCave1_Text_274DD2: @ 8274DD2 + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.\p" + .string "Would you like to see how strong I am?$" + +SecretBase_RedCave1_Text_274E41: @ 8274E41 + .string "I'm going to go all out!$" + +SecretBase_RedCave1_Text_274E5A: @ 8274E5A + .string "Oh.\n" + .string "Some other time, then!$" + +SecretBase_RedCave1_Text_274E75:: @ 8274E75 + .string "Hmm… I've still got lots to learn.\n" + .string "I have to study some more.$" + +SecretBase_RedCave1_Text_274EB3: @ 8274EB3 + .string "Thanks for battling with me.\n" + .string "Please come back again tomorrow.$" + +SecretBase_RedCave1_Text_274EF1: @ 8274EF1 + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.$" + +SecretBase_RedCave1_Text_274F39: @ 8274F39 + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.\p" + .string "So, how would you like a battle?$" + +SecretBase_RedCave1_Text_274FCA: @ 8274FCA + .string "That's the way!$" + +SecretBase_RedCave1_Text_274FDA: @ 8274FDA + .string "When you're ready, give me a shout!$" + +SecretBase_RedCave1_Text_274FFE:: @ 8274FFE + .string "Aww! Done in!\n" + .string "But it's still fun to battle!$" + +SecretBase_RedCave1_Text_27502A: @ 827502A + .string "Well, anyway, I should go buy some\n" + .string "decorations and furniture.\p" + .string "I want my SECRET BASE to be a place\n" + .string "other people can enjoy.$" + +SecretBase_RedCave1_Text_2750A4: @ 82750A4 + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.$" + +SecretBase_RedCave1_Text_275114: @ 8275114 + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.\p" + .string "If you would be so kind, will you battle\n" + .string "with my POKéMON?$" + +SecretBase_RedCave1_Text_2751AF: @ 82751AF + .string "Thank you.\n" + .string "Shall we begin?$" + +SecretBase_RedCave1_Text_2751CA: @ 82751CA + .string "Oh.\n" + .string "How disappointing…$" + +SecretBase_RedCave1_Text_2751E1:: @ 82751E1 + .string "I concede…$" + +SecretBase_RedCave1_Text_2751EC: @ 82751EC + .string "That was all in good fun!\n" + .string "I should go enjoy shopping now.$" + +SecretBase_RedCave1_Text_275226: @ 8275226 + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.$" + +SecretBase_RedCave1_Text_275287: @ 8275287 + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?\p" + .string "But since you found me, how about we\n" + .string "have a battle?$" + +SecretBase_RedCave1_Text_275315: @ 8275315 + .string "I'm not going down easily!$" + +SecretBase_RedCave1_Text_275330: @ 8275330 + .string "Oh… Are you maybe tired from searching\n" + .string "for this place?$" + +SecretBase_RedCave1_Text_275367:: @ 8275367 + .string "I went down…$" + +SecretBase_RedCave1_Text_275374: @ 8275374 + .string "Where's your SECRET BASE?\n" + .string "I should go visit you there.$" + +SecretBase_RedCave1_Text_2753AB: @ 82753AB + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?$" + +SecretBase_RedCave1_Text_275405: @ 8275405 + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!\p" + .string "In the meantime, want to battle?$" + +SecretBase_RedCave1_Text_2754B2: @ 82754B2 + .string "This is my SECRET BASE.\n" + .string "I can't lose!$" + +SecretBase_RedCave1_Text_2754D8: @ 82754D8 + .string "I'll battle with you anytime.$" + +SecretBase_RedCave1_Text_2754F6:: @ 82754F6 + .string "Huh?\n" + .string "Did I just lose?$" + +SecretBase_RedCave1_Text_27550C: @ 827550C + .string "I won't lose at collecting decorations.\n" + .string "Come visit again!$" + +SecretBase_RedCave1_Text_275546: @ 8275546 + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!$" + +SecretBase_RedCave1_Text_2755D2: @ 82755D2 + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "That's what I do.\n" + .string "Want to battle with me?$" + +SecretBase_RedCave1_Text_275679: @ 8275679 + .string "Show me what you're made of!$" + +SecretBase_RedCave1_Text_275696: @ 8275696 + .string "I guess there are times when you're not\n" + .string "into it.$" + +SecretBase_RedCave1_Text_2756C7:: @ 82756C7 + .string "I know exactly what you're made of now.$" + +SecretBase_RedCave1_Text_2756EF: @ 82756EF + .string "We can both become stronger.\n" + .string "Let's keep at it!$" + +SecretBase_RedCave1_Text_27571E: @ 827571E + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "Every day is a great day.$" + +SecretBase_RedCave1_Text_2757B5: @ 82757B5 + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?\p" + .string "Want to see my taste in battling?$" + +SecretBase_RedCave1_Text_275884: @ 8275884 + .string "There's no holding back!$" + +SecretBase_RedCave1_Text_27589D: @ 827589D + .string "I'll be happy to demonstrate my style\n" + .string "anytime.$" + +SecretBase_RedCave1_Text_2758CC:: @ 82758CC + .string "You're supremely talented!\n" + .string "Your power seems to be limitless…$" + +SecretBase_RedCave1_Text_275909: @ 8275909 + .string "What did you think of my style?\n" + .string "I'll keep on polishing it!$" + +SecretBase_RedCave1_Text_275944: @ 8275944 + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?$" + +EventScript_2759F1:: @ 82759F1 + special GetSecretBaseTypeInFrontOfPlayer + special CheckPlayerHasSecretBase + compare VAR_RESULT, 1 + goto_if_eq EventScript_275BE8 + checkpartymove MOVE_SECRET_POWER + setfieldeffectargument 0, VAR_RESULT + buffermovename 1, MOVE_SECRET_POWER + compare VAR_0x8007, 1 + goto_if_eq EventScript_275A50 + compare VAR_0x8007, 2 + goto_if_eq EventScript_275A50 + compare VAR_0x8007, 3 + goto_if_eq EventScript_275A50 + compare VAR_0x8007, 4 + goto_if_eq EventScript_275A50 + compare VAR_0x8007, 5 + goto_if_eq EventScript_275AA9 + compare VAR_0x8007, 6 + goto_if_eq EventScript_275B02 + end + +EventScript_275A50:: @ 8275A50 + lockall + compare VAR_RESULT, 6 + goto_if_eq EventScript_275A91 + bufferpartymonnick 0, VAR_RESULT + msgbox SecretBase_Text_UseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_275CDE + msgbox Text_MonUsedHM, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE + waitstate + goto EventScript_275A9B + end + +EventScript_275A86:: @ 8275A86 + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE + waitstate + goto EventScript_275A9B + end + +EventScript_275A91:: @ 8275A91 + msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_DEFAULT + releaseall + end + +EventScript_275A9B:: @ 8275A9B + msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT + goto EventScript_275B5B + end + +EventScript_275AA9:: @ 8275AA9 + lockall + compare VAR_RESULT, 6 + goto_if_eq EventScript_275AEA + bufferpartymonnick 0, VAR_RESULT + msgbox Text_274779, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_275CDE + msgbox Text_MonUsedHM, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE + waitstate + goto EventScript_275AF4 + end + +EventScript_275ADF:: @ 8275ADF + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE + waitstate + goto EventScript_275AF4 + end + +EventScript_275AEA:: @ 8275AEA + msgbox Text_274746, MSGBOX_DEFAULT + releaseall + end + +EventScript_275AF4:: @ 8275AF4 + msgbox Text_2747C2, MSGBOX_DEFAULT + goto EventScript_275B5B + end + +EventScript_275B02:: @ 8275B02 + lockall + compare VAR_RESULT, 6 + goto_if_eq EventScript_275B43 + bufferpartymonnick 0, VAR_RESULT + msgbox Text_274825, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_275CDE + msgbox Text_MonUsedHM, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB + waitstate + goto EventScript_275B4D + end + +EventScript_275B38:: @ 8275B38 + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB + waitstate + goto EventScript_275B4D + end + +EventScript_275B43:: @ 8275B43 + msgbox Text_2747DD, MSGBOX_DEFAULT + releaseall + end + +EventScript_275B4D:: @ 8275B4D + msgbox Text_274883, MSGBOX_DEFAULT + goto EventScript_275B5B + end + +EventScript_275B5B:: @ 8275B5B + closemessage + playse SE_KAIDAN + setvar VAR_INIT_SECRET_BASE, 0 + setflag FLAG_DECORATION_0 + special SetPlayerSecretBase + special EnterSecretBase + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special InitSecretBaseDecorationSprites + setvar VAR_SECRET_BASE_INITIALIZED, 1 + waitstate + end + +SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 + applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 + waitmovement 0 + setvar VAR_INIT_SECRET_BASE, 1 + msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_275BAB + closemessage + playse SE_KAIDAN + special ClearAndLeaveSecretBase + end + +SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB + closemessage + setflag FLAG_RECEIVED_SECRET_POWER + special EnterNewlyCreatedSecretBase + waitstate + end + +SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 + walk_up + walk_up + step_end + +EventScript_275BB7:: @ 8275BB7 + lockall + setvar VAR_INIT_SECRET_BASE, 1 + playse SE_KAIDAN + special IsCurSecretBaseOwnedByAnotherPlayer + compare VAR_RESULT, 0 + goto_if_eq EventScript_275BDB + clearflag FLAG_DECORATION_0 + special EnterSecretBase + setvar VAR_SECRET_BASE_INITIALIZED, 0 + waitstate + end + +EventScript_275BDB:: @ 8275BDB + setflag FLAG_DECORATION_0 + special EnterSecretBase + setvar VAR_SECRET_BASE_INITIALIZED, 0 + waitstate + end + +EventScript_275BE8:: @ 8275BE8 + checkpartymove MOVE_SECRET_POWER + compare VAR_RESULT, 6 + goto_if_eq EventScript_275C9A + setfieldeffectargument 0, VAR_RESULT + setorcopyvar VAR_0x8004, VAR_RESULT + lockall + special GetSecretBaseNearbyMapName + msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_275CDE + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_275CDE + fadescreenswapbuffers 1 + special MoveOutOfSecretBaseFromOutside + closemessage + fadescreenswapbuffers 0 + msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_275CDE + bufferpartymonnick 0, VAR_0x8004 + buffermovename 1, MOVE_SECRET_POWER + msgbox Text_MonUsedHM, MSGBOX_DEFAULT + closemessage + closemessage + compare VAR_0x8007, 1 + goto_if_eq EventScript_275A86 + compare VAR_0x8007, 2 + goto_if_eq EventScript_275A86 + compare VAR_0x8007, 3 + goto_if_eq EventScript_275A86 + compare VAR_0x8007, 4 + goto_if_eq EventScript_275A86 + compare VAR_0x8007, 5 + goto_if_eq EventScript_275ADF + compare VAR_0x8007, 6 + goto_if_eq EventScript_275B38 + releaseall + end + +EventScript_275C9A:: @ 8275C9A + lockall + compare VAR_0x8007, 1 + goto_if_eq EventScript_275A91 + compare VAR_0x8007, 2 + goto_if_eq EventScript_275A91 + compare VAR_0x8007, 3 + goto_if_eq EventScript_275A91 + compare VAR_0x8007, 4 + goto_if_eq EventScript_275A91 + compare VAR_0x8007, 5 + goto_if_eq EventScript_275AEA + compare VAR_0x8007, 6 + goto_if_eq EventScript_275B43 + end + +EventScript_275CDE:: @ 8275CDE + closemessage + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 +LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 +SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 + setflag FLAG_DECORATION_1 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 + return + +EventScript_275D0C:: @ 8275D0C + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special InitSecretBaseDecorationSprites + setvar VAR_SECRET_BASE_INITIALIZED, 1 + end + +EventScript_275D1F:: @ 8275D1F + setvar VAR_0x8005, 0 + goto EventScript_275D2A + end + +EventScript_275D2A:: @ 8275D2A + special sub_8127E18 + end + +EventScript_275D2E:: @ 8275D2E + setvar VAR_0x8004, 0 + goto EventScript_275D39 + end + +EventScript_275D39:: @ 8275D39 + special sub_8129708 + compare VAR_RESULT, 1 + goto_if_eq EventScript_275D63 + addvar VAR_0x8004, 1 + compare VAR_0x8005, 0 + goto_if_eq EventScript_275D39 + removeobject VAR_0x8006 + setflag 0x8005 + goto EventScript_275D39 + end + +EventScript_275D63:: @ 8275D63 + end + +SecretBase_BlueCave1_EventScript_275D64:: @ 8275D64 +SecretBase_BlueCave2_EventScript_275D64:: @ 8275D64 +SecretBase_BlueCave3_EventScript_275D64:: @ 8275D64 +SecretBase_BlueCave4_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave1_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave2_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave3_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave4_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave1_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave2_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave3_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave4_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub1_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub2_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub3_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub4_EventScript_275D64:: @ 8275D64 +SecretBase_Tree1_EventScript_275D64:: @ 8275D64 +SecretBase_Tree2_EventScript_275D64:: @ 8275D64 +SecretBase_Tree3_EventScript_275D64:: @ 8275D64 +SecretBase_Tree4_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 + special GetSecretBaseOwnerInteractionState + compare VAR_0x8004, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275DD6 + compare VAR_0x8004, 1 + goto_if_eq SecretBase_RedCave1_EventScript_275E4E + compare VAR_0x8004, 2 + goto_if_eq SecretBase_RedCave1_EventScript_275EC6 + compare VAR_0x8004, 3 + goto_if_eq SecretBase_RedCave1_EventScript_275F3E + compare VAR_0x8004, 4 + goto_if_eq SecretBase_RedCave1_EventScript_275FB6 + compare VAR_0x8004, 5 + goto_if_eq SecretBase_RedCave1_EventScript_27602E + compare VAR_0x8004, 6 + goto_if_eq SecretBase_RedCave1_EventScript_2760A6 + compare VAR_0x8004, 7 + goto_if_eq SecretBase_RedCave1_EventScript_27611E + compare VAR_0x8004, 8 + goto_if_eq SecretBase_RedCave1_EventScript_276196 + compare VAR_0x8004, 9 + goto_if_eq SecretBase_RedCave1_EventScript_27620E + end + +SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E25 + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_275E44 + msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275E2F + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275E2F + msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 + msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 + msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E9D + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_275EBC + msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275EA7 + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275EA7 + msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D + msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC + msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F15 + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_275F34 + msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275F1F + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275F1F + msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 + msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 + msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F8D + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_275FAC + msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275F97 + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_275F97 + msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D + msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC + msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_276005 + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_276024 + msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_27600F + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_27600F + msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_276005:: @ 8276005 + msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27600F:: @ 827600F + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276024:: @ 8276024 + msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27602E:: @ 827602E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27607D + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_27609C + msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_276087 + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_276087 + msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_27607D:: @ 827607D + msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276087:: @ 8276087 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27609C:: @ 827609C + msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2760F5 + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_276114 + msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_2760FF + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_2760FF + msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 + msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276114:: @ 8276114 + msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27611E:: @ 827611E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27616D + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_27618C + msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_276177 + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_276177 + msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_27616D:: @ 827616D + msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276177:: @ 8276177 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27618C:: @ 827618C + msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276196:: @ 8276196 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2761E5 + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_276204 + msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_2761EF + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_2761EF + msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 + msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276204:: @ 8276204 + msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27620E:: @ 827620E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27625D + compare VAR_RESULT, 1 + goto_if_eq SecretBase_RedCave1_EventScript_27627C + msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_276267 + setvar VAR_RESULT, 1 + special sub_80EA30C + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_RedCave1_EventScript_276267 + msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_27625D:: @ 827625D + msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276267:: @ 8276267 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27627C:: @ 827627C + msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276286:: @ 8276286 + special PrepSecretBaseBattleFlags + setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + compare VAR_RESULT, 3 + call_if_eq SecretBase_RedCave1_EventScript_2762BD + compare VAR_RESULT, 1 + call_if_eq SecretBase_RedCave1_EventScript_2762C1 + compare VAR_RESULT, 2 + call_if_eq SecretBase_RedCave1_EventScript_2762C5 + special HealPlayerParty + release + end + +SecretBase_RedCave1_EventScript_2762BD:: @ 82762BD + special sub_80EB438 + return + +SecretBase_RedCave1_EventScript_2762C1:: @ 82762C1 + special sub_80EB368 + return + +SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 + special sub_80EB3D0 + return + + .include "data/scripts/secret_power_tm.inc" + +SecretBase_EventScript_DollInteract:: @ 82766A2 + special sub_80EB290 + end + +SecretBase_EventScript_CushionInteract:: @ 82766A6 + special sub_80EB2C8 + end + +SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA + .string "All decorations and furniture in your\n" + .string "SECRET BASE will be returned to your PC.\p" + .string "Is that okay?$" + +SecretBase_Text_WantToRegisterSecretBase: @ 8276707 + .string "Do you want to register\n" + .string "{STR_VAR_1}'s SECRET BASE?$" + +SecretBase_Text_AlreadyRegisteredDelete: @ 8276731 + .string "This data is already registered.\n" + .string "Would you like to delete it?$" + +SecretBase_Text_TooManyBasesDeleteSome: @ 827676F + .string "Up to 10 locations can be registered.\p" + .string "Delete a location if you want to\n" + .string "register another location.$" + +SecretBase_Text_RegistrationCompleted: @ 82767D1 + .string "Registration completed.$" + +SecretBase_Text_DataUnregistered: @ 82767E9 + .string "Data has been unregistered.$" + +SecretBase_Text_BootUpPC: @ 8276805 + .string "{PLAYER} booted up the PC.$" + +SecretBase_Text_WhatWouldYouLikeToDo: @ 827681A + .string "What would you like to do?$" + +SecretBase_Text_RegistryInfo: @ 8276835 + .string "Once registered, a SECRET BASE will not\n" + .string "disappear unless the other TRAINER\l" + .string "moves it to a different location.\p" + .string "If a SECRET BASE is deleted from the\n" + .string "registered list, another one may take\l" + .string "its place.\p" + .string "Up to ten SECRET BASE locations\n" + .string "may be registered.$" + +SecretBase_Text_BattleTowerShield: @ 827692B + .string "A shield of {STR_VAR_2} that marks winning\n" + .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" + +SecretBase_Text_ToyTV: @ 8276974 + .string "A realistic toy TV. It could be easily\n" + .string "mistaken for the real thing.$" + +SecretBase_Text_SeedotTV: @ 82769B8 + .string "A toy TV shaped like a SEEDOT.\n" + .string "It looks ready to roll away on its own…$" + +SecretBase_Text_SkittyTV: @ 82769FF + .string "A toy TV shaped like a SKITTY.\n" + .string "It looks ready to stroll away…$" + +SecretBase_Text_WouldYouLikeToMoveBases: @ 8276A3D + .string "You may only make one SECRET BASE.\p" + .string "Would you like to move from the SECRET\n" + .string "BASE near {STR_VAR_1}?$" + +SecretBase_Text_MovingCompletedUseSecretPower: @ 8276A95 + .string "Moving completed.\p" + .string "Would you like to use the SECRET POWER?$" -- cgit v1.2.3 From 9fbcd552de64511dd45c1306b5fcb9bd789b3ea4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Sep 2019 02:12:00 -0400 Subject: document remainder of secret_base scripts, delete unneeded scripts.incs --- data/scripts/field_move_scripts.inc | 6 +- data/scripts/secret_base.inc | 813 +++++++++++++++++++++++++ data/scripts/secret_base_1.inc | 199 ------- data/scripts/secret_base_2.inc | 1113 ----------------------------------- data/scripts/shared_secret_base.inc | 225 +++++++ 5 files changed, 1041 insertions(+), 1315 deletions(-) create mode 100644 data/scripts/secret_base.inc delete mode 100644 data/scripts/secret_base_1.inc delete mode 100644 data/scripts/secret_base_2.inc create mode 100644 data/scripts/shared_secret_base.inc (limited to 'data/scripts') diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 6eae55294..71d4b725c 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -11,7 +11,7 @@ EventScript_CutTree:: @ 82906BB msgbox Text_WantToCut, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_CancelCut - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate @@ -51,7 +51,7 @@ Text_WantToCut: @ 829072E .string "CUT down!\p" .string "Would you like to CUT it?$" -Text_MonUsedHM: @ 8290771 +Text_MonUsedFieldMove: @ 8290771 .string "{STR_VAR_1} used {STR_VAR_2}!$" Text_CantCut: @ 829077D @@ -70,7 +70,7 @@ EventScript_RockSmash:: @ 82907A6 msgbox Text_WantToSmash, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_CancelSmash - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc new file mode 100644 index 000000000..f2a99cd36 --- /dev/null +++ b/data/scripts/secret_base.inc @@ -0,0 +1,813 @@ +SecretBase_Text_TreeCanBeClimbed: @ 8274746 + .string "If some vines drop down, this tree can\n" + .string "be climbed.$" + +SecretBase_Text_TreeUseSecretPower: @ 8274779 + .string "If some vines drop down, this tree can\n" + .string "be climbed.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_VineDroppedDown: @ 82747C2 + .string "A thick vine dropped down!$" + +SecretBase_Text_ClumpOfGrass: @ 82747DD + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.$" + +SecretBase_Text_ClumpUseSecretPower: @ 8274825 + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_DiscoveredSmallEntrance: @ 8274883 + .string "Discovered a small entrance!$" + + .include "data/text/secret_base_trainers.inc" + +SecretBase_EventScript_CheckEntrance:: @ 82759F1 + special GetSecretBaseTypeInFrontOfPlayer + special CheckPlayerHasSecretBase + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase + checkpartymove MOVE_SECRET_POWER + setfieldeffectargument 0, VAR_RESULT + buffermovename 1, MOVE_SECRET_POWER + compare VAR_0x8007, SECRET_BASE_RED_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_BROWN_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_BLUE_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_YELLOW_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_TREE + goto_if_eq SecretBase_EventScript_Tree + compare VAR_0x8007, SECRET_BASE_SHRUB + goto_if_eq SecretBase_EventScript_Shrub + end + +SecretBase_EventScript_Cave:: @ 8275A50 + lockall + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + bufferpartymonnick 0, VAR_RESULT + msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE + waitstate + goto SecretBase_EventScript_CaveEnter + end + +SecretBase_EventScript_CaveUseSecretPower:: @ 8275A86 + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE + waitstate + goto SecretBase_EventScript_CaveEnter + end + +SecretBase_EventScript_CaveNoSecretPower:: @ 8275A91 + msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_DEFAULT + releaseall + end + +SecretBase_EventScript_CaveEnter:: @ 8275A9B + msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT + goto SecretBase_EventScript_InitSecretBase + end + +SecretBase_EventScript_Tree:: @ 8275AA9 + lockall + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_TreeNoSecretPower + bufferpartymonnick 0, VAR_RESULT + msgbox SecretBase_Text_TreeUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE + waitstate + goto SecretBase_EventScript_TreeEnter + end + +SecretBase_EventScript_TreeUseSecretPower:: @ 8275ADF + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE + waitstate + goto SecretBase_EventScript_TreeEnter + end + +SecretBase_EventScript_TreeNoSecretPower:: @ 8275AEA + msgbox SecretBase_Text_TreeCanBeClimbed, MSGBOX_DEFAULT + releaseall + end + +SecretBase_EventScript_TreeEnter:: @ 8275AF4 + msgbox SecretBase_Text_VineDroppedDown, MSGBOX_DEFAULT + goto SecretBase_EventScript_InitSecretBase + end + +SecretBase_EventScript_Shrub:: @ 8275B02 + lockall + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_ShrubNoSecretPower + bufferpartymonnick 0, VAR_RESULT + msgbox SecretBase_Text_ClumpUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB + waitstate + goto SecretBase_EventScript_ShrubEnter + end + +SecretBase_EventScript_ShrubUseSecretPower:: @ 8275B38 + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB + waitstate + goto SecretBase_EventScript_ShrubEnter + end + +SecretBase_EventScript_ShrubNoSecretPower:: @ 8275B43 + msgbox SecretBase_Text_ClumpOfGrass, MSGBOX_DEFAULT + releaseall + end + +SecretBase_EventScript_ShrubEnter:: @ 8275B4D + msgbox SecretBase_Text_DiscoveredSmallEntrance, MSGBOX_DEFAULT + goto SecretBase_EventScript_InitSecretBase + end + +SecretBase_EventScript_InitSecretBase:: @ 8275B5B + closemessage + playse SE_KAIDAN + setvar VAR_INIT_SECRET_BASE, 0 + setflag FLAG_DECORATION_0 + special SetPlayerSecretBase + special EnterSecretBase + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special InitSecretBaseDecorationSprites + setvar VAR_SECRET_BASE_INITIALIZED, 1 + waitstate + end + +SecretBase_EventScript_FirstEntrance:: @ 8275B81 + applymovement EVENT_OBJ_ID_PLAYER, SecretBase_Movement_275BB4 + waitmovement 0 + setvar VAR_INIT_SECRET_BASE, 1 + msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_SetAsBase + closemessage + playse SE_KAIDAN + special ClearAndLeaveSecretBase + end + +SecretBase_EventScript_SetAsBase:: @ 8275BAB + closemessage + setflag FLAG_RECEIVED_SECRET_POWER + special EnterNewlyCreatedSecretBase + waitstate + end + +SecretBase_Movement_275BB4: @ 8275BB4 + walk_up + walk_up + step_end + +SecretBase_EventScript_Enter:: @ 8275BB7 + lockall + setvar VAR_INIT_SECRET_BASE, 1 + playse SE_KAIDAN + special IsCurSecretBaseOwnedByAnotherPlayer + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_EnterPlayersBase + clearflag FLAG_DECORATION_0 + special EnterSecretBase + setvar VAR_SECRET_BASE_INITIALIZED, 0 + waitstate + end + +SecretBase_EventScript_EnterPlayersBase:: @ 8275BDB + setflag FLAG_DECORATION_0 + special EnterSecretBase + setvar VAR_SECRET_BASE_INITIALIZED, 0 + waitstate + end + +SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8 + checkpartymove MOVE_SECRET_POWER + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_NoSecretPower + setfieldeffectargument 0, VAR_RESULT + setorcopyvar VAR_0x8004, VAR_RESULT + lockall + special GetSecretBaseNearbyMapName + msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_CancelOnEntrance + fadescreenswapbuffers 1 + special MoveOutOfSecretBaseFromOutside + closemessage + fadescreenswapbuffers 0 + msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_CancelOnEntrance + bufferpartymonnick 0, VAR_0x8004 + buffermovename 1, MOVE_SECRET_POWER + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT + closemessage + closemessage + compare VAR_0x8007, SECRET_BASE_RED_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_BROWN_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_BLUE_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_YELLOW_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_TREE + goto_if_eq SecretBase_EventScript_TreeUseSecretPower + compare VAR_0x8007, SECRET_BASE_SHRUB + goto_if_eq SecretBase_EventScript_ShrubUseSecretPower + releaseall + end + +SecretBase_EventScript_NoSecretPower:: @ 8275C9A + lockall + compare VAR_0x8007, SECRET_BASE_RED_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_BROWN_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_BLUE_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_YELLOW_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_TREE + goto_if_eq SecretBase_EventScript_TreeNoSecretPower + compare VAR_0x8007, SECRET_BASE_SHRUB + goto_if_eq SecretBase_EventScript_ShrubNoSecretPower + end + +SecretBase_EventScript_CancelOnEntrance:: @ 8275CDE + closemessage + releaseall + end + +SecretBase_EventScript_SetDecorationFlags:: @ 8275CE1 + setflag FLAG_DECORATION_1 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 + return + +SecretBase_EventScript_InitDecorations:: @ 8275D0C + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special InitSecretBaseDecorationSprites + setvar VAR_SECRET_BASE_INITIALIZED, 1 + end + +SecretBase_EventScript_SetDecoration:: @ 8275D1F + setvar VAR_0x8005, 0 + goto SecretBase_EventScript_SetDecoration2 + end + +SecretBase_EventScript_SetDecoration2:: @ 8275D2A + special SetDecoration + end + +SecretBase_EventScript_PutAwayDecoration:: @ 8275D2E + setvar VAR_0x8004, 0 + goto SecretBase_EventScript_PutAwayDecorationLoop + end + +SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39 + special sub_8129708 + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_PutAwayDecorationEnd + addvar VAR_0x8004, 1 + compare VAR_0x8005, 0 + goto_if_eq SecretBase_EventScript_PutAwayDecorationLoop + removeobject VAR_0x8006 + setflag 0x8005 @ UB: GF likely meant setvar here; setflag 0x8005 is out of bounds + goto SecretBase_EventScript_PutAwayDecorationLoop + end + +SecretBase_EventScript_PutAwayDecorationEnd:: @ 8275D63 + end + +SecretBase_EventScript_RecordMixTrainer:: @ 8275D64 + special GetSecretBaseOwnerAndState + compare VAR_0x8004, 0 + goto_if_eq SecretBase_EventScript_Trainer0 + compare VAR_0x8004, 1 + goto_if_eq SecretBase_EventScript_Trainer1 + compare VAR_0x8004, 2 + goto_if_eq SecretBase_EventScript_Trainer2 + compare VAR_0x8004, 3 + goto_if_eq SecretBase_EventScript_Trainer3 + compare VAR_0x8004, 4 + goto_if_eq SecretBase_EventScript_Trainer4 + compare VAR_0x8004, 5 + goto_if_eq SecretBase_EventScript_Trainer5 + compare VAR_0x8004, 6 + goto_if_eq SecretBase_EventScript_Trainer6 + compare VAR_0x8004, 7 + goto_if_eq SecretBase_EventScript_Trainer7 + compare VAR_0x8004, 8 + goto_if_eq SecretBase_EventScript_Trainer8 + compare VAR_0x8004, 9 + goto_if_eq SecretBase_EventScript_Trainer9 + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer0:: @ 8275DD6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer0PostBattle + msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle + msgbox SecretBase_Text_Trainer0AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25 + msgbox SecretBase_Text_Trainer0PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer0PostBattle:: @ 8275E44 + msgbox SecretBase_Text_Trainer0PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer1:: @ 8275E4E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer1PostBattle + msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle + msgbox SecretBase_Text_Trainer1AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D + msgbox SecretBase_Text_Trainer1PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7 + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer1PostBattle:: @ 8275EBC + msgbox SecretBase_Text_Trainer1PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer2:: @ 8275EC6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer2PostBattle + msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle + msgbox SecretBase_Text_Trainer2AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15 + msgbox SecretBase_Text_Trainer2PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer2PostBattle:: @ 8275F34 + msgbox SecretBase_Text_Trainer2PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer3:: @ 8275F3E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer3PostBattle + msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle + msgbox SecretBase_Text_Trainer3AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D + msgbox SecretBase_Text_Trainer3PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97 + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer3PostBattle:: @ 8275FAC + msgbox SecretBase_Text_Trainer3PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer4:: @ 8275FB6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer4PostBattle + msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle + msgbox SecretBase_Text_Trainer4AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer4PreChampion:: @ 8276005 + msgbox SecretBase_Text_Trainer4PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer4PostBattle:: @ 8276024 + msgbox SecretBase_Text_Trainer4PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer5:: @ 827602E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer5PostBattle + msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle + msgbox SecretBase_Text_Trainer5AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer5PreChampion:: @ 827607D + msgbox SecretBase_Text_Trainer5PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087 + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer5PostBattle:: @ 827609C + msgbox SecretBase_Text_Trainer5PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer6:: @ 82760A6 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer6PostBattle + msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle + msgbox SecretBase_Text_Trainer6AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5 + msgbox SecretBase_Text_Trainer6PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer6PostBattle:: @ 8276114 + msgbox SecretBase_Text_Trainer6PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer7:: @ 827611E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer7PostBattle + msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle + msgbox SecretBase_Text_Trainer7AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer7PreChampion:: @ 827616D + msgbox SecretBase_Text_Trainer7PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177 + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer7PostBattle:: @ 827618C + msgbox SecretBase_Text_Trainer7PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer8:: @ 8276196 + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer8PostBattle + msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle + msgbox SecretBase_Text_Trainer8AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5 + msgbox SecretBase_Text_Trainer8PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer8PostBattle:: @ 8276204 + msgbox SecretBase_Text_Trainer8PostBattle, MSGBOX_DEFAULT + release + end + +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer9:: @ 827620E + lock + faceplayer + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_Trainer9PostBattle + msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle + setvar VAR_RESULT, 1 + special SetBattledOwnerFromResult + call Common_EventScript_SaveGame + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle + msgbox SecretBase_Text_Trainer9AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer + end + +SecretBase_EventScript_Trainer9PreChampion:: @ 827625D + msgbox SecretBase_Text_Trainer9PreChampion, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267 + special sub_80EB300 + setvar VAR_RESULT, 0 + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_Trainer9PostBattle:: @ 827627C + msgbox SecretBase_Text_Trainer9PostBattle, MSGBOX_DEFAULT + release + end + +SecretBase_EventScript_BattleTrainer:: @ 8276286 + special PrepSecretBaseBattleFlags + setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + compare VAR_RESULT, B_OUTCOME_DREW + call_if_eq SecretBase_EventScript_2762BD + compare VAR_RESULT, B_OUTCOME_WON + call_if_eq SecretBase_EventScript_2762C1 + compare VAR_RESULT, B_OUTCOME_LOST + call_if_eq SecretBase_EventScript_2762C5 + special HealPlayerParty + release + end + +SecretBase_EventScript_2762BD:: @ 82762BD + special sub_80EB438 + return + +SecretBase_EventScript_2762C1:: @ 82762C1 + special sub_80EB368 + return + +SecretBase_EventScript_2762C5:: @ 82762C5 + special sub_80EB3D0 + return + + .include "data/scripts/secret_power_tm.inc" + +SecretBase_EventScript_DollInteract:: @ 82766A2 + special sub_80EB290 + end + +SecretBase_EventScript_CushionInteract:: @ 82766A6 + special sub_80EB2C8 + end + +SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA + .string "All decorations and furniture in your\n" + .string "SECRET BASE will be returned to your PC.\p" + .string "Is that okay?$" + +SecretBase_Text_WantToRegisterSecretBase: @ 8276707 + .string "Do you want to register\n" + .string "{STR_VAR_1}'s SECRET BASE?$" + +SecretBase_Text_AlreadyRegisteredDelete: @ 8276731 + .string "This data is already registered.\n" + .string "Would you like to delete it?$" + +SecretBase_Text_TooManyBasesDeleteSome: @ 827676F + .string "Up to 10 locations can be registered.\p" + .string "Delete a location if you want to\n" + .string "register another location.$" + +SecretBase_Text_RegistrationCompleted: @ 82767D1 + .string "Registration completed.$" + +SecretBase_Text_DataUnregistered: @ 82767E9 + .string "Data has been unregistered.$" + +SecretBase_Text_BootUpPC: @ 8276805 + .string "{PLAYER} booted up the PC.$" + +SecretBase_Text_WhatWouldYouLikeToDo: @ 827681A + .string "What would you like to do?$" + +SecretBase_Text_RegistryInfo: @ 8276835 + .string "Once registered, a SECRET BASE will not\n" + .string "disappear unless the other TRAINER\l" + .string "moves it to a different location.\p" + .string "If a SECRET BASE is deleted from the\n" + .string "registered list, another one may take\l" + .string "its place.\p" + .string "Up to ten SECRET BASE locations\n" + .string "may be registered.$" + +SecretBase_Text_BattleTowerShield: @ 827692B + .string "A shield of {STR_VAR_2} that marks winning\n" + .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" + +SecretBase_Text_ToyTV: @ 8276974 + .string "A realistic toy TV. It could be easily\n" + .string "mistaken for the real thing.$" + +SecretBase_Text_SeedotTV: @ 82769B8 + .string "A toy TV shaped like a SEEDOT.\n" + .string "It looks ready to roll away on its own…$" + +SecretBase_Text_SkittyTV: @ 82769FF + .string "A toy TV shaped like a SKITTY.\n" + .string "It looks ready to stroll away…$" + +SecretBase_Text_WouldYouLikeToMoveBases: @ 8276A3D + .string "You may only make one SECRET BASE.\p" + .string "Would you like to move from the SECRET\n" + .string "BASE near {STR_VAR_1}?$" + +SecretBase_Text_MovingCompletedUseSecretPower: @ 8276A95 + .string "Moving completed.\p" + .string "Would you like to use the SECRET POWER?$" diff --git a/data/scripts/secret_base_1.inc b/data/scripts/secret_base_1.inc deleted file mode 100644 index dfe990dfd..000000000 --- a/data/scripts/secret_base_1.inc +++ /dev/null @@ -1,199 +0,0 @@ -SecretBase_EventScript_PC:: @ 823B4BB - lockall - playse SE_PC_LOGIN - message SecretBase_Text_BootUpPC - dofieldeffect FLDEFF_PCTURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto SecretBase_EventScript_PCShowMainMenu - end - -SecretBase_EventScript_PCShowMainMenu:: @ 823B4D3 - message SecretBase_Text_WhatWouldYouLikeToDo - waitmessage - goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister - goto SecretBase_EventScript_PCMainMenuWithoutRegister - end - -SecretBase_EventScript_PCCancel:: @ 823B4E8 - lockall - goto SecretBase_EventScript_PCShowMainMenu - end - -SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF - multichoice 0, 0, 6, 0 - switch VAR_RESULT - case 0, SecretBase_EventScript_PCDecorationMenu - case 1, SecretBase_EventScript_PCPackUp - case 2, SecretBase_EventScript_PCRegistryMenu - case 3, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff - end - -SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 - multichoice 0, 0, 5, 0 - switch VAR_RESULT - case 0, SecretBase_EventScript_PCDecorationMenu - case 1, SecretBase_EventScript_PCPackUp - case 2, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff - end - -SecretBase_EventScript_PCPackUp:: @ 823B568 - msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_EventScript_PCShowMainMenu - closemessage - special MoveOutOfSecretBase - releaseall - end - -SecretBase_EventScript_PCDecorationMenu:: @ 823B581 - special ShowSecretBaseDecorationMenu - end - -SecretBase_EventScript_PCRegistryMenu:: @ 823B585 - special ShowSecretBaseRegistryMenu - end - -SecretBase_EventScript_RecordMixingPC:: @ 823B589 - lockall - message SecretBase_Text_BootUpPC - playse SE_PC_LOGIN - dofieldeffect FLDEFF_PCTURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto SecretBase_EventScript_PCRegisterMenu - end - -SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 - message SecretBase_Text_WhatWouldYouLikeToDo - waitmessage - multichoice 0, 0, 7, 0 - switch VAR_RESULT - case 0, SecretBase_EventScript_PCRegister - case 1, SecretBase_EventScript_PCRegistryMenu - case 2, SecretBase_EventScript_PCRegistryInfo - case 3, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff - end - -SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 - lockall - goto SecretBase_EventScript_PCRegisterMenu - end - -SecretBase_EventScript_PCRegister:: @ 823B5F0 - special GetCurSecretBaseRegistrationValidity - compare VAR_RESULT, 1 - goto_if_eq SecretBase_EventScript_AlreadyRegistered - compare VAR_RESULT, 2 - goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases - special CopyCurSecretBaseOwnerName_StrVar1 - msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_EventScript_PCRegisterMenu - msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN - special ToggleCurSecretBaseRegistry - special DoSecretBasePCTurnOffEffect - releaseall - end - -SecretBase_EventScript_AlreadyRegistered:: @ 823B62F - msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_EventScript_PCRegisterMenu - msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN - special ToggleCurSecretBaseRegistry - special DoSecretBasePCTurnOffEffect - releaseall - end - -SecretBase_EventScript_CantRegisterTooManyBases:: @ 823B652 - msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -SecretBase_EventScript_PCRegistryInfo:: @ 823B660 - msgbox SecretBase_Text_RegistryInfo, MSGBOX_DEFAULT - goto SecretBase_EventScript_PCRegisterMenu - end - -SecretBase_EventScript_PCTurnOff:: @ 823B66E - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -@ Unused -SecretBase_EventScript_23B674:: @ 823B674 - special SetSecretBaseSecretsTvFlags_Poster - end - -@ Unused -SecretBase_EventScript_23B678:: @ 823B678 - special SetSecretBaseSecretsTvFlags_MiscFurnature - end - -@ Unused -SecretBase_EventScript_23B67C:: @ 823B67C - special SetSecretBaseSecretsTvFlags_LargeDecorationSpot - end - -@ Unused -SecretBase_EventScript_23B680:: @ 823B680 - special SetSecretBaseSecretsTvFlags_SmallDecorationSpot - end - -SecretBase_EventScript_SandOrnament:: @ 823B684 - special SetSecretBaseSecretsTvFlags_SandOrnament - dofieldeffect FLDEFF_SAND_PILLAR - waitstate - end - -SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C - special GetShieldToyTVDecorationInfo - compare VAR_RESULT, 0 - goto_if_eq SecretBase_EventScript_BattleTowerShield - compare VAR_RESULT, 1 - goto_if_eq SecretBase_EventScript_ToyTV - compare VAR_RESULT, 2 - goto_if_eq SecretBase_EventScript_SeedotTV - compare VAR_RESULT, 3 - goto_if_eq SecretBase_EventScript_SkittyTV - end - -SecretBase_EventScript_BattleTowerShield:: @ 823B6BC - msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN - end - -SecretBase_EventScript_ToyTV:: @ 823B6C5 - msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN - end - -SecretBase_EventScript_SeedotTV:: @ 823B6CE - msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN - end - -SecretBase_EventScript_SkittyTV:: @ 823B6D7 - msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN - end - -SecretBase_Text_SmallIndentInWall:: @ 823B6E0 - .string "There's a small indent in the wall.$" - -SecretBase_Text_UseSecretPower:: @ 823B704 - .string "There's a small indent in the wall.\p" - .string "Use the SECRET POWER?$" - -SecretBase_Text_DiscoveredSmallCavern:: @ 823B73E - .string "Discovered a small cavern!$" - -SecretBase_Text_WantToMakeYourSecretBaseHere: @ 823B759 - .string "Want to make your SECRET BASE here?$" diff --git a/data/scripts/secret_base_2.inc b/data/scripts/secret_base_2.inc deleted file mode 100644 index 28b382bd0..000000000 --- a/data/scripts/secret_base_2.inc +++ /dev/null @@ -1,1113 +0,0 @@ -Text_274746: @ 8274746 - .string "If some vines drop down, this tree can\n" - .string "be climbed.$" - -Text_274779: @ 8274779 - .string "If some vines drop down, this tree can\n" - .string "be climbed.\p" - .string "Use the SECRET POWER?$" - -Text_2747C2: @ 82747C2 - .string "A thick vine dropped down!$" - -Text_2747DD: @ 82747DD - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.$" - -Text_274825: @ 8274825 - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.\p" - .string "Use the SECRET POWER?$" - -Text_274883: @ 8274883 - .string "Discovered a small entrance!$" - -SecretBase_RedCave1_Text_2748A0: @ 82748A0 - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Since you're already here, how would\n" - .string "you like to battle?$" - -SecretBase_RedCave1_Text_274939: @ 8274939 - .string "Okay!\n" - .string "Here we come!$" - -SecretBase_RedCave1_Text_27494D: @ 827494D - .string "Hunh?\n" - .string "Oh, you can't now…$" - -SecretBase_RedCave1_Text_274966:: @ 8274966 - .string "Waaargh! You're too strong!\n" - .string "About me losing… Please keep it secret!$" - -SecretBase_RedCave1_Text_2749AA: @ 82749AA - .string "What do you think of my SECRET BASE?\n" - .string "Come visit me again tomorrow.$" - -SecretBase_RedCave1_Text_2749ED: @ 82749ED - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Feel free to hang out!$" - -SecretBase_RedCave1_Text_274A64: @ 8274A64 - .string "There're a lot of places where\n" - .string "you can make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?\p" - .string "Oh, would you like to have a battle?$" - -SecretBase_RedCave1_Text_274AFA: @ 8274AFA - .string "Okay, here goes!$" - -SecretBase_RedCave1_Text_274B0B: @ 8274B0B - .string "Oh…\n" - .string "You can't now, okay.$" - -SecretBase_RedCave1_Text_274B24:: @ 8274B24 - .string "Hmmm… It's our loss…\n" - .string "But don't tell anyone!\l" - .string "It's a confidential secret!$" - -SecretBase_RedCave1_Text_274B6C: @ 8274B6C - .string "If you're in this area again,\n" - .string "I hope you'll visit me.$" - -SecretBase_RedCave1_Text_274BA2: @ 8274BA2 - .string "There're a lot of places where you can\n" - .string "make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?$" - -SecretBase_RedCave1_Text_274C13: @ 8274C13 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "Oh! Were you thinking about\n" - .string "taking this spot, too?\p" - .string "I'll tell you what, you can have this\n" - .string "spot if you can beat me.$" - -SecretBase_RedCave1_Text_274CB0: @ 8274CB0 - .string "Okay!\n" - .string "I'm going to defend my SECRET BASE!$" - -SecretBase_RedCave1_Text_274CDA: @ 8274CDA - .string "Hunh? Is that right?\n" - .string "You're not interested in this spot?$" - -SecretBase_RedCave1_Text_274D13:: @ 8274D13 - .string "I can't keep going!\n" - .string "I surrender!$" - -SecretBase_RedCave1_Text_274D34: @ 8274D34 - .string "Okay, when I move one day,\n" - .string "this place will be yours!$" - -SecretBase_RedCave1_Text_274D69: @ 8274D69 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "I waited a long time for it to open.\n" - .string "I finally got to use it!$" - -SecretBase_RedCave1_Text_274DD2: @ 8274DD2 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.\p" - .string "Would you like to see how strong I am?$" - -SecretBase_RedCave1_Text_274E41: @ 8274E41 - .string "I'm going to go all out!$" - -SecretBase_RedCave1_Text_274E5A: @ 8274E5A - .string "Oh.\n" - .string "Some other time, then!$" - -SecretBase_RedCave1_Text_274E75:: @ 8274E75 - .string "Hmm… I've still got lots to learn.\n" - .string "I have to study some more.$" - -SecretBase_RedCave1_Text_274EB3: @ 8274EB3 - .string "Thanks for battling with me.\n" - .string "Please come back again tomorrow.$" - -SecretBase_RedCave1_Text_274EF1: @ 8274EF1 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.$" - -SecretBase_RedCave1_Text_274F39: @ 8274F39 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.\p" - .string "So, how would you like a battle?$" - -SecretBase_RedCave1_Text_274FCA: @ 8274FCA - .string "That's the way!$" - -SecretBase_RedCave1_Text_274FDA: @ 8274FDA - .string "When you're ready, give me a shout!$" - -SecretBase_RedCave1_Text_274FFE:: @ 8274FFE - .string "Aww! Done in!\n" - .string "But it's still fun to battle!$" - -SecretBase_RedCave1_Text_27502A: @ 827502A - .string "Well, anyway, I should go buy some\n" - .string "decorations and furniture.\p" - .string "I want my SECRET BASE to be a place\n" - .string "other people can enjoy.$" - -SecretBase_RedCave1_Text_2750A4: @ 82750A4 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.$" - -SecretBase_RedCave1_Text_275114: @ 8275114 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.\p" - .string "If you would be so kind, will you battle\n" - .string "with my POKéMON?$" - -SecretBase_RedCave1_Text_2751AF: @ 82751AF - .string "Thank you.\n" - .string "Shall we begin?$" - -SecretBase_RedCave1_Text_2751CA: @ 82751CA - .string "Oh.\n" - .string "How disappointing…$" - -SecretBase_RedCave1_Text_2751E1:: @ 82751E1 - .string "I concede…$" - -SecretBase_RedCave1_Text_2751EC: @ 82751EC - .string "That was all in good fun!\n" - .string "I should go enjoy shopping now.$" - -SecretBase_RedCave1_Text_275226: @ 8275226 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.$" - -SecretBase_RedCave1_Text_275287: @ 8275287 - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?\p" - .string "But since you found me, how about we\n" - .string "have a battle?$" - -SecretBase_RedCave1_Text_275315: @ 8275315 - .string "I'm not going down easily!$" - -SecretBase_RedCave1_Text_275330: @ 8275330 - .string "Oh… Are you maybe tired from searching\n" - .string "for this place?$" - -SecretBase_RedCave1_Text_275367:: @ 8275367 - .string "I went down…$" - -SecretBase_RedCave1_Text_275374: @ 8275374 - .string "Where's your SECRET BASE?\n" - .string "I should go visit you there.$" - -SecretBase_RedCave1_Text_2753AB: @ 82753AB - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?$" - -SecretBase_RedCave1_Text_275405: @ 8275405 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!\p" - .string "In the meantime, want to battle?$" - -SecretBase_RedCave1_Text_2754B2: @ 82754B2 - .string "This is my SECRET BASE.\n" - .string "I can't lose!$" - -SecretBase_RedCave1_Text_2754D8: @ 82754D8 - .string "I'll battle with you anytime.$" - -SecretBase_RedCave1_Text_2754F6:: @ 82754F6 - .string "Huh?\n" - .string "Did I just lose?$" - -SecretBase_RedCave1_Text_27550C: @ 827550C - .string "I won't lose at collecting decorations.\n" - .string "Come visit again!$" - -SecretBase_RedCave1_Text_275546: @ 8275546 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!$" - -SecretBase_RedCave1_Text_2755D2: @ 82755D2 - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "That's what I do.\n" - .string "Want to battle with me?$" - -SecretBase_RedCave1_Text_275679: @ 8275679 - .string "Show me what you're made of!$" - -SecretBase_RedCave1_Text_275696: @ 8275696 - .string "I guess there are times when you're not\n" - .string "into it.$" - -SecretBase_RedCave1_Text_2756C7:: @ 82756C7 - .string "I know exactly what you're made of now.$" - -SecretBase_RedCave1_Text_2756EF: @ 82756EF - .string "We can both become stronger.\n" - .string "Let's keep at it!$" - -SecretBase_RedCave1_Text_27571E: @ 827571E - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "Every day is a great day.$" - -SecretBase_RedCave1_Text_2757B5: @ 82757B5 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?\p" - .string "Want to see my taste in battling?$" - -SecretBase_RedCave1_Text_275884: @ 8275884 - .string "There's no holding back!$" - -SecretBase_RedCave1_Text_27589D: @ 827589D - .string "I'll be happy to demonstrate my style\n" - .string "anytime.$" - -SecretBase_RedCave1_Text_2758CC:: @ 82758CC - .string "You're supremely talented!\n" - .string "Your power seems to be limitless…$" - -SecretBase_RedCave1_Text_275909: @ 8275909 - .string "What did you think of my style?\n" - .string "I'll keep on polishing it!$" - -SecretBase_RedCave1_Text_275944: @ 8275944 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?$" - -EventScript_2759F1:: @ 82759F1 - special GetSecretBaseTypeInFrontOfPlayer - special CheckPlayerHasSecretBase - compare VAR_RESULT, 1 - goto_if_eq EventScript_275BE8 - checkpartymove MOVE_SECRET_POWER - setfieldeffectargument 0, VAR_RESULT - buffermovename 1, MOVE_SECRET_POWER - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275AA9 - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B02 - end - -EventScript_275A50:: @ 8275A50 - lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275A91 - bufferpartymonnick 0, VAR_RESULT - msgbox SecretBase_Text_UseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE - waitstate - goto EventScript_275A9B - end - -EventScript_275A86:: @ 8275A86 - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE - waitstate - goto EventScript_275A9B - end - -EventScript_275A91:: @ 8275A91 - msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_DEFAULT - releaseall - end - -EventScript_275A9B:: @ 8275A9B - msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275AA9:: @ 8275AA9 - lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275AEA - bufferpartymonnick 0, VAR_RESULT - msgbox Text_274779, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_TREE - waitstate - goto EventScript_275AF4 - end - -EventScript_275ADF:: @ 8275ADF - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_TREE - waitstate - goto EventScript_275AF4 - end - -EventScript_275AEA:: @ 8275AEA - msgbox Text_274746, MSGBOX_DEFAULT - releaseall - end - -EventScript_275AF4:: @ 8275AF4 - msgbox Text_2747C2, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275B02:: @ 8275B02 - lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275B43 - bufferpartymonnick 0, VAR_RESULT - msgbox Text_274825, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB - waitstate - goto EventScript_275B4D - end - -EventScript_275B38:: @ 8275B38 - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB - waitstate - goto EventScript_275B4D - end - -EventScript_275B43:: @ 8275B43 - msgbox Text_2747DD, MSGBOX_DEFAULT - releaseall - end - -EventScript_275B4D:: @ 8275B4D - msgbox Text_274883, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275B5B:: @ 8275B5B - closemessage - playse SE_KAIDAN - setvar VAR_INIT_SECRET_BASE, 0 - setflag FLAG_DECORATION_0 - special SetPlayerSecretBase - special EnterSecretBase - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special InitSecretBaseDecorationSprites - setvar VAR_SECRET_BASE_INITIALIZED, 1 - waitstate - end - -SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 - applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 - waitmovement 0 - setvar VAR_INIT_SECRET_BASE, 1 - msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275BAB - closemessage - playse SE_KAIDAN - special ClearAndLeaveSecretBase - end - -SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB - closemessage - setflag FLAG_RECEIVED_SECRET_POWER - special EnterNewlyCreatedSecretBase - waitstate - end - -SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 - walk_up - walk_up - step_end - -EventScript_275BB7:: @ 8275BB7 - lockall - setvar VAR_INIT_SECRET_BASE, 1 - playse SE_KAIDAN - special IsCurSecretBaseOwnedByAnotherPlayer - compare VAR_RESULT, 0 - goto_if_eq EventScript_275BDB - clearflag FLAG_DECORATION_0 - special EnterSecretBase - setvar VAR_SECRET_BASE_INITIALIZED, 0 - waitstate - end - -EventScript_275BDB:: @ 8275BDB - setflag FLAG_DECORATION_0 - special EnterSecretBase - setvar VAR_SECRET_BASE_INITIALIZED, 0 - waitstate - end - -EventScript_275BE8:: @ 8275BE8 - checkpartymove MOVE_SECRET_POWER - compare VAR_RESULT, 6 - goto_if_eq EventScript_275C9A - setfieldeffectargument 0, VAR_RESULT - setorcopyvar VAR_0x8004, VAR_RESULT - lockall - special GetSecretBaseNearbyMapName - msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - fadescreenswapbuffers 1 - special MoveOutOfSecretBaseFromOutside - closemessage - fadescreenswapbuffers 0 - msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - bufferpartymonnick 0, VAR_0x8004 - buffermovename 1, MOVE_SECRET_POWER - msgbox Text_MonUsedHM, MSGBOX_DEFAULT - closemessage - closemessage - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275ADF - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B38 - releaseall - end - -EventScript_275C9A:: @ 8275C9A - lockall - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275AEA - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B43 - end - -EventScript_275CDE:: @ 8275CDE - closemessage - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 -LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 -SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 - setflag FLAG_DECORATION_1 - setflag FLAG_DECORATION_2 - setflag FLAG_DECORATION_3 - setflag FLAG_DECORATION_4 - setflag FLAG_DECORATION_5 - setflag FLAG_DECORATION_6 - setflag FLAG_DECORATION_7 - setflag FLAG_DECORATION_8 - setflag FLAG_DECORATION_9 - setflag FLAG_DECORATION_10 - setflag FLAG_DECORATION_11 - setflag FLAG_DECORATION_12 - setflag FLAG_DECORATION_13 - setflag FLAG_DECORATION_14 - return - -EventScript_275D0C:: @ 8275D0C - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special InitSecretBaseDecorationSprites - setvar VAR_SECRET_BASE_INITIALIZED, 1 - end - -EventScript_275D1F:: @ 8275D1F - setvar VAR_0x8005, 0 - goto EventScript_275D2A - end - -EventScript_275D2A:: @ 8275D2A - special sub_8127E18 - end - -EventScript_275D2E:: @ 8275D2E - setvar VAR_0x8004, 0 - goto EventScript_275D39 - end - -EventScript_275D39:: @ 8275D39 - special sub_8129708 - compare VAR_RESULT, 1 - goto_if_eq EventScript_275D63 - addvar VAR_0x8004, 1 - compare VAR_0x8005, 0 - goto_if_eq EventScript_275D39 - removeobject VAR_0x8006 - setflag 0x8005 - goto EventScript_275D39 - end - -EventScript_275D63:: @ 8275D63 - end - -SecretBase_BlueCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave4_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave4_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave1_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave2_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave3_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave4_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub1_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub2_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub3_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub4_EventScript_275D64:: @ 8275D64 -SecretBase_Tree1_EventScript_275D64:: @ 8275D64 -SecretBase_Tree2_EventScript_275D64:: @ 8275D64 -SecretBase_Tree3_EventScript_275D64:: @ 8275D64 -SecretBase_Tree4_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 - special GetSecretBaseOwnerInteractionState - compare VAR_0x8004, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275DD6 - compare VAR_0x8004, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275E4E - compare VAR_0x8004, 2 - goto_if_eq SecretBase_RedCave1_EventScript_275EC6 - compare VAR_0x8004, 3 - goto_if_eq SecretBase_RedCave1_EventScript_275F3E - compare VAR_0x8004, 4 - goto_if_eq SecretBase_RedCave1_EventScript_275FB6 - compare VAR_0x8004, 5 - goto_if_eq SecretBase_RedCave1_EventScript_27602E - compare VAR_0x8004, 6 - goto_if_eq SecretBase_RedCave1_EventScript_2760A6 - compare VAR_0x8004, 7 - goto_if_eq SecretBase_RedCave1_EventScript_27611E - compare VAR_0x8004, 8 - goto_if_eq SecretBase_RedCave1_EventScript_276196 - compare VAR_0x8004, 9 - goto_if_eq SecretBase_RedCave1_EventScript_27620E - end - -SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E25 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275E44 - msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275E2F - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275E2F - msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 - msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 - msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E9D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275EBC - msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275EA7 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275EA7 - msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D - msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC - msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F15 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275F34 - msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F1F - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F1F - msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 - msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 - msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F8D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275FAC - msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F97 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F97 - msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D - msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC - msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_276005 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276024 - msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_27600F - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_27600F - msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_276005:: @ 8276005 - msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27600F:: @ 827600F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276024:: @ 8276024 - msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27602E:: @ 827602E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27607D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27609C - msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276087 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276087 - msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27607D:: @ 827607D - msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276087:: @ 8276087 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27609C:: @ 827609C - msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2760F5 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276114 - msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2760FF - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2760FF - msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 - msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276114:: @ 8276114 - msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27611E:: @ 827611E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27616D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27618C - msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276177 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276177 - msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27616D:: @ 827616D - msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276177:: @ 8276177 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27618C:: @ 827618C - msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276196:: @ 8276196 - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2761E5 - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276204 - msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2761EF - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2761EF - msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 - msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276204:: @ 8276204 - msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27620E:: @ 827620E - lock - faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27625D - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27627C - msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276267 - setvar VAR_RESULT, 1 - special sub_80EA30C - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276267 - msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27625D:: @ 827625D - msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276267:: @ 8276267 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27627C:: @ 827627C - msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276286:: @ 8276286 - special PrepSecretBaseBattleFlags - setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - compare VAR_RESULT, 3 - call_if_eq SecretBase_RedCave1_EventScript_2762BD - compare VAR_RESULT, 1 - call_if_eq SecretBase_RedCave1_EventScript_2762C1 - compare VAR_RESULT, 2 - call_if_eq SecretBase_RedCave1_EventScript_2762C5 - special HealPlayerParty - release - end - -SecretBase_RedCave1_EventScript_2762BD:: @ 82762BD - special sub_80EB438 - return - -SecretBase_RedCave1_EventScript_2762C1:: @ 82762C1 - special sub_80EB368 - return - -SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 - special sub_80EB3D0 - return - - .include "data/scripts/secret_power_tm.inc" - -SecretBase_EventScript_DollInteract:: @ 82766A2 - special sub_80EB290 - end - -SecretBase_EventScript_CushionInteract:: @ 82766A6 - special sub_80EB2C8 - end - -SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA - .string "All decorations and furniture in your\n" - .string "SECRET BASE will be returned to your PC.\p" - .string "Is that okay?$" - -SecretBase_Text_WantToRegisterSecretBase: @ 8276707 - .string "Do you want to register\n" - .string "{STR_VAR_1}'s SECRET BASE?$" - -SecretBase_Text_AlreadyRegisteredDelete: @ 8276731 - .string "This data is already registered.\n" - .string "Would you like to delete it?$" - -SecretBase_Text_TooManyBasesDeleteSome: @ 827676F - .string "Up to 10 locations can be registered.\p" - .string "Delete a location if you want to\n" - .string "register another location.$" - -SecretBase_Text_RegistrationCompleted: @ 82767D1 - .string "Registration completed.$" - -SecretBase_Text_DataUnregistered: @ 82767E9 - .string "Data has been unregistered.$" - -SecretBase_Text_BootUpPC: @ 8276805 - .string "{PLAYER} booted up the PC.$" - -SecretBase_Text_WhatWouldYouLikeToDo: @ 827681A - .string "What would you like to do?$" - -SecretBase_Text_RegistryInfo: @ 8276835 - .string "Once registered, a SECRET BASE will not\n" - .string "disappear unless the other TRAINER\l" - .string "moves it to a different location.\p" - .string "If a SECRET BASE is deleted from the\n" - .string "registered list, another one may take\l" - .string "its place.\p" - .string "Up to ten SECRET BASE locations\n" - .string "may be registered.$" - -SecretBase_Text_BattleTowerShield: @ 827692B - .string "A shield of {STR_VAR_2} that marks winning\n" - .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" - -SecretBase_Text_ToyTV: @ 8276974 - .string "A realistic toy TV. It could be easily\n" - .string "mistaken for the real thing.$" - -SecretBase_Text_SeedotTV: @ 82769B8 - .string "A toy TV shaped like a SEEDOT.\n" - .string "It looks ready to roll away on its own…$" - -SecretBase_Text_SkittyTV: @ 82769FF - .string "A toy TV shaped like a SKITTY.\n" - .string "It looks ready to stroll away…$" - -SecretBase_Text_WouldYouLikeToMoveBases: @ 8276A3D - .string "You may only make one SECRET BASE.\p" - .string "Would you like to move from the SECRET\n" - .string "BASE near {STR_VAR_1}?$" - -SecretBase_Text_MovingCompletedUseSecretPower: @ 8276A95 - .string "Moving completed.\p" - .string "Would you like to use the SECRET POWER?$" diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc new file mode 100644 index 000000000..cbde8af36 --- /dev/null +++ b/data/scripts/shared_secret_base.inc @@ -0,0 +1,225 @@ +@ Label is unused, but all the Secret Base MapScripts fall through to here +SecretBase_MapScripts:: + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SecretBase_MapScript1_OnResume + .byte 0 + +SecretBase_MapScript2_OnWarp: @ 823B498 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations + .2byte 0 + +SecretBase_MapScript1_OnTransition: @ 823B4A2 + call SecretBase_EventScript_SetDecorationFlags + special SetSecretBaseOwnerGfxId + special InitSecretBaseVars + end + +SecretBase_MapScript2_OnFrame: @ 823B4AE + map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance + .2byte 0 + +SecretBase_MapScript1_OnResume: @ 823B4B8 + setstepcallback 6 + end + +SecretBase_EventScript_PC:: @ 823B4BB + lockall + playse SE_PC_LOGIN + message SecretBase_Text_BootUpPC + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCShowMainMenu:: @ 823B4D3 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister + goto SecretBase_EventScript_PCMainMenuWithoutRegister + end + +SecretBase_EventScript_PCCancel:: @ 823B4E8 + lockall + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF + multichoice 0, 0, 6, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCRegistryMenu + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 + multichoice 0, 0, 5, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCPackUp:: @ 823B568 + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCShowMainMenu + closemessage + special MoveOutOfSecretBase + releaseall + end + +SecretBase_EventScript_PCDecorationMenu:: @ 823B581 + special ShowSecretBaseDecorationMenu + end + +SecretBase_EventScript_PCRegistryMenu:: @ 823B585 + special ShowSecretBaseRegistryMenu + end + +SecretBase_EventScript_RecordMixingPC:: @ 823B589 + lockall + message SecretBase_Text_BootUpPC + playse SE_PC_LOGIN + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + multichoice 0, 0, 7, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCRegister + case 1, SecretBase_EventScript_PCRegistryMenu + case 2, SecretBase_EventScript_PCRegistryInfo + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 + lockall + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegister:: @ 823B5F0 + special GetCurSecretBaseRegistrationValidity + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_AlreadyRegistered + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases + special CopyCurSecretBaseOwnerName_StrVar1 + msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_AlreadyRegistered:: @ 823B62F + msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_CantRegisterTooManyBases:: @ 823B652 + msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +SecretBase_EventScript_PCRegistryInfo:: @ 823B660 + msgbox SecretBase_Text_RegistryInfo, MSGBOX_DEFAULT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCTurnOff:: @ 823B66E + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +@ Unused +SecretBase_EventScript_23B674:: @ 823B674 + special SetSecretBaseSecretsTvFlags_Poster + end + +@ Unused +SecretBase_EventScript_23B678:: @ 823B678 + special SetSecretBaseSecretsTvFlags_MiscFurnature + end + +@ Unused +SecretBase_EventScript_23B67C:: @ 823B67C + special SetSecretBaseSecretsTvFlags_LargeDecorationSpot + end + +@ Unused +SecretBase_EventScript_23B680:: @ 823B680 + special SetSecretBaseSecretsTvFlags_SmallDecorationSpot + end + +SecretBase_EventScript_SandOrnament:: @ 823B684 + special SetSecretBaseSecretsTvFlags_SandOrnament + dofieldeffect FLDEFF_SAND_PILLAR + waitstate + end + +SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C + special GetShieldToyTVDecorationInfo + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_BattleTowerShield + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_ToyTV + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_SeedotTV + compare VAR_RESULT, 3 + goto_if_eq SecretBase_EventScript_SkittyTV + end + +SecretBase_EventScript_BattleTowerShield:: @ 823B6BC + msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN + end + +SecretBase_EventScript_ToyTV:: @ 823B6C5 + msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SeedotTV:: @ 823B6CE + msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SkittyTV:: @ 823B6D7 + msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN + end + +SecretBase_Text_SmallIndentInWall:: @ 823B6E0 + .string "There's a small indent in the wall.$" + +SecretBase_Text_IndentUseSecretPower:: @ 823B704 + .string "There's a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_DiscoveredSmallCavern:: @ 823B73E + .string "Discovered a small cavern!$" + +SecretBase_Text_WantToMakeYourSecretBaseHere: @ 823B759 + .string "Want to make your SECRET BASE here?$" -- cgit v1.2.3 From cb82d868afab3d98c028b29ff516201d4157826a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Sep 2019 02:49:26 -0400 Subject: fix secret base jsons --- data/scripts/shared_secret_base.inc | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index cbde8af36..f2a0f8523 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -1,5 +1,27 @@ -@ Label is unused, but all the Secret Base MapScripts fall through to here -SecretBase_MapScripts:: +SecretBase_RedCave1_MapScripts:: @ 823B483 +SecretBase_RedCave2_MapScripts:: @ 823B483 +SecretBase_RedCave3_MapScripts:: @ 823B483 +SecretBase_RedCave4_MapScripts:: @ 823B483 +SecretBase_BrownCave1_MapScripts:: @ 823B483 +SecretBase_BrownCave2_MapScripts:: @ 823B483 +SecretBase_BrownCave3_MapScripts:: @ 823B483 +SecretBase_BrownCave4_MapScripts:: @ 823B483 +SecretBase_BlueCave1_MapScripts:: @ 823B483 +SecretBase_BlueCave2_MapScripts:: @ 823B483 +SecretBase_BlueCave3_MapScripts:: @ 823B483 +SecretBase_BlueCave4_MapScripts:: @ 823B483 +SecretBase_YellowCave1_MapScripts:: @ 823B483 +SecretBase_YellowCave2_MapScripts:: @ 823B483 +SecretBase_YellowCave3_MapScripts:: @ 823B483 +SecretBase_YellowCave4_MapScripts:: @ 823B483 +SecretBase_Tree1_MapScripts:: @ 823B483 +SecretBase_Tree2_MapScripts:: @ 823B483 +SecretBase_Tree3_MapScripts:: @ 823B483 +SecretBase_Tree4_MapScripts:: @ 823B483 +SecretBase_Shrub1_MapScripts:: @ 823B483 +SecretBase_Shrub2_MapScripts:: @ 823B483 +SecretBase_Shrub3_MapScripts:: @ 823B483 +SecretBase_Shrub4_MapScripts:: @ 823B483 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame -- cgit v1.2.3 From 826fc3154e2fd85e535c3941090e644b3ce771af Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Sep 2019 13:01:45 -0400 Subject: condense secret base mapscript labels --- data/scripts/shared_secret_base.inc | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index f2a0f8523..7a993948b 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -1,27 +1,4 @@ -SecretBase_RedCave1_MapScripts:: @ 823B483 -SecretBase_RedCave2_MapScripts:: @ 823B483 -SecretBase_RedCave3_MapScripts:: @ 823B483 -SecretBase_RedCave4_MapScripts:: @ 823B483 -SecretBase_BrownCave1_MapScripts:: @ 823B483 -SecretBase_BrownCave2_MapScripts:: @ 823B483 -SecretBase_BrownCave3_MapScripts:: @ 823B483 -SecretBase_BrownCave4_MapScripts:: @ 823B483 -SecretBase_BlueCave1_MapScripts:: @ 823B483 -SecretBase_BlueCave2_MapScripts:: @ 823B483 -SecretBase_BlueCave3_MapScripts:: @ 823B483 -SecretBase_BlueCave4_MapScripts:: @ 823B483 -SecretBase_YellowCave1_MapScripts:: @ 823B483 -SecretBase_YellowCave2_MapScripts:: @ 823B483 -SecretBase_YellowCave3_MapScripts:: @ 823B483 -SecretBase_YellowCave4_MapScripts:: @ 823B483 -SecretBase_Tree1_MapScripts:: @ 823B483 -SecretBase_Tree2_MapScripts:: @ 823B483 -SecretBase_Tree3_MapScripts:: @ 823B483 -SecretBase_Tree4_MapScripts:: @ 823B483 -SecretBase_Shrub1_MapScripts:: @ 823B483 -SecretBase_Shrub2_MapScripts:: @ 823B483 -SecretBase_Shrub3_MapScripts:: @ 823B483 -SecretBase_Shrub4_MapScripts:: @ 823B483 +SecretBase_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame -- cgit v1.2.3 From f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 16 Sep 2019 00:29:59 -0400 Subject: Fix misnamed function --- data/scripts/pkmn_center_nurse.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 9b1b576b4..bfeba79e3 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -48,7 +48,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 return EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1 - specialvar VAR_RESULT, PlayerAtTrainerHillEntrance + specialvar VAR_RESULT, PlayerNotAtTrainerHillEntrance compare VAR_RESULT, 0 goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn specialvar VAR_RESULT, BufferUnionRoomPlayerName -- cgit v1.2.3 From 06af24bce58b9285166d27fc371ad3c3dbb63a29 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Sep 2019 23:47:07 -0400 Subject: Use misc ScrCmd constants --- data/scripts/cable_club.inc | 2 +- data/scripts/contest_hall.inc | 126 +++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 64 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index eeecf2d75..8501edadd 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -99,7 +99,7 @@ MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD - turnobject VAR_0x8007, 3 + turnobject VAR_0x8007, DIR_WEST OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6c19cdc0c..0aa0f31c8 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -261,7 +261,7 @@ LinkContestRoom1_EventScript_27A091:: @ 827A091 return LinkContestRoom1_EventScript_27A097:: @ 827A097 - buffercontesttypestring 1, 32776 + buffercontesttypestring 1, VAR_0x8008 bufferstdstring 2, VAR_0x8009 call LinkContestRoom1_EventScript_27A0B1 lockall @@ -1012,71 +1012,71 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B return LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F - turnvobject 0, 1 - turnvobject 2, 1 - turnvobject 4, 4 - turnvobject 6, 1 - turnvobject 8, 1 - turnvobject 10, 1 - turnvobject 12, 1 - turnvobject 14, 1 - turnvobject 16, 1 - turnvobject 18, 1 - turnvobject 20, 4 - turnvobject 22, 4 - turnvobject 25, 4 - turnvobject 27, 3 - turnvobject 28, 4 + turnvobject 0, DIR_SOUTH + turnvobject 2, DIR_SOUTH + turnvobject 4, DIR_EAST + turnvobject 6, DIR_SOUTH + turnvobject 8, DIR_SOUTH + turnvobject 10, DIR_SOUTH + turnvobject 12, DIR_SOUTH + turnvobject 14, DIR_SOUTH + turnvobject 16, DIR_SOUTH + turnvobject 18, DIR_SOUTH + turnvobject 20, DIR_EAST + turnvobject 22, DIR_EAST + turnvobject 25, DIR_EAST + turnvobject 27, DIR_WEST + turnvobject 28, DIR_EAST delay 10 - turnvobject 0, 4 - turnvobject 2, 4 - turnvobject 4, 4 - turnvobject 6, 4 - turnvobject 8, 4 - turnvobject 10, 3 - turnvobject 12, 3 - turnvobject 14, 3 - turnvobject 16, 3 - turnvobject 18, 3 - turnvobject 20, 1 - turnvobject 22, 1 - turnvobject 25, 2 - turnvobject 27, 2 - turnvobject 28, 2 + turnvobject 0, DIR_EAST + turnvobject 2, DIR_EAST + turnvobject 4, DIR_EAST + turnvobject 6, DIR_EAST + turnvobject 8, DIR_EAST + turnvobject 10, DIR_WEST + turnvobject 12, DIR_WEST + turnvobject 14, DIR_WEST + turnvobject 16, DIR_WEST + turnvobject 18, DIR_WEST + turnvobject 20, DIR_SOUTH + turnvobject 22, DIR_SOUTH + turnvobject 25, DIR_NORTH + turnvobject 27, DIR_NORTH + turnvobject 28, DIR_NORTH delay 10 - turnvobject 1, 2 - turnvobject 3, 2 - turnvobject 5, 2 - turnvobject 7, 2 - turnvobject 9, 4 - turnvobject 11, 2 - turnvobject 15, 2 - turnvobject 13, 2 - turnvobject 17, 2 - turnvobject 19, 2 - turnvobject 21, 3 - turnvobject 23, 3 - turnvobject 24, 3 - turnvobject 26, 4 - turnvobject 29, 3 - turnvobject 30, 3 + turnvobject 1, DIR_NORTH + turnvobject 3, DIR_NORTH + turnvobject 5, DIR_NORTH + turnvobject 7, DIR_NORTH + turnvobject 9, DIR_EAST + turnvobject 11, DIR_NORTH + turnvobject 15, DIR_NORTH + turnvobject 13, DIR_NORTH + turnvobject 17, DIR_NORTH + turnvobject 19, DIR_NORTH + turnvobject 21, DIR_WEST + turnvobject 23, DIR_WEST + turnvobject 24, DIR_WEST + turnvobject 26, DIR_EAST + turnvobject 29, DIR_WEST + turnvobject 30, DIR_WEST delay 10 - turnvobject 1, 4 - turnvobject 3, 4 - turnvobject 5, 4 - turnvobject 7, 4 - turnvobject 9, 4 - turnvobject 11, 3 - turnvobject 15, 3 - turnvobject 13, 3 - turnvobject 17, 3 - turnvobject 19, 3 - turnvobject 21, 1 - turnvobject 23, 1 - turnvobject 24, 1 - turnvobject 26, 2 - turnvobject 29, 2 - turnvobject 30, 2 + turnvobject 1, DIR_EAST + turnvobject 3, DIR_EAST + turnvobject 5, DIR_EAST + turnvobject 7, DIR_EAST + turnvobject 9, DIR_EAST + turnvobject 11, DIR_WEST + turnvobject 15, DIR_WEST + turnvobject 13, DIR_WEST + turnvobject 17, DIR_WEST + turnvobject 19, DIR_WEST + turnvobject 21, DIR_SOUTH + turnvobject 23, DIR_SOUTH + turnvobject 24, DIR_SOUTH + turnvobject 26, DIR_NORTH + turnvobject 29, DIR_NORTH + turnvobject 30, DIR_NORTH delay 10 return -- cgit v1.2.3 From aac9658a8ee9a23bbb7cf8a56496a49b8cdbe61d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Sep 2019 14:24:07 -0400 Subject: Document some field_specials data --- data/scripts/cable_club.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 8501edadd..76988dfeb 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -978,7 +978,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B faceplayer setvar VAR_FRONTIER_FACILITY, 8 goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 - specialvar VAR_RESULT, sub_813990C + specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED @@ -1086,7 +1086,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 faceplayer setvar VAR_FRONTIER_FACILITY, 9 goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 - specialvar VAR_RESULT, sub_813990C + specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B specialvar VAR_RESULT, IsWirelessAdapterConnected -- cgit v1.2.3 From b596322ca2a4fa575311397158ce2ecb0053781b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Sep 2019 18:57:25 -0400 Subject: Initial script_menu documentation --- data/scripts/cable_club.inc | 16 ++++++++-------- data/scripts/contest_hall.inc | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 76988dfeb..7e431382c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1626,15 +1626,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1 .string "Which of our services do you wish\n" .string "to use?$" -OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B +CableClub_Text_TradeUsingLinkCable:: @ 8277F1B .string "Trade POKéMON with another player\n" .string "using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A +CableClub_Text_BattleUsingLinkCable:: @ 8277F5A .string "You may battle another TRAINER\n" .string "using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96 +CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 .string "You can use the RECORD CORNER with\n" .string "others using a GBA Game Link cable.$" @@ -1804,19 +1804,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792 .string "Please wait.$" -OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F +CableClub_Text_YouMayTradeHere:: @ 827879F .string "You may trade your POKéMON here\n" .string "with another TRAINER.$" -OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5 +CableClub_Text_YouMayBattleHere:: @ 82787D5 .string "You may battle with your friends\n" .string "here.$" -OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC +CableClub_Text_CanMakeBerryPowder:: @ 82787FC .string "Two to five TRAINERS can make\n" .string "BERRY POWDER together.$" -OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831 +CableClub_Text_CanMixRecords:: @ 8278831 .string "The records of two to four players\n" .string "can be mixed together.$" @@ -1824,7 +1824,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B .string "A guide to the WIRELESS CLUB's\n" .string "various services.$" -OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C +CableClub_Text_CancelSelectedItem:: @ 827889C .string "Cancels the selected MENU item.$" OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 0aa0f31c8..80420541e 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -216,19 +216,19 @@ LinkContestRoom1_EventScript_279FF2:: @ 8279FF2 return LinkContestRoom1_EventScript_27A024:: @ 827A024 - setvar VAR_0x8009, 5 + setvar VAR_0x8009, STDSTRING_NORMAL return LinkContestRoom1_EventScript_27A02A:: @ 827A02A - setvar VAR_0x8009, 6 + setvar VAR_0x8009, STDSTRING_SUPER return LinkContestRoom1_EventScript_27A030:: @ 827A030 - setvar VAR_0x8009, 7 + setvar VAR_0x8009, STDSTRING_HYPER return LinkContestRoom1_EventScript_27A036:: @ 827A036 - setvar VAR_0x8009, 8 + setvar VAR_0x8009, STDSTRING_MASTER return LinkContestRoom1_EventScript_27A03C:: @ 827A03C @@ -241,23 +241,23 @@ LinkContestRoom1_EventScript_27A03C:: @ 827A03C return LinkContestRoom1_EventScript_27A079:: @ 827A079 - setvar VAR_0x8008, 0 + setvar VAR_0x8008, CONTEST_CATEGORY_COOL return LinkContestRoom1_EventScript_27A07F:: @ 827A07F - setvar VAR_0x8008, 1 + setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY return LinkContestRoom1_EventScript_27A085:: @ 827A085 - setvar VAR_0x8008, 2 + setvar VAR_0x8008, CONTEST_CATEGORY_CUTE return LinkContestRoom1_EventScript_27A08B:: @ 827A08B - setvar VAR_0x8008, 3 + setvar VAR_0x8008, CONTEST_CATEGORY_SMART return LinkContestRoom1_EventScript_27A091:: @ 827A091 - setvar VAR_0x8008, 4 + setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH return LinkContestRoom1_EventScript_27A097:: @ 827A097 -- cgit v1.2.3 From de0084ef7a932e27c0020c589f0e2916aef5aeb8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 19 Sep 2019 00:56:51 -0400 Subject: Document multichoice ids --- data/scripts/cable_club.inc | 60 ++++++++++++++++++------------------- data/scripts/contest_hall.inc | 16 +++++----- data/scripts/mystery_event_club.inc | 8 ++--- data/scripts/players_house.inc | 2 +- data/scripts/pokeblocks.inc | 4 +-- 5 files changed, 45 insertions(+), 45 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 7e431382c..822f1bd6c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -344,22 +344,22 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 setvar VAR_0x8004, 0 goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 - multichoice 0, 0, 74, 0 + multichoice 0, 0, MULTI_LINK_SERVICES_A1, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75 - multichoice 0, 0, 76, 0 + multichoice 0, 0, MULTI_LINK_SERVICES_B1, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 @@ -370,14 +370,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 message OldaleTown_PokemonCenter_2F_Text_2790BE waitmessage - multichoice 0, 0, 18, 0 + multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23 case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55 case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15 case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 @@ -991,12 +991,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B end OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C - multichoice 17, 6, 17, 0 + multichoice 17, 6, MULTI_YESNOINFO, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC case 2, OldaleTown_PokemonCenter_2F_EventScript_277593 - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 @@ -1103,44 +1103,44 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E - multichoice 0, 0, 78, 0 + multichoice 0, 0, MULTI_LINK_SERVICES_C, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7 case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E - multichoice 0, 0, 79, 0 + multichoice 0, 0, MULTI_LINK_SERVICES_D, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7 case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB - multichoice 0, 0, 75, 0 + multichoice 0, 0, MULTI_LINK_SERVICES_A2, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB - multichoice 0, 0, 77, 0 + multichoice 0, 0, MULTI_LINK_SERVICES_B2, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D @@ -1157,14 +1157,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B message OldaleTown_PokemonCenter_2F_Text_2790BE waitmessage - multichoice 0, 0, 18, 0 + multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E case 1, OldaleTown_PokemonCenter_2F_EventScript_277899 case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0 case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E @@ -1235,12 +1235,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 message OldaleTown_PokemonCenter_2F_Text_2792CD waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 @@ -1268,12 +1268,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 message OldaleTown_PokemonCenter_2F_Text_279334 waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 @@ -1301,12 +1301,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 message OldaleTown_PokemonCenter_2F_Text_2793A3 waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08 case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 @@ -1445,12 +1445,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 faceplayer message MossdeepCity_GameCorner_1F_Text_278A7D waitmessage - multichoice 0, 0, 80, 0 + multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT case 0, MossdeepCity_GameCorner_1F_EventScript_277C73 case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D case 2, MossdeepCity_GameCorner_1F_EventScript_277C87 - case 127, MossdeepCity_GameCorner_1F_EventScript_277C87 + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87 end MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 @@ -1479,12 +1479,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 delay 60 message MossdeepCity_GameCorner_1F_Text_278DAD waitmessage - multichoice 0, 0, 80, 0 + multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9 case 1, MossdeepCity_GameCorner_1F_EventScript_277D35 case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 end MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 @@ -1528,12 +1528,12 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 message MossdeepCity_GameCorner_1F_Text_2793A3 waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6 case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 end MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 80420541e..03863eb40 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -43,24 +43,24 @@ LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A message LilycoveCity_ContestLobby_Text_27AF28 waitmessage - multichoice 0, 0, 2, 0 + multichoice 0, 0, MULTI_ENTERINFO, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279E62 case 1, LilycoveCity_ContestLobby_EventScript_279D97 case 2, LilycoveCity_ContestLobby_EventScript_279E09 - case 127, LilycoveCity_ContestLobby_EventScript_279E09 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 end LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97 message LilycoveCity_ContestLobby_Text_27AF5E waitmessage - multichoice 0, 0, 3, 0 + multichoice 0, 0, MULTI_CONTEST_INFO, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279DDF case 1, LilycoveCity_ContestLobby_EventScript_279DED case 2, LilycoveCity_ContestLobby_EventScript_279DFB case 3, LilycoveCity_ContestLobby_EventScript_279D5A - case 127, LilycoveCity_ContestLobby_EventScript_279D5A + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A end LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF @@ -104,14 +104,14 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62 message LilycoveCity_ContestLobby_Text_27B3FF waitmessage - multichoice 0, 0, 82, 0 + multichoice 0, 0, MULTI_CONTEST_RANK, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279EB5 case 1, LilycoveCity_ContestLobby_EventScript_279EC0 case 2, LilycoveCity_ContestLobby_EventScript_279ECB case 3, LilycoveCity_ContestLobby_EventScript_279ED6 case 4, LilycoveCity_ContestLobby_EventScript_279E09 - case 127, LilycoveCity_ContestLobby_EventScript_279E09 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 end LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5 @@ -137,10 +137,10 @@ LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6 LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1 message LilycoveCity_ContestLobby_Text_27B423 waitmessage - multichoice 0, 0, 4, 0 + multichoice 0, 0, MULTI_CONTEST_TYPE, 0 switch VAR_RESULT case 5, LilycoveCity_ContestLobby_EventScript_279E09 - case 127, LilycoveCity_ContestLobby_EventScript_279E09 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 copyvar VAR_CONTEST_CATEGORY, VAR_RESULT goto LilycoveCity_ContestLobby_EventScript_279E13 end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index cc189a96b..c8cb84107 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -8,12 +8,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT - multichoice 17, 6, 20, 0 + multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591 - case 127, PetalburgCity_PokemonCenter_1F_EventScript_2915EB + case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB end PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 @@ -60,12 +60,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5 PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT - multichoice 17, 6, 20, 0 + multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650 case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642 - case 127, PetalburgCity_PokemonCenter_1F_EventScript_29167C + case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C end PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index c4a5ffe86..855c5eac2 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -507,7 +507,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT - multichoice 22, 8, 108, 1 + multichoice 22, 8, MULTI_TV_LATI, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_ROAMER_POKEMON, VAR_RESULT 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 -- cgit v1.2.3 From b6dffcf8b774ca06287dda30fa5a6323bd8835f6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 19 Sep 2019 19:23:24 -0400 Subject: Clean up script_menu documentation --- data/scripts/cable_club.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 822f1bd6c..d9a5157ab 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -344,7 +344,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 setvar VAR_0x8004, 0 goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 - multichoice 0, 0, MULTI_LINK_SERVICES_A1, 0 + multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 @@ -353,7 +353,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 end OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75 - multichoice 0, 0, MULTI_LINK_SERVICES_B1, 0 + multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 @@ -1103,7 +1103,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E - multichoice 0, 0, MULTI_LINK_SERVICES_C, 0 + multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B @@ -1113,7 +1113,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 end OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E - multichoice 0, 0, MULTI_LINK_SERVICES_D, 0 + multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B @@ -1125,7 +1125,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB - multichoice 0, 0, MULTI_LINK_SERVICES_A2, 0 + multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B @@ -1134,7 +1134,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B end OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB - multichoice 0, 0, MULTI_LINK_SERVICES_B2, 0 + multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B -- cgit v1.2.3 From 80f58f7b24058db4f6e6ab62b24875d0b78b084a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 17 Sep 2019 15:24:44 -0400 Subject: Document PLAYER_HAS constants, consolidate poke constants --- data/scripts/cable_club.inc | 4 ++-- data/scripts/trainer_battle.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 76988dfeb..780651b43 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -392,7 +392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 @@ -1174,7 +1174,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index c205a9d22..21ba0d6d3 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A compare VAR_RESULT, 0 goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 compare VAR_RESULT, 0 goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement -- cgit v1.2.3 From de6e1e9ecf72f9ffad23d83a3cfccdbabd2b239b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 23 Sep 2019 00:36:49 -0400 Subject: Use multi constants from merge --- data/scripts/shared_secret_base.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index 7a993948b..933835a73 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -48,22 +48,22 @@ SecretBase_EventScript_PCCancel:: @ 823B4E8 end SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF - multichoice 0, 0, 6, 0 + multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, 0 switch VAR_RESULT case 0, SecretBase_EventScript_PCDecorationMenu case 1, SecretBase_EventScript_PCPackUp case 2, SecretBase_EventScript_PCRegistryMenu case 3, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff end SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 - multichoice 0, 0, 5, 0 + multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, 0 switch VAR_RESULT case 0, SecretBase_EventScript_PCDecorationMenu case 1, SecretBase_EventScript_PCPackUp case 2, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff end SecretBase_EventScript_PCPackUp:: @ 823B568 @@ -98,13 +98,13 @@ SecretBase_EventScript_RecordMixingPC:: @ 823B589 SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 message SecretBase_Text_WhatWouldYouLikeToDo waitmessage - multichoice 0, 0, 7, 0 + multichoice 0, 0, MULTI_REGISTER_MENU, 0 switch VAR_RESULT case 0, SecretBase_EventScript_PCRegister case 1, SecretBase_EventScript_PCRegistryMenu case 2, SecretBase_EventScript_PCRegistryInfo case 3, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff end SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 -- cgit v1.2.3 From 801ca37f0402083d7c0749cbf2ea473bf9dc4894 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 25 Sep 2019 14:48:22 -0400 Subject: Document day_care.inc and related --- data/scripts/day_care.inc | 307 +++++++++++++++++++++++----------------------- 1 file changed, 155 insertions(+), 152 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 057a2fa07..9006029cd 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,245 +1,245 @@ -Route117_EventScript_291C18:: @ 8291C18 +Route117_EventScript_DaycareMan:: @ 8291C18 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_291C4D - compare VAR_RESULT, 2 - goto_if_eq Route117_EventScript_291CD1 - compare VAR_RESULT, 3 - goto_if_eq Route117_EventScript_291CE8 - msgbox Route117_Text_291FCF, MSGBOX_DEFAULT + compare VAR_RESULT, DAYCARE_EGG_WAITING + goto_if_eq Route117_EventScript_DaycareEggWaiting + compare VAR_RESULT, DAYCARE_ONE_MON + goto_if_eq Route117_EventScript_CheckOnOneMon + compare VAR_RESULT, DAYCARE_TWO_MONS + goto_if_eq Route117_EventScript_CheckOnTwoMons + msgbox Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon, MSGBOX_DEFAULT release end -Route117_EventScript_291C4D:: @ 8291C4D - msgbox Route117_Text_29205D, MSGBOX_YESNO +Route117_EventScript_DaycareEggWaiting:: @ 8291C4D + msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_291C83 - msgbox Route117_Text_2922C6, MSGBOX_YESNO + goto_if_eq Route117_EventScript_DaycareAcceptEgg + msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_291C83 - msgbox Route117_Text_292149, MSGBOX_DEFAULT + goto_if_eq Route117_EventScript_DaycareAcceptEgg + msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release end -Route117_EventScript_291C83:: @ 8291C83 +Route117_EventScript_DaycareAcceptEgg:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare VAR_RESULT, 6 - goto_if_ne Route117_EventScript_291C9D - msgbox Route117_Text_29216A, MSGBOX_DEFAULT + compare VAR_RESULT, PARTY_SIZE + goto_if_ne Route117_EventScript_DaycareReceiveEgg + msgbox Route117_Text_YouHaveNoRoomForIt, MSGBOX_DEFAULT release end -Route117_EventScript_291C9D:: @ 8291C9D - message Route117_Text_2921A4 +Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D + message Route117_Text_ReceivedEgg playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - msgbox Route117_Text_2921CF, MSGBOX_DEFAULT + msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG release end -Route117_EventScript_291CB7:: @ 8291CB7 - specialvar VAR_RESULT, sub_8071614 +Route117_EventScript_CheckMonReceivedMail:: @ 8291CB7 + specialvar VAR_RESULT, CheckDaycareMonReceivedMail compare VAR_RESULT, 1 - call_if_eq Route117_EventScript_291CC8 + call_if_eq Route117_EventScript_MonReceivedMail return -Route117_EventScript_291CC8:: @ 8291CC8 - msgbox Route117_Text_2921E5, MSGBOX_DEFAULT +Route117_EventScript_MonReceivedMail:: @ 8291CC8 + msgbox Route117_Text_FriendlyWithOtherTrainersMon, MSGBOX_DEFAULT return -Route117_EventScript_291CD1:: @ 8291CD1 +Route117_EventScript_CheckOnOneMon:: @ 8291CD1 special GetDaycareMonNicknames - msgbox Route117_Text_292114, MSGBOX_DEFAULT - setvar VAR_0x8004, 0 - call Route117_EventScript_291CB7 + msgbox Route117_Text_YourMonIsDoingFine, MSGBOX_DEFAULT + setvar VAR_0x8004, EGG_MOTHER + call Route117_EventScript_CheckMonReceivedMail release end -Route117_EventScript_291CE8:: @ 8291CE8 +Route117_EventScript_CheckOnTwoMons:: @ 8291CE8 special GetDaycareMonNicknames - msgbox Route117_Text_292299, MSGBOX_DEFAULT + msgbox Route117_Text_YourMonsAreDoingFine, MSGBOX_DEFAULT special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage waitbuttonpress - setvar VAR_0x8004, 0 - call Route117_EventScript_291CB7 - setvar VAR_0x8004, 1 - call Route117_EventScript_291CB7 + setvar VAR_0x8004, EGG_MOTHER + call Route117_EventScript_CheckMonReceivedMail + setvar VAR_0x8004, EGG_FATHER + call Route117_EventScript_CheckMonReceivedMail release end -Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 +Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11 lock faceplayer specialvar VAR_RESULT, GetDaycareState + compare VAR_RESULT, DAYCARE_EGG_WAITING + goto_if_eq Route117_PokemonDayCare_EventScript_EggWaiting + compare VAR_RESULT, DAYCARE_ONE_MON + goto_if_eq Route117_PokemonDayCare_EventScript_OneMonInDaycare + compare VAR_RESULT, DAYCARE_TWO_MONS + goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare + msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291E0B - compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291E2F - compare VAR_RESULT, 3 - goto_if_eq Route117_PokemonDayCare_EventScript_291F5C - msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 +Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291DED - specialvar VAR_RESULT, sub_80722E0 + goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneMon + specialvar VAR_RESULT, CountPartyAliveNonEggMons compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291E01 - msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT + goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons + msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT fadescreen 1 special ChooseSendDaycareMon waitstate compare VAR_0x8004, 255 - goto_if_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_if_eq Route117_PokemonDayCare_EventScript_291DF7 + goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneAliveMon specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 - msgbox Route117_PokemonDayCare_Text_292370, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_WellRaiseYourMon, MSGBOX_DEFAULT waitmoncry special StoreSelectedPokemonInDaycare - incrementgamestat 47 + incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState - compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291DD4 + compare VAR_RESULT, DAYCARE_ONE_MON + goto_if_eq Route117_PokemonDayCare_EventScript_CanRaiseOneMore release end -Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA - msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA + msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 - msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO +Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4 + msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291D56 - goto Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise + goto Route117_PokemonDayCare_EventScript_ComeAgain end -Route117_PokemonDayCare_EventScript_291DED:: @ 8291DED - msgbox Route117_PokemonDayCare_Text_2925BB, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_OnlyOneMon:: @ 8291DED + msgbox Route117_PokemonDayCare_Text_YouHaveJustOneMon, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291DF7:: @ 8291DF7 - msgbox Route117_PokemonDayCare_Text_292617, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_OnlyOneAliveMon:: @ 8291DF7 + msgbox Route117_PokemonDayCare_Text_WhatWillYouBattleWith, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291E01:: @ 8291E01 - msgbox Route117_PokemonDayCare_Text_29266D, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons:: @ 8291E01 + msgbox Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291E0B:: @ 8291E0B - msgbox Route117_PokemonDayCare_Text_2923F6, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_EggWaiting:: @ 8291E0B + msgbox Route117_PokemonDayCare_Text_HusbandWasLookingForYou, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 - msgbox Route117_PokemonDayCare_Text_2924CC, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels:: @ 8291E15 + msgbox Route117_PokemonDayCare_Text_YourMonHasGrownXLevels, MSGBOX_DEFAULT return -Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E +Route117_PokemonDayCare_EventScript_DisplayLevelsGained:: @ 8291E1E specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare VAR_RESULT, 0 - call_if_ne Route117_PokemonDayCare_EventScript_291E15 + call_if_ne Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels return -Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F - msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F + msgbox Route117_PokemonDayCare_Text_GoodToSeeYou, MSGBOX_DEFAULT setvar VAR_0x8004, 0 - call Route117_PokemonDayCare_EventScript_291E1E - msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO + call Route117_PokemonDayCare_EventScript_DisplayLevelsGained + msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291D56 - msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO + goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise + msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291E6D - goto Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon + goto Route117_PokemonDayCare_EventScript_ComeAgain end -Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D +Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount - compare VAR_RESULT, 6 - goto_if_eq Route117_PokemonDayCare_EventScript_291F3D + compare VAR_RESULT, PARTY_SIZE + goto_if_eq Route117_PokemonDayCare_EventScript_NoRoom specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 - compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291EAC + compare VAR_RESULT, DAYCARE_ONE_MON + goto_if_eq Route117_PokemonDayCare_EventScript_CostPrompt special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT - compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291DCA - goto Route117_PokemonDayCare_EventScript_291EAC + compare VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU + goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain + goto Route117_PokemonDayCare_EventScript_CostPrompt end -Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC +Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC special GetDaycareCost - msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO + msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291EC8 - goto Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney + goto Route117_PokemonDayCare_EventScript_ComeAgain end -Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 +Route117_PokemonDayCare_EventScript_CheckEnoughMoney:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291EE2 - msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT + goto_if_eq Route117_PokemonDayCare_EventScript_RetrieveMon + msgbox Route117_PokemonDayCare_Text_NotEnoughMoney, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 - applymovement 1, Route117_PokemonDayCare_Movement_291F47 +Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2 + applymovement 1, Route117_PokemonDayCare_Movement_RetrieveDaycareMon waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 playse SE_REGI - msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 - msgbox Route117_PokemonDayCare_Text_292593, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_TookBackMon, MSGBOX_DEFAULT waitmoncry specialvar VAR_RESULT, GetDaycareState - compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291F24 - goto Route117_PokemonDayCare_EventScript_291DCA + compare VAR_RESULT, DAYCARE_ONE_MON + goto_if_eq Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon + goto Route117_PokemonDayCare_EventScript_ComeAgain end -Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 - msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO +Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24 + msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291E6D - goto Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon + goto Route117_PokemonDayCare_EventScript_ComeAgain end -Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D - msgbox Route117_PokemonDayCare_Text_2924EF, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_NoRoom:: @ 8291F3D + msgbox Route117_PokemonDayCare_Text_YourTeamIsFull, MSGBOX_DEFAULT release end -Route117_PokemonDayCare_Movement_291F47: @ 8291F47 +Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47 delay_16 delay_16 face_left @@ -261,50 +261,52 @@ Route117_PokemonDayCare_Movement_291F47: @ 8291F47 walk_slow_down step_end +@ Unused. Possibly a commented script, or a typo end added to the above Movement script Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B end -Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C - msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT +Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C + msgbox Route117_PokemonDayCare_Text_GoodToSeeYou, MSGBOX_DEFAULT setvar VAR_0x8004, 0 - call Route117_PokemonDayCare_EventScript_291E1E + call Route117_PokemonDayCare_EventScript_DisplayLevelsGained setvar VAR_0x8004, 1 - call Route117_PokemonDayCare_EventScript_291E1E - msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO + call Route117_PokemonDayCare_EventScript_DisplayLevelsGained + msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route117_PokemonDayCare_EventScript_291E6D - msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT + goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon + msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT release end +@ Unused Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 - goto_if_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare - msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT - msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT release end EventScript_EggHatch:: @ 8291FC0 lockall - msgbox Text_292668, MSGBOX_DEFAULT + msgbox Text_EggHatchHuh, MSGBOX_DEFAULT special EggHatch waitstate releaseall end -Route117_Text_291FCF: @ 8291FCF +Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon: @ 8291FCF .string "I'm the DAY-CARE MAN.\p" .string "I help take care of the precious\n" .string "POKéMON of TRAINERS.\p" .string "If you'd like me to raise your POKéMON,\n" .string "have a word with my wife.$" -Route117_Text_29205D: @ 829205D +Route117_Text_DoYouWantEgg: @ 829205D .string "Ah, it's you!\p" .string "We were raising your POKéMON,\n" .string "and my goodness, were we surprised!\p" @@ -313,124 +315,125 @@ Route117_Text_29205D: @ 829205D .string "but your POKéMON had it.\p" .string "You do want it, yes?$" -Route117_Text_292114: @ 8292114 +Route117_Text_YourMonIsDoingFine: @ 8292114 .string "Ah, it's you! Good to see you.\n" .string "Your {STR_VAR_1}'s doing fine.$" -Route117_Text_292149: @ 8292149 +Route117_Text_IllKeepIt: @ 8292149 .string "Well then, I'll keep it.\n" .string "Thanks!$" -Route117_Text_29216A: @ 829216A +Route117_Text_YouHaveNoRoomForIt: @ 829216A .string "You have no room for it…\n" .string "Come back when you've made room.$" -Route117_Text_2921A4: @ 82921A4 +Route117_Text_ReceivedEgg: @ 82921A4 .string "{PLAYER} received the EGG from\n" .string "the DAY-CARE MAN.$" -Route117_Text_2921CF: @ 82921CF +Route117_Text_TakeGoodCareOfIt: @ 82921CF .string "Take good care of it.$" -Route117_Text_2921E5: @ 82921E5 +Route117_Text_FriendlyWithOtherTrainersMon: @ 82921E5 .string "By the way, about your {STR_VAR_1},\n" .string "it seemed to be friendly with\l" .string "{STR_VAR_2}'s {STR_VAR_3}.\p" .string "I may even have seen it receiving\n" .string "a piece of MAIL.$" -Route117_Text_29225A: @ 829225A +@ Unused +Route117_Text_SeeWifeIfYouWantToPickUpMon: @ 829225A .string "If you want to pick up your POKéMON,\n" .string "have a word with my wife.$" -Route117_Text_292299: @ 8292299 +Route117_Text_YourMonsAreDoingFine: @ 8292299 .string "Ah, it's you! Your {STR_VAR_1} and\n" .string "{STR_VAR_2} are doing fine.$" -Route117_Text_2922C6: @ 82922C6 +Route117_Text_IWillKeepDoYouWantIt: @ 82922C6 .string "I really will keep it.\n" .string "You do want this, yes?$" -Route117_PokemonDayCare_Text_2922F4: @ 82922F4 +Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon: @ 82922F4 .string "I'm the DAY-CARE LADY.\p" .string "We can raise POKéMON for you.\p" .string "Would you like us to raise one?$" -Route117_PokemonDayCare_Text_292349: @ 8292349 +Route117_PokemonDayCare_Text_WhichMonShouldWeRaise: @ 8292349 .string "Which POKéMON should we raise for\n" .string "you?$" -Route117_PokemonDayCare_Text_292370: @ 8292370 +Route117_PokemonDayCare_Text_WellRaiseYourMon: @ 8292370 .string "Fine, we'll raise your {STR_VAR_1}\n" .string "for a while.\p" .string "Come back for it later.$" -Route117_PokemonDayCare_Text_2923AF: @ 82923AF +Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF .string "We can raise two of your POKéMON.\n" .string "Would you like us to raise one more?$" -Route117_PokemonDayCare_Text_2923F6: @ 82923F6 +Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6 .string "My husband was looking for you.$" Route117_PokemonDayCare_Text_292416: @ 8292416 .string "Oh, fine, then.\n" .string "Come again.$" -Route117_PokemonDayCare_Text_292432: @ 8292432 +Route117_PokemonDayCare_Text_NotEnoughMoney: @ 8292432 .string "You don't have enough money…$" -Route117_PokemonDayCare_Text_29244F: @ 829244F +Route117_PokemonDayCare_Text_TakeOtherOneBackToo: @ 829244F .string "Will you take back the other one,\n" .string "too?$" -Route117_PokemonDayCare_Text_292476: @ 8292476 +Route117_PokemonDayCare_Text_ComeAgain: @ 8292476 .string "Fine.\n" .string "Come again.$" -Route117_PokemonDayCare_Text_292488: @ 8292488 +Route117_PokemonDayCare_Text_GoodToSeeYou: @ 8292488 .string "Ah, it's you! Good to see you.\n" .string "Your POKéMON can only be doing good!$" -Route117_PokemonDayCare_Text_2924CC: @ 82924CC +Route117_PokemonDayCare_Text_YourMonHasGrownXLevels: @ 82924CC .string "By level, your {STR_VAR_1} has\n" .string "grown by {STR_VAR_2}.$" -Route117_PokemonDayCare_Text_2924EF: @ 82924EF +Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF .string "Your POKéMON team is full.\n" .string "Make room, then come see me.$" Route117_PokemonDayCare_Text_292527: @ 8292527 .string "Which POKéMON will you take back?$" -Route117_PokemonDayCare_Text_292549: @ 8292549 +Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549 .string "If you want your {STR_VAR_1} back,\n" .string "it will cost ¥{STR_VAR_2}.$" -Route117_PokemonDayCare_Text_292575: @ 8292575 +Route117_PokemonDayCare_Text_HeresYourMon: @ 8292575 .string "Perfect!\n" .string "Here's your POKéMON.$" -Route117_PokemonDayCare_Text_292593: @ 8292593 +Route117_PokemonDayCare_Text_TookBackMon: @ 8292593 .string "{PLAYER} took back {STR_VAR_1} from\n" .string "the DAY-CARE LADY.$" -Route117_PokemonDayCare_Text_2925BB: @ 82925BB +Route117_PokemonDayCare_Text_YouHaveJustOneMon: @ 82925BB .string "Oh? But you have just one\n" .string "POKéMON.\p" .string "Come back another time.$" -Route117_PokemonDayCare_Text_2925F6: @ 82925F6 +Route117_PokemonDayCare_Text_TakeYourMonBack: @ 82925F6 .string "Will you take your POKéMON back?$" -Route117_PokemonDayCare_Text_292617: @ 8292617 +Route117_PokemonDayCare_Text_WhatWillYouBattleWith: @ 8292617 .string "If you leave me that POKéMON,\n" .string "what will you battle with?\p" .string "Come back another time.$" -Text_292668: @ 8292668 +Text_EggHatchHuh: @ 8292668 .string "Huh?$" -Route117_PokemonDayCare_Text_29266D: @ 829266D +Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne: @ 829266D .string "Huh?\n" .string "Now, now.\p" .string "If you leave that POKéMON with\n" -- cgit v1.2.3 From 4e98a0cc4b13b4b4f504025106c4c53e4ca0db2f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 25 Sep 2019 18:05:12 -0400 Subject: Remove Egg parent constants --- data/scripts/day_care.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 9006029cd..f8b579525 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -58,7 +58,7 @@ Route117_EventScript_MonReceivedMail:: @ 8291CC8 Route117_EventScript_CheckOnOneMon:: @ 8291CD1 special GetDaycareMonNicknames msgbox Route117_Text_YourMonIsDoingFine, MSGBOX_DEFAULT - setvar VAR_0x8004, EGG_MOTHER + setvar VAR_0x8004, 0 call Route117_EventScript_CheckMonReceivedMail release end @@ -70,9 +70,9 @@ Route117_EventScript_CheckOnTwoMons:: @ 8291CE8 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress - setvar VAR_0x8004, EGG_MOTHER + setvar VAR_0x8004, 0 call Route117_EventScript_CheckMonReceivedMail - setvar VAR_0x8004, EGG_FATHER + setvar VAR_0x8004, 1 call Route117_EventScript_CheckMonReceivedMail release end -- cgit v1.2.3 From 37373c1b21a415206a37cddb563fbb6912313587 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 25 Sep 2019 18:44:56 -0400 Subject: Review changes for #817 --- data/scripts/day_care.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index f8b579525..062fd9f5a 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -110,7 +110,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneAliveMon - specialvar VAR_0x8005, GetSelectedMonNickAndSpecies + specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies waitse playmoncry VAR_0x8005, 0 msgbox Route117_PokemonDayCare_Text_WellRaiseYourMon, MSGBOX_DEFAULT -- cgit v1.2.3 From 0c1f1281dab28d481e717ff1343a213b4e0da2a8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Sep 2019 10:08:47 -0400 Subject: Review changes for #778 --- data/scripts/lilycove_lady.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 9ee7adc7c..77b842d3d 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -423,9 +423,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA fadescreen 1 special OpenPokeblockCaseForContestLady waitstate - compare VAR_RESULT, 65535 + compare VAR_RESULT, 0xFFFF goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 - compare VAR_RESULT, 65535 + compare VAR_RESULT, 0xFFFF goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 end -- cgit v1.2.3 From 86f1f9066a155210f5f05b00db06ab281a3e7c39 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Sep 2019 12:22:58 -0400 Subject: Split some files from event_scripts --- data/scripts/battle_pike.inc | 312 ++++++++++++++++++++++++++++++++++++++++++ data/scripts/move_tutors.inc | 309 +++++++++++++++++++++++++++++++++++++++++ data/scripts/roulette.inc | 70 ++++++++++ data/scripts/trainer_hill.inc | 85 ++++++++++++ 4 files changed, 776 insertions(+) create mode 100644 data/scripts/battle_pike.inc create mode 100644 data/scripts/move_tutors.inc create mode 100644 data/scripts/roulette.inc create mode 100644 data/scripts/trainer_hill.inc (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc new file mode 100644 index 000000000..bb02a7d6c --- /dev/null +++ b/data/scripts/battle_pike.inc @@ -0,0 +1,312 @@ +BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + +BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 + setvar VAR_0x8004, 4 + special CallBattlePikeFunction + setvar VAR_0x8004, 5 + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 + case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 + case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 + case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 + case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93:: @ 82C3E93 + setobjectxyperm 1, 2, 5 + setobjectxyperm 2, 6, 5 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2:: @ 82C3EA2 + setobjectxyperm 1, 4, 4 + setobjectxyperm 2, 3, 4 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1:: @ 82C3EB1 + setobjectxyperm 1, 4, 4 + setobjectxyperm 2, 0, 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0:: @ 82C3EC0 + setobjectxyperm 1, 5, 5 + setobjectxyperm 2, 0, 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF + setobjectxyperm 1, 4, 3 + setobjectxyperm 2, 4, 4 + end + +BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_0x8004, 5 + special CallBattlePikeFunction + compare VAR_RESULT, 3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 6 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 7 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 8 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E + setvar VAR_0x8007, 0 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59:: @ 82C3F59 + setvar VAR_0x8007, 1 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 + setvar VAR_0x8007, 2 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, 0 + special CallBattlePikeFunction + setvar VAR_0x8004, 5 + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 + case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 + waitstate + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 + waitstate + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT + closemessage + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT + closemessage + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 + setvar VAR_0x8004, 25 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 + compare VAR_RESULT, 1 + call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, 3 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + waitstate + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 + setvar VAR_0x8004, 24 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 + setvar VAR_0x8004, 24 + setvar VAR_0x8005, 0 + special CallBattlePikeFunction + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + return + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 + setvar VAR_0x8004, 7 + special CallBattlePikeFunction + setvar VAR_0x8004, 25 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 + compare VAR_RESULT, 1 + call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, 3 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + waitstate + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT + closemessage + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special CallFrontierUtilFunc + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E +BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E + setorcopyvar VAR_0x8006, VAR_RESULT + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + special CallFrontierUtilFunc + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B + setorcopyvar VAR_RESULT, VAR_0x8006 + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 + setvar VAR_0x8004, 21 + special CallFrontierUtilFunc + return + +BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A +BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A + set_invisible + step_end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc new file mode 100644 index 000000000..e8eebade3 --- /dev/null +++ b/data/scripts/move_tutors.inc @@ -0,0 +1,309 @@ +SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 + msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + call SlateportCity_PokemonFanClub_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT + setvar VAR_0x8005, 23 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER + goto SlateportCity_PokemonFanClub_EventScript_2C7F74 + end + +SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A + msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 + msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT + release + end + +MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC + msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_EventScript_2C7FD2 + call MauvilleCity_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_EventScript_2C7FD2 + msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT + setvar VAR_0x8005, 16 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_EventScript_2C7FD2 + setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT + goto MauvilleCity_EventScript_2C7FDC + end + +MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 + msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT + release + end + +MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC + msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT + release + end + +VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT + setvar VAR_0x8005, 29 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER + goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + end + +VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT + release + end + +VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT + release + end + +LavaridgeTown_House_EventScript_2C804E:: @ 82C804E + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC + msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + call LavaridgeTown_House_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT + setvar VAR_0x8005, 7 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC + goto LavaridgeTown_House_EventScript_2C80AC + end + +LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 + msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT + release + end + +LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC + msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT + release + end + +FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 + msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_Mart_EventScript_2C810A + call FallarborTown_Mart_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_Mart_EventScript_2C810A + msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT + setvar VAR_0x8005, 8 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_Mart_EventScript_2C810A + setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME + goto FallarborTown_Mart_EventScript_2C8114 + end + +FallarborTown_Mart_EventScript_2C810A:: @ 82C810A + msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT + release + end + +FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 + msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT + release + end + +FortreeCity_House2_EventScript_2C811E:: @ 82C811E + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C + msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_2C8172 + call FortreeCity_House2_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_2C8172 + msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT + setvar VAR_0x8005, 24 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_2C8172 + setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK + goto FortreeCity_House2_EventScript_2C817C + end + +FortreeCity_House2_EventScript_2C8172:: @ 82C8172 + msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT + release + end + +FortreeCity_House2_EventScript_2C817C:: @ 82C817C + msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT + setvar VAR_0x8005, 14 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT + release + end + +MossdeepCity_EventScript_2C81EE:: @ 82C81EE + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C + msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq MossdeepCity_EventScript_2C8242 + call MossdeepCity_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq MossdeepCity_EventScript_2C8242 + msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT + setvar VAR_0x8005, 15 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MossdeepCity_EventScript_2C8242 + setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH + goto MossdeepCity_EventScript_2C824C + end + +MossdeepCity_EventScript_2C8242:: @ 82C8242 + msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT + release + end + +MossdeepCity_EventScript_2C824C:: @ 82C824C + msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + call SootopolisCity_PokemonCenter_1F_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT + setvar VAR_0x8005, 4 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE + goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + end + +SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT + release + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT + setvar VAR_0x8005, 12 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION + goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT + release + end + +PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT + release + end + +EventScript_ShowPartyMenu:: @ 82C8326 + special sub_81B892C + waitstate + lock + faceplayer + return + +FallarborTown_Mart_EventScript_2C832D:: @ 82C832D +FortreeCity_House2_EventScript_2C832D:: @ 82C832D +LavaridgeTown_House_EventScript_2C832D:: @ 82C832D +LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D:: @ 82C832D +MauvilleCity_EventScript_2C832D:: @ 82C832D +MossdeepCity_EventScript_2C832D:: @ 82C832D +PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D +SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D +SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D +VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D + msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO + return diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc new file mode 100644 index 000000000..877308bc2 --- /dev/null +++ b/data/scripts/roulette.inc @@ -0,0 +1,70 @@ +MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 0 + getpricereduction 2 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D + addvar VAR_0x8004, 128 + goto MauvilleCity_GameCorner_EventScript_2A5B0D + end + +MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 1 + getpricereduction 2 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D + addvar VAR_0x8004, 128 + goto MauvilleCity_GameCorner_EventScript_2A5B0D + end + +MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D + special PlayRoulette + waitstate + end + +gUnknown_082A5B12:: @ 82A5B12 + .string "The minimum wager at this table\n" + .string "is {STR_VAR_1}. Do you want to play?$" + +gUnknown_082A5B4E:: @ 82A5B4E + .string "You don't have enough COINS.$" + +gUnknown_082A5B6B:: @ 82A5B6B + .string "Special rate table right now!$" + +gUnknown_082A5B89:: @ 82A5B89 + .string "Place your wager with the + Control\n" + .string "Pad, then press the A Button.$" + +gUnknown_082A5BCB:: @ 82A5BCB + .string "It's a hit!$" + +gUnknown_082A5BD7:: @ 82A5BD7 + .string "Jackpot!$" + +gUnknown_082A5BE0:: @ 82A5BE0 + .string "Nothing doing!$" + +gUnknown_082A5BEF:: @ 82A5BEF + .string "You've won {STR_VAR_1} COINS!$" + +gUnknown_082A5C04:: @ 82A5C04 + .string "No COINS left…$" + +gUnknown_082A5C13:: @ 82A5C13 + .string "Keep playing?$" + +gUnknown_082A5C21:: @ 82A5C21 + .string "The ROULETTE board will be cleared.$" + +gUnknown_082A5C45:: @ 82A5C45 + .string "You don't have a COIN CASE.$" + +gUnknown_082A5C61:: @ 82A5C61 + .string "Your COIN CASE is full!\n" + .string "Coins can be exchanged for prizes.$" diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc new file mode 100644 index 000000000..dde971f9f --- /dev/null +++ b/data/scripts/trainer_hill.inc @@ -0,0 +1,85 @@ +TrainerHill_1F_MapScript1_2C8336: @ 82C8336 +TrainerHill_2F_MapScript1_2C8336: @ 82C8336 +TrainerHill_3F_MapScript1_2C8336: @ 82C8336 +TrainerHill_4F_MapScript1_2C8336: @ 82C8336 +TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 + setvar VAR_TEMP_2, 0 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER + special CallTrainerHillFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special CallFrontierUtilFunc + compare VAR_RESULT, B_OUTCOME_LOST + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + compare VAR_RESULT, B_OUTCOME_DREW + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + compare VAR_RESULT, B_OUTCOME_FORFEITED + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + end + +TrainerHill_1F_MapScript2_2C8372: @ 82C8372 +TrainerHill_2F_MapScript2_2C8372: @ 82C8372 + map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C + .2byte 0 + +TrainerHill_1F_EventScript_2C837C:: @ 82C837C + setvar VAR_TEMP_3, 1 +@ forced stop + +TrainerHill_1F_MapScript2_2C8381: @ 82C8381 +TrainerHill_2F_MapScript2_2C8381: @ 82C8381 +TrainerHill_3F_MapScript2_2C8381: @ 82C8381 +TrainerHill_4F_MapScript2_2C8381: @ 82C8381 +TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 + map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 + map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF + .2byte 0 + +EventScript_TrainerHillTimer:: @ 82C8393 + lockall + setvar VAR_0x8004, TRAINER_HILL_FUNC_7 + special CallTrainerHillFunction + msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT + releaseall + end + +TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 + setvar VAR_TEMP_2, 1 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 + special CallTrainerHillFunction + compare VAR_RESULT, 1 + goto_if_eq TrainerHill_1F_EventScript_2C83BF + end + +TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF + warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 + waitstate + end + +TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 + special CallTrainerHillFunction + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST + special CallTrainerHillFunction + setvar VAR_TEMP_1, 1 + end + +TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF +TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF + setvar VAR_TEMP_1, 0 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 + waitstate + end + +TrainerHill_1F_Movement_2C83EE:: @ 82C83EE + set_invisible + step_end + +EventScript_2C83F0:: @ 82C83F0 + trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText + setvar VAR_0x8004, TRAINER_HILL_FUNC_11 + special CallTrainerHillFunction + waitmessage + waitbuttonpress + closemessage + end -- cgit v1.2.3 From 12cc7ef34c286476541f901715b4c2847f8ef350 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Sep 2019 14:20:51 -0400 Subject: Split more files from event_scripts --- data/scripts/interview.inc | 346 +++++++++++++++++++++++++++++++ data/scripts/mevent.inc | 63 ++++++ data/scripts/prof_birch.inc | 94 +++++++++ data/scripts/unusual_weather.inc | 433 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 936 insertions(+) create mode 100644 data/scripts/interview.inc create mode 100644 data/scripts/mevent.inc create mode 100644 data/scripts/prof_birch.inc create mode 100644 data/scripts/unusual_weather.inc (limited to 'data/scripts') diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc new file mode 100644 index 000000000..013d39da2 --- /dev/null +++ b/data/scripts/interview.inc @@ -0,0 +1,346 @@ +BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9 +LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9 +SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9 +SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9 + special InterviewAfter + incrementgamestat GAME_STAT_GOT_INTERVIEWED + release + end + +SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 + setvar VAR_0x8005, 1 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 + copyvar VAR_0x8009, VAR_0x8006 + msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + end + +SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 + msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + end + +SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 + msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT + setvar VAR_0x8005, 1 + goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + end + +SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 + lock + faceplayer + setvar VAR_0x8005, 2 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 + copyvar VAR_0x8009, VAR_0x8006 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER + msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 + msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 + msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C + msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 + msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT + setvar VAR_0x8005, 2 + goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 + msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 + lock + faceplayer + specialvar VAR_RESULT, sub_80EF8F8 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 + setvar VAR_0x8005, 3 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F + copyvar VAR_0x8009, VAR_0x8006 + msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + end + +SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C + msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT + random 3 + copyvar VAR_0x800A, VAR_RESULT + switch VAR_RESULT + case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 + case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 + case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF + end + +SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 + msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end + +SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 + msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end + +SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF + msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end + +SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 0 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT + setvar VAR_0x8006, 1 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT + copyvar VAR_0x8007, VAR_0x800A + setvar VAR_0x8005, 3 + goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + end + +SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 + lock + faceplayer + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 + setvar VAR_0x8005, 6 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 + copyvar VAR_0x8009, VAR_0x8006 + msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + end + +LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B + msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 0 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + end + +LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 + msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA + setvar VAR_0x8004, 24 + special SetContestCategoryStringVarForInterview + msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 1 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 + setvar VAR_0x8005, 6 + goto LilycoveCity_ContestLobby_EventScript_28C7E9 + end + +LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 + msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B + compare VAR_LINK_CONTEST_ROOM_STATE, 2 + goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 + setvar VAR_0x8005, 6 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 + switch VAR_CONTEST_LOCATION + case 0, LilycoveCity_ContestLobby_EventScript_28CB95 + case 2, LilycoveCity_ContestLobby_EventScript_28CB91 + case 1, LilycoveCity_ContestLobby_EventScript_28CB91 + case 3, LilycoveCity_ContestLobby_EventScript_28CB91 + case 4, LilycoveCity_ContestLobby_EventScript_28CB91 + case 5, LilycoveCity_ContestLobby_EventScript_28CB95 + end + +LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + return + +LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 + return + +BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 + lock + faceplayer + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A + setvar VAR_0x8005, 7 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + copyvar VAR_0x8009, VAR_0x8006 + msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E + end + +BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 + message BattleFrontier_BattleTowerLobby_Text_27F7BA + waitmessage + multichoice 20, 8, MULTI_SATISFACTION, 1 + copyvar VAR_0x8008, VAR_RESULT + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 + msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E + msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 + msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT + return + +BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 + msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT + return + +BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 + copyvar VAR_0x8004, VAR_0x8008 + setvar VAR_0x8005, 7 + goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 + msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A + msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + setvar VAR_0x8005, 7 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER + return + +BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER + return diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc new file mode 100644 index 000000000..d97e58063 --- /dev/null +++ b/data/scripts/mevent.inc @@ -0,0 +1,63 @@ + +EventScript_Questionnaire:: @ 827381B + lockall + msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_2738FD + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen + lock + faceplayer + specialvar VAR_0x8008, GetMartEmployeeObjectEventId + compare VAR_0x8004, 1 + goto_if_eq EventScript_27386D + compare VAR_0x8004, 2 + goto_if_eq EventScript_2738B5 + compare VAR_RESULT, 0 + goto_if_eq EventScript_2738FD + compare VAR_RESULT, 1 + goto_if_eq EventScript_2738FF + end + +EventScript_27386D:: @ 827386D + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF + 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 gUnknown_08273506, MSGBOX_DEFAULT + setflag FLAG_SYS_MYSTERY_EVENT_ENABLE + msgbox gUnknown_08273559, MSGBOX_DEFAULT + releaseall + end + +EventScript_2738B5:: @ 82738B5 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF + 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 gUnknown_08273446, MSGBOX_DEFAULT + setflag FLAG_SYS_MYSTERY_GIFT_ENABLE + msgbox gUnknown_082734CC, MSGBOX_DEFAULT + releaseall + end + +EventScript_2738FD:: @ 82738FD + releaseall + end + +EventScript_2738FF:: @ 82738FF + applymovement VAR_0x8008, Common_Movement_FaceDown + waitmovement 0 + msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT + releaseall + end diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc new file mode 100644 index 000000000..318f88ad7 --- /dev/null +++ b/data/scripts/prof_birch.inc @@ -0,0 +1,94 @@ +LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD +Route101_EventScript_2720AD:: @ 82720AD +Route103_EventScript_2720AD:: @ 82720AD + compare VAR_PETALBURG_GYM_STATE, 0 + goto_if_eq Common_EventScript_NopReturn + goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 0 + call_if_eq Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 1 + call_if_eq Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 2 + call_if_eq Route101_EventScript_272127 + compare VAR_BIRCH_STATE, 3 + call_if_eq Route101_EventScript_272127 + compare VAR_BIRCH_STATE, 4 + call_if_eq Route101_EventScript_272134 + compare VAR_BIRCH_STATE, 5 + call_if_eq Route101_EventScript_272134 + compare VAR_BIRCH_STATE, 6 + call_if_eq Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 7 + call_if_eq Route101_EventScript_27211A + return + +Route101_EventScript_27211A:: @ 827211A + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + return + +Route101_EventScript_272127:: @ 8272127 + clearflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_103_BIRCH + return + +Route101_EventScript_272134:: @ 8272134 + clearflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 +Route101_EventScript_272141:: @ 8272141 +Route103_EventScript_272141:: @ 8272141 + lock + faceplayer + goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 + +Route101_EventScript_272155:: @ 8272155 + msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq Route101_EventScript_27216F + call Route101_EventScript_272184 + release + end + +Route101_EventScript_27216F:: @ 827216F + msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT + release + end + +Route101_EventScript_272179:: @ 8272179 + copyvar VAR_0x8004, VAR_0x8009 + special ShowPokedexRatingMessage + waitmessage + waitbuttonpress + return + +EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 +Route101_EventScript_272184:: @ 8272184 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, ScriptGetPokedexInfo + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + copyvar VAR_0x800A, VAR_RESULT + buffernumberstring 0, VAR_0x8008 + buffernumberstring 1, VAR_0x8009 + msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT + call Route101_EventScript_272179 + compare VAR_0x800A, 0 + goto_if_eq Common_EventScript_NopReturn + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, ScriptGetPokedexInfo + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + buffernumberstring 0, VAR_0x8008 + buffernumberstring 1, VAR_0x8009 + msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT + return diff --git a/data/scripts/unusual_weather.inc b/data/scripts/unusual_weather.inc new file mode 100644 index 000000000..abfbeb8a0 --- /dev/null +++ b/data/scripts/unusual_weather.inc @@ -0,0 +1,433 @@ +UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 + setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 + setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 + setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C + setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F + setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 + setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 + setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 + setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 + setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB + setmetatile 10, 28, METATILE_General_RoughWater, 0 + setmetatile 11, 28, METATILE_General_RoughWater, 0 + setmetatile 9, 29, METATILE_General_RoughWater, 0 + setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 29, METATILE_General_RoughWater, 0 + setmetatile 9, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 31, METATILE_General_RoughWater, 0 + setmetatile 11, 31, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 + setmetatile 20, 53, METATILE_General_RoughWater, 0 + setmetatile 21, 53, METATILE_General_RoughWater, 0 + setmetatile 19, 54, METATILE_General_RoughWater, 0 + setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 54, METATILE_General_RoughWater, 0 + setmetatile 19, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 56, METATILE_General_RoughWater, 0 + setmetatile 21, 56, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 + setmetatile 8, 16, METATILE_General_RoughWater, 0 + setmetatile 9, 16, METATILE_General_RoughWater, 0 + setmetatile 7, 17, METATILE_General_RoughWater, 0 + setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 17, METATILE_General_RoughWater, 0 + setmetatile 7, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 19, METATILE_General_RoughWater, 0 + setmetatile 9, 19, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 + setmetatile 53, 18, METATILE_General_RoughWater, 0 + setmetatile 54, 18, METATILE_General_RoughWater, 0 + setmetatile 52, 19, METATILE_General_RoughWater, 0 + setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 19, METATILE_General_RoughWater, 0 + setmetatile 52, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 21, METATILE_General_RoughWater, 0 + setmetatile 54, 21, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F + setmetatile 57, 9, METATILE_General_RoughWater, 0 + setmetatile 58, 9, METATILE_General_RoughWater, 0 + setmetatile 56, 10, METATILE_General_RoughWater, 0 + setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 10, METATILE_General_RoughWater, 0 + setmetatile 56, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 12, METATILE_General_RoughWater, 0 + setmetatile 58, 12, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC + setmetatile 61, 30, METATILE_General_RoughWater, 0 + setmetatile 62, 30, METATILE_General_RoughWater, 0 + setmetatile 60, 31, METATILE_General_RoughWater, 0 + setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 31, METATILE_General_RoughWater, 0 + setmetatile 60, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 33, METATILE_General_RoughWater, 0 + setmetatile 62, 33, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 + setmetatile 16, 14, METATILE_General_RoughWater, 0 + setmetatile 17, 14, METATILE_General_RoughWater, 0 + setmetatile 15, 15, METATILE_General_RoughWater, 0 + setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 15, METATILE_General_RoughWater, 0 + setmetatile 15, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 17, METATILE_General_RoughWater, 0 + setmetatile 17, 17, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 + setmetatile 42, 19, METATILE_General_RoughWater, 0 + setmetatile 43, 19, METATILE_General_RoughWater, 0 + setmetatile 41, 20, METATILE_General_RoughWater, 0 + setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 20, METATILE_General_RoughWater, 0 + setmetatile 41, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 22, METATILE_General_RoughWater, 0 + setmetatile 43, 22, METATILE_General_RoughWater, 0 + return + +Route105_EventScript_273D13:: @ 8273D13 +Route114_EventScript_273D13:: @ 8273D13 +Route115_EventScript_273D13:: @ 8273D13 +Route116_EventScript_273D13:: @ 8273D13 +Route118_EventScript_273D13:: @ 8273D13 +Route125_EventScript_273D13:: @ 8273D13 +Route127_EventScript_273D13:: @ 8273D13 +Route129_EventScript_273D13:: @ 8273D13 + setflag FLAG_HIDE_MAP_NAME_POPUP + return + +UnusualWeather_StartKyogreWeather:: @ 8273D17 + setweather WEATHER_RAIN_HEAVY + return + +UnusualWeather_StartGroudonWeather:: @ 8273D1B + setweather WEATHER_DROUGHT + return + +UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F + lockall + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START + goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage + goto UnusualWeather_EventScript_ShowSunEndedMessage + end + +UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 + closemessage + fadescreenswapbuffers 1 + setweather WEATHER_SUNNY + doweather + call UnusualWeather_EventScript_CleanupMapTiles + special DrawWholeMapView + setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 + clearflag FLAG_HIDE_MAP_NAME_POPUP + fadescreenswapbuffers 0 + releaseall + end + +UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 + msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 + end + +UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F + msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 + end + +UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North + case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South + case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West + case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East + case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North + case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South + case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East + case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East + return + +UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 + setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 + setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 + setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C + setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F + setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 + setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 + setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 + setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 + setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB + setmetatile 10, 28, METATILE_General_CalmWater, 0 + setmetatile 11, 28, METATILE_General_CalmWater, 0 + setmetatile 9, 29, METATILE_General_CalmWater, 0 + setmetatile 10, 29, METATILE_General_CalmWater, 0 + setmetatile 11, 29, METATILE_General_CalmWater, 0 + setmetatile 12, 29, METATILE_General_CalmWater, 0 + setmetatile 9, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 30, METATILE_General_CalmWater, 0 + setmetatile 11, 30, METATILE_General_CalmWater, 0 + setmetatile 12, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 31, METATILE_General_CalmWater, 0 + setmetatile 11, 31, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 + setmetatile 20, 53, METATILE_General_CalmWater, 0 + setmetatile 21, 53, METATILE_General_CalmWater, 0 + setmetatile 19, 54, METATILE_General_CalmWater, 0 + setmetatile 20, 54, METATILE_General_CalmWater, 0 + setmetatile 21, 54, METATILE_General_CalmWater, 0 + setmetatile 22, 54, METATILE_General_CalmWater, 0 + setmetatile 19, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 55, METATILE_General_CalmWater, 0 + setmetatile 21, 55, METATILE_General_CalmWater, 0 + setmetatile 22, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 56, METATILE_General_CalmWater, 0 + setmetatile 21, 56, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 + setmetatile 8, 16, METATILE_General_CalmWater, 0 + setmetatile 9, 16, METATILE_General_CalmWater, 0 + setmetatile 7, 17, METATILE_General_CalmWater, 0 + setmetatile 8, 17, METATILE_General_CalmWater, 0 + setmetatile 9, 17, METATILE_General_CalmWater, 0 + setmetatile 10, 17, METATILE_General_CalmWater, 0 + setmetatile 7, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 18, METATILE_General_CalmWater, 0 + setmetatile 9, 18, METATILE_General_CalmWater, 0 + setmetatile 10, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 19, METATILE_General_CalmWater, 0 + setmetatile 9, 19, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 + setmetatile 53, 18, METATILE_General_CalmWater, 0 + setmetatile 54, 18, METATILE_General_CalmWater, 0 + setmetatile 52, 19, METATILE_General_CalmWater, 0 + setmetatile 53, 19, METATILE_General_CalmWater, 0 + setmetatile 54, 19, METATILE_General_CalmWater, 0 + setmetatile 55, 19, METATILE_General_CalmWater, 0 + setmetatile 52, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 20, METATILE_General_CalmWater, 0 + setmetatile 54, 20, METATILE_General_CalmWater, 0 + setmetatile 55, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 21, METATILE_General_CalmWater, 0 + setmetatile 54, 21, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F + setmetatile 57, 9, METATILE_General_CalmWater, 0 + setmetatile 58, 9, METATILE_General_CalmWater, 0 + setmetatile 56, 10, METATILE_General_CalmWater, 0 + setmetatile 57, 10, METATILE_General_CalmWater, 0 + setmetatile 58, 10, METATILE_General_CalmWater, 0 + setmetatile 59, 10, METATILE_General_CalmWater, 0 + setmetatile 56, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 11, METATILE_General_CalmWater, 0 + setmetatile 58, 11, METATILE_General_CalmWater, 0 + setmetatile 59, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 12, METATILE_General_CalmWater, 0 + setmetatile 58, 12, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC + setmetatile 61, 30, METATILE_General_CalmWater, 0 + setmetatile 62, 30, METATILE_General_CalmWater, 0 + setmetatile 60, 31, METATILE_General_CalmWater, 0 + setmetatile 61, 31, METATILE_General_CalmWater, 0 + setmetatile 62, 31, METATILE_General_CalmWater, 0 + setmetatile 63, 31, METATILE_General_CalmWater, 0 + setmetatile 60, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 32, METATILE_General_CalmWater, 0 + setmetatile 62, 32, METATILE_General_CalmWater, 0 + setmetatile 63, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 33, METATILE_General_CalmWater, 0 + setmetatile 62, 33, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 + setmetatile 16, 14, METATILE_General_CalmWater, 0 + setmetatile 17, 14, METATILE_General_CalmWater, 0 + setmetatile 15, 15, METATILE_General_CalmWater, 0 + setmetatile 16, 15, METATILE_General_CalmWater, 0 + setmetatile 17, 15, METATILE_General_CalmWater, 0 + setmetatile 18, 15, METATILE_General_CalmWater, 0 + setmetatile 15, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 16, METATILE_General_CalmWater, 0 + setmetatile 17, 16, METATILE_General_CalmWater, 0 + setmetatile 18, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 17, METATILE_General_CalmWater, 0 + setmetatile 17, 17, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 + setmetatile 42, 19, METATILE_General_CalmWater, 0 + setmetatile 43, 19, METATILE_General_CalmWater, 0 + setmetatile 41, 20, METATILE_General_CalmWater, 0 + setmetatile 42, 20, METATILE_General_CalmWater, 0 + setmetatile 43, 20, METATILE_General_CalmWater, 0 + setmetatile 44, 20, METATILE_General_CalmWater, 0 + setmetatile 41, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 21, METATILE_General_CalmWater, 0 + setmetatile 43, 21, METATILE_General_CalmWater, 0 + setmetatile 44, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 22, METATILE_General_CalmWater, 0 + setmetatile 43, 22, METATILE_General_CalmWater, 0 + return + +UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 + setescapewarp MAP_ROUTE105, 255, 11, 29 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A + setescapewarp MAP_ROUTE105, 255, 21, 54 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 + setescapewarp MAP_ROUTE125, 255, 9, 17 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C + setescapewarp MAP_ROUTE125, 255, 54, 19 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 + setescapewarp MAP_ROUTE127, 255, 58, 10 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE + setescapewarp MAP_ROUTE127, 255, 62, 31 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 + setescapewarp MAP_ROUTE129, 255, 17, 15 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 + setescapewarp MAP_ROUTE129, 255, 43, 20 + return -- cgit v1.2.3 From 75869a880cd05fad228b6b2dc3ff6036e9def970 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Sep 2019 15:27:08 -0400 Subject: Move running shoes script --- data/scripts/players_house.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'data/scripts') diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 149fb52cc..741b7f41e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -707,3 +707,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE walk_right walk_in_place_fastest_up step_end + +EventScript_RunningShoesManual:: @ 8292DE5 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN + end -- cgit v1.2.3 From 67152b92424419a470ed2bb0cf5e5f8a8ced38de Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 28 Sep 2019 02:37:01 -0400 Subject: Split off more files from event_scripts --- data/scripts/cave_hole.inc | 41 +++++++ data/scripts/cave_of_origin.inc | 48 ++++++++ data/scripts/check_furniture.inc | 27 +++++ data/scripts/elite_four.inc | 74 ++++++++++++ data/scripts/field_poison.inc | 51 ++++++++ data/scripts/kecleon.inc | 119 +++++++++++++++++++ data/scripts/movement.inc | 101 ++++++++++++++++ data/scripts/new_game.inc | 245 +++++++++++++++++++++++++++++++++++++++ data/scripts/pc.inc | 66 +++++++++++ 9 files changed, 772 insertions(+) create mode 100644 data/scripts/cave_hole.inc create mode 100644 data/scripts/cave_of_origin.inc create mode 100644 data/scripts/check_furniture.inc create mode 100644 data/scripts/elite_four.inc create mode 100644 data/scripts/field_poison.inc create mode 100644 data/scripts/kecleon.inc create mode 100644 data/scripts/movement.inc create mode 100644 data/scripts/new_game.inc create mode 100644 data/scripts/pc.inc (limited to 'data/scripts') diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc new file mode 100644 index 000000000..e6f332224 --- /dev/null +++ b/data/scripts/cave_hole.inc @@ -0,0 +1,41 @@ +GraniteCave_B1F_MapScript2_2A8327: @ 82A8327 +MirageTower_2F_MapScript2_2A8327: @ 82A8327 +MirageTower_3F_MapScript2_2A8327: @ 82A8327 +MtPyre_2F_MapScript2_2A8327: @ 82A8327 +SkyPillar_2F_MapScript2_2A8327: @ 82A8327 +SkyPillar_4F_MapScript2_2A8327: @ 82A8327 + map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole + .2byte 0 + +GraniteCave_B1F_MapScript1_2A8331: @ 82A8331 +MirageTower_2F_MapScript1_2A8331: @ 82A8331 +MirageTower_3F_MapScript1_2A8331: @ 82A8331 +MtPyre_2F_MapScript1_2A8331: @ 82A8331 + copyvar VAR_ICE_STEP_COUNT, 0x1 + end + +EventScript_FallDownHole:: @ 82A8337 + lockall + delay 20 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + waitmovement 0 + playse SE_RU_HYUU + delay 60 + warphole MAP_UNDEFINED + waitstate + end + +gUnknown_082A8350:: @ 82A8350 + lockall + delay 20 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + waitmovement 0 + playse SE_RU_HYUU + delay 60 + special DoFallWarp + waitstate + end + +GraniteCave_B1F_Movement_2A8369: @ 82A8369 + set_invisible + step_end diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc new file mode 100644 index 000000000..57e93d4a6 --- /dev/null +++ b/data/scripts/cave_of_origin.inc @@ -0,0 +1,48 @@ +@ All unused / leftover scripts from RS +EventScript_272274:: @ 8272274 + lockall + waitse + playmoncry SPECIES_KYOGRE, 2 + waitmoncry + setvar VAR_TEMP_5, 1 + releaseall + end + +EventScript_272283:: @ 8272283 + lockall + setvar VAR_TEMP_1, 1 + goto EventScript_2722A7 + end + +EventScript_27228F:: @ 827228F + lockall + setvar VAR_TEMP_2, 1 + goto EventScript_2722A7 + end + +EventScript_27229B:: @ 827229B + lockall + setvar VAR_TEMP_3, 1 + goto EventScript_2722A7 + end + +EventScript_2722A7:: @ 82722A7 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 5 + special sub_8139560 + waitstate + releaseall + end + +CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1 +CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1 +CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1 +CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 + return \ No newline at end of file diff --git a/data/scripts/check_furniture.inc b/data/scripts/check_furniture.inc new file mode 100644 index 000000000..f9220a26f --- /dev/null +++ b/data/scripts/check_furniture.inc @@ -0,0 +1,27 @@ +EventScript_PictureBookShelf:: @ 82725CE + msgbox Text_PictureBookShelf, MSGBOX_SIGN + end + +EventScript_BookShelf:: @ 82725D7 + msgbox Text_BookShelf, MSGBOX_SIGN + end + +EventScript_PokemonCenterBookShelf:: @ 82725E0 + msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN + end + +EventScript_Vase:: @ 82725E9 + msgbox Text_Vase, MSGBOX_SIGN + end + +EventScript_EmptyTrashCan:: @ 82725F2 + msgbox Text_EmptyTrashCan, MSGBOX_SIGN + end + +EventScript_ShopShelf:: @ 82725FB + msgbox Text_ShopShelf, MSGBOX_SIGN + end + +EventScript_Blueprint:: @ 8272604 + msgbox Text_Blueprint, MSGBOX_SIGN + end diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc new file mode 100644 index 000000000..69b5f4807 --- /dev/null +++ b/data/scripts/elite_four.inc @@ -0,0 +1,74 @@ +EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8 +EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 +EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 +EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 +PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 + waitmovement 0 + playse SE_DOOR + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + special DrawWholeMapView + return + +EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 +EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 +EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 +EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA + waitmovement 0 + playse SE_TRACK_DOOR + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + special DrawWholeMapView + return + +EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC +EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC +EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC +EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + return + +EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F +EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F +EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F +EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + return diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc new file mode 100644 index 000000000..91ec765ff --- /dev/null +++ b/data/scripts/field_poison.inc @@ -0,0 +1,51 @@ +EventScript_Poison:: @ 82736BC + lockall + special ExecuteWhiteOut + waitstate + compare VAR_RESULT, 1 + goto_if_eq EventScript_2736D9 + compare VAR_RESULT, 2 + goto_if_eq EventScript_2736F8 + releaseall + end + +EventScript_2736D9:: @ 82736D9 + message gText_PlayerWhitedOut + waitmessage + waitbuttonpress + special sub_80B05B4 + waitstate + fadescreen 1 + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 + special sp0C8_whiteout_maybe + waitstate + end + +EventScript_2736F4:: @ 82736F4 + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN + return + +EventScript_2736F8:: @ 82736F8 + message gText_PlayerWhitedOut + waitmessage + waitbuttonpress + setvar VAR_0x8004, 16 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + setvar VAR_0x8004, 12 + special CallBattlePyramidFunction + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + special CallTrainerHillFunction + compare VAR_RESULT, 1 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + special sub_80B05B4 + waitstate + fadescreen 1 + special sp0C8_whiteout_maybe + waitstate + end diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc new file mode 100644 index 000000000..567b44037 --- /dev/null +++ b/data/scripts/kecleon.inc @@ -0,0 +1,119 @@ +Route120_EventScript_2722DB:: @ 82722DB + lock + faceplayer + setvar VAR_0x8009, 1 + goto Route120_EventScript_272336 + end + +Route120_EventScript_2722E8:: @ 82722E8 + lock + faceplayer + setvar VAR_0x8009, 2 + goto Route120_EventScript_272336 + end + +Route120_EventScript_2722F5:: @ 82722F5 + lock + faceplayer + setvar VAR_0x8009, 3 + goto Route120_EventScript_272336 + end + +Route120_EventScript_272302:: @ 8272302 + lock + faceplayer + setvar VAR_0x8009, 4 + goto Route120_EventScript_272336 + end + +Route120_EventScript_27230F:: @ 827230F + lock + faceplayer + setvar VAR_0x8009, 5 + goto Route120_EventScript_272336 + end + +Route119_EventScript_27231C:: @ 827231C + lock + faceplayer + setvar VAR_0x8009, 6 + goto Route119_EventScript_272336 + end + +Route119_EventScript_272329:: @ 8272329 + lock + faceplayer + setvar VAR_0x8009, 7 + goto Route119_EventScript_272336 + end + +Route119_EventScript_272336:: @ 8272336 +Route120_EventScript_272336:: @ 8272336 + checkitem ITEM_DEVON_SCOPE, 1 + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272350 + msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + release + end + +Route119_EventScript_272350:: @ 8272350 + msgbox Route119_Text_1F5D23, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272365 + release + end + +Route119_EventScript_272365:: @ 8272365 + msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT + closemessage + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer + waitmovement 0 + applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, GetBattleOutcome + compare VAR_RESULT, 1 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 4 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 5 + goto_if_eq EventScript_RemoveKecleon + release + end + +EventScript_RemoveKecleon:: @ 82723C1 + goto Common_EventScript_RemoveStaticPokemon + end + +FortreeCity_Movement_2723C7: @ 82723C7 +Route119_Movement_2723C7: @ 82723C7 +Route120_Movement_2723C7: @ 82723C7 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + step_end diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc new file mode 100644 index 000000000..26b509d5b --- /dev/null +++ b/data/scripts/movement.inc @@ -0,0 +1,101 @@ +SlateportCity_Movement_272596: @ 8272596 + emote_question_mark + step_end + +Common_Movement_ExclamationMark: @ 8272598 + emote_exclamation_mark + step_end + +Common_Movement_Delay48: @ 827259A + delay_16 + delay_16 + delay_16 + step_end + +Common_Movement_FacePlayer: @ 827259E + face_player + step_end + +Common_Movement_FaceAwayPlayer: @ 82725A0 + face_away_player + step_end + +Common_Movement_FaceOriginalDirection: @ 82725A2 + face_original_direction + step_end + +Common_Movement_WalkInPlaceLeft: @ 82725A4 + walk_in_place_fastest_left + step_end + +Common_Movement_WalkInPlaceUp: @ 82725A6 + walk_in_place_fastest_up + step_end + +Common_Movement_WalkInPlaceRight: @ 82725A8 + walk_in_place_fastest_right + step_end + +Common_Movement_WalkInPlaceDown: @ 82725AA + walk_in_place_fastest_down + step_end + +RustboroCity_Movement_2725AC: @ 82725AC + face_right + step_end + +RustboroCity_Movement_2725AE: @ 82725AE + face_left + step_end + +Common_Movement_FaceDown: @ 82725B0 + face_down + step_end + +Common_Movement_FaceUp: @ 82725B2 + face_up + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 +MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 + walk_in_place_down + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 +BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 + walk_in_place_left + step_end + +Route121_Movement_2725B8: @ 82725B8 + walk_in_place_right + step_end + +EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 + walk_up + walk_up + walk_up + walk_up + step_end + +EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 + delay_16 + delay_16 + step_end + +Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 + walk_up + step_end + +Movement_2725CB:: @ 82725CB + walk_up + walk_up + step_end diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc new file mode 100644 index 000000000..61ba4fed6 --- /dev/null +++ b/data/scripts/new_game.inc @@ -0,0 +1,245 @@ +EventScript_ResetAllBerries:: @ 827149D + setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES + setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES + setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES + setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES + setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES + return + +EventScript_ResetAllMapFlags:: @ 82715DE + setflag FLAG_LINK_CONTEST_POKE_BALL + setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA + setflag FLAG_HIDE_PETALBURG_CITY_WALLY + setflag FLAG_UNKNOWN_0x363 + setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST + setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST + setflag FLAG_HIDE_ROUTE_110_BIRCH + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS + setflag FLAG_HIDE_PETALBURG_GYM_GREETER + setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_PLAYERS_HOUSE_DAD + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_GYM_WALLY + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW + setflag FLAG_HIDE_ROUTE_119_RIVAL + setflag FLAG_HIDE_ROUTE_119_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE + setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE + setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN + setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS + setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY + setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_ROUTE_116_MR_BRINEY + setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 + setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT + setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE + setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH + setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR + setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER + setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE + setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON + setflag FLAG_UNKNOWN_0x393 + setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE + setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON + setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT + setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL + setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH + setflag FLAG_HIDE_ROUTE_110_RIVAL_2 + setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE + setflag FLAG_HIDE_ROUTE_104_RIVAL + setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL + setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN + setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M + setflag FLAG_HIDE_ROUTE_128_STEVEN + setflag FLAG_HIDE_ROUTE_128_ARCHIE + setflag FLAG_HIDE_ROUTE_128_MAXIE + setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE + setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN + setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL + setflag FLAG_HIDE_ROUTE_101_BOY + setflag FLAG_HIDE_PETALBURG_CITY_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA + setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL + setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT + setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT + setflag FLAG_HIDE_SKY_PILLAR_WALLACE + setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT + call EventScript_ResetAllBerries + end diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc new file mode 100644 index 000000000..f1d6361ee --- /dev/null +++ b/data/scripts/pc.inc @@ -0,0 +1,66 @@ +EventScript_PC:: @ 8271D92 + lockall + setvar VAR_0x8004, 0 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox Text_BootUpPC, MSGBOX_DEFAULT + goto EventScript_271DAC + end + +EventScript_271DAC:: @ 8271DAC + message gText_WhichPCShouldBeAccessed + waitmessage + special ScriptMenu_CreatePCMultichoice + waitstate + goto EventScript_271DBC + end + +EventScript_271DBC:: @ 8271DBC + switch VAR_RESULT + case 0, EventScript_271E0E + case 1, EventScript_271DF9 + case 2, EventScript_271E54 + case 3, EventScript_271E47 + case MULTI_B_PRESSED, EventScript_271E47 + end + +EventScript_271DF9:: @ 8271DF9 + playse SE_PC_LOGIN + msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT + special PlayerPC + waitstate + goto EventScript_271DAC + end + +EventScript_271E0E:: @ 8271E0E + playse SE_PC_LOGIN + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 + call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E + msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT + special ShowPokemonStorageSystemPC + waitstate + goto EventScript_271DAC + end + +EventScript_271E35:: @ 8271E35 + msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT + return + +EventScript_271E3E:: @ 8271E3E + msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT + return + +EventScript_271E47:: @ 8271E47 + setvar VAR_0x8004, 0 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end + +EventScript_271E54:: @ 8271E54 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 + playse SE_PC_LOGIN + special AccessHallOfFamePC + waitstate + goto EventScript_271DBC + end -- cgit v1.2.3 From 749247b9104426fc8c652c5454fc1508b35c43b0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 5 Oct 2019 10:52:48 -0400 Subject: Convert 4 spaces in .inc to tab --- data/scripts/battle_pike.inc | 476 ++++++++++++++-------------- data/scripts/cave_hole.inc | 48 +-- data/scripts/cave_of_origin.inc | 66 ++-- data/scripts/check_furniture.inc | 28 +- data/scripts/elite_four.inc | 108 +++---- data/scripts/field_poison.inc | 88 +++--- data/scripts/interview.inc | 536 +++++++++++++++---------------- data/scripts/kecleon.inc | 186 +++++------ data/scripts/mevent.inc | 106 +++---- data/scripts/move_tutors.inc | 474 ++++++++++++++-------------- data/scripts/movement.inc | 112 +++---- data/scripts/new_game.inc | 484 ++++++++++++++-------------- data/scripts/pc.inc | 98 +++--- data/scripts/prof_birch.inc | 144 ++++----- data/scripts/roulette.inc | 80 ++--- data/scripts/trainer_hill.inc | 106 +++---- data/scripts/unusual_weather.inc | 658 +++++++++++++++++++-------------------- 17 files changed, 1899 insertions(+), 1899 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index bb02a7d6c..581a789e4 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -1,312 +1,312 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 - setvar VAR_0x8004, 4 - special CallBattlePikeFunction - setvar VAR_0x8004, 5 - special CallBattlePikeFunction - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 - case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF - end + setvar VAR_0x8004, 4 + special CallBattlePikeFunction + setvar VAR_0x8004, 5 + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 + case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 + case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 + case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 + case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93:: @ 82C3E93 - setobjectxyperm 1, 2, 5 - setobjectxyperm 2, 6, 5 - end + setobjectxyperm 1, 2, 5 + setobjectxyperm 2, 6, 5 + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2:: @ 82C3EA2 - setobjectxyperm 1, 4, 4 - setobjectxyperm 2, 3, 4 - end + setobjectxyperm 1, 4, 4 + setobjectxyperm 2, 3, 4 + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1:: @ 82C3EB1 - setobjectxyperm 1, 4, 4 - setobjectxyperm 2, 0, 0 - end + setobjectxyperm 1, 4, 4 + setobjectxyperm 2, 0, 0 + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0:: @ 82C3EC0 - setobjectxyperm 1, 5, 5 - setobjectxyperm 2, 0, 0 - end + setobjectxyperm 1, 5, 5 + setobjectxyperm 2, 0, 0 + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF - setobjectxyperm 1, 4, 3 - setobjectxyperm 2, 4, 4 - end + setobjectxyperm 1, 4, 3 + setobjectxyperm 2, 4, 4 + end BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 - .2byte 0 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 + .2byte 0 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_0x8004, 5 - special CallBattlePikeFunction - compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 6 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 7 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 8 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - end + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_0x8004, 5 + special CallBattlePikeFunction + compare VAR_RESULT, 3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 6 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 7 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 8 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - end + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - end + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E - setvar VAR_0x8007, 0 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F - end + setvar VAR_0x8007, 0 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59:: @ 82C3F59 - setvar VAR_0x8007, 1 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F - end + setvar VAR_0x8007, 1 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 - setvar VAR_0x8007, 2 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F - end + setvar VAR_0x8007, 2 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, 0 - special CallBattlePikeFunction - setvar VAR_0x8004, 5 - special CallBattlePikeFunction - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 - case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - end + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, 0 + special CallBattlePikeFunction + setvar VAR_0x8004, 5 + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 + case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 - waitstate - end + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 + waitstate + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 - waitstate - end + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 + waitstate + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_2, 1 - end + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_2, 0 - lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT - closemessage - end + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT + closemessage + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_2, 1 - end + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_2, 0 - lockall - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT - closemessage - end + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT + closemessage + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 - setvar VAR_0x8004, 25 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, 3 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C - waitstate - end + setvar VAR_0x8004, 25 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 + compare VAR_RESULT, 1 + call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, 3 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + waitstate + end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 - setvar VAR_0x8004, 24 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - return + setvar VAR_0x8004, 24 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 - setvar VAR_0x8004, 24 - setvar VAR_0x8005, 0 - special CallBattlePikeFunction - return + setvar VAR_0x8004, 24 + setvar VAR_0x8005, 0 + special CallBattlePikeFunction + return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 - return + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 + return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 - return + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + return BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004, 7 - special CallBattlePikeFunction - setvar VAR_0x8004, 25 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, 3 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C - waitstate - end + setvar VAR_0x8004, 7 + special CallBattlePikeFunction + setvar VAR_0x8004, 25 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 + compare VAR_RESULT, 1 + call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, 3 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + waitstate + end BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_2, 1 - end + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_2, 0 - lockall - msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT - closemessage - end + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT + closemessage + end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special CallFrontierUtilFunc + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E - setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - special CallFrontierUtilFunc - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 + setorcopyvar VAR_0x8006, VAR_RESULT + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + special CallFrontierUtilFunc + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B - setorcopyvar VAR_RESULT, VAR_0x8006 - end + setorcopyvar VAR_RESULT, VAR_0x8006 + end BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 - setvar VAR_0x8004, 21 - special CallFrontierUtilFunc - return + setvar VAR_0x8004, 21 + special CallFrontierUtilFunc + return BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A - set_invisible - step_end + set_invisible + step_end diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index e6f332224..86689fdb0 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -4,38 +4,38 @@ MirageTower_3F_MapScript2_2A8327: @ 82A8327 MtPyre_2F_MapScript2_2A8327: @ 82A8327 SkyPillar_2F_MapScript2_2A8327: @ 82A8327 SkyPillar_4F_MapScript2_2A8327: @ 82A8327 - map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole - .2byte 0 + map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole + .2byte 0 GraniteCave_B1F_MapScript1_2A8331: @ 82A8331 MirageTower_2F_MapScript1_2A8331: @ 82A8331 MirageTower_3F_MapScript1_2A8331: @ 82A8331 MtPyre_2F_MapScript1_2A8331: @ 82A8331 - copyvar VAR_ICE_STEP_COUNT, 0x1 - end + copyvar VAR_ICE_STEP_COUNT, 0x1 + end EventScript_FallDownHole:: @ 82A8337 - lockall - delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 - waitmovement 0 - playse SE_RU_HYUU - delay 60 - warphole MAP_UNDEFINED - waitstate - end + lockall + delay 20 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + waitmovement 0 + playse SE_RU_HYUU + delay 60 + warphole MAP_UNDEFINED + waitstate + end gUnknown_082A8350:: @ 82A8350 - lockall - delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 - waitmovement 0 - playse SE_RU_HYUU - delay 60 - special DoFallWarp - waitstate - end + lockall + delay 20 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + waitmovement 0 + playse SE_RU_HYUU + delay 60 + special DoFallWarp + waitstate + end GraniteCave_B1F_Movement_2A8369: @ 82A8369 - set_invisible - step_end + set_invisible + step_end diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index 83e8cd799..f534afaff 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -1,48 +1,48 @@ @ All unused / leftover scripts from RS EventScript_272274:: @ 8272274 - lockall - waitse - playmoncry SPECIES_KYOGRE, 2 - waitmoncry - setvar VAR_TEMP_5, 1 - releaseall - end + lockall + waitse + playmoncry SPECIES_KYOGRE, 2 + waitmoncry + setvar VAR_TEMP_5, 1 + releaseall + end EventScript_272283:: @ 8272283 - lockall - setvar VAR_TEMP_1, 1 - goto EventScript_2722A7 - end + lockall + setvar VAR_TEMP_1, 1 + goto EventScript_2722A7 + end EventScript_27228F:: @ 827228F - lockall - setvar VAR_TEMP_2, 1 - goto EventScript_2722A7 - end + lockall + setvar VAR_TEMP_2, 1 + goto EventScript_2722A7 + end EventScript_27229B:: @ 827229B - lockall - setvar VAR_TEMP_3, 1 - goto EventScript_2722A7 - end + lockall + setvar VAR_TEMP_3, 1 + goto EventScript_2722A7 + end EventScript_2722A7:: @ 82722A7 - setvar VAR_0x8004, 1 @ vertical pan - setvar VAR_0x8005, 1 @ horizontal pan - setvar VAR_0x8006, 8 @ num shakes - setvar VAR_0x8007, 5 @ shake delay - special ShakeCamera - waitstate - releaseall - end + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera + waitstate + releaseall + end CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1 CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1 CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1 CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_2, 1 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_4, 1 - setvar VAR_TEMP_5, 1 - return \ No newline at end of file + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 + return \ No newline at end of file diff --git a/data/scripts/check_furniture.inc b/data/scripts/check_furniture.inc index f9220a26f..0a952f3c3 100644 --- a/data/scripts/check_furniture.inc +++ b/data/scripts/check_furniture.inc @@ -1,27 +1,27 @@ EventScript_PictureBookShelf:: @ 82725CE - msgbox Text_PictureBookShelf, MSGBOX_SIGN - end + msgbox Text_PictureBookShelf, MSGBOX_SIGN + end EventScript_BookShelf:: @ 82725D7 - msgbox Text_BookShelf, MSGBOX_SIGN - end + msgbox Text_BookShelf, MSGBOX_SIGN + end EventScript_PokemonCenterBookShelf:: @ 82725E0 - msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN - end + msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN + end EventScript_Vase:: @ 82725E9 - msgbox Text_Vase, MSGBOX_SIGN - end + msgbox Text_Vase, MSGBOX_SIGN + end EventScript_EmptyTrashCan:: @ 82725F2 - msgbox Text_EmptyTrashCan, MSGBOX_SIGN - end + msgbox Text_EmptyTrashCan, MSGBOX_SIGN + end EventScript_ShopShelf:: @ 82725FB - msgbox Text_ShopShelf, MSGBOX_SIGN - end + msgbox Text_ShopShelf, MSGBOX_SIGN + end EventScript_Blueprint:: @ 8272604 - msgbox Text_Blueprint, MSGBOX_SIGN - end + msgbox Text_Blueprint, MSGBOX_SIGN + end diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index 69b5f4807..c6b8d5578 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -3,72 +3,72 @@ EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 - waitmovement 0 - playse SE_DOOR - setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 - setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 - setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - special DrawWholeMapView - return + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 + waitmovement 0 + playse SE_DOOR + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + special DrawWholeMapView + return EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA - waitmovement 0 - playse SE_TRACK_DOOR - setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - special DrawWholeMapView - return + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA + waitmovement 0 + playse SE_TRACK_DOOR + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + special DrawWholeMapView + return EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC - setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 - setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 - setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - return + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + return EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F - setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - return + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + return diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 91ec765ff..9f8058e4e 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -1,51 +1,51 @@ EventScript_Poison:: @ 82736BC - lockall - special ExecuteWhiteOut - waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_2736D9 - compare VAR_RESULT, 2 - goto_if_eq EventScript_2736F8 - releaseall - end + lockall + special ExecuteWhiteOut + waitstate + compare VAR_RESULT, 1 + goto_if_eq EventScript_2736D9 + compare VAR_RESULT, 2 + goto_if_eq EventScript_2736F8 + releaseall + end EventScript_2736D9:: @ 82736D9 - message gText_PlayerWhitedOut - waitmessage - waitbuttonpress - special sub_80B05B4 - waitstate - fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 - special sp0C8_whiteout_maybe - waitstate - end + message gText_PlayerWhitedOut + waitmessage + waitbuttonpress + special sub_80B05B4 + waitstate + fadescreen 1 + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 + special sp0C8_whiteout_maybe + waitstate + end EventScript_2736F4:: @ 82736F4 - setrespawn HEAL_LOCATION_LAVARIDGE_TOWN - return + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN + return EventScript_2736F8:: @ 82736F8 - message gText_PlayerWhitedOut - waitmessage - waitbuttonpress - setvar VAR_0x8004, 16 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 - setvar VAR_0x8004, 12 - special CallBattlePyramidFunction - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 - special CallTrainerHillFunction - compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - special sub_80B05B4 - waitstate - fadescreen 1 - special sp0C8_whiteout_maybe - waitstate - end + message gText_PlayerWhitedOut + waitmessage + waitbuttonpress + setvar VAR_0x8004, 16 + special CallBattlePikeFunction + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + setvar VAR_0x8004, 12 + special CallBattlePyramidFunction + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + special CallTrainerHillFunction + compare VAR_RESULT, 1 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + special sub_80B05B4 + waitstate + fadescreen 1 + special sp0C8_whiteout_maybe + waitstate + end diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 013d39da2..2ad8b305e 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -2,345 +2,345 @@ BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9 LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9 SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9 SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9 - special InterviewAfter - incrementgamestat GAME_STAT_GOT_INTERVIEWED - release - end + special InterviewAfter + incrementgamestat GAME_STAT_GOT_INTERVIEWED + release + end SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 - setvar VAR_0x8005, 1 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 - copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C - end + setvar VAR_0x8005, 1 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 + copyvar VAR_0x8009, VAR_0x8006 + msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + end SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 - msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C - end + msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + end SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C - msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT + release + end SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 - msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT - setvar VAR_0x8005, 1 - goto SlateportCity_PokemonFanClub_EventScript_28C7E9 - end + msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT + setvar VAR_0x8005, 1 + goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + end SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 - msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT + release + end SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 - lock - faceplayer - setvar VAR_0x8005, 2 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 - copyvar VAR_0x8009, VAR_0x8006 - goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 - setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C - end + lock + faceplayer + setvar VAR_0x8005, 2 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 + copyvar VAR_0x8009, VAR_0x8006 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER + msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 - msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C - end + msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 - msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C - end + msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C - msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT + release + end SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 - msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT - setvar VAR_0x8005, 2 - goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 - end + msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT + setvar VAR_0x8005, 2 + goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 + end SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 - msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT + release + end SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 - lock - faceplayer - specialvar VAR_RESULT, sub_80EF8F8 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 - setvar VAR_0x8005, 3 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F - copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - end + lock + faceplayer + specialvar VAR_RESULT, sub_80EF8F8 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 + setvar VAR_0x8005, 3 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F + copyvar VAR_0x8009, VAR_0x8006 + msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + end SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C - msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT - random 3 - copyvar VAR_0x800A, VAR_RESULT - switch VAR_RESULT - case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 - case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 - case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF - end + msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT + random 3 + copyvar VAR_0x800A, VAR_RESULT + switch VAR_RESULT + case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 + case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 + case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF + end SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 - msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED - end + msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 - msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED - end + msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF - msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED - end + msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED - setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT - setvar VAR_0x8006, 1 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT - copyvar VAR_0x8007, VAR_0x800A - setvar VAR_0x8005, 3 - goto SlateportCity_PokemonFanClub_EventScript_28C7E9 - end + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 0 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT + setvar VAR_0x8006, 1 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT + copyvar VAR_0x8007, VAR_0x800A + setvar VAR_0x8005, 3 + goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + end SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 - msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT + release + end SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F - msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT + release + end LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 - lock - faceplayer - goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 - setvar VAR_0x8005, 6 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 - copyvar VAR_0x8009, VAR_0x8006 - msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - end + lock + faceplayer + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 + setvar VAR_0x8005, 6 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 + copyvar VAR_0x8009, VAR_0x8006 + msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + end LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B - msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - end + msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 0 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + end LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT - release - end + msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT + release + end LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA - setvar VAR_0x8004, 24 - special SetContestCategoryStringVarForInterview - msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 1 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT - setflag FLAG_TEMP_2 - setvar VAR_0x8005, 6 - goto LilycoveCity_ContestLobby_EventScript_28C7E9 - end + setvar VAR_0x8004, 24 + special SetContestCategoryStringVarForInterview + msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 1 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 + setvar VAR_0x8005, 6 + goto LilycoveCity_ContestLobby_EventScript_28C7E9 + end LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 - msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT - release - end + msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT + release + end LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare VAR_LINK_CONTEST_ROOM_STATE, 2 - goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 - setvar VAR_0x8005, 6 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 - switch VAR_CONTEST_LOCATION - case 0, LilycoveCity_ContestLobby_EventScript_28CB95 - case 2, LilycoveCity_ContestLobby_EventScript_28CB91 - case 1, LilycoveCity_ContestLobby_EventScript_28CB91 - case 3, LilycoveCity_ContestLobby_EventScript_28CB91 - case 4, LilycoveCity_ContestLobby_EventScript_28CB91 - case 5, LilycoveCity_ContestLobby_EventScript_28CB95 - end + compare VAR_LINK_CONTEST_ROOM_STATE, 2 + goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 + setvar VAR_0x8005, 6 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 + switch VAR_CONTEST_LOCATION + case 0, LilycoveCity_ContestLobby_EventScript_28CB95 + case 2, LilycoveCity_ContestLobby_EventScript_28CB91 + case 1, LilycoveCity_ContestLobby_EventScript_28CB91 + case 3, LilycoveCity_ContestLobby_EventScript_28CB91 + case 4, LilycoveCity_ContestLobby_EventScript_28CB91 + case 5, LilycoveCity_ContestLobby_EventScript_28CB95 + end LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 - clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - return + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + return LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 - return + return BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 - lock - faceplayer - goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A - setvar VAR_0x8005, 7 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A - copyvar VAR_0x8009, VAR_0x8006 - msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E - end + lock + faceplayer + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A + setvar VAR_0x8005, 7 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + copyvar VAR_0x8009, VAR_0x8006 + msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E + end BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 - message BattleFrontier_BattleTowerLobby_Text_27F7BA - waitmessage - multichoice 20, 8, MULTI_SATISFACTION, 1 - copyvar VAR_0x8008, VAR_RESULT - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - end + message BattleFrontier_BattleTowerLobby_Text_27F7BA + waitmessage + multichoice 20, 8, MULTI_SATISFACTION, 1 + copyvar VAR_0x8008, VAR_RESULT + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 + msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + end BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E - msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT - release - end + msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT + release + end BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 - msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT - return + msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT + return BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT - return + msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT + return BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT - setflag FLAG_TEMP_2 - copyvar VAR_0x8004, VAR_0x8008 - setvar VAR_0x8005, 7 - goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 - end + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 + copyvar VAR_0x8004, VAR_0x8008 + setvar VAR_0x8005, 7 + goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 + end BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT - release - end + msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT + release + end BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A - msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT - release - end + msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT + release + end BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 - compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - setvar VAR_0x8005, 7 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER - return + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + setvar VAR_0x8005, 7 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER + return BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 - setflag FLAG_HIDE_BATTLE_TOWER_REPORTER - return + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER + return diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index 567b44037..e4118d3e1 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -1,119 +1,119 @@ Route120_EventScript_2722DB:: @ 82722DB - lock - faceplayer - setvar VAR_0x8009, 1 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 1 + goto Route120_EventScript_272336 + end Route120_EventScript_2722E8:: @ 82722E8 - lock - faceplayer - setvar VAR_0x8009, 2 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 2 + goto Route120_EventScript_272336 + end Route120_EventScript_2722F5:: @ 82722F5 - lock - faceplayer - setvar VAR_0x8009, 3 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 3 + goto Route120_EventScript_272336 + end Route120_EventScript_272302:: @ 8272302 - lock - faceplayer - setvar VAR_0x8009, 4 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 4 + goto Route120_EventScript_272336 + end Route120_EventScript_27230F:: @ 827230F - lock - faceplayer - setvar VAR_0x8009, 5 - goto Route120_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 5 + goto Route120_EventScript_272336 + end Route119_EventScript_27231C:: @ 827231C - lock - faceplayer - setvar VAR_0x8009, 6 - goto Route119_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 6 + goto Route119_EventScript_272336 + end Route119_EventScript_272329:: @ 8272329 - lock - faceplayer - setvar VAR_0x8009, 7 - goto Route119_EventScript_272336 - end + lock + faceplayer + setvar VAR_0x8009, 7 + goto Route119_EventScript_272336 + end Route119_EventScript_272336:: @ 8272336 Route120_EventScript_272336:: @ 8272336 - checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT - release - end + checkitem ITEM_DEVON_SCOPE, 1 + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272350 + msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + release + end Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272365 - release - end + msgbox Route119_Text_1F5D23, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq Route119_EventScript_272365 + release + end Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT - closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 - applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 - waitmovement 0 - waitse - playmoncry SPECIES_KECLEON, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 4 - goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 5 - goto_if_eq EventScript_RemoveKecleon - release - end + msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT + closemessage + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer + waitmovement 0 + applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, GetBattleOutcome + compare VAR_RESULT, 1 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 4 + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, 5 + goto_if_eq EventScript_RemoveKecleon + release + end EventScript_RemoveKecleon:: @ 82723C1 - goto Common_EventScript_RemoveStaticPokemon - end + goto Common_EventScript_RemoveStaticPokemon + end FortreeCity_Movement_2723C7: @ 82723C7 Route119_Movement_2723C7: @ 82723C7 Route120_Movement_2723C7: @ 82723C7 - set_visible - delay_4 - set_invisible - delay_4 - set_visible - delay_4 - set_invisible - delay_4 - set_visible - delay_8 - set_invisible - delay_8 - set_visible - delay_8 - set_invisible - delay_8 - set_visible - delay_16 - set_invisible - delay_16 - set_visible - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + step_end diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc index d97e58063..29f9c47d5 100644 --- a/data/scripts/mevent.inc +++ b/data/scripts/mevent.inc @@ -1,63 +1,63 @@ EventScript_Questionnaire:: @ 827381B - lockall - msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_2738FD - setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE - call Common_ShowEasyChatScreen - lock - faceplayer - specialvar VAR_0x8008, GetMartEmployeeObjectEventId - compare VAR_0x8004, 1 - goto_if_eq EventScript_27386D - compare VAR_0x8004, 2 - goto_if_eq EventScript_2738B5 - compare VAR_RESULT, 0 - goto_if_eq EventScript_2738FD - compare VAR_RESULT, 1 - goto_if_eq EventScript_2738FF - end + lockall + msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_2738FD + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen + lock + faceplayer + specialvar VAR_0x8008, GetMartEmployeeObjectEventId + compare VAR_0x8004, 1 + goto_if_eq EventScript_27386D + compare VAR_0x8004, 2 + goto_if_eq EventScript_2738B5 + compare VAR_RESULT, 0 + goto_if_eq EventScript_2738FD + compare VAR_RESULT, 1 + goto_if_eq EventScript_2738FF + end EventScript_27386D:: @ 827386D - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF - goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF - 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 gUnknown_08273506, MSGBOX_DEFAULT - setflag FLAG_SYS_MYSTERY_EVENT_ENABLE - msgbox gUnknown_08273559, MSGBOX_DEFAULT - releaseall - end + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF + 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 gUnknown_08273506, MSGBOX_DEFAULT + setflag FLAG_SYS_MYSTERY_EVENT_ENABLE + msgbox gUnknown_08273559, MSGBOX_DEFAULT + releaseall + end EventScript_2738B5:: @ 82738B5 - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF - goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF - 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 gUnknown_08273446, MSGBOX_DEFAULT - setflag FLAG_SYS_MYSTERY_GIFT_ENABLE - msgbox gUnknown_082734CC, MSGBOX_DEFAULT - releaseall - end + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF + 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 gUnknown_08273446, MSGBOX_DEFAULT + setflag FLAG_SYS_MYSTERY_GIFT_ENABLE + msgbox gUnknown_082734CC, MSGBOX_DEFAULT + releaseall + end EventScript_2738FD:: @ 82738FD - releaseall - end + releaseall + end EventScript_2738FF:: @ 82738FF - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 - msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT - releaseall - end + applymovement VAR_0x8008, Common_Movement_FaceDown + waitmovement 0 + msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT + releaseall + end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index e8eebade3..8780b9994 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -1,299 +1,299 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - call SlateportCity_PokemonFanClub_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT - setvar VAR_0x8005, 23 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER - goto SlateportCity_PokemonFanClub_EventScript_2C7F74 - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 + msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + call SlateportCity_PokemonFanClub_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT + setvar VAR_0x8005, 23 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER + goto SlateportCity_PokemonFanClub_EventScript_2C7F74 + end SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT + release + end SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT - release - end + msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT + release + end MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC - msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - call MauvilleCity_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT - setvar VAR_0x8005, 16 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT - goto MauvilleCity_EventScript_2C7FDC - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC + msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_EventScript_2C7FD2 + call MauvilleCity_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_EventScript_2C7FD2 + msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT + setvar VAR_0x8005, 16 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_EventScript_2C7FD2 + setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT + goto MauvilleCity_EventScript_2C7FDC + end MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 - msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT - release - end + msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT + release + end MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC - msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT - release - end + msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT + release + end VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT - setvar VAR_0x8005, 29 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER - goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT + setvar VAR_0x8005, 29 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER + goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + end VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT - release - end + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT + release + end VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT - release - end + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT + release + end LavaridgeTown_House_EventScript_2C804E:: @ 82C804E - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC - msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - call LavaridgeTown_House_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT - setvar VAR_0x8005, 7 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC - goto LavaridgeTown_House_EventScript_2C80AC - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC + msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + call LavaridgeTown_House_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT + setvar VAR_0x8005, 7 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC + goto LavaridgeTown_House_EventScript_2C80AC + end LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 - msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT - release - end + msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT + release + end LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC - msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT - release - end + msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT + release + end FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 - msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - call FallarborTown_Mart_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT - setvar VAR_0x8005, 8 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME - goto FallarborTown_Mart_EventScript_2C8114 - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 + msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_Mart_EventScript_2C810A + call FallarborTown_Mart_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_Mart_EventScript_2C810A + msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT + setvar VAR_0x8005, 8 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_Mart_EventScript_2C810A + setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME + goto FallarborTown_Mart_EventScript_2C8114 + end FallarborTown_Mart_EventScript_2C810A:: @ 82C810A - msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT - release - end + msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT + release + end FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 - msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT - release - end + msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT + release + end FortreeCity_House2_EventScript_2C811E:: @ 82C811E - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C - msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - call FortreeCity_House2_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT - setvar VAR_0x8005, 24 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK - goto FortreeCity_House2_EventScript_2C817C - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C + msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_2C8172 + call FortreeCity_House2_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_2C8172 + msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT + setvar VAR_0x8005, 24 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_2C8172 + setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK + goto FortreeCity_House2_EventScript_2C817C + end FortreeCity_House2_EventScript_2C8172:: @ 82C8172 - msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT - release - end + msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT + release + end FortreeCity_House2_EventScript_2C817C:: @ 82C817C - msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT - release - end + msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT + release + end LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT - setvar VAR_0x8005, 14 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT + setvar VAR_0x8005, 14 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + end LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT - release - end + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT + release + end LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT - release - end + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT + release + end MossdeepCity_EventScript_2C81EE:: @ 82C81EE - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C - msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - call MossdeepCity_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT - setvar VAR_0x8005, 15 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH - goto MossdeepCity_EventScript_2C824C - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C + msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq MossdeepCity_EventScript_2C8242 + call MossdeepCity_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq MossdeepCity_EventScript_2C8242 + msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT + setvar VAR_0x8005, 15 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MossdeepCity_EventScript_2C8242 + setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH + goto MossdeepCity_EventScript_2C824C + end MossdeepCity_EventScript_2C8242:: @ 82C8242 - msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT - release - end + msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT + release + end MossdeepCity_EventScript_2C824C:: @ 82C824C - msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT - release - end + msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT + release + end SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - call SootopolisCity_PokemonCenter_1F_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT - setvar VAR_0x8005, 4 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE - goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + call SootopolisCity_PokemonCenter_1F_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT + setvar VAR_0x8005, 4 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE + goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + end SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT - release - end + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT + release + end SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT - release - end + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT + release + end PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT - setvar VAR_0x8005, 12 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION - goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - end + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D + compare VAR_RESULT, 0 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT + setvar VAR_0x8005, 12 + call EventScript_ShowPartyMenu + compare VAR_RESULT, 0 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION + goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + end PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT - release - end + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT + release + end PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT - release - end + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT + release + end EventScript_ShowPartyMenu:: @ 82C8326 - special sub_81B892C - waitstate - lock - faceplayer - return + special sub_81B892C + waitstate + lock + faceplayer + return FallarborTown_Mart_EventScript_2C832D:: @ 82C832D FortreeCity_House2_EventScript_2C832D:: @ 82C832D @@ -305,5 +305,5 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D - msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO - return + msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO + return diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index 26b509d5b..b7abceae4 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -1,101 +1,101 @@ SlateportCity_Movement_272596: @ 8272596 - emote_question_mark - step_end + emote_question_mark + step_end Common_Movement_ExclamationMark: @ 8272598 - emote_exclamation_mark - step_end + emote_exclamation_mark + step_end Common_Movement_Delay48: @ 827259A - delay_16 - delay_16 - delay_16 - step_end + delay_16 + delay_16 + delay_16 + step_end Common_Movement_FacePlayer: @ 827259E - face_player - step_end + face_player + step_end Common_Movement_FaceAwayPlayer: @ 82725A0 - face_away_player - step_end + face_away_player + step_end Common_Movement_FaceOriginalDirection: @ 82725A2 - face_original_direction - step_end + face_original_direction + step_end Common_Movement_WalkInPlaceLeft: @ 82725A4 - walk_in_place_fastest_left - step_end + walk_in_place_fastest_left + step_end Common_Movement_WalkInPlaceUp: @ 82725A6 - walk_in_place_fastest_up - step_end + walk_in_place_fastest_up + step_end Common_Movement_WalkInPlaceRight: @ 82725A8 - walk_in_place_fastest_right - step_end + walk_in_place_fastest_right + step_end Common_Movement_WalkInPlaceDown: @ 82725AA - walk_in_place_fastest_down - step_end + walk_in_place_fastest_down + step_end RustboroCity_Movement_2725AC: @ 82725AC - face_right - step_end + face_right + step_end RustboroCity_Movement_2725AE: @ 82725AE - face_left - step_end + face_left + step_end Common_Movement_FaceDown: @ 82725B0 - face_down - step_end + face_down + step_end Common_Movement_FaceUp: @ 82725B2 - face_up - step_end + face_up + step_end BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 - walk_in_place_down - step_end + walk_in_place_down + step_end BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 - walk_in_place_left - step_end + walk_in_place_left + step_end Route121_Movement_2725B8: @ 82725B8 - walk_in_place_right - step_end + walk_in_place_right + step_end EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 - walk_up - walk_up - walk_up - walk_up - step_end + walk_up + walk_up + walk_up + walk_up + step_end EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 - delay_16 - delay_16 - step_end + delay_16 + delay_16 + step_end Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 - walk_up - step_end + walk_up + step_end Movement_2725CB:: @ 82725CB - walk_up - walk_up - step_end + walk_up + walk_up + step_end diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 61ba4fed6..e8cfc34a0 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -1,245 +1,245 @@ EventScript_ResetAllBerries:: @ 827149D - setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES - setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES - setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES - setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES - setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES - setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES - setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES - setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES - setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES - setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES - setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES - setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES - setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES - setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES - setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES - setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES - setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES - return + setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES + setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES + setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES + setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES + setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES + return EventScript_ResetAllMapFlags:: @ 82715DE - setflag FLAG_LINK_CONTEST_POKE_BALL - setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE - setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE - setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA - setflag FLAG_HIDE_PETALBURG_CITY_WALLY - setflag FLAG_UNKNOWN_0x363 - setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT - setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY - setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setflag FLAG_HIDE_ROUTE_104_MR_BRINEY - setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_108_MR_BRINEY - setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT - setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST - setflag FLAG_HIDE_ROUTE_110_BIRCH - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - setflag FLAG_HIDE_PETALBURG_GYM_GREETER - setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - setflag FLAG_HIDE_PLAYERS_HOUSE_DAD - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL - setflag FLAG_HIDE_FANCLUB_OLD_LADY - setflag FLAG_HIDE_FANCLUB_BOY - setflag FLAG_HIDE_FANCLUB_LITTLE_BOY - setflag FLAG_HIDE_FANCLUB_LADY - setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN - setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT - setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - setflag FLAG_HIDE_PETALBURG_GYM_WALLY - setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 - setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW - setflag FLAG_HIDE_ROUTE_119_RIVAL - setflag FLAG_HIDE_ROUTE_119_SCOTT - setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN - setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE - setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN - setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS - setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN - setflag FLAG_HIDE_ROUTE_116_MR_BRINEY - setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO - setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN - setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE - setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 - setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 - setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT - setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH - setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - setflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_ROUTE_103_BIRCH - setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR - setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER - setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE - setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON - setflag FLAG_UNKNOWN_0x393 - setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE - setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON - setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT - setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL - setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH - setflag FLAG_HIDE_ROUTE_110_RIVAL_2 - setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE - setflag FLAG_HIDE_ROUTE_104_RIVAL - setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 - setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO - setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M - setflag FLAG_HIDE_ROUTE_128_STEVEN - setflag FLAG_HIDE_ROUTE_128_ARCHIE - setflag FLAG_HIDE_ROUTE_128_MAXIE - setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE - setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT - setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setflag FLAG_HIDE_OLDALE_TOWN_RIVAL - setflag FLAG_HIDE_ROUTE_101_BOY - setflag FLAG_HIDE_PETALBURG_CITY_SCOTT - setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA - setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE - setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON - setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE - setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE - setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL - setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT - setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - setflag FLAG_HIDE_DEOXYS - setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT - setflag FLAG_HIDE_SKY_PILLAR_WALLACE - setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT - call EventScript_ResetAllBerries - end + setflag FLAG_LINK_CONTEST_POKE_BALL + setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA + setflag FLAG_HIDE_PETALBURG_CITY_WALLY + setflag FLAG_UNKNOWN_0x363 + setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST + setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST + setflag FLAG_HIDE_ROUTE_110_BIRCH + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS + setflag FLAG_HIDE_PETALBURG_GYM_GREETER + setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_PLAYERS_HOUSE_DAD + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_GYM_WALLY + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW + setflag FLAG_HIDE_ROUTE_119_RIVAL + setflag FLAG_HIDE_ROUTE_119_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE + setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE + setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN + setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS + setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY + setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_ROUTE_116_MR_BRINEY + setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 + setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT + setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE + setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH + setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR + setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER + setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE + setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON + setflag FLAG_UNKNOWN_0x393 + setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE + setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON + setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT + setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL + setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH + setflag FLAG_HIDE_ROUTE_110_RIVAL_2 + setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE + setflag FLAG_HIDE_ROUTE_104_RIVAL + setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL + setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN + setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M + setflag FLAG_HIDE_ROUTE_128_STEVEN + setflag FLAG_HIDE_ROUTE_128_ARCHIE + setflag FLAG_HIDE_ROUTE_128_MAXIE + setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE + setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN + setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL + setflag FLAG_HIDE_ROUTE_101_BOY + setflag FLAG_HIDE_PETALBURG_CITY_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA + setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL + setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT + setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT + setflag FLAG_HIDE_SKY_PILLAR_WALLACE + setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT + call EventScript_ResetAllBerries + end diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index f1d6361ee..d5e51e412 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -1,66 +1,66 @@ EventScript_PC:: @ 8271D92 - lockall - setvar VAR_0x8004, 0 - special DoPCTurnOnEffect - playse SE_PC_ON - msgbox Text_BootUpPC, MSGBOX_DEFAULT - goto EventScript_271DAC - end + lockall + setvar VAR_0x8004, 0 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox Text_BootUpPC, MSGBOX_DEFAULT + goto EventScript_271DAC + end EventScript_271DAC:: @ 8271DAC - message gText_WhichPCShouldBeAccessed - waitmessage - special ScriptMenu_CreatePCMultichoice - waitstate - goto EventScript_271DBC - end + message gText_WhichPCShouldBeAccessed + waitmessage + special ScriptMenu_CreatePCMultichoice + waitstate + goto EventScript_271DBC + end EventScript_271DBC:: @ 8271DBC - switch VAR_RESULT - case 0, EventScript_271E0E - case 1, EventScript_271DF9 - case 2, EventScript_271E54 - case 3, EventScript_271E47 - case MULTI_B_PRESSED, EventScript_271E47 - end + switch VAR_RESULT + case 0, EventScript_271E0E + case 1, EventScript_271DF9 + case 2, EventScript_271E54 + case 3, EventScript_271E47 + case MULTI_B_PRESSED, EventScript_271E47 + end EventScript_271DF9:: @ 8271DF9 - playse SE_PC_LOGIN - msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT - special PlayerPC - waitstate - goto EventScript_271DAC - end + playse SE_PC_LOGIN + msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT + special PlayerPC + waitstate + goto EventScript_271DAC + end EventScript_271E0E:: @ 8271E0E - playse SE_PC_LOGIN - call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 - call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E - msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT - special ShowPokemonStorageSystemPC - waitstate - goto EventScript_271DAC - end + playse SE_PC_LOGIN + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 + call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E + msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT + special ShowPokemonStorageSystemPC + waitstate + goto EventScript_271DAC + end EventScript_271E35:: @ 8271E35 - msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT - return + msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT + return EventScript_271E3E:: @ 8271E3E - msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT - return + msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT + return EventScript_271E47:: @ 8271E47 - setvar VAR_0x8004, 0 - playse SE_PC_OFF - special DoPCTurnOffEffect - releaseall - end + setvar VAR_0x8004, 0 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end EventScript_271E54:: @ 8271E54 - goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 - playse SE_PC_LOGIN - special AccessHallOfFamePC - waitstate - goto EventScript_271DBC - end + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 + playse SE_PC_LOGIN + special AccessHallOfFamePC + waitstate + goto EventScript_271DBC + end diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc index 318f88ad7..249f45376 100644 --- a/data/scripts/prof_birch.inc +++ b/data/scripts/prof_birch.inc @@ -1,94 +1,94 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD - compare VAR_PETALBURG_GYM_STATE, 0 - goto_if_eq Common_EventScript_NopReturn - goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 0 - call_if_eq Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 1 - call_if_eq Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 2 - call_if_eq Route101_EventScript_272127 - compare VAR_BIRCH_STATE, 3 - call_if_eq Route101_EventScript_272127 - compare VAR_BIRCH_STATE, 4 - call_if_eq Route101_EventScript_272134 - compare VAR_BIRCH_STATE, 5 - call_if_eq Route101_EventScript_272134 - compare VAR_BIRCH_STATE, 6 - call_if_eq Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 7 - call_if_eq Route101_EventScript_27211A - return + compare VAR_PETALBURG_GYM_STATE, 0 + goto_if_eq Common_EventScript_NopReturn + goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 0 + call_if_eq Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 1 + call_if_eq Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 2 + call_if_eq Route101_EventScript_272127 + compare VAR_BIRCH_STATE, 3 + call_if_eq Route101_EventScript_272127 + compare VAR_BIRCH_STATE, 4 + call_if_eq Route101_EventScript_272134 + compare VAR_BIRCH_STATE, 5 + call_if_eq Route101_EventScript_272134 + compare VAR_BIRCH_STATE, 6 + call_if_eq Route101_EventScript_27211A + compare VAR_BIRCH_STATE, 7 + call_if_eq Route101_EventScript_27211A + return Route101_EventScript_27211A:: @ 827211A - clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - setflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_ROUTE_103_BIRCH - return + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + return Route101_EventScript_272127:: @ 8272127 - clearflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - setflag FLAG_HIDE_ROUTE_103_BIRCH - return + clearflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_103_BIRCH + return Route101_EventScript_272134:: @ 8272134 - clearflag FLAG_HIDE_ROUTE_103_BIRCH - setflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - return + clearflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + return LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 Route101_EventScript_272141:: @ 8272141 Route103_EventScript_272141:: @ 8272141 - lock - faceplayer - goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 - goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 + lock + faceplayer + goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 - msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route101_EventScript_27216F - call Route101_EventScript_272184 - release - end + msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq Route101_EventScript_27216F + call Route101_EventScript_272184 + release + end Route101_EventScript_27216F:: @ 827216F - msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT - release - end + msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT + release + end Route101_EventScript_272179:: @ 8272179 - copyvar VAR_0x8004, VAR_0x8009 - special ShowPokedexRatingMessage - waitmessage - waitbuttonpress - return + copyvar VAR_0x8004, VAR_0x8009 + special ShowPokedexRatingMessage + waitmessage + waitbuttonpress + return EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 Route101_EventScript_272184:: @ 8272184 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, ScriptGetPokedexInfo - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - copyvar VAR_0x800A, VAR_RESULT - buffernumberstring 0, VAR_0x8008 - buffernumberstring 1, VAR_0x8009 - msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT - call Route101_EventScript_272179 - compare VAR_0x800A, 0 - goto_if_eq Common_EventScript_NopReturn - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, ScriptGetPokedexInfo - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - buffernumberstring 0, VAR_0x8008 - buffernumberstring 1, VAR_0x8009 - msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT - return + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, ScriptGetPokedexInfo + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + copyvar VAR_0x800A, VAR_RESULT + buffernumberstring 0, VAR_0x8008 + buffernumberstring 1, VAR_0x8009 + msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT + call Route101_EventScript_272179 + compare VAR_0x800A, 0 + goto_if_eq Common_EventScript_NopReturn + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, ScriptGetPokedexInfo + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + buffernumberstring 0, VAR_0x8008 + buffernumberstring 1, VAR_0x8009 + msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT + return diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc index 877308bc2..1dda5e17b 100644 --- a/data/scripts/roulette.inc +++ b/data/scripts/roulette.inc @@ -1,70 +1,70 @@ MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 0 - getpricereduction 2 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D - addvar VAR_0x8004, 128 - goto MauvilleCity_GameCorner_EventScript_2A5B0D - end + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 0 + getpricereduction 2 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D + addvar VAR_0x8004, 128 + goto MauvilleCity_GameCorner_EventScript_2A5B0D + end MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 1 - getpricereduction 2 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D - addvar VAR_0x8004, 128 - goto MauvilleCity_GameCorner_EventScript_2A5B0D - end + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + setvar VAR_0x8004, 1 + getpricereduction 2 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D + addvar VAR_0x8004, 128 + goto MauvilleCity_GameCorner_EventScript_2A5B0D + end MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D - special PlayRoulette - waitstate - end - + special PlayRoulette + waitstate + end + gUnknown_082A5B12:: @ 82A5B12 - .string "The minimum wager at this table\n" - .string "is {STR_VAR_1}. Do you want to play?$" + .string "The minimum wager at this table\n" + .string "is {STR_VAR_1}. Do you want to play?$" gUnknown_082A5B4E:: @ 82A5B4E - .string "You don't have enough COINS.$" + .string "You don't have enough COINS.$" gUnknown_082A5B6B:: @ 82A5B6B - .string "Special rate table right now!$" + .string "Special rate table right now!$" gUnknown_082A5B89:: @ 82A5B89 - .string "Place your wager with the + Control\n" - .string "Pad, then press the A Button.$" + .string "Place your wager with the + Control\n" + .string "Pad, then press the A Button.$" gUnknown_082A5BCB:: @ 82A5BCB - .string "It's a hit!$" + .string "It's a hit!$" gUnknown_082A5BD7:: @ 82A5BD7 - .string "Jackpot!$" + .string "Jackpot!$" gUnknown_082A5BE0:: @ 82A5BE0 - .string "Nothing doing!$" + .string "Nothing doing!$" gUnknown_082A5BEF:: @ 82A5BEF - .string "You've won {STR_VAR_1} COINS!$" + .string "You've won {STR_VAR_1} COINS!$" gUnknown_082A5C04:: @ 82A5C04 - .string "No COINS left…$" + .string "No COINS left…$" gUnknown_082A5C13:: @ 82A5C13 - .string "Keep playing?$" + .string "Keep playing?$" gUnknown_082A5C21:: @ 82A5C21 - .string "The ROULETTE board will be cleared.$" + .string "The ROULETTE board will be cleared.$" gUnknown_082A5C45:: @ 82A5C45 - .string "You don't have a COIN CASE.$" + .string "You don't have a COIN CASE.$" gUnknown_082A5C61:: @ 82A5C61 - .string "Your COIN CASE is full!\n" - .string "Coins can be exchanged for prizes.$" + .string "Your COIN CASE is full!\n" + .string "Coins can be exchanged for prizes.$" diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index dde971f9f..5b43118d1 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -3,27 +3,27 @@ TrainerHill_2F_MapScript1_2C8336: @ 82C8336 TrainerHill_3F_MapScript1_2C8336: @ 82C8336 TrainerHill_4F_MapScript1_2C8336: @ 82C8336 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER - special CallTrainerHillFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc - compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - end + setvar VAR_TEMP_2, 0 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER + special CallTrainerHillFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special CallFrontierUtilFunc + compare VAR_RESULT, B_OUTCOME_LOST + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + compare VAR_RESULT, B_OUTCOME_DREW + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + compare VAR_RESULT, B_OUTCOME_FORFEITED + goto_if_eq TrainerHill_1F_EventScript_2C83C9 + end TrainerHill_1F_MapScript2_2C8372: @ 82C8372 TrainerHill_2F_MapScript2_2C8372: @ 82C8372 - map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C - .2byte 0 + map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C + .2byte 0 TrainerHill_1F_EventScript_2C837C:: @ 82C837C - setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_3, 1 @ forced stop TrainerHill_1F_MapScript2_2C8381: @ 82C8381 @@ -31,55 +31,55 @@ TrainerHill_2F_MapScript2_2C8381: @ 82C8381 TrainerHill_3F_MapScript2_2C8381: @ 82C8381 TrainerHill_4F_MapScript2_2C8381: @ 82C8381 TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 - map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 - map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF - .2byte 0 + map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 + map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF + .2byte 0 EventScript_TrainerHillTimer:: @ 82C8393 - lockall - setvar VAR_0x8004, TRAINER_HILL_FUNC_7 - special CallTrainerHillFunction - msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT - releaseall - end + lockall + setvar VAR_0x8004, TRAINER_HILL_FUNC_7 + special CallTrainerHillFunction + msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT + releaseall + end TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 - setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, TRAINER_HILL_FUNC_9 - special CallTrainerHillFunction - compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83BF - end + setvar VAR_TEMP_2, 1 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 + special CallTrainerHillFunction + compare VAR_RESULT, 1 + goto_if_eq TrainerHill_1F_EventScript_2C83BF + end TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF - warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 - waitstate - end + warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 + waitstate + end TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 - setvar VAR_0x8004, TRAINER_HILL_FUNC_12 - special CallTrainerHillFunction - setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST - special CallTrainerHillFunction - setvar VAR_TEMP_1, 1 - end + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 + special CallTrainerHillFunction + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST + special CallTrainerHillFunction + setvar VAR_TEMP_1, 1 + end TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF - setvar VAR_TEMP_1, 0 - warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 - waitstate - end + setvar VAR_TEMP_1, 0 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 + waitstate + end TrainerHill_1F_Movement_2C83EE:: @ 82C83EE - set_invisible - step_end + set_invisible + step_end EventScript_2C83F0:: @ 82C83F0 - trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, TRAINER_HILL_FUNC_11 - special CallTrainerHillFunction - waitmessage - waitbuttonpress - closemessage - end + trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText + setvar VAR_0x8004, TRAINER_HILL_FUNC_11 + special CallTrainerHillFunction + waitmessage + waitbuttonpress + closemessage + end diff --git a/data/scripts/unusual_weather.inc b/data/scripts/unusual_weather.inc index abfbeb8a0..e9eae89c2 100644 --- a/data/scripts/unusual_weather.inc +++ b/data/scripts/unusual_weather.inc @@ -1,162 +1,162 @@ UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 - setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 - setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 - return + setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 - setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return + setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 - setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return + setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C - setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return + setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F - setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 - setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 - return + setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 + setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 - setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 - return + setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 - setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 - return + setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 - setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 - return + setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 + return UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB - setmetatile 10, 28, METATILE_General_RoughWater, 0 - setmetatile 11, 28, METATILE_General_RoughWater, 0 - setmetatile 9, 29, METATILE_General_RoughWater, 0 - setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 - setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 - setmetatile 12, 29, METATILE_General_RoughWater, 0 - setmetatile 9, 30, METATILE_General_RoughWater, 0 - setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 - setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 - setmetatile 12, 30, METATILE_General_RoughWater, 0 - setmetatile 10, 31, METATILE_General_RoughWater, 0 - setmetatile 11, 31, METATILE_General_RoughWater, 0 - return + setmetatile 10, 28, METATILE_General_RoughWater, 0 + setmetatile 11, 28, METATILE_General_RoughWater, 0 + setmetatile 9, 29, METATILE_General_RoughWater, 0 + setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 29, METATILE_General_RoughWater, 0 + setmetatile 9, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 31, METATILE_General_RoughWater, 0 + setmetatile 11, 31, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 - setmetatile 20, 53, METATILE_General_RoughWater, 0 - setmetatile 21, 53, METATILE_General_RoughWater, 0 - setmetatile 19, 54, METATILE_General_RoughWater, 0 - setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 - setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 - setmetatile 22, 54, METATILE_General_RoughWater, 0 - setmetatile 19, 55, METATILE_General_RoughWater, 0 - setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 - setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 - setmetatile 22, 55, METATILE_General_RoughWater, 0 - setmetatile 20, 56, METATILE_General_RoughWater, 0 - setmetatile 21, 56, METATILE_General_RoughWater, 0 - return + setmetatile 20, 53, METATILE_General_RoughWater, 0 + setmetatile 21, 53, METATILE_General_RoughWater, 0 + setmetatile 19, 54, METATILE_General_RoughWater, 0 + setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 54, METATILE_General_RoughWater, 0 + setmetatile 19, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 56, METATILE_General_RoughWater, 0 + setmetatile 21, 56, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 - setmetatile 8, 16, METATILE_General_RoughWater, 0 - setmetatile 9, 16, METATILE_General_RoughWater, 0 - setmetatile 7, 17, METATILE_General_RoughWater, 0 - setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 - setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 - setmetatile 10, 17, METATILE_General_RoughWater, 0 - setmetatile 7, 18, METATILE_General_RoughWater, 0 - setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 - setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 - setmetatile 10, 18, METATILE_General_RoughWater, 0 - setmetatile 8, 19, METATILE_General_RoughWater, 0 - setmetatile 9, 19, METATILE_General_RoughWater, 0 - return + setmetatile 8, 16, METATILE_General_RoughWater, 0 + setmetatile 9, 16, METATILE_General_RoughWater, 0 + setmetatile 7, 17, METATILE_General_RoughWater, 0 + setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 17, METATILE_General_RoughWater, 0 + setmetatile 7, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 19, METATILE_General_RoughWater, 0 + setmetatile 9, 19, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 - setmetatile 53, 18, METATILE_General_RoughWater, 0 - setmetatile 54, 18, METATILE_General_RoughWater, 0 - setmetatile 52, 19, METATILE_General_RoughWater, 0 - setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 - setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 - setmetatile 55, 19, METATILE_General_RoughWater, 0 - setmetatile 52, 20, METATILE_General_RoughWater, 0 - setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 55, 20, METATILE_General_RoughWater, 0 - setmetatile 53, 21, METATILE_General_RoughWater, 0 - setmetatile 54, 21, METATILE_General_RoughWater, 0 - return + setmetatile 53, 18, METATILE_General_RoughWater, 0 + setmetatile 54, 18, METATILE_General_RoughWater, 0 + setmetatile 52, 19, METATILE_General_RoughWater, 0 + setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 19, METATILE_General_RoughWater, 0 + setmetatile 52, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 21, METATILE_General_RoughWater, 0 + setmetatile 54, 21, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F - setmetatile 57, 9, METATILE_General_RoughWater, 0 - setmetatile 58, 9, METATILE_General_RoughWater, 0 - setmetatile 56, 10, METATILE_General_RoughWater, 0 - setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 - setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 - setmetatile 59, 10, METATILE_General_RoughWater, 0 - setmetatile 56, 11, METATILE_General_RoughWater, 0 - setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 - setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 - setmetatile 59, 11, METATILE_General_RoughWater, 0 - setmetatile 57, 12, METATILE_General_RoughWater, 0 - setmetatile 58, 12, METATILE_General_RoughWater, 0 - return + setmetatile 57, 9, METATILE_General_RoughWater, 0 + setmetatile 58, 9, METATILE_General_RoughWater, 0 + setmetatile 56, 10, METATILE_General_RoughWater, 0 + setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 10, METATILE_General_RoughWater, 0 + setmetatile 56, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 12, METATILE_General_RoughWater, 0 + setmetatile 58, 12, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC - setmetatile 61, 30, METATILE_General_RoughWater, 0 - setmetatile 62, 30, METATILE_General_RoughWater, 0 - setmetatile 60, 31, METATILE_General_RoughWater, 0 - setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 - setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 - setmetatile 63, 31, METATILE_General_RoughWater, 0 - setmetatile 60, 32, METATILE_General_RoughWater, 0 - setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 - setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 - setmetatile 63, 32, METATILE_General_RoughWater, 0 - setmetatile 61, 33, METATILE_General_RoughWater, 0 - setmetatile 62, 33, METATILE_General_RoughWater, 0 - return + setmetatile 61, 30, METATILE_General_RoughWater, 0 + setmetatile 62, 30, METATILE_General_RoughWater, 0 + setmetatile 60, 31, METATILE_General_RoughWater, 0 + setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 31, METATILE_General_RoughWater, 0 + setmetatile 60, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 33, METATILE_General_RoughWater, 0 + setmetatile 62, 33, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 - setmetatile 16, 14, METATILE_General_RoughWater, 0 - setmetatile 17, 14, METATILE_General_RoughWater, 0 - setmetatile 15, 15, METATILE_General_RoughWater, 0 - setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 - setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 - setmetatile 18, 15, METATILE_General_RoughWater, 0 - setmetatile 15, 16, METATILE_General_RoughWater, 0 - setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 - setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 - setmetatile 18, 16, METATILE_General_RoughWater, 0 - setmetatile 16, 17, METATILE_General_RoughWater, 0 - setmetatile 17, 17, METATILE_General_RoughWater, 0 - return + setmetatile 16, 14, METATILE_General_RoughWater, 0 + setmetatile 17, 14, METATILE_General_RoughWater, 0 + setmetatile 15, 15, METATILE_General_RoughWater, 0 + setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 15, METATILE_General_RoughWater, 0 + setmetatile 15, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 17, METATILE_General_RoughWater, 0 + setmetatile 17, 17, METATILE_General_RoughWater, 0 + return UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 - setmetatile 42, 19, METATILE_General_RoughWater, 0 - setmetatile 43, 19, METATILE_General_RoughWater, 0 - setmetatile 41, 20, METATILE_General_RoughWater, 0 - setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 44, 20, METATILE_General_RoughWater, 0 - setmetatile 41, 21, METATILE_General_RoughWater, 0 - setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 - setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 - setmetatile 44, 21, METATILE_General_RoughWater, 0 - setmetatile 42, 22, METATILE_General_RoughWater, 0 - setmetatile 43, 22, METATILE_General_RoughWater, 0 - return + setmetatile 42, 19, METATILE_General_RoughWater, 0 + setmetatile 43, 19, METATILE_General_RoughWater, 0 + setmetatile 41, 20, METATILE_General_RoughWater, 0 + setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 20, METATILE_General_RoughWater, 0 + setmetatile 41, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 22, METATILE_General_RoughWater, 0 + setmetatile 43, 22, METATILE_General_RoughWater, 0 + return Route105_EventScript_273D13:: @ 8273D13 Route114_EventScript_273D13:: @ 8273D13 @@ -166,268 +166,268 @@ Route118_EventScript_273D13:: @ 8273D13 Route125_EventScript_273D13:: @ 8273D13 Route127_EventScript_273D13:: @ 8273D13 Route129_EventScript_273D13:: @ 8273D13 - setflag FLAG_HIDE_MAP_NAME_POPUP - return + setflag FLAG_HIDE_MAP_NAME_POPUP + return UnusualWeather_StartKyogreWeather:: @ 8273D17 - setweather WEATHER_RAIN_HEAVY - return + setweather WEATHER_RAIN_HEAVY + return UnusualWeather_StartGroudonWeather:: @ 8273D1B - setweather WEATHER_DROUGHT - return + setweather WEATHER_DROUGHT + return UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F - lockall - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START - goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage - goto UnusualWeather_EventScript_ShowSunEndedMessage - end + lockall + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START + goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage + goto UnusualWeather_EventScript_ShowSunEndedMessage + end UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 - closemessage - fadescreenswapbuffers 1 - setweather WEATHER_SUNNY - doweather - call UnusualWeather_EventScript_CleanupMapTiles - special DrawWholeMapView - setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 - clearflag FLAG_HIDE_MAP_NAME_POPUP - fadescreenswapbuffers 0 - releaseall - end + closemessage + fadescreenswapbuffers 1 + setweather WEATHER_SUNNY + doweather + call UnusualWeather_EventScript_CleanupMapTiles + special DrawWholeMapView + setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 + clearflag FLAG_HIDE_MAP_NAME_POPUP + fadescreenswapbuffers 0 + releaseall + end UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 - msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 - end + msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 + end UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F - msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 - end + msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 + end UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North - case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South - case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West - case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East - case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North - case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South - case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East - case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East - return + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North + case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South + case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West + case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East + case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North + case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South + case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East + case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East + return UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 - setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 - setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 - return + setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 + return UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 - setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 - return + setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 + return UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 - setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 - return + setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 + return UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C - setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 - return + setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 + return UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F - setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 - setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 - return + setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 + setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 + return UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 - setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 - return + setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 + return UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 - setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 - return + setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 + return UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 - setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 - return + setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 + return UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB - setmetatile 10, 28, METATILE_General_CalmWater, 0 - setmetatile 11, 28, METATILE_General_CalmWater, 0 - setmetatile 9, 29, METATILE_General_CalmWater, 0 - setmetatile 10, 29, METATILE_General_CalmWater, 0 - setmetatile 11, 29, METATILE_General_CalmWater, 0 - setmetatile 12, 29, METATILE_General_CalmWater, 0 - setmetatile 9, 30, METATILE_General_CalmWater, 0 - setmetatile 10, 30, METATILE_General_CalmWater, 0 - setmetatile 11, 30, METATILE_General_CalmWater, 0 - setmetatile 12, 30, METATILE_General_CalmWater, 0 - setmetatile 10, 31, METATILE_General_CalmWater, 0 - setmetatile 11, 31, METATILE_General_CalmWater, 0 - return + setmetatile 10, 28, METATILE_General_CalmWater, 0 + setmetatile 11, 28, METATILE_General_CalmWater, 0 + setmetatile 9, 29, METATILE_General_CalmWater, 0 + setmetatile 10, 29, METATILE_General_CalmWater, 0 + setmetatile 11, 29, METATILE_General_CalmWater, 0 + setmetatile 12, 29, METATILE_General_CalmWater, 0 + setmetatile 9, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 30, METATILE_General_CalmWater, 0 + setmetatile 11, 30, METATILE_General_CalmWater, 0 + setmetatile 12, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 31, METATILE_General_CalmWater, 0 + setmetatile 11, 31, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 - setmetatile 20, 53, METATILE_General_CalmWater, 0 - setmetatile 21, 53, METATILE_General_CalmWater, 0 - setmetatile 19, 54, METATILE_General_CalmWater, 0 - setmetatile 20, 54, METATILE_General_CalmWater, 0 - setmetatile 21, 54, METATILE_General_CalmWater, 0 - setmetatile 22, 54, METATILE_General_CalmWater, 0 - setmetatile 19, 55, METATILE_General_CalmWater, 0 - setmetatile 20, 55, METATILE_General_CalmWater, 0 - setmetatile 21, 55, METATILE_General_CalmWater, 0 - setmetatile 22, 55, METATILE_General_CalmWater, 0 - setmetatile 20, 56, METATILE_General_CalmWater, 0 - setmetatile 21, 56, METATILE_General_CalmWater, 0 - return + setmetatile 20, 53, METATILE_General_CalmWater, 0 + setmetatile 21, 53, METATILE_General_CalmWater, 0 + setmetatile 19, 54, METATILE_General_CalmWater, 0 + setmetatile 20, 54, METATILE_General_CalmWater, 0 + setmetatile 21, 54, METATILE_General_CalmWater, 0 + setmetatile 22, 54, METATILE_General_CalmWater, 0 + setmetatile 19, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 55, METATILE_General_CalmWater, 0 + setmetatile 21, 55, METATILE_General_CalmWater, 0 + setmetatile 22, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 56, METATILE_General_CalmWater, 0 + setmetatile 21, 56, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 - setmetatile 8, 16, METATILE_General_CalmWater, 0 - setmetatile 9, 16, METATILE_General_CalmWater, 0 - setmetatile 7, 17, METATILE_General_CalmWater, 0 - setmetatile 8, 17, METATILE_General_CalmWater, 0 - setmetatile 9, 17, METATILE_General_CalmWater, 0 - setmetatile 10, 17, METATILE_General_CalmWater, 0 - setmetatile 7, 18, METATILE_General_CalmWater, 0 - setmetatile 8, 18, METATILE_General_CalmWater, 0 - setmetatile 9, 18, METATILE_General_CalmWater, 0 - setmetatile 10, 18, METATILE_General_CalmWater, 0 - setmetatile 8, 19, METATILE_General_CalmWater, 0 - setmetatile 9, 19, METATILE_General_CalmWater, 0 - return + setmetatile 8, 16, METATILE_General_CalmWater, 0 + setmetatile 9, 16, METATILE_General_CalmWater, 0 + setmetatile 7, 17, METATILE_General_CalmWater, 0 + setmetatile 8, 17, METATILE_General_CalmWater, 0 + setmetatile 9, 17, METATILE_General_CalmWater, 0 + setmetatile 10, 17, METATILE_General_CalmWater, 0 + setmetatile 7, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 18, METATILE_General_CalmWater, 0 + setmetatile 9, 18, METATILE_General_CalmWater, 0 + setmetatile 10, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 19, METATILE_General_CalmWater, 0 + setmetatile 9, 19, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 - setmetatile 53, 18, METATILE_General_CalmWater, 0 - setmetatile 54, 18, METATILE_General_CalmWater, 0 - setmetatile 52, 19, METATILE_General_CalmWater, 0 - setmetatile 53, 19, METATILE_General_CalmWater, 0 - setmetatile 54, 19, METATILE_General_CalmWater, 0 - setmetatile 55, 19, METATILE_General_CalmWater, 0 - setmetatile 52, 20, METATILE_General_CalmWater, 0 - setmetatile 53, 20, METATILE_General_CalmWater, 0 - setmetatile 54, 20, METATILE_General_CalmWater, 0 - setmetatile 55, 20, METATILE_General_CalmWater, 0 - setmetatile 53, 21, METATILE_General_CalmWater, 0 - setmetatile 54, 21, METATILE_General_CalmWater, 0 - return + setmetatile 53, 18, METATILE_General_CalmWater, 0 + setmetatile 54, 18, METATILE_General_CalmWater, 0 + setmetatile 52, 19, METATILE_General_CalmWater, 0 + setmetatile 53, 19, METATILE_General_CalmWater, 0 + setmetatile 54, 19, METATILE_General_CalmWater, 0 + setmetatile 55, 19, METATILE_General_CalmWater, 0 + setmetatile 52, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 20, METATILE_General_CalmWater, 0 + setmetatile 54, 20, METATILE_General_CalmWater, 0 + setmetatile 55, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 21, METATILE_General_CalmWater, 0 + setmetatile 54, 21, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F - setmetatile 57, 9, METATILE_General_CalmWater, 0 - setmetatile 58, 9, METATILE_General_CalmWater, 0 - setmetatile 56, 10, METATILE_General_CalmWater, 0 - setmetatile 57, 10, METATILE_General_CalmWater, 0 - setmetatile 58, 10, METATILE_General_CalmWater, 0 - setmetatile 59, 10, METATILE_General_CalmWater, 0 - setmetatile 56, 11, METATILE_General_CalmWater, 0 - setmetatile 57, 11, METATILE_General_CalmWater, 0 - setmetatile 58, 11, METATILE_General_CalmWater, 0 - setmetatile 59, 11, METATILE_General_CalmWater, 0 - setmetatile 57, 12, METATILE_General_CalmWater, 0 - setmetatile 58, 12, METATILE_General_CalmWater, 0 - return + setmetatile 57, 9, METATILE_General_CalmWater, 0 + setmetatile 58, 9, METATILE_General_CalmWater, 0 + setmetatile 56, 10, METATILE_General_CalmWater, 0 + setmetatile 57, 10, METATILE_General_CalmWater, 0 + setmetatile 58, 10, METATILE_General_CalmWater, 0 + setmetatile 59, 10, METATILE_General_CalmWater, 0 + setmetatile 56, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 11, METATILE_General_CalmWater, 0 + setmetatile 58, 11, METATILE_General_CalmWater, 0 + setmetatile 59, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 12, METATILE_General_CalmWater, 0 + setmetatile 58, 12, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC - setmetatile 61, 30, METATILE_General_CalmWater, 0 - setmetatile 62, 30, METATILE_General_CalmWater, 0 - setmetatile 60, 31, METATILE_General_CalmWater, 0 - setmetatile 61, 31, METATILE_General_CalmWater, 0 - setmetatile 62, 31, METATILE_General_CalmWater, 0 - setmetatile 63, 31, METATILE_General_CalmWater, 0 - setmetatile 60, 32, METATILE_General_CalmWater, 0 - setmetatile 61, 32, METATILE_General_CalmWater, 0 - setmetatile 62, 32, METATILE_General_CalmWater, 0 - setmetatile 63, 32, METATILE_General_CalmWater, 0 - setmetatile 61, 33, METATILE_General_CalmWater, 0 - setmetatile 62, 33, METATILE_General_CalmWater, 0 - return + setmetatile 61, 30, METATILE_General_CalmWater, 0 + setmetatile 62, 30, METATILE_General_CalmWater, 0 + setmetatile 60, 31, METATILE_General_CalmWater, 0 + setmetatile 61, 31, METATILE_General_CalmWater, 0 + setmetatile 62, 31, METATILE_General_CalmWater, 0 + setmetatile 63, 31, METATILE_General_CalmWater, 0 + setmetatile 60, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 32, METATILE_General_CalmWater, 0 + setmetatile 62, 32, METATILE_General_CalmWater, 0 + setmetatile 63, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 33, METATILE_General_CalmWater, 0 + setmetatile 62, 33, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 - setmetatile 16, 14, METATILE_General_CalmWater, 0 - setmetatile 17, 14, METATILE_General_CalmWater, 0 - setmetatile 15, 15, METATILE_General_CalmWater, 0 - setmetatile 16, 15, METATILE_General_CalmWater, 0 - setmetatile 17, 15, METATILE_General_CalmWater, 0 - setmetatile 18, 15, METATILE_General_CalmWater, 0 - setmetatile 15, 16, METATILE_General_CalmWater, 0 - setmetatile 16, 16, METATILE_General_CalmWater, 0 - setmetatile 17, 16, METATILE_General_CalmWater, 0 - setmetatile 18, 16, METATILE_General_CalmWater, 0 - setmetatile 16, 17, METATILE_General_CalmWater, 0 - setmetatile 17, 17, METATILE_General_CalmWater, 0 - return + setmetatile 16, 14, METATILE_General_CalmWater, 0 + setmetatile 17, 14, METATILE_General_CalmWater, 0 + setmetatile 15, 15, METATILE_General_CalmWater, 0 + setmetatile 16, 15, METATILE_General_CalmWater, 0 + setmetatile 17, 15, METATILE_General_CalmWater, 0 + setmetatile 18, 15, METATILE_General_CalmWater, 0 + setmetatile 15, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 16, METATILE_General_CalmWater, 0 + setmetatile 17, 16, METATILE_General_CalmWater, 0 + setmetatile 18, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 17, METATILE_General_CalmWater, 0 + setmetatile 17, 17, METATILE_General_CalmWater, 0 + return UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 - setmetatile 42, 19, METATILE_General_CalmWater, 0 - setmetatile 43, 19, METATILE_General_CalmWater, 0 - setmetatile 41, 20, METATILE_General_CalmWater, 0 - setmetatile 42, 20, METATILE_General_CalmWater, 0 - setmetatile 43, 20, METATILE_General_CalmWater, 0 - setmetatile 44, 20, METATILE_General_CalmWater, 0 - setmetatile 41, 21, METATILE_General_CalmWater, 0 - setmetatile 42, 21, METATILE_General_CalmWater, 0 - setmetatile 43, 21, METATILE_General_CalmWater, 0 - setmetatile 44, 21, METATILE_General_CalmWater, 0 - setmetatile 42, 22, METATILE_General_CalmWater, 0 - setmetatile 43, 22, METATILE_General_CalmWater, 0 - return + setmetatile 42, 19, METATILE_General_CalmWater, 0 + setmetatile 43, 19, METATILE_General_CalmWater, 0 + setmetatile 41, 20, METATILE_General_CalmWater, 0 + setmetatile 42, 20, METATILE_General_CalmWater, 0 + setmetatile 43, 20, METATILE_General_CalmWater, 0 + setmetatile 44, 20, METATILE_General_CalmWater, 0 + setmetatile 41, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 21, METATILE_General_CalmWater, 0 + setmetatile 43, 21, METATILE_General_CalmWater, 0 + setmetatile 44, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 22, METATILE_General_CalmWater, 0 + setmetatile 43, 22, METATILE_General_CalmWater, 0 + return UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East - return + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East + return UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 - setescapewarp MAP_ROUTE105, 255, 11, 29 - return + setescapewarp MAP_ROUTE105, 255, 11, 29 + return UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A - setescapewarp MAP_ROUTE105, 255, 21, 54 - return + setescapewarp MAP_ROUTE105, 255, 21, 54 + return UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 - setescapewarp MAP_ROUTE125, 255, 9, 17 - return + setescapewarp MAP_ROUTE125, 255, 9, 17 + return UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C - setescapewarp MAP_ROUTE125, 255, 54, 19 - return + setescapewarp MAP_ROUTE125, 255, 54, 19 + return UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 - setescapewarp MAP_ROUTE127, 255, 58, 10 - return + setescapewarp MAP_ROUTE127, 255, 58, 10 + return UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE - setescapewarp MAP_ROUTE127, 255, 62, 31 - return + setescapewarp MAP_ROUTE127, 255, 62, 31 + return UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 - setescapewarp MAP_ROUTE129, 255, 17, 15 - return + setescapewarp MAP_ROUTE129, 255, 17, 15 + return UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 - setescapewarp MAP_ROUTE129, 255, 43, 20 - return + setescapewarp MAP_ROUTE129, 255, 43, 20 + return -- cgit v1.2.3 From d914c1d659f2d7076079487e5c5df8ee617ec144 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 13:55:30 -0400 Subject: Document common movements --- data/scripts/cable_club.inc | 2 +- data/scripts/cave_of_origin.inc | 2 +- data/scripts/elite_four.inc | 4 ++-- data/scripts/gabby_and_ty.inc | 4 ++-- data/scripts/movement.inc | 33 ++++++++++++++++----------------- data/scripts/pkmn_center_nurse.inc | 4 ++-- data/scripts/players_house.inc | 34 +++++++++++++++++----------------- 7 files changed, 41 insertions(+), 42 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 3fcb25807..693860be4 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -312,7 +312,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index f534afaff..da4a97761 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -45,4 +45,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_5, 1 - return \ No newline at end of file + return diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index c6b8d5578..c60e3889e 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -25,7 +25,7 @@ EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 31000539c..af9688f55 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94 Route111_EventScript_28CF9F:: @ 828CF9F applymovement VAR_0x8004, Route111_Movement_28D04F - applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route111_EventScript_28CFB1:: @ 828CFB1 applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index b7abceae4..3dd1a8144 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -1,4 +1,4 @@ -SlateportCity_Movement_272596: @ 8272596 +Common_Movement_QuestionMark: @ 8272596 emote_question_mark step_end @@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -Common_Movement_WalkInPlaceLeft: @ 82725A4 +Common_Movement_WalkInPlaceFastestLeft: @ 82725A4 walk_in_place_fastest_left step_end -Common_Movement_WalkInPlaceUp: @ 82725A6 +Common_Movement_WalkInPlaceFastestUp: @ 82725A6 walk_in_place_fastest_up step_end -Common_Movement_WalkInPlaceRight: @ 82725A8 +Common_Movement_WalkInPlaceFastestRight: @ 82725A8 walk_in_place_fastest_right step_end -Common_Movement_WalkInPlaceDown: @ 82725AA +Common_Movement_WalkInPlaceFastestDown: @ 82725AA walk_in_place_fastest_down step_end -RustboroCity_Movement_2725AC: @ 82725AC +Common_Movement_FaceRight: @ 82725AC face_right step_end -RustboroCity_Movement_2725AE: @ 82725AE +Common_Movement_FaceLeft: @ 82725AE face_left step_end @@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2 face_up step_end -BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 -MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 +Common_Movement_WalkInPlaceDown: @ 82725B4 walk_in_place_down step_end -BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 -BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 +Common_Movement_WalkInPlaceLeft: @ 82725B6 walk_in_place_left step_end -Route121_Movement_2725B8: @ 82725B8 +Common_Movement_WalkInPlaceRight: @ 82725B8 walk_in_place_right step_end -EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA +Common_Movement_WalkUp6: @ 82725BA walk_up walk_up walk_up @@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 +Common_Movement_WalkUp4: @ 82725C1 walk_up walk_up walk_up walk_up step_end -EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 +Common_Movement_Delay32: @ 82725C6 delay_16 delay_16 step_end -Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 +Common_Movement_WalkUp: @ 82725C9 walk_up step_end -Movement_2725CB:: @ 82725CB +@ Unused +Common_Movement_WalkUp2:: @ 82725CB walk_up walk_up step_end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index bfeba79e3..0d4be2c0d 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -38,11 +38,11 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D return EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 - applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special HealPlayerParty return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 741b7f41e..f88d3af6c 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 end LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D end LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC - applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -586,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight + applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -624,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -- cgit v1.2.3 From 748a1dbdd4cc37edbd123c66296a789b428d8a5f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 14:16:37 -0400 Subject: Document cave hole --- data/scripts/cave_hole.inc | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 86689fdb0..0852149a6 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -1,23 +1,15 @@ -GraniteCave_B1F_MapScript2_2A8327: @ 82A8327 -MirageTower_2F_MapScript2_2A8327: @ 82A8327 -MirageTower_3F_MapScript2_2A8327: @ 82A8327 -MtPyre_2F_MapScript2_2A8327: @ 82A8327 -SkyPillar_2F_MapScript2_2A8327: @ 82A8327 -SkyPillar_4F_MapScript2_2A8327: @ 82A8327 +CaveHole_MapScript2_CheckFallDownHole: @ 82A8327 map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole .2byte 0 -GraniteCave_B1F_MapScript1_2A8331: @ 82A8331 -MirageTower_2F_MapScript1_2A8331: @ 82A8331 -MirageTower_3F_MapScript1_2A8331: @ 82A8331 -MtPyre_2F_MapScript1_2A8331: @ 82A8331 - copyvar VAR_ICE_STEP_COUNT, 0x1 +CaveHole_MapScript1_FixCrackedGround: @ 82A8331 + copyvar VAR_ICE_STEP_COUNT, 1 end EventScript_FallDownHole:: @ 82A8337 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -25,10 +17,10 @@ EventScript_FallDownHole:: @ 82A8337 waitstate end -gUnknown_082A8350:: @ 82A8350 +EventScript_FallDownHoleMtPyre:: @ 82A8350 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -36,6 +28,6 @@ gUnknown_082A8350:: @ 82A8350 waitstate end -GraniteCave_B1F_Movement_2A8369: @ 82A8369 +Movement_SetInvisible: @ 82A8369 set_invisible step_end -- cgit v1.2.3 From 02070eaf730800c6c85285877de54ea59440a2ef Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 16:06:34 -0400 Subject: Document kecleon --- data/scripts/kecleon.inc | 57 +++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index e4118d3e1..ac0931fd8 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -1,74 +1,73 @@ -Route120_EventScript_2722DB:: @ 82722DB +Route120_EventScript_Kecleon1:: @ 82722DB lock faceplayer setvar VAR_0x8009, 1 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_2722E8:: @ 82722E8 +Route120_EventScript_Kecleon2:: @ 82722E8 lock faceplayer setvar VAR_0x8009, 2 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_2722F5:: @ 82722F5 +Route120_EventScript_Kecleon3:: @ 82722F5 lock faceplayer setvar VAR_0x8009, 3 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_272302:: @ 8272302 +Route120_EventScript_Kecleon4:: @ 8272302 lock faceplayer setvar VAR_0x8009, 4 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_27230F:: @ 827230F +Route120_EventScript_Kecleon5:: @ 827230F lock faceplayer setvar VAR_0x8009, 5 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_27231C:: @ 827231C +Route119_EventScript_Kecleon1:: @ 827231C lock faceplayer setvar VAR_0x8009, 6 - goto Route119_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_272329:: @ 8272329 +Route119_EventScript_Kecleon2:: @ 8272329 lock faceplayer setvar VAR_0x8009, 7 - goto Route119_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_272336:: @ 8272336 -Route120_EventScript_272336:: @ 8272336 +EventScript_Kecleon:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + goto_if_eq EventScript_AskUseDevonScope + msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, MSGBOX_YESNO +EventScript_AskUseDevonScope:: @ 8272350 + msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272365 + goto_if_eq EventScript_BattleKecleon release end -Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT +EventScript_BattleKecleon:: @ 8272365 + msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 @@ -79,11 +78,11 @@ Route119_EventScript_272365:: @ 8272365 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq EventScript_RemoveKecleon release end @@ -92,9 +91,7 @@ EventScript_RemoveKecleon:: @ 82723C1 goto Common_EventScript_RemoveStaticPokemon end -FortreeCity_Movement_2723C7: @ 82723C7 -Route119_Movement_2723C7: @ 82723C7 -Route120_Movement_2723C7: @ 82723C7 +Movement_KecleonAppears: @ 82723C7 set_visible delay_4 set_invisible -- cgit v1.2.3 From f179ab95c07ef7ec7a97864e88bbb35f9efae881 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 17:30:17 -0400 Subject: Document move tutors --- data/scripts/move_tutors.inc | 317 +++++++++++++++++++++---------------------- 1 file changed, 154 insertions(+), 163 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 8780b9994..b6ba75e0d 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -1,309 +1,300 @@ -SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 +SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught + msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - call SlateportCity_PokemonFanClub_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT - setvar VAR_0x8005, 23 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SWAGGER + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq MoveTutor_EventScript_SwaggerDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER - goto SlateportCity_PokemonFanClub_EventScript_2C7F74 + goto MoveTutor_EventScript_SwaggerTaught end -SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT +MoveTutor_EventScript_SwaggerDeclined:: @ 82C7F6A + msgbox MoveTutor_Text_SwaggerDeclined, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT +MoveTutor_EventScript_SwaggerTaught:: @ 82C7F74 + msgbox MoveTutor_Text_SwaggerTaught, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E +MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC - msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught + msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - call MauvilleCity_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_RolloutDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT - setvar VAR_0x8005, 16 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_RolloutDeclined + msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MoveTutor_EventScript_RolloutDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT - goto MauvilleCity_EventScript_2C7FDC + goto MoveTutor_EventScript_RolloutTaught end -MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 - msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT +MoveTutor_EventScript_RolloutDeclined:: @ 82C7FD2 + msgbox MoveTutor_Text_RolloutDeclined, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC - msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT +MoveTutor_EventScript_RolloutTaught:: @ 82C7FDC + msgbox MoveTutor_Text_RolloutTaught, MSGBOX_DEFAULT release end -VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 +VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught + msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT - setvar VAR_0x8005, 29 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER - goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + goto MoveTutor_EventScript_FuryCutterTaught end -VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT +MoveTutor_EventScript_FuryCutterDeclined:: @ 82C803A + msgbox MoveTutor_Text_FuryCutterDeclined, MSGBOX_DEFAULT release end -VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT +MoveTutor_EventScript_FuryCutterTaught:: @ 82C8044 + msgbox MoveTutor_Text_FuryCutterTaught, MSGBOX_DEFAULT release end -LavaridgeTown_House_EventScript_2C804E:: @ 82C804E +LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC - msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught + msgbox MoveTutor_MimicTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - call LavaridgeTown_House_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_MimicDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT - setvar VAR_0x8005, 7 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_MimicDeclined + msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_MIMIC + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq MoveTutor_EventScript_MimicDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC - goto LavaridgeTown_House_EventScript_2C80AC + goto MoveTutor_EventScript_MimicTaught end -LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 - msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT +MoveTutor_EventScript_MimicDeclined:: @ 82C80A2 + msgbox MoveTutor_MimicDeclined, MSGBOX_DEFAULT release end -LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC - msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT +MoveTutor_EventScript_MimicTaught:: @ 82C80AC + msgbox MoveTutor_Text_MimicTaught, MSGBOX_DEFAULT release end -FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 +FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 - msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught + msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - call FallarborTown_Mart_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT - setvar VAR_0x8005, 8 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_METRONOME + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq MoveTutor_EventScript_MetronomeDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME - goto FallarborTown_Mart_EventScript_2C8114 + goto MoveTutor_EventScript_MetronomeTaught end -FallarborTown_Mart_EventScript_2C810A:: @ 82C810A - msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT +MoveTutor_EventScript_MetronomeDeclined:: @ 82C810A + msgbox MoveTutor_Text_MetronomeDeclined, MSGBOX_DEFAULT release end -FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 - msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT +MoveTutor_EventScript_MetronomeTaught:: @ 82C8114 + msgbox MoveTutor_Text_MetronomeTaught, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_2C811E:: @ 82C811E +FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C - msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught + msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - call FortreeCity_House2_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT - setvar VAR_0x8005, 24 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK - goto FortreeCity_House2_EventScript_2C817C + goto MoveTutor_EventScript_SleepTalkTaught end -FortreeCity_House2_EventScript_2C8172:: @ 82C8172 - msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT +MoveTutor_EventScript_SleepTalkDeclined:: @ 82C8172 + msgbox MoveTutor_Text_SleepTalkDeclined, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_2C817C:: @ 82C817C - msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT +MoveTutor_EventScript_SleepTalkTaught:: @ 82C817C + msgbox MoveTutor_Text_SleepTalkTaught, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 +LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught + msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT - setvar VAR_0x8005, 14 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq MoveTutor_EventScript_SubstituteDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + goto MoveTutor_EventScript_SubstituteTaught end -LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT +MoveTutor_EventScript_SubstituteDeclined:: @ 82C81DA + msgbox MoveTutor_Text_SubstituteDeclined, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT +MoveTutor_EventScript_SubstituteTaught:: @ 82C81E4 + msgbox MoveTutor_Text_SubstituteTaught, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_2C81EE:: @ 82C81EE +MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C - msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught + msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - call MossdeepCity_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT - setvar VAR_0x8005, 15 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH - goto MossdeepCity_EventScript_2C824C + goto MoveTutor_EventScript_DynamicPunchTaught end -MossdeepCity_EventScript_2C8242:: @ 82C8242 - msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT +MoveTutor_EventScript_DynamicPunchDeclined:: @ 82C8242 + msgbox MoveTutor_Text_DynamicPunchDeclined, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_2C824C:: @ 82C824C - msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT +MoveTutor_EventScript_DynamicPunchTaught:: @ 82C824C + msgbox MoveTutor_Text_DynamicPunchTaught, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 +SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught + msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - call SootopolisCity_PokemonCenter_1F_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT - setvar VAR_0x8005, 4 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE - goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + goto MoveTutor_EventScript_DoubleEdgeTaught end -SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT +MoveTutor_EventScript_DoubleEdgeDeclined:: @ 82C82AA + msgbox MoveTutor_Text_DoubleEdgeDeclined, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT +MoveTutor_EventScript_DoubleEdgeTaught:: @ 82C82B4 + msgbox MoveTutor_Text_DoubleEdgeTaught, MSGBOX_DEFAULT release end -PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE +PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught + msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT - setvar VAR_0x8005, 12 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq MoveTutor_EventScript_ExplosionDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION - goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + goto MoveTutor_EventScript_ExplosionTaught end -PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT +MoveTutor_EventScript_ExplosionDeclined:: @ 82C8312 + msgbox MoveTutor_Text_ExplosionDeclined, MSGBOX_DEFAULT release end -PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT +MoveTutor_EventScript_ExplosionTaught:: @ 82C831C + msgbox MoveTutor_Text_ExplosionTaught, MSGBOX_DEFAULT release end -EventScript_ShowPartyMenu:: @ 82C8326 - special sub_81B892C +MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326 + special OpenPartyMenuForMoveTutor waitstate lock faceplayer return -FallarborTown_Mart_EventScript_2C832D:: @ 82C832D -FortreeCity_House2_EventScript_2C832D:: @ 82C832D -LavaridgeTown_House_EventScript_2C832D:: @ 82C832D -LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D:: @ 82C832D -MauvilleCity_EventScript_2C832D:: @ 82C832D -MossdeepCity_EventScript_2C832D:: @ 82C832D -PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D -SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D -SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D -VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D - msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO +MoveTutor_EventScript_CanOnlyBeLearnedOnce:: @ 82C832D + msgbox MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce, MSGBOX_YESNO return -- cgit v1.2.3 From c4deb4db96ac8463c2ef1dd92ca5c7d6d13c4dae Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 20:04:30 -0400 Subject: Document field_poison --- data/scripts/battle_pike.inc | 38 +++++++++++++++++++------------------- data/scripts/field_poison.inc | 38 +++++++++++++++++++------------------- data/scripts/trainer_hill.inc | 8 ++++---- 3 files changed, 42 insertions(+), 42 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 581a789e4..9892ffb7b 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -3,9 +3,9 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS special CallBattlePikeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 @@ -50,7 +50,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction compare VAR_RESULT, 3 goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 @@ -92,11 +92,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -108,9 +108,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - setvar VAR_0x8004, 0 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE special CallBattlePikeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 @@ -167,17 +167,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 - setvar VAR_0x8004, 25 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 compare VAR_RESULT, 1 call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -189,7 +189,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 @@ -200,14 +200,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 - setvar VAR_0x8004, 24 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 1 special CallBattlePikeFunction return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 - setvar VAR_0x8004, 24 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 0 special CallBattlePikeFunction return @@ -229,19 +229,19 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C return BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004, 7 + setvar VAR_0x8004,BATTLE_PIKE_FUNC_7 special CallBattlePikeFunction - setvar VAR_0x8004, 25 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 compare VAR_RESULT, 1 call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -253,7 +253,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 @@ -275,7 +275,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D closemessage end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 +BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 9f8058e4e..2ca9c7b06 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -1,51 +1,51 @@ -EventScript_Poison:: @ 82736BC +EventScript_FieldPoison:: @ 82736BC lockall - special ExecuteWhiteOut + special TryFieldPoisonWhiteOut waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_2736D9 - compare VAR_RESULT, 2 - goto_if_eq EventScript_2736F8 + compare VAR_RESULT, FLDPSN_WHITEOUT + goto_if_eq EventScript_FieldWhiteOut + compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT + goto_if_eq EventScript_FrontierFieldWhiteOut releaseall end -EventScript_2736D9:: @ 82736D9 +EventScript_FieldWhiteOut:: @ 82736D9 message gText_PlayerWhitedOut waitmessage waitbuttonpress - special sub_80B05B4 + special Script_FadeOutMapMusic waitstate fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 - special sp0C8_whiteout_maybe + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + special SetCB2WhiteOut waitstate end -EventScript_2736F4:: @ 82736F4 +EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN return -EventScript_2736F8:: @ 82736F8 +EventScript_FrontierFieldWhiteOut:: @ 82736F8 message gText_PlayerWhitedOut waitmessage waitbuttonpress - setvar VAR_0x8004, 16 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 - setvar VAR_0x8004, 12 + goto_if_eq BattleFrontier_BattlePike_EventScript_Retire + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN special CallTrainerHillFunction compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - special sub_80B05B4 + goto_if_eq TrainerHill_1F_EventScript_Lost + special Script_FadeOutMapMusic waitstate fadescreen 1 - special sp0C8_whiteout_maybe + special SetCB2WhiteOut waitstate end diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 5b43118d1..7d898a93d 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -10,11 +10,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost end TrainerHill_1F_MapScript2_2C8372: @ 82C8372 @@ -56,7 +56,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF waitstate end -TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 +TrainerHill_1F_EventScript_Lost:: @ 82C83C9 setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST -- cgit v1.2.3 From 81ee8f07efeba516947e0289c5d58d58e5220332 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 01:13:34 -0400 Subject: Document pc.inc and prof_birch.inc --- data/scripts/field_move_scripts.inc | 12 ++++---- data/scripts/pc.inc | 42 ++++++++++++------------- data/scripts/prof_birch.inc | 61 +++++++++++++++++-------------------- 3 files changed, 55 insertions(+), 60 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 71d4b725c..bd98a3676 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB lockall goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut checkpartymove MOVE_CUT - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CheckTreeCantCut setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT @@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6 lockall goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock checkpartymove MOVE_ROCK_SMASH - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantSmashRock setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT @@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder checkpartymove MOVE_STRENGTH - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantStrength setfieldeffectargument 0, VAR_RESULT msgbox Text_WantToStrength, MSGBOX_YESNO @@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16 EventScript_UseWaterfall:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantWaterfall bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT @@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC EventScript_UseDive:: @ 8290B0F lockall checkpartymove MOVE_DIVE - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantDive bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT @@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58 EventScript_UseDiveUnderwater:: @ 8290B5A lockall checkpartymove MOVE_DIVE - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantSurface bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index d5e51e412..b3602ee6f 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92 special DoPCTurnOnEffect playse SE_PC_ON msgbox Text_BootUpPC, MSGBOX_DEFAULT - goto EventScript_271DAC + goto EventScript_PCMainMenu end -EventScript_271DAC:: @ 8271DAC +EventScript_PCMainMenu:: @ 8271DAC message gText_WhichPCShouldBeAccessed waitmessage special ScriptMenu_CreatePCMultichoice waitstate - goto EventScript_271DBC + goto EventScript_AccessPC end -EventScript_271DBC:: @ 8271DBC +EventScript_AccessPC:: @ 8271DBC switch VAR_RESULT - case 0, EventScript_271E0E - case 1, EventScript_271DF9 - case 2, EventScript_271E54 - case 3, EventScript_271E47 - case MULTI_B_PRESSED, EventScript_271E47 + case 0, EventScript_AccessPokemonStorage + case 1, EventScript_AccessPlayersPC + case 2, EventScript_AccessHallOfFame + case 3, EventScript_TurnOffPC + case MULTI_B_PRESSED, EventScript_TurnOffPC end -EventScript_271DF9:: @ 8271DF9 +EventScript_AccessPlayersPC:: @ 8271DF9 playse SE_PC_LOGIN msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT special PlayerPC waitstate - goto EventScript_271DAC + goto EventScript_PCMainMenu end -EventScript_271E0E:: @ 8271E0E +EventScript_AccessPokemonStorage:: @ 8271E0E playse SE_PC_LOGIN - call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 - call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT special ShowPokemonStorageSystemPC waitstate - goto EventScript_271DAC + goto EventScript_PCMainMenu end -EventScript_271E35:: @ 8271E35 +EventScript_AccessSomeonesPC:: @ 8271E35 msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT return -EventScript_271E3E:: @ 8271E3E +EventScript_AccessLanettesPC:: @ 8271E3E msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT return -EventScript_271E47:: @ 8271E47 +EventScript_TurnOffPC:: @ 8271E47 setvar VAR_0x8004, 0 playse SE_PC_OFF special DoPCTurnOffEffect releaseall end -EventScript_271E54:: @ 8271E54 - goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 +EventScript_AccessHallOfFame:: @ 8271E54 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC playse SE_PC_LOGIN special AccessHallOfFamePC waitstate - goto EventScript_271DBC + goto EventScript_AccessPC end diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc index 249f45376..50284d590 100644 --- a/data/scripts/prof_birch.inc +++ b/data/scripts/prof_birch.inc @@ -1,94 +1,89 @@ -LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD -Route101_EventScript_2720AD:: @ 82720AD -Route103_EventScript_2720AD:: @ 82720AD +ProfBirch_EventScript_UpdateLocation:: @ 82720AD compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Common_EventScript_NopReturn - goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A + goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab compare VAR_BIRCH_STATE, 0 - call_if_eq Route101_EventScript_27211A + call_if_eq ProfBirch_EventScript_MoveToLab compare VAR_BIRCH_STATE, 1 - call_if_eq Route101_EventScript_27211A + call_if_eq ProfBirch_EventScript_MoveToLab compare VAR_BIRCH_STATE, 2 - call_if_eq Route101_EventScript_272127 + call_if_eq ProfBirch_EventScript_MoveToRoute101 compare VAR_BIRCH_STATE, 3 - call_if_eq Route101_EventScript_272127 + call_if_eq ProfBirch_EventScript_MoveToRoute101 compare VAR_BIRCH_STATE, 4 - call_if_eq Route101_EventScript_272134 + call_if_eq ProfBirch_EventScript_MoveToRoute103 compare VAR_BIRCH_STATE, 5 - call_if_eq Route101_EventScript_272134 + call_if_eq ProfBirch_EventScript_MoveToRoute103 compare VAR_BIRCH_STATE, 6 - call_if_eq Route101_EventScript_27211A + call_if_eq ProfBirch_EventScript_MoveToLab compare VAR_BIRCH_STATE, 7 - call_if_eq Route101_EventScript_27211A + call_if_eq ProfBirch_EventScript_MoveToLab return -Route101_EventScript_27211A:: @ 827211A +ProfBirch_EventScript_MoveToLab:: @ 827211A clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH return -Route101_EventScript_272127:: @ 8272127 +ProfBirch_EventScript_MoveToRoute101:: @ 8272127 clearflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_103_BIRCH return -Route101_EventScript_272134:: @ 8272134 +ProfBirch_EventScript_MoveToRoute103:: @ 8272134 clearflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 return -LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 -Route101_EventScript_272141:: @ 8272141 -Route103_EventScript_272141:: @ 8272141 +ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141 lock faceplayer - goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 - goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 + goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch -Route101_EventScript_272155:: @ 8272155 +ProfBirch_EventScript_AskRatePokedex:: @ 8272155 msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route101_EventScript_27216F - call Route101_EventScript_272184 + goto_if_eq ProfBirch_EventScript_DeclineRating + call ProfBirch_EventScript_RatePokedex release end -Route101_EventScript_27216F:: @ 827216F +ProfBirch_EventScript_DeclineRating:: @ 827216F msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT release end -Route101_EventScript_272179:: @ 8272179 +ProfBirch_EventScript_ShowRatingMessage:: @ 8272179 copyvar VAR_0x8004, VAR_0x8009 special ShowPokedexRatingMessage waitmessage waitbuttonpress return -EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 -Route101_EventScript_272184:: @ 8272184 +ProfBirch_EventScript_RatePokedex:: @ 8272184 setvar VAR_0x8004, 0 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x800A, VAR_RESULT - buffernumberstring 0, VAR_0x8008 - buffernumberstring 1, VAR_0x8009 + buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen + buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT - call Route101_EventScript_272179 + call ProfBirch_EventScript_ShowRatingMessage compare VAR_0x800A, 0 - goto_if_eq Common_EventScript_NopReturn + goto_if_eq Common_EventScript_NopReturn @ National dex not enabled setvar VAR_0x8004, 1 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 - buffernumberstring 0, VAR_0x8008 - buffernumberstring 1, VAR_0x8009 + buffernumberstring 0, VAR_0x8008 @ Num National seen + buffernumberstring 1, VAR_0x8009 @ Num National caught msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT return -- cgit v1.2.3 From 0df304d629b10b2c65a4cf358b80fd5cf2a7befa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 02:00:16 -0400 Subject: Document roulette.inc --- data/scripts/roulette.inc | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc index 1dda5e17b..791069088 100644 --- a/data/scripts/roulette.inc +++ b/data/scripts/roulette.inc @@ -1,70 +1,71 @@ -MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 +Roulette_EventScript_Table1:: @ 82A5AB1 checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 - getpricereduction 2 + getpricereduction POKENEWS_GAME_CORNER compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D + goto_if_eq Roulette_EventScript_Play addvar VAR_0x8004, 128 - goto MauvilleCity_GameCorner_EventScript_2A5B0D + goto Roulette_EventScript_Play end -MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF +Roulette_EventScript_Table2:: @ 82A5ADF checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 - getpricereduction 2 + getpricereduction POKENEWS_GAME_CORNER compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D + goto_if_eq Roulette_EventScript_Play addvar VAR_0x8004, 128 - goto MauvilleCity_GameCorner_EventScript_2A5B0D + goto Roulette_EventScript_Play end -MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D +Roulette_EventScript_Play:: @ 82A5B0D special PlayRoulette waitstate end -gUnknown_082A5B12:: @ 82A5B12 +Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12 .string "The minimum wager at this table\n" .string "is {STR_VAR_1}. Do you want to play?$" -gUnknown_082A5B4E:: @ 82A5B4E +Roulette_Text_NotEnoughCoins:: @ 82A5B4E .string "You don't have enough COINS.$" -gUnknown_082A5B6B:: @ 82A5B6B +Roulette_Text_SpecialRateTable:: @ 82A5B6B .string "Special rate table right now!$" -gUnknown_082A5B89:: @ 82A5B89 +Roulette_Text_ControlsInstruction:: @ 82A5B89 .string "Place your wager with the + Control\n" .string "Pad, then press the A Button.$" -gUnknown_082A5BCB:: @ 82A5BCB +Roulette_Text_ItsAHit:: @ 82A5BCB .string "It's a hit!$" -gUnknown_082A5BD7:: @ 82A5BD7 +Roulette_Text_Jackpot:: @ 82A5BD7 .string "Jackpot!$" -gUnknown_082A5BE0:: @ 82A5BE0 +Roulette_Text_NothingDoing:: @ 82A5BE0 .string "Nothing doing!$" -gUnknown_082A5BEF:: @ 82A5BEF +Roulette_Text_YouveWonXCoins:: @ 82A5BEF .string "You've won {STR_VAR_1} COINS!$" -gUnknown_082A5C04:: @ 82A5C04 +Roulette_Text_NoCoinsLeft:: @ 82A5C04 .string "No COINS left…$" -gUnknown_082A5C13:: @ 82A5C13 +Roulette_Text_KeepPlaying:: @ 82A5C13 .string "Keep playing?$" -gUnknown_082A5C21:: @ 82A5C21 +Roulette_Text_BoardWillBeCleared:: @ 82A5C21 .string "The ROULETTE board will be cleared.$" -gUnknown_082A5C45:: @ 82A5C45 +@ Unused +Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45 .string "You don't have a COIN CASE.$" -gUnknown_082A5C61:: @ 82A5C61 +Roulette_Text_CoinCaseIsFull:: @ 82A5C61 .string "Your COIN CASE is full!\n" .string "Coins can be exchanged for prizes.$" -- cgit v1.2.3 From 9553ec1d2863ee4c0fae213d84b06f92f7ffb629 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 10:34:12 -0400 Subject: Document mevent.inc --- data/scripts/cable_club.inc | 4 ++-- data/scripts/mevent.inc | 39 +++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 22 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 3fcb25807..d13e58313 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -55,11 +55,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 goto_if_set FLAG_SYS_HAS_EON_TICKET, OldaleTown_PokemonCenter_2F_EventScript_276B19 - msgbox gUnknown_08273594, MSGBOX_DEFAULT + msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET setvar VAR_ALWAYS_ZERO_0x403F, 0 - msgbox gUnknown_082735F2, MSGBOX_DEFAULT + msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT release end diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc index 29f9c47d5..88f44e002 100644 --- a/data/scripts/mevent.inc +++ b/data/scripts/mevent.inc @@ -1,27 +1,26 @@ - EventScript_Questionnaire:: @ 827381B lockall - msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO + msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_2738FD + 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 EventScript_27386D + goto_if_eq Mevent_EventScript_PlayerInputMysteryEventPhrase compare VAR_0x8004, 2 - goto_if_eq EventScript_2738B5 + goto_if_eq Mevent_EventScript_PlayerInputMysteryGiftPhrase compare VAR_RESULT, 0 - goto_if_eq EventScript_2738FD + goto_if_eq Mevent_EventScript_Release compare VAR_RESULT, 1 - goto_if_eq EventScript_2738FF + goto_if_eq Mevent_EventScript_QuestionnaireThankYou end -EventScript_27386D:: @ 827386D - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF - goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF +Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D + 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 @@ -29,15 +28,15 @@ EventScript_27386D:: @ 827386D waitmovement 0 applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 - msgbox gUnknown_08273506, MSGBOX_DEFAULT + msgbox Mevent_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE - msgbox gUnknown_08273559, MSGBOX_DEFAULT + msgbox Mevent_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT releaseall end -EventScript_2738B5:: @ 82738B5 - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF - goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF +Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5 + 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 @@ -45,19 +44,19 @@ EventScript_2738B5:: @ 82738B5 waitmovement 0 applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 - msgbox gUnknown_08273446, MSGBOX_DEFAULT + msgbox Mevent_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE - msgbox gUnknown_082734CC, MSGBOX_DEFAULT + msgbox Mevent_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT releaseall end -EventScript_2738FD:: @ 82738FD +Mevent_EventScript_Release:: @ 82738FD releaseall end -EventScript_2738FF:: @ 82738FF +Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 - msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT + msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT releaseall end -- cgit v1.2.3 From 628301d6d59def09c4c21f85f949e93a98838606 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 11:29:14 -0400 Subject: Document unusual_weather.inc --- data/scripts/unusual_weather.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/unusual_weather.inc b/data/scripts/unusual_weather.inc index e9eae89c2..ad6985ac8 100644 --- a/data/scripts/unusual_weather.inc +++ b/data/scripts/unusual_weather.inc @@ -158,14 +158,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 setmetatile 43, 22, METATILE_General_RoughWater, 0 return -Route105_EventScript_273D13:: @ 8273D13 -Route114_EventScript_273D13:: @ 8273D13 -Route115_EventScript_273D13:: @ 8273D13 -Route116_EventScript_273D13:: @ 8273D13 -Route118_EventScript_273D13:: @ 8273D13 -Route125_EventScript_273D13:: @ 8273D13 -Route127_EventScript_273D13:: @ 8273D13 -Route129_EventScript_273D13:: @ 8273D13 +UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13 setflag FLAG_HIDE_MAP_NAME_POPUP return -- cgit v1.2.3 From 7ba11b7a1b4e8639cdd65ab147a24b430f6424c5 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Oct 2019 00:14:10 -0400 Subject: Use VAR_FACING constants --- data/scripts/apprentice.inc | 14 +++++++------- data/scripts/cave_of_origin.inc | 2 +- data/scripts/gabby_and_ty.inc | 12 ++++++------ data/scripts/secret_power_tm.inc | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index b75a3c579..7eae99dcf 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -74,7 +74,7 @@ Script_Apprentice_FirstMeetingNag: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -117,7 +117,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -163,7 +163,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -187,7 +187,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -235,7 +235,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -261,7 +261,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index f534afaff..da4a97761 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -45,4 +45,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_5, 1 - return \ No newline at end of file + return diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 31000539c..be8277baa 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_28CF94 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route111_EventScript_28CF9F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_28CFB1 goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE msgbox Route111_Text_28B042, MSGBOX_YESNO @@ -247,11 +247,11 @@ Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_28CF94 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route111_EventScript_28CF9F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_28CFB1 goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 647064829..51a327142 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -51,11 +51,11 @@ Route111_EventScript_27661E:: @ 827661E closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq Route111_EventScript_27666A - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_27666A - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_276675 removeobject VAR_LAST_TALKED release -- cgit v1.2.3 From bcf74df27f852f5e83393a76bd0e774a570579ca Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 23:07:59 -0400 Subject: Use B_OUTCOME constants for GetBattleOutcome --- data/scripts/kecleon.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index e4118d3e1..c9aa665e3 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -79,11 +79,11 @@ Route119_EventScript_272365:: @ 8272365 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq EventScript_RemoveKecleon release end -- cgit v1.2.3 From 70d1d8956e47a2258133389373278183a8fb9ef8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 8 Oct 2019 02:25:31 -0400 Subject: Document elite_four.inc and the E4 map scripts --- data/scripts/elite_four.inc | 24 ++++++------------------ data/scripts/movement.inc | 6 +++--- 2 files changed, 9 insertions(+), 21 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index c6b8d5578..e7aada698 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -1,9 +1,5 @@ -EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -21,11 +17,8 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 special DrawWholeMapView return -EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA +PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 @@ -37,10 +30,8 @@ EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 special DrawWholeMapView return -EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC +@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible +PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 @@ -61,10 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 return -EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F +PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index b7abceae4..a50c5eeda 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -70,7 +70,7 @@ Route121_Movement_2725B8: @ 82725B8 walk_in_place_right step_end -EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA +Common_Movement_WalkUp6: @ 82725BA walk_up walk_up walk_up @@ -79,14 +79,14 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 +Common_Movement_WalkUp4: @ 82725C1 walk_up walk_up walk_up walk_up step_end -EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 +Common_Movement_Delay32: @ 82725C6 delay_16 delay_16 step_end -- cgit v1.2.3 From 1b7607bd91a9bdf9ee5e2ccbf895727bc53f9254 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Oct 2019 04:14:09 -0400 Subject: Document cable_club.inc --- data/scripts/cable_club.inc | 1464 ++++++++++++++++++++----------------------- data/scripts/pokeblocks.inc | 10 +- 2 files changed, 695 insertions(+), 779 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 3fcb25807..6b2c87520 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,558 +1,492 @@ -PokemonCenter_2F_OnTransition: @ 8276ACF - call OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift +CableClub_MapScript_OnTransition: @ 8276ACF + call CableClub_EventScript_HideOrShowMysteryGiftMan end -OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift:: @ 8276AD5 - specialvar VAR_RESULT, sub_813B514 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB +CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 8276AD5 + specialvar VAR_RESULT, ShouldDistributeEonTicket + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_ShowMysteryGiftMan specialvar VAR_RESULT, ValidateReceivedWonderCard - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF - goto OldaleTown_PokemonCenter_2F_EventScript_276AFB + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_HideMysteryGiftMan + goto CableClub_EventScript_ShowMysteryGiftMan end -OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB +CableClub_EventScript_ShowMysteryGiftMan:: @ 8276AFB clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return -OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF +CableClub_EventScript_HideMysteryGiftMan:: @ 8276AFF setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return -BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -DewfordTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -EverGrandeCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -EverGrandeCity_PokemonLeague_2F_EventScript_276B03:: @ 8276B03 -FallarborTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -FortreeCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -LavaridgeTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -LilycoveCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -MauvilleCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -MossdeepCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -OldaleTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -PacifidlogTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -PetalburgCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -RustboroCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -SlateportCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 - specialvar VAR_RESULT, sub_813B514 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 - goto OldaleTown_PokemonCenter_2F_EventScript_276B19 +CableClub_EventScript_MysteryGiftMan:: @ 8276B03 + specialvar VAR_RESULT, ShouldDistributeEonTicket + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_DistributeEonTicket + goto CableClub_EventScript_AlreadyGotEonTicket end -OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 +CableClub_EventScript_AlreadyGotEonTicket:: @ 8276B19 gotoram -OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A +@ Unused? +CableClub_EventScript_MysteryGiftThankYou:: @ 8276B1A msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC end -OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 +CableClub_EventScript_DistributeEonTicket:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - goto_if_set FLAG_SYS_HAS_EON_TICKET, OldaleTown_PokemonCenter_2F_EventScript_276B19 - msgbox gUnknown_08273594, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AlreadyGotEonTicket + goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket + msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET - setvar VAR_ALWAYS_ZERO_0x403F, 0 - msgbox gUnknown_082735F2, MSGBOX_DEFAULT + setvar VAR_DISTRIBUTE_EON_TICKET, 0 + msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT release end +@ Unused? OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end -BattleFrontier_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -DewfordTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C: @ 8276B6C -FallarborTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -FortreeCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -LilycoveCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -MauvilleCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -MossdeepCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -OldaleTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -PetalburgCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C - map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE +CableClub_MapScript2_OnWarp: @ 8276B6C + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant .2byte 0 -MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE -OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE +CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD + goto_if_eq CableClub_EventScript_DontTurnAttendant turnobject VAR_0x8007, DIR_WEST +CableClub_EventScript_DontTurnAttendant:: @ 8276BBD + end + +CableClub_MapScript1_OnLoad: @ 8276BBE + compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER + goto_if_eq CableClub_EventScript_OnLoadFromTradeCenter + compare VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER + goto_if_eq CableClub_EventScript_OnLoadFromRecordCorner + compare VAR_CABLE_CLUB_STATE, USING_UNION_ROOM + goto_if_eq CableClub_EventScript_OnLoadFromUnionRoom + compare VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH + goto_if_eq CableClub_EventScript_OnLoadFromBerryCrush + compare VAR_CABLE_CLUB_STATE, USING_MINIGAME + goto_if_eq CableClub_EventScript_OnLoadFromGameCorner + end + +CableClub_EventScript_OnLoadFromColosseum:: @ 8276C17 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromTradeCenter:: @ 8276C1D + call CableClub_EventScript_OpenDirectCornerBarrier + end -OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD - end - -BattleFrontier_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -DewfordTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE: @ 8276BBE -FallarborTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -FortreeCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -LilycoveCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -MauvilleCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -MossdeepCity_GameCorner_1F_MapScript1_276BBE: @ 8276BBE -MossdeepCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -OldaleTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -PetalburgCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare VAR_CABLE_CLUB_STATE, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare VAR_CABLE_CLUB_STATE, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare VAR_CABLE_CLUB_STATE, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare VAR_CABLE_CLUB_STATE, 7 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare VAR_CABLE_CLUB_STATE, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C17:: @ 8276C17 - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C1D:: @ 8276C1D - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C23:: @ 8276C23 - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C29:: @ 8276C29 - call OldaleTown_PokemonCenter_2F_EventScript_277BBE - end - -OldaleTown_PokemonCenter_2F_EventScript_276C2F:: @ 8276C2F - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C35:: @ 8276C35 - call OldaleTown_PokemonCenter_2F_EventScript_277C0A - end - -BattleFrontier_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -DewfordTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B: @ 8276C3B -FallarborTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -FortreeCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -LilycoveCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -MauvilleCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -MossdeepCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -OldaleTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -PetalburgCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B - map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 - map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 - map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C - map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C - map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D +CableClub_EventScript_OnLoadFromRecordCorner:: @ 8276C23 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromUnionRoom:: @ 8276C29 + call CableClub_EventScript_OpenUnionRoomBarrier + end + +CableClub_EventScript_OnLoadFromBerryCrush:: @ 8276C2F + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35 + call EventScript_OpenMossdeepGameCornerBarrier + end + +CableClub_MapScript2_OnFrame: @ 8276C3B + map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_ExitTradeCenter + map_script_2 VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER, CableClub_EventScript_ExitRecordCorner + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_ExitUnionRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85 +CableClub_EventScript_ExitLinkRoom:: @ 8276C85 lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CB5 - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -MossdeepCity_GameCorner_1F_EventScript_276C9D:: @ 8276C9D -OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D +CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CB5 - call OldaleTown_PokemonCenter_2F_EventScript_277C1D + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call EventScript_CloseMossdeepGameCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 +CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 +CableClub_EventScript_ExitTradeCenter:: @ 8276CE7 lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CFF - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_PlayerExitTradeCenter + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF +CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call OldaleTown_PokemonCenter_2F_EventScript_276DAE + call CableClub_EventScript_TrainerCardDataOverwritten return -OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C +CableClub_EventScript_ExitRecordCorner:: @ 8276D2C lockall - call OldaleTown_PokemonCenter_2F_EventScript_276D44 - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_PlayerExitRecordCorner + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 +CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + goto_if_eq CableClub_EventScript_ExitRecordCornerRet + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 - -OldaleTown_PokemonCenter_2F_EventScript_276D6B:: @ 8276D6B +CableClub_EventScript_ExitRecordCornerRet:: @ 8276D6B return -OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C +CableClub_EventScript_ExitUnionRoom:: @ 8276D6C lockall - call OldaleTown_PokemonCenter_2F_EventScript_276D84 - call OldaleTown_PokemonCenter_2F_EventScript_277BD1 + call CableClub_EventScript_PlayerExitUnionRoom + call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 +CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84 setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call OldaleTown_PokemonCenter_2F_EventScript_276DAE + call CableClub_EventScript_TrainerCardDataOverwritten return -OldaleTown_PokemonCenter_2F_EventScript_276DAE:: @ 8276DAE - message OldaleTown_PokemonCenter_2F_Text_278521 +CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE + message CableClub_Text_TrainerCardDataOverwritten waitmessage playse SE_PIN delay 60 - message OldaleTown_PokemonCenter_2F_Text_27854C + message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F +CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 +CableClub_EventScript_Tutorial:: @ 8276DE0 lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 - msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT + msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_276E10 + applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter waitmovement 0 delay 30 - msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT + msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2 releaseall end -OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10 +CableClub_Movement_PlayerApproachCounter: @ 8276E10 walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 - message OldaleTown_PokemonCenter_2F_Text_277EA4 +CableClub_EventScript_WelcomeToCableClub:: @ 8276E13 + message CableClub_Text_WelcomeWhichCableClubService waitmessage delay 28 - goto OldaleTown_PokemonCenter_2F_EventScript_276E30 + goto CableClub_EventScript_SelectCableClubRoom end -OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 - msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276E30 +CableClub_EventScript_UnusedWelcomeToCableClub:: @ 8276E22 + msgbox CableClub_Text_WhichService, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectCableClubRoom end -OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 +CableClub_EventScript_SelectCableClubRoom:: @ 8276E30 setvar VAR_0x8004, 0 - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_CableClubUnlockedRecordCorner multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75 +CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75 multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_RecordCorner + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 +CableClub_EventScript_Colosseum:: @ 8276EB7 copyvar VAR_0x8007, VAR_LAST_TALKED - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 - message OldaleTown_PokemonCenter_2F_Text_2790BE +CableClub_EventScript_SelectBattleMode:: @ 8276EC2 + message CableClub_Text_WhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E - case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55 - case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15 - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_SingleBattleMode + case 1, CableClub_EventScript_DoubleBattleMode + case 2, CableClub_EventScript_MultiBattleMode + case 3, CableClub_EventScript_BattleModeInfo + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 - msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 +CableClub_EventScript_BattleModeInfo:: @ 8276F15 + msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 - setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 +CableClub_EventScript_SingleBattleMode:: @ 8276F23 + setvar VAR_0x8004, USING_SINGLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E +CableClub_EventScript_DoubleBattleMode:: @ 8276F2E special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 - setvar VAR_0x8004, 2 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 + goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle + setvar VAR_0x8004, USING_DOUBLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F47:: @ 8276F47 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 +CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 8276F47 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 - setvar VAR_0x8004, 5 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 +CableClub_EventScript_MultiBattleMode:: @ 8276F55 + setvar VAR_0x8004, USING_MULTI_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 +CableClub_EventScript_TryEnterColosseum:: @ 8276F60 call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2DA4 + special TryBattleLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD + goto_if_eq CableClub_EventScript_EnterColosseum compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277046 + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD +CableClub_EventScript_EnterColosseum:: @ 8276FBD special HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release - compare VAR_0x8004, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277036 + compare VAR_0x8004, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_WarpToDoubleColosseum special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B - applymovement EVENT_OBJ_ID_PLAYER, Movement_277352 +@ Unused +CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036 +CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036 special SetCableClubWarp warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046 +CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 8277046 switch VAR_0x8004 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277094 - case 2, OldaleTown_PokemonCenter_2F_EventScript_277083 - case 5, OldaleTown_PokemonCenter_2F_EventScript_277072 - goto OldaleTown_PokemonCenter_2F_EventScript_27730E + case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle + case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle + case USING_MULTI_BATTLE, CableClub_EventScript_AbortLinkNeedFourPlayers + goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants end -OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072 +CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 8277072 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27833D, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_NeedFourPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083 +CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 8277083 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278307, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_CantDoubleBattleWithXPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094 +CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 8277094 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_CantSingleBattleWithXPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 - special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278372, MSGBOX_DEFAULT +CableClub_EventScript_ConfirmNumberAndRestart:: @ 82770A5 + special CloseLink @ Redundant + msgbox CableClub_Text_PleaseConfirmNumberAndRestart, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 +CableClub_EventScript_TradeCenter:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_277199 + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2E4C + special TryTradeLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27713A + goto_if_eq CableClub_EventScript_EnterTradeCenter compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 7 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB + goto_if_eq CableClub_EventScript_AbortLinkPlayerNotReady compare VAR_RESULT, 9 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 + goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end -OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A - setvar VAR_0x8004, 3 +CableClub_EventScript_EnterTradeCenter:: @ 827713A + setvar VAR_0x8004, USING_TRADE_CENTER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -564,31 +498,31 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 +CableClub_EventScript_CheckPartyTradeRequirements:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_2771BF - specialvar VAR_RESULT, sub_80F9370 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD + goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_2771BF:: @ 82771BF - msgbox OldaleTown_PokemonCenter_2F_Text_278027, MSGBOX_DEFAULT +CableClub_EventScript_NeedTwoMonsToTrade:: @ 82771BF + msgbox CableClub_Text_NeedTwoMonsToTrade, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD - msgbox OldaleTown_PokemonCenter_2F_Text_278061, MSGBOX_DEFAULT +CableClub_EventScript_CantTradeEnigmaBerry:: @ 82771CD + msgbox CableClub_Text_CantTradeEnigmaBerry, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB +CableClub_EventScript_RecordCorner:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage special sub_80B2E74 @@ -596,38 +530,38 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB special sub_80B2EA8 waitstate compare VAR_RESULT, 12 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277328 + goto_if_eq CableClub_EventScript_AbortLinkForeignGame compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27724C + goto_if_eq CableClub_EventScript_EnterRecordCorner compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C - setvar VAR_0x8004, 4 +CableClub_EventScript_EnterRecordCorner:: @ 827724C + setvar VAR_0x8004, USING_RECORD_CORNER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -639,71 +573,70 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitstate end -OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB +CableClub_EventScript_AbortLinkPlayerNotReady:: @ 82772AB special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278565, MSGBOX_DEFAULT + msgbox CableClub_Text_NotSetUpForFarAwayRegion, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8 +CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 82772B8 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, MSGBOX_DEFAULT + msgbox CableClub_Text_OtherTrainerNotReady, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5 -OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5 +CableClub_EventScript_AbortLinkConnectionError:: @ 82772C5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2 -OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2 +CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 82772D2 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, MSGBOX_DEFAULT + msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF +CableClub_EventScript_AbortLinkDifferentSelections:: @ 82772DF special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC +CableClub_EventScript_AbortLink:: @ 82772EC special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278291, MSGBOX_DEFAULT + msgbox CableClub_Text_PleaseVisitAgain, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9 +MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9 special CloseLink - msgbox MossdeepCity_GameCorner_1F_Text_278D51, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_1F_Text_ComeAgain, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306 +@ Unused +CableClub_EventScript_CableClubWarp:: @ 8277306 special SetCableClubWarp special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E +CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 827730E special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, MSGBOX_DEFAULT + msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B +CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 827731B special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, MSGBOX_DEFAULT + msgbox CableClub_Text_YouHaveAMonThatCantBeTaken, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 +CableClub_EventScript_AbortLinkForeignGame:: @ 8277328 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278651, MSGBOX_DEFAULT + msgbox CableClub_Text_CantMixWithJapaneseGame, MSGBOX_DEFAULT release end @@ -712,54 +645,56 @@ CableClub_EventScript_WirelessClubAdjustements:: @ 8277335 release end -OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F +CableClub_EventScript_NotReadyYet:: @ 827733F msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT releaseall end -OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349 +Movement_AttendantFaceDown: @ 8277349 face_down step_end -OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B +@ Unused +Movement_AttendantFaceRight: @ 827734B face_right step_end -MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D -OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D +Movement_AttendantFaceLeft: @ 827734D face_left step_end -OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F +Movement_PlayerExitLinkRoom: @ 827734F walk_down walk_down step_end -Movement_277352: @ 8277352 +@ Functionally unused +Movement_PlayerApproachLinkRoomRight: @ 8277352 walk_right walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356 +Movement_PlayerApproachLinkRoomLeft: @ 8277356 walk_left walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A +Movement_PlayerEnterLinkRoom: @ 827735A walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C +@ Unused +Movement_PlayerFaceAttendantLeft: @ 827735C face_left step_end -OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E +Movement_PlayerFaceAttendantRight: @ 827735E face_right step_end -MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 +Movement_PlayerEnterMinigameRoom: @ 8277360 walk_left walk_up walk_up @@ -894,62 +829,62 @@ EventScript_RecordCenter_Spot3:: @ 827745C RecordCorner_EventScript_277471:: @ 8277471 bufferitemname 1, VAR_TEMP_1 - message RecordCorner_Text_27863C + message RecordCorner_Text_PlayerSentOverOneX waitmessage waitbuttonpress releaseall end -gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E - msgbox Text_278452, MSGBOX_DEFAULT +CableClub_EventScript_ReadTrainerCard:: @ 827747E + msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT fadescreen 1 - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D - msgbox Text_27847B, MSGBOX_DEFAULT +CableClub_EventScript_ReadTrainerCardColored:: @ 827748D + msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT fadescreen 1 - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C - msgbox Text_27842E, MSGBOX_DEFAULT +CableClub_EventScript_TooBusyToNotice:: @ 827749C + msgbox CableClub_Text_TooBusyToNotice, MSGBOX_DEFAULT closemessage end -SingleBattleColosseum_EventScript_2774A6:: @ 82774A6 - special sub_8098574 - msgbox SingleBattleColosseum_Text_2784B4, MSGBOX_DEFAULT - special sub_809859C +SingleBattleColosseum_EventScript_Attendant:: @ 82774A6 + special Script_FacePlayer + msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT + special Script_ClearHeldMovement closemessage end -TradeCenter_EventScript_2774B6:: @ 82774B6 - special sub_8098574 - msgbox TradeCenter_Text_2784E2, MSGBOX_DEFAULT - special sub_809859C +TradeCenter_EventScript_Attendant:: @ 82774B6 + special Script_FacePlayer + msgbox TradeCenter_Text_TakeSeatStartTrade, MSGBOX_DEFAULT + special Script_ClearHeldMovement closemessage end RecordCorner_EventScript_2774C6:: @ 82774C6 compare VAR_TEMP_0, 0 - goto_if_ne RecordCorner_EventScript_2774E0 - special sub_8098574 - message RecordCorner_Text_27861C + goto_if_ne RecordCorner_EventScript_AlreadyMixed + special Script_FacePlayer + message RecordCorner_Text_TakeSeatAndWait waitmessage waitbuttonpress - special sub_809859C + special Script_ClearHeldMovement closemessage end -RecordCorner_EventScript_2774E0:: @ 82774E0 - special sub_8098574 - message RecordCorner_Text_27850E +RecordCorner_EventScript_AlreadyMixed:: @ 82774E0 + special Script_FacePlayer + message RecordCorner_Text_ThanksForComing waitmessage waitbuttonpress - special sub_809859C + special Script_ClearHeldMovement closemessage end @@ -969,70 +904,70 @@ EventScript_TerminateLink:: @ 8277509 EventScript_DoLinkRoomExit:: @ 8277513 special CleanupLinkRoomState - special sub_80AF9F8 + special ReturnFromLinkRoom waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B +CableClub_EventScript_UnionRoomAttendant:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277668 - message OldaleTown_PokemonCenter_2F_Text_27940D + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_UnionRoomAdapterNotConnected + message CableClub_Text_WelcomeUnionRoomEnter waitmessage - goto OldaleTown_PokemonCenter_2F_EventScript_27755C + goto CableClub_EventScript_UnionRoomSelect end -OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C +CableClub_EventScript_UnionRoomSelect:: @ 827755C multichoice 17, 6, MULTI_YESNOINFO, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F - case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 2, OldaleTown_PokemonCenter_2F_EventScript_277593 - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_EnterUnionRoom + case 1, CableClub_EventScript_AbortLink + case 2, CableClub_EventScript_UnionRoomInfo + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 - message OldaleTown_PokemonCenter_2F_Text_2794B8 +CableClub_EventScript_UnionRoomInfo:: @ 8277593 + message CableClub_Text_UnionRoomInfo waitmessage - goto OldaleTown_PokemonCenter_2F_EventScript_27755C + goto CableClub_EventScript_UnionRoomSelect end -OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F - call OldaleTown_PokemonCenter_2F_EventScript_277626 +CableClub_EventScript_EnterUnionRoom:: @ 827759F + call CableClub_EventScript_CheckPartyUnionRoomRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT + goto_if_eq CableClub_EventScript_AbortLink + msgbox CableClub_Text_EnjoyUnionRoom, MSGBOX_DEFAULT closemessage special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, USING_UNION_ROOM copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - call OldaleTown_PokemonCenter_2F_EventScript_277BBE + call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim - special sub_8018090 + special Script_ResetUnionRoomTrade special SetCableClubWarp warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate @@ -1040,329 +975,325 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 +CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_27764C - specialvar VAR_RESULT, sub_80F9370 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27765A + goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C - msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT +CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 827764C + msgbox CableClub_Text_NeedTwoMonsForUnionRoom, MSGBOX_DEFAULT goto EventScript_CableClub_SetVarResult0 end -OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A - msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT +CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 827765A + msgbox CableClub_Text_NoEnigmaBerryInUnionRoom, MSGBOX_DEFAULT goto EventScript_CableClub_SetVarResult0 end -OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 - msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, MSGBOX_DEFAULT +CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 8277668 + msgbox CableClub_Text_UnionRoomAdapterNotConnected, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 +CableClub_EventScript_WirelessClubAttendant:: @ 8277672 lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements - msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO + msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A - msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT + goto_if_eq CableClub_EventScript_DontAskAboutLinking + msgbox CableClub_Text_ExplainWirelessClub, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_27769A:: @ 827769A - msgbox OldaleTown_PokemonCenter_2F_Text_279C91, MSGBOX_DEFAULT +CableClub_EventScript_DontAskAboutLinking:: @ 827769A + msgbox CableClub_Text_HopeYouEnjoyWirelessSystem, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 +CableClub_EventScript_DirectCornerAttendant:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 - message OldaleTown_PokemonCenter_2F_Text_279013 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_WelcomeToCableClub + message CableClub_Text_WelcomeWhichDirectCornerRoom waitmessage delay 28 - goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 + goto CableClub_EventScript_DirectCornerSelectService end -OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 +CableClub_EventScript_DirectCornerSelectService:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_DirectCornerNoBerry + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerSelectAllServices multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessBerryCrush + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E +CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7 - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessRecordMix + case 3, CableClub_EventScript_WirelessBerryCrush + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB +CableClub_EventScript_DirectCornerNoBerry:: @ 827778B + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerHasRecordMix multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB +CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessRecordMix + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D - msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO +CableClub_EventScript_WirelessTrade:: @ 827780D + msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_277199 + goto_if_eq CableClub_EventScript_AbortLink + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 3 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B - message OldaleTown_PokemonCenter_2F_Text_2790BE +CableClub_EventScript_WirelessBattleSelect:: @ 827783B + message CableClub_Text_WhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E - case 1, OldaleTown_PokemonCenter_2F_EventScript_277899 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessSingleBattle + case 1, CableClub_EventScript_WirelessDoubleBattle + case 2, CableClub_EventScript_WirelessMultiBattle + case 3, CableClub_EventScript_WirelessBattleInfo + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E +CableClub_EventScript_WirelessSingleBattle:: @ 827788E setvar VAR_0x8004, 0 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 +CableClub_EventScript_WirelessDoubleBattle:: @ 8277899 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 + goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778B2:: @ 82778B2 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_27783B +CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT + goto CableClub_EventScript_WirelessBattleSelect end -OldaleTown_PokemonCenter_2F_EventScript_2778C0:: @ 82778C0 +CableClub_EventScript_WirelessMultiBattle:: @ 82778C0 setvar VAR_0x8004, 2 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB - msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_27783B +CableClub_EventScript_WirelessBattleInfo:: @ 82778CB + msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT + goto CableClub_EventScript_WirelessBattleSelect end -OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 - msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO +CableClub_EventScript_WirelessRecordMix:: @ 82778D9 + msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 12 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 - msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO +CableClub_EventScript_WirelessBerryCrush:: @ 82778F7 + msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink special HasAtLeastOneBerry - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277923 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush setvar VAR_0x8004, 5 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 - msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 +CableClub_EventScript_NeedBerryForBerryCrush:: @ 8277923 + msgbox CableClub_Text_NeedBerryForBerryCrush, MSGBOX_DEFAULT + goto CableClub_EventScript_DirectCornerSelectService end -OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 +CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931 call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink switch VAR_0x8004 - case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 0, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 2, OldaleTown_PokemonCenter_2F_EventScript_277A16 - case 5, OldaleTown_PokemonCenter_2F_EventScript_277AA3 - case 12, OldaleTown_PokemonCenter_2F_EventScript_277AA3 + case 3, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 0, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 1, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 2, CableClub_EventScript_ChooseLinkLeaderFrom4 + case 5, CableClub_EventScript_ChooseLinkLeader + case 12, CableClub_EventScript_ChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 - message OldaleTown_PokemonCenter_2F_Text_2792CD +CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989 + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE - case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroup2Players + case 1, CableClub_EventScript_TryLeadGroup2Players + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroup2Players:: @ 82779C6 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 + goto_if_eq CableClub_EventScript_TryLeadGroup2Players release return -OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE + goto_if_eq CableClub_EventScript_TryJoinGroup2Players release return -OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 - message OldaleTown_PokemonCenter_2F_Text_279334 +CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16 + message CableClub_Text_ChooseGroupLeaderOfFour waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B - case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroup4Players + case 1, CableClub_EventScript_TryLeadGroup4Players + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroup4Players:: @ 8277A53 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 + goto_if_eq CableClub_EventScript_TryLeadGroup4Players release return -OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B + goto_if_eq CableClub_EventScript_TryJoinGroup4Players release return -OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 - message OldaleTown_PokemonCenter_2F_Text_2793A3 +CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3 + message CableClub_Text_ChooseGroupLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroupXPlayers + case 1, CableClub_EventScript_TryLeadGroupXPlayers + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroupXPlayers:: @ 8277AE0 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 + goto_if_eq CableClub_EventScript_TryLeadGroupXPlayers release return -OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroupXPlayers:: @ 8277B08 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 + goto_if_eq CableClub_EventScript_TryJoinGroupXPlayers release return -BattleFrontier_BattleTowerLobby_EventScript_277B30:: @ 8277B30 -MossdeepCity_GameCorner_1F_EventScript_277B30:: @ 8277B30 -OldaleTown_PokemonCenter_2F_EventScript_277B30:: @ 8277B30 - special BerryBlenderLinkBecomeLeader +CableClub_EventScript_TryBecomeLinkLeader:: @ 8277B30 + special TryBecomeLinkLeader waitstate return -BattleFrontier_BattleTowerLobby_EventScript_277B35:: @ 8277B35 -MossdeepCity_GameCorner_1F_EventScript_277B35:: @ 8277B35 -OldaleTown_PokemonCenter_2F_EventScript_277B35:: @ 8277B35 - special BerryBlenderLinkJoinGroup +CableClub_EventScript_TryJoinLinkGroup:: @ 8277B35 + special TryJoinLinkGroup waitstate return -OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A - messageautoscroll OldaleTown_PokemonCenter_2F_Text_2781A5 +CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A + messageautoscroll CableClub_Text_DirectYouToYourRoom waitmessage delay 60 closemessage copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -1373,256 +1304,240 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A EventScript_WirelessBoxResults:: @ 8277B8A lockall - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_27733F + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq EventScript_277BB4 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AdapterNotConnected fadescreen 1 special sub_801A42C waitstate - msgbox OldaleTown_PokemonCenter_2F_Text_27874F, MSGBOX_DEFAULT + msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT releaseall end -EventScript_277BB4:: @ 8277BB4 - msgbox OldaleTown_PokemonCenter_2F_Text_27871F, MSGBOX_DEFAULT +CableClub_EventScript_AdapterNotConnected:: @ 8277BB4 + msgbox CableClub_Text_AdapterNotConnected, MSGBOX_DEFAULT releaseall end -OldaleTown_PokemonCenter_2F_EventScript_277BBE:: @ 8277BBE +CableClub_EventScript_OpenUnionRoomBarrier:: @ 8277BBE setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277BD1:: @ 8277BD1 +CableClub_EventScript_CloseUnionRoomBarrier:: @ 8277BD1 setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -OldaleTown_PokemonCenter_2F_EventScript_277BE4:: @ 8277BE4 +CableClub_EventScript_OpenDirectCornerBarrier:: @ 8277BE4 setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277BF7:: @ 8277BF7 +CableClub_EventScript_CloseDirectCornerBarrier:: @ 8277BF7 setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -MossdeepCity_GameCorner_1F_EventScript_277C0A:: @ 8277C0A -OldaleTown_PokemonCenter_2F_EventScript_277C0A:: @ 8277C0A +EventScript_OpenMossdeepGameCornerBarrier:: @ 8277C0A setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277C1D:: @ 8277C1D +EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1 return -BattleFrontier_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -DewfordTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -EverGrandeCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -EverGrandeCity_PokemonLeague_1F_MapScript1_277C30: @ 8277C30 -FallarborTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -FortreeCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -LavaridgeTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -LilycoveCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -MauvilleCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -MossdeepCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -OldaleTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -PacifidlogTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -PetalburgCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -RustboroCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -SlateportCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -SootopolisCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -VerdanturfTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 - special sub_8016934 - end - -MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 +CableClub_MapScript1_InitUnionRoom: @ 8277C30 + special InitUnionRoom + end + +MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34 lock faceplayer - message MossdeepCity_GameCorner_1F_Text_278A7D + message MossdeepCity_GameCorner_1F_Text_DescribeWhichGame waitmessage multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277C73 - case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D - case 2, MossdeepCity_GameCorner_1F_EventScript_277C87 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87 + case 0, MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo + case 1, MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo + case 2, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit end -MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 - msgbox MossdeepCity_GameCorner_1F_Text_278ACB, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo:: @ 8277C73 + msgbox MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C7D:: @ 8277C7D - msgbox MossdeepCity_GameCorner_1F_Text_278BF1, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo:: @ 8277C7D + msgbox MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C87:: @ 8277C87 - msgbox MossdeepCity_GameCorner_1F_Text_278CAC, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit:: @ 8277C87 + msgbox MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 +MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91 lock faceplayer - message MossdeepCity_GameCorner_1F_Text_278CEB + message MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E48 + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected delay 60 - message MossdeepCity_GameCorner_1F_Text_278DAD + message MossdeepCity_GameCorner_1F_Text_PlayWhichGame waitmessage multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9 - case 1, MossdeepCity_GameCorner_1F_EventScript_277D35 - case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case 0, MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump + case 1, MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking + case 2, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 +MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 setvar VAR_0x8005, 0 - special sub_802C920 - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT + special DoesPartyHavePokemonJumpSpecies + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon + msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 - special sub_81B8958 + special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_AbortMinigame call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame setvar VAR_0x8004, 4 - goto MossdeepCity_GameCorner_1F_EventScript_277D81 + goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end -MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 +MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 setvar VAR_0x8005, 1 - special sub_8027A5C - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT + special DoesPartyHaveDodrio + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon + msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 - special sub_81B8958 + special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_AbortMinigame call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame setvar VAR_0x8004, 6 - goto MossdeepCity_GameCorner_1F_EventScript_277D81 + goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end -MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 - message MossdeepCity_GameCorner_1F_Text_2793A3 +MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81 + message CableClub_Text_ChooseGroupLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6 - case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE - case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case 0, MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup + case 1, MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader + case 2, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE - call MossdeepCity_GameCorner_1F_EventScript_277B30 +MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader:: @ 8277DBE + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom compare VAR_RESULT, 5 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DBE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader release return -MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 - call MossdeepCity_GameCorner_1F_EventScript_277B35 +MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup:: @ 8277DE6 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom compare VAR_RESULT, 5 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup release return -MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E - messageautoscroll MossdeepCity_GameCorner_1F_Text_278E00 +MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E + messageautoscroll MossdeepCity_GameCorner_1F_Text_AllGoodToGo waitmessage delay 60 closemessage copyvar VAR_0x8007, VAR_LAST_TALKED - call MossdeepCity_GameCorner_1F_EventScript_277C0A + call EventScript_OpenMossdeepGameCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end -MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 +MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48 delay 60 - msgbox MossdeepCity_GameCorner_1F_Text_278D68, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_1F_Text_AdapterNotConnected, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO +MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55 + msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame compare VAR_0x8005, 0 - call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E84 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements compare VAR_0x8005, 1 - call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E8D - goto MossdeepCity_GameCorner_1F_EventScript_2772F9 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements + goto MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277E84:: @ 8277E84 - msgbox MossdeepCity_GameCorner_1F_Text_278EDC, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements:: @ 8277E84 + msgbox MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed, MSGBOX_DEFAULT return -MossdeepCity_GameCorner_1F_EventScript_277E8D:: @ 8277E8D - msgbox MossdeepCity_GameCorner_1F_Text_278FA4, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements:: @ 8277E8D + msgbox MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed, MSGBOX_DEFAULT return -MossdeepCity_GameCorner_1F_EventScript_277E96:: @ 8277E96 +MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords:: @ 8277E96 lockall - special sub_802E3C4 + special ShowPokemonJumpRecords waitstate releaseall end -MossdeepCity_GameCorner_1F_EventScript_277E9D:: @ 8277E9D +MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords:: @ 8277E9D lockall - special sub_8027AAC + special ShowDodrioBerryPickingRecords waitstate releaseall end -OldaleTown_PokemonCenter_2F_Text_277EA4: @ 8277EA4 + +CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4 .string "Welcome to the POKéMON CABLE\n" .string "CLUB.\p" .string "Which of our services do you wish\n" .string "to use?$" -OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1 +CableClub_Text_WhichService: @ 8277EF1 .string "Which of our services do you wish\n" .string "to use?$" @@ -1638,18 +1553,19 @@ CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 .string "You can use the RECORD CORNER with\n" .string "others using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277FDD: @ 8277FDD +@ Unused +CableClub_Text_CloseThisMenu: @ 8277FDD .string "Close this menu.$" -OldaleTown_PokemonCenter_2F_Text_277FEE: @ 8277FEE +CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE .string "For a DOUBLE BATTLE, you must\n" .string "have at least two POKéMON.$" -OldaleTown_PokemonCenter_2F_Text_278027: @ 8278027 +CableClub_Text_NeedTwoMonsToTrade: @ 8278027 .string "For trading, you must have at\n" .string "least two POKéMON with you.$" -OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061 +CableClub_Text_CantTradeEnigmaBerry: @ 8278061 .string "A POKéMON holding the {STR_VAR_1}\n" .string "BERRY can't be traded.$" @@ -1671,54 +1587,50 @@ gText_AwaitingLinkup:: @ 8278131 .string "Awaiting linkup…\n" .string "… … B Button: Cancel$" -OldaleTown_PokemonCenter_2F_Text_278157:: @ 8278157 +@ Unused +CableClub_Text_OkayToSaveProgress:: @ 8278157 .string "Your progress must be saved before\n" .string "linking. Is it okay to save?$" -OldaleTown_PokemonCenter_2F_Text_278197: @ 8278197 +CableClub_Text_PleaseEnter: @ 8278197 .string "Please enter.$" -OldaleTown_PokemonCenter_2F_Text_2781A5: @ 82781A5 +CableClub_Text_DirectYouToYourRoom: @ 82781A5 .string "I'll direct you to your room now.$" -LilycoveCity_ContestLobby_Text_2781C7: @ 82781C7 -OldaleTown_PokemonCenter_2F_Text_2781C7: @ 82781C7 +Text_SomeoneIsNotReadyToLink: @ 82781C7 .string "Someone is not ready to link.\p" .string "Please come back after everyone\n" .string "has made preparations.$" -LilycoveCity_ContestLobby_Text_27821C: @ 827821C -OldaleTown_PokemonCenter_2F_Text_27821C: @ 827821C +Text_LinkErrorPleaseReset: @ 827821C .string "Sorry, we have a link error…\n" .string "Please reset and try again.$" -BattleFrontier_BattleTowerLobby_Text_278255: @ 8278255 -LilycoveCity_ContestLobby_Text_278255: @ 8278255 -OldaleTown_PokemonCenter_2F_Text_278255: @ 8278255 +Text_PlayersMadeDifferentSelections: @ 8278255 .string "The link partners appear to have\n" .string "made different selections.$" -OldaleTown_PokemonCenter_2F_Text_278291: @ 8278291 +CableClub_Text_PleaseVisitAgain: @ 8278291 .string "Please do visit again.$" -BattleFrontier_BattleTowerLobby_Text_2782A8: @ 82782A8 -OldaleTown_PokemonCenter_2F_Text_2782A8: @ 82782A8 +CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8 .string "The number of participants is\n" .string "incorrect.$" -OldaleTown_PokemonCenter_2F_Text_2782D1: @ 82782D1 +CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1 .string "The SINGLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -OldaleTown_PokemonCenter_2F_Text_278307: @ 8278307 +CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307 .string "The DOUBLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -OldaleTown_PokemonCenter_2F_Text_27833D: @ 827833D +CableClub_Text_NeedFourPlayers: @ 827833D .string "There must be four players to play\n" .string "this Battle Mode.$" -OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372 +CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372 .string "Please confirm the number of\n" .string "players and start again.$" @@ -1731,58 +1643,58 @@ Text_TerminateLinkPleaseWait: @ 82783E9 .string "You will be escorted out of\l" .string "the room. Please wait.$" -Text_27842E: @ 827842E +CableClub_Text_TooBusyToNotice: @ 827842E .string "This TRAINER is too busy to\n" .string "notice…$" -Text_278452: @ 8278452 +CableClub_Text_GotToLookAtTrainerCard: @ 8278452 .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!$" -Text_27847B: @ 827847B +CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!\p" .string "It's a {STR_VAR_2} card!$" -SingleBattleColosseum_Text_2784B4: @ 82784B4 +SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4 .string "Please take your place and start\n" .string "your battle.$" -TradeCenter_Text_2784E2: @ 82784E2 +TradeCenter_Text_TakeSeatStartTrade: @ 82784E2 .string "Please take your seat and start\n" .string "your trade.$" -RecordCorner_Text_27850E: @ 827850E +RecordCorner_Text_ThanksForComing: @ 827850E .string "Thanks for coming.$" -OldaleTown_PokemonCenter_2F_Text_278521: @ 8278521 +CableClub_Text_TrainerCardDataOverwritten: @ 8278521 .string "The TRAINER CARD data will\n" .string "be overwritten.$" -OldaleTown_PokemonCenter_2F_Text_27854C: @ 827854C +CableClub_Text_HopeToSeeYouAgain: @ 827854C .string "I hope to see you again!$" -OldaleTown_PokemonCenter_2F_Text_278565: @ 8278565 +CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565 .string "I'm awfully sorry.\p" .string "We're not set up to conduct trades\n" .string "with TRAINERS far away in another\l" .string "region yet…$" -OldaleTown_PokemonCenter_2F_Text_2785C9: @ 82785C9 +CableClub_Text_OtherTrainerNotReady: @ 82785C9 .string "The other TRAINER is not ready.$" -OldaleTown_PokemonCenter_2F_Text_2785E9: @ 82785E9 +CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9 .string "You have at least one POKéMON\n" .string "that can't be taken.$" -RecordCorner_Text_27861C: @ 827861C +RecordCorner_Text_TakeSeatAndWait: @ 827861C .string "Please take your seat and wait.$" -RecordCorner_Text_27863C: @ 827863C +RecordCorner_Text_PlayerSentOverOneX: @ 827863C .string "{STR_VAR_1} sent over one\n" .string "{STR_VAR_2}.$" -OldaleTown_PokemonCenter_2F_Text_278651: @ 8278651 +CableClub_Text_CantMixWithJapaneseGame: @ 8278651 .string "Sorry, there is a transmission error.\p" .string "You may not mix records with \n" .string "Japanese Ruby or Sapphire games.\p" @@ -1790,18 +1702,20 @@ OldaleTown_PokemonCenter_2F_Text_278651: @ 8278651 .string "Japanese Emerald and overseas Ruby\l" .string "or Sapphire games at the same time.$" -OldaleTown_PokemonCenter_2F_Text_27871F: @ 827871F +CableClub_Text_AdapterNotConnected: @ 827871F .string "The Wireless Adapter is not\n" .string "connected properly.$" -OldaleTown_PokemonCenter_2F_Text_27874F: @ 827874F +CableClub_Text_ParticipantsStepUpToCounter: @ 827874F .string "Participants are asked to step up\n" .string "to the reception counter.$" -OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B +@ Unused +CableClub_Text_Hello: @ 827878B .string "Hello!$" -OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792 +@ Unused +CableClub_Text_PleaseWait: @ 8278792 .string "Please wait.$" CableClub_Text_YouMayTradeHere:: @ 827879F @@ -1830,29 +1744,31 @@ CableClub_Text_CancelSelectedItem:: @ 827889C OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC .string "Which battle mode would you like?$" -OldaleTown_PokemonCenter_2F_Text_2788DE: @ 82788DE +@ Unused +CableClub_Text_ReturnsToPreviousStep: @ 82788DE .string "Returns to the previous step.$" -OldaleTown_PokemonCenter_2F_Text_2788FC: @ 82788FC +CableClub_Text_NeedBerryForBerryCrush: @ 82788FC .string "To use the BERRY CRUSH service,\n" .string "you must have at least one BERRY.$" -OldaleTown_PokemonCenter_2F_Text_27893E: @ 827893E +CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E .string "To enter the UNION ROOM, you must\n" .string "have at least two POKéMON.$" -OldaleTown_PokemonCenter_2F_Text_27897B: @ 827897B +CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B .string "No POKéMON holding the {STR_VAR_1}\n" .string "BERRY may enter the UNION ROOM.$" -OldaleTown_PokemonCenter_2F_Text_2789B5: @ 82789B5 +CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5 .string "This is the POKéMON WIRELESS CLUB\n" .string "UNION ROOM.\p" .string "Unfortunately, your Wireless\n" .string "Adapter is not connected properly.\p" .string "Please do come again.$" -OldaleTown_PokemonCenter_2F_Text_278A39: @ 8278A39 +@ Unused +CableClub_Text_OhExcuseMe: @ 8278A39 .string "Oh…\n" .string "Excuse me!$" @@ -1861,12 +1777,12 @@ CableClub_Text_PlayerIsWaiting: @ 8278A48 .string "right now.\l" .string "Go for it!$" -MossdeepCity_GameCorner_1F_Text_278A7D: @ 8278A7D +MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D .string "I can explain game rules to you,\n" .string "if you'd like.\p" .string "Which game should I describe?$" -MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB +MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB .string "“POKéMON JUMP”\p" .string "Make your POKéMON skip the VINE WHIP\n" .string "rope with the A Button.\p" @@ -1879,7 +1795,7 @@ MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB .string "Good things happen if everyone\n" .string "jumps in time.$" -MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1 +MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1 .string "“DODRIO BERRY-PICKING”\p" .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" @@ -1888,46 +1804,47 @@ MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1 .string "To play this game, you must have\n" .string "a DODRIO.$" -MossdeepCity_GameCorner_1F_Text_278CAC: @ 8278CAC +MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC .string "If you want to play a game,\n" .string "please tell the old man beside me.$" -MossdeepCity_GameCorner_1F_Text_278CEB: @ 8278CEB +MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB .string "Hi, welcome!\n" .string "Are you here to play games using\l" .string "Wireless Communication?\p" .string "Can you wait just a little bit?$" -MossdeepCity_GameCorner_1F_Text_278D51: @ 8278D51 +MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51 .string "All right, come again!$" -MossdeepCity_GameCorner_1F_Text_278D68: @ 8278D68 +MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68 .string "The Wireless Adapter isn't connected.\n" .string "Come back when it's hooked up!$" -MossdeepCity_GameCorner_1F_Text_278DAD: @ 8278DAD +MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD .string "All right, which game did you want\n" .string "to play?$" -MossdeepCity_GameCorner_1F_Text_278DD9: @ 8278DD9 +MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9 .string "Which POKéMON would you like to\n" .string "enter?$" -MossdeepCity_GameCorner_1F_Text_278E00: @ 8278E00 +MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00 .string "Okay, you're all good to go.\n" .string "Don't let the others beat you!$" -MossdeepCity_GameCorner_1F_Text_278E3C: @ 8278E3C +@ Unused +MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C .string "Are you leaving now?\n" .string "Do come again!$" -MossdeepCity_GameCorner_1F_Text_278E60: @ 8278E60 +MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60 .string "It doesn't look like you have any\n" .string "POKéMON that you can enter…\p" .string "Would you like me to explain what\n" .string "kinds of POKéMON can enter?$" -MossdeepCity_GameCorner_1F_Text_278EDC: @ 8278EDC +MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC .string "“POKéMON JUMP” is open to POKéMON\n" .string "around 28 inches or less.\p" .string "What you can't enter are those\n" @@ -1936,15 +1853,16 @@ MossdeepCity_GameCorner_1F_Text_278EDC: @ 8278EDC .string "swim, burrow, or fly.\p" .string "That's all you need to know.$" -MossdeepCity_GameCorner_1F_Text_278FA4: @ 8278FA4 +MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4 .string "DODRIO BERRY-PICKING is a game that \n" .string "only DODRIO may enter.$" -MossdeepCity_GameCorner_1F_Text_278FE0: @ 8278FE0 +@ Unused +MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0 .string "Could you retry this from the start\n" .string "again, please?$" -OldaleTown_PokemonCenter_2F_Text_279013: @ 8279013 +CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013 .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB DIRECT CORNER.\p" .string "You may interact directly with\n" @@ -1952,22 +1870,22 @@ OldaleTown_PokemonCenter_2F_Text_279013: @ 8279013 .string "Which room would you like to\n" .string "enter?$" -OldaleTown_PokemonCenter_2F_Text_27909D: @ 827909D +CableClub_Text_TradePokemon: @ 827909D .string "Would you like to trade POKéMON?$" -OldaleTown_PokemonCenter_2F_Text_2790BE: @ 82790BE +CableClub_Text_WhichBattleMode: @ 82790BE .string "Which Battle Mode would you like\n" .string "to play?$" -OldaleTown_PokemonCenter_2F_Text_2790E8: @ 82790E8 +CableClub_Text_AccessRecordCorner: @ 82790E8 .string "Would you like to access\n" .string "the RECORD CORNER?$" -OldaleTown_PokemonCenter_2F_Text_279114: @ 8279114 +CableClub_Text_UseBerryCrush: @ 8279114 .string "Would you like to use the\n" .string "BERRY CRUSH System?$" -OldaleTown_PokemonCenter_2F_Text_279142: @ 8279142 +CableClub_Text_ExplainBattleModes: @ 8279142 .string "There are three Battle Modes.\p" .string "SINGLE BATTLE is for two TRAINERS\n" .string "with one or more POKéMON each.\p" @@ -1982,27 +1900,25 @@ OldaleTown_PokemonCenter_2F_Text_279142: @ 8279142 .string "Each TRAINER can have one POKéMON\n" .string "in battle at a time.$" -BattleFrontier_BattleTowerLobby_Text_2792CD: @ 82792CD -OldaleTown_PokemonCenter_2F_Text_2792CD: @ 82792CD +CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD .string "Please decide which of you two\n" .string "will become the LEADER.\p" .string "The other player must then choose\n" .string "“JOIN GROUP.”$" -OldaleTown_PokemonCenter_2F_Text_279334: @ 8279334 +CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334 .string "Please decide which of you four\n" .string "will become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -MossdeepCity_GameCorner_1F_Text_2793A3: @ 82793A3 -OldaleTown_PokemonCenter_2F_Text_2793A3: @ 82793A3 +CableClub_Text_ChooseGroupLeader: @ 82793A3 .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -OldaleTown_PokemonCenter_2F_Text_27940D: @ 827940D +CableClub_Text_WelcomeUnionRoomEnter: @ 827940D .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB UNION ROOM.\p" .string "You may interact directly with\n" @@ -2010,7 +1926,7 @@ OldaleTown_PokemonCenter_2F_Text_27940D: @ 827940D .string "whom you may not even know.\p" .string "Would you like to enter the ROOM?$" -OldaleTown_PokemonCenter_2F_Text_2794B8: @ 82794B8 +CableClub_Text_UnionRoomInfo: @ 82794B8 .string "The TRAINERS in the UNION ROOM\n" .string "will be those players around you\l" .string "who have also entered the ROOM.\p" @@ -2024,11 +1940,11 @@ OldaleTown_PokemonCenter_2F_Text_2794B8: @ 82794B8 .string "trade.\p" .string "Would you like to enter the ROOM?$" -OldaleTown_PokemonCenter_2F_Text_27961C: @ 827961C +CableClub_Text_EnjoyUnionRoom: @ 827961C .string "I hope you enjoy your time in\n" .string "the UNION ROOM.$" -OldaleTown_PokemonCenter_2F_Text_27964A: @ 827964A +CableClub_Text_FirstTimeRightThisWay: @ 827964A .string "Hello!\n" .string "My name is TEALA.\p" .string "This must be your first time\n" @@ -2039,7 +1955,7 @@ OldaleTown_PokemonCenter_2F_Text_27964A: @ 827964A .string "floor of our POKéMON CENTER.\p" .string "Right this way, please.$" -OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 +CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718 .string "On the top floor, there are two\n" .string "rooms.\p" .string "First, the room on the left.\n" @@ -2061,14 +1977,14 @@ OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -OldaleTown_PokemonCenter_2F_Text_279937: @ 8279937 +CableClub_Text_AskAboutLinking: @ 8279937 .string "Hello, {PLAYER}!\p" .string "It's me, TEALA, the POKéMON\n" .string "CENTER 2F attendant.\p" .string "Is there something you needed to\n" .string "ask me about linking?$" -OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA +CableClub_Text_ExplainWirelessClub: @ 82799AA .string "Let me explain how the POKéMON\n" .string "WIRELESS CLUB works.\p" .string "On this, the top floor, there are\n" @@ -2097,6 +2013,6 @@ OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -OldaleTown_PokemonCenter_2F_Text_279C91: @ 8279C91 +CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91 .string "I hope you enjoy the Wireless\n" .string "Communication System.$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 10ced77c4..9590f3140 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -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 -- cgit v1.2.3 From 1c99f5b7c9d280955389e0ecd97613e68062d5b3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Oct 2019 10:22:21 -0400 Subject: Split text from cable_club.inc --- data/scripts/cable_club.inc | 486 -------------------------------------------- 1 file changed, 486 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 6b2c87520..812da1c78 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1530,489 +1530,3 @@ MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords:: @ 8277E9D waitstate releaseall end - -CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4 - .string "Welcome to the POKéMON CABLE\n" - .string "CLUB.\p" - .string "Which of our services do you wish\n" - .string "to use?$" - -CableClub_Text_WhichService: @ 8277EF1 - .string "Which of our services do you wish\n" - .string "to use?$" - -CableClub_Text_TradeUsingLinkCable:: @ 8277F1B - .string "Trade POKéMON with another player\n" - .string "using a GBA Game Link cable.$" - -CableClub_Text_BattleUsingLinkCable:: @ 8277F5A - .string "You may battle another TRAINER\n" - .string "using a GBA Game Link cable.$" - -CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 - .string "You can use the RECORD CORNER with\n" - .string "others using a GBA Game Link cable.$" - -@ Unused -CableClub_Text_CloseThisMenu: @ 8277FDD - .string "Close this menu.$" - -CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE - .string "For a DOUBLE BATTLE, you must\n" - .string "have at least two POKéMON.$" - -CableClub_Text_NeedTwoMonsToTrade: @ 8278027 - .string "For trading, you must have at\n" - .string "least two POKéMON with you.$" - -CableClub_Text_CantTradeEnigmaBerry: @ 8278061 - .string "A POKéMON holding the {STR_VAR_1}\n" - .string "BERRY can't be traded.$" - -gText_PleaseWaitForLink:: @ 8278091 - .string "Please wait.\n" - .string "… … B Button: Cancel$" - -gText_ConfirmLinkWhenPlayersReady:: @ 82780B3 - .string "When all players are ready…\n" - .string "A Button: Confirm\l" - .string "B Button: Cancel$" - -gText_ConfirmStartLinkWithXPlayers:: @ 82780F2 - .string "Start link with {STR_VAR_1} players.\n" - .string "A Button: Confirm\l" - .string "B Button: Cancel$" - -gText_AwaitingLinkup:: @ 8278131 - .string "Awaiting linkup…\n" - .string "… … B Button: Cancel$" - -@ Unused -CableClub_Text_OkayToSaveProgress:: @ 8278157 - .string "Your progress must be saved before\n" - .string "linking. Is it okay to save?$" - -CableClub_Text_PleaseEnter: @ 8278197 - .string "Please enter.$" - -CableClub_Text_DirectYouToYourRoom: @ 82781A5 - .string "I'll direct you to your room now.$" - -Text_SomeoneIsNotReadyToLink: @ 82781C7 - .string "Someone is not ready to link.\p" - .string "Please come back after everyone\n" - .string "has made preparations.$" - -Text_LinkErrorPleaseReset: @ 827821C - .string "Sorry, we have a link error…\n" - .string "Please reset and try again.$" - -Text_PlayersMadeDifferentSelections: @ 8278255 - .string "The link partners appear to have\n" - .string "made different selections.$" - -CableClub_Text_PleaseVisitAgain: @ 8278291 - .string "Please do visit again.$" - -CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8 - .string "The number of participants is\n" - .string "incorrect.$" - -CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1 - .string "The SINGLE BATTLE Mode can't be\n" - .string "played by {STR_VAR_1} players.$" - -CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307 - .string "The DOUBLE BATTLE Mode can't be\n" - .string "played by {STR_VAR_1} players.$" - -CableClub_Text_NeedFourPlayers: @ 827833D - .string "There must be four players to play\n" - .string "this Battle Mode.$" - -CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372 - .string "Please confirm the number of\n" - .string "players and start again.$" - -Text_TerminateLinkConfirmation: @ 82783A8 - .string "The link will be terminated if you\n" - .string "leave the room. Is that okay?$" - -Text_TerminateLinkPleaseWait: @ 82783E9 - .string "Terminating link…\n" - .string "You will be escorted out of\l" - .string "the room. Please wait.$" - -CableClub_Text_TooBusyToNotice: @ 827842E - .string "This TRAINER is too busy to\n" - .string "notice…$" - -CableClub_Text_GotToLookAtTrainerCard: @ 8278452 - .string "Score! Got to look at {STR_VAR_1}'s\n" - .string "TRAINER CARD!$" - -CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B - .string "Score! Got to look at {STR_VAR_1}'s\n" - .string "TRAINER CARD!\p" - .string "It's a {STR_VAR_2} card!$" - -SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4 - .string "Please take your place and start\n" - .string "your battle.$" - -TradeCenter_Text_TakeSeatStartTrade: @ 82784E2 - .string "Please take your seat and start\n" - .string "your trade.$" - -RecordCorner_Text_ThanksForComing: @ 827850E - .string "Thanks for coming.$" - -CableClub_Text_TrainerCardDataOverwritten: @ 8278521 - .string "The TRAINER CARD data will\n" - .string "be overwritten.$" - -CableClub_Text_HopeToSeeYouAgain: @ 827854C - .string "I hope to see you again!$" - -CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565 - .string "I'm awfully sorry.\p" - .string "We're not set up to conduct trades\n" - .string "with TRAINERS far away in another\l" - .string "region yet…$" - -CableClub_Text_OtherTrainerNotReady: @ 82785C9 - .string "The other TRAINER is not ready.$" - -CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9 - .string "You have at least one POKéMON\n" - .string "that can't be taken.$" - -RecordCorner_Text_TakeSeatAndWait: @ 827861C - .string "Please take your seat and wait.$" - -RecordCorner_Text_PlayerSentOverOneX: @ 827863C - .string "{STR_VAR_1} sent over one\n" - .string "{STR_VAR_2}.$" - -CableClub_Text_CantMixWithJapaneseGame: @ 8278651 - .string "Sorry, there is a transmission error.\p" - .string "You may not mix records with \n" - .string "Japanese Ruby or Sapphire games.\p" - .string "Also, you can't mix records with\n" - .string "Japanese Emerald and overseas Ruby\l" - .string "or Sapphire games at the same time.$" - -CableClub_Text_AdapterNotConnected: @ 827871F - .string "The Wireless Adapter is not\n" - .string "connected properly.$" - -CableClub_Text_ParticipantsStepUpToCounter: @ 827874F - .string "Participants are asked to step up\n" - .string "to the reception counter.$" - -@ Unused -CableClub_Text_Hello: @ 827878B - .string "Hello!$" - -@ Unused -CableClub_Text_PleaseWait: @ 8278792 - .string "Please wait.$" - -CableClub_Text_YouMayTradeHere:: @ 827879F - .string "You may trade your POKéMON here\n" - .string "with another TRAINER.$" - -CableClub_Text_YouMayBattleHere:: @ 82787D5 - .string "You may battle with your friends\n" - .string "here.$" - -CableClub_Text_CanMakeBerryPowder:: @ 82787FC - .string "Two to five TRAINERS can make\n" - .string "BERRY POWDER together.$" - -CableClub_Text_CanMixRecords:: @ 8278831 - .string "The records of two to four players\n" - .string "can be mixed together.$" - -OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B - .string "A guide to the WIRELESS CLUB's\n" - .string "various services.$" - -CableClub_Text_CancelSelectedItem:: @ 827889C - .string "Cancels the selected MENU item.$" - -OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC - .string "Which battle mode would you like?$" - -@ Unused -CableClub_Text_ReturnsToPreviousStep: @ 82788DE - .string "Returns to the previous step.$" - -CableClub_Text_NeedBerryForBerryCrush: @ 82788FC - .string "To use the BERRY CRUSH service,\n" - .string "you must have at least one BERRY.$" - -CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E - .string "To enter the UNION ROOM, you must\n" - .string "have at least two POKéMON.$" - -CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B - .string "No POKéMON holding the {STR_VAR_1}\n" - .string "BERRY may enter the UNION ROOM.$" - -CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5 - .string "This is the POKéMON WIRELESS CLUB\n" - .string "UNION ROOM.\p" - .string "Unfortunately, your Wireless\n" - .string "Adapter is not connected properly.\p" - .string "Please do come again.$" - -@ Unused -CableClub_Text_OhExcuseMe: @ 8278A39 - .string "Oh…\n" - .string "Excuse me!$" - -CableClub_Text_PlayerIsWaiting: @ 8278A48 - .string "It appears as if {STR_VAR_1} is playing\n" - .string "right now.\l" - .string "Go for it!$" - -MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D - .string "I can explain game rules to you,\n" - .string "if you'd like.\p" - .string "Which game should I describe?$" - -MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB - .string "“POKéMON JUMP”\p" - .string "Make your POKéMON skip the VINE WHIP\n" - .string "rope with the A Button.\p" - .string "Only mini POKéMON around 28 inches\n" - .string "or less may participate.\p" - .string "POKéMON that only swim, burrow,\n" - .string "or fly are not good at jumping.\p" - .string "As a result, those POKéMON may not\n" - .string "participate.\p" - .string "Good things happen if everyone\n" - .string "jumps in time.$" - -MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1 - .string "“DODRIO BERRY-PICKING”\p" - .string "Command DODRIO's three heads to\n" - .string "catch falling BERRIES.\p" - .string "Press right, up, or left on the\n" - .string "{PLUS} Control Pad to move the heads.\p" - .string "To play this game, you must have\n" - .string "a DODRIO.$" - -MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC - .string "If you want to play a game,\n" - .string "please tell the old man beside me.$" - -MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB - .string "Hi, welcome!\n" - .string "Are you here to play games using\l" - .string "Wireless Communication?\p" - .string "Can you wait just a little bit?$" - -MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51 - .string "All right, come again!$" - -MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68 - .string "The Wireless Adapter isn't connected.\n" - .string "Come back when it's hooked up!$" - -MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD - .string "All right, which game did you want\n" - .string "to play?$" - -MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9 - .string "Which POKéMON would you like to\n" - .string "enter?$" - -MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00 - .string "Okay, you're all good to go.\n" - .string "Don't let the others beat you!$" - -@ Unused -MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C - .string "Are you leaving now?\n" - .string "Do come again!$" - -MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60 - .string "It doesn't look like you have any\n" - .string "POKéMON that you can enter…\p" - .string "Would you like me to explain what\n" - .string "kinds of POKéMON can enter?$" - -MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC - .string "“POKéMON JUMP” is open to POKéMON\n" - .string "around 28 inches or less.\p" - .string "What you can't enter are those\n" - .string "POKéMON that can't jump.\p" - .string "You know, like POKéMON that only\n" - .string "swim, burrow, or fly.\p" - .string "That's all you need to know.$" - -MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4 - .string "DODRIO BERRY-PICKING is a game that \n" - .string "only DODRIO may enter.$" - -@ Unused -MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0 - .string "Could you retry this from the start\n" - .string "again, please?$" - -CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013 - .string "Welcome to the POKéMON WIRELESS\n" - .string "CLUB DIRECT CORNER.\p" - .string "You may interact directly with\n" - .string "your friends here.\p" - .string "Which room would you like to\n" - .string "enter?$" - -CableClub_Text_TradePokemon: @ 827909D - .string "Would you like to trade POKéMON?$" - -CableClub_Text_WhichBattleMode: @ 82790BE - .string "Which Battle Mode would you like\n" - .string "to play?$" - -CableClub_Text_AccessRecordCorner: @ 82790E8 - .string "Would you like to access\n" - .string "the RECORD CORNER?$" - -CableClub_Text_UseBerryCrush: @ 8279114 - .string "Would you like to use the\n" - .string "BERRY CRUSH System?$" - -CableClub_Text_ExplainBattleModes: @ 8279142 - .string "There are three Battle Modes.\p" - .string "SINGLE BATTLE is for two TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.\p" - .string "DOUBLE BATTLE is for two TRAINERS\n" - .string "with two or more POKéMON each.\p" - .string "Each TRAINER will send out two\n" - .string "POKéMON in battle at a time.\p" - .string "MULTI BATTLE is for four TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.$" - -CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD - .string "Please decide which of you two\n" - .string "will become the LEADER.\p" - .string "The other player must then choose\n" - .string "“JOIN GROUP.”$" - -CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334 - .string "Please decide which of you four\n" - .string "will become the GROUP LEADER.\p" - .string "The other players must then choose\n" - .string "“JOIN GROUP.”$" - -CableClub_Text_ChooseGroupLeader: @ 82793A3 - .string "Please decide which of you will\n" - .string "become the GROUP LEADER.\p" - .string "The other players must then choose\n" - .string "“JOIN GROUP.”$" - -CableClub_Text_WelcomeUnionRoomEnter: @ 827940D - .string "Welcome to the POKéMON WIRELESS\n" - .string "CLUB UNION ROOM.\p" - .string "You may interact directly with\n" - .string "other TRAINERS here, some of\l" - .string "whom you may not even know.\p" - .string "Would you like to enter the ROOM?$" - -CableClub_Text_UnionRoomInfo: @ 82794B8 - .string "The TRAINERS in the UNION ROOM\n" - .string "will be those players around you\l" - .string "who have also entered the ROOM.\p" - .string "You may do all sorts of things\n" - .string "here, such as exchanging greetings.\p" - .string "You may enter two POKéMON up to\n" - .string "Lv. 30 for a one-on-one battle.\p" - .string "You may take part in a chat with\n" - .string "two to five people.\p" - .string "Or, you may register a POKéMON for\n" - .string "trade.\p" - .string "Would you like to enter the ROOM?$" - -CableClub_Text_EnjoyUnionRoom: @ 827961C - .string "I hope you enjoy your time in\n" - .string "the UNION ROOM.$" - -CableClub_Text_FirstTimeRightThisWay: @ 827964A - .string "Hello!\n" - .string "My name is TEALA.\p" - .string "This must be your first time\n" - .string "up here.\p" - .string "I'll show you how the Wireless\n" - .string "Communication System works.\p" - .string "First, I need to show you this\n" - .string "floor of our POKéMON CENTER.\p" - .string "Right this way, please.$" - -CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718 - .string "On the top floor, there are two\n" - .string "rooms.\p" - .string "First, the room on the left.\n" - .string "It's the UNION ROOM.\p" - .string "You may link up with TRAINERS\n" - .string "around you who have also entered\l" - .string "the UNION ROOM.\p" - .string "With them, you may do things like\n" - .string "chat, battle, and trade.\p" - .string "Second, the room on the right is\n" - .string "the DIRECT CORNER.\p" - .string "You may trade or battle POKéMON\n" - .string "with your friends in this room.\p" - .string "If the Wireless Adapter isn't\n" - .string "connected, you may still link up\l" - .string "using a GBA Game Link cable.\p" - .string "If that is the case, you must go\n" - .string "to the DIRECT CORNER.\p" - .string "I hope you enjoy the Wireless \n" - .string "Communication System.$" - -CableClub_Text_AskAboutLinking: @ 8279937 - .string "Hello, {PLAYER}!\p" - .string "It's me, TEALA, the POKéMON\n" - .string "CENTER 2F attendant.\p" - .string "Is there something you needed to\n" - .string "ask me about linking?$" - -CableClub_Text_ExplainWirelessClub: @ 82799AA - .string "Let me explain how the POKéMON\n" - .string "WIRELESS CLUB works.\p" - .string "On this, the top floor, there are\n" - .string "two rooms.\p" - .string "First, the room on the left.\n" - .string "It's the UNION ROOM.\p" - .string "You may link up with TRAINERS\n" - .string "around you who have also entered\l" - .string "the UNION ROOM.\p" - .string "With them, you may do things like\n" - .string "chat, battle, and trade.\p" - .string "Second, the room on the right is\n" - .string "the DIRECT CORNER.\p" - .string "You may trade or battle POKéMON\n" - .string "with your friends in this room.\p" - .string "Sometimes, you may not be able to\n" - .string "find your friends in the UNION ROOM\l" - .string "or the DIRECT CORNER.\p" - .string "In that case, please move closer\n" - .string "to your friends.\p" - .string "If the Wireless Adapter isn't\n" - .string "connected, you may still link up\l" - .string "using a GBA Game Link cable.\p" - .string "If that is the case, you must go\n" - .string "to the DIRECT CORNER.\p" - .string "I hope you enjoy the Wireless \n" - .string "Communication System.$" - -CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91 - .string "I hope you enjoy the Wireless\n" - .string "Communication System.$" -- cgit v1.2.3 From 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Oct 2019 22:23:05 -0400 Subject: Review changes for #835 --- data/scripts/cable_club.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 812da1c78..432e266ea 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,4 +1,4 @@ -CableClub_MapScript_OnTransition: @ 8276ACF +CableClub_OnTransition: @ 8276ACF call CableClub_EventScript_HideOrShowMysteryGiftMan end @@ -54,7 +54,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 release end -CableClub_MapScript2_OnWarp: @ 8276B6C +CableClub_OnWarp: @ 8276B6C map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant @@ -72,7 +72,7 @@ CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE CableClub_EventScript_DontTurnAttendant:: @ 8276BBD end -CableClub_MapScript1_OnLoad: @ 8276BBE +CableClub_OnLoad: @ 8276BBE compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE goto_if_eq CableClub_EventScript_OnLoadFromColosseum compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE @@ -115,7 +115,7 @@ CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35 call EventScript_OpenMossdeepGameCornerBarrier end -CableClub_MapScript2_OnFrame: @ 8276C3B +CableClub_OnFrame: @ 8276C3B map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom @@ -1350,7 +1350,7 @@ EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1 return -CableClub_MapScript1_InitUnionRoom: @ 8277C30 +CableClub_OnResume: @ 8277C30 special InitUnionRoom end @@ -1403,7 +1403,7 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91 MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 setvar VAR_0x8005, 0 - special DoesPartyHavePokemonJumpSpecies + special IsPokemonJumpSpeciesInParty compare VAR_RESULT, FALSE goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT @@ -1422,7 +1422,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 setvar VAR_0x8005, 1 - special DoesPartyHaveDodrio + special IsDodrioInParty compare VAR_RESULT, FALSE goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT -- cgit v1.2.3 From 144c5888a11115c93ed065c738a8ab395d71a798 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 13 Oct 2019 15:29:53 -0400 Subject: Fix map script names --- data/scripts/cave_hole.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 0852149a6..7f0dd5534 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -1,8 +1,8 @@ -CaveHole_MapScript2_CheckFallDownHole: @ 82A8327 +CaveHole_CheckFallDownHole: @ 82A8327 map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole .2byte 0 -CaveHole_MapScript1_FixCrackedGround: @ 82A8331 +CaveHole_FixCrackedGround: @ 82A8331 copyvar VAR_ICE_STEP_COUNT, 1 end -- cgit v1.2.3 From 1b41b8b7caf56d34d31137c18055a30258787263 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 15 Oct 2019 04:58:52 -0400 Subject: Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms --- data/scripts/shared_secret_base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index 933835a73..3f83e38b0 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -20,7 +20,7 @@ SecretBase_MapScript2_OnFrame: @ 823B4AE .2byte 0 SecretBase_MapScript1_OnResume: @ 823B4B8 - setstepcallback 6 + setstepcallback STEP_CB_SECRET_BASE end SecretBase_EventScript_PC:: @ 823B4BB -- cgit v1.2.3 From 0db188b487d7cc6c3e4164dd6d8e94a320deceff Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 20 Oct 2019 02:31:51 -0400 Subject: Clean up berry_tree.inc and misc adjacent documentation --- data/scripts/berry_tree.inc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 63d1f0bcc..6de5ccf47 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,16 +1,16 @@ BerryTreeScript:: @ 82742F9 special EventObjectInteractionGetBerryTreeData switch VAR_0x8004 - case 255, BerryTree_EventScript_27434F - case 0, BerryTree_EventScript_CheckSoil - case 1, BerryTree_EventScript_CheckBerryStage1 - case 2, BerryTree_EventScript_CheckBerryStage2 - case 3, BerryTree_EventScript_CheckBerryStage3 - case 4, BerryTree_EventScript_CheckBerryStage4 - case 5, BerryTree_EventScript_CheckBerryFullyGrown + case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling + case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil + case BERRY_STAGE_PLANTED, BerryTree_EventScript_CheckBerryStage1 + case BERRY_STAGE_SPROUTED, BerryTree_EventScript_CheckBerryStage2 + case BERRY_STAGE_TALLER, BerryTree_EventScript_CheckBerryStage3 + case BERRY_STAGE_FLOWERING, BerryTree_EventScript_CheckBerryStage4 + case BERRY_STAGE_BERRIES, BerryTree_EventScript_CheckBerryFullyGrown end -BerryTree_EventScript_27434F:: @ 827434F +BerryTree_EventScript_Sparkling:: @ 827434F lockall message BerryTree_Text_ExclamationPoint waitmessage @@ -22,7 +22,7 @@ BerryTree_EventScript_CheckSoil:: @ 8274359 lock faceplayer specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BerryTree_EventScript_WantToPlant message BerryTree_Text_ItsSoftLoamySoil waitmessage @@ -85,6 +85,8 @@ BerryTree_EventScript_CheckBerryStage4:: @ 82743E1 waitbuttonpress goto BerryTree_EventScript_WantToWater +@ VAR_0x8005 here is the number of times watered +@ Buffered by EventObjectInteractionGetBerryTreeData BerryTree_EventScript_GetCareAdverb:: @ 82743F6 compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_SetAdverbPoor @@ -101,6 +103,7 @@ BerryTree_EventScript_SetAdverbPoor:: @ 827441A bufferstring 1, BerryTree_Text_CareAdverbPoor return +@ VAR_0x8006 here is the number of berries BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock @@ -116,7 +119,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448 special EventObjectInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_BerryPocketFull - special sub_80EED34 + special IncrementDailyPickedBerries special EventObjectInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry playfanfare MUS_ME_KINOMI @@ -143,7 +146,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479 release end -BerryTree_EventScript_274482:: @ 8274482 +BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482 lockall special EventObjectInteractionGetBerryTreeData call BerryTree_EventScript_PlantBerry @@ -165,10 +168,9 @@ BerryTree_EventScript_DontWater:: @ 82744BE releaseall end -BerryTree_EventScript_2744C0:: @ 82744C0 +BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0 special EventObjectInteractionGetBerryTreeData lockall - BerryTree_EventScript_WaterBerry:: @ 82744C4 special EventObjectInteractionGetBerryName message BerryTree_Text_WateredTheBerry @@ -185,7 +187,7 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 BerryTree_EventScript_PlantBerry:: @ 82744DD special EventObjectInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES - special sub_80EED10 + special IncrementDailyPlantedBerries special EventObjectInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry waitmessage -- cgit v1.2.3 From ac399ade4ad2f2602274943ef1efaee0d2b62074 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 20 Oct 2019 03:46:05 -0400 Subject: Document safari zone scripts --- data/scripts/safari_zone.inc | 136 +++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 3539e0970..83cf5d16d 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,103 +1,103 @@ -EventScript_2A4B4C:: @ 82A4B4C +SafariZone_EventScript_OutOfBallsMidBattle:: @ 82A4B4C setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end -EventScript_2A4B5D:: @ 82A4B5D +SafariZone_EventScript_Exit:: @ 82A4B5D setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end -EventScript_2A4B6F:: @ 82A4B6F +SafariZone_EventScript_RetirePrompt:: @ 82A4B6F lockall - msgbox Text_2A4BF4, MSGBOX_YESNO + msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq EventScript_2A4B85 + goto_if_eq SafariZone_EventScript_Retire releaseall end -EventScript_2A4B85:: @ 82A4B85 - goto EventScript_2A4B5D +SafariZone_EventScript_Retire:: @ 82A4B85 + goto SafariZone_EventScript_Exit -EventScript_2A4B8A:: @ 82A4B8A +SafariZone_EventScript_TimesUp:: @ 82A4B8A lockall playse SE_PINPON - message Text_2A4C26 + message SafariZone_Text_TimesUp waitmessage waitbuttonpress releaseall - goto EventScript_2A4B5D + goto SafariZone_EventScript_Exit -EventScript_2A4B9B:: @ 82A4B9B +SafariZone_EventScript_OutOfBalls:: @ 82A4B9B lockall playse SE_PINPON - message Text_2A4C56 + message SafariZone_Text_OutOfBalls waitmessage waitbuttonpress releaseall - goto EventScript_2A4B5D + goto SafariZone_EventScript_Exit EventScript_PokeBlockFeeder:: @ 82A4BAC lockall special GetPokeblockFeederInFront - compare VAR_RESULT, 65535 - goto_if_ne EventScript_2A4BEB - msgbox Text_2A4C90, MSGBOX_YESNO + compare VAR_RESULT, 0xFFFF + goto_if_ne SafariZone_EventScript_PokeblockPresent + msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq EventScript_2A4BD0 + goto_if_eq SafariZone_EventScript_ChoosePokeblock releaseall end -EventScript_2A4BD0:: @ 82A4BD0 +SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0 fadescreen 1 special OpenPokeblockCaseOnFeeder waitstate - compare VAR_RESULT, 65535 - goto_if_ne EventScript_2A4BE2 + compare VAR_RESULT, 0xFFFF + goto_if_ne SafariZone_EventScript_PokeblockPlaced end -EventScript_2A4BE2:: @ 82A4BE2 - message Text_2A4CEB +SafariZone_EventScript_PokeblockPlaced:: @ 82A4BE2 + message SafariZone_Text_PokeblockWasPlaced waitmessage waitbuttonpress releaseall end -EventScript_2A4BEB:: @ 82A4BEB - message Text_2A4CC5 +SafariZone_EventScript_PokeblockPresent:: @ 82A4BEB + message SafariZone_Text_PokeblockStillHere waitmessage waitbuttonpress releaseall end -Text_2A4BF4: @ 82A4BF4 +SafariZone_Text_WouldYouLikeToExit: @ 82A4BF4 .string "Would you like to exit the SAFARI\n" .string "ZONE right now?$" -Text_2A4C26: @ 82A4C26 +SafariZone_Text_TimesUp: @ 82A4C26 .string "Ding-dong! Time's up!\n" .string "Your SAFARI Game is over.$" -Text_2A4C56: @ 82A4C56 +SafariZone_Text_OutOfBalls: @ 82A4C56 .string "You've run out of SAFARI BALLS.\n" .string "Your SAFARI Game is over.$" -Text_2A4C90: @ 82A4C90 +SafariZone_Text_PlacePokeblockOnFeeder: @ 82A4C90 .string "Would you like to place a {POKEBLOCK}\n" .string "on the {POKEBLOCK} FEEDER?$" -Text_2A4CC5: @ 82A4CC5 +SafariZone_Text_PokeblockStillHere: @ 82A4CC5 .string "The {STR_VAR_1} you left\n" .string "before is still here.$" -Text_2A4CEB: @ 82A4CEB +SafariZone_Text_PokeblockWasPlaced: @ 82A4CEB .string "The {STR_VAR_1} was placed\n" .string "on the {POKEBLOCK} FEEDER.$" -Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12 +Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12 .string "Welcome to the SAFARI ZONE!\p" .string "Here, you may witness many kinds of\n" .string "POKéMON rarely seen in HOENN.\p" @@ -109,14 +109,14 @@ Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12 .string "for keeps!\p" .string "Come in and enjoy the SAFARI ZONE!$" -Route121_SafariZoneEntrance_Text_2A4E46: @ 82A4E46 +Route121_SafariZoneEntrance_Text_WelcomeFirstTime: @ 82A4E46 .string "Welcome to the SAFARI ZONE!\n" .string "Is it your first time here?$" -Route121_SafariZoneEntrance_Text_2A4E7E: @ 82A4E7E +Route121_SafariZoneEntrance_Text_ComeInAndEnjoy: @ 82A4E7E .string "Come in and enjoy the SAFARI ZONE!$" -Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1 +Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1 .string "When you enter the SAFARI ZONE, you\n" .string "start with 30 SAFARI BALLS for\l" .string "catching POKéMON.\p" @@ -125,39 +125,39 @@ Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1 .string "walked 500 steps.\p" .string "Come in and enjoy the SAFARI ZONE!$" -Route121_SafariZoneEntrance_Text_2A4F74: @ 82A4F74 +Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay: @ 82A4F74 .string "Welcome to the SAFARI ZONE!\p" .string "All you can catch for just ¥500!\n" .string "Would you like to play a SAFARI Game?$" -Route121_SafariZoneEntrance_Text_2A4FD7: @ 82A4FD7 +Route121_SafariZoneEntrance_Text_PlayAnotherTime: @ 82A4FD7 .string "Okay.\n" .string "Please play another time!$" -Route121_SafariZoneEntrance_Text_2A4FF7: @ 82A4FF7 +Route121_SafariZoneEntrance_Text_NotEnoughMoney: @ 82A4FF7 .string "You don't have enough money.\n" .string "Sorry.$" -Route121_SafariZoneEntrance_Text_2A501B: @ 82A501B +Route121_SafariZoneEntrance_Text_ThatWillBe500Please: @ 82A501B .string "That will be ¥500, please.$" -Route121_SafariZoneEntrance_Text_2A5036: @ 82A5036 +Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls: @ 82A5036 .string "Here are your SAFARI BALLS.$" -Route121_SafariZoneEntrance_Text_2A5052: @ 82A5052 +Route121_SafariZoneEntrance_Text_Received30SafariBalls: @ 82A5052 .string "{PLAYER} received 30 SAFARI BALLS.$" -Route121_SafariZoneEntrance_Text_2A506F: @ 82A506F +Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself: @ 82A506F .string "We'll let you know when your game\n" .string "is over.\p" .string "So, until then, enjoy yourself, please!\n" .string "Off you go on your wild excursion!$" -Route121_SafariZoneEntrance_Text_2A50E5: @ 82A50E5 +Route121_SafariZoneEntrance_Text_PCIsFull: @ 82A50E5 .string "Excuse me!\n" .string "Your PC BOX is full.$" -Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105 +Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105 .string "Excuse me!\n" .string "You seem to be without a {POKEBLOCK} CASE.\p" .string "Your SAFARI Game will be much more\n" @@ -166,129 +166,129 @@ Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105 .string "You may obtain a {POKEBLOCK} CASE from\n" .string "the LILYCOVE CONTEST HALL.$" -SafariZone_South_Text_2A51D4: @ 82A51D4 +SafariZone_South_Text_StillHaveTimeExit: @ 82A51D4 .string "You still have time left. Would you like\n" .string "to exit the SAFARI ZONE now?$" -SafariZone_South_Text_2A521A: @ 82A521A +SafariZone_South_Text_EnjoyTheRestOfYourAdventure: @ 82A521A .string "Please enjoy the rest of your wild\n" .string "adventure!$" -SafariZone_South_Text_2A5248: @ 82A5248 +SafariZone_South_Text_ExitEarlyThankYouForPlaying: @ 82A5248 .string "Okay.\p" .string "I'll take back your remaining SAFARI\n" .string "BALLS.\p" .string "Thank you for playing.\n" .string "We hope to see you again.$" -SafariZone_South_Text_2A52AB: @ 82A52AB +SafariZone_South_Text_GoodLuck: @ 82A52AB .string "Good luck!\p" .string "If you need anything, don't hesitate\n" .string "to tell me, please!$" -SafariZone_South_Text_2A52EF: @ 82A52EF +SafariZone_South_Text_Boy: @ 82A52EF .string "Did you know?\p" .string "If you put a {POKEBLOCK} in that square box,\n" .string "POKéMON gather around.$" -SafariZone_South_Text_2A533B: @ 82A533B +SafariZone_South_Text_Man: @ 82A533B .string "I want to keep going deeper, but I\n" .string "forgot to bring a BIKE.\p" .string "Something tells me that rare POKéMON\n" .string "live in the outlying areas.$" -SafariZone_Southwest_Text_2A53B7: @ 82A53B7 +SafariZone_Southwest_Text_Woman: @ 82A53B7 .string "Sometimes, when I toss a {POKEBLOCK} at \n" .string "POKéMON, it gets ignored.\p" .string "Do POKéMON have likes and dislikes\n" .string "about what they eat?$" -SafariZone_Northwest_Text_2A542C: @ 82A542C +SafariZone_Northwest_Text_Man: @ 82A542C .string "Gasp… Gasp…\n" .string "I…made it out here…but…\p" .string "I'm exhausted… I don't have the\n" .string "energy to catch POKéMON…$" -SafariZone_North_Text_2A5489: @ 82A5489 +SafariZone_North_Text_Fisherman: @ 82A5489 .string "I'm on a mission to find WATER POKéMON\n" .string "you don't see in HOENN.\p" .string "Do you have any idea where the lake is?$" -SafariZone_North_Text_2A54F0: @ 82A54F0 +SafariZone_North_Text_Man: @ 82A54F0 .string "I'm going to catch a lot of rare POKéMON\n" .string "here and trade them with my friends!$" -SafariZone_South_Text_2A553E: @ 82A553E +SafariZone_South_Text_Youngster: @ 82A553E .string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n" .string "But it seems to have disappeared.\p" .string "I guess POKéMON must have eaten it\n" .string "without me noticing.$" -Route121_SafariZoneEntrance_Text_2A55BB: @ 82A55BB +Route121_SafariZoneEntrance_Text_TrainerTip: @ 82A55BB .string "SAFARI ZONE TRAINER TIP!\p" .string "Throw {POKEBLOCK}S at wild POKéMON to make\n" .string "them less likely to flee.$" -SafariZone_Southwest_Text_2A5613: @ 82A5613 +SafariZone_Southwest_Text_RestHouseSign: @ 82A5613 .string "“Relieve your tired feet.”\n" .string "REST HOUSE$" -SafariZone_RestHouse_Text_2A5639: @ 82A5639 +SafariZone_RestHouse_Text_Youngster: @ 82A5639 .string "I don't have any {POKEBLOCK}S, but I caught\n" .string "a good number of POKéMON.\p" .string "You can improve your chances of making\n" .string "a catch by getting closer to them\l" .string "before throwing a SAFARI BALL.$" -SafariZone_RestHouse_Text_2A56E1: @ 82A56E1 +SafariZone_RestHouse_Text_PsychicM: @ 82A56E1 .string "If you use {POKEBLOCK}S, wild POKéMON won't\n" .string "be so quick to run away.\p" .string "It's not much use to give {POKEBLOCK}S to\n" .string "POKéMON that don't flee easily.$" -SafariZone_RestHouse_Text_2A5764: @ 82A5764 +SafariZone_RestHouse_Text_FatMan: @ 82A5764 .string "If you put a {POKEBLOCK} on the FEEDER,\n" .string "POKéMON are attracted to it.\p" .string "I think POKéMON with the same sort of\n" .string "nature are drawn by a certain {POKEBLOCK}.$" -SafariZone_South_Text_2A57EE: @ 82A57EE +SafariZone_South_Text_AreaOffLimits1: @ 82A57EE .string "This area is still under construction.\n" .string "It's off-limits, sorry!$" -SafariZone_Southeast_Text_2A582D: @ 82A582D +SafariZone_Southeast_Text_ExpansionIsFinished: @ 82A582D .string "The SAFARI ZONE's expansion project\n" .string "is finished now.\p" .string "We hope you will enjoy the new area.$" -SafariZone_South_Text_2A5887: @ 82A5887 +SafariZone_South_Text_AreaOffLimits2: @ 82A5887 .string "This area is still under construction.\n" .string "It's off-limits, sorry!$" -SafariZone_Southeast_Text_2A58C6: @ 82A58C6 +SafariZone_Southeast_Text_LittleGirl: @ 82A58C6 .string "Wow! Whee! I haven't seen any of\n" .string "these POKéMON before!$" -SafariZone_Southeast_Text_2A58FD: @ 82A58FD +SafariZone_Southeast_Text_FatMan: @ 82A58FD .string "The POKéMON in this area are all\n" .string "new to me.\p" .string "And I'm allowed to catch these rare\n" .string "POKéMON! Too cool!$" -SafariZone_Southeast_Text_2A5960: @ 82A5960 +SafariZone_Southeast_Text_RichBoy: @ 82A5960 .string "The POKéMON around here seem to be\n" .string "from somewhere other than HOENN.$" -SafariZone_Northeast_Text_2A59A4: @ 82A59A4 +SafariZone_Northeast_Text_Boy: @ 82A59A4 .string "I only have a couple SAFARI BALLS left.\p" .string "I'm having a hard time trying to\n" .string "decide what I should catch.$" -SafariZone_Northeast_Text_2A5A09: @ 82A5A09 +SafariZone_Northeast_Text_Woman: @ 82A5A09 .string "I heard that you can see PIKACHU here.\n" .string "Where might one be?$" -SafariZone_Northeast_Text_2A5A44: @ 82A5A44 +SafariZone_Northeast_Text_Girl: @ 82A5A44 .string "Oh, boo!\n" .string "I can't seem to catch anything!\p" .string "I'll end up wasting the admission\n" -- cgit v1.2.3 From 04ea8eea5ae477037f9848b365ca026e46509666 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 20 Oct 2019 12:27:23 -0500 Subject: Document rest of Petalburg scripts --- data/scripts/mystery_event_club.inc | 108 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index c8cb84107..1df0ed88c 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,110 +1,110 @@ -PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 +MysteryEventClub_EventScript_Man:: @ 8291539 lock faceplayer - goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_2915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291552 + goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5 + msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291552 end -PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 - msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT +MysteryEventClub_EventScript_291552:: @ 8291552 + msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F - case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB - case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591 - case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB + case 0, MysteryEventClub_EventScript_29159F + case 1, MysteryEventClub_EventScript_2915EB + case 2, MysteryEventClub_EventScript_291591 + case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB end -PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291552 +MysteryEventClub_EventScript_291591:: @ 8291591 + msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291552 end -PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F - msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT +MysteryEventClub_EventScript_29159F:: @ 829159F + msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_2915CB compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_2915D5 end -PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB - msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, MSGBOX_DEFAULT +MysteryEventClub_EventScript_2915CB:: @ 82915CB + msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_2915D5:: @ 82915D5 +MysteryEventClub_EventScript_2915D5:: @ 82915D5 setvar VAR_0x8004, 0 special sub_811EECC waitmessage delay 80 - msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, MSGBOX_DEFAULT + msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_2915EB:: @ 82915EB - msgbox PetalburgCity_PokemonCenter_1F_Text_291991, MSGBOX_DEFAULT +MysteryEventClub_EventScript_2915EB:: @ 82915EB + msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291603 +MysteryEventClub_EventScript_2915F5:: @ 82915F5 + msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291603 end -PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT +MysteryEventClub_EventScript_291603:: @ 8291603 + msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650 - case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C - case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642 - case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C + case 0, MysteryEventClub_EventScript_291650 + case 1, MysteryEventClub_EventScript_29167C + case 2, MysteryEventClub_EventScript_291642 + case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C end -PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291603 +MysteryEventClub_EventScript_291642:: @ 8291642 + msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291603 end -PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT +MysteryEventClub_EventScript_291650:: @ 8291650 + msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_2915CB compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_2915D5 end -PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C - msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, MSGBOX_DEFAULT +MysteryEventClub_EventScript_29167C:: @ 829167C + msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_291686:: @ 8291686 +MysteryEventClub_EventScript_291686:: @ 8291686 return -PetalburgCity_PokemonCenter_1F_Text_291687: @ 8291687 +MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687 .string "Hello there, TRAINER!\n" .string "You've got a wonderful smile, there.\p" .string "I have a hobby--collecting the profiles\n" .string "of POKéMON TRAINERS.$" -PetalburgCity_PokemonCenter_1F_Text_2916FF: @ 82916FF +MysteryEventClub_Text_2916FF: @ 82916FF .string "So, how about it?\n" .string "May I see your profile?$" -PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729 +MysteryEventClub_Text_EasyChatExplanation: @ 8291729 .string "You make your own profile by putting\n" .string "together four words or phrases.\p" .string "Here, I'll show you an example of a\n" @@ -123,37 +123,37 @@ PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729 .string "Repeat for the remaining text choices,\n" .string "and you'll have your very own profile.$" -PetalburgCity_PokemonCenter_1F_Text_291969: @ 8291969 +MysteryEventClub_Text_291969: @ 8291969 .string "Yes! Thank you!\n" .string "So, let's see it, then.$" -PetalburgCity_PokemonCenter_1F_Text_291991: @ 8291991 +MysteryEventClub_Text_291991: @ 8291991 .string "Oh, no, really?\p" .string "I imagine someone like you would have\n" .string "a wonderful profile…$" -PetalburgCity_PokemonCenter_1F_Text_2919DC: @ 82919DC +MysteryEventClub_Text_2919DC: @ 82919DC .string "Oh? You're not into it right now?\p" .string "Well, anytime is good by me!$" -PetalburgCity_PokemonCenter_1F_Text_291A1B: @ 8291A1B +MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B .string "Hello there, TRAINER!\n" .string "You've got a wonderful smile.$" -PetalburgCity_PokemonCenter_1F_Text_291A4F: @ 8291A4F +MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F .string "May I see your new profile?$" -PetalburgCity_PokemonCenter_1F_Text_291A6B: @ 8291A6B +MysteryEventClub_Text_291A6B: @ 8291A6B .string "Yes! Thank you!\p" .string "I hope it's even better than the profile\n" .string "you showed me before.$" -PetalburgCity_PokemonCenter_1F_Text_291ABA: @ 8291ABA +MysteryEventClub_Text_291ABA: @ 8291ABA .string "Oh, you like your profile the way it is.\p" .string "I don't blame you--it's a wonderful\n" .string "profile the way it is now.$" -PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22 +MysteryEventClub_Text_291B22: @ 8291B22 .string "F-fantastic!\p" .string "Your profile, it's wonderful!\n" .string "It really says what you're about.\p" @@ -161,7 +161,7 @@ PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22 .string "be captivated by you!\p" .string "Thank you!$" -PetalburgCity_PokemonCenter_1F_Text_291BB7: @ 8291BB7 +MysteryEventClub_Text_291BB7: @ 8291BB7 .string "Oh?\n" .string "You know the secret saying!\p" .string "That means you're now a fellow member\n" -- cgit v1.2.3 From 973e6f9667ece0c6ceb3d7718ddc65eac9ef1a65 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 20 Oct 2019 16:11:07 -0400 Subject: Document mauville_man.inc --- data/scripts/mauville_man.inc | 582 +++++++++++++++++++++--------------------- 1 file changed, 294 insertions(+), 288 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 0ab47ea80..deeec7721 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -1,273 +1,277 @@ -MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066 +MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan:: @ 828E066 special ScrSpecial_GetCurrentMauvilleMan switch VAR_RESULT - case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6 - case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167 - case 2, MauvilleCity_PokemonCenter_1F_EventScript_28E4D4 - case 3, MauvilleCity_PokemonCenter_1F_EventScript_29014A - case 4, MauvilleCity_PokemonCenter_1F_EventScript_2902F6 + case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard + case MAUVILLE_MAN_HIPSTER, MauvilleCity_PokemonCenter_1F_EventScript_Hipster + case MAUVILLE_MAN_TRADER, MauvilleCity_PokemonCenter_1F_EventScript_Trader + case MAUVILLE_MAN_STORYTELLER, MauvilleCity_PokemonCenter_1F_EventScript_Storyteller + case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_Giddy end -MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 +@ Bard +MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO + msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong end -MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 +MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: @ 828E0C7 setvar VAR_0x8004, 0 special ScrSpecial_PlayBardSong delay 60 special ScrSpecial_HasBardSongBeenChanged - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics + msgbox MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA - msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong:: @ 828E0EA + msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO +MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4 + msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics end -MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 +MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113 setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics + msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special ScrSpecial_PlayBardSong delay 60 - msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO + msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics special ScrSpecial_SaveBardSongLyrics - msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT + msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E15D:: @ 828E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics:: @ 828E15D + msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 +@ Hipster +MauvilleCity_PokemonCenter_1F_EventScript_Hipster:: @ 828E167 lock faceplayer setflag FLAG_SYS_HIPSTER_MEET - msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT + msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C - msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord + msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C +MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord:: @ 828E18C special ScrSpecial_HipsterTeachWord - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord + msgbox MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290666, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_TeachWord:: @ 828E1A4 + msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT special ScrSpecial_SetHipsterSpokenFlag release end -MauvilleCity_PokemonCenter_1F_Text_28E1B1: @ 828E1B1 +@ Trader +MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor: @ 828E1B1 .string "Hi, I'm the TRADER.\n" .string "Want to trade decorations with me?$" -MauvilleCity_PokemonCenter_1F_Text_28E1E8: @ 828E1E8 +MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues: @ 828E1E8 .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_28E20E: @ 828E20E +MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded: @ 828E20E .string "But we've traded decorations already,\n" .string "you and I.$" -MauvilleCity_PokemonCenter_1F_Text_28E23F: @ 828E23F +MauvilleCity_PokemonCenter_1F_Text_PickADecorItem: @ 828E23F .string "If you see any decorative item that\n" .string "you want of mine, speak up.$" -MauvilleCity_PokemonCenter_1F_Text_28E27F: @ 828E27F +MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything: @ 828E27F .string "You don't want anything?\n" .string "I feel unwanted…$" -MauvilleCity_PokemonCenter_1F_Text_28E2A9: @ 828E2A9 +MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt: @ 828E2A9 .string "That decorative item once belonged\n" .string "to {STR_VAR_1}.\p" .string "Do you want it?$" -MauvilleCity_PokemonCenter_1F_Text_28E2E3: @ 828E2E3 +MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor: @ 828E2E3 .string "Uh… Wait a second. You don't have a\n" .string "single piece of decoration!$" -MauvilleCity_PokemonCenter_1F_Text_28E323: @ 828E323 +MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade: @ 828E323 .string "Okay, pick the decoration that you'll\n" .string "trade to me.$" -MauvilleCity_PokemonCenter_1F_Text_28E356: @ 828E356 +MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade: @ 828E356 .string "You won't trade with me?\n" .string "I feel unwanted…$" -MauvilleCity_PokemonCenter_1F_Text_28E380: @ 828E380 +MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis: @ 828E380 .string "You've got all the {STR_VAR_2}S that can\n" .string "be stored. You've no room for this.$" -MauvilleCity_PokemonCenter_1F_Text_28E3C4: @ 828E3C4 +MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor: @ 828E3C4 .string "Okay, so we'll trade my {STR_VAR_3}\n" .string "for your {STR_VAR_2}?$" -MauvilleCity_PokemonCenter_1F_Text_28E3EC: @ 828E3EC +MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse: @ 828E3EC .string "That piece of decoration is in use.\n" .string "You can't trade it.$" -MauvilleCity_PokemonCenter_1F_Text_28E424: @ 828E424 +MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC: @ 828E424 .string "Then we'll trade!\n" .string "I'll send my decoration to your PC.$" -MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A +MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne: @ 828E45A .string "Oops! Sorry! That's a really rare\n" .string "piece of decoration.\l" .string "I can't trade that one away!\p" .string "Can I interest you in something else?$" -MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 +MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO + msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade special ScrSpecial_GetTraderTradedFlag - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D - message MauvilleCity_PokemonCenter_1F_Text_28E23F + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded + message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem waitmessage - goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive end -MauvilleCity_PokemonCenter_1F_EventScript_28E503:: @ 828E503 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade:: @ 828E503 + msgbox MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D - msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded:: @ 828E50D + msgbox MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 +MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517 special ScrSpecial_TraderMenuGetDecoration waitstate compare VAR_0x8004, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 - compare VAR_0x8004, 65535 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor + compare VAR_0x8004, 0xFFFF + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor + msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor special ScrSpecial_DoesPlayerHaveNoDecorations - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A - goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive end -MauvilleCity_PokemonCenter_1F_EventScript_28E558:: @ 828E558 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor:: @ 828E558 + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E562:: @ 828E562 - message MauvilleCity_PokemonCenter_1F_Text_28E45A +MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor:: @ 828E562 + message MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne waitmessage - goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive end -MauvilleCity_PokemonCenter_1F_EventScript_28E56E:: @ 828E56E - message MauvilleCity_PokemonCenter_1F_Text_28E23F +MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor:: @ 828E56E + message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem waitmessage - goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive end -MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor:: @ 828E57A + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584 + msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 - compare VAR_0x8006, 65535 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor + compare VAR_0x8006, 0xFFFF + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse special ScrSpecial_IsDecorationFull - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor + msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive special ScrSpecial_TraderDoDecorationTrade - msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT + msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E5D4:: @ 828E5D4 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor:: @ 828E5D4 + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E5DE:: @ 828E5DE - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, MSGBOX_DEFAULT - goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 +MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse:: @ 828E5DE + msgbox MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse, MSGBOX_DEFAULT + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive end -MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor:: @ 828E5EC + msgbox MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_Text_28E5F6: @ 828E5F6 +@ Storyteller +MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale: @ 828E5F6 .string "I'm the STORYTELLER.\n" .string "I'll tell you tales of legendary\l" .string "TRAINERS.\p" .string "Will you hear my tale?$" -MauvilleCity_PokemonCenter_1F_Text_28E64D: @ 828E64D +MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues: @ 828E64D .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_28E673: @ 828E673 +MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell: @ 828E673 .string "I know of these legends.\n" .string "Which tale will you have me tell?$" -MauvilleCity_PokemonCenter_1F_Text_28E6AE: @ 828E6AE +MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales: @ 828E6AE .string "But, I know of no legendary TRAINERS.\n" .string "Hence, I know no tales.\p" .string "Where does one find a TRAINER worthy\n" .string "of a legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726 +MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes: @ 828E726 .string "What's that?!\n" .string "You… You…\p" .string "{STR_VAR_2}\n" @@ -275,12 +279,12 @@ MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726 .string "That is indeed magnificent!\n" .string "It's the birth of a new legend!$" -MauvilleCity_PokemonCenter_1F_Text_28E78A: @ 828E78A +MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends: @ 828E78A .string "It gets me thinking, could there be\n" .string "other TRAINERS with more impressive\l" .string "legends awaiting discovery?$" -MauvilleCity_PokemonCenter_1F_Text_28E7EE: @ 828E7EE +MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE .string "Are you a TRAINER?\p" .string "Then tell me, have you any tales that\n" .string "are even remotely legendary?$" @@ -289,24 +293,24 @@ MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844 .string "Incidentally… Would you care to hear\n" .string "another legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_28E881: @ 828E881 +MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend: @ 828E881 .string "Hmm…\n" .string "I'm not satisfied…\p" .string "I wish you would bring me news worthy\n" .string "of being called a legend.$" -MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 +MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested: @ 828E8D9 .string "I wish more people would be interested\n" .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" -MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930 +MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle:: @ 828E930 .string "The Save-Happy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947 +MauvilleCity_PokemonCenter_1F_Text_SavedGameAction:: @ 828E947 .string "Saved the game$" -MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956 +MauvilleCity_PokemonCenter_1F_Text_SavedGameStory:: @ 828E956 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER saved the game\n" @@ -314,13 +318,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956 .string "A more cautious TRAINER than\n" .string "{STR_VAR_3} one will never find!$" -MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7 +MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle:: @ 828E9D7 .string "The Trendsetter TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF +MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction:: @ 828E9EF .string "Started trends$" -MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE +MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory:: @ 828E9FE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER started new trends\n" @@ -328,13 +332,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE .string "{STR_VAR_3} is setting trends for all\n" .string "the HOENN region!$" -MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D +MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle:: @ 828EA7D .string "The BERRY-Planting TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98 +MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction:: @ 828EA98 .string "Planted BERRIES$" -MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8 +MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory:: @ 828EAA8 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER planted BERRIES\n" @@ -342,13 +346,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8 .string "{STR_VAR_3} is a legendary lover of\n" .string "BERRIES!$" -MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19 +MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle:: @ 828EB19 .string "The BIKE-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31 +MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction:: @ 828EB31 .string "Traded BIKES$" -MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E +MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory:: @ 828EB3E .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER swapped BIKES\n" @@ -356,13 +360,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E .string "{STR_VAR_3} must love BIKES deeply\n" .string "and passionately!$" -MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5 +MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle:: @ 828EBB5 .string "The Interviewed TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD +MauvilleCity_PokemonCenter_1F_Text_InterviewsAction:: @ 828EBCD .string "Got interviewed$" -MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD +MauvilleCity_PokemonCenter_1F_Text_InterviewsStory:: @ 828EBDD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got interviewed\n" @@ -370,26 +374,26 @@ MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD .string "{STR_VAR_3} must be a TRAINER who's\n" .string "attracting much attention!$" -MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60 +MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle:: @ 828EC60 .string "The Battle-Happy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79 +MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction:: @ 828EC79 .string "Battled$" -MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81 +MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory:: @ 828EC81 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER battled {STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a TRAINER who can\n" .string "never refuse a chance to battle!$" -MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04 +MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle:: @ 828ED04 .string "The POKéMON-Catching TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21 +MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction:: @ 828ED21 .string "Caught POKéMON$" -MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30 +MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory:: @ 828ED30 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -397,13 +401,13 @@ MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30 .string "{STR_VAR_3} is a legendary catcher of\n" .string "wild POKéMON!$" -MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1 +MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle:: @ 828EDA1 .string "The Fishing TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5 +MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction:: @ 828EDB5 .string "Caught POKéMON with a ROD$" -MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF +MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory:: @ 828EDCF .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -411,13 +415,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF .string "{STR_VAR_3} is a legendary fishing\n" .string "expert!$" -MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45 +MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle:: @ 828EE45 .string "The EGG-Warming TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D +MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction:: @ 828EE5D .string "Hatched EGGS$" -MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A +MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory:: @ 828EE6A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER hatched {STR_VAR_1} POKéMON\n" @@ -425,13 +429,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A .string "{STR_VAR_3} is a legendary warmer\n" .string "of EGGS!$" -MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD +MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle:: @ 828EEDD .string "The Evolver TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1 +MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction:: @ 828EEF1 .string "Evolved POKéMON$" -MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01 +MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory:: @ 828EF01 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {STR_VAR_1} POKéMON\n" @@ -439,13 +443,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01 .string "{STR_VAR_3} is the ultimate evolver\n" .string "of POKéMON!$" -MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73 +MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle:: @ 828EF73 .string "The POKéMON CENTER-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95 +MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction:: @ 828EF95 .string "Used POKéMON CENTERS$" -MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA +MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory:: @ 828EFAA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -453,13 +457,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA .string "There could be no greater lover of\n" .string "POKéMON CENTERS than {STR_VAR_3}!$" -MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045 +MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle:: @ 828F045 .string "The Homebody TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A +MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction:: @ 828F05A .string "Rested POKéMON at home$" -MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071 +MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory:: @ 828F071 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -467,13 +471,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071 .string "There could be no more of a homebody\n" .string "than {STR_VAR_3}!$" -MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3 +MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle:: @ 828F0F3 .string "The SAFARI-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D +MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction:: @ 828F10D .string "Entered the SAFARI ZONE$" -MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125 +MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory:: @ 828F125 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER went into the SAFARI ZONE\n" @@ -481,13 +485,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125 .string "{STR_VAR_3} is a TRAINER whose wild side\n" .string "must come out in the SAFARI ZONE!$" -MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE +MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle:: @ 828F1BE .string "The CUT-Frenzy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5 +MauvilleCity_PokemonCenter_1F_Text_UsedCutAction:: @ 828F1D5 .string "Used CUT$" -MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE +MauvilleCity_PokemonCenter_1F_Text_UsedCutStory:: @ 828F1DE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used CUT\n" @@ -495,13 +499,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE .string "{STR_VAR_3} is a TRAINER who just must\n" .string "love to CUT!$" -MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F +MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle:: @ 828F24F .string "The ROCK-SMASHING TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269 +MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction:: @ 828F269 .string "Smashed rocks$" -MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277 +MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory:: @ 828F277 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used ROCK SMASH\n" @@ -509,13 +513,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277 .string "{STR_VAR_3} must be a TRAINER who\n" .string "can't leave a stone unsmashed!$" -MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC +MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle:: @ 828F2FC .string "The Move-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314 +MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction:: @ 828F314 .string "Moved the SECRET BASE$" -MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A +MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory:: @ 828F32A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER moved the SECRET BASE\n" @@ -523,13 +527,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A .string "{STR_VAR_3} is a TRAINER who loves\n" .string "to move houses often!$" -MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD +MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle:: @ 828F3AD .string "The SPLASH-Happy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6 +MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction:: @ 828F3C6 .string "Used SPLASH$" -MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2 +MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory:: @ 828F3D2 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used SPLASH\n" @@ -537,13 +541,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2 .string "{STR_VAR_3} is a TRAINER who must love\n" .string "SPLASHING around!$" -MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B +MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle:: @ 828F44B .string "The Tenacious TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461 +MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction:: @ 828F461 .string "Resorted to using STRUGGLE$" -MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C +MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory:: @ 828F47C .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER had to rely on STRUGGLE\n" @@ -551,13 +555,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C .string "{STR_VAR_3} is a tenacious TRAINER\n" .string "who never gives in to adversity!$" -MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C +MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle:: @ 828F50C .string "The SLOT Champ$" -MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B +MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction:: @ 828F51B .string "Won the jackpot on the SLOTS$" -MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538 +MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory:: @ 828F538 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won the jackpot on\n" @@ -565,13 +569,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538 .string "{STR_VAR_3} is a TRAINER who was lucky\n" .string "on the SLOTS!$" -MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE +MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle:: @ 828F5BE .string "The ROULETTE Champ$" -MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1 +MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction:: @ 828F5D1 .string "Had consecutive ROULETTE wins of$" -MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2 +MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory:: @ 828F5F2 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won in ROULETTE\n" @@ -579,13 +583,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2 .string "{STR_VAR_3} was lucky when the ball\n" .string "bounced in ROULETTE!$" -MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678 +MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle:: @ 828F678 .string "The BATTLE TOWER Challenger$" -MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694 +MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction:: @ 828F694 .string "Took the BATTLE TOWER challenge$" -MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4 +MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory:: @ 828F6B4 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER took the BATTLE TOWER\n" @@ -593,13 +597,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4 .string "{STR_VAR_3} is a TRAINER who aspires\n" .string "for excellence in the BATTLE TOWER!$" -MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751 +MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle:: @ 828F751 .string "The Blend-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A +MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction:: @ 828F76A .string "Made {POKEBLOCK}S$" -MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776 +MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory:: @ 828F776 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {POKEBLOCK}S\n" @@ -607,13 +611,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776 .string "There is none better at using a BERRY\n" .string "BLENDER than {STR_VAR_3}!$" -MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6 +MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle:: @ 828F7F6 .string "The CONTEST-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811 +MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction:: @ 828F811 .string "Entered CONTESTS$" -MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822 +MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory:: @ 828F822 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER entered CONTESTS\n" @@ -621,13 +625,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822 .string "{STR_VAR_3} must love showing off\n" .string "POKéMON to others!$" -MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C +MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle:: @ 828F89C .string "The CONTEST Master$" -MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF +MauvilleCity_PokemonCenter_1F_Text_WonContestsAction:: @ 828F8AF .string "Won CONTESTS$" -MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC +MauvilleCity_PokemonCenter_1F_Text_WonContestsStory:: @ 828F8BC .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won CONTESTS\n" @@ -635,13 +639,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC .string "{STR_VAR_3} must be an incredible\n" .string "CONTEST master!$" -MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F +MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle:: @ 828F92F .string "The Happy Shopper$" -MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941 +MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction:: @ 828F941 .string "Shopped$" -MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949 +MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory:: @ 828F949 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bought items in shops\n" @@ -649,13 +653,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949 .string "{STR_VAR_3} must be one of those\n" .string "people who are born to shop.$" -MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1 +MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle:: @ 828F9D1 .string "The Item-Finding TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA +MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction:: @ 828F9EA .string "Used an ITEMFINDER$" -MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD +MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory:: @ 828F9FD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used an ITEMFINDER\n" @@ -663,13 +667,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD .string "{STR_VAR_3} must enjoy scouring the\n" .string "ground for hidden items!$" -MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81 +MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle:: @ 828FA81 .string "The Rain-Soaked TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99 +MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction:: @ 828FA99 .string "Got rained on$" -MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7 +MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory:: @ 828FAA7 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got soaked by rain\n" @@ -677,13 +681,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7 .string "{STR_VAR_3}'s charisma must even\n" .string "attract rain!$" -MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D +MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle:: @ 828FB1D .string "The Avid POKéDEX Reader$" -MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35 +MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction:: @ 828FB35 .string "Checked a POKéDEX$" -MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47 +MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory:: @ 828FB47 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked a POKéDEX\n" @@ -691,13 +695,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47 .string "{STR_VAR_3} must love inspecting\n" .string "POKéMON in a POKéDEX!$" -MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4 +MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle:: @ 828FBC4 .string "The RIBBON Collector$" -MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9 +MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction:: @ 828FBD9 .string "Received RIBBONS$" -MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA +MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory:: @ 828FBEA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER received RIBBONS\n" @@ -705,13 +709,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA .string "{STR_VAR_3} must be a TRAINER who\n" .string "loves to collect RIBBONS!$" -MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B +MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle:: @ 828FC6B .string "The Ledge-Jumping TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85 +MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction:: @ 828FC85 .string "Jumped down ledges$" -MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98 +MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory:: @ 828FC98 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER jumped down ledges\n" @@ -719,26 +723,26 @@ MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98 .string "If there's a ledge to be jumped,\n" .string "{STR_VAR_3} can't ignore it!$" -MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D +MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle:: @ 828FD1D .string "The Legendary TV Viewer$" -MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35 +MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction:: @ 828FD35 .string "Watched TV$" -MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40 +MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory:: @ 828FD40 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER watched TV\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must love watching TV!$" -MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2 +MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle:: @ 828FDA2 .string "The Time-Conscious TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD +MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction:: @ 828FDBD .string "Checked the time$" -MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE +MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory:: @ 828FDCE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked the time\n" @@ -746,13 +750,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE .string "{STR_VAR_3} must be a punctual TRAINER\n" .string "who's conscious of the time.$" -MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57 +MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle:: @ 828FE57 .string "The POKéMON LOTTERY Wizard$" -MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72 +MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction:: @ 828FE72 .string "Won POKéMON LOTTERIES$" -MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88 +MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory:: @ 828FE88 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won POKéMON LOTTERIES\n" @@ -760,13 +764,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88 .string "{STR_VAR_3} must have many friends\n" .string "to trade POKéMON with!$" -MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C +MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle:: @ 828FF0C .string "The DAY CARE-Using Trainer$" -MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27 +MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction:: @ 828FF27 .string "Left POKéMON at the DAY CARE$" -MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44 +MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory:: @ 828FF44 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER left POKéMON with the\n" @@ -774,13 +778,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44 .string "{STR_VAR_3} must be a real go-getter\n" .string "who raises POKéMON aggressively!$" -MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD +MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle:: @ 828FFDD .string "The CABLE CAR-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA +MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction:: @ 828FFFA .string "Rode the CABLE CAR$" -MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D +MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory:: @ 829000D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER rode the CABLE CAR\n" @@ -788,13 +792,13 @@ MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D .string "{STR_VAR_3} must be a busy TRAINER\n" .string "who's up and down all the time!$" -MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097 +MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle:: @ 8290097 .string "The Hot Spring-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5 +MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction:: @ 82900B5 .string "Bathed in hot springs$" -MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB +MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory:: @ 82900CB .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bathed in hot springs\n" @@ -803,160 +807,162 @@ MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB .string "baby-smooth skin!$" -MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A +MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A lock faceplayer setvar VAR_0x8008, 0 setvar VAR_0x8009, 0 setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO + msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA - message MauvilleCity_PokemonCenter_1F_Text_28E673 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales + message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell waitmessage special ScrSpecial_StorytellerStoryListMenu waitstate compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection setvar VAR_0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD - goto MauvilleCity_PokemonCenter_1F_EventScript_29020F + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales + goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale -MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 - goto MauvilleCity_PokemonCenter_1F_EventScript_290219 +MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection:: @ 82901B7 + goto MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller end -MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD - msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales:: @ 82901BD + msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D - goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 - -MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA - msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, MSGBOX_DEFAULT - -MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd + goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales + +MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales:: @ 82901DA + msgbox MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2 + msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale + msgbox MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_29020F:: @ 829020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale:: @ 829020F + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_290219:: @ 8290219 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller:: @ 8290219 + msgbox MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_290223:: @ 8290223 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, MSGBOX_DEFAULT +@ Unused +MauvilleCity_PokemonCenter_1F_EventScript_WaitingForRecordMix:: @ 8290223 + msgbox MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_29022D:: @ 829022D +MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd:: @ 829022D release end -MauvilleCity_PokemonCenter_1F_Text_29022F: @ 829022F +@ Giddy +MauvilleCity_PokemonCenter_1F_Text_HearMyStory: @ 829022F .string "I'm GIDDY!\n" .string "I have a scintillating story for you!\p" .string "Would you like to hear my story?$" -MauvilleCity_PokemonCenter_1F_Text_290281: @ 8290281 +MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues: @ 8290281 .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_2902A7: @ 82902A7 +MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking: @ 82902A7 .string "Also, I was thinking…$" -MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD +MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain: @ 82902BD .string "That's about it, I think…\p" .string "We should chat again!\n" .string "Bye-bye!$" -MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 +MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO + msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy end -MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 +MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale:: @ 8290317 special ScrSpecial_GiddyShouldTellAnotherTale - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales end -MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 +MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale:: @ 8290331 special ScrSpecial_GiddyShouldTellAnotherTale - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales end -MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B - msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, MSGBOX_DEFAULT - goto MauvilleCity_PokemonCenter_1F_EventScript_290359 +MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale:: @ 829034B + msgbox MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking, MSGBOX_DEFAULT + goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale end -MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 +@ Regardless of whether yes or no is selected below, Giddy will continue to tell stories until he's told 10 +MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale:: @ 8290359 special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale end -MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A - msgbox MauvilleCity_PokemonCenter_1F_Text_290281, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy:: @ 829037A + msgbox MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384 - msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales:: @ 8290384 + msgbox MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_Text_29038E: @ 829038E +MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong: @ 829038E .string "Hi, I'm the BARD.\n" .string "Would you like to hear my song?$" -MauvilleCity_PokemonCenter_1F_Text_2903C0: @ 82903C0 +MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1: @ 82903C0 .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_2903E6: @ 82903E6 +MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers: @ 82903E6 .string "Oh, what a moving song…\n" .string "I wish I could play it for others…$" -MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421 +MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics: @ 8290421 .string "So?\n" .string "How do you like my song?\p" .string "But I'm none too happy about\n" @@ -964,38 +970,38 @@ MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421 .string "How would you like to write some\n" .string "new lyrics for me?$" -MauvilleCity_PokemonCenter_1F_Text_29049B: @ 829049B +MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2: @ 829049B .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_2904C1: @ 82904C1 +MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou: @ 82904C1 .string "Thank you kindly!\n" .string "Let me sing it for you.$" -MauvilleCity_PokemonCenter_1F_Text_2904EB: @ 82904EB +MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo: @ 82904EB .string "Was that how you wanted your song\n" .string "to go?$" -MauvilleCity_PokemonCenter_1F_Text_290514: @ 8290514 +MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile: @ 8290514 .string "Okay! That's it, then.\n" .string "I'll sing this song for a while.$" -MauvilleCity_PokemonCenter_1F_Text_29054C: @ 829054C +MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening: @ 829054C .string "Hey, yo! They call me the HIPSTER.\n" .string "I'll teach you what's hip and happening.$" -MauvilleCity_PokemonCenter_1F_Text_290598: @ 8290598 +MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou: @ 8290598 .string "But, hey, I taught you what's hip and\n" .string "happening already.\p" .string "I'd like to spread the good word to\n" .string "other folks.$" -MauvilleCity_PokemonCenter_1F_Text_290602: @ 8290602 +MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach: @ 8290602 .string "But, hey, you already know a lot about\n" .string "what's hip and happening.\p" .string "I've got nothing new to teach you!$" -MauvilleCity_PokemonCenter_1F_Text_290666: @ 8290666 +MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase: @ 8290666 .string "Hey, have you heard about\n" .string "“{STR_VAR_1}”?\p" .string "What's it mean? Well…\n" -- cgit v1.2.3 From c70162086bdbc952716521fdfc05d50b7ee3b4a3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 21 Oct 2019 06:46:57 -0400 Subject: Split some smaller files from event_scripts --- data/scripts/flash.inc | 4 + data/scripts/obtain_item.inc | 208 ++++++++++++++++++++++++++++++++++++++ data/scripts/pc_transfer.inc | 55 ++++++++++ data/scripts/record_mix.inc | 22 ++++ data/scripts/repel.inc | 6 ++ data/scripts/rival_graphics.inc | 48 +++++++++ data/scripts/set_gym_trainers.inc | 92 +++++++++++++++++ data/scripts/surf.inc | 18 ++++ data/scripts/test_signpost.inc | 7 ++ data/scripts/trainer_battle.inc | 4 + data/scripts/trainer_script.inc | 23 +++++ 11 files changed, 487 insertions(+) create mode 100644 data/scripts/flash.inc create mode 100644 data/scripts/obtain_item.inc create mode 100644 data/scripts/pc_transfer.inc create mode 100644 data/scripts/record_mix.inc create mode 100644 data/scripts/repel.inc create mode 100644 data/scripts/rival_graphics.inc create mode 100644 data/scripts/set_gym_trainers.inc create mode 100644 data/scripts/surf.inc create mode 100644 data/scripts/test_signpost.inc create mode 100644 data/scripts/trainer_script.inc (limited to 'data/scripts') diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc new file mode 100644 index 000000000..e0630db56 --- /dev/null +++ b/data/scripts/flash.inc @@ -0,0 +1,4 @@ +EventScript_2926F8:: @ 82926F8 + animateflash 1 + setflashradius 1 + end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc new file mode 100644 index 000000000..00bf4523e --- /dev/null +++ b/data/scripts/obtain_item.inc @@ -0,0 +1,208 @@ +Std_ObtainItem:: @ 8271AD3 + giveitem VAR_0x8000, VAR_0x8001 + copyvar VAR_0x8007, VAR_RESULT + call EventScript_271AE3 + return + +EventScript_271AE3:: @ 8271AE3 + bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 + checkitemtype VAR_0x8000 + call EventScript_BufferStdString + compare VAR_0x8007, 1 + call_if_eq EventScript_271B95 + compare VAR_0x8007, 0 + call_if_eq EventScript_271BA9 + return + +EventScript_BufferStdString:: @ 8271B08 + switch VAR_RESULT + case POCKET_ITEMS, EventScript_StdStringItem + case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems + case POCKET_POKE_BALLS, EventScript_StdStringPokeballs + case POCKET_TM_HM, EventScript_StdStringTMHMS + case POCKET_BERRIES, EventScript_StdStringBerries + end + +EventScript_StdStringItem:: @ 8271B45 + bufferstdstring 2, STDSTRING_ITEMS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_StdStringKeyItems:: @ 8271B55 + bufferstdstring 2, STDSTRING_KEYITEMS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_StdStringPokeballs:: @ 8271B65 + bufferstdstring 2, STDSTRING_POKEBALLS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_StdStringTMHMS:: @ 8271B75 + bufferstdstring 2, STDSTRING_TMHMS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedTMHM + return + +EventScript_StdStringBerries:: @ 8271B85 + bufferstdstring 2, STDSTRING_BERRIES + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_271B95:: @ 8271B95 + message gText_ObtainedTheItem + waitfanfare + msgbox gText_PutItemInPocket, MSGBOX_DEFAULT + setvar VAR_RESULT, 1 + return + +EventScript_271BA9:: @ 8271BA9 + setvar VAR_RESULT, 0 + return + +EventScript_PlayFanfareObtainedItem:: @ 8271BAF + playfanfare MUS_FANFA4 + return + +EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 + playfanfare MUS_ME_WAZA + return + +Std_ObtainDecoration:: @ 8271BB7 + givedecoration VAR_0x8000 + copyvar VAR_0x8007, VAR_RESULT + call EventScript_271BC5 + return + +EventScript_271BC5:: @ 8271BC5 + bufferdecorationname 1, VAR_0x8000 + compare VAR_0x8007, 1 + call_if_eq EventScript_271BE0 + compare VAR_0x8007, 0 + call_if_eq EventScript_271BF7 + return + +EventScript_271BE0:: @ 8271BE0 + playfanfare MUS_FANFA4 + message gText_ObtainedTheDecor + waitfanfare + msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT + setvar VAR_RESULT, 1 + return + +EventScript_271BF7:: @ 8271BF7 + setvar VAR_RESULT, 0 + return + +Std_FindItem:: @ 8271BFD + lock + faceplayer + waitse + copyvar VAR_0x8004, VAR_0x8000 + copyvar VAR_0x8005, VAR_0x8001 + checkitemspace VAR_0x8000, VAR_0x8001 + copyvar VAR_0x8007, VAR_RESULT + bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 + checkitemtype VAR_0x8000 + call EventScript_BufferStdString + compare VAR_0x8007, 1 + call_if_eq EventScript_PickItemUp + compare VAR_0x8007, 0 + call_if_eq EventScript_271CA1 + release + return + +EventScript_PickItemUp:: @ 8271C3A + removeobject VAR_LAST_TALKED + giveitem VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, BufferTMHMMoveName + copyvar VAR_0x8008, VAR_RESULT + compare VAR_0x8008, 1 + call_if_eq EventScript_271C8F + compare VAR_0x8008, 0 + call_if_eq EventScript_271C9B + waitfanfare + waitmessage + bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN + special CallBattlePyramidFunction + compare VAR_RESULT, 1 + goto_if_eq EventScript_271C86 + msgbox gText_PutItemInPocket, MSGBOX_DEFAULT + return + +EventScript_271C86:: @ 8271C86 + msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT + return + +EventScript_271C8F:: @ 8271C8F + bufferitemnameplural 0, VAR_0x8004, VAR_0x8005 + message gText_PlayerFoundOneItemTwoLines + return + +EventScript_271C9B:: @ 8271C9B + message gText_PlayerFoundOneItem + return + +EventScript_271CA1:: @ 8271CA1 + msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT + setvar VAR_RESULT, 0 + return + +EventScript_HiddenItemScript:: @ 8271CB7 + lockall + waitse + giveitem VAR_0x8005, 1 + copyvar VAR_0x8007, VAR_RESULT + bufferitemnameplural 1, VAR_0x8005, 1 + checkitemtype VAR_0x8005 + call EventScript_BufferStdString + compare VAR_0x8007, 1 + goto_if_eq EventScript_271CE8 + compare VAR_0x8007, 0 + goto_if_eq EventScript_271D47 + end + +EventScript_271CE8:: @ 8271CE8 + copyvar VAR_0x8008, VAR_0x8004 + copyvar VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, BufferTMHMMoveName + compare VAR_RESULT, 1 + goto_if_eq EventScript_271D0E + compare VAR_RESULT, 0 + goto_if_eq EventScript_271D1F + end + +EventScript_271D0E:: @ 8271D0E + bufferitemnameplural 0, VAR_0x8004, 1 + message gText_PlayerFoundOneItemTwoLines + goto EventScript_271D2A + end + +EventScript_271D1F:: @ 8271D1F + message gText_PlayerFoundOneItem + goto EventScript_271D2A + end + +EventScript_271D2A:: @ 8271D2A + waitmessage + waitfanfare + bufferitemnameplural 1, VAR_0x8004, 1 + copyvar VAR_0x8004, VAR_0x8008 + msgbox gText_PutItemInPocket, MSGBOX_DEFAULT + special sub_80EDCE8 + special SetFlagInVar + releaseall + end + +EventScript_271D47:: @ 8271D47 + msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT + setvar VAR_RESULT, 0 + releaseall + end diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc new file mode 100644 index 000000000..6a72eae75 --- /dev/null +++ b/data/scripts/pc_transfer.inc @@ -0,0 +1,55 @@ +@ VAR_0x8004 here is used by ChangePokemonNickname +Common_EventScript_GetGiftMonPartySlot:: @ 827378B + getpartysize + subvar VAR_RESULT, 1 + copyvar VAR_0x8004, VAR_RESULT + return + +Common_EventScript_NameReceivedBoxMon:: @ 8273797 + fadescreen 1 + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + return + +LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0 +MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0 +Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 +RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 + bufferboxname 0, VAR_PC_BOX_TO_SEND_MON + bufferspeciesname 1, VAR_TEMP_1 + call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB + call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB + specialvar VAR_RESULT, ShouldShowBoxWasFullMessage + compare VAR_RESULT, 1 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 + msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT + return + +LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 + specialvar VAR_RESULT, GetPCBoxToSendMon + bufferboxname 2, VAR_RESULT + msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT + return + +LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 + specialvar VAR_RESULT, ShouldShowBoxWasFullMessage + compare VAR_RESULT, 1 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF + msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT + return + +LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF + specialvar VAR_RESULT, GetPCBoxToSendMon + bufferboxname 2, VAR_RESULT + msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT + return + +Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 + msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT + release + end diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc new file mode 100644 index 000000000..7e9a2de7e --- /dev/null +++ b/data/scripts/record_mix.inc @@ -0,0 +1,22 @@ +EventScript_271D5E:: @ 8271D5E + lock + faceplayer + msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_if_eq EventScript_271D83 + compare VAR_RESULT, 0 + goto_if_eq EventScript_271D89 + goto EventScript_271D89 + +EventScript_271D83:: @ 8271D83 + special RecordMixingPlayerSpotTriggered + waitstate + lock + faceplayer + +EventScript_271D89:: @ 8271D89 + message Text_WouldNotLikeToMixRecords + waitmessage + waitbuttonpress + release + end diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc new file mode 100644 index 000000000..5deda5762 --- /dev/null +++ b/data/scripts/repel.inc @@ -0,0 +1,6 @@ +EventScript_RepelWoreOff:: @ 82A4B2A + msgbox Text_RepelWoreOff, MSGBOX_SIGN + end + +Text_RepelWoreOff: @ 82A4B33 + .string "REPEL's effect wore off…$" diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc new file mode 100644 index 000000000..60bd1a337 --- /dev/null +++ b/data/scripts/rival_graphics.inc @@ -0,0 +1,48 @@ +Common_EventScript_SetupRivalGfxId:: @ 8271ED7 + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq EventScript_SetupRivalGfxIdFemale + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_SetupRivalGfxIdMale + end + +EventScript_SetupRivalGfxIdFemale:: @ 8271EEF + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return + +EventScript_SetupRivalGfxIdMale:: @ 8271EF5 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq EventScript_SetupRivalOnBikeGfxIdFemale + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_SetupRivalOnBikeGfxIdMale + end + +EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE + return + +EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + return + +@ Unused +Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq EventScript_SetupRivalGfxIdMale2 + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_SetupRivalGfxIdFemale2 + end + +EventScript_SetupRivalGfxIdMale2:: @ 8271F37 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc new file mode 100644 index 000000000..1f5535805 --- /dev/null +++ b/data/scripts/set_gym_trainers.inc @@ -0,0 +1,92 @@ +Common_EventScript_SetGymTrainers:: @ 8271F43 + switch VAR_0x8008 + case 1, RusboroCity_Gym_SetGymTrainers + case 2, DewfordTown_Gym_SetGymTrainers + case 3, MauvilleCity_Gym_SetGymTrainers + case 4, LavaridgeTown_Gym_SetGymTrainers + case 5, PetalburgCity_Gym_SetGymTrainers + case 6, FortreeCity_Gym_SetGymTrainers + case 7, MossdeepCity_Gym_SetGymTrainers + case 8, SootopolisCity_Gym_SetGymTrainers + end + +RusboroCity_Gym_SetGymTrainers:: @ 8271FA1 + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY + settrainerflag TRAINER_MARC + return + +DewfordTown_Gym_SetGymTrainers:: @ 8271FAB + settrainerflag TRAINER_TAKAO + settrainerflag TRAINER_JOCELYN + settrainerflag TRAINER_LAURA + settrainerflag TRAINER_BRENDEN + settrainerflag TRAINER_CRISTIAN + settrainerflag TRAINER_LILITH + return + +MauvilleCity_Gym_SetGymTrainers:: @ 8271FBE + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN + settrainerflag TRAINER_ANGELO + return + +LavaridgeTown_Gym_SetGymTrainers:: @ 8271FCE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_KEEGAN + settrainerflag TRAINER_GERALD + settrainerflag TRAINER_DANIELLE + settrainerflag TRAINER_JACE + settrainerflag TRAINER_JEFF + settrainerflag TRAINER_ELI + return + +PetalburgCity_Gym_SetGymTrainers:: @ 8271FE7 + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_ALEXIA + settrainerflag TRAINER_JODY + return + +FortreeCity_Gym_SetGymTrainers:: @ 8271FFD + settrainerflag TRAINER_JARED + settrainerflag TRAINER_FLINT + settrainerflag TRAINER_ASHLEY + settrainerflag TRAINER_EDWARDO + settrainerflag TRAINER_HUMBERTO + settrainerflag TRAINER_DARIUS + return + +MossdeepCity_Gym_SetGymTrainers:: @ 8272010 + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_BLAKE + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA + settrainerflag TRAINER_SYLVIA + settrainerflag TRAINER_NATE + settrainerflag TRAINER_KATHLEEN + settrainerflag TRAINER_CLIFFORD + settrainerflag TRAINER_MACEY + settrainerflag TRAINER_NICHOLAS + return + +SootopolisCity_Gym_SetGymTrainers:: @ 8272035 + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_BETHANY + settrainerflag TRAINER_ANNIKA + settrainerflag TRAINER_DAPHNE + return diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc new file mode 100644 index 000000000..d89aa98c1 --- /dev/null +++ b/data/scripts/surf.inc @@ -0,0 +1,18 @@ +EventScript_UseSurf:: @ 8271EA0 + checkpartymove MOVE_SURF + compare VAR_RESULT, 6 + goto_if_eq EventScript_CantSurf + bufferpartymonnick 0, VAR_RESULT + setfieldeffectargument 0, VAR_RESULT + lockall + msgbox gText_WantToUseSurf, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq EventScript_CancelSurf + msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_SURF + +EventScript_CancelSurf:: @ 8271ED5 + releaseall + +EventScript_CantSurf:: @ 8271ED6 + end diff --git a/data/scripts/test_signpost.inc b/data/scripts/test_signpost.inc new file mode 100644 index 000000000..482fe18f2 --- /dev/null +++ b/data/scripts/test_signpost.inc @@ -0,0 +1,7 @@ +Text_ThisIsATestSignpostMsg:: @ 82C840A + .string "This is a test message.\n" + .string "This is a signpost.$" + +EventScript_TestSignpostMsg:: @ 82C8436 + msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN + end diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 21ba0d6d3..0ba8bcda6 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -1,3 +1,7 @@ +EventScript_271354:: @ 8271354 + cmdD8 + cmdD9 + EventScript_ShowSecondTrainerIntro:: @ 8271356 special SetUpTrainerEncounterMusic special EndTrainerApproach diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc new file mode 100644 index 000000000..59577e8a8 --- /dev/null +++ b/data/scripts/trainer_script.inc @@ -0,0 +1,23 @@ +Std_RegisteredInMatchCall:: @ 82742C9 + buffertrainerclassname 0, VAR_0x8000 + buffertrainername 1, VAR_0x8000 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT + waitfanfare + closemessage + delay 30 + return + +EventScript_TryGetTrainerScript:: @ 82742E6 + special ShouldTryGetTrainerScript + compare VAR_RESULT, 1 + goto_if_eq EventScript_GotoTrainerScript + releaseall + end + +EventScript_GotoTrainerScript:: @ 82742F6 + gotobeatenscript + releaseall + end -- cgit v1.2.3 From 6923f0e36958ac34feb9345fed88cb611027bea8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 21 Oct 2019 17:58:00 -0400 Subject: Document lilycove_lady.inc --- data/scripts/lilycove_lady.inc | 588 ++++++++++++++++++++--------------------- 1 file changed, 294 insertions(+), 294 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 77b842d3d..ad63aeba8 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -1,455 +1,453 @@ -LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B +LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady:: @ 82A836B special Script_GetLilycoveLadyId switch VAR_RESULT - case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_2A8554 - case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_2A8395 - case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_2A882A + case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_QuizLady + case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_FavorLady + case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_ContestLady end -LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 +LilycoveCity_PokemonCenter_1F_EventScript_FavorLady:: @ 82A8395 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFavorLadyState compare VAR_RESULT, LILYCOVE_LADY_STATE_READY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted:: @ 82A83C6 + msgbox LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady:: @ 82A83D0 special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing, MSGBOX_DEFAULT specialvar VAR_RESULT, HasAnotherPlayerGivenFavorLadyItem - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_RequestItem + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 +LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem:: @ 82A83F7 special BufferFavorLadyItemName special BufferFavorLadyPlayerName specialvar VAR_RESULT, DidFavorLadyLikeItem - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing end -LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 +LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing:: @ 82A8419 + msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 +LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing:: @ 82A8427 + msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435 + msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor end -LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor:: @ 82A8454 + msgbox LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C +LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E + msgbox LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C +LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C fadescreen 1 setvar VAR_RESULT, 0 special Script_FavorLadyOpenBagMenu waitstate compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CancelChooseFavorItem compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_CancelChooseFavorItem:: @ 82A848E + msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD +LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem:: @ 82A84AD specialvar VAR_RESULT, Script_DoesFavorLadyLikeItem - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 +LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem:: @ 82A84C9 special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 +LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem:: @ 82A84D6 specialvar VAR_RESULT, IsFavorLadyThresholdMet - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 +LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem:: @ 82A84F2 special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF +LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem:: @ 82A84FF special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + msgbox LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510 setvar VAR_0x8004, 0 specialvar VAR_0x8004, FavorLadyGetPrize - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize:: @ 82A8545 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F +LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize:: @ 82A854F special SetFavorLadyState_Complete release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 +LilycoveCity_PokemonCenter_1F_EventScript_QuizLady:: @ 82A8554 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady, MSGBOX_DEFAULT specialvar VAR_RESULT, GetQuizLadyState compare VAR_RESULT, LILYCOVE_LADY_STATE_READY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 +LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz:: @ 82A8585 specialvar VAR_RESULT, GetQuizAuthor compare VAR_RESULT, QUIZ_AUTHOR_PLAYER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz compare VAR_RESULT, QUIZ_AUTHOR_OTHER_PLAYER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady compare VAR_RESULT, QUIZ_AUTHOR_LADY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady end -LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC +LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz:: @ 82A85AC specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz:: @ 82A85C8 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE +LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady:: @ 82A85D2 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE +LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady:: @ 82A85E0 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE +LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE setvar VAR_0x8004, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO + msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz:: @ 82A8612 + msgbox LilycoveCity_PokemonCenter_1F_Text_HowBoringBye, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C +LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz:: @ 82A861C special ClearQuizLadyPlayerAnswer compare VAR_0x8004, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 -LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 +LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse end LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C special QuizLadyShowQuizQuestion waitstate - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState end LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 special QuizLadyGetPlayerAnswer waitstate - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState end -LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660 + msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz:: @ 82A867F + msgbox LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 +LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689 special SetQuizLadyState_Complete - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer, MSGBOX_DEFAULT specialvar VAR_RESULT, IsQuizAnswerCorrect - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse end -LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 +LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 playse SE_SEIKAI delay 10 playse SE_SEIKAI - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 +LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7 special BufferQuizCorrectAnswer special BufferQuizPrizeName playse SE_HAZURE delay 10 playse SE_HAZURE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, MSGBOX_DEFAULT - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz end @ VAR_RESULT is essentially ignored, both jumps are identical -LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC +LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize:: @ 82A86EC specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0 end -LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 +LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1:: @ 82A8708 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 +LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0:: @ 82A8716 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 +LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724 setvar VAR_0x8005, 0 special BufferQuizPrizeItem special SetQuizLadyState_Complete giveitem_std VAR_0x8005 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize + goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C + msgbox LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp, MSGBOX_DEFAULT special SetQuizLadyState_GivePrize release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759 + msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 +LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778 special QuizLadyPickNewQuestion - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT - -LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D +LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785 + msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D fadescreen 1 setvar VAR_RESULT, 0 special Script_QuizLadyOpenBagMenu waitstate compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF + msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE + msgbox LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz, MSGBOX_DEFAULT special ClearQuizLadyQuestionAndAnswer special ClearQuizLadyPlayerAnswer setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION - -LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 +LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 fadescreen 1 special QuizLadySetCustomQuestion waitstate compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion + goto LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8 + msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion end -LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 +LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz:: @ 82A8817 special QuizLadyTakePrizeForCustomQuiz special QuizLadyRecordCustomQuizData special QuizLadySetWaitingForChallenger - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A +LilycoveCity_PokemonCenter_1F_EventScript_ContestLady:: @ 82A882A lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady, MSGBOX_DEFAULT specialvar VAR_RESULT, HasPlayerGivenContestLadyPokeblock - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock end -@ Redundant with above script, VAR_RESULT will always be 0 here -LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 +@ Redundant with above script, VAR_RESULT will always be FALSE here +LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock:: @ 82A8850 specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock:: @ 82A886C + msgbox LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 +LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876 special Script_BufferContestLadyCategoryAndMonName - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality, MSGBOX_DEFAULT checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase + msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0 + msgbox LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA +LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA fadescreen 1 special OpenPokeblockCaseForContestLady waitstate compare VAR_RESULT, 0xFFFF - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock compare VAR_RESULT, 0xFFFF - goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 + goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7 + msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ 82A88F6 + msgbox LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock, MSGBOX_DEFAULT special SetContestLadyGivenPokeblock special GetContestLadyMonSpecies - goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A + goto LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock end @ VAR_0x8004 here is the return value from GivePokeblockToContestLady -LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A - applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89B8 +LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ 82A890A + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon waitmovement 0 delay 60 - applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89BB + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady waitmovement 0 delay 60 waitse @@ -457,194 +455,194 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A delay 120 waitmoncry compare VAR_0x8004, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F - goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock + goto LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A893F:: @ 82A893F - applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89C2 +@ VAR_0x8004 here is the return value from GivePokeblockToContestLady +LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock:: @ 82A893F + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonJump waitmovement 0 delay 60 - -@ VAR_0x8004 here is the return value from GivePokeblockToContestLady -LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C - applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89C0 +LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock:: @ 82A894C + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer waitmovement 0 delay 60 compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock compare VAR_0x8004, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F +LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock:: @ 82A8970 + msgbox LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow end -LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E +LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock:: @ 82A897E special Script_BufferContestLadyCategoryAndMonName - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F + msgbox LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow end -LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F +LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow:: @ 82A898F specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow release end -LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow:: @ 82A89A1 + msgbox LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests, MSGBOX_DEFAULT special PutLilycoveContestLadyShowOnTheAir release end -LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase:: @ 82A89AE + msgbox LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 +LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon: @ 82A89B8 face_right delay_8 step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB +LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady: @ 82A89BB face_left delay_8 step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE +@ Unused +LilycoveCity_PokemonCenter_1F_Movement_MonFaceDown: @ 82A89BE face_down step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 +LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer: @ 82A89C0 face_player step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 +LilycoveCity_PokemonCenter_1F_Movement_MonJump: @ 82A89C2 disable_jump_landing_ground_effect jump_in_place_left disable_jump_landing_ground_effect jump_in_place_left step_end -LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 +LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon:: @ 82A89C7 specialvar VAR_RESULT, GetContestLadyCategory special Script_BufferContestLadyCategoryAndMonName special GetContestLadyMonSpecies compare VAR_RESULT, CONTEST_CATEGORY_COOL - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Skitty compare VAR_RESULT, CONTEST_CATEGORY_CUTE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Poochyena compare VAR_RESULT, CONTEST_CATEGORY_SMART - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Kecleon compare VAR_RESULT, CONTEST_CATEGORY_TOUGH - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Pikachu end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A +LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: @ 82A8A0A lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D +LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: @ 82A8A1D lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30 +LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: @ 82A8A30 lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Poochyena, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43 +LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: @ 82A8A43 lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Kecleon, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 +LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: @ 82A8A56 lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Pikachu, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_Text_2A8A69: @ 82A8A69 +LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady: @ 82A8A69 .string "I'm the FAVOR LADY…$" -LilycoveCity_PokemonCenter_1F_Text_2A8A7D: @ 82A8A7D +LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing: @ 82A8A7D .string "I've recently developed an obsession\n" .string "for {STR_VAR_1} things…$" -LilycoveCity_PokemonCenter_1F_Text_2A8AB1: @ 82A8AB1 +LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime: @ 82A8AB1 .string "Oh…\n" .string "Thank you for last time…$" -LilycoveCity_PokemonCenter_1F_Text_2A8ACE: @ 82A8ACE +LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing: @ 82A8ACE .string "Before, I think it was {STR_VAR_3}…\p" .string "{STR_VAR_3} gave me one {STR_VAR_2},\n" .string "saying it was {STR_VAR_1}.\p" .string "But it wasn't {STR_VAR_1}.\n" .string "Not in the least bit.$" -LilycoveCity_PokemonCenter_1F_Text_2A8B36: @ 82A8B36 +LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing: @ 82A8B36 .string "Before, {STR_VAR_3} gave me a very\n" .string "{STR_VAR_1} {STR_VAR_2}.\p" .string "I cherish it now.$" -LilycoveCity_PokemonCenter_1F_Text_2A8B69: @ 82A8B69 +LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing: @ 82A8B69 .string "Listen, if you have anything that\n" .string "is {STR_VAR_1}, will you share it\l" .string "with me?$" -LilycoveCity_PokemonCenter_1F_Text_2A8BAD: @ 82A8BAD +LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe: @ 82A8BAD .string "…Really?\n" .string "What will you give me?$" -LilycoveCity_PokemonCenter_1F_Text_2A8BCD: @ 82A8BCD +LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye: @ 82A8BCD .string "Is that so?\n" .string "Then, it's good-bye…$" -LilycoveCity_PokemonCenter_1F_Text_2A8BEE: @ 82A8BEE +LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare: @ 82A8BEE .string "Oh…\n" .string "You're not willing to share?$" -LilycoveCity_PokemonCenter_1F_Text_2A8C0F: @ 82A8C0F +LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt: @ 82A8C0F .string "Oh?\n" .string "That {STR_VAR_2} is {STR_VAR_1}?\p" .string "…Oh, is that right?\p" .string "Well, I owe you a thanks anyway.\n" .string "I'll try to cherish it…$" -LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F +LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis: @ 82A8C6F .string "Oh…\p" .string "That's a quite {STR_VAR_1}\n" .string "{STR_VAR_2}…\p" @@ -653,7 +651,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F .string "Thank you…\n" .string "I will cherish this…$" -LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 +LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis: @ 82A8CC8 .string "…Oh, oh, oh…\p" .string "This is amazing!\n" .string "This really is {STR_VAR_1}!\p" @@ -663,89 +661,90 @@ LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 .string "I will treasure this for the rest\n" .string "of my life!$" -LilycoveCity_PokemonCenter_1F_Text_2A8D5D: @ 82A8D5D +LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn: @ 82A8D5D .string "I'll give you this wonderful item in\n" .string "return for your fabulous gift.\p" .string "I hope you will cherish it…$" -LilycoveCity_PokemonCenter_1F_Text_2A8DBD: @ 82A8DBD +LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt: @ 82A8DBD .string "Oh, you can't have it if you don't have\n" .string "the space for it.\p" .string "Please come see me when you get\n" .string "your BAG organized…$" -LilycoveCity_PokemonCenter_1F_Text_2A8E2B: @ 82A8E2B +LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady: @ 82A8E2B .string "I'm the QUIZ LADY!\n" .string "I love quizzes!$" -LilycoveCity_PokemonCenter_1F_Text_2A8E4E: @ 82A8E4E +LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz: @ 82A8E4E .string "Oh?\p" .string "I'm waiting for a challenger to answer\n" .string "the quiz you made.\p" .string "We can chat another time, okay?$" -LilycoveCity_PokemonCenter_1F_Text_2A8EAC: @ 82A8EAC +LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger: @ 82A8EAC .string "I'm waiting for someone to challenge\n" .string "a quiz this {STR_VAR_1} thought up!$" -LilycoveCity_PokemonCenter_1F_Text_2A8EEC: @ 82A8EEC +LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge: @ 82A8EEC .string "If you answer correctly, you can win\n" .string "fabulous prizes!\p" .string "Would you like to take the quiz\n" .string "challenge?$" -LilycoveCity_PokemonCenter_1F_Text_2A8F4D: @ 82A8F4D +LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer: @ 82A8F4D .string "… … … … … …\n" .string "… … … … … …$" -LilycoveCity_PokemonCenter_1F_Text_2A8F65: @ 82A8F65 +LilycoveCity_PokemonCenter_1F_Text_HowBoringBye: @ 82A8F65 .string "Oh, how boring!\n" .string "Bye-bye!$" -LilycoveCity_PokemonCenter_1F_Text_2A8F7E: @ 82A8F7E +LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit: @ 82A8F7E .string "Awww!\n" .string "You're going to quit?$" -LilycoveCity_PokemonCenter_1F_Text_2A8F9A: @ 82A8F9A +LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime: @ 82A8F9A .string "Please take the quiz challenge\n" .string "another time!$" -LilycoveCity_PokemonCenter_1F_Text_2A8FC7: @ 82A8FC7 +LilycoveCity_PokemonCenter_1F_Text_YouGotItRight: @ 82A8FC7 .string "You're amazing! You've got it right!\n" .string "You're one sharp customer!$" -LilycoveCity_PokemonCenter_1F_Text_2A9007: @ 82A9007 +LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize: @ 82A9007 .string "Congratulations!\n" .string "You've got the quiz right!\p" .string "You've won a prize provided by\n" .string "{STR_VAR_1}!$" -LilycoveCity_PokemonCenter_1F_Text_2A9056: @ 82A9056 +@ Unused +LilycoveCity_PokemonCenter_1F_Text_XReceivedOneY: @ 82A9056 .string "{STR_VAR_1} received\n" .string "one {STR_VAR_2}!$" -LilycoveCity_PokemonCenter_1F_Text_2A906A: @ 82A906A +LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp: @ 82A906A .string "Oh? Your BAG is filled up!\n" .string "Come see me when you have room.$" -LilycoveCity_PokemonCenter_1F_Text_2A90A5: @ 82A90A5 +LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs: @ 82A90A5 .string "Hmm… Wrong!\n" .string "The correct answer is “{STR_VAR_3}”!$" -LilycoveCity_PokemonCenter_1F_Text_2A90CD: @ 82A90CD +LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize: @ 82A90CD .string "Too bad!\p" .string "I get to keep the quiz prize\n" .string "{STR_VAR_1} now!$" -LilycoveCity_PokemonCenter_1F_Text_2A90FB: @ 82A90FB +LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz: @ 82A90FB .string "Listen, listen!\n" .string "Would you like to make your own quiz?$" -LilycoveCity_PokemonCenter_1F_Text_2A9131: @ 82A9131 +LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime: @ 82A9131 .string "Oh, I see…\n" .string "Well, maybe next time!$" -LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 +LilycoveCity_PokemonCenter_1F_Text_PickYourPrize: @ 82A9153 .string "Okay, the first thing you have to do\n" .string "is pick the prize for the person that\l" .string "answers your quiz correctly.\p" @@ -753,46 +752,47 @@ LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 .string "the quiz can't get it right, I get to\l" .string "keep the prize!$" -LilycoveCity_PokemonCenter_1F_Text_2A9212: @ 82A9212 +LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize: @ 82A9212 .string "If you don't choose a prize,\n" .string "your quiz can't be made.\p" .string "Are you going to quit making\n" .string "your quiz?$" -LilycoveCity_PokemonCenter_1F_Text_2A9270: @ 82A9270 +LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz: @ 82A9270 .string "Oh, how nice!\n" .string "That's a wonderful prize!\p" .string "Next, you need to write your quiz\n" .string "question and its answer.$" -LilycoveCity_PokemonCenter_1F_Text_2A92D3: @ 82A92D3 +LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion: @ 82A92D3 .string "Are you going to quit writing\n" .string "your quiz question?$" -LilycoveCity_PokemonCenter_1F_Text_2A9305: @ 82A9305 +@ Unused +LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizAnswer: @ 82A9305 .string "Are you going to quit choosing\n" .string "your quiz answer?$" -LilycoveCity_PokemonCenter_1F_Text_2A9336: @ 82A9336 +LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger: @ 82A9336 .string "Thank you!\n" .string "You've put together a nice quiz.\p" .string "I'll go look for someone who'll take\n" .string "your quiz challenge right away.$" -LilycoveCity_PokemonCenter_1F_Text_2A93A7: @ 82A93A7 +LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady: @ 82A93A7 .string "I'm the CONTEST LADY!\n" .string "I sure do love CONTESTS!$" -LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6 +LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock: @ 82A93D6 .string "Thanks for your {POKEBLOCK} before!$" -LilycoveCity_PokemonCenter_1F_Text_2A93F4: @ 82A93F4 +LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality: @ 82A93F4 .string "This is my friend {STR_VAR_1}!\n" .string "It's the epitome of {STR_VAR_2}!\p" .string "But I think that it will display\n" .string "even more {STR_VAR_2}!$" -LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451 +LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase: @ 82A9451 .string "So, I need your help!\p" .string "Please, may I have one {POKEBLOCK}?\n" .string "All I'm asking for is one!\p" @@ -800,57 +800,57 @@ LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451 .string "Don't you have a {POKEBLOCK} CASE?\l" .string "That's no good. Next time, then!$" -LilycoveCity_PokemonCenter_1F_Text_2A94E8: @ 82A94E8 +LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock: @ 82A94E8 .string "So, I need your help!\p" .string "Please, may I have one {POKEBLOCK}?\n" .string "All I'm asking for is one!$" -LilycoveCity_PokemonCenter_1F_Text_2A9537: @ 82A9537 +LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock: @ 82A9537 .string "Awww!\n" .string "I can't have one {POKEBLOCK}?!$" -LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556 +LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate: @ 82A9556 .string "Sheesh!\n" .string "What a cheapskate!$" -LilycoveCity_PokemonCenter_1F_Text_2A9571: @ 82A9571 +LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock: @ 82A9571 .string "Yay!\n" .string "Thank you!\p" .string "I'll feed my POKéMON your {POKEBLOCK}\n" .string "right away.$" -LilycoveCity_PokemonCenter_1F_Text_2A95AD: @ 82A95AD +LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks: @ 82A95AD .string "…It doesn't seem to have changed\n" .string "in any way at all…\p" .string "Hmm…\p" .string "Oh, well!\n" .string "Thank you very much!$" -LilycoveCity_PokemonCenter_1F_Text_2A9605: @ 82A9605 +LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks: @ 82A9605 .string "Oh, yay!\n" .string "It's really delighted!\p" .string "I think it really improved {STR_VAR_1}'s\n" .string "{STR_VAR_2} quality, too.\p" .string "Thank you so much!$" -LilycoveCity_PokemonCenter_1F_Text_2A9669: @ 82A9669 +LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests: @ 82A9669 .string "Hmm…\p" .string "I think we may be ready to enter\n" .string "some CONTESTS.\p" .string "If you see us in one somewhere,\n" .string "I hope you'll cheer for us.$" -LilycoveCity_PokemonCenter_1F_Text_2A96DA: @ 82A96DA +LilycoveCity_PokemonCenter_1F_Text_Zigzagoon: @ 82A96DA .string "{STR_VAR_1}: Guguuh!$" -LilycoveCity_PokemonCenter_1F_Text_2A96E6: @ 82A96E6 +LilycoveCity_PokemonCenter_1F_Text_Kecleon: @ 82A96E6 .string "{STR_VAR_1}: Igigigiiih!$" -LilycoveCity_PokemonCenter_1F_Text_2A96F6: @ 82A96F6 +LilycoveCity_PokemonCenter_1F_Text_Poochyena: @ 82A96F6 .string "{STR_VAR_1}: Baaarun…$" -LilycoveCity_PokemonCenter_1F_Text_2A9703: @ 82A9703 +LilycoveCity_PokemonCenter_1F_Text_Pikachu: @ 82A9703 .string "{STR_VAR_1}: Pikka!$" -LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E +LilycoveCity_PokemonCenter_1F_Text_Skitty: @ 82A970E .string "{STR_VAR_1}: Umyaaaan!$" -- cgit v1.2.3 From fa4940ee44b08b22486e6278dede88f079861ddd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 21 Oct 2019 18:06:42 -0400 Subject: Clean up lilycove_lady.inc doc --- data/scripts/lilycove_lady.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index ad63aeba8..5f6621fa3 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -78,12 +78,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C special Script_FavorLadyOpenBagMenu waitstate compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CancelChooseFavorItem + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_CancelChooseFavorItem:: @ 82A848E +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor @@ -209,9 +209,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz:: @ 82A8612 LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz:: @ 82A861C special ClearQuizLadyPlayerAnswer compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635 compare VAR_RESULT, 0 @@ -220,13 +220,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse end -LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C +LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion:: @ 82A864C special QuizLadyShowQuizQuestion waitstate goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState end -LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 +LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656 special QuizLadyGetPlayerAnswer waitstate goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState -- cgit v1.2.3 From c0aaa014247f8dfd78d9c7668b8a2096456ec253 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 17:28:05 -0400 Subject: Document flash.inc --- data/scripts/flash.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index e0630db56..916b50719 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,4 @@ -EventScript_2926F8:: @ 82926F8 +EventScript_FldEffFlash:: @ 82926F8 animateflash 1 setflashradius 1 end -- cgit v1.2.3 From 9a8676984736dc57a83e8b615b9e33dcb430c59f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 17:56:47 -0400 Subject: Document obtain_item.inc --- data/scripts/obtain_item.inc | 102 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 00bf4523e..206277cb7 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -1,66 +1,66 @@ Std_ObtainItem:: @ 8271AD3 giveitem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT - call EventScript_271AE3 + call EventScript_ObtainItemMessage return -EventScript_271AE3:: @ 8271AE3 +EventScript_ObtainItemMessage:: @ 8271AE3 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 - call EventScript_BufferStdString + call EventScript_BufferPocketNameAndTryFanfare compare VAR_0x8007, 1 - call_if_eq EventScript_271B95 + call_if_eq EventScript_ObtainedItem compare VAR_0x8007, 0 - call_if_eq EventScript_271BA9 + call_if_eq EventScript_NoRoomForItem return -EventScript_BufferStdString:: @ 8271B08 +EventScript_BufferPocketNameAndTryFanfare:: @ 8271B08 switch VAR_RESULT - case POCKET_ITEMS, EventScript_StdStringItem - case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems - case POCKET_POKE_BALLS, EventScript_StdStringPokeballs - case POCKET_TM_HM, EventScript_StdStringTMHMS - case POCKET_BERRIES, EventScript_StdStringBerries + case POCKET_ITEMS, EventScript_BufferItemsPocket + case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket + case POCKET_POKE_BALLS, EventScript_BufferPokeballsPocket + case POCKET_TM_HM, EventScript_BufferTMHMsPocket + case POCKET_BERRIES, EventScript_BufferBerriesPocket end -EventScript_StdStringItem:: @ 8271B45 +EventScript_BufferItemsPocket:: @ 8271B45 bufferstdstring 2, STDSTRING_ITEMS compare VAR_0x8007, 1 call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_StdStringKeyItems:: @ 8271B55 +EventScript_BufferKeyItemsPocket:: @ 8271B55 bufferstdstring 2, STDSTRING_KEYITEMS compare VAR_0x8007, 1 call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_StdStringPokeballs:: @ 8271B65 +EventScript_BufferPokeballsPocket:: @ 8271B65 bufferstdstring 2, STDSTRING_POKEBALLS compare VAR_0x8007, 1 call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_StdStringTMHMS:: @ 8271B75 +EventScript_BufferTMHMsPocket:: @ 8271B75 bufferstdstring 2, STDSTRING_TMHMS compare VAR_0x8007, 1 call_if_eq EventScript_PlayFanfareObtainedTMHM return -EventScript_StdStringBerries:: @ 8271B85 +EventScript_BufferBerriesPocket:: @ 8271B85 bufferstdstring 2, STDSTRING_BERRIES compare VAR_0x8007, 1 call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_271B95:: @ 8271B95 +EventScript_ObtainedItem:: @ 8271B95 message gText_ObtainedTheItem waitfanfare msgbox gText_PutItemInPocket, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return -EventScript_271BA9:: @ 8271BA9 +EventScript_NoRoomForItem:: @ 8271BA9 setvar VAR_RESULT, 0 return @@ -75,18 +75,18 @@ EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 Std_ObtainDecoration:: @ 8271BB7 givedecoration VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT - call EventScript_271BC5 + call EventScript_ObtainDecorationMessage return -EventScript_271BC5:: @ 8271BC5 +EventScript_ObtainDecorationMessage:: @ 8271BC5 bufferdecorationname 1, VAR_0x8000 compare VAR_0x8007, 1 - call_if_eq EventScript_271BE0 + call_if_eq EventScript_ObtainedDecor compare VAR_0x8007, 0 - call_if_eq EventScript_271BF7 + call_if_eq EventScript_NoRoomForDecor return -EventScript_271BE0:: @ 8271BE0 +EventScript_ObtainedDecor:: @ 8271BE0 playfanfare MUS_FANFA4 message gText_ObtainedTheDecor waitfanfare @@ -94,7 +94,7 @@ EventScript_271BE0:: @ 8271BE0 setvar VAR_RESULT, 1 return -EventScript_271BF7:: @ 8271BF7 +EventScript_NoRoomForDecor:: @ 8271BF7 setvar VAR_RESULT, 0 return @@ -108,47 +108,47 @@ Std_FindItem:: @ 8271BFD copyvar VAR_0x8007, VAR_RESULT bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 - call EventScript_BufferStdString + call EventScript_BufferPocketNameAndTryFanfare compare VAR_0x8007, 1 - call_if_eq EventScript_PickItemUp + call_if_eq EventScript_PickUpItem compare VAR_0x8007, 0 - call_if_eq EventScript_271CA1 + call_if_eq EventScript_NoRoomToPickUpItem release return -EventScript_PickItemUp:: @ 8271C3A +EventScript_PickUpItem:: @ 8271C3A removeobject VAR_LAST_TALKED giveitem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, BufferTMHMMoveName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 - call_if_eq EventScript_271C8F + call_if_eq EventScript_FoundTMHM compare VAR_0x8008, 0 - call_if_eq EventScript_271C9B + call_if_eq EventScript_FoundItem waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 - goto_if_eq EventScript_271C86 + goto_if_eq EventScript_PutBattlePyramidItemInBag msgbox gText_PutItemInPocket, MSGBOX_DEFAULT return -EventScript_271C86:: @ 8271C86 +EventScript_PutBattlePyramidItemInBag:: @ 8271C86 msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT return -EventScript_271C8F:: @ 8271C8F +EventScript_FoundTMHM:: @ 8271C8F bufferitemnameplural 0, VAR_0x8004, VAR_0x8005 - message gText_PlayerFoundOneItemTwoLines + message gText_PlayerFoundOneTMHM return -EventScript_271C9B:: @ 8271C9B +EventScript_FoundItem:: @ 8271C9B message gText_PlayerFoundOneItem return -EventScript_271CA1:: @ 8271CA1 +EventScript_NoRoomToPickUpItem:: @ 8271CA1 msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 @@ -161,46 +161,46 @@ EventScript_HiddenItemScript:: @ 8271CB7 copyvar VAR_0x8007, VAR_RESULT bufferitemnameplural 1, VAR_0x8005, 1 checkitemtype VAR_0x8005 - call EventScript_BufferStdString + call EventScript_BufferPocketNameAndTryFanfare compare VAR_0x8007, 1 - goto_if_eq EventScript_271CE8 + goto_if_eq EventScript_PickUpHiddenItem compare VAR_0x8007, 0 - goto_if_eq EventScript_271D47 + goto_if_eq EventScript_NoRoomForHiddenItem end -EventScript_271CE8:: @ 8271CE8 +EventScript_PickUpHiddenItem:: @ 8271CE8 copyvar VAR_0x8008, VAR_0x8004 copyvar VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, BufferTMHMMoveName compare VAR_RESULT, 1 - goto_if_eq EventScript_271D0E + goto_if_eq EventScript_FoundHiddenTMHM compare VAR_RESULT, 0 - goto_if_eq EventScript_271D1F + goto_if_eq EventScript_FoundHiddenItem end -EventScript_271D0E:: @ 8271D0E +EventScript_FoundHiddenTMHM:: @ 8271D0E bufferitemnameplural 0, VAR_0x8004, 1 - message gText_PlayerFoundOneItemTwoLines - goto EventScript_271D2A + message gText_PlayerFoundOneTMHM + goto EventScript_PutHiddenItemInPocket end -EventScript_271D1F:: @ 8271D1F +EventScript_FoundHiddenItem:: @ 8271D1F message gText_PlayerFoundOneItem - goto EventScript_271D2A + goto EventScript_PutHiddenItemInPocket end -EventScript_271D2A:: @ 8271D2A +EventScript_PutHiddenItemInPocket:: @ 8271D2A waitmessage waitfanfare bufferitemnameplural 1, VAR_0x8004, 1 copyvar VAR_0x8004, VAR_0x8008 msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - special sub_80EDCE8 - special SetFlagInVar + special TryPutTreasureInvestigatorsOnAir + special SetHiddenItemFlag releaseall end -EventScript_271D47:: @ 8271D47 +EventScript_NoRoomForHiddenItem:: @ 8271D47 msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 -- cgit v1.2.3 From ca2c6fa9b1222c1e871c41c497b8690405845b66 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 18:07:08 -0400 Subject: Document pc_transfer.inc --- data/scripts/pc_transfer.inc | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc index 6a72eae75..594956a31 100644 --- a/data/scripts/pc_transfer.inc +++ b/data/scripts/pc_transfer.inc @@ -13,40 +13,37 @@ Common_EventScript_NameReceivedBoxMon:: @ 8273797 faceplayer return -LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0 -MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0 -Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 -RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 +Common_EventScript_TransferredToPC:: @ 82737A0 bufferboxname 0, VAR_PC_BOX_TO_SEND_MON bufferspeciesname 1, VAR_TEMP_1 - call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB - call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC return -LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB +EventScript_TransferredSomeonesPC:: @ 82737BB specialvar VAR_RESULT, ShouldShowBoxWasFullMessage compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 + goto_if_eq EventScript_SomeonesPCBoxFull msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 +EventScript_SomeonesPCBoxFull:: @ 82737D4 specialvar VAR_RESULT, GetPCBoxToSendMon bufferboxname 2, VAR_RESULT - msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT + msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 +EventScript_TransferredLanettesPC:: @ 82737E6 specialvar VAR_RESULT, ShouldShowBoxWasFullMessage compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF + goto_if_eq EventScript_LanettesPCBoxFull msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF +EventScript_LanettesPCBoxFull:: @ 82737FF specialvar VAR_RESULT, GetPCBoxToSendMon bufferboxname 2, VAR_RESULT - msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT + msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT return Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 -- cgit v1.2.3 From 7d24f2d62c307a1d72b6bb766258fc91d6e79a85 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 18:15:13 -0400 Subject: Document record_mix.inc and clean surf.inc --- data/scripts/record_mix.inc | 15 ++++++++------- data/scripts/surf.inc | 12 +++++------- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc index 7e9a2de7e..f70b7f83e 100644 --- a/data/scripts/record_mix.inc +++ b/data/scripts/record_mix.inc @@ -1,21 +1,22 @@ -EventScript_271D5E:: @ 8271D5E +@ Seems this was superseded by the Record Center, and the below scripts are now unused +EventScript_MixRecordsPrompt:: @ 8271D5E lock faceplayer msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq EventScript_271D83 + goto_if_eq EventScript_MixRecords compare VAR_RESULT, 0 - goto_if_eq EventScript_271D89 - goto EventScript_271D89 + goto_if_eq EventScript_DeclineMixRecords + goto EventScript_DeclineMixRecords -EventScript_271D83:: @ 8271D83 +EventScript_MixRecords:: @ 8271D83 special RecordMixingPlayerSpotTriggered waitstate lock faceplayer -EventScript_271D89:: @ 8271D89 - message Text_WouldNotLikeToMixRecords +EventScript_DeclineMixRecords:: @ 8271D89 + message Text_WeHopeToSeeYouAgain waitmessage waitbuttonpress release diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index d89aa98c1..154cc53c2 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -1,18 +1,16 @@ EventScript_UseSurf:: @ 8271EA0 checkpartymove MOVE_SURF - compare VAR_RESULT, 6 - goto_if_eq EventScript_CantSurf + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_EndUseSurf bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall msgbox gText_WantToUseSurf, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_CancelSurf + goto_if_eq EventScript_ReleaseUseSurf msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF - -EventScript_CancelSurf:: @ 8271ED5 +EventScript_ReleaseUseSurf:: @ 8271ED5 releaseall - -EventScript_CantSurf:: @ 8271ED6 +EventScript_EndUseSurf:: @ 8271ED6 end -- cgit v1.2.3 From 6db014cc32d28a64499af7d605be3a062560d5e0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 17 Oct 2019 19:22:03 -0400 Subject: Document party_menu first pass --- data/scripts/cable_club.inc | 4 ++-- data/scripts/move_tutors.inc | 2 +- data/scripts/new_game.inc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 6962d17f8..ccda6afce 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -911,7 +911,7 @@ EventScript_DoLinkRoomExit:: @ 8277513 CableClub_EventScript_UnionRoomAttendant:: @ 827751B lock faceplayer - setvar VAR_FRONTIER_FACILITY, 8 + setvar VAR_FRONTIER_FACILITY, FACILITY_UNION_ROOM goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE @@ -1019,7 +1019,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 827769A CableClub_EventScript_DirectCornerAttendant:: @ 82776A4 lock faceplayer - setvar VAR_FRONTIER_FACILITY, 9 + setvar VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER @ Set preemptively for multi battles, ignored otherwise goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index b6ba75e0d..0d4244023 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -289,7 +289,7 @@ MoveTutor_EventScript_ExplosionTaught:: @ 82C831C end MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326 - special OpenPartyMenuForMoveTutor + special ChooseMonForMoveTutor waitstate lock faceplayer diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e8cfc34a0..5bc4bf780 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -204,7 +204,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M setflag FLAG_HIDE_ROUTE_128_STEVEN setflag FLAG_HIDE_ROUTE_128_ARCHIE -- cgit v1.2.3 From f35a3f73b20aa11c05434b23262e1eeacc62e081 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 19:44:38 -0400 Subject: Document gabby_and_ty.inc --- data/scripts/gabby_and_ty.inc | 301 +++++++++++++++++++++--------------------- 1 file changed, 148 insertions(+), 153 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 0f8d71f6b..7ed366aca 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,337 +1,332 @@ +@ Unused EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore compare VAR_RESULT, 1 - goto_if_eq EventScript_28CCC6 + goto_if_eq EventScript_UnusedRet setvar VAR_0x8005, 8 special InterviewAfter return -EventScript_28CCC6:: @ 828CCC6 +EventScript_UnusedRet:: @ 828CCC6 return -Route111_EventScript_28CCC7:: @ 828CCC7 -Route118_EventScript_28CCC7:: @ 828CCC7 -Route120_EventScript_28CCC7:: @ 828CCC7 +@ Gabby and Ty always move to the same spots for the first 5 battles +@ From the 6th battle onwards, they move randomly between locations 6-8 +GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7 cleartrainerflag TRAINER_GABBY_AND_TY_6 specialvar VAR_RESULT, GabbyAndTyGetBattleNum switch VAR_RESULT - case 0, Route111_EventScript_28CD38 - case 1, Route111_EventScript_28CD3E - case 2, Route111_EventScript_28CD49 - case 3, Route111_EventScript_28CD54 - case 4, Route111_EventScript_28CD5F - case 5, Route111_EventScript_28CD6A - case 6, Route111_EventScript_28CD75 - case 7, Route111_EventScript_28CD80 - case 8, Route111_EventScript_28CD8B + case 0, GabbyAndTy_EventScript_MoveForBattle1 + case 1, GabbyAndTy_EventScript_MoveForBattle2 + case 2, GabbyAndTy_EventScript_MoveForBattle3 + case 3, GabbyAndTy_EventScript_MoveForBattle4 + case 4, GabbyAndTy_EventScript_MoveForBattle5 + case 5, GabbyAndTy_EventScript_MoveForBattle6 + case 6, GabbyAndTy_EventScript_MoveForBattle7 + case 7, GabbyAndTy_EventScript_MoveForBattle8 + case 8, GabbyAndTy_EventScript_MoveForBattle9 end -Route111_EventScript_28CD38:: @ 828CD38 - call Route111_EventScript_28CD9A +GabbyAndTy_EventScript_MoveForBattle1:: @ 828CD38 + call GabbyAndTy_EventScript_ShowAtRoute111_1 return -Route111_EventScript_28CD3E:: @ 828CD3E - call Route111_EventScript_28CDA2 - call Route111_EventScript_28CD96 +GabbyAndTy_EventScript_MoveForBattle2:: @ 828CD3E + call GabbyAndTy_EventScript_ShowAtRoute118_1 + call GabbyAndTy_EventScript_HideAtRoute111_1 return -Route111_EventScript_28CD49:: @ 828CD49 - call Route111_EventScript_28CDAA - call Route111_EventScript_28CD9E +GabbyAndTy_EventScript_MoveForBattle3:: @ 828CD49 + call GabbyAndTy_EventScript_ShowAtRoute120_1 + call GabbyAndTy_EventScript_HideAtRoute118_1 return -Route111_EventScript_28CD54:: @ 828CD54 - call Route111_EventScript_28CDB2 - call Route111_EventScript_28CDA6 +GabbyAndTy_EventScript_MoveForBattle4:: @ 828CD54 + call GabbyAndTy_EventScript_ShowAtRoute111_3 + call GabbyAndTy_EventScript_HideAtRoute120_1 return -Route111_EventScript_28CD5F:: @ 828CD5F - call Route111_EventScript_28CDBA - call Route111_EventScript_28CDAE +GabbyAndTy_EventScript_MoveForBattle5:: @ 828CD5F + call GabbyAndTy_EventScript_ShowAtRoute118_2 + call GabbyAndTy_EventScript_HideAtRoute111_3 return -Route111_EventScript_28CD6A:: @ 828CD6A - call Route111_EventScript_28CDC2 - call Route111_EventScript_28CDB6 +GabbyAndTy_EventScript_MoveForBattle6:: @ 828CD6A + call GabbyAndTy_EventScript_ShowAtRoute120_2 + call GabbyAndTy_EventScript_HideAtRoute118_2 return -Route111_EventScript_28CD75:: @ 828CD75 - call Route111_EventScript_28CDCA - call Route111_EventScript_28CDBE +GabbyAndTy_EventScript_MoveForBattle7:: @ 828CD75 + call GabbyAndTy_EventScript_ShowAtRoute111_2 + call GabbyAndTy_EventScript_HideAtRoute120_2 return -Route111_EventScript_28CD80:: @ 828CD80 - call Route111_EventScript_28CDD2 - call Route111_EventScript_28CDC6 +GabbyAndTy_EventScript_MoveForBattle8:: @ 828CD80 + call GabbyAndTy_EventScript_ShowAtRoute118_3 + call GabbyAndTy_EventScript_HideAtRoute111_2 return -Route111_EventScript_28CD8B:: @ 828CD8B - call Route111_EventScript_28CDC2 - call Route111_EventScript_28CDCE +GabbyAndTy_EventScript_MoveForBattle9:: @ 828CD8B + call GabbyAndTy_EventScript_ShowAtRoute120_2 + call GabbyAndTy_EventScript_HideAtRoute118_3 return -Route111_EventScript_28CD96:: @ 828CD96 +GabbyAndTy_EventScript_HideAtRoute111_1:: @ 828CD96 setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return -Route111_EventScript_28CD9A:: @ 828CD9A +GabbyAndTy_EventScript_ShowAtRoute111_1:: @ 828CD9A clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return -Route111_EventScript_28CD9E:: @ 828CD9E +GabbyAndTy_EventScript_HideAtRoute118_1:: @ 828CD9E setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return -Route111_EventScript_28CDA2:: @ 828CDA2 +GabbyAndTy_EventScript_ShowAtRoute118_1:: @ 828CDA2 clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return -Route111_EventScript_28CDA6:: @ 828CDA6 +GabbyAndTy_EventScript_HideAtRoute120_1:: @ 828CDA6 setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return -Route111_EventScript_28CDAA:: @ 828CDAA +GabbyAndTy_EventScript_ShowAtRoute120_1:: @ 828CDAA clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return -Route111_EventScript_28CDAE:: @ 828CDAE +GabbyAndTy_EventScript_HideAtRoute111_3:: @ 828CDAE setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return -Route111_EventScript_28CDB2:: @ 828CDB2 +GabbyAndTy_EventScript_ShowAtRoute111_3:: @ 828CDB2 clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return -Route111_EventScript_28CDB6:: @ 828CDB6 +GabbyAndTy_EventScript_HideAtRoute118_2:: @ 828CDB6 setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return -Route111_EventScript_28CDBA:: @ 828CDBA +GabbyAndTy_EventScript_ShowAtRoute118_2:: @ 828CDBA clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return -Route111_EventScript_28CDBE:: @ 828CDBE +GabbyAndTy_EventScript_HideAtRoute120_2:: @ 828CDBE setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return -Route111_EventScript_28CDC2:: @ 828CDC2 +GabbyAndTy_EventScript_ShowAtRoute120_2:: @ 828CDC2 clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return -Route111_EventScript_28CDC6:: @ 828CDC6 +GabbyAndTy_EventScript_HideAtRoute111_2:: @ 828CDC6 setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return -Route111_EventScript_28CDCA:: @ 828CDCA +GabbyAndTy_EventScript_ShowAtRoute111_2:: @ 828CDCA clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return -Route111_EventScript_28CDCE:: @ 828CDCE +GabbyAndTy_EventScript_HideAtRoute118_3:: @ 828CDCE setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return -Route111_EventScript_28CDD2:: @ 828CDD2 +GabbyAndTy_EventScript_ShowAtRoute118_3:: @ 828CDD2 clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return -Route111_EventScript_28CDD6:: @ 828CDD6 - trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle1:: @ 828CDD6 + trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_GabbyPreFirstBattle, GabbyAndTy_Text_GabbyDefeatFirstTime, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route111_EventScript_28CDF6:: @ 828CDF6 - trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 - msgbox Route111_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6 + trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_TyPreFirstBattle, GabbyAndTy_Text_TyDefeatFirstTime, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_28CE16:: @ 828CE16 - trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16 + trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route118_EventScript_28CE36:: @ 828CE36 - trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle2:: @ 828CE36 + trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route120_EventScript_28CE56:: @ 828CE56 - trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56 + trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route120_EventScript_28CE76:: @ 828CE76 - trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle3:: @ 828CE76 + trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_28CE96:: @ 828CE96 - trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96 + trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route111_EventScript_28CEB6:: @ 828CEB6 - trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6 + trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_28CED6:: @ 828CED6 - trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT +Route118_EventScript_GabbyBattle5:: @ 828CED6 + trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route118_EventScript_28CEF6:: @ 828CEF6 - trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, MSGBOX_DEFAULT +Route118_EventScript_TyBattle5:: @ 828CEF6 + trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_28CF16:: @ 828CF16 -Route118_EventScript_28CF16:: @ 828CF16 -Route120_EventScript_28CF16:: @ 828CF16 - trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16 + trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route111_EventScript_28CF36:: @ 828CF36 -Route118_EventScript_28CF36:: @ 828CF36 -Route120_EventScript_28CF36:: @ 828CF36 - trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 + trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_28CF56:: @ 828CF56 +GabbyAndTy_EventScript_FirstInterview:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, DIR_NORTH - call_if_eq Route111_EventScript_28CF94 + call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq Route111_EventScript_28CF9F + call_if_eq GabbyAndTy_EventScript_FacePlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq Route111_EventScript_28CFB1 - goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE - msgbox Route111_Text_28B042, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 + call_if_eq GabbyAndTy_EventScript_FacePlayerEast + goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou + msgbox GabbyAndTy_Text_WhoAreYouInterview, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28CF94:: @ 828CF94 - applymovement VAR_0x8004, Route111_Movement_28D04D +GabbyAndTy_EventScript_FacePlayerNorth:: @ 828CF94 + applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown waitmovement 0 return -Route111_EventScript_28CF9F:: @ 828CF9F - applymovement VAR_0x8004, Route111_Movement_28D04F +GabbyAndTy_EventScript_FacePlayerSouth:: @ 828CF9F + applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -Route111_EventScript_28CFB1:: @ 828CFB1 - applymovement VAR_0x8004, Route111_Movement_28D051 +GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1 + applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route111_EventScript_28CFC3:: @ 828CFC3 -Route118_EventScript_28CFC3:: @ 828CFC3 -Route120_EventScript_28CFC3:: @ 828CFC3 +GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, DIR_NORTH - call_if_eq Route111_EventScript_28CF94 + call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq Route111_EventScript_28CF9F + call_if_eq GabbyAndTy_EventScript_FacePlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq Route111_EventScript_28CFB1 - goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE + call_if_eq GabbyAndTy_EventScript_FacePlayerEast + goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D053 - msgbox Route111_Text_28B137, MSGBOX_DEFAULT + goto_if_eq GabbyAndTy_EventScript_DidntInterviewLastTime + msgbox GabbyAndTy_Text_QuoteFromLastInterview, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT - case 0, Route111_EventScript_28D061 - case 1, Route111_EventScript_28D06F - case 2, Route111_EventScript_28D07D - case 3, Route111_EventScript_28D08B - case 4, Route111_EventScript_28D099 + case 0, GabbyAndTy_EventScript_RequestInterviewNoTrivia + case 1, GabbyAndTy_EventScript_RequestInterviewShortBattle + case 2, GabbyAndTy_EventScript_RequestInterviewThrewBall + case 3, GabbyAndTy_EventScript_RequestInterviewUsedItems + case 4, GabbyAndTy_EventScript_RequestInterviewLostAMon end -Route111_Movement_28D04D: @ 828D04D +GabbyAndTy_Movement_WalkInPlaceDown: @ 828D04D walk_in_place_down step_end -Route111_Movement_28D04F: @ 828D04F +GabbyAndTy_Movement_WalkInPlaceUp: @ 828D04F walk_in_place_up step_end -Route111_Movement_28D051: @ 828D051 +GabbyAndTy_Movement_WalkInPlaceLeft: @ 828D051 walk_in_place_left step_end -Route111_EventScript_28D053:: @ 828D053 - msgbox Route111_Text_28B62D, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_DidntInterviewLastTime:: @ 828D053 + msgbox GabbyAndTy_Text_GiveUsAnInterviewThisTime, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D061:: @ 828D061 - msgbox Route111_Text_28B3F3, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewNoTrivia:: @ 828D061 + msgbox GabbyAndTy_Text_InterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D06F:: @ 828D06F - msgbox Route111_Text_28B1B3, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewShortBattle:: @ 828D06F + msgbox GabbyAndTy_Text_YouStompedUsInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D07D:: @ 828D07D - msgbox Route111_Text_28B23D, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewThrewBall:: @ 828D07D + msgbox GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D08B:: @ 828D08B - msgbox Route111_Text_28B2FA, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewUsedItems:: @ 828D08B + msgbox GabbyAndTy_Text_CleverItemSkillsInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D099:: @ 828D099 - msgbox Route111_Text_28B379, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099 + msgbox GabbyAndTy_Text_WeLookedRespectableInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D0A7:: @ 828D0A7 +GabbyAndTy_EventScript_Interview:: @ 828D0A7 compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B433, MSGBOX_DEFAULT + goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut + msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT + goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut + msgbox GabbyAndTy_Text_PerfectWellBeSeeingYou, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end -Route111_EventScript_28D0E1:: @ 828D0E1 - msgbox Route111_Text_28B577, MSGBOX_DEFAULT +GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut:: @ 828D0E1 + msgbox GabbyAndTy_Text_DontGiveUpKeepingEyeOut, MSGBOX_DEFAULT setflag FLAG_TEMP_1 release end -Route111_EventScript_28D0EE:: @ 828D0EE - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_KeepingAnEyeOutForYou:: @ 828D0EE + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -- cgit v1.2.3 From 13f97601876155203eeee8a76b16f9aa3d2c73ca Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 26 Oct 2019 11:16:04 -0500 Subject: Document route 109 scripts --- data/scripts/new_game.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e8cfc34a0..ea1b21ac7 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -102,7 +102,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST -- cgit v1.2.3 From 93e2851fc187499259affb1ee32c845a7e9f9023 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 20:50:41 -0400 Subject: Document players_house.inc and Littleroot house scripts --- data/scripts/new_game.inc | 2 +- data/scripts/players_house.inc | 455 ++++++++++++++++++++--------------------- data/scripts/tv.inc | 4 +- 3 files changed, 225 insertions(+), 236 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index ea1b21ac7..f053b3299 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -117,7 +117,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_PLAYERS_HOUSE_DAD diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index f88d3af6c..acb1536e8 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,67 +1,63 @@ -LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE -LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE +PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet:: @ 82926FE setvar VAR_LITTLEROOT_INTRO_STATE, 5 return -LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 -LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704 + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x8005, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D - compare VAR_0x8005, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT + compare VAR_0x8005, MALE + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale + compare VAR_0x8005, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale + msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D +PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 +PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 +PlayersHouse_1F_Movement_PlayerWalkIn: @ 8292763 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 -LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765 + msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_292781:: @ 8292781 +LittlerootTown_BrendansHouse_2F_EventScript_WallClock:: @ 8292781 lockall - setvar VAR_0x8004, 0 - goto LittlerootTown_BrendansHouse_2F_EventScript_292799 + setvar VAR_0x8004, MALE + goto PlayersHouse_2F_EventScript_WallClock end -LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D +LittlerootTown_MaysHouse_2F_EventScript_WallClock:: @ 829278D lockall - setvar VAR_0x8004, 1 - goto LittlerootTown_MaysHouse_2F_EventScript_292799 + setvar VAR_0x8004, FEMALE + goto PlayersHouse_2F_EventScript_WallClock end -LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 -LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 - goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_29283F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT - call LittlerootTown_BrendansHouse_2F_EventScript_292849 +PlayersHouse_2F_EventScript_WallClock:: @ 8292799 + goto_if_set FLAG_SET_WALL_CLOCK, PlayersHouse_2F_EventScript_CheckWallClock + msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT + call PlayersHouse_2F_EventScript_SetWallClock delay 30 setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK @@ -69,41 +65,41 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF + call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F + call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale playse SE_KAIDAN removeobject VAR_0x8008 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF +PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF setvar VAR_0x8008, 14 addobject VAR_0x8008 - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsMale waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F +PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F setvar VAR_0x8008, 14 addobject VAR_0x8008 - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsFemale waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F +PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F incrementgamestat GAME_STAT_CHECKED_CLOCK fadescreen 1 special Special_ViewWallClock @@ -111,13 +107,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 +PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849 fadescreen 1 special StartWallClock waitstate return -LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 +PlayersHouse_2F_Movement_MomEntersMale: @ 8292850 delay_8 walk_down walk_in_place_fastest_left @@ -126,13 +122,13 @@ LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857 +PlayersHouse_2F_Movement_MomExitsMale: @ 8292857 walk_right walk_up delay_8 step_end -LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B +PlayersHouse_2F_Movement_MomEntersFemale: @ 829285B delay_8 walk_down walk_in_place_fastest_right @@ -141,91 +137,88 @@ LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B walk_right step_end -LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 +PlayersHouse_2F_Movement_MomExitsFemale: @ 8292862 walk_left walk_up delay_8 step_end -LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 -LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 +PlayersHouse_1F_EventScript_SetWatchedBroadcast:: @ 8292866 setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D +PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - call LittlerootTown_BrendansHouse_1F_EventScript_29294B - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 + call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale waitmovement 0 - call LittlerootTown_BrendansHouse_1F_EventScript_29296C + call PlayersHouse_1F_EventScript_WatchGymBroadcast applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatMale waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292866 + goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end -LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC +PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - call LittlerootTown_MaysHouse_1F_EventScript_29294B - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 + call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale waitmovement 0 - call LittlerootTown_MaysHouse_1F_EventScript_29296C + call PlayersHouse_1F_EventScript_WatchGymBroadcast applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT - msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1 + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatFemale waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_292866 + goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end -LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B -LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B +PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B playse SE_PIN applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT closemessage return -LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C -LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C +PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME delay 35 return -LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 +PlayersHouse_1F_Movement_MomApproachDadMale: @ 8292989 walk_up walk_right walk_right @@ -235,7 +228,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 +PlayersHouse_1F_Movement_MomApproachDadFemale: @ 8292991 walk_up walk_left walk_left @@ -245,15 +238,15 @@ LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999 +PlayersHouse_1F_Movement_MomApproachPlayerMale: @ 8292999 walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B +PlayersHouse_1F_Movement_MomApproachPlayerFemale: @ 829299B walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D +PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale: @ 829299D walk_in_place_fastest_left delay_16 delay_16 @@ -264,7 +257,7 @@ LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D delay_16 step_end -LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 +PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale: @ 82929A6 walk_in_place_fastest_right delay_16 delay_16 @@ -275,70 +268,69 @@ LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 delay_16 step_end -LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF +PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale: @ 82929AF walk_up walk_left walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3 +PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale: @ 82929B3 walk_up walk_right walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7 +PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale: @ 82929B7 walk_left walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA +PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale: @ 82929BA walk_right walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD +PlayersHouse_1F_Movement_MomReturnToSeatMale: @ 82929BD walk_left walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1 +PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 walk_right walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 -LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 +PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer compare VAR_LITTLEROOT_HOUSES_STATE, 4 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 - goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard + goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom + goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty compare VAR_TEMP_1, 1 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 + goto_if_eq PlayersHouse_1F_EventScript_SeeYouHoney compare VAR_LITTLEROOT_INTRO_STATE, 7 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT + goto_if_eq PlayersHouse_1F_EventScript_DidYouMeetProfBirch + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_DontPushYourselfTooHard:: @ 8292A0F + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 - goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A43 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19 + goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, PlayersHouse_1F_EventScript_CheckGiveAmuletCoin + msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -346,67 +338,65 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 release end -LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 - goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_292A51 - goto LittlerootTown_BrendansHouse_1F_EventScript_292A86 +PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43 + goto_if_set FLAG_BADGE05_GET, PlayersHouse_1F_EventScript_TryGiveAmuletCoin + goto PlayersHouse_1F_EventScript_MomHealsParty -LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 - goto_if_set FLAG_MOM_SAYS_GOODBYE, LittlerootTown_BrendansHouse_1F_EventScript_292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51 + goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty + msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT - setflag FLAG_MOM_SAYS_GOODBYE + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_AMULET_COIN release end -LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT - goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E +PlayersHouse_1F_EventScript_MomHealsParty:: @ 8292A86 + msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT + goto PlayersHouse_1F_EventScript_HealParty end -LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_SeeYouHoney:: @ 8292A94 + msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E +PlayersHouse_1F_EventScript_HealParty:: @ 8292A9E closemessage call Common_EventScript_OutOfCenterPartyHeal incrementgamestat GAME_STAT_RESTED_AT_HOME - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TakeCareHoney, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_DidYouMeetProfBirch:: @ 8292AB0 + msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292ABA:: @ 8292ABA -LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA +PlayersHouse_1F_EventScript_Vigoroth1:: @ 8292ABA lock faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Vigoroth1, MSGBOX_DEFAULT waitmoncry release end -LittlerootTown_BrendansHouse_1F_EventScript_292ACD:: @ 8292ACD -LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD +PlayersHouse_1F_EventScript_Vigoroth2:: @ 8292ACD lock faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Vigoroth2, MSGBOX_DEFAULT waitmoncry release end -LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 +PlayersHouse_1F_Movement_PlayerApproachTVForGymMale: @ 8292AE0 walk_down walk_down walk_left @@ -414,11 +404,11 @@ LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6 +PlayersHouse_1F_Movement_PlayerMoveToTVMale: @ 8292AE6 walk_left step_end -LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 +PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale: @ 8292AE8 walk_down walk_down walk_right @@ -426,26 +416,25 @@ LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 walk_right step_end -LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE +PlayersHouse_1F_Movement_PlayerMoveToTVFemale: @ 8292AEE walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0 +PlayersHouse_1F_Movement_MovePlayerAwayFromDoor: @ 8292AF0 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 -LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 +PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 + call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 + call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomFemale applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -454,64 +443,64 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C96 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CA1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale + msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT closemessage delay 20 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CAC - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CC1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachDadMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachDadFemale + msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT closemessage - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CD6 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_DadExitsMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_DadExitsFemale playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_RECEIVED_SS_TICKET delay 30 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D5D + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerFemale delay 20 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_TV_LATIAS_LATIOS special TurnOnTVScreen delay 60 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D72 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D7D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale + msgbox PlayersHouse_1F_Text_IsThatABreakingStory, MSGBOX_DEFAULT closemessage - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D1E - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale + msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale + msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT multichoice 22, 8, MULTI_TV_LATI, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_ROAMER_POKEMON, VAR_RESULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -519,155 +508,155 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 end @ Never called. -LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 +PlayersHouse_1F_EventScript_AirLatiBroadcast:: @ 8292C72 setflag FLAG_SYS_TV_LATIAS_LATIOS return -LittlerootTown_BrendansHouse_1F_EventScript_292C76:: @ 8292C76 - setvar VAR_0x8008, 0 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 1 +PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale:: @ 8292C76 + setvar VAR_0x8008, MALE + setvar VAR_0x8009, 5 @ Dad object event ID + setvar VAR_0x800A, 1 @ Mom object event ID return -LittlerootTown_BrendansHouse_1F_EventScript_292C86:: @ 8292C86 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 1 +PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale:: @ 8292C86 + setvar VAR_0x8008, FEMALE + setvar VAR_0x8009, 5 @ Dad object event ID + setvar VAR_0x800A, 1 @ Mom object event ID return -LittlerootTown_BrendansHouse_1F_EventScript_292C96:: @ 8292C96 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB2 +PlayersHouse_1F_EventScript_DadApproachPlayerMale:: @ 8292C96 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CA1:: @ 8292CA1 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB5 +PlayersHouse_1F_EventScript_DadApproachPlayerFemale:: @ 8292CA1 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CAC:: @ 8292CAC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292989 +PlayersHouse_1F_EventScript_MomApproachDadMale:: @ 8292CAC + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB8 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292991 +PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBA + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBC +PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DC1 +PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6 +PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1 +PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 +PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE +PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 +PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B +PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D72:: @ 8292D72 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299D +PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale:: @ 8292D72 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929A6 +PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF +PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 +PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2 +PlayersHouse_1F_Movement_DadApproachPlayerMale: @ 8292DB2 walk_right walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5 +PlayersHouse_1F_Movement_DadApproachPlayerFemale: @ 8292DB5 walk_left walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8 +PlayersHouse_1F_Movement_DadFaceMomMale: @ 8292DB8 face_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA +PlayersHouse_1F_Movement_DadFaceMomFemale: @ 8292DBA face_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC +PlayersHouse_1F_Movement_DadExitsMale: @ 8292DBC walk_down walk_right walk_down delay_8 step_end -LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1 +PlayersHouse_1F_Movement_DadExitsFemale: @ 8292DC1 walk_down walk_left walk_down delay_8 step_end -LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 +PlayersHouse_1F_Movement_PlayerEnterRoomMale: @ 8292DC6 delay_16 walk_down walk_down @@ -675,14 +664,14 @@ LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC +PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit: @ 8292DCC delay_8 delay_16 delay_16 walk_in_place_fastest_down step_end -LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 +PlayersHouse_1F_Movement_PlayerEnterRoomFemale: @ 8292DD1 delay_16 walk_down walk_down @@ -690,7 +679,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 +PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale: @ 8292DD7 walk_up walk_left walk_left @@ -699,7 +688,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE +PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale: @ 8292DDE walk_up walk_right walk_right @@ -709,5 +698,5 @@ LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE step_end EventScript_RunningShoesManual:: @ 8292DE5 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN + msgbox PlayersHouse_1F_Text_RunningShoesManual, MSGBOX_SIGN end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index ed279d478..67141d7a1 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -36,12 +36,12 @@ EventScript_27EE8A:: @ 827EE8A end EventScript_27EE9A:: @ 827EE9A - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT releaseall end EventScript_27EEA4:: @ 827EEA4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and @ It's called again when Mom actually asks for the color, overwriting @ whatever it does here. -- cgit v1.2.3 From 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 28 Oct 2019 09:28:08 -0400 Subject: Clean up players_house doc --- data/scripts/tv.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 67141d7a1..427775a76 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -4,9 +4,9 @@ EventScript_TV:: @ 827EE0B special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare VAR_RESULT, 2 - goto_if_eq EventScript_27EE9A + goto_if_eq EventScript_PlayersHouseMovie compare VAR_RESULT, 1 - goto_if_eq EventScript_27EEA4 + goto_if_eq EventScript_PlayersHouseLatiNewsFlash goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring @@ -35,12 +35,12 @@ EventScript_27EE8A:: @ 827EE8A releaseall end -EventScript_27EE9A:: @ 827EE9A +EventScript_PlayersHouseMovie:: @ 827EE9A msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT releaseall end -EventScript_27EEA4:: @ 827EEA4 +EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4 msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and @ It's called again when Mom actually asks for the color, overwriting -- cgit v1.2.3 From 8055548fa4d6707ac311e32afc9614d4603115db Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 31 Oct 2019 17:00:37 -0400 Subject: Document legendary scripts --- data/scripts/cave_of_origin.inc | 23 ++++++++++------------- data/scripts/new_game.inc | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index da4a97761..52a1da84f 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -1,32 +1,32 @@ @ All unused / leftover scripts from RS -EventScript_272274:: @ 8272274 +CaveOfOrigin_EventScript_LegendaryCry:: @ 8272274 lockall waitse - playmoncry SPECIES_KYOGRE, 2 + playmoncry SPECIES_KYOGRE, 2 @ SPECIES_GROUDON in Ruby waitmoncry setvar VAR_TEMP_5, 1 releaseall end -EventScript_272283:: @ 8272283 +CaveOfOrigin_EventScript_Shake1:: @ 8272283 lockall setvar VAR_TEMP_1, 1 - goto EventScript_2722A7 + goto CaveOfOrigin_EventScript_Shake end -EventScript_27228F:: @ 827228F +CaveOfOrigin_EventScript_Shake2:: @ 827228F lockall setvar VAR_TEMP_2, 1 - goto EventScript_2722A7 + goto CaveOfOrigin_EventScript_Shake end -EventScript_27229B:: @ 827229B +CaveOfOrigin_EventScript_Shake3:: @ 827229B lockall setvar VAR_TEMP_3, 1 - goto EventScript_2722A7 + goto CaveOfOrigin_EventScript_Shake end -EventScript_2722A7:: @ 82722A7 +CaveOfOrigin_EventScript_Shake:: @ 82722A7 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan setvar VAR_0x8006, 8 @ num shakes @@ -36,10 +36,7 @@ EventScript_2722A7:: @ 82722A7 releaseall end -CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 +CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1 setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_3, 1 diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index f053b3299..e30dad1cc 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -240,6 +240,6 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_HIDE_SKY_PILLAR_WALLACE - setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT + setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT call EventScript_ResetAllBerries end -- cgit v1.2.3 From 5f1fcdd0234d07b54637db05a4e7d658e89e4531 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 1 Nov 2019 17:50:54 -0400 Subject: Document aqua/magma area scripts --- data/scripts/interview.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 2ad8b305e..8512ca105 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -50,7 +50,7 @@ SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 release end -SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 +SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883 lock faceplayer setvar VAR_0x8005, 2 -- cgit v1.2.3 From 033c6cea3bbd982b7c60ee4fe5bee477e8d8773e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 2 Nov 2019 12:34:53 -0400 Subject: Use YES/NO constants for MSGBOX_YESNO --- data/scripts/berry_tree.inc | 12 +++++------ data/scripts/cable_club.inc | 12 +++++------ data/scripts/contest_hall.inc | 8 ++++---- data/scripts/day_care.inc | 18 ++++++++--------- data/scripts/field_move_scripts.inc | 12 +++++------ data/scripts/gabby_and_ty.inc | 2 +- data/scripts/interview.inc | 24 +++++++++++----------- data/scripts/kecleon.inc | 2 +- data/scripts/lilycove_lady.inc | 36 ++++++++++++++++----------------- data/scripts/mauville_man.inc | 24 +++++++++++----------- data/scripts/mevent.inc | 2 +- data/scripts/move_tutors.inc | 40 ++++++++++++++++++------------------- data/scripts/pkmn_center_nurse.inc | 8 ++++---- data/scripts/pokeblocks.inc | 12 +++++------ data/scripts/prof_birch.inc | 2 +- data/scripts/record_mix.inc | 4 ++-- data/scripts/safari_zone.inc | 4 ++-- data/scripts/secret_base.inc | 34 +++++++++++++++---------------- data/scripts/secret_power_tm.inc | 2 +- data/scripts/shared_secret_base.inc | 6 +++--- data/scripts/surf.inc | 2 +- 21 files changed, 133 insertions(+), 133 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6de5ccf47..6b2da5ccb 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -32,9 +32,9 @@ BerryTree_EventScript_CheckSoil:: @ 8274359 BerryTree_EventScript_WantToPlant:: @ 8274374 msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_ChooseBerryToPlant - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_CancelPlanting end @@ -110,9 +110,9 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 faceplayer special EventObjectInteractionGetBerryCountString msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_PickBerry - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_CancelPickingBerry BerryTree_EventScript_PickBerry:: @ 8274448 @@ -159,9 +159,9 @@ BerryTree_EventScript_WantToWater:: @ 827448D goto_if_eq BerryTree_EventScript_DontWater special EventObjectInteractionGetBerryName msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_WaterBerry - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_DontWater BerryTree_EventScript_DontWater:: @ 82744BE diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ccda6afce..ebb2e6ef0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -890,7 +890,7 @@ RecordCorner_EventScript_AlreadyMixed:: @ 82774E0 EventScript_ConfirmLeaveTradeRoom:: @ 82774EF msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_TerminateLink erasebox 0, 0, 29, 19 releaseall @@ -1005,7 +1005,7 @@ CableClub_EventScript_WirelessClubAttendant:: @ 8277672 faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_DontAskAboutLinking msgbox CableClub_Text_ExplainWirelessClub, MSGBOX_DEFAULT release @@ -1080,7 +1080,7 @@ CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB CableClub_EventScript_WirelessTrade:: @ 827780D msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortLink call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 @@ -1132,7 +1132,7 @@ CableClub_EventScript_WirelessBattleInfo:: @ 82778CB CableClub_EventScript_WirelessRecordMix:: @ 82778D9 msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 12 goto CableClub_EventScript_SaveAndChooseLinkLeader @@ -1140,7 +1140,7 @@ CableClub_EventScript_WirelessRecordMix:: @ 82778D9 CableClub_EventScript_WirelessBerryCrush:: @ 82778F7 msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortLink special HasAtLeastOneBerry compare VAR_RESULT, FALSE @@ -1500,7 +1500,7 @@ MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48 MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55 msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame compare VAR_0x8005, 0 call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 9a9816a5f..857c1e205 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -154,15 +154,15 @@ LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12 LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21 msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279E13 - case 1, LilycoveCity_ContestLobby_EventScript_279F87 + case NO, LilycoveCity_ContestLobby_EventScript_279E13 + case YES, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45 msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279E13 - case 1, LilycoveCity_ContestLobby_EventScript_279F87 + case NO, LilycoveCity_ContestLobby_EventScript_279E13 + case YES, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 062fd9f5a..b4c23a694 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -15,10 +15,10 @@ Route117_EventScript_DaycareMan:: @ 8291C18 Route117_EventScript_DaycareEggWaiting:: @ 8291C4D msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_EventScript_DaycareAcceptEgg msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_EventScript_DaycareAcceptEgg msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG @@ -88,7 +88,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11 compare VAR_RESULT, DAYCARE_TWO_MONS goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release @@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4 msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -170,10 +170,10 @@ Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_DisplayLevelsGained msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -197,7 +197,7 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC special GetDaycareCost msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -229,7 +229,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2 Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24 msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -272,7 +272,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_DisplayLevelsGained msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT release diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index bd98a3676..56e3297b6 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -9,7 +9,7 @@ EventScript_CutTree:: @ 82906BB bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT msgbox Text_WantToCut, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_CancelCut msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ EventScript_RockSmash:: @ 82907A6 bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH msgbox Text_WantToSmash, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_CancelSmash msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage @@ -133,7 +133,7 @@ EventScript_StrengthBoulder:: @ 82908BA goto_if_eq EventScript_CantStrength setfieldeffectargument 0, VAR_RESULT msgbox Text_WantToStrength, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_CancelStrength closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -195,7 +195,7 @@ EventScript_UseWaterfall:: @ 8290A49 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT msgbox Text_WantToWaterfall, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_EndWaterfall msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_WATERFALL @@ -231,7 +231,7 @@ EventScript_UseDive:: @ 8290B0F setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_WantToDive, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_EndDive msgbox Text_MonUsedDive, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_DIVE @@ -256,7 +256,7 @@ EventScript_UseDiveUnderwater:: @ 8290B5A setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_WantToSurface, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_EndSurface msgbox Text_MonUsedDive, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_DIVE diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 7ed366aca..f61b9d6db 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -305,7 +305,7 @@ GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099 end GabbyAndTy_EventScript_Interview:: @ 828D0A7 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 8512ca105..8b2b72f75 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -14,9 +14,9 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C end @@ -61,17 +61,17 @@ SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883 goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end @@ -117,9 +117,9 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 end @@ -190,9 +190,9 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 copyvar VAR_0x8009, VAR_0x8006 msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end @@ -271,9 +271,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A copyvar VAR_0x8009, VAR_0x8006 msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E end diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index ac0931fd8..659cd027b 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -57,7 +57,7 @@ EventScript_Kecleon:: @ 8272336 EventScript_AskUseDevonScope:: @ 8272350 msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_BattleKecleon release end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 5f6621fa3..b7b9d514a 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -56,9 +56,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing:: @ 82A8427 LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435 msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor end @@ -85,9 +85,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem end @@ -195,9 +195,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady:: @ 82A85E0 LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE setvar VAR_0x8004, 0 msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz end @@ -234,9 +234,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660 msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz end @@ -311,9 +311,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759 msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz end @@ -338,9 +338,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize end @@ -360,9 +360,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8 msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion end @@ -406,9 +406,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876 compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock end @@ -429,9 +429,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7 msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index deeec7721..34622775a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -13,9 +13,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong end @@ -37,9 +37,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong:: @ 828E0EA MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics end @@ -55,7 +55,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113 special ScrSpecial_PlayBardSong delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics special ScrSpecial_SaveBardSongLyrics msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT @@ -158,7 +158,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade special ScrSpecial_GetTraderTradedFlag compare VAR_RESULT, TRUE @@ -186,7 +186,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517 compare VAR_0x8004, 0xFFFF goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor special ScrSpecial_DoesPlayerHaveNoDecorations compare VAR_RESULT, TRUE @@ -228,7 +228,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584 compare VAR_RESULT, TRUE goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive special ScrSpecial_TraderDoDecorationTrade msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT @@ -815,7 +815,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare VAR_RESULT, 0 @@ -850,7 +850,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales:: @ 82901DA msgbox MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales, MSGBOX_DEFAULT MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2 msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 @@ -901,9 +901,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy end diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc index 88f44e002..731154315 100644 --- a/data/scripts/mevent.inc +++ b/data/scripts/mevent.inc @@ -1,7 +1,7 @@ EventScript_Questionnaire:: @ 827381B lockall msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Mevent_EventScript_Release setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE call Common_ShowEasyChatScreen diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 0d4244023..a7807ce51 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -3,10 +3,10 @@ SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16 faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_SwaggerDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_SwaggerDeclined msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_SWAGGER @@ -32,10 +32,10 @@ MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_RolloutDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_RolloutDeclined msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT @@ -61,10 +61,10 @@ VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6 faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_FuryCutterDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_FuryCutterDeclined msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER @@ -90,10 +90,10 @@ LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught msgbox MoveTutor_MimicTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_MimicDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_MimicDeclined msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_MIMIC @@ -119,10 +119,10 @@ FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6 faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_MetronomeDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_MetronomeDeclined msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_METRONOME @@ -148,10 +148,10 @@ FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_SleepTalkDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_SleepTalkDeclined msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK @@ -177,10 +177,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186 faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_SubstituteDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_SubstituteDeclined msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE @@ -206,10 +206,10 @@ MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH @@ -235,10 +235,10 @@ SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256 faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE @@ -264,10 +264,10 @@ PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE faceplayer goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_ExplosionDeclined call MoveTutor_EventScript_CanOnlyBeLearnedOnce - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MoveTutor_EventScript_ExplosionDeclined msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 0d4be2c0d..18b203d61 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -6,9 +6,9 @@ Common_EventScript_PkmnCenterNurse:: @ 827191E compare VAR_RESULT, 4 goto_if_eq EventScript_PkmnCenterNurse_GoldCard msgbox gText_WouldYouLikeToRestYourPkmn, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_PkmnCenterNurse_HealPkmn - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_PkmnCenterNurse_Goodbye end @@ -112,14 +112,14 @@ EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68 applymovement VAR_0x800B, Common_Movement_Delay48 waitmovement 0 msgbox gText_NoticesGoldCard, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn message gText_WeHopeToSeeYouAgain2 return EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC msgbox gText_YouWantTheUsual, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn message gText_WeHopeToSeeYouAgain2 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9590f3140..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 diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc index 50284d590..b89d2fbd0 100644 --- a/data/scripts/prof_birch.inc +++ b/data/scripts/prof_birch.inc @@ -49,7 +49,7 @@ ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141 ProfBirch_EventScript_AskRatePokedex:: @ 8272155 msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq ProfBirch_EventScript_DeclineRating call ProfBirch_EventScript_RatePokedex release diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc index f70b7f83e..23f224ae4 100644 --- a/data/scripts/record_mix.inc +++ b/data/scripts/record_mix.inc @@ -3,9 +3,9 @@ EventScript_MixRecordsPrompt:: @ 8271D5E lock faceplayer msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_MixRecords - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclineMixRecords goto EventScript_DeclineMixRecords diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 83cf5d16d..72d1d3c92 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ SafariZone_EventScript_Exit:: @ 82A4B5D SafariZone_EventScript_RetirePrompt:: @ 82A4B6F lockall msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SafariZone_EventScript_Retire releaseall end @@ -46,7 +46,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC compare VAR_RESULT, 0xFFFF goto_if_ne SafariZone_EventScript_PokeblockPresent msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SafariZone_EventScript_ChoosePokeblock releaseall end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index f2a99cd36..04fab5598 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -52,7 +52,7 @@ SecretBase_EventScript_Cave:: @ 8275A50 goto_if_eq SecretBase_EventScript_CaveNoSecretPower bufferpartymonnick 0, VAR_RESULT msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage @@ -84,7 +84,7 @@ SecretBase_EventScript_Tree:: @ 8275AA9 goto_if_eq SecretBase_EventScript_TreeNoSecretPower bufferpartymonnick 0, VAR_RESULT msgbox SecretBase_Text_TreeUseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage @@ -116,7 +116,7 @@ SecretBase_EventScript_Shrub:: @ 8275B02 goto_if_eq SecretBase_EventScript_ShrubNoSecretPower bufferpartymonnick 0, VAR_RESULT msgbox SecretBase_Text_ClumpUseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage @@ -161,7 +161,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SecretBase_EventScript_SetAsBase closemessage playse SE_KAIDAN @@ -209,17 +209,17 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8 lockall special GetSecretBaseNearbyMapName msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance fadescreenswapbuffers 1 special MoveOutOfSecretBaseFromOutside closemessage fadescreenswapbuffers 0 msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER @@ -347,7 +347,7 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6 compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer0PostBattle msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -384,7 +384,7 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer1PostBattle msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -421,7 +421,7 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6 compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer2PostBattle msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -458,7 +458,7 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer3PostBattle msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -495,7 +495,7 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6 compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer4PostBattle msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -532,7 +532,7 @@ SecretBase_EventScript_Trainer5:: @ 827602E compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer5PostBattle msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -569,7 +569,7 @@ SecretBase_EventScript_Trainer6:: @ 82760A6 compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer6PostBattle msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -606,7 +606,7 @@ SecretBase_EventScript_Trainer7:: @ 827611E compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer7PostBattle msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -643,7 +643,7 @@ SecretBase_EventScript_Trainer8:: @ 8276196 compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer8PostBattle msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult @@ -680,7 +680,7 @@ SecretBase_EventScript_Trainer9:: @ 827620E compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer9PostBattle msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle setvar VAR_RESULT, 1 special SetBattledOwnerFromResult diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 51a327142..c89202ded 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -37,7 +37,7 @@ Route111_EventScript_2765FF:: @ 82765FF lock faceplayer msgbox Route111_Text_2762C9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route111_EventScript_27661E msgbox Route111_Text_27655C, MSGBOX_DEFAULT release diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index 3f83e38b0..3a4c044a3 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -68,7 +68,7 @@ SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 SecretBase_EventScript_PCPackUp:: @ 823B568 msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_PCShowMainMenu closemessage special MoveOutOfSecretBase @@ -120,7 +120,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0 goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases special CopyCurSecretBaseOwnerName_StrVar1 msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_PCRegisterMenu msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN special ToggleCurSecretBaseRegistry @@ -130,7 +130,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0 SecretBase_EventScript_AlreadyRegistered:: @ 823B62F msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_PCRegisterMenu msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN special ToggleCurSecretBaseRegistry diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index 154cc53c2..af6cac1da 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -6,7 +6,7 @@ EventScript_UseSurf:: @ 8271EA0 setfieldeffectargument 0, VAR_RESULT lockall msgbox gText_WantToUseSurf, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_ReleaseUseSurf msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF -- cgit v1.2.3 From d9da932dadef1ffc59a524376c8f06bcd9d12598 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 14:05:29 -0500 Subject: Document Rustboro scripts --- data/scripts/new_game.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 4357199c4..e39c6eca6 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -95,7 +95,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_UNKNOWN_0x363 setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY -- cgit v1.2.3 From e7f6459a890901d59ca179c40f58bd84b255e467 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 15:19:08 -0500 Subject: Split mystery event msg --- data/scripts/meventmsg_altering_cave.inc | 24 ++++++++++ data/scripts/meventmsg_aurora_ticket.inc | 61 ++++++++++++++++++++++++ data/scripts/meventmsg_battle_card.inc | 47 +++++++++++++++++++ data/scripts/meventmsg_mystic_ticket.inc | 63 +++++++++++++++++++++++++ data/scripts/meventmsg_old_sea_map.inc | 62 +++++++++++++++++++++++++ data/scripts/meventmsg_pichu.inc | 79 ++++++++++++++++++++++++++++++++ data/scripts/meventmsg_stamp_card.inc | 21 +++++++++ data/scripts/meventmsg_trainer.inc | 49 ++++++++++++++++++++ 8 files changed, 406 insertions(+) create mode 100644 data/scripts/meventmsg_altering_cave.inc create mode 100644 data/scripts/meventmsg_aurora_ticket.inc create mode 100644 data/scripts/meventmsg_battle_card.inc create mode 100644 data/scripts/meventmsg_mystic_ticket.inc create mode 100644 data/scripts/meventmsg_old_sea_map.inc create mode 100644 data/scripts/meventmsg_pichu.inc create mode 100644 data/scripts/meventmsg_stamp_card.inc create mode 100644 data/scripts/meventmsg_trainer.inc (limited to 'data/scripts') diff --git a/data/scripts/meventmsg_altering_cave.inc b/data/scripts/meventmsg_altering_cave.inc new file mode 100644 index 000000000..072005934 --- /dev/null +++ b/data/scripts/meventmsg_altering_cave.inc @@ -0,0 +1,24 @@ +MysteryEventScript_AlteringCave:: @ 86756E3 + setvaddress MysteryEventScript_AlteringCave + addvar VAR_ALTERING_CAVE_WILD_SET, 1 + compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if_ne MysteryEventScript_AlteringCave_ + setvar VAR_ALTERING_CAVE_WILD_SET, 0 +MysteryEventScript_AlteringCave_: @ 86756FD + lock + faceplayer + vmessage sText_MysteryGiftAlteringCave + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftAlteringCave:: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "There appears to be a rumor about\n" + .string "rare POKéMON sightings.\p" + .string "The sightings reportedly came from\n" + .string "the ALTERING CAVE on ROUTE 103.\p" + .string "Perhaps it would be worthwhile for\n" + .string "you to investigate this rumor.$" diff --git a/data/scripts/meventmsg_aurora_ticket.inc b/data/scripts/meventmsg_aurora_ticket.inc new file mode 100644 index 000000000..811c840aa --- /dev/null +++ b/data/scripts/meventmsg_aurora_ticket.inc @@ -0,0 +1,61 @@ +MysteryEventScript_AuroraTicket:: @ 867533C + setvaddress MysteryEventScript_AuroraTicket + lock + faceplayer + checkflag FLAG_RECEIVED_AURORA_TICKET + vgoto_if_eq AuroraTicket_Obtained + checkflag FLAG_BATTLED_DEOXYS + vgoto_if_eq AuroraTicket_Obtained + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained + vmessage sText_AuroraTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace + giveitem_std ITEM_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND + setflag FLAG_RECEIVED_AURORA_TICKET + vmessage sText_AuroraTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +AuroraTicket_NoBagSpace: @ 8675397 + vmessage sText_AuroraTicketBagFull + waitmessage + waitbuttonpress + release + end + +AuroraTicket_Obtained: @ 86753A0 + vmessage sText_AuroraTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_AuroraTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_AuroraTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_AuroraTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_AuroraTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/meventmsg_battle_card.inc b/data/scripts/meventmsg_battle_card.inc new file mode 100644 index 000000000..8c36ed63a --- /dev/null +++ b/data/scripts/meventmsg_battle_card.inc @@ -0,0 +1,47 @@ +MysteryEventScript_BattleCard:: @ 867513C + setvaddress MysteryEventScript_BattleCard + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_eq MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON + specialvar VAR_0x8008, GetMysteryEventCardVal + compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES + vgoto_if_ne MysteryEventScript_BattleCardInfo + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard_WonPrize + waitmessage + waitbuttonpress + giveitem_std ITEM_POTION + release + setflag FLAG_MYSTERY_EVENT_DONE + end + +MysteryEventScript_BattleCardInfo: @ 8675179 + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftBattleCountCard: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Your BATTLE COUNT CARD keeps\n" + .string "track of your battle record against\l" + .string "TRAINERS with the same CARD.\p" + .string "Look for and battle TRAINERS who\n" + .string "have the same CARD as you.\p" + .string "You may check the overall rankings\n" + .string "by reading the NEWS.\p" + .string "Please do give it a try!$" + +sText_MysteryGiftBattleCountCard_WonPrize: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Congratulations!\p" + .string "You have won a prize for winning\n" + .string "three battles!\p" + .string "We hope you will be inspired to\n" + .string "battle some more.$" diff --git a/data/scripts/meventmsg_mystic_ticket.inc b/data/scripts/meventmsg_mystic_ticket.inc new file mode 100644 index 000000000..0264fb77f --- /dev/null +++ b/data/scripts/meventmsg_mystic_ticket.inc @@ -0,0 +1,63 @@ +MysteryEventScript_MysticTicket:: @ 867550B + setvaddress MysteryEventScript_MysticTicket + lock + faceplayer + checkflag FLAG_RECEIVED_MYSTIC_TICKET + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_LUGIA + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_HO_OH + vgoto_if_eq MysticTicket_Obtained + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained + vmessage sText_MysticTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace + giveitem_std ITEM_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK + setflag FLAG_RECEIVED_MYSTIC_TICKET + vmessage sText_MysticTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +MysticTicket_NoBagSpace: @ 867556F + vmessage sText_MysticTicketBagFull + waitmessage + waitbuttonpress + release + end + +MysticTicket_Obtained: @ 8675578 + vmessage sText_MysticTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysticTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_MysticTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysticTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysticTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/meventmsg_old_sea_map.inc b/data/scripts/meventmsg_old_sea_map.inc new file mode 100644 index 000000000..dffb56caa --- /dev/null +++ b/data/scripts/meventmsg_old_sea_map.inc @@ -0,0 +1,62 @@ +MysteryEventScript_OldSeaMap:: @ 86757F4 + setvaddress MysteryEventScript_OldSeaMap + lock + faceplayer + checkflag FLAG_RECEIVED_OLD_SEA_MAP + vgoto_if_eq OldSeaMap_Obtained + checkflag FLAG_CAUGHT_MEW + vgoto_if_eq OldSeaMap_Obtained + checkitem ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq OldSeaMap_Obtained + vmessage sText_MysteryGiftOldSeaMapForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq OldSeaMap_NoBagSpace + giveitem_std ITEM_OLD_SEA_MAP + setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND + setflag FLAG_RECEIVED_OLD_SEA_MAP + vmessage sText_MysteryGiftOldSeaMapUseAtPort + waitmessage + waitbuttonpress + release + end + +OldSeaMap_NoBagSpace: @ 867584F + vmessage sText_MysteryGiftOldSeaMapBagFull + waitmessage + waitbuttonpress + release + end + +OldSeaMap_Obtained: @ 8675858 + vmessage sText_MysteryGiftOldSeaMapThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftOldSeaMapForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Let me confirm--you are {PLAYER}?\p" + .string "We received this OLD SEA MAP\n" + .string "addressed to you.$" + +sText_MysteryGiftOldSeaMapUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysteryGiftOldSeaMapThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysteryGiftOldSeaMapBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/meventmsg_pichu.inc b/data/scripts/meventmsg_pichu.inc new file mode 100644 index 000000000..4df317564 --- /dev/null +++ b/data/scripts/meventmsg_pichu.inc @@ -0,0 +1,79 @@ +MysteryEventScript_SurfPichu:: @ 8674D3D + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_ne SurfPichu_GiveIfPossible + returnram + +SurfPichu_GiveIfPossible: @ 8674D4C + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg + lock + faceplayer + vmessage sText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare MUS_FANFA4 + waitfanfare + release + end + +SurfPichu_FullParty: @ 8674D73 + lock + faceplayer + vmessage sText_FullParty + waitmessage + waitbuttonpress + release + end + +SurfPichu_GiveEgg: @ 8674D7E + giveegg SPECIES_PICHU + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if_eq SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if_eq SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if_eq SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if_eq SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if_eq SurfPichu_Slot5 + return + +SurfPichu_Slot1: @ 8674DC0 + setmonmove 1, 2, MOVE_SURF + return + +SurfPichu_Slot2:: @ 8674DC6 + setmonmove 2, 2, MOVE_SURF + return + +SurfPichu_Slot3: @ 8674DCC + setmonmove 3, 2, MOVE_SURF + return + +SurfPichu_Slot4: @ 8674DD2 + setmonmove 4, 2, MOVE_SURF + return + +SurfPichu_Slot5: @ 8674DD8 + setmonmove 5, 2, MOVE_SURF + return + +sText_MysteryGiftEgg: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "From the POKéMON CENTER we\n" + .string "have a gift--a POKéMON EGG!\p" + .string "Please raise it with love and\n" + .string "kindness.$" + +sText_FullParty: + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" diff --git a/data/scripts/meventmsg_stamp_card.inc b/data/scripts/meventmsg_stamp_card.inc new file mode 100644 index 000000000..dcef80a50 --- /dev/null +++ b/data/scripts/meventmsg_stamp_card.inc @@ -0,0 +1,21 @@ +MysteryEventScript_StampCard:: @ 8674CB0 + setvaddress MysteryEventScript_StampCard + setorcopyvar VAR_RESULT, GET_MAX_STAMPS + specialvar VAR_0x8008, GetMysteryEventCardVal + setorcopyvar VAR_RESULT, GET_NUM_STAMPS + specialvar VAR_0x8009, GetMysteryEventCardVal + subvar VAR_0x8008, VAR_0x8009 + buffernumberstring 0, VAR_0x8008 + lock + faceplayer + vmessage sText_MysteryGiftStampCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftStampCard: + .string "Thank you for using the STAMP CARD\n" + .string "System.\p" + .string "You have {STR_VAR_1} more to collect to\n" + .string "fill your STAMP CARD.$" diff --git a/data/scripts/meventmsg_trainer.inc b/data/scripts/meventmsg_trainer.inc new file mode 100644 index 000000000..1b0117078 --- /dev/null +++ b/data/scripts/meventmsg_trainer.inc @@ -0,0 +1,49 @@ +MysteryEventScript_VisitingTrainer:: @ 8674EC1 + setvaddress MysteryEventScript_VisitingTrainer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerInstructions + waitmessage + waitbuttonpress + release + end + +MysteryEventScript_VisitingTrainerArrived: @ 8674EDF + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerArrived + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftVisitingTrainerInstructions: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "By holding this WONDER CARD, you\n" + .string "may take part in a survey at a\l" + .string "POKéMON MART.\p" + .string "Use these surveys to invite\n" + .string "TRAINERS to SOOTOPOLIS CITY.\p" + .string "…Let me give you a secret\n" + .string "password for a survey:\p" + .string "“GIVE ME\n" + .string "AWESOME TRAINER”\p" + .string "Write that in on a survey and send\n" + .string "it to the WIRELESS\l" + .string "COMMUNICATION SYSTEM.$" + +sText_MysteryGiftVisitingTrainerArrived: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "A TRAINER has arrived in\n" + .string "SOOTOPOLIS CITY looking for you.\p" + .string "We hope you will enjoy\n" + .string "battling the visiting TRAINER.\p" + .string "You may invite other TRAINERS by\n" + .string "entering other passwords.\p" + .string "Try looking for other passwords\n" + .string "that may work.$" -- cgit v1.2.3 From 37bd93ec6c3890048e49bada3e41127fd3fcea4f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 18:19:18 -0500 Subject: Rename mystery event msg scripts --- data/scripts/mevent_altering_cave.inc | 24 ++++++++++ data/scripts/mevent_aurora_ticket.inc | 61 ++++++++++++++++++++++++ data/scripts/mevent_battle_card.inc | 47 +++++++++++++++++++ data/scripts/mevent_mystic_ticket.inc | 63 +++++++++++++++++++++++++ data/scripts/mevent_old_sea_map.inc | 62 +++++++++++++++++++++++++ data/scripts/mevent_pichu.inc | 79 ++++++++++++++++++++++++++++++++ data/scripts/mevent_stamp_card.inc | 21 +++++++++ data/scripts/mevent_trainer.inc | 49 ++++++++++++++++++++ data/scripts/meventmsg_altering_cave.inc | 24 ---------- data/scripts/meventmsg_aurora_ticket.inc | 61 ------------------------ data/scripts/meventmsg_battle_card.inc | 47 ------------------- data/scripts/meventmsg_mystic_ticket.inc | 63 ------------------------- data/scripts/meventmsg_old_sea_map.inc | 62 ------------------------- data/scripts/meventmsg_pichu.inc | 79 -------------------------------- data/scripts/meventmsg_stamp_card.inc | 21 --------- data/scripts/meventmsg_trainer.inc | 49 -------------------- 16 files changed, 406 insertions(+), 406 deletions(-) create mode 100644 data/scripts/mevent_altering_cave.inc create mode 100644 data/scripts/mevent_aurora_ticket.inc create mode 100644 data/scripts/mevent_battle_card.inc create mode 100644 data/scripts/mevent_mystic_ticket.inc create mode 100644 data/scripts/mevent_old_sea_map.inc create mode 100644 data/scripts/mevent_pichu.inc create mode 100644 data/scripts/mevent_stamp_card.inc create mode 100644 data/scripts/mevent_trainer.inc delete mode 100644 data/scripts/meventmsg_altering_cave.inc delete mode 100644 data/scripts/meventmsg_aurora_ticket.inc delete mode 100644 data/scripts/meventmsg_battle_card.inc delete mode 100644 data/scripts/meventmsg_mystic_ticket.inc delete mode 100644 data/scripts/meventmsg_old_sea_map.inc delete mode 100644 data/scripts/meventmsg_pichu.inc delete mode 100644 data/scripts/meventmsg_stamp_card.inc delete mode 100644 data/scripts/meventmsg_trainer.inc (limited to 'data/scripts') diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc new file mode 100644 index 000000000..072005934 --- /dev/null +++ b/data/scripts/mevent_altering_cave.inc @@ -0,0 +1,24 @@ +MysteryEventScript_AlteringCave:: @ 86756E3 + setvaddress MysteryEventScript_AlteringCave + addvar VAR_ALTERING_CAVE_WILD_SET, 1 + compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if_ne MysteryEventScript_AlteringCave_ + setvar VAR_ALTERING_CAVE_WILD_SET, 0 +MysteryEventScript_AlteringCave_: @ 86756FD + lock + faceplayer + vmessage sText_MysteryGiftAlteringCave + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftAlteringCave:: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "There appears to be a rumor about\n" + .string "rare POKéMON sightings.\p" + .string "The sightings reportedly came from\n" + .string "the ALTERING CAVE on ROUTE 103.\p" + .string "Perhaps it would be worthwhile for\n" + .string "you to investigate this rumor.$" diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc new file mode 100644 index 000000000..811c840aa --- /dev/null +++ b/data/scripts/mevent_aurora_ticket.inc @@ -0,0 +1,61 @@ +MysteryEventScript_AuroraTicket:: @ 867533C + setvaddress MysteryEventScript_AuroraTicket + lock + faceplayer + checkflag FLAG_RECEIVED_AURORA_TICKET + vgoto_if_eq AuroraTicket_Obtained + checkflag FLAG_BATTLED_DEOXYS + vgoto_if_eq AuroraTicket_Obtained + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained + vmessage sText_AuroraTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace + giveitem_std ITEM_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND + setflag FLAG_RECEIVED_AURORA_TICKET + vmessage sText_AuroraTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +AuroraTicket_NoBagSpace: @ 8675397 + vmessage sText_AuroraTicketBagFull + waitmessage + waitbuttonpress + release + end + +AuroraTicket_Obtained: @ 86753A0 + vmessage sText_AuroraTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_AuroraTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_AuroraTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_AuroraTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_AuroraTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc new file mode 100644 index 000000000..8c36ed63a --- /dev/null +++ b/data/scripts/mevent_battle_card.inc @@ -0,0 +1,47 @@ +MysteryEventScript_BattleCard:: @ 867513C + setvaddress MysteryEventScript_BattleCard + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_eq MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON + specialvar VAR_0x8008, GetMysteryEventCardVal + compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES + vgoto_if_ne MysteryEventScript_BattleCardInfo + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard_WonPrize + waitmessage + waitbuttonpress + giveitem_std ITEM_POTION + release + setflag FLAG_MYSTERY_EVENT_DONE + end + +MysteryEventScript_BattleCardInfo: @ 8675179 + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftBattleCountCard: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Your BATTLE COUNT CARD keeps\n" + .string "track of your battle record against\l" + .string "TRAINERS with the same CARD.\p" + .string "Look for and battle TRAINERS who\n" + .string "have the same CARD as you.\p" + .string "You may check the overall rankings\n" + .string "by reading the NEWS.\p" + .string "Please do give it a try!$" + +sText_MysteryGiftBattleCountCard_WonPrize: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Congratulations!\p" + .string "You have won a prize for winning\n" + .string "three battles!\p" + .string "We hope you will be inspired to\n" + .string "battle some more.$" diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc new file mode 100644 index 000000000..0264fb77f --- /dev/null +++ b/data/scripts/mevent_mystic_ticket.inc @@ -0,0 +1,63 @@ +MysteryEventScript_MysticTicket:: @ 867550B + setvaddress MysteryEventScript_MysticTicket + lock + faceplayer + checkflag FLAG_RECEIVED_MYSTIC_TICKET + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_LUGIA + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_HO_OH + vgoto_if_eq MysticTicket_Obtained + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained + vmessage sText_MysticTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace + giveitem_std ITEM_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK + setflag FLAG_RECEIVED_MYSTIC_TICKET + vmessage sText_MysticTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +MysticTicket_NoBagSpace: @ 867556F + vmessage sText_MysticTicketBagFull + waitmessage + waitbuttonpress + release + end + +MysticTicket_Obtained: @ 8675578 + vmessage sText_MysticTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysticTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_MysticTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysticTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysticTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc new file mode 100644 index 000000000..dffb56caa --- /dev/null +++ b/data/scripts/mevent_old_sea_map.inc @@ -0,0 +1,62 @@ +MysteryEventScript_OldSeaMap:: @ 86757F4 + setvaddress MysteryEventScript_OldSeaMap + lock + faceplayer + checkflag FLAG_RECEIVED_OLD_SEA_MAP + vgoto_if_eq OldSeaMap_Obtained + checkflag FLAG_CAUGHT_MEW + vgoto_if_eq OldSeaMap_Obtained + checkitem ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq OldSeaMap_Obtained + vmessage sText_MysteryGiftOldSeaMapForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq OldSeaMap_NoBagSpace + giveitem_std ITEM_OLD_SEA_MAP + setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND + setflag FLAG_RECEIVED_OLD_SEA_MAP + vmessage sText_MysteryGiftOldSeaMapUseAtPort + waitmessage + waitbuttonpress + release + end + +OldSeaMap_NoBagSpace: @ 867584F + vmessage sText_MysteryGiftOldSeaMapBagFull + waitmessage + waitbuttonpress + release + end + +OldSeaMap_Obtained: @ 8675858 + vmessage sText_MysteryGiftOldSeaMapThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftOldSeaMapForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Let me confirm--you are {PLAYER}?\p" + .string "We received this OLD SEA MAP\n" + .string "addressed to you.$" + +sText_MysteryGiftOldSeaMapUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysteryGiftOldSeaMapThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysteryGiftOldSeaMapBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc new file mode 100644 index 000000000..4df317564 --- /dev/null +++ b/data/scripts/mevent_pichu.inc @@ -0,0 +1,79 @@ +MysteryEventScript_SurfPichu:: @ 8674D3D + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_ne SurfPichu_GiveIfPossible + returnram + +SurfPichu_GiveIfPossible: @ 8674D4C + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg + lock + faceplayer + vmessage sText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare MUS_FANFA4 + waitfanfare + release + end + +SurfPichu_FullParty: @ 8674D73 + lock + faceplayer + vmessage sText_FullParty + waitmessage + waitbuttonpress + release + end + +SurfPichu_GiveEgg: @ 8674D7E + giveegg SPECIES_PICHU + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if_eq SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if_eq SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if_eq SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if_eq SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if_eq SurfPichu_Slot5 + return + +SurfPichu_Slot1: @ 8674DC0 + setmonmove 1, 2, MOVE_SURF + return + +SurfPichu_Slot2:: @ 8674DC6 + setmonmove 2, 2, MOVE_SURF + return + +SurfPichu_Slot3: @ 8674DCC + setmonmove 3, 2, MOVE_SURF + return + +SurfPichu_Slot4: @ 8674DD2 + setmonmove 4, 2, MOVE_SURF + return + +SurfPichu_Slot5: @ 8674DD8 + setmonmove 5, 2, MOVE_SURF + return + +sText_MysteryGiftEgg: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "From the POKéMON CENTER we\n" + .string "have a gift--a POKéMON EGG!\p" + .string "Please raise it with love and\n" + .string "kindness.$" + +sText_FullParty: + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" diff --git a/data/scripts/mevent_stamp_card.inc b/data/scripts/mevent_stamp_card.inc new file mode 100644 index 000000000..dcef80a50 --- /dev/null +++ b/data/scripts/mevent_stamp_card.inc @@ -0,0 +1,21 @@ +MysteryEventScript_StampCard:: @ 8674CB0 + setvaddress MysteryEventScript_StampCard + setorcopyvar VAR_RESULT, GET_MAX_STAMPS + specialvar VAR_0x8008, GetMysteryEventCardVal + setorcopyvar VAR_RESULT, GET_NUM_STAMPS + specialvar VAR_0x8009, GetMysteryEventCardVal + subvar VAR_0x8008, VAR_0x8009 + buffernumberstring 0, VAR_0x8008 + lock + faceplayer + vmessage sText_MysteryGiftStampCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftStampCard: + .string "Thank you for using the STAMP CARD\n" + .string "System.\p" + .string "You have {STR_VAR_1} more to collect to\n" + .string "fill your STAMP CARD.$" diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc new file mode 100644 index 000000000..1b0117078 --- /dev/null +++ b/data/scripts/mevent_trainer.inc @@ -0,0 +1,49 @@ +MysteryEventScript_VisitingTrainer:: @ 8674EC1 + setvaddress MysteryEventScript_VisitingTrainer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerInstructions + waitmessage + waitbuttonpress + release + end + +MysteryEventScript_VisitingTrainerArrived: @ 8674EDF + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerArrived + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftVisitingTrainerInstructions: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "By holding this WONDER CARD, you\n" + .string "may take part in a survey at a\l" + .string "POKéMON MART.\p" + .string "Use these surveys to invite\n" + .string "TRAINERS to SOOTOPOLIS CITY.\p" + .string "…Let me give you a secret\n" + .string "password for a survey:\p" + .string "“GIVE ME\n" + .string "AWESOME TRAINER”\p" + .string "Write that in on a survey and send\n" + .string "it to the WIRELESS\l" + .string "COMMUNICATION SYSTEM.$" + +sText_MysteryGiftVisitingTrainerArrived: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "A TRAINER has arrived in\n" + .string "SOOTOPOLIS CITY looking for you.\p" + .string "We hope you will enjoy\n" + .string "battling the visiting TRAINER.\p" + .string "You may invite other TRAINERS by\n" + .string "entering other passwords.\p" + .string "Try looking for other passwords\n" + .string "that may work.$" diff --git a/data/scripts/meventmsg_altering_cave.inc b/data/scripts/meventmsg_altering_cave.inc deleted file mode 100644 index 072005934..000000000 --- a/data/scripts/meventmsg_altering_cave.inc +++ /dev/null @@ -1,24 +0,0 @@ -MysteryEventScript_AlteringCave:: @ 86756E3 - setvaddress MysteryEventScript_AlteringCave - addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 - vgoto_if_ne MysteryEventScript_AlteringCave_ - setvar VAR_ALTERING_CAVE_WILD_SET, 0 -MysteryEventScript_AlteringCave_: @ 86756FD - lock - faceplayer - vmessage sText_MysteryGiftAlteringCave - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftAlteringCave:: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "There appears to be a rumor about\n" - .string "rare POKéMON sightings.\p" - .string "The sightings reportedly came from\n" - .string "the ALTERING CAVE on ROUTE 103.\p" - .string "Perhaps it would be worthwhile for\n" - .string "you to investigate this rumor.$" diff --git a/data/scripts/meventmsg_aurora_ticket.inc b/data/scripts/meventmsg_aurora_ticket.inc deleted file mode 100644 index 811c840aa..000000000 --- a/data/scripts/meventmsg_aurora_ticket.inc +++ /dev/null @@ -1,61 +0,0 @@ -MysteryEventScript_AuroraTicket:: @ 867533C - setvaddress MysteryEventScript_AuroraTicket - lock - faceplayer - checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if_eq AuroraTicket_Obtained - checkflag FLAG_BATTLED_DEOXYS - vgoto_if_eq AuroraTicket_Obtained - checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, TRUE - vgoto_if_eq AuroraTicket_Obtained - vmessage sText_AuroraTicketForYou - waitmessage - waitbuttonpress - checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, FALSE - vgoto_if_eq AuroraTicket_NoBagSpace - giveitem_std ITEM_AURORA_TICKET - setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND - setflag FLAG_RECEIVED_AURORA_TICKET - vmessage sText_AuroraTicketUseAtPort - waitmessage - waitbuttonpress - release - end - -AuroraTicket_NoBagSpace: @ 8675397 - vmessage sText_AuroraTicketBagFull - waitmessage - waitbuttonpress - release - end - -AuroraTicket_Obtained: @ 86753A0 - vmessage sText_AuroraTicketThankYou - waitmessage - waitbuttonpress - release - end - -sText_AuroraTicketForYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "You must be {PLAYER}.\n" - .string "There is a ticket here for you.$" - -sText_AuroraTicketUseAtPort: - .string "It appears to be for use at the\n" - .string "LILYCOVE CITY port.\p" - .string "Why not give it a try and see what\n" - .string "it is about?$" - -sText_AuroraTicketThankYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.$" - -sText_AuroraTicketBagFull: - .string "Oh, I'm sorry, {PLAYER}.\n" - .string "Your BAG's KEY ITEMS POCKET is full.\p" - .string "Please store something on your PC,\n" - .string "then come back for this.$" diff --git a/data/scripts/meventmsg_battle_card.inc b/data/scripts/meventmsg_battle_card.inc deleted file mode 100644 index 8c36ed63a..000000000 --- a/data/scripts/meventmsg_battle_card.inc +++ /dev/null @@ -1,47 +0,0 @@ -MysteryEventScript_BattleCard:: @ 867513C - setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_eq MysteryEventScript_BattleCardInfo - setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON - specialvar VAR_0x8008, GetMysteryEventCardVal - compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES - vgoto_if_ne MysteryEventScript_BattleCardInfo - lock - faceplayer - vmessage sText_MysteryGiftBattleCountCard_WonPrize - waitmessage - waitbuttonpress - giveitem_std ITEM_POTION - release - setflag FLAG_MYSTERY_EVENT_DONE - end - -MysteryEventScript_BattleCardInfo: @ 8675179 - lock - faceplayer - vmessage sText_MysteryGiftBattleCountCard - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftBattleCountCard: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "Your BATTLE COUNT CARD keeps\n" - .string "track of your battle record against\l" - .string "TRAINERS with the same CARD.\p" - .string "Look for and battle TRAINERS who\n" - .string "have the same CARD as you.\p" - .string "You may check the overall rankings\n" - .string "by reading the NEWS.\p" - .string "Please do give it a try!$" - -sText_MysteryGiftBattleCountCard_WonPrize: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "Congratulations!\p" - .string "You have won a prize for winning\n" - .string "three battles!\p" - .string "We hope you will be inspired to\n" - .string "battle some more.$" diff --git a/data/scripts/meventmsg_mystic_ticket.inc b/data/scripts/meventmsg_mystic_ticket.inc deleted file mode 100644 index 0264fb77f..000000000 --- a/data/scripts/meventmsg_mystic_ticket.inc +++ /dev/null @@ -1,63 +0,0 @@ -MysteryEventScript_MysticTicket:: @ 867550B - setvaddress MysteryEventScript_MysticTicket - lock - faceplayer - checkflag FLAG_RECEIVED_MYSTIC_TICKET - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_LUGIA - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_HO_OH - vgoto_if_eq MysticTicket_Obtained - checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, TRUE - vgoto_if_eq MysticTicket_Obtained - vmessage sText_MysticTicketForYou - waitmessage - waitbuttonpress - checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, FALSE - vgoto_if_eq MysticTicket_NoBagSpace - giveitem_std ITEM_MYSTIC_TICKET - setflag FLAG_ENABLE_SHIP_NAVEL_ROCK - setflag FLAG_RECEIVED_MYSTIC_TICKET - vmessage sText_MysticTicketUseAtPort - waitmessage - waitbuttonpress - release - end - -MysticTicket_NoBagSpace: @ 867556F - vmessage sText_MysticTicketBagFull - waitmessage - waitbuttonpress - release - end - -MysticTicket_Obtained: @ 8675578 - vmessage sText_MysticTicketThankYou - waitmessage - waitbuttonpress - release - end - -sText_MysticTicketForYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "You must be {PLAYER}.\n" - .string "There is a ticket here for you.$" - -sText_MysticTicketUseAtPort: - .string "It appears to be for use at the\n" - .string "LILYCOVE CITY port.\p" - .string "Why not give it a try and see what\n" - .string "it is about?$" - -sText_MysticTicketThankYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.$" - -sText_MysticTicketBagFull: - .string "Oh, I'm sorry, {PLAYER}.\n" - .string "Your BAG's KEY ITEMS POCKET is full.\p" - .string "Please store something on your PC,\n" - .string "then come back for this.$" diff --git a/data/scripts/meventmsg_old_sea_map.inc b/data/scripts/meventmsg_old_sea_map.inc deleted file mode 100644 index dffb56caa..000000000 --- a/data/scripts/meventmsg_old_sea_map.inc +++ /dev/null @@ -1,62 +0,0 @@ -MysteryEventScript_OldSeaMap:: @ 86757F4 - setvaddress MysteryEventScript_OldSeaMap - lock - faceplayer - checkflag FLAG_RECEIVED_OLD_SEA_MAP - vgoto_if_eq OldSeaMap_Obtained - checkflag FLAG_CAUGHT_MEW - vgoto_if_eq OldSeaMap_Obtained - checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, TRUE - vgoto_if_eq OldSeaMap_Obtained - vmessage sText_MysteryGiftOldSeaMapForYou - waitmessage - waitbuttonpress - checkitemspace ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, FALSE - vgoto_if_eq OldSeaMap_NoBagSpace - giveitem_std ITEM_OLD_SEA_MAP - setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND - setflag FLAG_RECEIVED_OLD_SEA_MAP - vmessage sText_MysteryGiftOldSeaMapUseAtPort - waitmessage - waitbuttonpress - release - end - -OldSeaMap_NoBagSpace: @ 867584F - vmessage sText_MysteryGiftOldSeaMapBagFull - waitmessage - waitbuttonpress - release - end - -OldSeaMap_Obtained: @ 8675858 - vmessage sText_MysteryGiftOldSeaMapThankYou - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftOldSeaMapForYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "Let me confirm--you are {PLAYER}?\p" - .string "We received this OLD SEA MAP\n" - .string "addressed to you.$" - -sText_MysteryGiftOldSeaMapUseAtPort: - .string "It appears to be for use at the\n" - .string "LILYCOVE CITY port.\p" - .string "Why not give it a try and see what\n" - .string "it is about?$" - -sText_MysteryGiftOldSeaMapThankYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.$" - -sText_MysteryGiftOldSeaMapBagFull: - .string "Oh, I'm sorry, {PLAYER}.\n" - .string "Your BAG's KEY ITEMS POCKET is full.\p" - .string "Please store something on your PC,\n" - .string "then come back for this.$" diff --git a/data/scripts/meventmsg_pichu.inc b/data/scripts/meventmsg_pichu.inc deleted file mode 100644 index 4df317564..000000000 --- a/data/scripts/meventmsg_pichu.inc +++ /dev/null @@ -1,79 +0,0 @@ -MysteryEventScript_SurfPichu:: @ 8674D3D - setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_ne SurfPichu_GiveIfPossible - returnram - -SurfPichu_GiveIfPossible: @ 8674D4C - specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE - vgoto_if_eq SurfPichu_FullParty - setflag FLAG_MYSTERY_EVENT_DONE - vcall SurfPichu_GiveEgg - lock - faceplayer - vmessage sText_MysteryGiftEgg - waitmessage - waitbuttonpress - playfanfare MUS_FANFA4 - waitfanfare - release - end - -SurfPichu_FullParty: @ 8674D73 - lock - faceplayer - vmessage sText_FullParty - waitmessage - waitbuttonpress - release - end - -SurfPichu_GiveEgg: @ 8674D7E - giveegg SPECIES_PICHU - setmonobedient VAR_EVENT_PICHU_SLOT - setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 - vgoto_if_eq SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 - vgoto_if_eq SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 - vgoto_if_eq SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 - vgoto_if_eq SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 - vgoto_if_eq SurfPichu_Slot5 - return - -SurfPichu_Slot1: @ 8674DC0 - setmonmove 1, 2, MOVE_SURF - return - -SurfPichu_Slot2:: @ 8674DC6 - setmonmove 2, 2, MOVE_SURF - return - -SurfPichu_Slot3: @ 8674DCC - setmonmove 3, 2, MOVE_SURF - return - -SurfPichu_Slot4: @ 8674DD2 - setmonmove 4, 2, MOVE_SURF - return - -SurfPichu_Slot5: @ 8674DD8 - setmonmove 5, 2, MOVE_SURF - return - -sText_MysteryGiftEgg: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "From the POKéMON CENTER we\n" - .string "have a gift--a POKéMON EGG!\p" - .string "Please raise it with love and\n" - .string "kindness.$" - -sText_FullParty: - .string "Oh, your party appears to be full.\p" - .string "Please come see me after storing\n" - .string "a POKéMON on a PC.$" diff --git a/data/scripts/meventmsg_stamp_card.inc b/data/scripts/meventmsg_stamp_card.inc deleted file mode 100644 index dcef80a50..000000000 --- a/data/scripts/meventmsg_stamp_card.inc +++ /dev/null @@ -1,21 +0,0 @@ -MysteryEventScript_StampCard:: @ 8674CB0 - setvaddress MysteryEventScript_StampCard - setorcopyvar VAR_RESULT, GET_MAX_STAMPS - specialvar VAR_0x8008, GetMysteryEventCardVal - setorcopyvar VAR_RESULT, GET_NUM_STAMPS - specialvar VAR_0x8009, GetMysteryEventCardVal - subvar VAR_0x8008, VAR_0x8009 - buffernumberstring 0, VAR_0x8008 - lock - faceplayer - vmessage sText_MysteryGiftStampCard - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftStampCard: - .string "Thank you for using the STAMP CARD\n" - .string "System.\p" - .string "You have {STR_VAR_1} more to collect to\n" - .string "fill your STAMP CARD.$" diff --git a/data/scripts/meventmsg_trainer.inc b/data/scripts/meventmsg_trainer.inc deleted file mode 100644 index 1b0117078..000000000 --- a/data/scripts/meventmsg_trainer.inc +++ /dev/null @@ -1,49 +0,0 @@ -MysteryEventScript_VisitingTrainer:: @ 8674EC1 - setvaddress MysteryEventScript_VisitingTrainer - special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - vgoto_if_eq MysteryEventScript_VisitingTrainerArrived - lock - faceplayer - vmessage sText_MysteryGiftVisitingTrainerInstructions - waitmessage - waitbuttonpress - release - end - -MysteryEventScript_VisitingTrainerArrived: @ 8674EDF - lock - faceplayer - vmessage sText_MysteryGiftVisitingTrainerArrived - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftVisitingTrainerInstructions: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "By holding this WONDER CARD, you\n" - .string "may take part in a survey at a\l" - .string "POKéMON MART.\p" - .string "Use these surveys to invite\n" - .string "TRAINERS to SOOTOPOLIS CITY.\p" - .string "…Let me give you a secret\n" - .string "password for a survey:\p" - .string "“GIVE ME\n" - .string "AWESOME TRAINER”\p" - .string "Write that in on a survey and send\n" - .string "it to the WIRELESS\l" - .string "COMMUNICATION SYSTEM.$" - -sText_MysteryGiftVisitingTrainerArrived: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "A TRAINER has arrived in\n" - .string "SOOTOPOLIS CITY looking for you.\p" - .string "We hope you will enjoy\n" - .string "battling the visiting TRAINER.\p" - .string "You may invite other TRAINERS by\n" - .string "entering other passwords.\p" - .string "Try looking for other passwords\n" - .string "that may work.$" -- cgit v1.2.3 From 3a00b664070d67d0d5d16b4b9893c53101dec612 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 20:38:53 -0500 Subject: Document cave scripts --- data/scripts/new_game.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e39c6eca6..20a2b0222 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -166,7 +166,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT @@ -237,7 +237,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_HIDE_SKY_PILLAR_WALLACE setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT -- cgit v1.2.3 From 35ed8de51b0784e44560237248fc516f96e835df Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 12:37:11 -0500 Subject: Fix Battle Colosseum names --- data/scripts/cable_club.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ebb2e6ef0..9d3bccaf9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -388,9 +388,9 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD waitdooranim release compare VAR_0x8004, USING_MULTI_BATTLE - goto_if_eq CableClub_EventScript_WarpToDoubleColosseum + goto_if_eq CableClub_EventScript_WarpTo4PColosseum special SetCableClubWarp - warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 + warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8 special sub_80AF948 waitstate end @@ -401,9 +401,9 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B waitmovement 0 return -CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036 +CableClub_EventScript_WarpTo4PColosseum:: @ 8277036 special SetCableClubWarp - warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 + warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 special sub_80AF948 waitstate end @@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365 releaseall end -EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374 +EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374 setvar VAR_0x8005, 0 special ColosseumPlayerSpotTriggered waitstate end -EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E +EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E setvar VAR_0x8005, 1 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388 +EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 0 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3 +EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 1 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE +EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 2 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9 +EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 3 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4 +EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4 end EventScript_TradeCenter_Chair0:: @ 82773F5 @@ -854,9 +854,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C closemessage end -SingleBattleColosseum_EventScript_Attendant:: @ 82774A6 +BattleColosseum2P_EventScript_Attendant:: @ 82774A6 special Script_FacePlayer - msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT + msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT special Script_ClearHeldMovement closemessage end -- cgit v1.2.3 From 03a7995570766b96c942c08dbc7168d9daab4dc6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 13:28:33 -0500 Subject: Move hall of fame script --- data/scripts/hall_of_fame.inc | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 data/scripts/hall_of_fame.inc (limited to 'data/scripts') diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc new file mode 100644 index 000000000..c57358dd5 --- /dev/null +++ b/data/scripts/hall_of_fame.inc @@ -0,0 +1,53 @@ +EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 + special SetChampionSaveWarp + setflag FLAG_IS_CHAMPION + call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries + compare VAR_FOSSIL_MANIAC_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setvar VAR_STEVENS_HOUSE_STATE, 2 + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL + special UpdateTrainerFanClubGameClear + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent + return + +EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 + clearflag FLAG_DEFEATED_MEW + clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS + clearflag FLAG_DEFEATED_DEOXYS + clearflag FLAG_DEFEATED_LUGIA + clearflag FLAG_DEFEATED_HO_OH + return + +EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 + setvar VAR_FOSSIL_MANIAC_STATE, 1 + return + +EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + return + +EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD + return + +EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 + setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 + return -- cgit v1.2.3 From de933000e3c664459df7842d662841f2117b4f51 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 15:21:32 -0500 Subject: Document Lavaridge scripts --- data/scripts/field_poison.inc | 2 +- data/scripts/new_game.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 2ca9c7b06..40b4cf658 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9 special Script_FadeOutMapMusic waitstate fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter special SetCB2WhiteOut waitstate end diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e39c6eca6..eaef6d45a 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -199,8 +199,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE setflag FLAG_HIDE_ROUTE_104_RIVAL setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN -- cgit v1.2.3 From bef24a45f0249ba867a5a11f34e04c35c64cd9fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 02:03:45 -0500 Subject: Document Littleroot scripts --- data/scripts/players_house.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index acb1536e8..3a0675e5e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer - compare VAR_LITTLEROOT_HOUSES_STATE, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty @@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage - setvar VAR_LITTLEROOT_HOUSES_STATE, 4 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 releaseall end -- cgit v1.2.3 From e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:07:19 -0500 Subject: Resolve Littleroot merge conflict --- data/scripts/hall_of_fame.inc | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 data/scripts/hall_of_fame.inc (limited to 'data/scripts') diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc new file mode 100644 index 000000000..91a88f348 --- /dev/null +++ b/data/scripts/hall_of_fame.inc @@ -0,0 +1,53 @@ +EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 + special SetChampionSaveWarp + setflag FLAG_IS_CHAMPION + call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries + compare VAR_FOSSIL_MANIAC_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setvar VAR_STEVENS_HOUSE_STATE, 2 + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL + special UpdateTrainerFanClubGameClear + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent + return + +EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 + clearflag FLAG_DEFEATED_MEW + clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS + clearflag FLAG_DEFEATED_DEOXYS + clearflag FLAG_DEFEATED_LUGIA + clearflag FLAG_DEFEATED_HO_OH + return + +EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 + setvar VAR_FOSSIL_MANIAC_STATE, 1 + return + +EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + return + +EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD + return + +EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 + setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 + return -- cgit v1.2.3 From 1174a20a17aacab509cb4ea1df7b8c4689dfd4d4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 00:49:56 -0500 Subject: Document Fallarbor and Verdanturf scripts --- data/scripts/new_game.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index cba1c68ba..b1ecae203 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -138,9 +138,9 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_GYM_WALLY @@ -170,8 +170,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND + setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 -- cgit v1.2.3 From a38bff8c17fa416bb7d74db45de0d24a136e2706 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 03:07:32 -0500 Subject: Document Slateport scripts --- data/scripts/interview.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 8b2b72f75..5036e8ec9 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -105,7 +105,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 release end -SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 +SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943 lock faceplayer specialvar VAR_RESULT, sub_80EF8F8 -- cgit v1.2.3 From 06bb4ba4020fb50112e8a96c98e180ceeb115c15 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:42:14 -0500 Subject: Document Secret Power TM script --- data/scripts/secret_power_tm.inc | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index c89202ded..7be69ec58 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -1,4 +1,4 @@ -Route111_Text_2762C9: @ 82762C9 +Route111_Text_MakingRoomUseTMToMakeYourOwn: @ 82762C9 .string "What's that?\n" .string "What am I doing?\p" .string "I'm thinking about making my own room\n" @@ -6,7 +6,7 @@ Route111_Text_2762C9: @ 82762C9 .string "I know! I'll give you this TM.\n" .string "Will you use it to make your own room?$" -Route111_Text_27636E: @ 827636E +Route111_Text_ExplainSecretPower: @ 827636E .string "Find a big tree that looks like it might\n" .string "drop some vines.\p" .string "Use SECRET POWER in front of the tree.\n" @@ -24,59 +24,59 @@ Route111_Text_27636E: @ 827636E .string "I'm going to look for other places, too.\n" .string "Okay, bye!$" -Route111_Text_27655C: @ 827655C +Route111_Text_DontWantThis: @ 827655C .string "Oh, you don't want this?\n" .string "If you change your mind, tell me, okay?$" -Route111_Text_27659D: @ 827659D +Route111_Text_DontHaveAnyRoom: @ 827659D .string "Oh, you don't have any room for this.\p" .string "I'll hold on to it, so come back for it\n" .string "another time, okay?$" -Route111_EventScript_2765FF:: @ 82765FF +Route111_EventScript_SecretPowerMan:: @ 82765FF lock faceplayer - msgbox Route111_Text_2762C9, MSGBOX_YESNO + msgbox Route111_Text_MakingRoomUseTMToMakeYourOwn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_EventScript_27661E - msgbox Route111_Text_27655C, MSGBOX_DEFAULT + goto_if_eq Route111_EventScript_GiveSecretPower + msgbox Route111_Text_DontWantThis, MSGBOX_DEFAULT release end -Route111_EventScript_27661E:: @ 827661E +Route111_EventScript_GiveSecretPower:: @ 827661E giveitem_std ITEM_TM43 - compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_276680 - msgbox Route111_Text_27636E, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route111_EventScript_NoRoomForSecretPower + msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, DIR_WEST - call_if_eq Route111_EventScript_27666A + call_if_eq Route111_EventScript_SecretPowerManExit compare VAR_FACING, DIR_EAST - call_if_eq Route111_EventScript_27666A + call_if_eq Route111_EventScript_SecretPowerManExit compare VAR_FACING, DIR_NORTH - call_if_eq Route111_EventScript_276675 + call_if_eq Route111_EventScript_SecretPowerManExitNorth removeobject VAR_LAST_TALKED release end -Route111_EventScript_27666A:: @ 827666A - applymovement VAR_LAST_TALKED, Route111_Movement_27668A +Route111_EventScript_SecretPowerManExit:: @ 827666A + applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit waitmovement 0 return -Route111_EventScript_276675:: @ 8276675 - applymovement VAR_LAST_TALKED, Route111_Movement_276696 +Route111_EventScript_SecretPowerManExitNorth:: @ 8276675 + applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth waitmovement 0 return -Route111_EventScript_276680:: @ 8276680 - msgbox Route111_Text_27659D, MSGBOX_DEFAULT +Route111_EventScript_NoRoomForSecretPower:: @ 8276680 + msgbox Route111_Text_DontHaveAnyRoom, MSGBOX_DEFAULT release end -Route111_Movement_27668A: @ 827668A +Route111_Movement_SecretPowerManExit: @ 827668A walk_down walk_down walk_down @@ -90,7 +90,7 @@ Route111_Movement_27668A: @ 827668A walk_down step_end -Route111_Movement_276696: @ 8276696 +Route111_Movement_SecretPowerManExitNorth: @ 8276696 walk_left walk_down walk_down -- cgit v1.2.3 From ae1767fe462ac1085d033e8b377a0f4f4ae86089 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:53:55 -0500 Subject: Document Mystery Event Club script --- data/scripts/mystery_event_club.inc | 90 +++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 44 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 1df0ed88c..6687bbd47 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,97 +1,98 @@ MysteryEventClub_EventScript_Man:: @ 8291539 lock faceplayer - goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5 + goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_GivenProfileBefore msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291552 + goto MysteryEventClub_EventScript_AskToSeeProfile end -MysteryEventClub_EventScript_291552:: @ 8291552 - msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT +MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552 + msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, MysteryEventClub_EventScript_29159F - case 1, MysteryEventClub_EventScript_2915EB - case 2, MysteryEventClub_EventScript_291591 - case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB + case 0, MysteryEventClub_EventScript_CreateProfile + case 1, MysteryEventClub_EventScript_DeclineShowProfile + case 2, MysteryEventClub_EventScript_Info + case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineShowProfile end -MysteryEventClub_EventScript_291591:: @ 8291591 +MysteryEventClub_EventScript_Info:: @ 8291591 msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291552 + goto MysteryEventClub_EventScript_AskToSeeProfile end -MysteryEventClub_EventScript_29159F:: @ 829159F - msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT +MysteryEventClub_EventScript_CreateProfile:: @ 829159F + msgbox MysteryEventClub_Text_LetsSeeItThen, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq MysteryEventClub_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_CancelShowProfile compare VAR_RESULT, 1 - goto_if_eq MysteryEventClub_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_ShowProfile end -MysteryEventClub_EventScript_2915CB:: @ 82915CB - msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT +MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB + msgbox MysteryEventClub_Text_NotIntoItRightNow, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_2915D5:: @ 82915D5 +MysteryEventClub_EventScript_ShowProfile:: @ 82915D5 setvar VAR_0x8004, 0 special sub_811EECC waitmessage delay 80 - msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT + msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_2915EB:: @ 82915EB - msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT +MysteryEventClub_EventScript_DeclineShowProfile:: @ 82915EB + msgbox MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_2915F5:: @ 82915F5 +MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5 msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291603 + goto MysteryEventClub_EventScript_AskToSeeNewProfile end -MysteryEventClub_EventScript_291603:: @ 8291603 +MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603 msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, MysteryEventClub_EventScript_291650 - case 1, MysteryEventClub_EventScript_29167C - case 2, MysteryEventClub_EventScript_291642 - case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C + case 0, MysteryEventClub_EventScript_CreateNewProfile + case 1, MysteryEventClub_EventScript_DeclineNewProfile + case 2, MysteryEventClub_EventScript_InfoNewProfile + case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineNewProfile end -MysteryEventClub_EventScript_291642:: @ 8291642 +MysteryEventClub_EventScript_InfoNewProfile:: @ 8291642 msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291603 + goto MysteryEventClub_EventScript_AskToSeeNewProfile end -MysteryEventClub_EventScript_291650:: @ 8291650 - msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT +MysteryEventClub_EventScript_CreateNewProfile:: @ 8291650 + msgbox MysteryEventClub_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq MysteryEventClub_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_CancelShowProfile compare VAR_RESULT, 1 - goto_if_eq MysteryEventClub_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_ShowProfile end -MysteryEventClub_EventScript_29167C:: @ 829167C - msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT +MysteryEventClub_EventScript_DeclineNewProfile:: @ 829167C + msgbox MysteryEventClub_Text_LikeProfileWayItIs, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_291686:: @ 8291686 +@ Unused +MysteryEventClub_EventScript_Ret:: @ 8291686 return MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687 @@ -100,7 +101,7 @@ MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687 .string "I have a hobby--collecting the profiles\n" .string "of POKéMON TRAINERS.$" -MysteryEventClub_Text_2916FF: @ 82916FF +MysteryEventClub_Text_MayISeeYourProfile: @ 82916FF .string "So, how about it?\n" .string "May I see your profile?$" @@ -123,16 +124,16 @@ MysteryEventClub_Text_EasyChatExplanation: @ 8291729 .string "Repeat for the remaining text choices,\n" .string "and you'll have your very own profile.$" -MysteryEventClub_Text_291969: @ 8291969 +MysteryEventClub_Text_LetsSeeItThen: @ 8291969 .string "Yes! Thank you!\n" .string "So, let's see it, then.$" -MysteryEventClub_Text_291991: @ 8291991 +MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile: @ 8291991 .string "Oh, no, really?\p" .string "I imagine someone like you would have\n" .string "a wonderful profile…$" -MysteryEventClub_Text_2919DC: @ 82919DC +MysteryEventClub_Text_NotIntoItRightNow: @ 82919DC .string "Oh? You're not into it right now?\p" .string "Well, anytime is good by me!$" @@ -143,17 +144,17 @@ MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F .string "May I see your new profile?$" -MysteryEventClub_Text_291A6B: @ 8291A6B +MysteryEventClub_Text_EvenBetterThanLastProfile: @ 8291A6B .string "Yes! Thank you!\p" .string "I hope it's even better than the profile\n" .string "you showed me before.$" -MysteryEventClub_Text_291ABA: @ 8291ABA +MysteryEventClub_Text_LikeProfileWayItIs: @ 8291ABA .string "Oh, you like your profile the way it is.\p" .string "I don't blame you--it's a wonderful\n" .string "profile the way it is now.$" -MysteryEventClub_Text_291B22: @ 8291B22 +MysteryEventClub_Text_FantasticProfile: @ 8291B22 .string "F-fantastic!\p" .string "Your profile, it's wonderful!\n" .string "It really says what you're about.\p" @@ -161,7 +162,8 @@ MysteryEventClub_Text_291B22: @ 8291B22 .string "be captivated by you!\p" .string "Thank you!$" -MysteryEventClub_Text_291BB7: @ 8291BB7 +@ Unused +MysteryEventClub_Text_YouKnowSecretSaying: @ 8291BB7 .string "Oh?\n" .string "You know the secret saying!\p" .string "That means you're now a fellow member\n" -- cgit v1.2.3 From a3ee92a4e7c59c6274b6d7a1c7239845f5bbb8ab Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 20:40:25 -0500 Subject: Document some frontier util funcs --- data/scripts/battle_pike.inc | 18 +++++++++--------- data/scripts/trainer_hill.inc | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 9892ffb7b..2a6da1a58 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -100,11 +100,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -181,11 +181,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -245,11 +245,11 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -276,7 +276,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D end BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -287,7 +287,7 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 0 special CallFrontierUtilFunc compare VAR_RESULT, 2 @@ -302,7 +302,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 special CallFrontierUtilFunc return diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 7d898a93d..db6105249 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -6,7 +6,7 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_TEMP_2, 0 setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, B_OUTCOME_LOST -- cgit v1.2.3 From 7455bd9b9a6c02e5ff567400fde3ea6315be5837 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 12 Nov 2019 12:55:46 -0500 Subject: Document interview and TV scripts, and misc script clean up --- data/scripts/day_care.inc | 7 +- data/scripts/interview.inc | 276 ++++++++++++++++++------------------ data/scripts/lilycove_lady.inc | 2 +- data/scripts/pc_transfer.inc | 2 +- data/scripts/pkmn_center_nurse.inc | 4 +- data/scripts/players_house.inc | 2 +- data/scripts/roulette.inc | 8 +- data/scripts/secret_base.inc | 4 +- data/scripts/shared_secret_base.inc | 16 +-- data/scripts/tv.inc | 58 ++++---- 10 files changed, 189 insertions(+), 190 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index b4c23a694..61763ba17 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -90,7 +90,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11 msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise - msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_FineThenComeAgain, MSGBOX_DEFAULT release end @@ -375,7 +375,7 @@ Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6 .string "My husband was looking for you.$" -Route117_PokemonDayCare_Text_292416: @ 8292416 +Route117_PokemonDayCare_Text_FineThenComeAgain: @ 8292416 .string "Oh, fine, then.\n" .string "Come again.$" @@ -402,7 +402,8 @@ Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF .string "Your POKéMON team is full.\n" .string "Make room, then come see me.$" -Route117_PokemonDayCare_Text_292527: @ 8292527 +@ Unused +Route117_PokemonDayCare_Text_TakeBackWhichMon: @ 8292527 .string "Which POKéMON will you take back?$" Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549 diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 5036e8ec9..4c97d7e03 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -1,27 +1,25 @@ -BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9 -LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9 -SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9 -SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9 +Interview_EventScript_EndInterview:: @ 828C7E9 special InterviewAfter incrementgamestat GAME_STAT_GOT_INTERVIEWED release end -SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 - setvar VAR_0x8005, 1 +@ Shares reporter object with TVSHOW_PKMN_FAN_CLUB_OPINIONS +SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0 + setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2 copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO + msgbox SlateportCity_PokemonFanClub_Text_InterviewRequest, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview2 compare VAR_RESULT, NO - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2 end -SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 - msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827 + msgbox SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE @@ -29,54 +27,54 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 lock faceplayer compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_SubmitResponse2 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2 end -SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C - msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_DeclineInterview2:: @ 828C85C + msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 - msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT - setvar VAR_0x8005, 1 - goto SlateportCity_PokemonFanClub_EventScript_28C7E9 +SlateportCity_PokemonFanClub_EventScript_SubmitResponse2:: @ 828C866 + msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2, MSGBOX_DEFAULT + setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER + goto Interview_EventScript_EndInterview end -SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 - msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2:: @ 828C879 + msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT release end SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883 lock faceplayer - setvar VAR_0x8005, 2 + setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed copyvar VAR_0x8009, VAR_0x8006 - goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO + msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequest, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview compare VAR_RESULT, NO - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview end -SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 - msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO +SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8 + msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview compare VAR_RESULT, NO - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview end -SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 - msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7 + msgbox SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE @@ -84,71 +82,71 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 lock faceplayer compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview end -SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C - msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview:: @ 828C91C + msgbox SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory, MSGBOX_DEFAULT release end -SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 - msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT - setvar VAR_0x8005, 2 - goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 +SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse:: @ 828C926 + msgbox SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview, MSGBOX_DEFAULT + setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS + goto Interview_EventScript_EndInterview end -SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 - msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed:: @ 828C939 + msgbox SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943 lock faceplayer - specialvar VAR_RESULT, sub_80EF8F8 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 - setvar VAR_0x8005, 3 + specialvar VAR_RESULT, IsLeadMonNicknamedOrNotEnglish + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname + setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO + msgbox SlateportCity_PokemonFanClub_Text_InterviewRequestHasName, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_AcceptInterview compare VAR_RESULT, NO - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview end -SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C - msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C + msgbox SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers, MSGBOX_DEFAULT random 3 copyvar VAR_0x800A, VAR_RESULT switch VAR_RESULT - case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 - case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 - case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF + case 0, SlateportCity_PokemonFanClub_EventScript_RandomQuestion1 + case 1, SlateportCity_PokemonFanClub_EventScript_RandomQuestion2 + case 2, SlateportCity_PokemonFanClub_EventScript_RandomQuestion3 end -SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 - msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED +SlateportCity_PokemonFanClub_EventScript_RandomQuestion1:: @ 828C9C3 + msgbox SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview end -SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 - msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED +SlateportCity_PokemonFanClub_EventScript_RandomQuestion2:: @ 828C9D1 + msgbox SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview end -SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF - msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED +SlateportCity_PokemonFanClub_EventScript_RandomQuestion3:: @ 828C9DF + msgbox SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview end -SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED +SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 @@ -156,48 +154,48 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED lock faceplayer compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview + msgbox SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou, MSGBOX_DEFAULT setvar VAR_0x8006, 1 call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview + msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview, MSGBOX_DEFAULT copyvar VAR_0x8007, VAR_0x800A - setvar VAR_0x8005, 3 - goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + setvar VAR_0x8005, TVSHOW_PKMN_FAN_CLUB_OPINIONS + goto Interview_EventScript_EndInterview end -SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 - msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_DeclineInterview:: @ 828CA45 + msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F - msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed:: @ 828CA4F + msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 +LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59 lock faceplayer - goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 - setvar VAR_0x8005, 6 + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed + setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed copyvar VAR_0x8009, VAR_0x8006 - msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO + msgbox LilycoveCity_ContestLobby_Text_InterviewRequest, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B + goto_if_eq LilycoveCity_ContestLobby_EventScript_AcceptInterview compare VAR_RESULT, NO - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview end -LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B - msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B + msgbox LilycoveCity_ContestLobby_Text_DescribeContest, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 @@ -205,20 +203,20 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B lock faceplayer compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA + goto_if_eq LilycoveCity_ContestLobby_EventScript_SubmitResponse compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview end -LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_DeclineInterview:: @ 828CAD0 + msgbox LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA +LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA setvar VAR_0x8004, 24 special SetContestCategoryStringVarForInterview - msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 @@ -226,22 +224,22 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA lock faceplayer compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview + msgbox LilycoveCity_ContestLobby_Text_ThatsAllForInterview, MSGBOX_DEFAULT setflag FLAG_TEMP_2 - setvar VAR_0x8005, 6 - goto LilycoveCity_ContestLobby_EventScript_28C7E9 + setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE + goto Interview_EventScript_EndInterview end -LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 - msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 828CB21 + msgbox LilycoveCity_ContestLobby_Text_LookingForwardToNextContest, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 - setvar VAR_0x8005, 6 + setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE special InterviewBefore compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 @@ -261,86 +259,86 @@ LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 return -BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 +BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96 lock faceplayer - goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A - setvar VAR_0x8005, 7 + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed + setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed copyvar VAR_0x8009, VAR_0x8006 - msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO + msgbox BattleFrontier_BattleTowerLobby_Text_InterviewRequest, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview compare VAR_RESULT, NO - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview end -BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 - message BattleFrontier_BattleTowerLobby_Text_27F7BA +BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8 + message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut waitmessage multichoice 20, 8, MULTI_SATISFACTION, 1 copyvar VAR_0x8008, VAR_RESULT compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Satisfied compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied + msgbox BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview end -BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E - msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview:: @ 828CC2E + msgbox BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 - msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_Satisfied:: @ 828CC38 + msgbox BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle, MSGBOX_DEFAULT return -BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied:: @ 828CC41 + msgbox BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned, MSGBOX_DEFAULT return -BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A +BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview + msgbox BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine, MSGBOX_DEFAULT setflag FLAG_TEMP_2 copyvar VAR_0x8004, VAR_0x8008 - setvar VAR_0x8005, 7 - goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 + setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE + goto Interview_EventScript_EndInterview end -BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_CancelInterview:: @ 828CC70 + msgbox BattleFrontier_BattleTowerLobby_Text_SilentType, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A - msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed:: @ 828CC7A + msgbox BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 +BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84 compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - setvar VAR_0x8005, 7 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter + setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER return -BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 +BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER return diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index b7b9d514a..f553ea0ad 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -298,7 +298,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724 special BufferQuizPrizeItem special SetQuizLadyState_Complete giveitem_std VAR_0x8005 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz end diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc index 594956a31..cc583022d 100644 --- a/data/scripts/pc_transfer.inc +++ b/data/scripts/pc_transfer.inc @@ -35,7 +35,7 @@ EventScript_SomeonesPCBoxFull:: @ 82737D4 EventScript_TransferredLanettesPC:: @ 82737E6 specialvar VAR_RESULT, ShouldShowBoxWasFullMessage - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_LanettesPCBoxFull msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 18b203d61..a26e9e22a 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -91,9 +91,9 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19 EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43 specialvar VAR_RESULT, IsPokerusInParty - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 3a0675e5e..1b706e603 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -346,7 +346,7 @@ PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51 goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT setflag FLAG_RECEIVED_AMULET_COIN diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc index 791069088..9aea65054 100644 --- a/data/scripts/roulette.inc +++ b/data/scripts/roulette.inc @@ -1,10 +1,10 @@ Roulette_EventScript_Table1:: @ 82A5AB1 checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 getpricereduction POKENEWS_GAME_CORNER - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Roulette_EventScript_Play addvar VAR_0x8004, 128 goto Roulette_EventScript_Play @@ -12,11 +12,11 @@ Roulette_EventScript_Table1:: @ 82A5AB1 Roulette_EventScript_Table2:: @ 82A5ADF checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 getpricereduction POKENEWS_GAME_CORNER - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Roulette_EventScript_Play addvar VAR_0x8004, 128 goto Roulette_EventScript_Play diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 04fab5598..617b19b42 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -27,7 +27,7 @@ SecretBase_Text_DiscoveredSmallEntrance: @ 8274883 SecretBase_EventScript_CheckEntrance:: @ 82759F1 special GetSecretBaseTypeInFrontOfPlayer special CheckPlayerHasSecretBase - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, VAR_RESULT @@ -185,7 +185,7 @@ SecretBase_EventScript_Enter:: @ 8275BB7 setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN special IsCurSecretBaseOwnedByAnotherPlayer - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq SecretBase_EventScript_EnterPlayersBase clearflag FLAG_DECORATION_0 special EnterSecretBase diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index 3a4c044a3..de5dcc703 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -1,25 +1,25 @@ SecretBase_MapScripts:: - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp - map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame - map_script MAP_SCRIPT_ON_RESUME, SecretBase_MapScript1_OnResume + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_OnWarp + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume .byte 0 -SecretBase_MapScript2_OnWarp: @ 823B498 +SecretBase_OnWarp: @ 823B498 map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations .2byte 0 -SecretBase_MapScript1_OnTransition: @ 823B4A2 +SecretBase_OnTransition: @ 823B4A2 call SecretBase_EventScript_SetDecorationFlags special SetSecretBaseOwnerGfxId special InitSecretBaseVars end -SecretBase_MapScript2_OnFrame: @ 823B4AE +SecretBase_OnFrame: @ 823B4AE map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance .2byte 0 -SecretBase_MapScript1_OnResume: @ 823B4B8 +SecretBase_OnResume: @ 823B4B8 setstepcallback STEP_CB_SECRET_BASE end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 427775a76..a2d5473b1 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,28 +7,28 @@ EventScript_TV:: @ 827EE0B goto_if_eq EventScript_PlayersHouseMovie compare VAR_RESULT, 1 goto_if_eq EventScript_PlayersHouseLatiNewsFlash - goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A - goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A + goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1 + goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1 specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring - compare VAR_RESULT, 1 - goto_if_eq EventScript_27EEFF - goto EventScript_27EEE9 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_DoInSearchOfTrainers + goto EventScript_TryDoPokeNews end -EventScript_27EE54:: @ 827EE54 - specialvar VAR_0x8004, special_0x44 +EventScript_TryDoTVShow:: @ 827EE54 + specialvar VAR_0x8004, GetRandomActiveShowIdx compare VAR_0x8004, 255 - goto_if_eq EventScript_27EED8 - specialvar VAR_RESULT, special_0x4a + goto_if_eq EventScript_MomDadMightLikeThis2 + specialvar VAR_RESULT, GetNextActiveShowIfMassOutbreak compare VAR_RESULT, 255 - goto_if_eq EventScript_27EED8 + goto_if_eq EventScript_MomDadMightLikeThis2 copyvar VAR_0x8004, VAR_RESULT - specialvar VAR_RESULT, special_0x45 + specialvar VAR_RESULT, GetSelectedTVShow compare VAR_RESULT, 0 - goto_if_ne EventScript_27EEBA + goto_if_ne EventScript_DoTVShow end -EventScript_27EE8A:: @ 827EE8A +EventScript_MomDadMightLikeThis1:: @ 827EE8A special GetMomOrDadStringForTVMessage msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT special TurnOffTVScreen @@ -40,11 +40,11 @@ EventScript_PlayersHouseMovie:: @ 827EE9A releaseall end +@ special InitRoamer is a junk call. Its input var (VAR_0x8004) hasn't been set, and +@ It's called again when Mom actually asks for the color, overwriting +@ whatever it does here. EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4 msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT - @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and - @ It's called again when Mom actually asks for the color, overwriting - @ whatever it does here. special InitRoamer clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING @@ -52,41 +52,41 @@ EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4 releaseall end -EventScript_27EEBA:: @ 827EEBA +EventScript_DoTVShow:: @ 827EEBA special DoTVShow waitmessage waitbuttonpress compare VAR_RESULT, 1 - goto_if_ne EventScript_27EEBA - goto EventScript_27EED0 + goto_if_ne EventScript_DoTVShow + goto EventScript_TurnOffTV end -EventScript_27EED0:: @ 827EED0 +EventScript_TurnOffTV:: @ 827EED0 special TurnOffTVScreen setflag FLAG_SYS_TV_WATCH releaseall end -EventScript_27EED8:: @ 827EED8 +EventScript_MomDadMightLikeThis2:: @ 827EED8 special GetMomOrDadStringForTVMessage msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT - goto EventScript_27EED0 + goto EventScript_TurnOffTV end -EventScript_27EEE9:: @ 827EEE9 +EventScript_TryDoPokeNews:: @ 827EEE9 special DoPokeNews - compare VAR_RESULT, 0 - goto_if_eq EventScript_27EE54 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_TryDoTVShow waitmessage waitbuttonpress - goto EventScript_27EED0 + goto EventScript_TurnOffTV end -EventScript_27EEFF:: @ 827EEFF +EventScript_DoInSearchOfTrainers:: @ 827EEFF special DoTVShowInSearchOfTrainers waitmessage waitbuttonpress compare VAR_RESULT, 0 - goto_if_eq EventScript_27EEFF - goto EventScript_27EED0 + goto_if_eq EventScript_DoInSearchOfTrainers + goto EventScript_TurnOffTV end -- cgit v1.2.3 From af83b41dd19a49121f23d188015959d8072e4d7f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 10 Nov 2019 10:59:15 -0500 Subject: Document Contest Hall berry blenders and misc --- data/scripts/berry_blender.inc | 747 ++++++++++++++++++++++++++++++++++++++++ data/scripts/contest_hall.inc | 4 +- data/scripts/interview.inc | 2 +- data/scripts/new_game.inc | 2 +- data/scripts/pokeblocks.inc | 759 ----------------------------------------- 5 files changed, 751 insertions(+), 763 deletions(-) create mode 100644 data/scripts/berry_blender.inc delete mode 100644 data/scripts/pokeblocks.inc (limited to 'data/scripts') diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc new file mode 100644 index 000000000..09b0eccac --- /dev/null +++ b/data/scripts/berry_blender.inc @@ -0,0 +1,747 @@ +LilycoveCity_ContestLobby_Text_WantToMakePokeblocks: @ 8292DEE + .string "Oh? Did you want to make some {POKEBLOCK}S\n" + .string "with this old-timer?$" + +LilycoveCity_ContestLobby_Text_Excellent: @ 8292E28 + .string "Excellent!$" + +LilycoveCity_ContestLobby_Text_MadeOldTimerSad: @ 8292E33 + .string "Oh…\n" + .string "You've made this old-timer sad…$" + +LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks: @ 8292E57 + .string "Do you know how to make a {POKEBLOCK}?$" + +LilycoveCity_ContestLobby_Text_LetsBerryBlender: @ 8292E78 + .string "Let's get started, then!\p" + .string "Let's BERRY BLENDER!$" + +LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6 + .string "Okay, a little explanation, then.\p" + .string "Oh, don't worry, it's quite simple.\p" + .string "When the BLENDER's arrow comes to\n" + .string "your marker, just press the A Button.\p" + .string "That's all you have to do.\n" + .string "You'll see how easy it is when you try.$" + +LilycoveCity_ContestLobby_Text_DontHaveAnyBerries: @ 8292F77 + .string "Oh?\n" + .string "You don't have any BERRIES?\p" + .string "If you don't have any BERRIES,\n" + .string "you can't make any {POKEBLOCK}S.$" + +LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries: @ 8292FD1 + .string "Well, that won't do at all now, will it?\p" + .string "If you don't mind leftovers, you can\n" + .string "have one of my BERRIES.\p" + .string "That way, we could make some {POKEBLOCK}S\n" + .string "together using the BERRY BLENDER.$" + +LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare: @ 829307D + .string "If I had some BERRIES left over,\n" + .string "I'd gladly give you one…\p" + .string "But, I don't have any to spare today.\n" + .string "We'll have to do this another time.$" + +LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull: @ 8293101 + .string "But your {POKEBLOCK} CASE is full.\p" + .string "You should use some {POKEBLOCK}S before\n" + .string "you come see me again.$" + +LilycoveCity_ContestLobby_Text_DontHavePokeblockCase: @ 8293157 + .string "But you don't have a {POKEBLOCK} CASE.\p" + .string "You should get a {POKEBLOCK} CASE and then\n" + .string "come see me.$" + +LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready: @ 82931AA + .string "Let's get blending already!$" + +LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet: @ 82931C6 + .string "I wonder what kind of {POKEBLOCK} I'll get?\n" + .string "This is so exciting!$" + +LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs: @ 8293201 + .string "Hi, there! Did you want to blend some\n" + .string "{POKEBLOCK}S with us?$" + +LilycoveCity_ContestLobby_Text_Okay: @ 8293237 + .string "Okay!$" + +LilycoveCity_ContestLobby_Text_ThatsTooBad: @ 829323D + .string "That's too bad…\p" + .string "But we'll always be around whenever\n" + .string "you get the urge to blend!$" + +LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2: @ 829328C + .string "Of course, you do know how to\n" + .string "blend {POKEBLOCK}S, don't you?$" + +LilycoveCity_ContestLobby_Text_LetsBerryBlender2: @ 82932C3 + .string "Let's get started, then!\p" + .string "Let's BERRY BLENDER!$" + +LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1 + .string "Okay!\n" + .string "Let me explain it to you!\p" + .string "When the spinning BLENDER's arrow\n" + .string "reaches your marker, just press\l" + .string "the A Button.\p" + .string "That's all it takes.\n" + .string "Pretty easy, don't you think?$" + +LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394 + .string "Oh, but wait a second here…\n" + .string "You don't have any BERRIES.\p" + .string "You can't make any {POKEBLOCK}S without\n" + .string "BERRIES…\p" + .string "We'll always be around whenever you\n" + .string "get hold of some BERRIES to blend.$" + +LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2: @ 829343E + .string "Oh, but wait a second here…\n" + .string "Your {POKEBLOCK} CASE is full.\p" + .string "You should use some {POKEBLOCK}S and\n" + .string "then come back.$" + +LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2: @ 82934A2 + .string "Oh, but wait a second here…\n" + .string "You don't have a {POKEBLOCK} CASE.\p" + .string "You should get a {POKEBLOCK} CASE and\n" + .string "then come back.$" + +@ Unused +LilycoveCity_ContestLobby_Text_MakePokeblocksWithOurGroup: @ 829350B + .string "Oh, hello! Did you want to make some\n" + .string "{POKEBLOCK}S with our little group?$" + +LilycoveCity_ContestLobby_Text_OhDear: @ 829354E + .string "Oh, dear!$" + +LilycoveCity_ContestLobby_Text_LeftUsInShock: @ 8293558 + .string "Oh, dear me…\p" + .string "You've left us in shock!$" + +LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3: @ 829357E + .string "Naturally, you know how to make\n" + .string "{POKEBLOCK}S, don't you?$" + +LilycoveCity_ContestLobby_Text_LetsBerryBlender3: @ 82935B1 + .string "Okay, dear!\n" + .string "Let's get started!\p" + .string "Let's BERRY BLENDER!$" + +LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5 + .string "Oh, dear!\p" + .string "Then, I'll explain it to you nicely.\p" + .string "When the BLENDER's arrow spins to\n" + .string "your marker, press the A Button.\p" + .string "That's all it takes.\n" + .string "Isn't it simple?$" + +LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D + .string "You don't have any BERRIES,\n" + .string "do you?\p" + .string "If you don't have any BERRIES,\n" + .string "you can't make any {POKEBLOCK}S.\p" + .string "We'll always be making {POKEBLOCK}S here,\n" + .string "so let's make some together when\l" + .string "you get a BERRY or two.$" + +LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3: @ 8293738 + .string "Your {POKEBLOCK} CASE is full,\n" + .string "it looks like.\p" + .string "You should use some {POKEBLOCK}S up\n" + .string "and then come back.$" + +LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3: @ 8293792 + .string "You haven't gotten a {POKEBLOCK} CASE\n" + .string "yet, it looks like.\p" + .string "You need to get a {POKEBLOCK} CASE before\n" + .string "you come back.$" + +LilycoveCity_ContestLobby_Text_SetNewBlenderRecord: @ 82937F9 + .string "Okay! Today's going to be the day that\n" + .string "I set a new BLENDER speed record!$" + +LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs: @ 8293842 + .string "Oh, dear!\n" + .string "You look as if you're good at blending.\l" + .string "Would you like to join us?$" + +LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks: @ 829388F + .string "I'm going to make delicious {POKEBLOCK}S\n" + .string "and make my POKéMON cuter.$" + +LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD + .string "{POKEBLOCK}S will be made with your friends \n" + .string "from BERRIES in the BERRY BLENDER.\p" + .string "Is it okay to save the game before\n" + .string "linking with your friends?$" + +LilycoveCity_ContestLobby_Text_SearchingForFriends: @ 8293955 + .string "Searching for your friends…\n" + .string "… … B Button: Cancel$" + +LilycoveCity_ContestLobby_Text_Player1Arrived: @ 8293986 + .string "{STR_VAR_1} arrived.$" + +LilycoveCity_ContestLobby_Text_Player1And2Arrived: @ 8293992 + .string "{STR_VAR_1} and {STR_VAR_2} arrived.$" + +LilycoveCity_ContestLobby_Text_AllPlayersArrived: @ 82939A5 + .string "{STR_VAR_1}, {STR_VAR_2}, and\n" + .string "{STR_VAR_3} arrived.$" + +LilycoveCity_ContestLobby_Text_NoBerriesLink: @ 82939BD + .string "You have no BERRIES.\n" + .string "The BERRY BLENDER can't be used.$" + +LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink: @ 82939F3 + .string "Your {POKEBLOCK} CASE is full.\n" + .string "The BERRY BLENDER can't be used.$" + +LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink: @ 8293A2D + .string "You don't have a {POKEBLOCK} CASE.\n" + .string "The BERRY BLENDER can't be used.$" + +LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks: @ 8293A6B + .string "I love making {POKEBLOCK}S.\p" + .string "I always have some BERRIES with me.$" + +LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5 + .string "If you'd like, we could make some\n" + .string "{POKEBLOCK}S together using the\l" + .string "BERRY BLENDER.$" + +LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0 + .string "Oh?\n" + .string "You don't have any BERRIES?\p" + .string "Well, that won't do at all now, will it?\p" + .string "If you don't mind leftovers, you can\n" + .string "have one of my BERRIES.$" + +LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether: @ 8293B76 + .string "We'll use it to make {POKEBLOCK}S together\n" + .string "using the BERRY BLENDER.$" + +LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4 + .string "Oh?\n" + .string "You don't have any BERRIES?\p" + .string "If I had some left over, I'd gladly\n" + .string "give you one…\p" + .string "But, I don't have any to spare today.\n" + .string "Sorry about that.$" + +LilycoveCity_ContestLobby_EventScript_BerryBlender1:: @ 8293C3E + lockall + goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, LilycoveCity_ContestLobby_EventScript_BlendMasterPresent + setvar VAR_0x8009, 1 + applymovement 16, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_WantToMakePokeblocks, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1 + goto LilycoveCity_ContestLobby_EventScript_DeclineBlender1 + end + +LilycoveCity_ContestLobby_EventScript_DeclineBlender1: @ 8293C70 + msgbox LilycoveCity_ContestLobby_Text_MadeOldTimerSad, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender1NoBerries: @ 8293C7A + msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries, MSGBOX_DEFAULT + dotimebasedevents + goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries + goto LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry + end + +LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries: @ 8293C92 + msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry: @ 8293C9C + msgbox LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT + giveitem_std ITEM_PECHA_BERRY + setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY + goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1 + end + +LilycoveCity_ContestLobby_EventScript_UseBerryBlender1: @ 8293CB9 + msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender1 + goto LilycoveCity_ContestLobby_EventScript_ExplainBlending1 + end + +LilycoveCity_ContestLobby_EventScript_StartBlender1: @ 8293CD2 + msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_ExplainBlending1: @ 8293CE0 + msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_StartBlender1 + end + +LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1: @ 8293CEE + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoCase + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1CaseFull + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoBerries + msgbox LilycoveCity_ContestLobby_Text_Excellent, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1 + end + +@ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left +LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C + copyvar VAR_0x8004, VAR_0x8009 + fadescreen 1 + special DoBerryBlending + waitstate + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender1CaseFull: @ 8293D39 + msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender1NoCase: @ 8293D43 + msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_BerryBlender2:: @ 8293D4D + lockall + setvar VAR_0x8009, 2 + applymovement 10, Common_Movement_FaceOriginalDirection + applymovement 3, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2 + goto LilycoveCity_ContestLobby_EventScript_DeclineBlender2 + end + +LilycoveCity_ContestLobby_EventScript_DeclineBlender2: @ 8293D7D + msgbox LilycoveCity_ContestLobby_Text_ThatsTooBad, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender2NoBerries: @ 8293D87 + msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_UseBerryBlender2: @ 8293D91 + msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender2 + goto LilycoveCity_ContestLobby_EventScript_ExplainBlending2 + end + +LilycoveCity_ContestLobby_EventScript_StartBlender2: @ 8293DAA + msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender2, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_ExplainBlending2: @ 8293DB8 + msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending2, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_StartBlender2 + end + +LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2: @ 8293DC6 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoBerries + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoCase + msgbox LilycoveCity_ContestLobby_Text_Okay, MSGBOX_DEFAULT + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, 65535 + goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender2 + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2CaseFull + end + +LilycoveCity_ContestLobby_EventScript_Blender2CaseFull: @ 8293E0A + msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender2NoCase: @ 8293E14 + msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_BerryBlender3:: @ 8293E1E + lockall + setvar VAR_0x8008, 15 + setvar VAR_0x8009, 3 + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 17, Common_Movement_FaceOriginalDirection + applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBlender3 + goto LilycoveCity_ContestLobby_EventScript_DeclineBlender3 + end + +LilycoveCity_ContestLobby_EventScript_DeclineBlender3: @ 8293E5A + msgbox LilycoveCity_ContestLobby_Text_LeftUsInShock, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender3NoBerries: @ 8293E64 + msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_UseBerryBlender3: @ 8293E6E + msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender3 + goto LilycoveCity_ContestLobby_EventScript_ExplainBlending3 + end + +LilycoveCity_ContestLobby_EventScript_StartBlender3: @ 8293E87 + msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender3, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_ExplainBlending3: @ 8293E95 + msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending3, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_StartBlender3 + end + +LilycoveCity_ContestLobby_EventScript_TryUseBlender3: @ 8293EA3 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoBerries + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoCase + msgbox LilycoveCity_ContestLobby_Text_OhDear, MSGBOX_DEFAULT + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, 65535 + goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender3 + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3CaseFull + end + +LilycoveCity_ContestLobby_EventScript_Blender3CaseFull: @ 8293EE7 + msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender3NoCase: @ 8293EF1 + msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_BlendMasterPresent: @ 8293EFB + lockall + setvar VAR_0x8009, 1 + msgbox LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster + msgbox LilycoveCity_ContestLobby_Text_TooBusyNowIsee, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries: @ 8293F1E + msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoBerries, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster: @ 8293F28 + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, 65535 + goto_if_ne LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull + end + +LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster: @ 8293F64 + msgbox LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO + compare VAR_RESULT, NO + call_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending + msgbox LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending: @ 8293F85 + msgbox LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT + return + +LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase: @ 8293F8E + msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull: @ 8293F98 + msgbox LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_Blender2Man:: @ 8293FA2 + msgbox LilycoveCity_ContestLobby_Text_SetNewBlenderRecord, MSGBOX_NPC + end + +LilycoveCity_ContestLobby_EventScript_Blender3PokefanF:: @ 8293FAB + msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC + end + +LilycoveCity_ContestLobby_EventScript_Blender2Twin:: @ 8293FB4 + msgbox LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks, MSGBOX_NPC + end + +LilycoveCity_ContestLobby_EventScript_Blender1ExpertM:: @ 8293FBD + setvar VAR_0x8008, 15 + goto LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry + end + +LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry: @ 8293FC8 + lock + faceplayer + msgbox LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries + end + +LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries: @ 8293FEE + msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries: @ 8293FF8 + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries + dotimebasedevents + goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries + goto LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry + end + +LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries: @ 8294028 + msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry: @ 8294032 + msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT + giveitem_std ITEM_PECHA_BERRY + setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY + msgbox LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace: @ 8294053 + walk_in_place_fastest_right + step_end + +LilycoveCity_ContestLobby_EventScript_BerryBlenderLink:: @ 8294055 + lockall + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, 65535 + goto_if_ne LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame + compare VAR_RESULT, 65535 + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull + end + +LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame: @ 8294092 + msgbox LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender + end + +LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries: @ 82940B1 + msgbox LilycoveCity_ContestLobby_Text_NoBerriesLink, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender: @ 82940BB + call Common_EventScript_SaveGame + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender + specialvar VAR_RESULT, IsWirelessAdapterConnected + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader + message LilycoveCity_ContestLobby_Text_SearchingForFriends + waitmessage + special TryBerryBlenderLinkup + waitstate + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners + compare VAR_RESULT, 2 + goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady + compare VAR_RESULT, 3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections + compare VAR_RESULT, 5 + goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLink + compare VAR_RESULT, 6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkError + end + +LilycoveCity_ContestLobby_EventScript_TwoPlayerLink: @ 829411D + msgbox LilycoveCity_ContestLobby_Text_Player1Arrived, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_ThreePlayerLink: @ 829412B + msgbox LilycoveCity_ContestLobby_Text_Player1And2Arrived, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_FourPlayerLink: @ 8294139 + msgbox LilycoveCity_ContestLobby_Text_AllPlayersArrived, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending + end + +LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147 + setvar VAR_0x8004, 0 + fadescreen 1 + removeobject 240 + removeobject 239 + removeobject 238 + removeobject 237 + special DoBerryBlending + waitstate + releaseall + end + +LilycoveCity_ContestLobby_EventScript_CancelLinkBlender: @ 8294160 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull: @ 8294162 + msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase: @ 829416C + msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady: @ 8294176 + special CloseLink + msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections: @ 8294183 + special CloseLink + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_CloseLink: @ 8294190 + special CloseLink + msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_LinkError: @ 829419D + special CloseLink + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT + releaseall + end + +LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners: @ 82941AA + fadescreen 1 + specialvar VAR_RESULT, GetLinkPartnerNames + copyvar VAR_0x8008, VAR_RESULT + copyvar VAR_0x8004, VAR_0x8008 + special SpawnLinkPartnerEventObject + goto LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived + end + +LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived: @ 82941C4 + fadescreen 0 + switch VAR_0x8008 + case 2, LilycoveCity_ContestLobby_EventScript_TwoPlayerLink + case 3, LilycoveCity_ContestLobby_EventScript_ThreePlayerLink + case 4, LilycoveCity_ContestLobby_EventScript_FourPlayerLink + end + +LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader: @ 82941ED + setvar VAR_0x8004, 13 + goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader + end + +LilycoveCity_ContestLobby_EventScript_DecideLinkLeader: @ 82941F8 + message Text_DecideLinkLeader + waitmessage + multichoice 16, 6, MULTI_LINK_LEADER, 0 + switch VAR_RESULT + case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup + case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup + case 2, LilycoveCity_ContestLobby_EventScript_CloseLink + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CloseLink + end + +LilycoveCity_ContestLobby_EventScript_TryLeadGroup: @ 8294235 + call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided + compare VAR_RESULT, 5 + goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader + compare VAR_RESULT, 8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup + release + end + +LilycoveCity_ContestLobby_EventScript_TryJoinGroup: @ 829425D + call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided + compare VAR_RESULT, 5 + goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader + compare VAR_RESULT, 8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup + release + end + +LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader: @ 8294285 + special TryBecomeLinkLeader + waitstate + return + +LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup: @ 829428A + special TryJoinLinkGroup + waitstate + return + +LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided: @ 829428F + goto LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners + end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 857c1e205..58cd1ec5d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -9,7 +9,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 end LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA - msgbox LilycoveCity_ContestLobby_Text_27AEA8, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_ContestReceptionCounter, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 @@ -1462,7 +1462,7 @@ LilycoveCity_ContestLobby_Text_27AE47: @ 827AE47 .string "This is the reception counter for\n" .string "POKéMON CONTESTS.$" -LilycoveCity_ContestLobby_Text_27AEA8: @ 827AEA8 +LilycoveCity_ContestLobby_Text_ContestReceptionCounter: @ 827AEA8 .string "Hello!\p" .string "This is the reception counter for\n" .string "POKéMON CONTESTS.$" diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 5036e8ec9..c635144f3 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -180,7 +180,7 @@ SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F release end -LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 +LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59 lock faceplayer goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index b1ecae203..651a85cff 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -234,7 +234,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc deleted file mode 100644 index c223bc1c7..000000000 --- a/data/scripts/pokeblocks.inc +++ /dev/null @@ -1,759 +0,0 @@ -@ The scripts there concern pokeblock events in LilyCove City's Contest Lobby - -@ 'PblockX' number of offline opponents -@ 'Ask' talking with a blender machine -@ 'Yes' agreeing to blend -@ 'No' refusing to blend -@ 'KnowHow' asking if the player knows the blending process -@ 'Explain' explaining the blender process -@ 'Start' start blending -@ 'TalkX' talking with a person next to a blender machine -@ 'NoBerries' can't blend cause they have no berries -@ 'FullPokeblock' can't blend cause full pokeblock case -@ 'NoPokeblock' can't blend cause they have no pokeblock case - -Text_Pblock1_Ask: @ 8292DEE - .string "Oh? Did you want to make some {POKEBLOCK}S\n" - .string "with this old-timer?$" - -Text_Pblock1_Yes: @ 8292E28 - .string "Excellent!$" - -Text_Pblock1_No: @ 8292E33 - .string "Oh…\n" - .string "You've made this old-timer sad…$" - -Text_Pblock1_KnowHow: @ 8292E57 - .string "Do you know how to make a {POKEBLOCK}?$" - -Text_Pblock1_Start: @ 8292E78 - .string "Let's get started, then!\p" - .string "Let's BERRY BLENDER!$" - -Text_Pblock1_Explain: @ 8292EA6 - .string "Okay, a little explanation, then.\p" - .string "Oh, don't worry, it's quite simple.\p" - .string "When the BLENDER's arrow comes to\n" - .string "your marker, just press the A Button.\p" - .string "That's all you have to do.\n" - .string "You'll see how easy it is when you try.$" - -Text_Pblock1_NoBerries: @ 8292F77 - .string "Oh?\n" - .string "You don't have any BERRIES?\p" - .string "If you don't have any BERRIES,\n" - .string "you can't make any {POKEBLOCK}S.$" - -LilycoveCity_ContestLobby_Text_292FD1: @ 8292FD1 - .string "Well, that won't do at all now, will it?\p" - .string "If you don't mind leftovers, you can\n" - .string "have one of my BERRIES.\p" - .string "That way, we could make some {POKEBLOCK}S\n" - .string "together using the BERRY BLENDER.$" - -LilycoveCity_ContestLobby_Text_29307D: @ 829307D - .string "If I had some BERRIES left over,\n" - .string "I'd gladly give you one…\p" - .string "But, I don't have any to spare today.\n" - .string "We'll have to do this another time.$" - -Text_Pblock1_FullPokeblock: @ 8293101 - .string "But your {POKEBLOCK} CASE is full.\p" - .string "You should use some {POKEBLOCK}S before\n" - .string "you come see me again.$" - -Text_Pblock1_NoPokeblock: @ 8293157 - .string "But you don't have a {POKEBLOCK} CASE.\p" - .string "You should get a {POKEBLOCK} CASE and then\n" - .string "come see me.$" - -LilycoveCity_ContestLobby_Text_2931AA: @ 82931AA - .string "Let's get blending already!$" - -LilycoveCity_ContestLobby_Text_2931C6: @ 82931C6 - .string "I wonder what kind of {POKEBLOCK} I'll get?\n" - .string "This is so exciting!$" - -LilycoveCity_ContestLobby_Text_293201: @ 8293201 - .string "Hi, there! Did you want to blend some\n" - .string "{POKEBLOCK}S with us?$" - -LilycoveCity_ContestLobby_Text_293237: @ 8293237 - .string "Okay!$" - -LilycoveCity_ContestLobby_Text_29323D: @ 829323D - .string "That's too bad…\p" - .string "But we'll always be around whenever\n" - .string "you get the urge to blend!$" - -LilycoveCity_ContestLobby_Text_29328C: @ 829328C - .string "Of course, you do know how to\n" - .string "blend {POKEBLOCK}S, don't you?$" - -LilycoveCity_ContestLobby_Text_2932C3: @ 82932C3 - .string "Let's get started, then!\p" - .string "Let's BERRY BLENDER!$" - -LilycoveCity_ContestLobby_Text_2932F1: @ 82932F1 - .string "Okay!\n" - .string "Let me explain it to you!\p" - .string "When the spinning BLENDER's arrow\n" - .string "reaches your marker, just press\l" - .string "the A Button.\p" - .string "That's all it takes.\n" - .string "Pretty easy, don't you think?$" - -LilycoveCity_ContestLobby_Text_293394: @ 8293394 - .string "Oh, but wait a second here…\n" - .string "You don't have any BERRIES.\p" - .string "You can't make any {POKEBLOCK}S without\n" - .string "BERRIES…\p" - .string "We'll always be around whenever you\n" - .string "get hold of some BERRIES to blend.$" - -LilycoveCity_ContestLobby_Text_29343E: @ 829343E - .string "Oh, but wait a second here…\n" - .string "Your {POKEBLOCK} CASE is full.\p" - .string "You should use some {POKEBLOCK}S and\n" - .string "then come back.$" - -LilycoveCity_ContestLobby_Text_2934A2: @ 82934A2 - .string "Oh, but wait a second here…\n" - .string "You don't have a {POKEBLOCK} CASE.\p" - .string "You should get a {POKEBLOCK} CASE and\n" - .string "then come back.$" - -LilycoveCity_ContestLobby_Text_29350B: @ 829350B - .string "Oh, hello! Did you want to make some\n" - .string "{POKEBLOCK}S with our little group?$" - -LilycoveCity_ContestLobby_Text_29354E: @ 829354E - .string "Oh, dear!$" - -LilycoveCity_ContestLobby_Text_293558: @ 8293558 - .string "Oh, dear me…\p" - .string "You've left us in shock!$" - -LilycoveCity_ContestLobby_Text_29357E: @ 829357E - .string "Naturally, you know how to make\n" - .string "{POKEBLOCK}S, don't you?$" - -LilycoveCity_ContestLobby_Text_2935B1: @ 82935B1 - .string "Okay, dear!\n" - .string "Let's get started!\p" - .string "Let's BERRY BLENDER!$" - -LilycoveCity_ContestLobby_Text_2935E5: @ 82935E5 - .string "Oh, dear!\p" - .string "Then, I'll explain it to you nicely.\p" - .string "When the BLENDER's arrow spins to\n" - .string "your marker, press the A Button.\p" - .string "That's all it takes.\n" - .string "Isn't it simple?$" - -LilycoveCity_ContestLobby_Text_29367D: @ 829367D - .string "You don't have any BERRIES,\n" - .string "do you?\p" - .string "If you don't have any BERRIES,\n" - .string "you can't make any {POKEBLOCK}S.\p" - .string "We'll always be making {POKEBLOCK}S here,\n" - .string "so let's make some together when\l" - .string "you get a BERRY or two.$" - -LilycoveCity_ContestLobby_Text_293738: @ 8293738 - .string "Your {POKEBLOCK} CASE is full,\n" - .string "it looks like.\p" - .string "You should use some {POKEBLOCK}S up\n" - .string "and then come back.$" - -LilycoveCity_ContestLobby_Text_293792: @ 8293792 - .string "You haven't gotten a {POKEBLOCK} CASE\n" - .string "yet, it looks like.\p" - .string "You need to get a {POKEBLOCK} CASE before\n" - .string "you come back.$" - -LilycoveCity_ContestLobby_Text_2937F9: @ 82937F9 - .string "Okay! Today's going to be the day that\n" - .string "I set a new BLENDER speed record!$" - -LilycoveCity_ContestLobby_Text_293842: @ 8293842 - .string "Oh, dear!\n" - .string "You look as if you're good at blending.\l" - .string "Would you like to join us?$" - -LilycoveCity_ContestLobby_Text_29388F: @ 829388F - .string "I'm going to make delicious {POKEBLOCK}S\n" - .string "and make my POKéMON cuter.$" - -Text_PblockLink_Ask: @ 82938CD - .string "{POKEBLOCK}S will be made with your friends \n" - .string "from BERRIES in the BERRY BLENDER.\p" - .string "Is it okay to save the game before\n" - .string "linking with your friends?$" - -Text_PblockLink_Searching: @ 8293955 - .string "Searching for your friends…\n" - .string "… … B Button: Cancel$" - -Text_PblockLink_1Arrived: @ 8293986 - .string "{STR_VAR_1} arrived.$" - -Text_PblockLink_2Arrived: @ 8293992 - .string "{STR_VAR_1} and {STR_VAR_2} arrived.$" - -Text_PblockLink_3Arrived: @ 82939A5 - .string "{STR_VAR_1}, {STR_VAR_2}, and\n" - .string "{STR_VAR_3} arrived.$" - -Text_PblockLink_NoBerries: @ 82939BD - .string "You have no BERRIES.\n" - .string "The BERRY BLENDER can't be used.$" - -Text_PblockLink_FullPokeblock: @ 82939F3 - .string "Your {POKEBLOCK} CASE is full.\n" - .string "The BERRY BLENDER can't be used.$" - -Text_PblockLink_NoPokeblock: @ 8293A2D - .string "You don't have a {POKEBLOCK} CASE.\n" - .string "The BERRY BLENDER can't be used.$" - -Text_Pblock1_Talk_0: @ 8293A6B - .string "I love making {POKEBLOCK}S.\p" - .string "I always have some BERRIES with me.$" - -Text_Pblock1_Talk_1: @ 8293AA5 - .string "If you'd like, we could make some\n" - .string "{POKEBLOCK}S together using the\l" - .string "BERRY BLENDER.$" - -LilycoveCity_ContestLobby_Text_293AF0: @ 8293AF0 - .string "Oh?\n" - .string "You don't have any BERRIES?\p" - .string "Well, that won't do at all now, will it?\p" - .string "If you don't mind leftovers, you can\n" - .string "have one of my BERRIES.$" - -LilycoveCity_ContestLobby_Text_293B76: @ 8293B76 - .string "We'll use it to make {POKEBLOCK}S together\n" - .string "using the BERRY BLENDER.$" - -LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 - .string "Oh?\n" - .string "You don't have any BERRIES?\p" - .string "If I had some left over, I'd gladly\n" - .string "give you one…\p" - .string "But, I don't have any to spare today.\n" - .string "Sorry about that.$" - -EventScript_Pblock1_Ask:: @ 8293C3E - lockall - goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS, LilycoveCity_ContestLobby_EventScript_293EFB - setvar VAR_0x8009, 1 - applymovement 16, LilycoveCity_ContestLobby_Movement_294053 - waitmovement 0 - msgbox Text_Pblock1_Ask, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq EventScript_Pblock1_Yes - goto EventScript_Pblock1_No - end - -EventScript_Pblock1_No: @ 8293C70 - msgbox Text_Pblock1_No, MSGBOX_DEFAULT - releaseall - end - -EventScript_Pblock1_NoBerries: @ 8293C7A - msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT - dotimebasedevents - goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92 - goto LilycoveCity_ContestLobby_EventScript_293C9C - end - -LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92 - msgbox LilycoveCity_ContestLobby_Text_29307D, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C - msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT - giveitem_std ITEM_PECHA_BERRY - setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY - goto EventScript_Pblock1_KnowHow - end - -EventScript_Pblock1_KnowHow: @ 8293CB9 - msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq EventScript_Pblock1_Start - goto EventScript_Pblock1_Explain - end - -EventScript_Pblock1_Start: @ 8293CD2 - msgbox Text_Pblock1_Start, MSGBOX_DEFAULT - goto EventScript_StartBlending - end - -EventScript_Pblock1_Explain: @ 8293CE0 - msgbox Text_Pblock1_Explain, MSGBOX_DEFAULT - goto EventScript_Pblock1_Start - end - -EventScript_Pblock1_Yes: @ 8293CEE - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq EventScript_Pblock1_NoPokeblock - specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare VAR_RESULT, 65535 - goto_if_eq EventScript_Pblock1_FullPokeblock - specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 0 - goto_if_eq EventScript_Pblock1_NoBerries - msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT - goto EventScript_Pblock1_KnowHow - end - -EventScript_StartBlending: @ 8293D2C - copyvar VAR_0x8004, VAR_0x8009 - fadescreen 1 - special DoBerryBlending - waitstate - releaseall - end - -EventScript_Pblock1_FullPokeblock: @ 8293D39 - msgbox Text_Pblock1_FullPokeblock, MSGBOX_DEFAULT - releaseall - end - -EventScript_Pblock1_NoPokeblock: @ 8293D43 - msgbox Text_Pblock1_NoPokeblock, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D - lockall - setvar VAR_0x8009, 2 - applymovement 10, Common_Movement_FaceOriginalDirection - applymovement 3, LilycoveCity_ContestLobby_Movement_294053 - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6 - goto LilycoveCity_ContestLobby_EventScript_293D7D - end - -LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D - msgbox LilycoveCity_ContestLobby_Text_29323D, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 - msgbox LilycoveCity_ContestLobby_Text_293394, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 - msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA - goto LilycoveCity_ContestLobby_EventScript_293DB8 - end - -LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA - msgbox LilycoveCity_ContestLobby_Text_2932C3, MSGBOX_DEFAULT - goto EventScript_StartBlending - end - -LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8 - msgbox LilycoveCity_ContestLobby_Text_2932F1, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_293DAA - end - -LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 - specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293D87 - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293E14 - msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT - specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_293D91 - compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293E0A - end - -LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A - msgbox LilycoveCity_ContestLobby_Text_29343E, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14 - msgbox LilycoveCity_ContestLobby_Text_2934A2, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E - lockall - setvar VAR_0x8008, 15 - setvar VAR_0x8009, 3 - applymovement 9, Common_Movement_FaceOriginalDirection - applymovement 17, Common_Movement_FaceOriginalDirection - applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 - waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3 - goto LilycoveCity_ContestLobby_EventScript_293E5A - end - -LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A - msgbox LilycoveCity_ContestLobby_Text_293558, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 - msgbox LilycoveCity_ContestLobby_Text_29367D, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E - msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87 - goto LilycoveCity_ContestLobby_EventScript_293E95 - end - -LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87 - msgbox LilycoveCity_ContestLobby_Text_2935B1, MSGBOX_DEFAULT - goto EventScript_StartBlending - end - -LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95 - msgbox LilycoveCity_ContestLobby_Text_2935E5, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_293E87 - end - -LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 - specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293E64 - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293EF1 - msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT - specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_293E6E - compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293EE7 - end - -LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7 - msgbox LilycoveCity_ContestLobby_Text_293738, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1 - msgbox LilycoveCity_ContestLobby_Text_293792, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB - lockall - setvar VAR_0x8009, 1 - msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293F28 - msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E - msgbox LilycoveCity_ContestLobby_Text_2C439D, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293F8E - specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293F1E - specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_293F64 - compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293F98 - end - -LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 - msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO - compare VAR_RESULT, 0 - call_if_eq LilycoveCity_ContestLobby_EventScript_293F85 - msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT - goto EventScript_StartBlending - end - -LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85 - msgbox LilycoveCity_ContestLobby_Text_2C444C, MSGBOX_DEFAULT - return - -LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E - msgbox LilycoveCity_ContestLobby_Text_2C4573, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98 - msgbox LilycoveCity_ContestLobby_Text_2C45E8, MSGBOX_DEFAULT - releaseall - end - -LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2 - msgbox LilycoveCity_ContestLobby_Text_2937F9, MSGBOX_NPC - end - -LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB - msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_NPC - end - -LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4 - msgbox LilycoveCity_ContestLobby_Text_29388F, MSGBOX_NPC - end - -LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD - setvar VAR_0x8008, 15 - goto LilycoveCity_ContestLobby_EventScript_293FC8 - end - -LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 - lock - faceplayer - msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT - specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293FEE - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_293FF8 - end - -LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE - msgbox Text_Pblock1_Talk_1, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 - specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 - dotimebasedevents - goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028 - goto LilycoveCity_ContestLobby_EventScript_294032 - end - -LilycoveCity_ContestLobby_EventScript_294028: @ 8294028 - msgbox LilycoveCity_ContestLobby_Text_293BB4, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_294032: @ 8294032 - msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT - giveitem_std ITEM_PECHA_BERRY - setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY - msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_Movement_294053: @ 8294053 - walk_in_place_fastest_right - step_end - -EventScript_PblockLink:: @ 8294055 - lockall - specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 0 - goto_if_eq EventScript_PblocLink_NoBerries - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq EventScript_PblocLink_NoPokeblock - specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare VAR_RESULT, 65535 - goto_if_ne EventScript_PblocLink_Ask - compare VAR_RESULT, 65535 - goto_if_eq EventScript_PblocLink_FullPokeblock - end - -EventScript_PblocLink_Ask: @ 8294092 - msgbox Text_PblockLink_Ask, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq EventScript_PblocLink_TryConnect - compare VAR_RESULT, 0 - goto_if_eq EventScript_PblocLink_End - end - -EventScript_PblocLink_NoBerries: @ 82940B1 - msgbox Text_PblockLink_NoBerries, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_TryConnect: @ 82940BB - call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq EventScript_PblocLink_End - specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_2941ED - message Text_PblockLink_Searching - waitmessage - special sub_80B2FD8 - waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_PblocLink_SpawnPartners - compare VAR_RESULT, 2 - goto_if_eq EventScript_PblocLink_SomeoneNotReady - compare VAR_RESULT, 3 - goto_if_eq EventScript_PblocLink_DifferentSelections - compare VAR_RESULT, 5 - goto_if_eq EventScript_PblocLink_CloseLink - compare VAR_RESULT, 6 - goto_if_eq EventScript_PblocLink_LinkError - end - -EventScript_PblocLink_1Arrived: @ 829411D - msgbox Text_PblockLink_1Arrived, MSGBOX_DEFAULT - goto EventScript_PblocLink_StartLinkBlending - end - -EventScript_PblocLink_2Arrived: @ 829412B - msgbox Text_PblockLink_2Arrived, MSGBOX_DEFAULT - goto EventScript_PblocLink_StartLinkBlending - end - -EventScript_PblocLink_3Arrived: @ 8294139 - msgbox Text_PblockLink_3Arrived, MSGBOX_DEFAULT - goto EventScript_PblocLink_StartLinkBlending - end - -EventScript_PblocLink_StartLinkBlending: @ 8294147 - setvar VAR_0x8004, 0 - fadescreen 1 - removeobject 240 - removeobject 239 - removeobject 238 - removeobject 237 - special DoBerryBlending - waitstate - releaseall - end - -EventScript_PblocLink_End: @ 8294160 - releaseall - end - -EventScript_PblocLink_FullPokeblock: @ 8294162 - msgbox Text_PblockLink_FullPokeblock, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_NoPokeblock: @ 829416C - msgbox Text_PblockLink_NoPokeblock, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_SomeoneNotReady: @ 8294176 - special CloseLink - msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_DifferentSelections: @ 8294183 - special CloseLink - msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_CloseLink: @ 8294190 - special CloseLink - msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_LinkError: @ 829419D - special CloseLink - msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT - releaseall - end - -EventScript_PblocLink_SpawnPartners: @ 82941AA - fadescreen 1 - specialvar VAR_RESULT, GetLinkPartnerNames - copyvar VAR_0x8008, VAR_RESULT - copyvar VAR_0x8004, VAR_0x8008 - special SpawnLinkPartnerEventObject - goto EventScript_PblocLink_Arrived - end - -EventScript_PblocLink_Arrived: @ 82941C4 - fadescreen 0 - switch VAR_0x8008 - case 2, EventScript_PblocLink_1Arrived - case 3, EventScript_PblocLink_2Arrived - case 4, EventScript_PblocLink_3Arrived - end - -LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED - setvar VAR_0x8004, 13 - goto EventScript_PblocLink_DecideLeader - end - -EventScript_PblocLink_DecideLeader: @ 82941F8 - message Text_DecideLinkLeader - waitmessage - 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 MULTI_B_PRESSED, EventScript_PblocLink_CloseLink - end - -EventScript_PblocLink_TryBecomeLeader: @ 8294235 - call EventScript_PblocLink_BecomeLeader - compare VAR_RESULT, 1 - goto_if_eq EventScript_PblocLink_SpawnPartners_ - compare VAR_RESULT, 5 - goto_if_eq EventScript_PblocLink_DecideLeader - compare VAR_RESULT, 8 - goto_if_eq EventScript_PblocLink_TryBecomeLeader - release - end - -EventScript_PblocLink_TryJoinGroup: @ 829425D - call EventScript_PblocLink_JoinGroup - compare VAR_RESULT, 1 - goto_if_eq EventScript_PblocLink_SpawnPartners_ - compare VAR_RESULT, 5 - goto_if_eq EventScript_PblocLink_DecideLeader - compare VAR_RESULT, 8 - goto_if_eq EventScript_PblocLink_TryJoinGroup - release - end - -EventScript_PblocLink_BecomeLeader: @ 8294285 - special TryBecomeLinkLeader - waitstate - return - -EventScript_PblocLink_JoinGroup: @ 829428A - special TryJoinLinkGroup - waitstate - return - -EventScript_PblocLink_SpawnPartners_: @ 829428F - goto EventScript_PblocLink_SpawnPartners - end -- cgit v1.2.3 From ef8370566f14c22b9927db09b8ff69a98049c796 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 10 Nov 2019 21:54:00 -0500 Subject: Document Contest scripts --- data/scripts/berry_blender.inc | 516 +++++++-------- data/scripts/cable_club.inc | 28 +- data/scripts/contest_hall.inc | 1399 ++++++++++++++++++++-------------------- data/scripts/interview.inc | 32 +- data/scripts/new_game.inc | 2 +- 5 files changed, 1000 insertions(+), 977 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 09b0eccac..1d0862a65 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -1,22 +1,22 @@ -LilycoveCity_ContestLobby_Text_WantToMakePokeblocks: @ 8292DEE +BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE .string "Oh? Did you want to make some {POKEBLOCK}S\n" .string "with this old-timer?$" -LilycoveCity_ContestLobby_Text_Excellent: @ 8292E28 +BerryBlender_Text_Excellent: @ 8292E28 .string "Excellent!$" -LilycoveCity_ContestLobby_Text_MadeOldTimerSad: @ 8292E33 +BerryBlender_Text_MadeOldTimerSad: @ 8292E33 .string "Oh…\n" .string "You've made this old-timer sad…$" -LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks: @ 8292E57 +BerryBlender_Text_KnowHowToMakePokeblocks: @ 8292E57 .string "Do you know how to make a {POKEBLOCK}?$" -LilycoveCity_ContestLobby_Text_LetsBerryBlender: @ 8292E78 +BerryBlender_Text_LetsBerryBlender: @ 8292E78 .string "Let's get started, then!\p" .string "Let's BERRY BLENDER!$" -LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6 +BerryBlender_Text_ExplainBerryBlending: @ 8292EA6 .string "Okay, a little explanation, then.\p" .string "Oh, don't worry, it's quite simple.\p" .string "When the BLENDER's arrow comes to\n" @@ -24,63 +24,63 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6 .string "That's all you have to do.\n" .string "You'll see how easy it is when you try.$" -LilycoveCity_ContestLobby_Text_DontHaveAnyBerries: @ 8292F77 +BerryBlender_Text_DontHaveAnyBerries: @ 8292F77 .string "Oh?\n" .string "You don't have any BERRIES?\p" .string "If you don't have any BERRIES,\n" .string "you can't make any {POKEBLOCK}S.$" -LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries: @ 8292FD1 +BerryBlender_Text_CanHaveOneOfMyBerries: @ 8292FD1 .string "Well, that won't do at all now, will it?\p" .string "If you don't mind leftovers, you can\n" .string "have one of my BERRIES.\p" .string "That way, we could make some {POKEBLOCK}S\n" .string "together using the BERRY BLENDER.$" -LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare: @ 829307D +BerryBlender_Text_DontHaveAnyBerriesToSpare: @ 829307D .string "If I had some BERRIES left over,\n" .string "I'd gladly give you one…\p" .string "But, I don't have any to spare today.\n" .string "We'll have to do this another time.$" -LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull: @ 8293101 +BerryBlender_Text_PokeblockCaseIsFull: @ 8293101 .string "But your {POKEBLOCK} CASE is full.\p" .string "You should use some {POKEBLOCK}S before\n" .string "you come see me again.$" -LilycoveCity_ContestLobby_Text_DontHavePokeblockCase: @ 8293157 +BerryBlender_Text_DontHavePokeblockCase: @ 8293157 .string "But you don't have a {POKEBLOCK} CASE.\p" .string "You should get a {POKEBLOCK} CASE and then\n" .string "come see me.$" -LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready: @ 82931AA +BerryBlender_Text_LetsGetBlendingAlready: @ 82931AA .string "Let's get blending already!$" -LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet: @ 82931C6 +BerryBlender_Text_WhatKindOfPokeblockWillIGet: @ 82931C6 .string "I wonder what kind of {POKEBLOCK} I'll get?\n" .string "This is so exciting!$" -LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs: @ 8293201 +BerryBlender_Text_WantToBlendPokeblocksWithUs: @ 8293201 .string "Hi, there! Did you want to blend some\n" .string "{POKEBLOCK}S with us?$" -LilycoveCity_ContestLobby_Text_Okay: @ 8293237 +BerryBlender_Text_Okay: @ 8293237 .string "Okay!$" -LilycoveCity_ContestLobby_Text_ThatsTooBad: @ 829323D +BerryBlender_Text_ThatsTooBad: @ 829323D .string "That's too bad…\p" .string "But we'll always be around whenever\n" .string "you get the urge to blend!$" -LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2: @ 829328C +BerryBlender_Text_KnowHowToMakePokeblocks2: @ 829328C .string "Of course, you do know how to\n" .string "blend {POKEBLOCK}S, don't you?$" -LilycoveCity_ContestLobby_Text_LetsBerryBlender2: @ 82932C3 +BerryBlender_Text_LetsBerryBlender2: @ 82932C3 .string "Let's get started, then!\p" .string "Let's BERRY BLENDER!$" -LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1 +BerryBlender_Text_ExplainBerryBlending2: @ 82932F1 .string "Okay!\n" .string "Let me explain it to you!\p" .string "When the spinning BLENDER's arrow\n" @@ -89,7 +89,7 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1 .string "That's all it takes.\n" .string "Pretty easy, don't you think?$" -LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394 +BerryBlender_Text_DontHaveAnyBerries2: @ 8293394 .string "Oh, but wait a second here…\n" .string "You don't have any BERRIES.\p" .string "You can't make any {POKEBLOCK}S without\n" @@ -97,40 +97,40 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394 .string "We'll always be around whenever you\n" .string "get hold of some BERRIES to blend.$" -LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2: @ 829343E +BerryBlender_Text_PokeblockCaseIsFull2: @ 829343E .string "Oh, but wait a second here…\n" .string "Your {POKEBLOCK} CASE is full.\p" .string "You should use some {POKEBLOCK}S and\n" .string "then come back.$" -LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2: @ 82934A2 +BerryBlender_Text_DontHavePokeblockCase2: @ 82934A2 .string "Oh, but wait a second here…\n" .string "You don't have a {POKEBLOCK} CASE.\p" .string "You should get a {POKEBLOCK} CASE and\n" .string "then come back.$" @ Unused -LilycoveCity_ContestLobby_Text_MakePokeblocksWithOurGroup: @ 829350B +BerryBlender_Text_MakePokeblocksWithOurGroup: @ 829350B .string "Oh, hello! Did you want to make some\n" .string "{POKEBLOCK}S with our little group?$" -LilycoveCity_ContestLobby_Text_OhDear: @ 829354E +BerryBlender_Text_OhDear: @ 829354E .string "Oh, dear!$" -LilycoveCity_ContestLobby_Text_LeftUsInShock: @ 8293558 +BerryBlender_Text_LeftUsInShock: @ 8293558 .string "Oh, dear me…\p" .string "You've left us in shock!$" -LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3: @ 829357E +BerryBlender_Text_KnowHowToMakePokeblocks3: @ 829357E .string "Naturally, you know how to make\n" .string "{POKEBLOCK}S, don't you?$" -LilycoveCity_ContestLobby_Text_LetsBerryBlender3: @ 82935B1 +BerryBlender_Text_LetsBerryBlender3: @ 82935B1 .string "Okay, dear!\n" .string "Let's get started!\p" .string "Let's BERRY BLENDER!$" -LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5 +BerryBlender_Text_ExplainBerryBlending3: @ 82935E5 .string "Oh, dear!\p" .string "Then, I'll explain it to you nicely.\p" .string "When the BLENDER's arrow spins to\n" @@ -138,7 +138,7 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5 .string "That's all it takes.\n" .string "Isn't it simple?$" -LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D +BerryBlender_Text_DontHaveAnyBerries3: @ 829367D .string "You don't have any BERRIES,\n" .string "do you?\p" .string "If you don't have any BERRIES,\n" @@ -147,84 +147,84 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D .string "so let's make some together when\l" .string "you get a BERRY or two.$" -LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3: @ 8293738 +BerryBlender_Text_PokeblockCaseIsFull3: @ 8293738 .string "Your {POKEBLOCK} CASE is full,\n" .string "it looks like.\p" .string "You should use some {POKEBLOCK}S up\n" .string "and then come back.$" -LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3: @ 8293792 +BerryBlender_Text_DontHavePokeblockCase3: @ 8293792 .string "You haven't gotten a {POKEBLOCK} CASE\n" .string "yet, it looks like.\p" .string "You need to get a {POKEBLOCK} CASE before\n" .string "you come back.$" -LilycoveCity_ContestLobby_Text_SetNewBlenderRecord: @ 82937F9 +BerryBlender_Text_SetNewBlenderRecord: @ 82937F9 .string "Okay! Today's going to be the day that\n" .string "I set a new BLENDER speed record!$" -LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs: @ 8293842 +BerryBlender_Text_LookGoodAtBlendingJoinUs: @ 8293842 .string "Oh, dear!\n" .string "You look as if you're good at blending.\l" .string "Would you like to join us?$" -LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks: @ 829388F +BerryBlender_Text_MakeDeliciousPokeblocks: @ 829388F .string "I'm going to make delicious {POKEBLOCK}S\n" .string "and make my POKéMON cuter.$" -LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD +BerryBlender_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD .string "{POKEBLOCK}S will be made with your friends \n" .string "from BERRIES in the BERRY BLENDER.\p" .string "Is it okay to save the game before\n" .string "linking with your friends?$" -LilycoveCity_ContestLobby_Text_SearchingForFriends: @ 8293955 +BerryBlender_Text_SearchingForFriends: @ 8293955 .string "Searching for your friends…\n" .string "… … B Button: Cancel$" -LilycoveCity_ContestLobby_Text_Player1Arrived: @ 8293986 +BerryBlender_Text_Player1Arrived: @ 8293986 .string "{STR_VAR_1} arrived.$" -LilycoveCity_ContestLobby_Text_Player1And2Arrived: @ 8293992 +BerryBlender_Text_Player1And2Arrived: @ 8293992 .string "{STR_VAR_1} and {STR_VAR_2} arrived.$" -LilycoveCity_ContestLobby_Text_AllPlayersArrived: @ 82939A5 +BerryBlender_Text_AllPlayersArrived: @ 82939A5 .string "{STR_VAR_1}, {STR_VAR_2}, and\n" .string "{STR_VAR_3} arrived.$" -LilycoveCity_ContestLobby_Text_NoBerriesLink: @ 82939BD +BerryBlender_Text_NoBerriesLink: @ 82939BD .string "You have no BERRIES.\n" .string "The BERRY BLENDER can't be used.$" -LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink: @ 82939F3 +BerryBlender_Text_PokeblockCaseIsFullLink: @ 82939F3 .string "Your {POKEBLOCK} CASE is full.\n" .string "The BERRY BLENDER can't be used.$" -LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink: @ 8293A2D +BerryBlender_Text_DontHavePokeblockCaseLink: @ 8293A2D .string "You don't have a {POKEBLOCK} CASE.\n" .string "The BERRY BLENDER can't be used.$" -LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks: @ 8293A6B +BerryBlender_Text_LoveMakingPokeblocks: @ 8293A6B .string "I love making {POKEBLOCK}S.\p" .string "I always have some BERRIES with me.$" -LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5 +BerryBlender_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5 .string "If you'd like, we could make some\n" .string "{POKEBLOCK}S together using the\l" .string "BERRY BLENDER.$" -LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0 +BerryBlender_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0 .string "Oh?\n" .string "You don't have any BERRIES?\p" .string "Well, that won't do at all now, will it?\p" .string "If you don't mind leftovers, you can\n" .string "have one of my BERRIES.$" -LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether: @ 8293B76 +BerryBlender_Text_UseItToMakePokeblocksTogether: @ 8293B76 .string "We'll use it to make {POKEBLOCK}S together\n" .string "using the BERRY BLENDER.$" -LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4 +BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4 .string "Oh?\n" .string "You don't have any BERRIES?\p" .string "If I had some left over, I'd gladly\n" @@ -232,75 +232,75 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4 .string "But, I don't have any to spare today.\n" .string "Sorry about that.$" -LilycoveCity_ContestLobby_EventScript_BerryBlender1:: @ 8293C3E +BerryBlender_EventScript_BerryBlender1:: @ 8293C3E lockall - goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, LilycoveCity_ContestLobby_EventScript_BlendMasterPresent + goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent setvar VAR_0x8009, 1 - applymovement 16, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace + applymovement 16, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_WantToMakePokeblocks, MSGBOX_YESNO + msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1 - goto LilycoveCity_ContestLobby_EventScript_DeclineBlender1 + goto_if_eq BerryBlender_EventScript_TryUseBerryBlender1 + goto BerryBlender_EventScript_DeclineBlender1 end -LilycoveCity_ContestLobby_EventScript_DeclineBlender1: @ 8293C70 - msgbox LilycoveCity_ContestLobby_Text_MadeOldTimerSad, MSGBOX_DEFAULT +BerryBlender_EventScript_DeclineBlender1: @ 8293C70 + msgbox BerryBlender_Text_MadeOldTimerSad, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender1NoBerries: @ 8293C7A - msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender1NoBerries: @ 8293C7A + msgbox BerryBlender_Text_DontHaveAnyBerries, MSGBOX_DEFAULT dotimebasedevents - goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries - goto LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry + goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_Blender1NoSpareBerries + goto BerryBlender_EventScript_Blender1GiveSpareBerry end -LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries: @ 8293C92 - msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92 + msgbox BerryBlender_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry: @ 8293C9C - msgbox LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C + msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY - goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1 + goto BerryBlender_EventScript_UseBerryBlender1 end -LilycoveCity_ContestLobby_EventScript_UseBerryBlender1: @ 8293CB9 - msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO +BerryBlender_EventScript_UseBerryBlender1: @ 8293CB9 + msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender1 - goto LilycoveCity_ContestLobby_EventScript_ExplainBlending1 + goto_if_eq BerryBlender_EventScript_StartBlender1 + goto BerryBlender_EventScript_ExplainBlending1 end -LilycoveCity_ContestLobby_EventScript_StartBlender1: @ 8293CD2 - msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending +BerryBlender_EventScript_StartBlender1: @ 8293CD2 + msgbox BerryBlender_Text_LetsBerryBlender, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoBerryBlending end -LilycoveCity_ContestLobby_EventScript_ExplainBlending1: @ 8293CE0 - msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_StartBlender1 +BerryBlender_EventScript_ExplainBlending1: @ 8293CE0 + msgbox BerryBlender_Text_ExplainBerryBlending, MSGBOX_DEFAULT + goto BerryBlender_EventScript_StartBlender1 end -LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1: @ 8293CEE +BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoCase + goto_if_eq BerryBlender_EventScript_Blender1NoCase specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1CaseFull + goto_if_eq BerryBlender_EventScript_Blender1CaseFull specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoBerries - msgbox LilycoveCity_ContestLobby_Text_Excellent, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1 + goto_if_eq BerryBlender_EventScript_Blender1NoBerries + msgbox BerryBlender_Text_Excellent, MSGBOX_DEFAULT + goto BerryBlender_EventScript_UseBerryBlender1 end @ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left -LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C +BerryBlender_EventScript_DoBerryBlending: @ 8293D2C copyvar VAR_0x8004, VAR_0x8009 fadescreen 1 special DoBerryBlending @@ -308,326 +308,326 @@ LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C releaseall end -LilycoveCity_ContestLobby_EventScript_Blender1CaseFull: @ 8293D39 - msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender1CaseFull: @ 8293D39 + msgbox BerryBlender_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender1NoCase: @ 8293D43 - msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender1NoCase: @ 8293D43 + msgbox BerryBlender_Text_DontHavePokeblockCase, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_BerryBlender2:: @ 8293D4D +BerryBlender_EventScript_BerryBlender2:: @ 8293D4D lockall setvar VAR_0x8009, 2 applymovement 10, Common_Movement_FaceOriginalDirection - applymovement 3, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace + applymovement 3, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO + msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2 - goto LilycoveCity_ContestLobby_EventScript_DeclineBlender2 + goto_if_eq BerryBlender_EventScript_TryUseBerryBlender2 + goto BerryBlender_EventScript_DeclineBlender2 end -LilycoveCity_ContestLobby_EventScript_DeclineBlender2: @ 8293D7D - msgbox LilycoveCity_ContestLobby_Text_ThatsTooBad, MSGBOX_DEFAULT +BerryBlender_EventScript_DeclineBlender2: @ 8293D7D + msgbox BerryBlender_Text_ThatsTooBad, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender2NoBerries: @ 8293D87 - msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender2NoBerries: @ 8293D87 + msgbox BerryBlender_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_UseBerryBlender2: @ 8293D91 - msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO +BerryBlender_EventScript_UseBerryBlender2: @ 8293D91 + msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender2 - goto LilycoveCity_ContestLobby_EventScript_ExplainBlending2 + goto_if_eq BerryBlender_EventScript_StartBlender2 + goto BerryBlender_EventScript_ExplainBlending2 end -LilycoveCity_ContestLobby_EventScript_StartBlender2: @ 8293DAA - msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender2, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending +BerryBlender_EventScript_StartBlender2: @ 8293DAA + msgbox BerryBlender_Text_LetsBerryBlender2, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoBerryBlending end -LilycoveCity_ContestLobby_EventScript_ExplainBlending2: @ 8293DB8 - msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending2, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_StartBlender2 +BerryBlender_EventScript_ExplainBlending2: @ 8293DB8 + msgbox BerryBlender_Text_ExplainBerryBlending2, MSGBOX_DEFAULT + goto BerryBlender_EventScript_StartBlender2 end -LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2: @ 8293DC6 +BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoBerries + goto_if_eq BerryBlender_EventScript_Blender2NoBerries checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoCase - msgbox LilycoveCity_ContestLobby_Text_Okay, MSGBOX_DEFAULT + goto_if_eq BerryBlender_EventScript_Blender2NoCase + msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender2 + goto_if_ne BerryBlender_EventScript_UseBerryBlender2 compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2CaseFull + goto_if_eq BerryBlender_EventScript_Blender2CaseFull end -LilycoveCity_ContestLobby_EventScript_Blender2CaseFull: @ 8293E0A - msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender2CaseFull: @ 8293E0A + msgbox BerryBlender_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender2NoCase: @ 8293E14 - msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender2NoCase: @ 8293E14 + msgbox BerryBlender_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_BerryBlender3:: @ 8293E1E +BerryBlender_EventScript_BerryBlender3:: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 applymovement 9, Common_Movement_FaceOriginalDirection applymovement 17, Common_Movement_FaceOriginalDirection - applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace + applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO + msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBlender3 - goto LilycoveCity_ContestLobby_EventScript_DeclineBlender3 + goto_if_eq BerryBlender_EventScript_TryUseBlender3 + goto BerryBlender_EventScript_DeclineBlender3 end -LilycoveCity_ContestLobby_EventScript_DeclineBlender3: @ 8293E5A - msgbox LilycoveCity_ContestLobby_Text_LeftUsInShock, MSGBOX_DEFAULT +BerryBlender_EventScript_DeclineBlender3: @ 8293E5A + msgbox BerryBlender_Text_LeftUsInShock, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender3NoBerries: @ 8293E64 - msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender3NoBerries: @ 8293E64 + msgbox BerryBlender_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_UseBerryBlender3: @ 8293E6E - msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO +BerryBlender_EventScript_UseBerryBlender3: @ 8293E6E + msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender3 - goto LilycoveCity_ContestLobby_EventScript_ExplainBlending3 + goto_if_eq BerryBlender_EventScript_StartBlender3 + goto BerryBlender_EventScript_ExplainBlending3 end -LilycoveCity_ContestLobby_EventScript_StartBlender3: @ 8293E87 - msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender3, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending +BerryBlender_EventScript_StartBlender3: @ 8293E87 + msgbox BerryBlender_Text_LetsBerryBlender3, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoBerryBlending end -LilycoveCity_ContestLobby_EventScript_ExplainBlending3: @ 8293E95 - msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending3, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_StartBlender3 +BerryBlender_EventScript_ExplainBlending3: @ 8293E95 + msgbox BerryBlender_Text_ExplainBerryBlending3, MSGBOX_DEFAULT + goto BerryBlender_EventScript_StartBlender3 end -LilycoveCity_ContestLobby_EventScript_TryUseBlender3: @ 8293EA3 +BerryBlender_EventScript_TryUseBlender3: @ 8293EA3 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoBerries + goto_if_eq BerryBlender_EventScript_Blender3NoBerries checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoCase - msgbox LilycoveCity_ContestLobby_Text_OhDear, MSGBOX_DEFAULT + goto_if_eq BerryBlender_EventScript_Blender3NoCase + msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender3 + goto_if_ne BerryBlender_EventScript_UseBerryBlender3 compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3CaseFull + goto_if_eq BerryBlender_EventScript_Blender3CaseFull end -LilycoveCity_ContestLobby_EventScript_Blender3CaseFull: @ 8293EE7 - msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender3CaseFull: @ 8293EE7 + msgbox BerryBlender_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender3NoCase: @ 8293EF1 - msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT +BerryBlender_EventScript_Blender3NoCase: @ 8293EF1 + msgbox BerryBlender_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_BlendMasterPresent: @ 8293EFB +BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB lockall setvar VAR_0x8009, 1 - msgbox LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction, MSGBOX_YESNO + msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster - msgbox LilycoveCity_ContestLobby_Text_TooBusyNowIsee, MSGBOX_DEFAULT + goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster + msgbox BerryBlender_Text_TooBusyNowIsee, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries: @ 8293F1E - msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoBerries, MSGBOX_DEFAULT +BerryBlender_EventScript_BlendMasterNoBerries: @ 8293F1E + msgbox BerryBlender_Text_BlendMasterNoBerries, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster: @ 8293F28 +BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase + goto_if_eq BerryBlender_EventScript_BlendMasterNoCase specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries + goto_if_eq BerryBlender_EventScript_BlendMasterNoBerries specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster + goto_if_ne BerryBlender_EventScript_BlendWithBlendMaster compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull + goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull end -LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster: @ 8293F64 - msgbox LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO +BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64 + msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO compare VAR_RESULT, NO - call_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending - msgbox LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending + call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending + msgbox BerryBlender_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoBerryBlending end -LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending: @ 8293F85 - msgbox LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT +BerryBlender_EventScript_BlendMasterExplainBlending: @ 8293F85 + msgbox BerryBlender_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT return -LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase: @ 8293F8E - msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT +BerryBlender_EventScript_BlendMasterNoCase: @ 8293F8E + msgbox BerryBlender_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull: @ 8293F98 - msgbox LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT +BerryBlender_EventScript_BlendMasterCaseFull: @ 8293F98 + msgbox BerryBlender_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_Blender2Man:: @ 8293FA2 - msgbox LilycoveCity_ContestLobby_Text_SetNewBlenderRecord, MSGBOX_NPC +BerryBlender_EventScript_Blender2Man:: @ 8293FA2 + msgbox BerryBlender_Text_SetNewBlenderRecord, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_Blender3PokefanF:: @ 8293FAB - msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC +BerryBlender_EventScript_Blender3PokefanF:: @ 8293FAB + msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_Blender2Twin:: @ 8293FB4 - msgbox LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks, MSGBOX_NPC +BerryBlender_EventScript_Blender2Twin:: @ 8293FB4 + msgbox BerryBlender_Text_MakeDeliciousPokeblocks, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_Blender1ExpertM:: @ 8293FBD +BerryBlender_EventScript_Blender1ExpertM:: @ 8293FBD setvar VAR_0x8008, 15 - goto LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry + goto BerryBlender_EventScript_ExpertMCheckGiveBerry end -LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry: @ 8293FC8 +BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT + msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, TRUE - goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries + goto_if_eq BerryBlender_EventScript_ExpertMPlayerHasBerries compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries + goto_if_eq BerryBlender_EventScript_ExpertMNoBerries end -LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries: @ 8293FEE - msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT +BerryBlender_EventScript_ExpertMPlayerHasBerries: @ 8293FEE + msgbox BerryBlender_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries: @ 8293FF8 +BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries + goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries + goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries dotimebasedevents - goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries - goto LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry + goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_ExpertMNoSpareBerries + goto BerryBlender_EventScript_ExpertMGiveBerry end -LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries: @ 8294028 - msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT +BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028 + msgbox BerryBlender_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry: @ 8294032 - msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT +BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032 + msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY - msgbox LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT + msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace: @ 8294053 +BerryBlender_Movement_BlendLeaderWalkInPlace: @ 8294053 walk_in_place_fastest_right step_end -LilycoveCity_ContestLobby_EventScript_BerryBlenderLink:: @ 8294055 +BerryBlender_EventScript_BerryBlenderLink:: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries + goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase + goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame + goto_if_ne BerryBlender_EventScript_LinkBlenderSaveGame compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull + goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull end -LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame: @ 8294092 - msgbox LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO +BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092 + msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender + goto_if_eq BerryBlender_EventScript_TryDoLinkBlender compare VAR_RESULT, NO - goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender + goto_if_eq BerryBlender_EventScript_CancelLinkBlender end -LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries: @ 82940B1 - msgbox LilycoveCity_ContestLobby_Text_NoBerriesLink, MSGBOX_DEFAULT +BerryBlender_EventScript_LinkBlenderNoBerries: @ 82940B1 + msgbox BerryBlender_Text_NoBerriesLink, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender: @ 82940BB +BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB call Common_EventScript_SaveGame compare VAR_RESULT, FALSE - goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender + goto_if_eq BerryBlender_EventScript_CancelLinkBlender specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, TRUE - goto_if_eq LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader - message LilycoveCity_ContestLobby_Text_SearchingForFriends + goto_if_eq BerryBlender_EventScript_StartDecideLinkLeader + message BerryBlender_Text_SearchingForFriends waitmessage special TryBerryBlenderLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners + goto_if_eq BerryBlender_EventScript_SpawnLinkPartners compare VAR_RESULT, 2 - goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady + goto_if_eq BerryBlender_EventScript_CloseLinkNotReady compare VAR_RESULT, 3 - goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections + goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections compare VAR_RESULT, 5 - goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLink + goto_if_eq BerryBlender_EventScript_CloseLink compare VAR_RESULT, 6 - goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkError + goto_if_eq BerryBlender_EventScript_LinkError end -LilycoveCity_ContestLobby_EventScript_TwoPlayerLink: @ 829411D - msgbox LilycoveCity_ContestLobby_Text_Player1Arrived, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending +BerryBlender_EventScript_TwoPlayerLink: @ 829411D + msgbox BerryBlender_Text_Player1Arrived, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoLinkBerryBlending end -LilycoveCity_ContestLobby_EventScript_ThreePlayerLink: @ 829412B - msgbox LilycoveCity_ContestLobby_Text_Player1And2Arrived, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending +BerryBlender_EventScript_ThreePlayerLink: @ 829412B + msgbox BerryBlender_Text_Player1And2Arrived, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoLinkBerryBlending end -LilycoveCity_ContestLobby_EventScript_FourPlayerLink: @ 8294139 - msgbox LilycoveCity_ContestLobby_Text_AllPlayersArrived, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending +BerryBlender_EventScript_FourPlayerLink: @ 8294139 + msgbox BerryBlender_Text_AllPlayersArrived, MSGBOX_DEFAULT + goto BerryBlender_EventScript_DoLinkBerryBlending end -LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147 +BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147 setvar VAR_0x8004, 0 fadescreen 1 removeobject 240 @@ -639,109 +639,109 @@ LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147 releaseall end -LilycoveCity_ContestLobby_EventScript_CancelLinkBlender: @ 8294160 +BerryBlender_EventScript_CancelLinkBlender: @ 8294160 releaseall end -LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull: @ 8294162 - msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT +BerryBlender_EventScript_LinkBlenderCaseFull: @ 8294162 + msgbox BerryBlender_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase: @ 829416C - msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT +BerryBlender_EventScript_LinkBlenderNoCase: @ 829416C + msgbox BerryBlender_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady: @ 8294176 +BerryBlender_EventScript_CloseLinkNotReady: @ 8294176 special CloseLink msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections: @ 8294183 +BerryBlender_EventScript_CloseLinkDifferentSelections: @ 8294183 special CloseLink msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_CloseLink: @ 8294190 +BerryBlender_EventScript_CloseLink: @ 8294190 special CloseLink msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_LinkError: @ 829419D +BerryBlender_EventScript_LinkError: @ 829419D special CloseLink msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners: @ 82941AA +BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA fadescreen 1 specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerEventObject - goto LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived + goto BerryBlender_EventScript_LinkPlayersArrived end -LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived: @ 82941C4 +BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4 fadescreen 0 switch VAR_0x8008 - case 2, LilycoveCity_ContestLobby_EventScript_TwoPlayerLink - case 3, LilycoveCity_ContestLobby_EventScript_ThreePlayerLink - case 4, LilycoveCity_ContestLobby_EventScript_FourPlayerLink + case 2, BerryBlender_EventScript_TwoPlayerLink + case 3, BerryBlender_EventScript_ThreePlayerLink + case 4, BerryBlender_EventScript_FourPlayerLink end -LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader: @ 82941ED - setvar VAR_0x8004, 13 - goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader +BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED + setvar VAR_0x8004, LINK_GROUP_BERRY_BLENDER + goto BerryBlender_EventScript_DecideLinkLeader end -LilycoveCity_ContestLobby_EventScript_DecideLinkLeader: @ 82941F8 - message Text_DecideLinkLeader +BerryBlender_EventScript_DecideLinkLeader: @ 82941F8 + message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup - case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup - case 2, LilycoveCity_ContestLobby_EventScript_CloseLink - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CloseLink + case 0, BerryBlender_EventScript_TryJoinGroup + case 1, BerryBlender_EventScript_TryLeadGroup + case 2, BerryBlender_EventScript_CloseLink + case MULTI_B_PRESSED, BerryBlender_EventScript_CloseLink end -LilycoveCity_ContestLobby_EventScript_TryLeadGroup: @ 8294235 - call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader +BerryBlender_EventScript_TryLeadGroup: @ 8294235 + call BerryBlender_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided + goto_if_eq BerryBlender_EventScript_LinkLeaderDecided compare VAR_RESULT, 5 - goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader + goto_if_eq BerryBlender_EventScript_DecideLinkLeader compare VAR_RESULT, 8 - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup + goto_if_eq BerryBlender_EventScript_TryLeadGroup release end -LilycoveCity_ContestLobby_EventScript_TryJoinGroup: @ 829425D - call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup +BerryBlender_EventScript_TryJoinGroup: @ 829425D + call BerryBlender_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided + goto_if_eq BerryBlender_EventScript_LinkLeaderDecided compare VAR_RESULT, 5 - goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader + goto_if_eq BerryBlender_EventScript_DecideLinkLeader compare VAR_RESULT, 8 - goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup + goto_if_eq BerryBlender_EventScript_TryJoinGroup release end -LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader: @ 8294285 +BerryBlender_EventScript_TryBecomeLinkLeader: @ 8294285 special TryBecomeLinkLeader waitstate return -LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup: @ 829428A +BerryBlender_EventScript_TryJoinLinkGroup: @ 829428A special TryJoinLinkGroup waitstate return -LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided: @ 829428F - goto LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners +BerryBlender_EventScript_LinkLeaderDecided: @ 829428F + goto BerryBlender_EventScript_SpawnLinkPartners end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 9d3bccaf9..1b2e3f60f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1085,7 +1085,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 goto_if_eq CableClub_EventScript_AbortLink - setvar VAR_0x8004, 3 + setvar VAR_0x8004, LINK_GROUP_TRADE goto CableClub_EventScript_SaveAndChooseLinkLeader end @@ -1103,7 +1103,7 @@ CableClub_EventScript_WirelessBattleSelect:: @ 827783B end CableClub_EventScript_WirelessSingleBattle:: @ 827788E - setvar VAR_0x8004, 0 + setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE goto CableClub_EventScript_SaveAndChooseLinkLeader end @@ -1111,7 +1111,7 @@ CableClub_EventScript_WirelessDoubleBattle:: @ 8277899 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle - setvar VAR_0x8004, 1 + setvar VAR_0x8004, LINK_GROUP_DOUBLE_BATTLE goto CableClub_EventScript_SaveAndChooseLinkLeader end @@ -1121,7 +1121,7 @@ CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2 end CableClub_EventScript_WirelessMultiBattle:: @ 82778C0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE goto CableClub_EventScript_SaveAndChooseLinkLeader end @@ -1134,7 +1134,7 @@ CableClub_EventScript_WirelessRecordMix:: @ 82778D9 msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortLink - setvar VAR_0x8004, 12 + setvar VAR_0x8004, LINK_GROUP_RECORD_CORNER goto CableClub_EventScript_SaveAndChooseLinkLeader end @@ -1145,7 +1145,7 @@ CableClub_EventScript_WirelessBerryCrush:: @ 82778F7 special HasAtLeastOneBerry compare VAR_RESULT, FALSE goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush - setvar VAR_0x8004, 5 + setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH goto CableClub_EventScript_SaveAndChooseLinkLeader end @@ -1159,12 +1159,12 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931 compare VAR_RESULT, 0 goto_if_eq CableClub_EventScript_AbortLink switch VAR_0x8004 - case 3, CableClub_EventScript_ChooseLinkLeaderFrom2 - case 0, CableClub_EventScript_ChooseLinkLeaderFrom2 - case 1, CableClub_EventScript_ChooseLinkLeaderFrom2 - case 2, CableClub_EventScript_ChooseLinkLeaderFrom4 - case 5, CableClub_EventScript_ChooseLinkLeader - case 12, CableClub_EventScript_ChooseLinkLeader + case LINK_GROUP_TRADE, CableClub_EventScript_ChooseLinkLeaderFrom2 + case LINK_GROUP_SINGLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2 + case LINK_GROUP_DOUBLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2 + case LINK_GROUP_MULTI_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom4 + case LINK_GROUP_BERRY_CRUSH, CableClub_EventScript_ChooseLinkLeader + case LINK_GROUP_RECORD_CORNER, CableClub_EventScript_ChooseLinkLeader end CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989 @@ -1416,7 +1416,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame - setvar VAR_0x8004, 4 + setvar VAR_0x8004, LINK_GROUP_POKEMON_JUMP goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end @@ -1435,7 +1435,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame - setvar VAR_0x8004, 6 + setvar VAR_0x8004, LINK_GROUP_BERRY_PICKING goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 58cd1ec5d..cabf923b6 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1,498 +1,509 @@ -LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 +@ Either ends or returns to EventScript_ContestReceptionist after submitting a contest entry +LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist:: @ 8279CC5 lock faceplayer compare VAR_CONTEST_PRIZE_PICKUP, 0 - goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 - call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA - call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3 - goto LilycoveCity_ContestLobby_EventScript_279D5A + goto_if_ne LilycoveCity_ContestLobby_EventScript_PickUpPrize + call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_ReceptionWelcome + call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_GivePokeblockCase + goto LilycoveCity_ContestLobby_EventScript_AskEnterContest end -LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA - msgbox LilycoveCity_ContestLobby_Text_ContestReceptionCounter, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA + msgbox LilycoveCity_ContestLobby_Text_ContestReception, MSGBOX_DEFAULT return -LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 - msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3 + msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT giveitem_std ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE - msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT return -LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 - msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13 + msgbox LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize, MSGBOX_DEFAULT switch VAR_CONTEST_PRIZE_PICKUP - case 4, LilycoveCity_ContestLobby_EventScript_279D2C + case 4, LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter end -LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C +LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage release end -LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B +LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B call Common_EventScript_BagIsFull - msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A - message LilycoveCity_ContestLobby_Text_27AF28 +LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A + message LilycoveCity_ContestLobby_Text_EnterContest1 waitmessage multichoice 0, 0, MULTI_ENTERINFO, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279E62 - case 1, LilycoveCity_ContestLobby_EventScript_279D97 - case 2, LilycoveCity_ContestLobby_EventScript_279E09 - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 + case 0, LilycoveCity_ContestLobby_EventScript_ChooseContestRank + case 1, LilycoveCity_ContestLobby_EventScript_ContestInfo + case 2, LilycoveCity_ContestLobby_EventScript_CancelEnterContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest end -LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97 - message LilycoveCity_ContestLobby_Text_27AF5E +LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97 + message LilycoveCity_ContestLobby_Text_WhichTopic1 waitmessage multichoice 0, 0, MULTI_CONTEST_INFO, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279DDF - case 1, LilycoveCity_ContestLobby_EventScript_279DED - case 2, LilycoveCity_ContestLobby_EventScript_279DFB - case 3, LilycoveCity_ContestLobby_EventScript_279D5A - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A + case 0, LilycoveCity_ContestLobby_EventScript_ExplainContests + case 1, LilycoveCity_ContestLobby_EventScript_ExplainContestTypes + case 2, LilycoveCity_ContestLobby_EventScript_ExplainContestRanks + case 3, LilycoveCity_ContestLobby_EventScript_AskEnterContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterContest end -LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF - msgbox LilycoveCity_ContestLobby_Text_27AF7A, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_279D97 +LilycoveCity_ContestLobby_EventScript_ExplainContests:: @ 8279DDF + msgbox LilycoveCity_ContestLobby_Text_ExplainContests, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ContestInfo end -LilycoveCity_ContestLobby_EventScript_279DED:: @ 8279DED - msgbox LilycoveCity_ContestLobby_Text_27B17D, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_279D97 +LilycoveCity_ContestLobby_EventScript_ExplainContestTypes:: @ 8279DED + msgbox LilycoveCity_ContestLobby_Text_ExplainContestTypes, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ContestInfo end -LilycoveCity_ContestLobby_EventScript_279DFB:: @ 8279DFB - msgbox LilycoveCity_ContestLobby_Text_27B221, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_279D97 +LilycoveCity_ContestLobby_EventScript_ExplainContestRanks:: @ 8279DFB + msgbox LilycoveCity_ContestLobby_Text_ExplainContestRanks, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ContestInfo end -LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09 - msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_CancelEnterContest:: @ 8279E09 + msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 - msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13 + msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon1, MSGBOX_DEFAULT choosecontestmon compare VAR_0x8004, 255 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279E09 - special sub_80F7F30 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279F12 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279F87 - compare VAR_RESULT, 2 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279F45 - compare VAR_RESULT, 3 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279F69 - compare VAR_RESULT, 4 - goto_if_eq LilycoveCity_ContestLobby_EventScript_279F78 + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelEnterContest + special TryEnterContestMon + compare VAR_RESULT, CANT_ENTER_CONTEST + goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterLowRank + compare VAR_RESULT, CAN_ENTER_CONTEST_EQUAL_RANK + goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMon + compare VAR_RESULT, CAN_ENTER_CONTEST_HIGH_RANK + goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon + compare VAR_RESULT, CANT_ENTER_CONTEST_EGG + goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterEgg + compare VAR_RESULT, CANT_ENTER_CONTEST_FAINTED + goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterFainted end -LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62 - message LilycoveCity_ContestLobby_Text_27B3FF +LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62 + message LilycoveCity_ContestLobby_Text_EnterWhichRank waitmessage multichoice 0, 0, MULTI_CONTEST_RANK, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279EB5 - case 1, LilycoveCity_ContestLobby_EventScript_279EC0 - case 2, LilycoveCity_ContestLobby_EventScript_279ECB - case 3, LilycoveCity_ContestLobby_EventScript_279ED6 - case 4, LilycoveCity_ContestLobby_EventScript_279E09 - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 + case 0, LilycoveCity_ContestLobby_EventScript_EnterNormalRank + case 1, LilycoveCity_ContestLobby_EventScript_EnterSuperRank + case 2, LilycoveCity_ContestLobby_EventScript_EnterHyperRank + case 3, LilycoveCity_ContestLobby_EventScript_EnterMasterRank + case 4, LilycoveCity_ContestLobby_EventScript_CancelEnterContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest end -LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5 - setvar VAR_CONTEST_RANK, 0 - goto LilycoveCity_ContestLobby_EventScript_279EE1 +LilycoveCity_ContestLobby_EventScript_EnterNormalRank:: @ 8279EB5 + setvar VAR_CONTEST_RANK, CONTEST_RANK_NORMAL + goto LilycoveCity_ContestLobby_EventScript_ChooseContestType end -LilycoveCity_ContestLobby_EventScript_279EC0:: @ 8279EC0 - setvar VAR_CONTEST_RANK, 1 - goto LilycoveCity_ContestLobby_EventScript_279EE1 +LilycoveCity_ContestLobby_EventScript_EnterSuperRank:: @ 8279EC0 + setvar VAR_CONTEST_RANK, CONTEST_RANK_SUPER + goto LilycoveCity_ContestLobby_EventScript_ChooseContestType end -LilycoveCity_ContestLobby_EventScript_279ECB:: @ 8279ECB - setvar VAR_CONTEST_RANK, 2 - goto LilycoveCity_ContestLobby_EventScript_279EE1 +LilycoveCity_ContestLobby_EventScript_EnterHyperRank:: @ 8279ECB + setvar VAR_CONTEST_RANK, CONTEST_RANK_HYPER + goto LilycoveCity_ContestLobby_EventScript_ChooseContestType end -LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6 - setvar VAR_CONTEST_RANK, 3 - goto LilycoveCity_ContestLobby_EventScript_279EE1 +LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6 + setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER + goto LilycoveCity_ContestLobby_EventScript_ChooseContestType end -LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1 - message LilycoveCity_ContestLobby_Text_27B423 +@ The multichoice selection IDs are equal to the CATEGORY values +@ So rather than list the cases they just copy VAR_RESULT for a valid selection into VAR_CONTEST_CATEGORY +LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1 + message LilycoveCity_ContestLobby_Text_EnterWhichContest1 waitmessage multichoice 0, 0, MULTI_CONTEST_TYPE, 0 switch VAR_RESULT - case 5, LilycoveCity_ContestLobby_EventScript_279E09 - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 + case 5, LilycoveCity_ContestLobby_EventScript_CancelEnterContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest copyvar VAR_CONTEST_CATEGORY, VAR_RESULT - goto LilycoveCity_ContestLobby_EventScript_279E13 + goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon end -LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12 - msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_279E13 +LilycoveCity_ContestLobby_EventScript_CantEnterLowRank:: @ 8279F12 + msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon release end -LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21 - msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO +@ Unused +LilycoveCity_ContestLobby_EventScript_ConfirmEntry:: @ 8279F21 + msgbox LilycoveCity_ContestLobby_Text_ConfirmContestMon, MSGBOX_YESNO switch VAR_RESULT - case NO, LilycoveCity_ContestLobby_EventScript_279E13 - case YES, LilycoveCity_ContestLobby_EventScript_279F87 + case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon + case YES, LilycoveCity_ContestLobby_EventScript_EnterMon end -LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45 - msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO +LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon:: @ 8279F45 + msgbox LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway, MSGBOX_YESNO switch VAR_RESULT - case NO, LilycoveCity_ContestLobby_EventScript_279E13 - case YES, LilycoveCity_ContestLobby_EventScript_279F87 + case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon + case YES, LilycoveCity_ContestLobby_EventScript_EnterMon end -LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69 - msgbox LilycoveCity_ContestLobby_Text_27B4C4, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_279E13 +LilycoveCity_ContestLobby_EventScript_CantEnterEgg:: @ 8279F69 + msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon release end -LilycoveCity_ContestLobby_EventScript_279F78:: @ 8279F78 - msgbox LilycoveCity_ContestLobby_Text_27B501, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_279E13 +LilycoveCity_ContestLobby_EventScript_CantEnterFainted:: @ 8279F78 + msgbox LilycoveCity_ContestLobby_Text_MonInNoConditionForContest, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon release end -LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87 - msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT +@ The return here is back to LilycoveCity_ContestLobby_EventScript_ContestReceptionist +LilycoveCity_ContestLobby_EventScript_EnterMon:: @ 8279F87 + msgbox LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4, MSGBOX_DEFAULT closemessage releaseall - setvar VAR_LINK_CONTEST_ROOM_STATE, 1 + setvar VAR_CONTEST_HALL_STATE, 1 return -LinkContestRoom1_EventScript_279F97:: @ 8279F97 - special sub_80F90DC +ContestHall_EventScript_DoContest:: @ 8279F97 + special LinkContestTryShowWirelessIndicator setvar VAR_0x8006, 0 lockall - applymovement 14, LinkContestRoom1_Movement_27AD43 + applymovement 14, ContestHall_Movement_Player4FaceUp waitmovement 0 - applymovement 1, LinkContestRoom1_Movement_27AD09 + applymovement 1, ContestHall_Movement_MCWalkDown waitmovement 0 releaseall - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_279FF2 - call LinkContestRoom1_EventScript_27A03C - call LinkContestRoom1_EventScript_27A097 - call LinkContestRoom1_EventScript_27A0F5 - call LinkContestRoom1_EventScript_27A801 - call LinkContestRoom1_EventScript_27A8A5 - call LinkContestRoom1_EventScript_27A987 - call LinkContestRoom1_EventScript_27A9D4 - call LinkContestRoom1_EventScript_27AA1B - call LinkContestRoom1_EventScript_27AB36 - setvar VAR_LINK_CONTEST_ROOM_STATE, 2 - return - -LinkContestRoom1_EventScript_279FF2:: @ 8279FF2 + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_GetContestRankStringId + call ContestHall_EventScript_GetContestCategory + call ContestHall_EventScript_ContestGettingStarted + call ContestHall_EventScript_ShowContestMons + call ContestHall_EventScript_DoContestAppeals + call ContestHall_EventScript_ContestResults + call ContestHall_EventScript_GetWinnerObjEventId + call ContestHall_EventScript_CongratulateWinner + call ContestHall_EventScript_AudienceLookAround + call ContestHall_EventScript_GiveWinnerPrize + setvar VAR_CONTEST_HALL_STATE, 2 + return + +ContestHall_EventScript_GetContestRankStringId:: @ 8279FF2 switch VAR_CONTEST_RANK - case 0, LinkContestRoom1_EventScript_27A024 - case 1, LinkContestRoom1_EventScript_27A02A - case 2, LinkContestRoom1_EventScript_27A030 - case 3, LinkContestRoom1_EventScript_27A036 + case CONTEST_RANK_NORMAL, ContestHall_EventScript_GetNormalStringId + case CONTEST_RANK_SUPER, ContestHall_EventScript_GetSuperStringId + case CONTEST_RANK_HYPER, ContestHall_EventScript_GetHyperStringId + case CONTEST_RANK_MASTER, ContestHall_EventScript_GetMasterStringId return -LinkContestRoom1_EventScript_27A024:: @ 827A024 +ContestHall_EventScript_GetNormalStringId:: @ 827A024 setvar VAR_0x8009, STDSTRING_NORMAL return -LinkContestRoom1_EventScript_27A02A:: @ 827A02A +ContestHall_EventScript_GetSuperStringId:: @ 827A02A setvar VAR_0x8009, STDSTRING_SUPER return -LinkContestRoom1_EventScript_27A030:: @ 827A030 +ContestHall_EventScript_GetHyperStringId:: @ 827A030 setvar VAR_0x8009, STDSTRING_HYPER return -LinkContestRoom1_EventScript_27A036:: @ 827A036 +ContestHall_EventScript_GetMasterStringId:: @ 827A036 setvar VAR_0x8009, STDSTRING_MASTER return -LinkContestRoom1_EventScript_27A03C:: @ 827A03C +@ This whole switch is equivalent to copyvar VAR_0x8008, VAR_CONTEST_CATEGORY +ContestHall_EventScript_GetContestCategory:: @ 827A03C switch VAR_CONTEST_CATEGORY - case 0, LinkContestRoom1_EventScript_27A079 - case 1, LinkContestRoom1_EventScript_27A07F - case 2, LinkContestRoom1_EventScript_27A085 - case 3, LinkContestRoom1_EventScript_27A08B - case 4, LinkContestRoom1_EventScript_27A091 + case CONTEST_CATEGORY_COOL, ContestHall_EventScript_GetCategoryCool + case CONTEST_CATEGORY_BEAUTY, ContestHall_EventScript_GetCategoryBeauty + case CONTEST_CATEGORY_CUTE, ContestHall_EventScript_GetCategoryCute + case CONTEST_CATEGORY_SMART, ContestHall_EventScript_GetCategorySmart + case CONTEST_CATEGORY_TOUGH, ContestHall_EventScript_GetCategoryTough return -LinkContestRoom1_EventScript_27A079:: @ 827A079 +ContestHall_EventScript_GetCategoryCool:: @ 827A079 setvar VAR_0x8008, CONTEST_CATEGORY_COOL return -LinkContestRoom1_EventScript_27A07F:: @ 827A07F +ContestHall_EventScript_GetCategoryBeauty:: @ 827A07F setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY return -LinkContestRoom1_EventScript_27A085:: @ 827A085 +ContestHall_EventScript_GetCategoryCute:: @ 827A085 setvar VAR_0x8008, CONTEST_CATEGORY_CUTE return -LinkContestRoom1_EventScript_27A08B:: @ 827A08B +ContestHall_EventScript_GetCategorySmart:: @ 827A08B setvar VAR_0x8008, CONTEST_CATEGORY_SMART return -LinkContestRoom1_EventScript_27A091:: @ 827A091 +ContestHall_EventScript_GetCategoryTough:: @ 827A091 setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH return -LinkContestRoom1_EventScript_27A097:: @ 827A097 +ContestHall_EventScript_ContestGettingStarted:: @ 827A097 buffercontesttypestring 1, VAR_0x8008 bufferstdstring 2, VAR_0x8009 - call LinkContestRoom1_EventScript_27A0B1 + call ContestHall_EventScript_GettingStarted lockall - applymovement 1, LinkContestRoom1_Movement_27AD0B + applymovement 1, ContestHall_Movement_MCBackUp waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A0C7 +ContestHall_EventScript_GettingStarted:: @ 827A0B1 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_GettingStartedLink lockall - msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT + msgbox ContestHall_Text_GettingStartedParticipantsAsFollows, MSGBOX_DEFAULT releaseall return -LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7 - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_27A0DE - messageautoscroll LinkContestRoom1_Text_27B78F +ContestHall_EventScript_GettingStartedLink:: @ 827A0C7 + specialvar VAR_RESULT, IsWirelessContest + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_GettingStartedWireless + messageautoscroll ContestHall_Text_GettingStartedParticipantsAsFollowsLink waitmessage return -LinkContestRoom1_EventScript_27A0DE:: @ 827A0DE - messageautoscroll LinkContestRoom1_Text_27C929 +ContestHall_EventScript_GettingStartedWireless:: @ 827A0DE + messageautoscroll ContestHall_Text_GettingStartedWireless waitmessage - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27C972 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_ParticipantsAsFollows waitmessage - call LinkContestRoom1_EventScript_27A133 + call ContestHall_EventScript_TryWaitForLink return -LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 - call LinkContestRoom1_EventScript_27A149 - call LinkContestRoom1_EventScript_27A1D2 - call LinkContestRoom1_EventScript_27A34F - call LinkContestRoom1_EventScript_27A2D5 - call LinkContestRoom1_EventScript_27A77A - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_ShowContestMons:: @ 827A0F5 + call ContestHall_EventScript_ContestantWalkToCenter + call ContestHall_EventScript_ShowContestMonPic + call ContestHall_EventScript_AudienceHeartEmotes + call ContestHall_EventScript_AudienceReactToContestant + call ContestHall_EventScript_ContestantReturn + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_TryWaitForLink addvar VAR_0x8006, 1 - compare VAR_0x8006, 4 - goto_if_ne LinkContestRoom1_EventScript_27A0F5 - call LinkContestRoom1_EventScript_27A230 + compare VAR_0x8006, CONTESTANT_COUNT + goto_if_ne ContestHall_EventScript_ShowContestMons + call ContestHall_EventScript_AudienceVote setvar VAR_TEMP_1, 6 return -LinkContestRoom1_EventScript_27A133:: @ 827A133 - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_27A144 +ContestHall_EventScript_TryWaitForLink:: @ 827A133 + specialvar VAR_RESULT, IsWirelessContest + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_WaitForLink return -LinkContestRoom1_EventScript_27A144:: @ 827A144 - special sub_80F905C +ContestHall_EventScript_WaitForLink:: @ 827A144 + special LinkContestWaitForConnection waitstate return -LinkContestRoom1_EventScript_27A149:: @ 827A149 +ContestHall_EventScript_ContestantWalkToCenter:: @ 827A149 compare VAR_0x8006, 0 - goto_if_eq LinkContestRoom1_EventScript_27A176 + goto_if_eq ContestHall_EventScript_Player1WalkToCenter compare VAR_0x8006, 1 - goto_if_eq LinkContestRoom1_EventScript_27A18D + goto_if_eq ContestHall_EventScript_Player2WalkToCenter compare VAR_0x8006, 2 - goto_if_eq LinkContestRoom1_EventScript_27A1A4 + goto_if_eq ContestHall_EventScript_Player3WalkToCenter compare VAR_0x8006, 3 - goto_if_eq LinkContestRoom1_EventScript_27A1BB + goto_if_eq ContestHall_EventScript_Player4WalkToCenter return -LinkContestRoom1_EventScript_27A176:: @ 827A176 - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player1WalkToCenter:: @ 827A176 + call ContestHall_EventScript_TryWaitForLink lockall - applymovement 3, LinkContestRoom1_Movement_27AD52 + applymovement 3, ContestHall_Movement_Player1WalkToCenter waitmovement 0 releaseall setvar VAR_0x800B, 3 return -LinkContestRoom1_EventScript_27A18D:: @ 827A18D - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player2WalkToCenter:: @ 827A18D + call ContestHall_EventScript_TryWaitForLink lockall - applymovement 4, LinkContestRoom1_Movement_27AD5E + applymovement 4, ContestHall_Movement_Player2WalkToCenter waitmovement 0 releaseall setvar VAR_0x800B, 4 return -LinkContestRoom1_EventScript_27A1A4:: @ 827A1A4 - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player3WalkToCenter:: @ 827A1A4 + call ContestHall_EventScript_TryWaitForLink lockall - applymovement 5, LinkContestRoom1_Movement_27AD66 + applymovement 5, ContestHall_Movement_Player3WalkToCenter waitmovement 0 releaseall setvar VAR_0x800B, 5 return -LinkContestRoom1_EventScript_27A1BB:: @ 827A1BB - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player4WalkToCenter:: @ 827A1BB + call ContestHall_EventScript_TryWaitForLink lockall - applymovement 14, LinkContestRoom1_Movement_27AD6E + applymovement 14, ContestHall_Movement_Player4WalkToCenter waitmovement 0 releaseall setvar VAR_0x800B, 14 return -LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 - special sub_80F8850 +ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2 + special BufferContestTrainerAndMonNames addvar VAR_0x8006, 1 buffernumberstring 1, VAR_0x8006 lockall - applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD20 + applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 waitmovement 0 releaseall - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_27AD80 - addobject 13 + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_CheckIfContestWithRSPlayer + addobject 13 @ Place Poke Ball down playse SE_DANSA lockall - applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD20 + applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 waitmovement 0 releaseall - addvar VAR_0x8006, 65535 + addvar VAR_0x8006, -1 playse SE_BOWA2 special ShowContestEntryMonPic - call LinkContestRoom1_EventScript_27A217 + call ContestHall_EventScript_EntryXTrainersMon return -LinkContestRoom1_EventScript_27A217:: @ 827A217 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A229 - message LinkContestRoom1_Text_27B815 +ContestHall_EventScript_EntryXTrainersMon:: @ 827A217 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_EntryXTrainersMonLink + message ContestHall_Text_EntryXTrainersMon waitmessage return -LinkContestRoom1_EventScript_27A229:: @ 827A229 - messageautoscroll LinkContestRoom1_Text_27B815 +ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229 + messageautoscroll ContestHall_Text_EntryXTrainersMon waitmessage return -LinkContestRoom1_EventScript_27A230:: @ 827A230 - call LinkContestRoom1_EventScript_27A26C - call LinkContestRoom1_EventScript_27A2B9 +ContestHall_EventScript_AudienceVote:: @ 827A230 + call ContestHall_EventScript_AudienceWillVote + call ContestHall_EventScript_VotingUnderWay playse SE_W227B waitmessage - call LinkContestRoom1_EventScript_27AA1B - applymovement 1, LinkContestRoom1_Movement_27AD23 + call ContestHall_EventScript_AudienceLookAround + applymovement 1, ContestHall_Movement_MCFaceJudge2 waitmovement 0 - applymovement 2, LinkContestRoom1_Movement_27AD25 + applymovement 2, ContestHall_Movement_JudgeFaceMC waitmovement 0 delay 20 - applymovement 1, LinkContestRoom1_Movement_27AD13 - applymovement 2, LinkContestRoom1_Movement_27AD13 + applymovement 1, ContestHall_Movement_FaceContestants + applymovement 2, ContestHall_Movement_FaceContestants waitmovement 0 return -LinkContestRoom1_EventScript_27A26C:: @ 827A26C - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A280 - msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT +ContestHall_EventScript_AudienceWillVote:: @ 827A26C + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_AudienceWillVoteLink + msgbox ContestHall_Text_SeenContestantsAudienceWillVote, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27A280:: @ 827A280 - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_27A297 - messageautoscroll LinkContestRoom1_Text_27B830 +ContestHall_EventScript_AudienceWillVoteLink:: @ 827A280 + specialvar VAR_RESULT, IsWirelessContest + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_AudienceWillVoteWireless + messageautoscroll ContestHall_Text_SeenContestantsAudienceWillVote waitmessage return -LinkContestRoom1_EventScript_27A297:: @ 827A297 - messageautoscroll LinkContestRoom1_Text_27C9AF +ContestHall_EventScript_AudienceWillVoteWireless:: @ 827A297 + messageautoscroll ContestHall_Text_WeveSeenContestants waitmessage - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27CA04 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_AudienceWillVote waitmessage - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27CA42 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_LetVotingBegin waitmessage - call LinkContestRoom1_EventScript_27A133 + call ContestHall_EventScript_TryWaitForLink return -LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A2CA - message LinkContestRoom1_Text_27B8F2 +ContestHall_EventScript_VotingUnderWay:: @ 827A2B9 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_VotingUnderWayLink + message ContestHall_Text_VotingUnderWay return -LinkContestRoom1_EventScript_27A2CA:: @ 827A2CA - messageautoscroll LinkContestRoom1_Text_27B8F2 - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_VotingUnderWayLink:: @ 827A2CA + messageautoscroll ContestHall_Text_VotingUnderWay + call ContestHall_EventScript_TryWaitForLink return -LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 - call LinkContestRoom1_EventScript_27A133 - applymovement 1, LinkContestRoom1_Movement_27AD33 +ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5 + call ContestHall_EventScript_TryWaitForLink + applymovement 1, ContestHall_Movement_AudienceMemberLookLeft waitmovement 0 playse SE_W227B - call LinkContestRoom1_EventScript_27AA6F - applymovement 9, LinkContestRoom1_Movement_27AD3B - applymovement 12, LinkContestRoom1_Movement_27AD3F - applymovement 7, LinkContestRoom1_Movement_27AD3B + call ContestHall_EventScript_VObjectAudienceLookAround + applymovement 9, ContestHall_Movement_AudienceMemberLookRight + applymovement 12, ContestHall_Movement_AudienceMemberLookDown + applymovement 7, ContestHall_Movement_AudienceMemberLookRight waitmovement 0 - applymovement 1, LinkContestRoom1_Movement_27AD3B + applymovement 1, ContestHall_Movement_AudienceMemberLookRight waitmovement 0 - applymovement 10, LinkContestRoom1_Movement_27AD33 - applymovement 11, LinkContestRoom1_Movement_27AD3F - applymovement 6, LinkContestRoom1_Movement_27AD37 - applymovement 8, LinkContestRoom1_Movement_27AD33 + applymovement 10, ContestHall_Movement_AudienceMemberLookLeft + applymovement 11, ContestHall_Movement_AudienceMemberLookDown + applymovement 6, ContestHall_Movement_AudienceMemberLookUp + applymovement 8, ContestHall_Movement_AudienceMemberLookLeft waitmovement 0 - applymovement 1, LinkContestRoom1_Movement_27AD45 + applymovement 1, ContestHall_Movement_MCLookAtJudge waitmovement 0 - applymovement 1, LinkContestRoom1_Movement_27AD4E - applymovement 2, LinkContestRoom1_Movement_27AD49 + applymovement 1, ContestHall_Movement_MCWalkInPlaceDown + applymovement 2, ContestHall_Movement_JudgeLookAtMC waitmovement 0 releaseall - call LinkContestRoom1_EventScript_27A133 - return - -LinkContestRoom1_EventScript_27A34F:: @ 827A34F - special sub_80F82FC - compare VAR_CONTEST_LOCATION, 1 - call_if_eq LinkContestRoom1_EventScript_27A454 - compare VAR_CONTEST_LOCATION, 2 - call_if_eq LinkContestRoom1_EventScript_27A4B2 - compare VAR_CONTEST_LOCATION, 3 - call_if_eq LinkContestRoom1_EventScript_27A510 - compare VAR_CONTEST_LOCATION, 4 - call_if_eq LinkContestRoom1_EventScript_27A56E - compare VAR_CONTEST_LOCATION, 5 - call_if_eq LinkContestRoom1_EventScript_27A5CC + call ContestHall_EventScript_TryWaitForLink + return + +@ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience +@ The number of hearts to try to display is based on the condition of the presented pokemon and the rank +@ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart +@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects +@ and are set to 9 if they havent displayed a heart yet, and 1 if they have +ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F + special GetContestMonCondition + compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL + call_if_eq ContestHall_EventScript_GetNumberOfHeartsNormal + compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER + call_if_eq ContestHall_EventScript_GetNumberOfHeartsSuper + compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER + call_if_eq ContestHall_EventScript_GetNumberOfHeartsHyper + compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER + call_if_eq ContestHall_EventScript_GetNumberOfHeartsMaster + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + call_if_eq ContestHall_EventScript_GetNumberOfHeartsLink setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 setvar VAR_TEMP_3, 9 @@ -502,7 +513,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F setvar VAR_TEMP_7, 9 setvar VAR_TEMP_8, 9 compare VAR_TEMP_0, 0 - call_if_gt LinkContestRoom1_EventScript_27A3E5 + call_if_gt ContestHall_EventScript_DisplayHearts setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -513,505 +524,505 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F setvar VAR_TEMP_8, 0 return -LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 +ContestHall_EventScript_DisplayHearts:: @ 827A3E5 setvar VAR_RESULT, 8 special ScriptRandom compare VAR_RESULT, 0 - call_if_eq LinkContestRoom1_EventScript_27A65A + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1 compare VAR_RESULT, 1 - call_if_eq LinkContestRoom1_EventScript_27A67E + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember2 compare VAR_RESULT, 2 - call_if_eq LinkContestRoom1_EventScript_27A6A2 + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember3 compare VAR_RESULT, 3 - call_if_eq LinkContestRoom1_EventScript_27A6C6 + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember4 compare VAR_RESULT, 4 - call_if_eq LinkContestRoom1_EventScript_27A6EA + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember5 compare VAR_RESULT, 5 - call_if_eq LinkContestRoom1_EventScript_27A70E + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember6 compare VAR_RESULT, 6 - call_if_eq LinkContestRoom1_EventScript_27A732 + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember7 compare VAR_RESULT, 7 - call_if_eq LinkContestRoom1_EventScript_27A756 - compare VAR_TEMP_0, 0 - goto_if_gt LinkContestRoom1_EventScript_27A3E5 + call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember8 + compare VAR_TEMP_0, 0 @ Still more hearts to display + goto_if_gt ContestHall_EventScript_DisplayHearts waitmovement 0 return -LinkContestRoom1_EventScript_27A454:: @ 827A454 +ContestHall_EventScript_GetNumberOfHeartsNormal:: @ 827A454 compare VAR_0x8004, 80 - goto_if_gt LinkContestRoom1_EventScript_27A654 + goto_if_gt ContestHall_EventScript_Set8Hearts compare VAR_0x8004, 70 - goto_if_gt LinkContestRoom1_EventScript_27A64E + goto_if_gt ContestHall_EventScript_Set7Hearts compare VAR_0x8004, 60 - goto_if_gt LinkContestRoom1_EventScript_27A648 + goto_if_gt ContestHall_EventScript_Set6Hearts compare VAR_0x8004, 50 - goto_if_gt LinkContestRoom1_EventScript_27A642 + goto_if_gt ContestHall_EventScript_Set5Hearts compare VAR_0x8004, 40 - goto_if_gt LinkContestRoom1_EventScript_27A63C + goto_if_gt ContestHall_EventScript_Set4Hearts compare VAR_0x8004, 30 - goto_if_gt LinkContestRoom1_EventScript_27A636 + goto_if_gt ContestHall_EventScript_Set3Hearts compare VAR_0x8004, 20 - goto_if_gt LinkContestRoom1_EventScript_27A630 + goto_if_gt ContestHall_EventScript_Set2Hearts compare VAR_0x8004, 10 - goto_if_gt LinkContestRoom1_EventScript_27A62A + goto_if_gt ContestHall_EventScript_Set1Heart setvar VAR_TEMP_0, 0 return -LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 +ContestHall_EventScript_GetNumberOfHeartsSuper:: @ 827A4B2 compare VAR_0x8004, 230 - goto_if_gt LinkContestRoom1_EventScript_27A654 + goto_if_gt ContestHall_EventScript_Set8Hearts compare VAR_0x8004, 210 - goto_if_gt LinkContestRoom1_EventScript_27A64E + goto_if_gt ContestHall_EventScript_Set7Hearts compare VAR_0x8004, 190 - goto_if_gt LinkContestRoom1_EventScript_27A648 + goto_if_gt ContestHall_EventScript_Set6Hearts compare VAR_0x8004, 170 - goto_if_gt LinkContestRoom1_EventScript_27A642 + goto_if_gt ContestHall_EventScript_Set5Hearts compare VAR_0x8004, 150 - goto_if_gt LinkContestRoom1_EventScript_27A63C + goto_if_gt ContestHall_EventScript_Set4Hearts compare VAR_0x8004, 130 - goto_if_gt LinkContestRoom1_EventScript_27A636 + goto_if_gt ContestHall_EventScript_Set3Hearts compare VAR_0x8004, 110 - goto_if_gt LinkContestRoom1_EventScript_27A630 + goto_if_gt ContestHall_EventScript_Set2Hearts compare VAR_0x8004, 90 - goto_if_gt LinkContestRoom1_EventScript_27A62A + goto_if_gt ContestHall_EventScript_Set1Heart setvar VAR_TEMP_0, 0 return -LinkContestRoom1_EventScript_27A510:: @ 827A510 +ContestHall_EventScript_GetNumberOfHeartsHyper:: @ 827A510 compare VAR_0x8004, 380 - goto_if_gt LinkContestRoom1_EventScript_27A654 + goto_if_gt ContestHall_EventScript_Set8Hearts compare VAR_0x8004, 350 - goto_if_gt LinkContestRoom1_EventScript_27A64E + goto_if_gt ContestHall_EventScript_Set7Hearts compare VAR_0x8004, 320 - goto_if_gt LinkContestRoom1_EventScript_27A648 + goto_if_gt ContestHall_EventScript_Set6Hearts compare VAR_0x8004, 290 - goto_if_gt LinkContestRoom1_EventScript_27A642 + goto_if_gt ContestHall_EventScript_Set5Hearts compare VAR_0x8004, 260 - goto_if_gt LinkContestRoom1_EventScript_27A63C + goto_if_gt ContestHall_EventScript_Set4Hearts compare VAR_0x8004, 230 - goto_if_gt LinkContestRoom1_EventScript_27A636 + goto_if_gt ContestHall_EventScript_Set3Hearts compare VAR_0x8004, 200 - goto_if_gt LinkContestRoom1_EventScript_27A630 + goto_if_gt ContestHall_EventScript_Set2Hearts compare VAR_0x8004, 170 - goto_if_gt LinkContestRoom1_EventScript_27A62A + goto_if_gt ContestHall_EventScript_Set1Heart setvar VAR_TEMP_0, 0 return -LinkContestRoom1_EventScript_27A56E:: @ 827A56E +ContestHall_EventScript_GetNumberOfHeartsMaster:: @ 827A56E compare VAR_0x8004, 600 - goto_if_gt LinkContestRoom1_EventScript_27A654 + goto_if_gt ContestHall_EventScript_Set8Hearts compare VAR_0x8004, 560 - goto_if_gt LinkContestRoom1_EventScript_27A64E + goto_if_gt ContestHall_EventScript_Set7Hearts compare VAR_0x8004, 520 - goto_if_gt LinkContestRoom1_EventScript_27A648 + goto_if_gt ContestHall_EventScript_Set6Hearts compare VAR_0x8004, 480 - goto_if_gt LinkContestRoom1_EventScript_27A642 + goto_if_gt ContestHall_EventScript_Set5Hearts compare VAR_0x8004, 440 - goto_if_gt LinkContestRoom1_EventScript_27A63C + goto_if_gt ContestHall_EventScript_Set4Hearts compare VAR_0x8004, 400 - goto_if_gt LinkContestRoom1_EventScript_27A636 + goto_if_gt ContestHall_EventScript_Set3Hearts compare VAR_0x8004, 360 - goto_if_gt LinkContestRoom1_EventScript_27A630 + goto_if_gt ContestHall_EventScript_Set2Hearts compare VAR_0x8004, 320 - goto_if_gt LinkContestRoom1_EventScript_27A62A + goto_if_gt ContestHall_EventScript_Set1Heart setvar VAR_TEMP_0, 0 return -LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC +ContestHall_EventScript_GetNumberOfHeartsLink:: @ 827A5CC compare VAR_0x8004, 600 - goto_if_gt LinkContestRoom1_EventScript_27A654 + goto_if_gt ContestHall_EventScript_Set8Hearts compare VAR_0x8004, 550 - goto_if_gt LinkContestRoom1_EventScript_27A64E + goto_if_gt ContestHall_EventScript_Set7Hearts compare VAR_0x8004, 500 - goto_if_gt LinkContestRoom1_EventScript_27A648 + goto_if_gt ContestHall_EventScript_Set6Hearts compare VAR_0x8004, 450 - goto_if_gt LinkContestRoom1_EventScript_27A642 + goto_if_gt ContestHall_EventScript_Set5Hearts compare VAR_0x8004, 400 - goto_if_gt LinkContestRoom1_EventScript_27A63C + goto_if_gt ContestHall_EventScript_Set4Hearts compare VAR_0x8004, 300 - goto_if_gt LinkContestRoom1_EventScript_27A636 + goto_if_gt ContestHall_EventScript_Set3Hearts compare VAR_0x8004, 200 - goto_if_gt LinkContestRoom1_EventScript_27A630 + goto_if_gt ContestHall_EventScript_Set2Hearts compare VAR_0x8004, 100 - goto_if_gt LinkContestRoom1_EventScript_27A62A + goto_if_gt ContestHall_EventScript_Set1Heart setvar VAR_TEMP_0, 0 return -LinkContestRoom1_EventScript_27A62A:: @ 827A62A +ContestHall_EventScript_Set1Heart:: @ 827A62A setvar VAR_TEMP_0, 1 return -LinkContestRoom1_EventScript_27A630:: @ 827A630 +ContestHall_EventScript_Set2Hearts:: @ 827A630 setvar VAR_TEMP_0, 2 return -LinkContestRoom1_EventScript_27A636:: @ 827A636 +ContestHall_EventScript_Set3Hearts:: @ 827A636 setvar VAR_TEMP_0, 3 return -LinkContestRoom1_EventScript_27A63C:: @ 827A63C +ContestHall_EventScript_Set4Hearts:: @ 827A63C setvar VAR_TEMP_0, 4 return -LinkContestRoom1_EventScript_27A642:: @ 827A642 +ContestHall_EventScript_Set5Hearts:: @ 827A642 setvar VAR_TEMP_0, 5 return -LinkContestRoom1_EventScript_27A648:: @ 827A648 +ContestHall_EventScript_Set6Hearts:: @ 827A648 setvar VAR_TEMP_0, 6 return -LinkContestRoom1_EventScript_27A64E:: @ 827A64E +ContestHall_EventScript_Set7Hearts:: @ 827A64E setvar VAR_TEMP_0, 7 return -LinkContestRoom1_EventScript_27A654:: @ 827A654 +ContestHall_EventScript_Set8Hearts:: @ 827A654 setvar VAR_TEMP_0, 8 return -LinkContestRoom1_EventScript_27A65A:: @ 827A65A +ContestHall_EventScript_TryDisplayHeartAudienceMember1:: @ 827A65A compare VAR_TEMP_1, 1 - goto_if_eq LinkContestRoom1_EventScript_27A67D - applymovement 6, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember1AlreadyEmoted + applymovement 6, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_1, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A67D:: @ 827A67D +ContestHall_EventScript_AudienceMember1AlreadyEmoted:: @ 827A67D return -LinkContestRoom1_EventScript_27A67E:: @ 827A67E +ContestHall_EventScript_TryDisplayHeartAudienceMember2:: @ 827A67E compare VAR_TEMP_2, 1 - goto_if_eq LinkContestRoom1_EventScript_27A6A1 - applymovement 12, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember2AlreadyEmoted + applymovement 12, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_2, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1 +ContestHall_EventScript_AudienceMember2AlreadyEmoted:: @ 827A6A1 return -LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2 +ContestHall_EventScript_TryDisplayHeartAudienceMember3:: @ 827A6A2 compare VAR_TEMP_3, 1 - goto_if_eq LinkContestRoom1_EventScript_27A6C5 - applymovement 7, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember3AlreadyEmoted + applymovement 7, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_3, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5 +ContestHall_EventScript_AudienceMember3AlreadyEmoted:: @ 827A6C5 return -LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6 +ContestHall_EventScript_TryDisplayHeartAudienceMember4:: @ 827A6C6 compare VAR_TEMP_4, 1 - goto_if_eq LinkContestRoom1_EventScript_27A6E9 - applymovement 8, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_Audience4MemberAlreadyEmoted + applymovement 8, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_4, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9 +ContestHall_EventScript_Audience4MemberAlreadyEmoted:: @ 827A6E9 return -LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA +ContestHall_EventScript_TryDisplayHeartAudienceMember5:: @ 827A6EA compare VAR_TEMP_5, 1 - goto_if_eq LinkContestRoom1_EventScript_27A70D - applymovement 9, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember5AlreadyEmoted + applymovement 9, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_5, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A70D:: @ 827A70D +ContestHall_EventScript_AudienceMember5AlreadyEmoted:: @ 827A70D return -LinkContestRoom1_EventScript_27A70E:: @ 827A70E +ContestHall_EventScript_TryDisplayHeartAudienceMember6:: @ 827A70E compare VAR_TEMP_6, 1 - goto_if_eq LinkContestRoom1_EventScript_27A731 - applymovement 10, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember6AlreadyEmoted + applymovement 10, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_6, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A731:: @ 827A731 +ContestHall_EventScript_AudienceMember6AlreadyEmoted:: @ 827A731 return -LinkContestRoom1_EventScript_27A732:: @ 827A732 +ContestHall_EventScript_TryDisplayHeartAudienceMember7:: @ 827A732 compare VAR_TEMP_7, 1 - goto_if_eq LinkContestRoom1_EventScript_27A755 - applymovement 11, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember7AlreadyEmoted + applymovement 11, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_7, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A755:: @ 827A755 +ContestHall_EventScript_AudienceMember7AlreadyEmoted:: @ 827A755 return -LinkContestRoom1_EventScript_27A756:: @ 827A756 +ContestHall_EventScript_TryDisplayHeartAudienceMember8:: @ 827A756 compare VAR_TEMP_8, 1 - goto_if_eq LinkContestRoom1_EventScript_27A779 - applymovement 15, LinkContestRoom1_Movement_27AD11 + goto_if_eq ContestHall_EventScript_AudienceMember8AlreadyEmoted + applymovement 15, ContestHall_Movement_Heart playse SE_PIN delay 14 setvar VAR_TEMP_8, 1 - addvar VAR_TEMP_0, 65535 + addvar VAR_TEMP_0, -1 return -LinkContestRoom1_EventScript_27A779:: @ 827A779 +ContestHall_EventScript_AudienceMember8AlreadyEmoted:: @ 827A779 return -LinkContestRoom1_EventScript_27A77A:: @ 827A77A +ContestHall_EventScript_ContestantReturn:: @ 827A77A closemessage release - removeobject 13 - special sub_80F8EB8 - call LinkContestRoom1_EventScript_27A133 + removeobject 13 @ Poke Ball + special HideContestEntryMonPic + call ContestHall_EventScript_TryWaitForLink switch VAR_0x8006 - case 0, LinkContestRoom1_EventScript_27A7B9 - case 1, LinkContestRoom1_EventScript_27A7CB - case 2, LinkContestRoom1_EventScript_27A7DD - case 3, LinkContestRoom1_EventScript_27A7EF + case 0, ContestHall_EventScript_Player1WalkBack + case 1, ContestHall_EventScript_Player2WalkBack + case 2, ContestHall_EventScript_Player3WalkBack + case 3, ContestHall_EventScript_Player4WalkBack return -LinkContestRoom1_EventScript_27A7B9:: @ 827A7B9 - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player1WalkBack:: @ 827A7B9 + call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD58 + applymovement VAR_0x800B, ContestHall_Movement_Player1WalkBack waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27A7CB:: @ 827A7CB - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player2WalkBack:: @ 827A7CB + call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD62 + applymovement VAR_0x800B, ContestHall_Movement_Player2WalkBack waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27A7DD:: @ 827A7DD - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player3WalkBack:: @ 827A7DD + call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD6A + applymovement VAR_0x800B, ContestHall_Movement_Player3WalkBack waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27A7EF:: @ 827A7EF - call LinkContestRoom1_EventScript_27A133 +ContestHall_EventScript_Player4WalkBack:: @ 827A7EF + call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD74 + applymovement VAR_0x800B, ContestHall_Movement_Player4WalkBack waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27A801:: @ 827A801 +ContestHall_EventScript_DoContestAppeals:: @ 827A801 lockall - applymovement 1, LinkContestRoom1_Movement_27AD27 + applymovement 1, ContestHall_Movement_FaceContestants2 waitmovement 0 - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_27A853 + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_LetsAppeal waitmessage - applymovement 1, LinkContestRoom1_Movement_27AD15 - applymovement 2, LinkContestRoom1_Movement_27AD19 + applymovement 1, ContestHall_Movement_WalkStageLeft + applymovement 2, ContestHall_Movement_WalkStageRight waitmovement 0 releaseall - call LinkContestRoom1_EventScript_27A133 + call ContestHall_EventScript_TryWaitForLink setvar VAR_TEMP_9, 1 - special sub_80F910C + special LinkContestTryHideWirelessIndicator startcontest - special sub_80F90DC + special LinkContestTryShowWirelessIndicator setvar VAR_TEMP_9, 0 lockall - applymovement 1, LinkContestRoom1_Movement_27AD19 - applymovement 2, LinkContestRoom1_Movement_27AD15 + applymovement 1, ContestHall_Movement_WalkStageRight + applymovement 2, ContestHall_Movement_WalkStageLeft waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27A853:: @ 827A853 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A867 - msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT +ContestHall_EventScript_LetsAppeal:: @ 827A853 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_LetsAppealLink + msgbox ContestHall_Text_VotingCompleteLetsAppeal, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27A867:: @ 827A867 - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_27A87E - messageautoscroll LinkContestRoom1_Text_27B904 +ContestHall_EventScript_LetsAppealLink:: @ 827A867 + specialvar VAR_RESULT, IsWirelessContest + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_LetsAppealWireless + messageautoscroll ContestHall_Text_VotingCompleteLetsAppeal waitmessage return -LinkContestRoom1_EventScript_27A87E:: @ 827A87E - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27CA71 +ContestHall_EventScript_LetsAppealWireless:: @ 827A87E + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_VotingComplete waitmessage - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27CAD0 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_SecondStageOfJudging waitmessage - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27CB55 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_LetsAppeal waitmessage - call LinkContestRoom1_EventScript_27A133 + call ContestHall_EventScript_TryWaitForLink return -LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_27A8FB - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_27A91E - call LinkContestRoom1_EventScript_27A133 - applymovement 1, LinkContestRoom1_Movement_27AD0F +ContestHall_EventScript_ContestResults:: @ 827A8A5 + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_ThatsItForJudging + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_ThankYouForAppeals + call ContestHall_EventScript_TryWaitForLink + applymovement 1, ContestHall_Movement_MCFaceJudge waitmovement 0 - call LinkContestRoom1_EventScript_27A941 - call LinkContestRoom1_EventScript_27A133 - call LinkContestRoom1_EventScript_27A964 - call LinkContestRoom1_EventScript_27A133 - applymovement 1, LinkContestRoom1_Movement_27AD13 + call ContestHall_EventScript_JudgeLooksReady + call ContestHall_EventScript_TryWaitForLink + call ContestHall_EventScript_WeWillDeclareWinner + call ContestHall_EventScript_TryWaitForLink + applymovement 1, ContestHall_Movement_FaceContestants waitmovement 0 closemessage releaseall - special sub_80F910C + special LinkContestTryHideWirelessIndicator setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 playbgm MUS_CON_FAN, 0 return -LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A90F - msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT +ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_ThatsItForJudgingLink + msgbox ContestHall_Text_ThatsItForJudging, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27A90F:: @ 827A90F - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27BA15 +ContestHall_EventScript_ThatsItForJudgingLink:: @ 827A90F + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_ThatsItForJudging waitmessage delay 30 return -LinkContestRoom1_EventScript_27A91E:: @ 827A91E - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A932 - msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT +ContestHall_EventScript_ThankYouForAppeals:: @ 827A91E + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_ThankYouForAppealsLink + msgbox ContestHall_Text_ThankYouForAppeals, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27A932:: @ 827A932 - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27BA30 +ContestHall_EventScript_ThankYouForAppealsLink:: @ 827A932 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_ThankYouForAppeals waitmessage delay 30 return -LinkContestRoom1_EventScript_27A941:: @ 827A941 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A955 - msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT +ContestHall_EventScript_JudgeLooksReady:: @ 827A941 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_JudgeLooksReadyLink + msgbox ContestHall_Text_JudgeLooksReady, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27A955:: @ 827A955 - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27BAAC +ContestHall_EventScript_JudgeLooksReadyLink:: @ 827A955 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_JudgeLooksReady waitmessage delay 30 return -LinkContestRoom1_EventScript_27A964:: @ 827A964 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27A978 - msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT +ContestHall_EventScript_WeWillDeclareWinner:: @ 827A964 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_WeWillDeclareWinnerLink + msgbox ContestHall_Text_WeWillNowDeclareWinner, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27A978:: @ 827A978 - call LinkContestRoom1_EventScript_27A133 - messageautoscroll LinkContestRoom1_Text_27BB25 +ContestHall_EventScript_WeWillDeclareWinnerLink:: @ 827A978 + call ContestHall_EventScript_TryWaitForLink + messageautoscroll ContestHall_Text_WeWillNowDeclareWinner waitmessage delay 30 return -LinkContestRoom1_EventScript_27A987:: @ 827A987 - special sub_80F831C +ContestHall_EventScript_GetWinnerObjEventId:: @ 827A987 + special GetContestWinnerId switch VAR_0x8005 - case 0, LinkContestRoom1_EventScript_27A9BC - case 1, LinkContestRoom1_EventScript_27A9C2 - case 2, LinkContestRoom1_EventScript_27A9C8 - case 3, LinkContestRoom1_EventScript_27A9CE + case 0, ContestHall_EventScript_GetPlayer1ObjEventId + case 1, ContestHall_EventScript_GetPlayer2ObjEventId + case 2, ContestHall_EventScript_GetPlayer3ObjEventId + case 3, ContestHall_EventScript_GetPlayer4ObjEventId return -LinkContestRoom1_EventScript_27A9BC:: @ 827A9BC +ContestHall_EventScript_GetPlayer1ObjEventId:: @ 827A9BC setvar VAR_TEMP_3, 3 return -LinkContestRoom1_EventScript_27A9C2:: @ 827A9C2 +ContestHall_EventScript_GetPlayer2ObjEventId:: @ 827A9C2 setvar VAR_TEMP_3, 4 return -LinkContestRoom1_EventScript_27A9C8:: @ 827A9C8 +ContestHall_EventScript_GetPlayer3ObjEventId:: @ 827A9C8 setvar VAR_TEMP_3, 5 return -LinkContestRoom1_EventScript_27A9CE:: @ 827A9CE +ContestHall_EventScript_GetPlayer4ObjEventId:: @ 827A9CE setvar VAR_TEMP_3, 14 return -LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 - special sub_80F834C - special sub_80F8390 +ContestHall_EventScript_CongratulateWinner:: @ 827A9D4 + special BufferContestWinnerTrainerName + special BufferContestWinnerMonName addvar VAR_0x8005, 1 buffernumberstring 1, VAR_0x8005 - addvar VAR_0x8005, 65535 - call LinkContestRoom1_EventScript_27AA00 - applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD1D + addvar VAR_0x8005, -1 + call ContestHall_EventScript_CongratsWinner + applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp waitmovement 0 playse SE_W227B setvar VAR_TEMP_1, 0 return -LinkContestRoom1_EventScript_27AA00:: @ 827AA00 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27AA14 - msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT +ContestHall_EventScript_CongratsWinner:: @ 827AA00 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_CongratsWinnerLink + msgbox ContestHall_Text_CongratsTrainerXandMon, MSGBOX_DEFAULT return -LinkContestRoom1_EventScript_27AA14:: @ 827AA14 - messageautoscroll LinkContestRoom1_Text_27BB4C +ContestHall_EventScript_CongratsWinnerLink:: @ 827AA14 + messageautoscroll ContestHall_Text_CongratsTrainerXandMon waitmessage return -LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B +ContestHall_EventScript_AudienceLookAround:: @ 827AA1B addvar VAR_TEMP_1, 1 lockall - compare VAR_CONTEST_LOCATION, 1 - call_if_gt LinkContestRoom1_EventScript_27AA6F - applymovement 9, LinkContestRoom1_Movement_27AD3B - applymovement 12, LinkContestRoom1_Movement_27AD3F - applymovement 7, LinkContestRoom1_Movement_27AD3B + compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL + call_if_gt ContestHall_EventScript_VObjectAudienceLookAround + applymovement 9, ContestHall_Movement_AudienceMemberLookRight + applymovement 12, ContestHall_Movement_AudienceMemberLookDown + applymovement 7, ContestHall_Movement_AudienceMemberLookRight delay 30 - applymovement 10, LinkContestRoom1_Movement_27AD33 - applymovement 11, LinkContestRoom1_Movement_27AD3F - applymovement 6, LinkContestRoom1_Movement_27AD37 - applymovement 8, LinkContestRoom1_Movement_27AD33 + applymovement 10, ContestHall_Movement_AudienceMemberLookLeft + applymovement 11, ContestHall_Movement_AudienceMemberLookDown + applymovement 6, ContestHall_Movement_AudienceMemberLookUp + applymovement 8, ContestHall_Movement_AudienceMemberLookLeft compare VAR_TEMP_1, 4 - goto_if_ne LinkContestRoom1_EventScript_27AA1B + goto_if_ne ContestHall_EventScript_AudienceLookAround delay 30 return -LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F +ContestHall_EventScript_VObjectAudienceLookAround:: @ 827AA6F turnvobject 0, DIR_SOUTH turnvobject 2, DIR_SOUTH turnvobject 4, DIR_EAST @@ -1080,233 +1091,236 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F delay 10 return -LinkContestRoom1_EventScript_27AB36:: @ 827AB36 - compare VAR_CONTEST_LOCATION, 5 - goto_if_eq LinkContestRoom1_EventScript_27ABD8 - call LinkContestRoom1_EventScript_27AB9E - goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82 +ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + goto_if_eq ContestHall_EventScript_EndLinkContest + call ContestHall_EventScript_CheckShouldSkipPrize + goto_if_set FLAG_TEMP_2, ContestHall_EventScript_SkipPrize lockall - msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT + msgbox ContestHall_Text_AcceptYourPrize, MSGBOX_DEFAULT releaseall - call LinkContestRoom1_EventScript_27ABF8 - call LinkContestRoom1_EventScript_27AC5E + call ContestHall_EventScript_WinnerApproachForPrize + call ContestHall_EventScript_GivePrizeIfWinner playse SE_W227B setvar VAR_TEMP_1, 0 - call LinkContestRoom1_EventScript_27AA1B + call ContestHall_EventScript_AudienceLookAround delay 30 - special sub_80F88E8 - compare VAR_0x8004, 1 - goto_if_eq LinkContestRoom1_EventScript_27ABD2 + special ShouldReadyContestArtist + compare VAR_0x8004, TRUE + goto_if_eq ContestHall_EventScript_SetReadyForContestArtist return -LinkContestRoom1_EventScript_27AB82:: @ 827AB82 +ContestHall_EventScript_SkipPrize:: @ 827AB82 lockall - msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT + msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT releaseall delay 90 - special sub_80F88E8 - compare VAR_0x8004, 1 - goto_if_eq LinkContestRoom1_EventScript_27ABD2 + special ShouldReadyContestArtist + compare VAR_0x8004, TRUE + goto_if_eq ContestHall_EventScript_SetReadyForContestArtist return -LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E - specialvar VAR_RESULT, sub_80F7F7C - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_27ABAF +ContestHall_EventScript_CheckShouldSkipPrize:: @ 827AB9E + specialvar VAR_RESULT, HasMonWonThisContestBefore + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_CheckPlayerWon return -LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF - special sub_80F831C +ContestHall_EventScript_CheckPlayerWon:: @ 827ABAF + special GetContestWinnerId compare VAR_0x8005, 3 - goto_if_eq LinkContestRoom1_EventScript_27ABBE + goto_if_eq ContestHall_EventScript_CheckRankIsMaster return -LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE - compare VAR_CONTEST_RANK, 3 - goto_if_eq LinkContestRoom1_EventScript_27ABCD +ContestHall_EventScript_CheckRankIsMaster:: @ 827ABBE + compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER + goto_if_eq ContestHall_EventScript_DontSkipPrize setflag FLAG_TEMP_2 return -LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD +ContestHall_EventScript_DontSkipPrize:: @ 827ABCD return -LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE +@ This flag is never read +ContestHall_EventScript_SetSketchFlag:: @ 827ABCE setflag FLAG_CONTEST_SKETCH_CREATED return -LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2 +ContestHall_EventScript_SetReadyForContestArtist:: @ 827ABD2 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return -LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 +ContestHall_EventScript_EndLinkContest:: @ 827ABD8 delay 60 - special sub_80F84B0 - special sub_80F831C - special sub_80F88E8 - compare VAR_0x8004, 1 - goto_if_eq LinkContestRoom1_EventScript_27ABF1 + special GetContestPlayerId + special GetContestWinnerId + special ShouldReadyContestArtist + compare VAR_0x8004, TRUE + goto_if_eq ContestHall_EventScript_SetReadyForLinkContestArtist closemessage return -LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1 +ContestHall_EventScript_SetReadyForLinkContestArtist:: @ 827ABF1 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return -LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7 +@ Unused +ContestHall_EventScript_Ret:: @ 827ABF7 return -LinkContestRoom1_EventScript_27ABF8:: @ 827ABF8 +ContestHall_EventScript_WinnerApproachForPrize:: @ 827ABF8 switch VAR_0x8005 - case 0, LinkContestRoom1_EventScript_27AC2A - case 1, LinkContestRoom1_EventScript_27AC37 - case 2, LinkContestRoom1_EventScript_27AC44 - case 3, LinkContestRoom1_EventScript_27AC51 + case 0, ContestHall_EventScript_Player1ApproachForPrize + case 1, ContestHall_EventScript_Player2ApproachForPrize + case 2, ContestHall_EventScript_Player3ApproachForPrize + case 3, ContestHall_EventScript_Player4ApproachForPrize return -LinkContestRoom1_EventScript_27AC2A:: @ 827AC2A +ContestHall_EventScript_Player1ApproachForPrize:: @ 827AC2A lockall - applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7A + applymovement VAR_TEMP_3, ContestHall_Movement_Player1ApproachForPrize waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27AC37:: @ 827AC37 +ContestHall_EventScript_Player2ApproachForPrize:: @ 827AC37 lockall - applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7E + applymovement VAR_TEMP_3, ContestHall_Movement_Player2ApproachForPrize waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27AC44:: @ 827AC44 +ContestHall_EventScript_Player3ApproachForPrize:: @ 827AC44 lockall - applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD29 + applymovement VAR_TEMP_3, ContestHall_Movement_Player3ApproachForPrize waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27AC51:: @ 827AC51 +ContestHall_EventScript_Player4ApproachForPrize:: @ 827AC51 lockall - applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD2D + applymovement VAR_TEMP_3, ContestHall_Movement_Player4ApproachForPrize waitmovement 0 releaseall return -LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E - special sub_80F831C +@ In NPC Contests, the player is always entry 4 (id number 3) +ContestHall_EventScript_GivePrizeIfWinner:: @ 827AC5E + special GetContestWinnerId compare VAR_0x8005, 3 - goto_if_eq LinkContestRoom1_EventScript_27AC77 + goto_if_eq ContestHall_EventScript_GiveContestPrizes lockall - msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT + msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT releaseall return -LinkContestRoom1_EventScript_27AC77:: @ 827AC77 - compare VAR_CONTEST_LOCATION, 2 - call_if_eq LinkContestRoom1_EventScript_27ABCE - specialvar VAR_RESULT, sub_80F7F7C - compare VAR_RESULT, 0 - goto_if_eq LinkContestRoom1_EventScript_27ACDF - compare VAR_CONTEST_RANK, 3 - goto_if_eq LinkContestRoom1_EventScript_27ACBD +ContestHall_EventScript_GiveContestPrizes:: @ 827AC77 + compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER + call_if_eq ContestHall_EventScript_SetSketchFlag + specialvar VAR_RESULT, HasMonWonThisContestBefore + compare VAR_RESULT, FALSE + goto_if_eq ContestHall_EventScript_ReceiveContestRibbon + compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER + goto_if_eq ContestHall_EventScript_GiveLuxuryBall lockall - msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT + msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT releaseall return -LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 +ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8 lockall call Common_EventScript_BagIsFull - msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT + msgbox ContestHall_Text_PickUpPrizeAtCounterLater, MSGBOX_DEFAULT releaseall setvar VAR_CONTEST_PRIZE_PICKUP, 4 return -LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD +ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD giveitem_std ITEM_LUXURY_BALL - compare VAR_RESULT, 0 - goto_if_eq LinkContestRoom1_EventScript_27ACA8 + compare VAR_RESULT, FALSE + goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall lockall - msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT + msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT releaseall return -LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF - special sub_80F7FFC +ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF + special GiveMonContestRibbon incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET lockall - msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT + msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LinkContestRoom1_Text_27BC00, MSGBOX_DEFAULT + msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT waitfanfare - special sub_80F8390 - msgbox LinkContestRoom1_Text_27BC16, MSGBOX_DEFAULT + special BufferContestWinnerMonName + msgbox ContestHall_Text_PutRibbonOnMon, MSGBOX_DEFAULT releaseall return -LinkContestRoom1_Movement_27AD09: @ 827AD09 +ContestHall_Movement_MCWalkDown: @ 827AD09 walk_down step_end -LinkContestRoom1_Movement_27AD0B: @ 827AD0B +ContestHall_Movement_MCBackUp: @ 827AD0B lock_facing_direction walk_up unlock_facing_direction step_end -LinkContestRoom1_Movement_27AD0F: @ 827AD0F +ContestHall_Movement_MCFaceJudge: @ 827AD0F walk_in_place_fastest_right step_end -LinkContestRoom1_Movement_27AD11: @ 827AD11 +ContestHall_Movement_Heart: @ 827AD11 emote_heart step_end -LinkContestRoom1_Movement_27AD13: @ 827AD13 +ContestHall_Movement_FaceContestants: @ 827AD13 walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD15: @ 827AD15 +ContestHall_Movement_WalkStageLeft: @ 827AD15 walk_left walk_left walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD19: @ 827AD19 +ContestHall_Movement_WalkStageRight: @ 827AD19 walk_right walk_right walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD1D: @ 827AD1D +ContestHall_Movement_WinningPlayerWalkUp: @ 827AD1D walk_up walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD20: @ 827AD20 +ContestHall_Movement_ContestantDelay32: @ 827AD20 delay_16 delay_16 step_end -LinkContestRoom1_Movement_27AD23: @ 827AD23 +ContestHall_Movement_MCFaceJudge2: @ 827AD23 walk_in_place_fastest_right step_end -LinkContestRoom1_Movement_27AD25: @ 827AD25 +ContestHall_Movement_JudgeFaceMC: @ 827AD25 walk_in_place_fastest_left step_end -LinkContestRoom1_Movement_27AD27: @ 827AD27 +ContestHall_Movement_FaceContestants2: @ 827AD27 walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD29: @ 827AD29 +ContestHall_Movement_Player3ApproachForPrize: @ 827AD29 walk_left walk_left walk_up step_end -LinkContestRoom1_Movement_27AD2D: @ 827AD2D +ContestHall_Movement_Player4ApproachForPrize: @ 827AD2D walk_left walk_left walk_left @@ -1314,54 +1328,54 @@ LinkContestRoom1_Movement_27AD2D: @ 827AD2D walk_up step_end -LinkContestRoom1_Movement_27AD33: @ 827AD33 +ContestHall_Movement_AudienceMemberLookLeft: @ 827AD33 face_left delay_16 face_original_direction step_end -LinkContestRoom1_Movement_27AD37: @ 827AD37 +ContestHall_Movement_AudienceMemberLookUp: @ 827AD37 face_up delay_16 face_original_direction step_end -LinkContestRoom1_Movement_27AD3B: @ 827AD3B +ContestHall_Movement_AudienceMemberLookRight: @ 827AD3B face_right delay_16 face_original_direction step_end -LinkContestRoom1_Movement_27AD3F: @ 827AD3F +ContestHall_Movement_AudienceMemberLookDown: @ 827AD3F face_down delay_16 face_original_direction step_end -LinkContestRoom1_Movement_27AD43: @ 827AD43 +ContestHall_Movement_Player4FaceUp: @ 827AD43 face_up step_end -LinkContestRoom1_Movement_27AD45: @ 827AD45 +ContestHall_Movement_MCLookAtJudge: @ 827AD45 face_up delay_16 walk_in_place_fastest_right step_end -LinkContestRoom1_Movement_27AD49: @ 827AD49 +ContestHall_Movement_JudgeLookAtMC: @ 827AD49 walk_in_place_fastest_left delay_16 delay_16 walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD4E: @ 827AD4E +ContestHall_Movement_MCWalkInPlaceDown: @ 827AD4E delay_16 delay_16 walk_in_place_fastest_down step_end -LinkContestRoom1_Movement_27AD52: @ 827AD52 +ContestHall_Movement_Player1WalkToCenter: @ 827AD52 walk_up walk_right walk_right @@ -1369,7 +1383,7 @@ LinkContestRoom1_Movement_27AD52: @ 827AD52 walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD58: @ 827AD58 +ContestHall_Movement_Player1WalkBack: @ 827AD58 walk_fast_left walk_fast_left walk_fast_left @@ -1377,31 +1391,31 @@ LinkContestRoom1_Movement_27AD58: @ 827AD58 walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD5E: @ 827AD5E +ContestHall_Movement_Player2WalkToCenter: @ 827AD5E walk_up walk_right walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD62: @ 827AD62 +ContestHall_Movement_Player2WalkBack: @ 827AD62 walk_fast_left walk_fast_down walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD66: @ 827AD66 +ContestHall_Movement_Player3WalkToCenter: @ 827AD66 walk_up walk_left walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD6A: @ 827AD6A +ContestHall_Movement_Player3WalkBack: @ 827AD6A walk_fast_right walk_fast_down walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD6E: @ 827AD6E +ContestHall_Movement_Player4WalkToCenter: @ 827AD6E walk_up walk_left walk_left @@ -1409,7 +1423,7 @@ LinkContestRoom1_Movement_27AD6E: @ 827AD6E walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD74: @ 827AD74 +ContestHall_Movement_Player4WalkBack: @ 827AD74 walk_fast_right walk_fast_right walk_fast_right @@ -1417,36 +1431,37 @@ LinkContestRoom1_Movement_27AD74: @ 827AD74 walk_in_place_fastest_up step_end -LinkContestRoom1_Movement_27AD7A: @ 827AD7A +ContestHall_Movement_Player1ApproachForPrize: @ 827AD7A walk_right walk_right walk_up step_end -LinkContestRoom1_Movement_27AD7E: @ 827AD7E +ContestHall_Movement_Player2ApproachForPrize: @ 827AD7E walk_up step_end -LinkContestRoom1_EventScript_27AD80:: @ 827AD80 - specialvar VAR_RESULT, sub_80F9134 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_27AD91 +@ IsContestWithRSPlayer has no side effect, so this is nop +ContestHall_EventScript_CheckIfContestWithRSPlayer:: @ 827AD80 + specialvar VAR_RESULT, IsContestWithRSPlayer + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_RetRSPlayer return -LinkContestRoom1_EventScript_27AD91:: @ 827AD91 +ContestHall_EventScript_RetRSPlayer:: @ 827AD91 return -LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92 - specialvar VAR_RESULT, sub_80F9134 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_27ADA3 +LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer:: @ 827AD92 + specialvar VAR_RESULT, IsContestWithRSPlayer + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer return -LilycoveCity_ContestLobby_EventScript_27ADA3:: @ 827ADA3 +LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer:: @ 827ADA3 delay 9 return -LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7 +LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase: @ 827ADA7 .string "Hello!\p" .string "This is the reception counter for\n" .string "POKéMON CONTESTS.\p" @@ -1455,31 +1470,32 @@ LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7 .string "In that case, we need to provide you\n" .string "with this!$" -LilycoveCity_ContestLobby_Text_27AE47: @ 827AE47 +LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp: @ 827AE47 .string "Okay, now that we've cleared that\n" .string "up…\p" .string "Hello!\p" .string "This is the reception counter for\n" .string "POKéMON CONTESTS.$" -LilycoveCity_ContestLobby_Text_ContestReceptionCounter: @ 827AEA8 +LilycoveCity_ContestLobby_Text_ContestReception: @ 827AEA8 .string "Hello!\p" .string "This is the reception counter for\n" .string "POKéMON CONTESTS.$" -LilycoveCity_ContestLobby_Text_27AEE3: @ 827AEE3 +@ Unused +LilycoveCity_ContestLobby_Text_CounterOnlyFor4PlayerContests: @ 827AEE3 .string "Hello!\p" .string "This reception counter is only\n" .string "for 4-player POKéMON CONTESTS.$" -LilycoveCity_ContestLobby_Text_27AF28: @ 827AF28 +LilycoveCity_ContestLobby_Text_EnterContest1: @ 827AF28 .string "Would you like to enter your POKéMON\n" .string "in our CONTESTS?$" -LilycoveCity_ContestLobby_Text_27AF5E: @ 827AF5E +LilycoveCity_ContestLobby_Text_WhichTopic1: @ 827AF5E .string "Which topic would you like?$" -LilycoveCity_ContestLobby_Text_27AF7A: @ 827AF7A +LilycoveCity_ContestLobby_Text_ExplainContests: @ 827AF7A .string "A POKéMON CONTEST involves four\n" .string "TRAINERS entering one POKéMON each\l" .string "in competitive judging.\p" @@ -1498,14 +1514,14 @@ LilycoveCity_ContestLobby_Text_27AF7A: @ 827AF7A .string "The POKéMON garnering the highest\n" .string "score is declared the winner.$" -LilycoveCity_ContestLobby_Text_27B17D: @ 827B17D +LilycoveCity_ContestLobby_Text_ExplainContestTypes: @ 827B17D .string "There are five kinds of CONTESTS.\p" .string "COOL, BEAUTY, CUTE, SMART, and\n" .string "TOUGH are the five categories.\p" .string "Choose the CONTEST that is right for\n" .string "the POKéMON you plan to enter.$" -LilycoveCity_ContestLobby_Text_27B221: @ 827B221 +LilycoveCity_ContestLobby_Text_ExplainContestRanks: @ 827B221 .string "There are four ranks of POKéMON\n" .string "CONTESTS.\p" .string "NORMAL, SUPER, HYPER, and MASTER\n" @@ -1523,77 +1539,77 @@ LilycoveCity_ContestLobby_Text_27B221: @ 827B221 .string "may compete in the MASTER Rank as\l" .string "often as its TRAINER wants.$" -LilycoveCity_ContestLobby_Text_27B3FF: @ 827B3FF +LilycoveCity_ContestLobby_Text_EnterWhichRank: @ 827B3FF .string "Which Rank would you like to enter?$" -LilycoveCity_ContestLobby_Text_27B423: @ 827B423 +LilycoveCity_ContestLobby_Text_EnterWhichContest1: @ 827B423 .string "Which CONTEST would you like to enter?$" -LilycoveCity_ContestLobby_Text_27B44A: @ 827B44A +LilycoveCity_ContestLobby_Text_EnterWhichPokemon1: @ 827B44A .string "Which POKéMON would you like to enter?$" -LilycoveCity_ContestLobby_Text_27B471: @ 827B471 +LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank: @ 827B471 .string "I'm terribly sorry, but your POKéMON\n" .string "is not qualified to compete at this\l" .string "Rank yet…$" -LilycoveCity_ContestLobby_Text_27B4C4: @ 827B4C4 +LilycoveCity_ContestLobby_Text_EggCannotTakePart: @ 827B4C4 .string "I'm sorry, but an EGG cannot take part\n" .string "in a POKéMON CONTEST.$" -LilycoveCity_ContestLobby_Text_27B501: @ 827B501 +LilycoveCity_ContestLobby_Text_MonInNoConditionForContest: @ 827B501 .string "Your POKéMON appears to be in no\n" .string "condition to take part in a CONTEST…$" -LilycoveCity_ContestLobby_Text_27B547: @ 827B547 +LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway: @ 827B547 .string "Oh, but that RIBBON…\p" .string "Your POKéMON has won this CONTEST\n" .string "before, hasn't it?\p" .string "Would you like to enter it in this\n" .string "CONTEST anyway?$" -LilycoveCity_ContestLobby_Text_27B5C4: @ 827B5C4 +LilycoveCity_ContestLobby_Text_ConfirmContestMon: @ 827B5C4 .string "Is that your CONTEST POKéMON?$" -LilycoveCity_ContestLobby_Text_27B5E2: @ 827B5E2 +LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4: @ 827B5E2 .string "Okay, your POKéMON will be entered\n" .string "in this CONTEST.\p" .string "Your POKéMON is Entry No. 4.\n" .string "The CONTEST will begin shortly.$" -LilycoveCity_ContestLobby_Text_27B653: @ 827B653 +LilycoveCity_ContestLobby_Text_ComeThroughHere: @ 827B653 .string "Please come in through here.\n" .string "Good luck!$" -LilycoveCity_ContestLobby_Text_27B67B: @ 827B67B +LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize: @ 827B67B .string "Congratulations! Your POKéMON is the\n" .string "CONTEST winner!\p" .string "We have your prize right here.\n" .string "Please, right this way!$" -LilycoveCity_ContestLobby_Text_27B6E7: @ 827B6E7 +LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater: @ 827B6E7 .string "Please come back for your prize\n" .string "later on.$" -LinkContestRoom1_Text_27B711: @ 827B711 +ContestHall_Text_GettingStartedParticipantsAsFollows: @ 827B711 .string "MC: Hello! We're just getting started\n" .string "with a {STR_VAR_3} Rank POKéMON\l" .string "{STR_VAR_2}!\p" .string "The participating TRAINERS and their\n" .string "POKéMON are as follows:$" -LinkContestRoom1_Text_27B78F: @ 827B78F +ContestHall_Text_GettingStartedParticipantsAsFollowsLink: @ 827B78F .string "MC: Hello! We're just getting started\n" .string "with a 4-player linked POKéMON\l" .string "{STR_VAR_2}!\p" .string "The participating TRAINERS and their\n" .string "POKéMON are as follows:$" -LinkContestRoom1_Text_27B815: @ 827B815 +ContestHall_Text_EntryXTrainersMon: @ 827B815 .string "MC: Entry No. {STR_VAR_2}!\n" .string "{STR_VAR_1}'s {STR_VAR_3}!$" -LinkContestRoom1_Text_27B830: @ 827B830 +ContestHall_Text_SeenContestantsAudienceWillVote: @ 827B830 .string "MC: We've just seen the four POKéMON\n" .string "contestants.\p" .string "Now it's time for primary judging!\p" @@ -1602,10 +1618,10 @@ LinkContestRoom1_Text_27B830: @ 827B830 .string "Without any further ado, let the\n" .string "voting begin!$" -LinkContestRoom1_Text_27B8F2: @ 827B8F2 +ContestHall_Text_VotingUnderWay: @ 827B8F2 .string "Voting under way…$" -LinkContestRoom1_Text_27B904: @ 827B904 +ContestHall_Text_VotingCompleteLetsAppeal: @ 827B904 .string "Voting is now complete!\p" .string "While the votes are being tallied,\n" .string "let's move on to secondary judging!\p" @@ -1616,72 +1632,75 @@ LinkContestRoom1_Text_27B904: @ 827B904 .string "Let's see a little enthusiasm!\n" .string "Let's appeal!$" -LinkContestRoom1_Text_27BA15: @ 827BA15 +ContestHall_Text_ThatsItForJudging: @ 827BA15 .string "MC: That's it for judging!$" -LinkContestRoom1_Text_27BA30: @ 827BA30 +ContestHall_Text_ThankYouForAppeals: @ 827BA30 .string "Thank you all for a most wonderful\n" .string "display of quality appeals!\p" .string "This concludes all judging!\n" .string "Thank you for your fine efforts!$" -LinkContestRoom1_Text_27BAAC: @ 827BAAC +ContestHall_Text_JudgeLooksReady: @ 827BAAC .string "Now, all that remains is the pulse-\n" .string "pounding proclamation of the winner.\p" .string "The JUDGE looks ready to make\n" .string "the announcement!$" -LinkContestRoom1_Text_27BB25: @ 827BB25 +ContestHall_Text_WeWillNowDeclareWinner: @ 827BB25 .string "JUDGE: We will now declare the winner!$" -LinkContestRoom1_Text_27BB4C: @ 827BB4C +ContestHall_Text_CongratsTrainerXandMon: @ 827BB4C .string "MC: Entry No. {STR_VAR_2}!\p" .string "{STR_VAR_3} and {STR_VAR_1},\n" .string "congratulations!$" -LinkContestRoom1_Text_27BB7A: @ 827BB7A +ContestHall_Text_CongratsPleaseCompeteAgain: @ 827BB7A .string "MC: Congratulations!\n" .string "Please do compete again!$" -LinkContestRoom1_Text_27BBA8: @ 827BBA8 +ContestHall_Text_AcceptYourPrize: @ 827BBA8 .string "MC: Here you are!\n" .string "Please accept your prize!$" -LinkContestRoom1_Text_27BBD4: @ 827BBD4 +ContestHall_Text_ConferRibbonAsPrize: @ 827BBD4 .string "We confer on you this RIBBON\n" .string "as your prize!$" -LinkContestRoom1_Text_27BC00: @ 827BC00 +ContestHall_Text_ReceivedRibbon: @ 827BC00 .string "{PLAYER} received a RIBBON.$" -LinkContestRoom1_Text_27BC16: @ 827BC16 +ContestHall_Text_PutRibbonOnMon: @ 827BC16 .string "{PLAYER} put the RIBBON on\n" .string "{STR_VAR_1}.$" -LinkContestRoom1_Text_27BC2F: @ 827BC2F +ContestHall_Text_PickUpPrizeAtCounterLater: @ 827BC2F .string "Please pick up your prize at\n" .string "the reception counter later.\l" .string "Please do compete again!$" -LinkContestRoom1_Text_27BC82: @ 827BC82 +@ Unused +ContestHall_Text_OnlyRegister4Players: @ 827BC82 .string "I only register four players for\n" .string "POKéMON CONTESTS.\p" .string "If three other players link up, all\n" .string "four may enter the same CONTEST.\p" .string "Would you like to take part?$" -LilycoveCity_ContestLobby_Text_27BD17: @ 827BD17 +LilycoveCity_ContestLobby_Text_ProgressWillBeSaved: @ 827BD17 .string "Before entering a CONTEST, your\n" .string "progress will be saved.$" -LilycoveCity_ContestLobby_Text_27BD4F: @ 827BD4F +LilycoveCity_ContestLobby_Text_ParticipateAnotherTime: @ 827BD4F .string "We hope you will participate another\n" .string "time.$" -LilycoveCity_ContestLobby_Text_27BD7A: @ 827BD7A +@ Unused +LilycoveCity_ContestLobby_Text_EnterContest2: @ 827BD7A .string "Would you like to enter a CONTEST?$" -LilycoveCity_ContestLobby_Text_27BD9D: @ 827BD9D +@ Unused +LilycoveCity_ContestLobby_Text_Explain4PlayerContest: @ 827BD9D .string "When four players are ready, connect\n" .string "over a Game Link cable, and register\l" .string "with me, please.\p" @@ -1692,79 +1711,83 @@ LilycoveCity_ContestLobby_Text_27BD9D: @ 827BD9D .string "After that, the usual CONTEST rules\n" .string "apply.$" -LilycoveCity_ContestLobby_Text_27BE9E: @ 827BE9E +@ Unused +LilycoveCity_ContestLobby_Text_EnterWhichContest2: @ 827BE9E .string "Which CONTEST would you like to enter?$" -LilycoveCity_ContestLobby_Text_27BEC5: @ 827BEC5 +@ Unused +LilycoveCity_ContestLobby_Text_EnterWhichPokemon2: @ 827BEC5 .string "Which POKéMON would you like to enter?$" -LilycoveCity_ContestLobby_Text_27BEEC: @ 827BEEC +LilycoveCity_ContestLobby_Text_Transmitting: @ 827BEEC .string "Transmitting…$" -LilycoveCity_ContestLobby_Text_27BEFA: @ 827BEFA +LilycoveCity_ContestLobby_Text_TransmissionError: @ 827BEFA .string "Transmission error…$" -LilycoveCity_ContestLobby_Text_27BF0E: @ 827BF0E +LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest: @ 827BF0E .string "You may have chosen a different\n" .string "CONTEST than another player.$" -LilycoveCity_ContestLobby_Text_27BF4B: @ 827BF4B +LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice: @ 827BF4B .string "You may have made a different\n" .string "choice than another player.$" -LilycoveCity_ContestLobby_Text_27BF85: @ 827BF85 +LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel: @ 827BF85 .string "Please wait.\n" .string "… … B Button: Cancel$" -LilycoveCity_ContestLobby_Text_27BFA7: @ 827BFA7 +@ Unused +LilycoveCity_ContestLobby_Text_ParticipateAnotherTime2: @ 827BFA7 .string "We hope you will participate another\n" .string "time.$" -LilycoveCity_ContestLobby_Text_27BFD2: @ 827BFD2 +@ Unused +LilycoveCity_ContestLobby_Text_TransmissionErrorTryAgain: @ 827BFD2 .string "Transmission error.\n" .string "Please try again.$" -LilycoveCity_ContestLobby_Text_27BFF8: @ 827BFF8 +LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX: @ 827BFF8 .string "Your POKéMON will be entered in\n" .string "the CONTEST.\p" .string "Your POKéMON is Entry No. {STR_VAR_2}.$" -LilycoveCity_ContestLobby_Text_27C043: @ 827C043 +LilycoveCity_ContestLobby_Text_ContestBeginShortly: @ 827C043 .string "The CONTEST will begin shortly.$" -LilycoveCity_ContestLobby_Text_27C063: @ 827C063 +LilycoveCity_ContestLobby_Text_LinkContestReception: @ 827C063 .string "Welcome! This is the POKéMON CONTEST\n" .string "link reception counter.\p" .string "You may enter CONTESTS together with\n" .string "one or more friends.$" -LilycoveCity_ContestLobby_Text_27C0DA: @ 827C0DA +LilycoveCity_ContestLobby_Text_WhichTopic2: @ 827C0DA .string "Which topic would you like?$" -LilycoveCity_ContestLobby_Text_27C0F6: @ 827C0F6 +LilycoveCity_ContestLobby_Text_EnterContest3: @ 827C0F6 .string "Would you like to enter a CONTEST?$" -LilycoveCity_ContestLobby_Text_27C119: @ 827C119 +LilycoveCity_ContestLobby_Text_EnterWhichContest3: @ 827C119 .string "Which CONTEST would you like to enter?$" -LilycoveCity_ContestLobby_Text_27C140: @ 827C140 +LilycoveCity_ContestLobby_Text_MonInNoCondition2: @ 827C140 .string "Your POKéMON appears to be in no\n" .string "condition to take part in a CONTEST…$" -LilycoveCity_ContestLobby_Text_27C186: @ 827C186 +LilycoveCity_ContestLobby_Text_EggCannotTakePart2: @ 827C186 .string "I'm sorry, but an EGG cannot take part\n" .string "in a POKéMON CONTEST.$" -LilycoveCity_ContestLobby_Text_27C1C3: @ 827C1C3 +LilycoveCity_ContestLobby_Text_EnterWhichPokemon3: @ 827C1C3 .string "Which POKéMON would you like to enter?$" -Text_DecideLinkLeader: @ 827C1EA +LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader: @ 827C1EA .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -LilycoveCity_ContestLobby_Text_27C254: @ 827C254 +LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode: @ 827C254 .string "At least one player has entered using\n" .string "the 4-player reception counter.\p" .string "There must be four players connected\n" @@ -1773,7 +1796,7 @@ LilycoveCity_ContestLobby_Text_27C254: @ 827C254 .string "select G-MODE (GLOBAL MODE),\l" .string "then register to enter again, please.$" -LilycoveCity_ContestLobby_Text_27C340: @ 827C340 +LilycoveCity_ContestLobby_Text_ExplainLinkContest: @ 827C340 .string "This is a CONTEST for two to four\n" .string "players linked using a Wireless\l" .string "Adapter or a GBA Game Link cable.\p" @@ -1794,7 +1817,7 @@ LilycoveCity_ContestLobby_Text_27C340: @ 827C340 .string "After that, a CONTEST will start in\n" .string "the usual manner.$" -LilycoveCity_ContestLobby_Text_27C5B1: @ 827C5B1 +LilycoveCity_ContestLobby_Text_ExplainEMode: @ 827C5B1 .string "In E-MODE (EMERALD MODE),\n" .string "a LINK CONTEST can be held with\l" .string "two to four players. Each player must\l" @@ -1808,7 +1831,7 @@ LilycoveCity_ContestLobby_Text_27C5B1: @ 827C5B1 .string "Please be aware that E-MODE is not\n" .string "available in POKéMON Ruby or Sapphire.$" -LilycoveCity_ContestLobby_Text_27C742: @ 827C742 +LilycoveCity_ContestLobby_Text_ExplainGMode: @ 827C742 .string "G-MODE (GLOBAL MODE) is specifically\n" .string "for four players who are linked using\l" .string "GBA Game Link cables.\p" @@ -1819,50 +1842,50 @@ LilycoveCity_ContestLobby_Text_27C742: @ 827C742 .string "enter through the 4-player reception\l" .string "counter (POKéMON Ruby or Sapphire).$" -LilycoveCity_ContestLobby_Text_27C879: @ 827C879 +LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode: @ 827C879 .string "I'm terribly sorry.\p" .string "G-MODE does not function\n" .string "with Wireless Adapters.\p" .string "Please select E-MODE or try\n" .string "again using a GBA Game Link cable.$" -LilycoveCity_ContestLobby_Text_27C8FD: @ 827C8FD +LilycoveCity_ContestLobby_Text_WhichContestMode: @ 827C8FD .string "Which CONTEST MODE would you like\n" .string "to enter?$" -LinkContestRoom1_Text_27C929: @ 827C929 +ContestHall_Text_GettingStartedWireless: @ 827C929 .string "MC: Hello! We're just getting started\n" .string "with a 4-player linked POKéMON\l" .string "{STR_VAR_2}!$" -LinkContestRoom1_Text_27C972: @ 827C972 +ContestHall_Text_ParticipantsAsFollows: @ 827C972 .string "The participating TRAINERS and their\n" .string "POKéMON are as follows:$" -LinkContestRoom1_Text_27C9AF: @ 827C9AF +ContestHall_Text_WeveSeenContestants: @ 827C9AF .string "MC: We've just seen the four POKéMON\n" .string "contestants.\p" .string "Now it's time for primary judging!$" -LinkContestRoom1_Text_27CA04: @ 827CA04 +ContestHall_Text_AudienceWillVote: @ 827CA04 .string "The audience will vote on their\n" .string "favorite POKéMON contestants.$" -LinkContestRoom1_Text_27CA42: @ 827CA42 +ContestHall_Text_LetVotingBegin: @ 827CA42 .string "Without any further ado,\n" .string "let the voting begin!$" -LinkContestRoom1_Text_27CA71: @ 827CA71 +ContestHall_Text_VotingComplete: @ 827CA71 .string "Voting is now complete!\p" .string "While the votes are being tallied,\n" .string "let's move on to secondary judging!$" -LinkContestRoom1_Text_27CAD0: @ 827CAD0 +ContestHall_Text_SecondStageOfJudging: @ 827CAD0 .string "The second stage of judging is\n" .string "the much-anticipated appeal time!\p" .string "May the contestants amaze us with\n" .string "superb appeals of dazzling moves!$" -LinkContestRoom1_Text_27CB55: @ 827CB55 +ContestHall_Text_LetsAppeal: @ 827CB55 .string "Let's see a little enthusiasm!\n" .string "Let's appeal!$" diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index c635144f3..2ae93ce70 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -238,27 +238,27 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 release end -LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare VAR_LINK_CONTEST_ROOM_STATE, 2 - goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 +LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B + compare VAR_CONTEST_HALL_STATE, 2 + goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter setvar VAR_0x8005, 6 special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 - switch VAR_CONTEST_LOCATION - case 0, LilycoveCity_ContestLobby_EventScript_28CB95 - case 2, LilycoveCity_ContestLobby_EventScript_28CB91 - case 1, LilycoveCity_ContestLobby_EventScript_28CB91 - case 3, LilycoveCity_ContestLobby_EventScript_28CB91 - case 4, LilycoveCity_ContestLobby_EventScript_28CB91 - case 5, LilycoveCity_ContestLobby_EventScript_28CB95 - end - -LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter + switch VAR_CONTEST_TYPE + case 0, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter + case 2, LilycoveCity_ContestLobby_EventScript_ShowContestReporter + case 1, LilycoveCity_ContestLobby_EventScript_ShowContestReporter + case 3, LilycoveCity_ContestLobby_EventScript_ShowContestReporter + case 4, LilycoveCity_ContestLobby_EventScript_ShowContestReporter + case 5, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter + end + +LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91 clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER return -LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 +LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95 return BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 651a85cff..74fff4aea 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -82,7 +82,7 @@ EventScript_ResetAllBerries:: @ 827149D return EventScript_ResetAllMapFlags:: @ 82715DE - setflag FLAG_LINK_CONTEST_POKE_BALL + setflag FLAG_HIDE_CONTEST_POKE_BALL setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE -- cgit v1.2.3 From 525ec2025d754894e2c0c736c396b07af05a7278 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 12 Nov 2019 01:57:39 -0500 Subject: Document Routes 111-118 --- data/scripts/gabby_and_ty.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f61b9d6db..456f56f45 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -184,13 +184,13 @@ GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6 release end -Route118_EventScript_GabbyBattle5:: @ 828CED6 +GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6 trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route118_EventScript_TyBattle5:: @ 828CEF6 +GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6 trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release -- cgit v1.2.3 From fc3783b7395b25d290ec650d79fbdc80518046cd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 14 Nov 2019 18:56:18 -0500 Subject: WIP Document apprentice --- data/scripts/apprentice.inc | 2720 ++----------------------------------------- 1 file changed, 94 insertions(+), 2626 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 7eae99dcf..337899496 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -1,42 +1,40 @@ -#include "constants/apprentice.h" - -.macro apprentice_msg waitbuttonpress which -setvar VAR_0x8004, 8 +.macro apprentice_msg waitbuttonpress:req, which:req +setvar VAR_0x8004, APPRENTICE_FUNC_PRINT_MSG setvar VAR_0x8005, \waitbuttonpress setvar VAR_0x8006, \which special CallApprenticeFunction waitstate .endm -.macro apprentice_buff whichstringvar tobuff -setvar VAR_0x8004, 16 +.macro apprentice_buff whichstringvar:req, tobuff:req +setvar VAR_0x8004, APPRENTICE_FUNC_16 setvar VAR_0x8005, \whichstringvar setvar VAR_0x8006, \tobuff special CallApprenticeFunction .endm -.macro apprentice_menu which -setvar VAR_0x8004, 7 +.macro apprentice_menu which:req +setvar VAR_0x8004, APPRENTICE_FUNC_MENU setvar VAR_0x8005, \which special CallApprenticeFunction waitstate .endm -EventScript_Apprentice:: @ 82B688D +BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D lock faceplayer - setvar VAR_0x8004, 0 + setvar VAR_0x8004, APPRENTICE_FUNC_0 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_if_eq Script_Apprentice_FirstMeeting - setvar VAR_0x8004, 10 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6900 + setvar VAR_0x8004, APPRENTICE_FUNC_SET_TRUE_1 special CallApprenticeFunction - compare VAR_0x8004, 0 + compare VAR_0x8004, FALSE @ Always TRUE here goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE - goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Script_Apprentice_ReleaseAndEnd + goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_2B6E90 -BattleFrontier_BattleTowerLobby_EventScript_2B68BE: - setvar VAR_0x8004, 11 +BattleFrontier_BattleTowerLobby_EventScript_2B68BE: @ 82B68BE + setvar VAR_0x8004, APPRENTICE_FUNC_11 special CallApprenticeFunction compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 @@ -52,38 +50,37 @@ BattleFrontier_BattleTowerLobby_EventScript_2B68BE: releaseall end -Script_Apprentice_FirstMeeting: +BattleFrontier_BattleTowerLobby_EventScript_2B6900: @ 82B6900 apprentice_buff 0, APPRENTICE_BUFF_NAME apprentice_msg FALSE, 0 - -Script_Apprentice_FirstMeetingNag: +BattleFrontier_BattleTowerLobby_EventScript_2B6925: @ 82B6925 apprentice_menu APPRENTICE_ASK_YES_NO compare VAR_RESULT, 1 - goto_if_eq Script_Apprentice_FirstMeetingAskAgain + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69BB apprentice_msg FALSE, 2 apprentice_menu APPRENTICE_ASK_WHICH_LEVEL - setvar VAR_0x8004, 1 + setvar VAR_0x8004, APPRENTICE_FUNC_1 setorcopyvar VAR_0x8005, VAR_RESULT addvar VAR_0x8005, 1 special CallApprenticeFunction - setvar VAR_0x8004, 3 + setvar VAR_0x8004, APPRENTICE_FUNC_3 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_LEVEL apprentice_msg TRUE, 3 - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -Script_Apprentice_FirstMeetingAskAgain: +BattleFrontier_BattleTowerLobby_EventScript_2B69BB: @ 82B69BB apprentice_msg FALSE, 1 - goto Script_Apprentice_FirstMeetingNag + goto BattleFrontier_BattleTowerLobby_EventScript_2B6925 -BattleFrontier_BattleTowerLobby_EventScript_2B69D3: - setvar VAR_0x8004, 14 +BattleFrontier_BattleTowerLobby_EventScript_2B69D3: @ 82B69D3 + setvar VAR_0x8004, APPRENTICE_FUNC_14 setvar VAR_0x8005, 2 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_SPECIES1 @@ -95,80 +92,80 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ABA compare VAR_0x8005, 1 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, APPRENTICE_FUNC_12 special CallApprenticeFunction copyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 13 + setvar VAR_0x8004, APPRENTICE_FUNC_13 special CallApprenticeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, APPRENTICE_FUNC_5 special CallApprenticeFunction - setvar VAR_0x8004, 12 + setvar VAR_0x8004, APPRENTICE_FUNC_12 special CallApprenticeFunction compare VAR_RESULT, 3 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 - setvar VAR_0x8004, 16 + setvar VAR_0x8004, APPRENTICE_FUNC_16 setvar VAR_0x8005, 0 copyvar VAR_0x8006, VAR_0x8007 special CallApprenticeFunction - setvar VAR_0x8004, 15 + setvar VAR_0x8004, APPRENTICE_FUNC_15 special CallApprenticeFunction apprentice_msg TRUE, 7 - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -BattleFrontier_BattleTowerLobby_EventScript_2B6ABA: +BattleFrontier_BattleTowerLobby_EventScript_2B6ABA: @ 82B6ABA setvar VAR_0x8007, 0 return -BattleFrontier_BattleTowerLobby_EventScript_2B6AC0: +BattleFrontier_BattleTowerLobby_EventScript_2B6AC0: @ 82B6AC0 setvar VAR_0x8007, 1 return -BattleFrontier_BattleTowerLobby_EventScript_2B6AC6: - setvar VAR_0x8004, 4 +BattleFrontier_BattleTowerLobby_EventScript_2B6AC6: @ 82B6AC6 + setvar VAR_0x8004, APPRENTICE_FUNC_4 special CallApprenticeFunction return -BattleFrontier_BattleTowerLobby_EventScript_2B6ACF: - setvar VAR_0x8004, 14 +BattleFrontier_BattleTowerLobby_EventScript_2B6ACF: @ 82B6ACF + setvar VAR_0x8004, APPRENTICE_FUNC_14 setvar VAR_0x8005, 4 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 apprentice_msg TRUE, 10 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, APPRENTICE_FUNC_15 special CallApprenticeFunction -BattleFrontier_BattleTowerLobby_EventScript_2B6B09: +BattleFrontier_BattleTowerLobby_EventScript_2B6B09: @ 82B6B09 fadescreen 1 setvar VAR_RESULT, 0 - setvar VAR_0x8004, 19 + setvar VAR_0x8004, APPRENTICE_FUNC_19 special CallApprenticeFunction waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 - setvar VAR_0x8004, 20 + setvar VAR_0x8004, APPRENTICE_FUNC_20 special CallApprenticeFunction - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_msg TRUE, 12 - setvar VAR_0x8004, 5 + setvar VAR_0x8004, APPRENTICE_FUNC_5 special CallApprenticeFunction - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -BattleFrontier_BattleTowerLobby_EventScript_2B6B81: - setvar VAR_0x8004, 14 +BattleFrontier_BattleTowerLobby_EventScript_2B6B81: @ 82B6B81 + setvar VAR_0x8004, APPRENTICE_FUNC_14 setvar VAR_0x8005, 4 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 @@ -179,20 +176,20 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B81: compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 -BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: +BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: @ 82B6BD4 apprentice_msg TRUE, 14 - setvar VAR_0x8004, 5 + setvar VAR_0x8004, APPRENTICE_FUNC_5 special CallApprenticeFunction - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: - setvar VAR_0x8004, 14 +BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: @ 82B6C0C + setvar VAR_0x8004, APPRENTICE_FUNC_14 setvar VAR_0x8005, 4 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_ITEM @@ -206,8 +203,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4 end -BattleFrontier_BattleTowerLobby_EventScript_2B6C77: - setvar VAR_0x8004, 14 +BattleFrontier_BattleTowerLobby_EventScript_2B6C77: @ 82B6C77 + setvar VAR_0x8004, APPRENTICE_FUNC_14 setvar VAR_0x8005, 3 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 @@ -220,107 +217,106 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77: call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D50 compare VAR_0x8005, 1 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D56 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, APPRENTICE_FUNC_17 special CallApprenticeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, APPRENTICE_FUNC_5 special CallApprenticeFunction - setvar VAR_0x8004, 16 + setvar VAR_0x8004, APPRENTICE_FUNC_16 setvar VAR_0x8005, 0 copyvar VAR_0x8006, VAR_0x8007 special CallApprenticeFunction - setvar VAR_0x8004, 15 + setvar VAR_0x8004, APPRENTICE_FUNC_15 special CallApprenticeFunction apprentice_msg TRUE, 9 - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -BattleFrontier_BattleTowerLobby_EventScript_2B6D50: +BattleFrontier_BattleTowerLobby_EventScript_2B6D50: @ 82B6D50 setvar VAR_0x8007, 3 return -BattleFrontier_BattleTowerLobby_EventScript_2B6D56: +BattleFrontier_BattleTowerLobby_EventScript_2B6D56: @ 82B6D56 setvar VAR_0x8007, 4 return -BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: +BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: @ 82B6D5C apprentice_msg FALSE, 4 apprentice_menu APPRENTICE_ASK_3SPECIES copyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x8004, 18 + setvar VAR_0x8004, APPRENTICE_FUNC_18 special CallApprenticeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, APPRENTICE_FUNC_5 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_SPECIES4 apprentice_msg TRUE, 5 - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: +BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: @ 82B6DD4 apprentice_msg TRUE, 11 - setvar VAR_0x8004, 25 + setvar VAR_0x8004, APPRENTICE_FUNC_25 special CallApprenticeFunction setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE call Common_ShowEasyChatScreen lock faceplayer - setvar VAR_0x8004, 21 + setvar VAR_0x8004, APPRENTICE_FUNC_21 special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_EASY_CHAT apprentice_msg TRUE, 15 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, APPRENTICE_FUNC_9 special CallApprenticeFunction - call Script_Apprentice_SetLeavingFlags + call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D release releaseall switch VAR_FACING - case DIR_NORTH, Script_Apprentice_LeaveGoRight - goto Script_Apprentice_Leave + case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 + goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 end -Script_Apprentice_SetLeavingFlags: +BattleFrontier_BattleTowerLobby_EventScript_2B6E4D: @ 82B6E4D setflag FLAG_HIDE_APPRENTICE setflag FLAG_DAILY_APPRENTICE_LEAVES return -Script_Apprentice_LeaveGoRight: - setvar VAR_0x8004, 24 +BattleFrontier_BattleTowerLobby_EventScript_2B6E54: @ 82B6E54 + setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE special CallApprenticeFunction - compare VAR_0x8004, 0 - goto_if_eq Script_Apprentice_End + compare VAR_0x8004, FALSE @ Always TRUE here + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94 waitmovement 0 end -Script_Apprentice_Leave: - setvar VAR_0x8004, 24 +BattleFrontier_BattleTowerLobby_EventScript_2B6E72: @ 82B6E72 + setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE special CallApprenticeFunction - compare VAR_0x8004, 0 - goto_if_eq Script_Apprentice_End + compare VAR_0x8004, FALSE @ Always TRUE here + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95 waitmovement 0 end -Script_Apprentice_ReleaseAndEnd: +BattleFrontier_BattleTowerLobby_EventScript_2B6E90: @ 82B6E90 release releaseall end -Script_Apprentice_End: +BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove: @ 82B6E93 end BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94 walk_fast_right - BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 walk_fast_down walk_fast_down @@ -338,2531 +334,3 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 slide_down slide_down step_end - -gText_082B6EA5:: @ 82B6EA5 - .string "Um, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "Snivel… This tension is getting to me…$" - -gText_082B6EEC:: @ 82B6EEC - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" - .string "Here we come!$" - -gText_082B6F16:: @ 82B6F16 - .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n" - .string "Accept my challenge!$" - -gText_082B6F4C:: @ 82B6F4C - .string "Um… I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…\n" - .string "Do you think someone like me can win?$" - -gText_082B6F92:: @ 82B6F92 - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" - .string "I'll let you challenge me!$" - -gText_082B6FC9:: @ 82B6FC9 - .string "I'm horribly busy, but I also happen\n" - .string "to be {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$" - -gText_082B700C:: @ 82B700C - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "Glad to meet you!$" - -gText_082B703A:: @ 82B703A - .string "I serve as {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "May I begin?$" - -gText_082B706A:: @ 82B706A - .string "Eek! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" - .string "I'll do my best!$" - -gText_082B709C:: @ 82B709C - .string "Yeehaw! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" - .string "Put 'em up!$" - -gText_082B70CC:: @ 82B70CC - .string "I'm {STR_VAR_1}'s 1,000th apprentice!\n" - .string "Actually, I'm no. {STR_VAR_2}! Here goes!$" - -gText_082B710A:: @ 82B710A - .string "Yeah, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" - .string "Let's get rockin' and a-rollin'!$" - -gText_082B714D:: @ 82B714D - .string "Yippee-yahoo! I'm what you call\n" - .string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" - -gText_082B7185:: @ 82B7185 - .string "Cough! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "Good to meet you! Cough!$" - -gText_082B71C1:: @ 82B71C1 - .string "This is nerve-racking…\n" - .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" - -gText_082B71F9:: @ 82B71F9 - .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n" - .string "and that's no lie.$" - -gText_082B7229:: @ 82B7229 - .string "Are you… {PLAYER}?\n" - .string "Oh! Sniff…sob…\p" - .string "Oh! S-sorry…\n" - .string "I'm so nervous, I can't help crying…\p" - .string "I'm {STR_VAR_1}, and I really look up\n" - .string "to you, {PLAYER}.\p" - .string "I… I had this dream of one day meeting\n" - .string "you and asking you about POKéMON.\p" - .string "Please, please, {PLAYER}!\n" - .string "Please teach me about POKéMON!$" - -gText_082B731C:: @ 82B731C - .string "Oh… B-but…\n" - .string "Snivel… Waaaaaaah!\p" - .string "Please!\n" - .string "I'm begging you, please!$" - -gText_082B735B:: @ 82B735B - .string "Oh, really? You will?\n" - .string "Awesome! Wicked! Awoooh!\p" - .string "Oh… I'm sorry…\n" - .string "I'm so happy, I'm crying…\p" - .string "Um… Then please tell me!\n" - .string "It's about the BATTLE TOWER.\p" - .string "Which would be better for me: Level 50\n" - .string "or the Open Level?$" - -gText_082B7423:: @ 82B7423 - .string "{STR_VAR_1}?\n" - .string "Waaaaah!\p" - .string "Oh! I'm so sorry!\n" - .string "You've made me happy by choosing\l" - .string "the level for me, and it's made me cry…\p" - .string "Snivel…\n" - .string "Thank you so much!\l" - .string "Please talk with me again!$" - -gText_082B74C1:: @ 82B74C1 - .string "Wowee! You're {PLAYER}, aren't you?\n" - .string "You're awesomely strong, aren't you?\p" - .string "I'm {STR_VAR_1}!\n" - .string "I just became a TRAINER!\p" - .string "Please, {PLAYER}!\n" - .string "Can you be my teacher and tell me\l" - .string "lots about being a TRAINER?$" - -gText_082B756F:: @ 82B756F - .string "Aww, why?\n" - .string "Oh, please? Pretty please?\l" - .string "Please be my teacher, please!$" - -gText_082B75B2:: @ 82B75B2 - .string "Yay! Great!\p" - .string "The first thing I wanted to ask you is\n" - .string "about the BATTLE TOWER!\p" - .string "The Level 50 and Open Level Rooms…\n" - .string "Which would be perfect for me?$" - -gText_082B763F:: @ 82B763F - .string "{STR_VAR_1}, huh? That's true!\n" - .string "I'll do my best there!\p" - .string "If we meet here again, please teach\n" - .string "me something else, teacher!$" - -gText_082B76AC:: @ 82B76AC - .string "Um… Are you {PLAYER}?\n" - .string "My name is {STR_VAR_1}.\p" - .string "I want to become a POKéMON TRAINER,\n" - .string "but I don't know what to do…\p" - .string "So I thought maybe I could ask you for\n" - .string "advice because you're so famous.\p" - .string "{PLAYER}, could you give me advice?$" - -gText_082B7772:: @ 82B7772 - .string "Oh, but…\p" - .string "I sincerely want to become a POKéMON\n" - .string "TRAINER!\p" - .string "Please, can you answer my questions?$" - -gText_082B77CE:: @ 82B77CE - .string "Thank you!\n" - .string "Here's my first question right away!\p" - .string "The BATTLE TOWER has two levels,\n" - .string "Level 50 and Open Level, right?\p" - .string "Which level do you think is more\n" - .string "suitable for me?$" - -gText_082B7871:: @ 82B7871 - .string "Oh, the {STR_VAR_1} challenge?\n" - .string "Understood!\p" - .string "If I have another question, I'll come\n" - .string "back here for your advice!$" - -gText_082B78D4:: @ 82B78D4 - .string "Oh? Huh? You're…\n" - .string "No, that can't be true.\p" - .string "There isn't any way that someone\n" - .string "like me could meet {PLAYER}.\p" - .string "…You really are {PLAYER}?\n" - .string "I can't believe I'm talking to you!\p" - .string "When something this good happens,\n" - .string "only terrible things will happen to me\l" - .string "now, I just know it…\p" - .string "…I'm sorry…\n" - .string "I'm… {STR_VAR_1}…\p" - .string "There isn't anything special about\n" - .string "me that I can be proud of…\p" - .string "I shouldn't even say anything about\n" - .string "myself because you'll forget…\p" - .string "I had this dream that if I ever met\n" - .string "you, {PLAYER}, that maybe I could ask\l" - .string "you for advice as a TRAINER.\p" - .string "But I don't think you would agree\n" - .string "to that.\p" - .string "…Or will you be so kind as to give\n" - .string "me advice?$" - -gText_082B7B1A:: @ 82B7B1A - .string "I knew it…\p" - .string "It had to happen because I'm such\n" - .string "a really boring nobody…\p" - .string "But I thought just maybe…\n" - .string "You won't reconsider, will you?\p" - .string "But I can't give up just like that.\n" - .string "I'll ask you while I'm still lucky!\p" - .string "Please, will you be so kind as to give\n" - .string "me advice?$" - -gText_082B7C13:: @ 82B7C13 - .string "Really? I can't believe it!\n" - .string "I can't believe you'll advise me!\l" - .string "I… I'm so happy…\p" - .string "What I want to ask you is really\n" - .string "trivial, but I can't decide…\p" - .string "At the BATTLE TOWER, they let you\n" - .string "choose Level 50 or Open Level.\p" - .string "Which course do you think even I may\n" - .string "have a chance at?$" - -gText_082B7D18:: @ 82B7D18 - .string "{STR_VAR_1}? Okay!\n" - .string "But do you really think someone like\l" - .string "me would have a chance?\p" - .string "I'll do my best, even though I don't\n" - .string "think it will work.\p" - .string "Thank you very much for spending\n" - .string "time with someone like me.$" - -gText_082B7DD4:: @ 82B7DD4 - .string "Oh! You're {PLAYER}{KUN}, aren't you?\p" - .string "I've heard that you're tough at\n" - .string "POKéMON!\p" - .string "I'm {STR_VAR_1}!\n" - .string "I'll be your friend!\p" - .string "Did you know?\p" - .string "You can't win at the BATTLE FRONTIER\n" - .string "if all you know is what they teach at\l" - .string "the TRAINER'S SCHOOL.\p" - .string "I'm willing to listen to your advice.\n" - .string "You'll agree, of course?$" - -gText_082B7EE5:: @ 82B7EE5 - .string "Huh? Why are you refusing me?\n" - .string "It's me who's asking you!\l" - .string "You have to reconsider!$" - -gText_082B7F35:: @ 82B7F35 - .string "Okay, so there is this something.\n" - .string "I want you to decide it for me.\p" - .string "You know that the BATTLE TOWER has\n" - .string "Level 50 and Open Level Rooms?\p" - .string "Which do you think would be good\n" - .string "for me, {PLAYER}{KUN}?$" - -gText_082B7FE8:: @ 82B7FE8 - .string "Okay, {STR_VAR_1} is suitable for me?\n" - .string "Thank you!\p" - .string "Knowing that you made the decision,\n" - .string "{PLAYER}{KUN}, I won't be so upset if\l" - .string "I lose.\p" - .string "Okay, I'll look to you for advice again.\n" - .string "Bye!$" - -gText_082B8087:: @ 82B8087 - .string "Oh, hi, there! {PLAYER}{KUN}!\n" - .string "I know you because you're famous!\l" - .string "Call me {STR_VAR_1}! Glad to meet you!\p" - .string "I'm a TRIATHLETE, so I keep myself\n" - .string "fit even while I raise POKéMON.\p" - .string "I'm also involved with other things\n" - .string "like work, napping, ballroom dancing…\p" - .string "Being this busy, it's not so easy for\n" - .string "me to become a decent TRAINER.\p" - .string "So, I have a proposition!\p" - .string "There must be a reason why we met.\n" - .string "So, {PLAYER}{KUN}, how about sharing your\l" - .string "wisdom with me every so often?$" - -gText_082B822B:: @ 82B822B - .string "Oh, but, please?\n" - .string "A guy like me needs someone like\l" - .string "you, {PLAYER}{KUN}!\p" - .string "Honestly, I need your advice!$" - -gText_082B8286:: @ 82B8286 - .string "Thank you! That's more like it!\n" - .string "So, let's start with an easy one!\p" - .string "You know about the BATTLE TOWER's\n" - .string "two courses, right?\l" - .string "You know, Level 50 and Open Level.\p" - .string "Me being a busy guy, which one should\n" - .string "I gear up for?$" - -gText_082B8356:: @ 82B8356 - .string "{STR_VAR_1}, huh? Okay, gotcha.\n" - .string "I'll find time somehow and give it a go!\p" - .string "…Whoops, I'd better go to work!\n" - .string "Thanks! See you around!$" - -gText_082B83CE:: @ 82B83CE - .string "No way! Uh-uh!\n" - .string "Are you maybe the real {PLAYER}?\p" - .string "A-hah! Awesome! I'm {STR_VAR_1},\n" - .string "so pleased to meet you!\p" - .string "{PLAYER}, you're very strong,\n" - .string "aren't you?\p" - .string "Everyone's talking about you!\p" - .string "Oh! I just had this great idea!\n" - .string "I'll get advice off you, {PLAYER}!\l" - .string "I'm sure it will make me tougher!\p" - .string "Isn't it a great idea?\n" - .string "Please, I want your advice!$" - -gText_082B84FC:: @ 82B84FC - .string "Ahahaha, you can pretend to be mean,\n" - .string "but you can't fool me!\l" - .string "You really mean okay, don't you?$" - -gText_082B8559:: @ 82B8559 - .string "Yay! I knew you'd have a big heart,\n" - .string "{PLAYER}!\p" - .string "What should I ask you first?\n" - .string "…Oh, I thought of something!\p" - .string "Drum roll, please!\n" - .string "The question I have is…\p" - .string "If I were to take a BATTLE TOWER\n" - .string "challenge, which way should I go?\p" - .string "Level 50 or Open Level?\n" - .string "Which suits me more?$" - -gText_082B8656:: @ 82B8656 - .string "Oh-oh-oh!\n" - .string "{STR_VAR_1}, you say!\l" - .string "Thank you for a totally cool reply!\p" - .string "I guess that's about all I wanted\n" - .string "to ask you today.\p" - .string "Let's meet here again, okay?\n" - .string "Thanks!$" - -gText_082B86EA:: @ 82B86EA - .string "I beg your pardon, but…\n" - .string "Are you {PLAYER}?\p" - .string "I'm {STR_VAR_1}, and I am delighted to\n" - .string "make your acquaintance.\p" - .string "I have long been an admirer\n" - .string "of yours…\p" - .string "… … … … … …\p" - .string "Um… I hope you don't find this\n" - .string "request too much of a burden, but…\p" - .string "May I become your apprentice,\n" - .string "{PLAYER}?$" - -gText_082B87DA:: @ 82B87DA - .string "Oh…!\p" - .string "… … … … … …\n" - .string "… … … … … …\p" - .string "…I must have fainted from shock.\n" - .string "I'm sorry, I must have misheard you.\p" - .string "Please! Please say that you will\n" - .string "accept me as your apprentice!$" - -gText_082B887C:: @ 82B887C - .string "Oh… I'm delighted!\p" - .string "I don't wish to waste your time,\n" - .string "so please advise me on this.\p" - .string "I plan to take a BATTLE TOWER\n" - .string "challenge soon.\p" - .string "However, there are two levels…\p" - .string "Which would be most suitable for me?\n" - .string "Level 50 or Open Level?$" - -gText_082B8957:: @ 82B8957 - .string "{STR_VAR_1} is your choice!\n" - .string "I see. I will do my best!\p" - .string "Thank you, {PLAYER}.\n" - .string "I hope I can count on you again.\l" - .string "Please take care!$" - -gText_082B89C6:: @ 82B89C6 - .string "Eek! Eek! {PLAYER}!\n" - .string "You spoke to me!\l" - .string "I… I'm overjoyed!\p" - .string "Me! My name is {STR_VAR_1}!\n" - .string "I just became a TRAINER!\p" - .string "I'm delighted I met you, {PLAYER},\n" - .string "the big name in POKéMON circles!\p" - .string "Oh-oh-oh, I know!\n" - .string "May I ask a huge favor, {PLAYER}?\p" - .string "Please take me in as your apprentice!\n" - .string "I want to learn from you!$" - -gText_082B8ACF:: @ 82B8ACF - .string "Waaaah!\n" - .string "{PLAYER} turned me down…\l" - .string "It… It's an invaluable experience!\p" - .string "{PLAYER}, please! I want to hear\n" - .string "an affirmative answer this time!\p" - .string "I beg you for your guidance!$" - -gText_082B8B66:: @ 82B8B66 - .string "Hieeeeh! {PLAYER} said yes!\n" - .string "{PLAYER} said yes!\p" - .string "I won't be able to sleep tonight…\n" - .string "Thank you ever so much!\p" - .string "Then, here's my question!\p" - .string "At the BATTLE TOWER, what is right\n" - .string "for me, Level 50 or Open Level?$" - -gText_082B8C20:: @ 82B8C20 - .string "{STR_VAR_1}! Perfectly understood!\n" - .string "I understand perfectly!\l" - .string "I'm deliriously delighted!\p" - .string "I hope you'll be willing to teach me\n" - .string "some more another time.$" - -gText_082B8CAA:: @ 82B8CAA - .string "Whoa! Could you be…\n" - .string "Might you be… {PLAYER}{KUN}?!\l" - .string "That strong and famous TRAINER?\l" - .string "Well, hello, aren't I just the luckiest!\p" - .string "Hello, the name's {STR_VAR_1}!\p" - .string "I've been on the lookout for\n" - .string "a POKéMON teacher.\p" - .string "And with impeccably good timing,\n" - .string "along came you, {PLAYER}{KUN}!\p" - .string "So, there you have it, {PLAYER}{KUN}!\n" - .string "Let me apprentice under you!$" - -gText_082B8DD3:: @ 82B8DD3 - .string "Gwaaaah!\n" - .string "You're quite cool and tough…\p" - .string "Don't be that way, please.\n" - .string "I'm asking you!$" - -gText_082B8E24:: @ 82B8E24 - .string "Oh, yeah! That's a solid reply!\n" - .string "Excellent, I might add!\p" - .string "So how about a first piece of advice\n" - .string "on the BATTLE TOWER?\p" - .string "If I were to go, what would be better?\n" - .string "Level 50 or Open Level?$" - -gText_082B8ED5:: @ 82B8ED5 - .string "Uh-huh, {STR_VAR_1} it is!\n" - .string "OK, A-OK!\l" - .string "I'll go show my mettle, like, jam!\p" - .string "All right, I'll look to you as my mentor!\n" - .string "Adios!$" - -gText_082B8F45:: @ 82B8F45 - .string "Oh, hey, {PLAYER}{KUN}, right?\n" - .string "The police were looking for you!\p" - .string "… … …\n" - .string "Of course I'm lying!\p" - .string "Me, I'm {STR_VAR_1}. Despite the way\n" - .string "I look, I'm the POKéMON CHAMPION!\l" - .string "…That's a lie, too!\p" - .string "This is no lie, though.\n" - .string "I'm not very good at battling.\p" - .string "So, how about you becoming my master\n" - .string "about all things POKéMON?$" - -gText_082B905F:: @ 82B905F - .string "If you're going to act cold like that,\n" - .string "I'll show you what I'll do!\p" - .string "Waaah! Waaah! Waaah!\n" - .string "Hiccup!\p" - .string "Hahaha, that was my FAKE TEARS!\p" - .string "Come on, will you please be\n" - .string "my POKéMON master?$" - -gText_082B910E:: @ 82B910E - .string "Yippee!\n" - .string "I'll buy you a boat for that!\p" - .string "Of course I'm lying again!\n" - .string "But… Thank you, master!\p" - .string "You know how there's Level 50 and\n" - .string "Open Level at the BATTLE TOWER?\p" - .string "I'm having trouble deciding which\n" - .string "level I should challenge…\p" - .string "Can you decide for me, master?$" - -gText_082B9204:: @ 82B9204 - .string "Okay, so {STR_VAR_1} is better!\n" - .string "I'll go to the other level, then!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks, master!\n" - .string "I hope you'll keep teaching me!$" - -gText_082B929C:: @ 82B929C - .string "A-H-O-Y!\n" - .string "And that spells ahoy, and it means hi!\p" - .string "I'm {STR_VAR_1}, the rappin' SAILOR\n" - .string "am I!\p" - .string "Your turn now, tell me a little about\n" - .string "yourself, give it a try!\p" - .string "Uh-huh, uh-huh!\n" - .string "{PLAYER}{KUN}'s your name,\l" - .string "and POKéMON's your game!\p" - .string "And you're at a delicate age\n" - .string "when all the world's your stage!\p" - .string "Anyway, I just want to say,\n" - .string "that you're the tenth TRAINER\l" - .string "I've spoken to today.\p" - .string "Let's make that a celebration!\n" - .string "Become my mentor for commemoration!$" - -gText_082B9438:: @ 82B9438 - .string "But!\n" - .string "You have to work with me!\p" - .string "Don't be such a tease!\n" - .string "Become my mentor, please!$" - -gText_082B9488:: @ 82B9488 - .string "That's it!\n" - .string "{PLAYER}, you've got the spirit!\p" - .string "So here's my first question\n" - .string "that begs your suggestion!\p" - .string "It's about the BATTLE TOWER,\n" - .string "and it hinges on my power!\p" - .string "Level 50 and Open Level there be,\n" - .string "which is the one that's good for me?$" - -gText_082B9564:: @ 82B9564 - .string "Okay, {STR_VAR_1} it is, you say!\n" - .string "I'll go and take it on my way!\p" - .string "If it's advice I ever need,\n" - .string "{PLAYER}, your word I'll always heed!$" - -gText_082B95D8:: @ 82B95D8 - .string "Say, hey, aren't you {PLAYER}?\n" - .string "What should I do? Talk to you?\l" - .string "Why not? I'm already talking to you!\p" - .string "{PLAYER}, are you surprised at me?\n" - .string "I'd better tell you who I happen to be!\p" - .string "{STR_VAR_1} is what you can call me.\n" - .string "The brightest star in guitardom,\l" - .string "that's me!\p" - .string "Are you receiving me?\n" - .string "You are receiving me!\p" - .string "My luck's at its best,\n" - .string "I'll hit you with a request!\p" - .string "{PLAYER}, let me be your underling!\n" - .string "I want you to teach me everything!$" - -gText_082B9763:: @ 82B9763 - .string "You're turning me down, then?\n" - .string "I'll just have to ask you again!\p" - .string "{PLAYER}, I beg to be your underling!\n" - .string "I need you to teach me everything!$" - -gText_082B97E5:: @ 82B97E5 - .string "Lucky, yeah, woohoo!\n" - .string "Should I pop a question to you?\p" - .string "Since we're near the BATTLE TOWER,\n" - .string "how about a question about its power?\p" - .string "Of the choices you see,\n" - .string "which is the right one for me?$" - -gText_082B989A:: @ 82B989A - .string "If {STR_VAR_1} is what you suggest,\n" - .string "it must be the very best!\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me.\p" - .string "See you again, my smart friend!$" - -gText_082B992D:: @ 82B992D - .string "Oh, hi! You there!\n" - .string "Can I get you to massage my shoulder?\p" - .string "…Yes, there! That's it!\n" - .string "Ouch, ouch! Oooh, that feels great!\p" - .string "My name's {STR_VAR_1}.\n" - .string "I take karate training, but my body's\l" - .string "not built to take the abuse…\p" - .string "I decided I'll battle POKéMON and\n" - .string "toughen myself up.\p" - .string "You're {PLAYER}{KUN}, aren't you?\n" - .string "The POKéMON LEAGUE CHAMP?\p" - .string "Listen, can I get you to give me\n" - .string "advice?$" - -gText_082B9A84:: @ 82B9A84 - .string "Oh, why?\p" - .string "I won't be a big bother, I promise!\n" - .string "Please?$" - -gText_082B9AB9:: @ 82B9AB9 - .string "Thank you. Mighty good of you!\n" - .string "…Cough! Cough!\p" - .string "Oogh, I have to toughen up quick…\p" - .string "I'll be heading off to the BATTLE TOWER\n" - .string "right away, but what would be better\l" - .string "for me? Level 50 or Open Level?$" - -gText_082B9B76:: @ 82B9B76 - .string "Hm, all right. That's {STR_VAR_1}.\n" - .string "I'll go there right away.\p" - .string "I hope I can keep hitting you up for\n" - .string "help--after all, you're my mentor!$" - -gText_082B9BF2:: @ 82B9BF2 - .string "Er… Um…\n" - .string "{PLAYER}{KUN}…?\p" - .string "Please, don't look at me that way.\n" - .string "You're making me all self-conscious.\p" - .string "I… I'm {STR_VAR_1}.\p" - .string "I'm really embarrassed to say this,\n" - .string "but I explore ancient ruins and such.\p" - .string "I'm even more embarrassed to admit\n" - .string "I'm interested in the BATTLE FRONTIER.\p" - .string "{PLAYER}{KUN}, you have a reputation as\n" - .string "a tough TRAINER…\p" - .string "It's hard for me to say this,\n" - .string "but I want to ask something.\p" - .string "Could you become my teacher and\n" - .string "give me advice?$" - -gText_082B9D83:: @ 82B9D83 - .string "Please don't brush me off like this!\n" - .string "I can't live with the humiliation.\p" - .string "Please become my teacher!\n" - .string "I need your advice!$" - -gText_082B9DF9:: @ 82B9DF9 - .string "Th-thank you…\p" - .string "But please don't look at me like that.\n" - .string "It makes me all flustered.\p" - .string "Please, answer me without looking\n" - .string "at my eyes.\p" - .string "At the BATTLE TOWER…\n" - .string "Which level should I attempt?$" - -gText_082B9EAA:: @ 82B9EAA - .string "Oh… Okay!\n" - .string "I'll try my hand at that.\p" - .string "I hope I can make a valiant challenge\n" - .string "without getting all flustered…\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "If we meet again, I hope you will be\l" - .string "as helpful.$" - -gText_082B9F55:: @ 82B9F55 - .string "Hm? You appear to be {PLAYER}{KUN}…\n" - .string "But are you really real?\p" - .string "You may call me {STR_VAR_1}.\p" - .string "I have been toying with the idea of\n" - .string "apprenticing under a strong TRAINER.\p" - .string "So, I must say I'm lucky you came along!\n" - .string "…You really are {PLAYER}{KUN}, yes?\p" - .string "No, no, if you are real, it's fine.\n" - .string "I merely want you to recognize me\l" - .string "as your apprentice.$" - -gText_082BA084:: @ 82BA084 - .string "Oh?\n" - .string "But what would compel you to refuse?\p" - .string "I apologize for being skeptical about\n" - .string "your identity.\p" - .string "Please accept my apology and\n" - .string "accept me as your apprentice.$" - -gText_082BA11D:: @ 82BA11D - .string "You really are accepting me?\n" - .string "I don't wish to celebrate prematurely.\p" - .string "If it is true, I apologize.\n" - .string "But now, I need your advice.\p" - .string "If I were to enter the BATTLE TOWER,\n" - .string "what would be worthy of me?\l" - .string "Level 50 or Open Level?$" - -gText_082BA1F3:: @ 82BA1F3 - .string "{STR_VAR_1}?\n" - .string "Are you certain?\p" - .string "I see. If that's the case, that's fine.\n" - .string "I thank you for your time.\p" - .string "I realize I can annoy, but it delights\n" - .string "me that you have accepted me.\p" - .string "Let us meet again!$" - -gText_082BA2A3:: @ 82BA2A3 - .string "Sigh… Sob…\n" - .string "Oh, {PLAYER}!\p" - .string "I'm all tangled up in a dilemma\n" - .string "that I can't decide.\p" - .string "I can't decide what I should make\n" - .string "my {STR_VAR_1} hold.\p" - .string "Please tell me, {PLAYER}.\n" - .string "What item should I make it hold?$" - -gText_082BA34E:: @ 82BA34E - .string "Oh, really? I shouldn't make\n" - .string "my {STR_VAR_1} hold anything?$" - -gText_082BA380:: @ 82BA380 - .string "Oh, okay! I'm delighted it's settled!\n" - .string "Awesome! Wicked! Awoooh!\p" - .string "Thank you so much!$" - -gText_082BA3D2:: @ 82BA3D2 - .string "Oh, I'm so glad…\n" - .string "I think I have that {STR_VAR_1}, too.\p" - .string "I'm delighted it's settled!\n" - .string "Awesome! Wicked! Awoooh!\p" - .string "Thank you so much!$" - -gText_082BA448:: @ 82BA448 - .string "Waaaah! Please don't be mean!\p" - .string "That item {STR_VAR_1} was already\n" - .string "recommended to me before, sob…\p" - .string "Or do you mean I shouldn't make\n" - .string "my {STR_VAR_2} hold anything?$" - -gText_082BA4D3:: @ 82BA4D3 - .string "Yay! It's {PLAYER}!\n" - .string "Great! I wanted to ask you something!\p" - .string "Do you make your POKéMON hold items?\n" - .string "I want to make mine hold items, but…\p" - .string "What item would be good for\n" - .string "{STR_VAR_1} to hold?\p" - .string "What do you think?$" - -gText_082BA58C:: @ 82BA58C - .string "Huh? You mean my {STR_VAR_1} doesn't\n" - .string "have to hold anything?$" - -gText_082BA5BF:: @ 82BA5BF - .string "Oh, I get it! I'll do that!\n" - .string "Thanks for teaching me!$" - -gText_082BA5F3:: @ 82BA5F3 - .string "Oh, wow! One {STR_VAR_1}, huh?\n" - .string "Okay, I'll do that!\p" - .string "Thanks for teaching me!$" - -gText_082BA635:: @ 82BA635 - .string "Oh, uh, no, that's not what I meant.\n" - .string "I want to know about a different item\l" - .string "than the ones I already know.\p" - .string "Or do you mean that my POKéMON doesn't\n" - .string "have to hold anything this time?$" - -gText_082BA6E6:: @ 82BA6E6 - .string "{PLAYER}, hello!\n" - .string "It's about my {STR_VAR_1}…\p" - .string "I want to make it hold a good item.\n" - .string "What would be good for it?$" - -gText_082BA742:: @ 82BA742 - .string "Oh, then my {STR_VAR_1} doesn't have\n" - .string "to hold anything?$" - -gText_082BA770:: @ 82BA770 - .string "Okay, I got it!\n" - .string "See you again!$" - -gText_082BA78F:: @ 82BA78F - .string "Oh, the item {STR_VAR_1}?\n" - .string "Understood!\p" - .string "I'll do my best to find one!\n" - .string "See you again!$" - -gText_082BA7D8:: @ 82BA7D8 - .string "Somebody taught me about\n" - .string "the {STR_VAR_1} already.\p" - .string "I want my POKéMON to hold a different\n" - .string "kind of item.\p" - .string "Or do you think {STR_VAR_2} doesn't\n" - .string "have to hold anything?$" - -gText_082BA867:: @ 82BA867 - .string "Hello, {PLAYER}…\n" - .string "I'm sorry to disturb you, but I have\l" - .string "something else I wanted to ask you.\p" - .string "I don't think I'm good enough to win\n" - .string "matches on my own, so I'm thinking of\l" - .string "making my {STR_VAR_1} hold an item.\p" - .string "But I don't know what would be good.\p" - .string "{PLAYER}, please, could you decide\n" - .string "for me?$" - -gText_082BA96B:: @ 82BA96B - .string "A POKéMON belonging to someone like me\n" - .string "would be better off without an item?$" - -gText_082BA9B7:: @ 82BA9B7 - .string "I understand…\n" - .string "You're saying I shouldn't rely on items.\l" - .string "I'll do my best not to!\p" - .string "Thank you very much!$" - -gText_082BAA1B:: @ 82BAA1B - .string "The item {STR_VAR_1}, okay.\n" - .string "I'm not sure if I can get one…\l" - .string "No! I'll do my best to get it.\p" - .string "Thank you very much!$" - -gText_082BAA81:: @ 82BAA81 - .string "Oh, but…\n" - .string "I think I've heard about that before…\p" - .string "Is it maybe because I haven't handled\n" - .string "the item {STR_VAR_1} very well?\p" - .string "Or do you mean I shouldn't make\n" - .string "my {STR_VAR_2} hold anything?$" - -gText_082BAB22:: @ 82BAB22 - .string "Oh, {PLAYER}{KUN}.\n" - .string "There's something I wanted to ask you.\p" - .string "You know how you decided which\n" - .string "POKéMON I should have for me?\p" - .string "But I never asked you what item\n" - .string "it should be holding.\p" - .string "Since you already gave me advice,\n" - .string "how about seeing this to the end?\p" - .string "What would be good? I want to make\n" - .string "my {STR_VAR_1} hold something.$" - -gText_082BAC43:: @ 82BAC43 - .string "Oh! So my {STR_VAR_1} should do\n" - .string "the best it can empty-handed?$" - -gText_082BAC78:: @ 82BAC78 - .string "If you think that's best, I'll do that.\p" - .string "Knowing that you made the decision,\n" - .string "{PLAYER}{KUN}, I won't be so upset if\l" - .string "I lose.\p" - .string "Okay, I'll look to you for advice again.\n" - .string "Bye!$" - -gText_082BAD17:: @ 82BAD17 - .string "The item {STR_VAR_1}, huh?\n" - .string "Not bad. I'll use it!\p" - .string "Knowing that you made the decision,\n" - .string "{PLAYER}{KUN}, I won't be so upset if\l" - .string "I lose.\p" - .string "Okay, I'll look to you for advice again.\n" - .string "Bye!$" - -gText_082BADB6:: @ 82BADB6 - .string "Huh? What are you saying?\n" - .string "You told me about the {STR_VAR_1}\l" - .string "already before.\p" - .string "Or do you mean my {STR_VAR_2} should\n" - .string "do the best it can empty-handed?$" - -gText_082BAE36:: @ 82BAE36 - .string "Yo, {PLAYER}{KUN}!\p" - .string "We're both busy, but we seem to run\n" - .string "into each other often anyway!\p" - .string "Today I have to do some walking,\n" - .string "cleaning, and brushing.\p" - .string "I haven't even had the time to buy\n" - .string "my precious {STR_VAR_1} anything.\p" - .string "I don't have any time, so how about\n" - .string "giving me advice on what I should make\l" - .string "my {STR_VAR_1} hold?$" - -gText_082BAF4E:: @ 82BAF4E - .string "Oh, so me being a busy guy, you say\n" - .string "my {STR_VAR_1} doesn't need anything?$" - -gText_082BAF8F:: @ 82BAF8F - .string "Okay, gotcha.\n" - .string "I won't need any time for that.\p" - .string "Thanks today!\n" - .string "See you around!$" - -gText_082BAFDB:: @ 82BAFDB - .string "Okay, gotcha.\n" - .string "I'll find time somehow and find\l" - .string "that {STR_VAR_1} you recommended.\p" - .string "I'm glad I met a good mentor in you.\n" - .string "Thanks! See you around!$" - -gText_082BB05F:: @ 82BB05F - .string "Huh? I already know about\n" - .string "that {STR_VAR_1}.\p" - .string "Oh, right, I get it.\n" - .string "So me being a busy guy, you say\l" - .string "my {STR_VAR_2} doesn't need anything?$" - -gText_082BB0D4:: @ 82BB0D4 - .string "Hiya, {PLAYER}! It's me!\n" - .string "I need to tap your mind again today.\l" - .string "Please, I need your advice!\p" - .string "Drum roll, please!\n" - .string "The question I have is…\p" - .string "If I want to make my {STR_VAR_1} hold\n" - .string "an item, what should it be?$" - -gText_082BB18C:: @ 82BB18C - .string "Is that right? My {STR_VAR_1} doesn't\n" - .string "need to hold an item, you're saying.$" - -gText_082BB1CE:: @ 82BB1CE - .string "Okay, that's what I'll do!\p" - .string "I guess that's about all I wanted\n" - .string "to ask you today.\p" - .string "Let's meet here again, okay?\n" - .string "Thanks!$" - -gText_082BB242:: @ 82BB242 - .string "Uh-huh! One {STR_VAR_1}.\n" - .string "What a cool choice!\l" - .string "I'll definitely try that!\p" - .string "I guess that's about all I wanted\n" - .string "to ask you today.\p" - .string "Let's meet here again, okay?\n" - .string "Thanks!$" - -gText_082BB2D9:: @ 82BB2D9 - .string "Ahahah! That's silly!\n" - .string "You already told me about that\l" - .string "{STR_VAR_1} before!\p" - .string "Are you feeling okay, {PLAYER}?\p" - .string "Oh, wait! My {STR_VAR_2} doesn't\n" - .string "need to hold an item, you're saying.$" - -gText_082BB370:: @ 82BB370 - .string "Hello, {PLAYER}. I hope you've been\n" - .string "keeping well.\p" - .string "May I approach you for advice?\p" - .string "In a recent battle, my opponent\n" - .string "seemed to have given his POKéMON\l" - .string "an item to hold.\p" - .string "As a result, I was defeated…\p" - .string "I don't wish to be left behind.\n" - .string "I would like to make my {STR_VAR_1}\l" - .string "hold an item, too.\p" - .string "It would please me if you could decide\n" - .string "what would be right for my POKéMON…$" - -gText_082BB4C3:: @ 82BB4C3 - .string "In other words… My POKéMON has\n" - .string "no need to hold an item?$" - -gText_082BB4FB:: @ 82BB4FB - .string "I understand clearly now!\n" - .string "I will keep trying like this.\p" - .string "Thank you, {PLAYER}.\n" - .string "I hope I can count on you again.\l" - .string "Please take care!$" - -gText_082BB575:: @ 82BB575 - .string "One {STR_VAR_1} it is!\n" - .string "I will order it right away.\p" - .string "Thank you, {PLAYER}.\n" - .string "I hope I can count on you again.\l" - .string "Please take care!$" - -gText_082BB5E1:: @ 82BB5E1 - .string "You've already told me about that,\n" - .string "and I already have it.\p" - .string "Or are you saying… My POKéMON has\n" - .string "no need to hold an item?$" - -gText_082BB656:: @ 82BB656 - .string "Eek! {PLAYER}!\n" - .string "I… I'm overjoyed to see you again!\p" - .string "Oh-oh-oh! There's something I just\n" - .string "had to ask you, {PLAYER}!\p" - .string "Please decide what my {STR_VAR_1}\n" - .string "should be holding!$" - -gText_082BB6E5:: @ 82BB6E5 - .string "Oh, wow! I didn't expect that answer!\n" - .string "So, a hold item isn't necessary?$" - -gText_082BB72C:: @ 82BB72C - .string "Perfectly understood!\n" - .string "I'll keep at this without an item!\p" - .string "I hope you'll be willing to teach me\n" - .string "some more another time.$" - -gText_082BB7A2:: @ 82BB7A2 - .string "{STR_VAR_1}! I'll use that!\p" - .string "Um… Could it be, {PLAYER}, you also\n" - .string "make your POKéMON hold that item?\p" - .string "I'll be sure to get it!\n" - .string "I hope you'll be willing to teach me\l" - .string "some more another time.$" - -gText_082BB84A:: @ 82BB84A - .string "Oh? You recommended that\n" - .string "{STR_VAR_1} before, too.\p" - .string "Or is it the best thing to hold?\n" - .string "Or do you mean that my {STR_VAR_2}\l" - .string "doesn't need anything to hold?$" - -gText_082BB8CD:: @ 82BB8CD - .string "Hola!\n" - .string "My maestro, {PLAYER}{KUN}!\p" - .string "I want to hit you up for advice on\n" - .string "POKéMON tools.\p" - .string "What do you think would be good for\n" - .string "my {STR_VAR_1} to hold?\p" - .string "Don't be shy now.\n" - .string "Let's blurt it out!$" - -gText_082BB970:: @ 82BB970 - .string "Oh? So, you're saying my {STR_VAR_1}\n" - .string "can win without holding any item?$" - -gText_082BB9AE:: @ 82BB9AE - .string "Si, bueno!\n" - .string "I'll give it my best shot, like, slam!\p" - .string "All right, thanks, as always!\n" - .string "Adios!$" - -gText_082BBA05:: @ 82BBA05 - .string "Uh-huh, that's one {STR_VAR_1}?\n" - .string "Si, bueno!\l" - .string "I'll go find me one, like, bam!\p" - .string "All right, thanks, as always!\n" - .string "Adios!$" - -gText_082BBA6C:: @ 82BBA6C - .string "No, no! You already told me about\n" - .string "that {STR_VAR_1} thing before.\p" - .string "Oh, now wait just one minute here…\n" - .string "So, you're saying my {STR_VAR_2}\l" - .string "can win without holding any item?$" - -gText_082BBB01:: @ 82BBB01 - .string "{PLAYER}{KUN}, something unbelievable\n" - .string "has happened!\p" - .string "I woke up this morning, and my POKéMON\n" - .string "had 10 NUGGETS!\p" - .string "Of course I'm lying!\n" - .string "Wahahaha!\p" - .string "This is no lie, though.\n" - .string "I'm not very good at thinking about\l" - .string "what items POKéMON should hold.\p" - .string "So, how about deciding for me what\n" - .string "my {STR_VAR_1} should hold, master?$" - -gText_082BBC1C:: @ 82BBC1C - .string "What's that mean?\n" - .string "Don't make it hold anything?$" - -gText_082BBC4B:: @ 82BBC4B - .string "Okay, so it shouldn't hold anything.\n" - .string "Then, I'd better get something for it!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks, master!\n" - .string "I hope you'll keep teaching me!$" - -gText_082BBCF6:: @ 82BBCF6 - .string "Okay, so it's one {STR_VAR_1}!\n" - .string "I'll make it hold anything but that!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks, master!\n" - .string "I hope you'll keep teaching me!$" - -gText_082BBD90:: @ 82BBD90 - .string "Um, you told me about that before,\n" - .string "didn't you?\p" - .string "Isn't there something else?\p" - .string "Or do you mean, don't make\n" - .string "my {STR_VAR_2} hold anything?$" - -gText_082BBE0B:: @ 82BBE0B - .string "A-H-O-Y!\n" - .string "And that spells ahoy!\p" - .string "The rappin' SAILOR am I!\n" - .string "I present to you a question\l" - .string "that's pretty fly!\p" - .string "It's an item question\n" - .string "that begs your suggestion!\p" - .string "My {STR_VAR_1} needs an item to hold,\n" - .string "What should it be, if I may be bold?$" - -gText_082BBEE5:: @ 82BBEE5 - .string "Is that right?\n" - .string "My {STR_VAR_1} doesn't need to be\l" - .string "holding anything tight?$" - -gText_082BBF25:: @ 82BBF25 - .string "Okay, I hear you, sure I do!\n" - .string "My POKéMON will go empty-handed, too!\p" - .string "If it's advice I ever need,\n" - .string "{PLAYER}, your word I'll always heed!$" - -gText_082BBFA4:: @ 82BBFA4 - .string "Okay, one {STR_VAR_1},\n" - .string "that's what I'll use.\l" - .string "I was right to make you choose!\p" - .string "If it's advice I ever need,\n" - .string "{PLAYER}, your word I'll always heed!$" - -gText_082BC024:: @ 82BC024 - .string "Okay, one {STR_VAR_1}, you say?\n" - .string "You told me that the other day.\l" - .string "I need a new idea, a brand new way.\p" - .string "Or, what, is that right?\n" - .string "My POKéMON doesn't need to hold\l" - .string "anything tight?$" - -gText_082BC0C8:: @ 82BC0C8 - .string "Say, hey, {PLAYER}!\n" - .string "I found you again today!\p" - .string "What should I do? Get your advice?\n" - .string "Why not? I'm already talking to you!\p" - .string "{PLAYER}, are you getting sick of me?\n" - .string "Nah, no way, that can't be.\p" - .string "Will you hear me out?\n" - .string "I'm looking for advice--that's what\l" - .string "I'm talking about.\p" - .string "It's about a hold item for\n" - .string "my {STR_VAR_1} that'd be good.\l" - .string "My indecision is making me brood.$" - -gText_082BC213:: @ 82BC213 - .string "My {STR_VAR_1} needs nothing?\n" - .string "Doesn't need to hold anything?$" - -gText_082BC247:: @ 82BC247 - .string "If holding nothing is the best,\n" - .string "I'll do as you suggest!\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me.\p" - .string "See you again, my smart friend!$" - -gText_082BC2DD:: @ 82BC2DD - .string "If holding that {STR_VAR_1} is\n" - .string "the best, I'll do as you suggest!\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me.\p" - .string "See you again, my smart friend!$" - -gText_082BC373:: @ 82BC373 - .string "Haven't I heard about that\n" - .string "{STR_VAR_1} before?\l" - .string "I'm certain I have, that's for sure!\p" - .string "I need a new something!\n" - .string "Or, my {STR_VAR_2} needs nothing?\l" - .string "Doesn't need to hold anything?$" - -gText_082BC40E:: @ 82BC40E - .string "Gwah! Ouch! {PLAYER}{KUN}, my arm's broken!\n" - .string "Don't touch it, please!\p" - .string "I must've broken it while I was trying\n" - .string "out different hold items with my posse\l" - .string "of POKéMON.\p" - .string "So, things being this way,\n" - .string "I need you to decide for me.\p" - .string "{PLAYER}{KUN}, what do you think would be\n" - .string "good for my {STR_VAR_1} to hold?$" - -gText_082BC514:: @ 82BC514 - .string "Ouch…\p" - .string "So your suggestion is my {STR_VAR_1}\n" - .string "doesn't have to hold anything?$" - -gText_082BC555:: @ 82BC555 - .string "Hm, all right. That would be easier\n" - .string "for me, the way things are now.\p" - .string "I hope I can keep hitting you up\n" - .string "for help like this.$" - -gText_082BC5CE:: @ 82BC5CE - .string "Hm, all right. That's one {STR_VAR_1}.\n" - .string "My POKéMON's arm is fine, so I'll make\l" - .string "it hold that item right away.\p" - .string "I hope I can keep hitting you up\n" - .string "for help like this.$" - -gText_082BC666:: @ 82BC666 - .string "No, no, you told me about that\n" - .string "{STR_VAR_1} before, remember?\p" - .string "How about telling me something\n" - .string "even better?\p" - .string "Oh, wait a second.\n" - .string "So your suggestion is my {STR_VAR_2}\l" - .string "doesn't have to hold anything?$" - -gText_082BC714:: @ 82BC714 - .string "Er… Um…\n" - .string "{PLAYER}{KUN}…\p" - .string "Please, don't look at me that way.\n" - .string "My POKéMON don't have anything.\p" - .string "I… I'm really embarrassed about this,\n" - .string "but I really need your advice.\p" - .string "I can't decide what hold item would\n" - .string "make my {STR_VAR_1} strong.\p" - .string "{PLAYER}{KUN}, what do you think would\n" - .string "be good?$" - -gText_082BC808:: @ 82BC808 - .string "Oh… Then, you think it would be better\n" - .string "if my {STR_VAR_1} didn't have an item?$" - -gText_082BC84D:: @ 82BC84D - .string "Oh… Okay!\n" - .string "I'll go without an item.\p" - .string "This is nerve-racking, though.\n" - .string "Wouldn't it be too cool?\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "If we meet again, I hope you will be\l" - .string "as helpful.$" - -gText_082BC8EA:: @ 82BC8EA - .string "Oh… Okay!\n" - .string "I'll go with that {STR_VAR_1}.\p" - .string "This is nerve-racking, though.\n" - .string "Wouldn't it be too cool?\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "If we meet again, I hope you will be\l" - .string "as helpful.$" - -gText_082BC984:: @ 82BC984 - .string "B-but I already heard about that.\p" - .string "Please don't brush me off like this!\n" - .string "I can't live with the humiliation.\p" - .string "Oh… Am I jumping to conclusions?\n" - .string "Do you think it would be better if\l" - .string "my {STR_VAR_2} didn't have an item?$" - -gText_082BCA4D:: @ 82BCA4D - .string "Hm? You appear to be {PLAYER}{KUN}…\n" - .string "But are you really?\l" - .string "Perhaps you're a twin?\p" - .string "Oh, no, no, no, don't worry!\n" - .string "If you really are {PLAYER}, please\l" - .string "forget about my rudeness.\p" - .string "What I would like is some more of\n" - .string "your fine advice.\p" - .string "I have here my {STR_VAR_1} that I wish\n" - .string "to make hold a convenient item.\p" - .string "What would be worthy of it?$" - -gText_082BCB75:: @ 82BCB75 - .string "It's better if it held nothing?\n" - .string "Are you certain?$" - -gText_082BCBA6:: @ 82BCBA6 - .string "I see. If that's the case, that's fine.\n" - .string "I thank you for your time.\p" - .string "Let us meet again!$" - -gText_082BCBFC:: @ 82BCBFC - .string "One {STR_VAR_1}?\n" - .string "Are you certain?\p" - .string "I see. If that's the case, that's fine.\n" - .string "I thank you for your time.\p" - .string "I do hope my POKéMON will be able to\n" - .string "put it to good use.\p" - .string "Let us meet again!$" - -gText_082BCCA4:: @ 82BCCA4 - .string "No, no, wait a minute.\n" - .string "I believe you taught me that before.\p" - .string "I would like you to recommend\n" - .string "something different this time.\p" - .string "Perhaps you're suggesting that\n" - .string "my {STR_VAR_2} should hold nothing?\l" - .string "Are you certain?$" - -gText_082BCD68:: @ 82BCD68 - .string "Waah, {PLAYER}!\n" - .string "I have a dilemma, sob…\p" - .string "I want to begin battling other people,\n" - .string "but I don't know what to do.\p" - .string "How should I line up my POKéMON\n" - .string "so they'll be at their strongest?\p" - .string "Please tell me, {PLAYER}.\n" - .string "If you were me, which of these POKéMON\l" - .string "would you send out first?$" - -gText_082BCE64:: @ 82BCE64 - .string "My {STR_VAR_1} should go first?\n" - .string "Waaaaah!\p" - .string "Oh! I'm so sorry!\n" - .string "You've made me happy by choosing\l" - .string "my first POKéMON, and it's made me cry…\p" - .string "Thank you so much!$" - -gText_082BCEF2:: @ 82BCEF2 - .string "Yay! It's {PLAYER}!\n" - .string "Great! I wanted to ask you something!\p" - .string "Um, of my POKéMON, which do you\n" - .string "think should go out first?$" - -gText_082BCF61:: @ 82BCF61 - .string "My {STR_VAR_1}? That's true.\n" - .string "Okay, I'll do that!\p" - .string "Thanks for teaching me!$" - -gText_082BCFA1:: @ 82BCFA1 - .string "{PLAYER}, hello!\p" - .string "I think, in a battle, it's very important\n" - .string "which POKéMON comes out first.\p" - .string "Out of the POKéMON that I have,\n" - .string "which would be good to send out first?$" - -gText_082BD03C:: @ 82BD03C - .string "My {STR_VAR_1} goes first?\n" - .string "Okay, I got it!\p" - .string "See you again!$" - -gText_082BD06D:: @ 82BD06D - .string "Hello, {PLAYER}…\n" - .string "I'm sorry to disturb you again with\l" - .string "another question.\p" - .string "I have so little confidence, I don't\n" - .string "know what I'd do without you, {PLAYER}.\p" - .string "It may be a waste of time for me to\n" - .string "even worry about it, but I just can't\l" - .string "decide something…\p" - .string "Which of my POKéMON should I send\n" - .string "out first in a battle?$" - -gText_082BD18A:: @ 82BD18A - .string "My {STR_VAR_1}?\n" - .string "Understood!\p" - .string "I can't believe that you would bother\n" - .string "to answer my questions so often!\p" - .string "I'm so grateful that you would even\n" - .string "speak with me… Thank you!$" - -gText_082BD222:: @ 82BD222 - .string "Oh, {PLAYER}{KUN}! It's me!\n" - .string "I'm so glad to see you because I have\l" - .string "this little problem.\p" - .string "I can't decide how my POKéMON should\n" - .string "be lined up. Could you decide for me?\p" - .string "Oh, you don't need to decide the whole\n" - .string "party right now.\p" - .string "How about deciding just the first\n" - .string "POKéMON for me?$" - -gText_082BD325:: @ 82BD325 - .string "My {STR_VAR_1}? That's great!\p" - .string "Knowing that you made the decision,\n" - .string "{PLAYER}{KUN}, I won't be so upset if\l" - .string "I lose.\p" - .string "Okay, I'll look to you for advice again.\n" - .string "Bye!$" - -gText_082BD3B1:: @ 82BD3B1 - .string "Hi, my teacher {PLAYER}{KUN}!\n" - .string "I'm busy again today!\p" - .string "I have to do some cycling, shopping,\n" - .string "and humming.\p" - .string "I haven't even had the time to decide\n" - .string "how to line up my POKéMON team.\p" - .string "So, how about checking out my team?\n" - .string "Which one should go first?$" - -gText_082BD493:: @ 82BD493 - .string "Okay, gotcha.\n" - .string "I have enough time at least to put\l" - .string "my {STR_VAR_1} at the head of the line!\p" - .string "Whoops, my girlfriend's waiting!\n" - .string "Thanks! See you around!$" - -gText_082BD51C:: @ 82BD51C - .string "Yoohoo! Hiya, {PLAYER}!\n" - .string "You always walk around looking tough!\p" - .string "Listen, I need something from you\n" - .string "again! It's the usual thing!\p" - .string "Drum roll, please!\n" - .string "The question I have is about my team.\p" - .string "Which POKéMON of mine should be first\n" - .string "to go out in a battle?$" - -gText_082BD609:: @ 82BD609 - .string "Hmhm!\n" - .string "My {STR_VAR_1}, you say!\l" - .string "Thanks for a most cool answer!\p" - .string "I guess that's about all I wanted\n" - .string "to ask you today.\p" - .string "Let's meet here again, okay?\n" - .string "Thanks!$" - -gText_082BD697:: @ 82BD697 - .string "Thank you so much for stopping to\n" - .string "chat with me, {PLAYER}.\p" - .string "I know I'm taking advantage of your\n" - .string "kindness, but may I ask for advice?\p" - .string "I would like you to decide on the order\n" - .string "of my POKéMON team.\p" - .string "It would please me if you could decide\n" - .string "which POKéMON should come first.$" - -gText_082BD797:: @ 82BD797 - .string "My {STR_VAR_1} it is!\n" - .string "I will put it first right away!\p" - .string "Thank you, {PLAYER}.\n" - .string "I hope I can count on you again.\l" - .string "Please take care!$" - -gText_082BD806:: @ 82BD806 - .string "Eek! {PLAYER}!\n" - .string "I… I'm overjoyed to see you again!\p" - .string "My POKéMON have become much\n" - .string "stronger!\p" - .string "But I don't always win. It seems to\n" - .string "depend on which POKéMON goes first.\p" - .string "{PLAYER}, please, I need your help!\p" - .string "Please decide which of my POKéMON\n" - .string "should go out first!$" - -gText_082BD8F5:: @ 82BD8F5 - .string "Sigh… I'm overwhelmed with happiness…\p" - .string "It's like a dream having you decide\n" - .string "for me, {PLAYER}.\p" - .string "But perfectly understood!\n" - .string "I will go with my {STR_VAR_1} first!\p" - .string "I hope you'll be willing to teach me\n" - .string "some more another time.$" - -gText_082BD9BE:: @ 82BD9BE - .string "Hello, hello!\n" - .string "My mentor, {PLAYER}{KUN}!\l" - .string "Hit me with your sage advice today!\p" - .string "You see, I pulled together a team of\n" - .string "three POKéMON. So far so good.\p" - .string "But the team's battling order's not\n" - .string "settled yet.\p" - .string "This is where you come in, {PLAYER}{KUN}!\n" - .string "You decide which POKéMON leads off!\p" - .string "Don't be shy now.\n" - .string "Let's blurt it out!$" - -gText_082BDAE1:: @ 82BDAE1 - .string "Uh-huh, my {STR_VAR_1} leads off!\n" - .string "OK, A-OK!\l" - .string "I'll reorder the lineup, like, wham!\p" - .string "All right, thanks, as always!\n" - .string "Adios!$" - -gText_082BDB4E:: @ 82BDB4E - .string "{PLAYER}{KUN}, listen!\n" - .string "It's a crisis!\p" - .string "My POKéMON, all three of them, go into\n" - .string "battle at once!\p" - .string "Of course that's impossible!\n" - .string "Wahahaha!\p" - .string "This is no lie, though.\n" - .string "I'm not very good at thinking about\l" - .string "how I should line up my POKéMON.\p" - .string "So, how about deciding for me which\n" - .string "POKéMON should go first, master?$" - -gText_082BDC6B:: @ 82BDC6B - .string "Okay, so it's my {STR_VAR_1} you chose?\n" - .string "I'll let any but that one go first!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks, master!\n" - .string "I hope you'll keep teaching me!$" - -gText_082BDD0D:: @ 82BDD0D - .string "A-H-O-Y!\n" - .string "And that spells ahoy!\p" - .string "The rappin' SAILOR am I!\n" - .string "I present to you a question\l" - .string "that's pretty fly!\p" - .string "It's a team lineup question\n" - .string "that begs your suggestion!\p" - .string "Out of this lot, which should go first\n" - .string "as the first on the spot?$" - -gText_082BDDEC:: @ 82BDDEC - .string "Okay, I hear you, sure I do!\n" - .string "I'll switch them up, that I'll do!\p" - .string "If it's advice I ever need,\n" - .string "{PLAYER}, your word I'll always heed!$" - -gText_082BDE68:: @ 82BDE68 - .string "Yahoo, {PLAYER}!\n" - .string "How do you do?\p" - .string "What should I do? Go ahead and ask?\n" - .string "Uh-huh, I have something to ask!\l" - .string "Are you receiving me?\l" - .string "You are receiving me!\p" - .string "You have to decide, which of my\n" - .string "POKéMON is the first to ride!\l" - .string "Into battle, I mean to say.$" - -gText_082BDF4D:: @ 82BDF4D - .string "My {STR_VAR_1}? Yes!\n" - .string "That'll do, there's no distress!\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me.\p" - .string "See you again, my smart friend!$" - -gText_082BDFD8:: @ 82BDFD8 - .string "…Oof…ooch… {PLAYER}{KUN}…\n" - .string "My stomach's hurting all of a sudden…\p" - .string "…It's getting better now…\p" - .string "I must've worried myself sick racking\n" - .string "my brains on how I should line up\l" - .string "my posse of POKéMON.\p" - .string "So, things being this way,\n" - .string "I need you to decide for me.\p" - .string "{PLAYER}{KUN}, which of my POKéMON should\n" - .string "go first? So I'd win, I mean.$" - -gText_082BE0FD:: @ 82BE0FD - .string "Hm, all right.\n" - .string "My {STR_VAR_1} goes first.\p" - .string "I'll fix the lineup like that after\n" - .string "I have my supper.\p" - .string "I hope I can keep hitting you up\n" - .string "for help like this.$" - -gText_082BE189:: @ 82BE189 - .string "Er… Um…\n" - .string "{PLAYER}{KUN}?\p" - .string "Please, don't look at me that way.\n" - .string "You're making me feel all flustered.\p" - .string "Um…\n" - .string "I really need your advice.\p" - .string "It makes me bashful to say this,\n" - .string "but I chose my 3-POKéMON team.\l" - .string "I can't decide on the order, though.\p" - .string "Which POKéMON should I send out first\n" - .string "so I at least look capable?$" - -gText_082BE2A5:: @ 82BE2A5 - .string "Oh… Okay!\n" - .string "I'll lead with my {STR_VAR_1}.\p" - .string "I hope I can do my best without\n" - .string "getting all flustered.\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "If we meet again, I hope you will be\l" - .string "as helpful.$" - -gText_082BE33E:: @ 82BE33E - .string "Hm? You appear to be {PLAYER}{KUN}…\n" - .string "But are you really?\l" - .string "Perhaps you're a clever look-alike?\p" - .string "Oh, no, no, no, don't worry!\n" - .string "If you really are {PLAYER}, please\l" - .string "forget about my rudeness.\p" - .string "What I would like is your fine advice.\p" - .string "I have here my POKéMON team.\n" - .string "I would like you to tell me which one\l" - .string "should go first in a battle.$" - -gText_082BE46C:: @ 82BE46C - .string "My {STR_VAR_1}…\n" - .string "You aren't pulling my leg?\p" - .string "I see. If that's the case, that's fine.\n" - .string "I thank you for your time.\p" - .string "I am as you see, but I shall do\n" - .string "my best.\p" - .string "Let us meet again!$" - -gText_082BE50D:: @ 82BE50D - .string "Snivel…\n" - .string "Oh, {PLAYER}!\p" - .string "What perfect timing!\n" - .string "There's something I just can't decide…\p" - .string "I can't decide which POKéMON I should\n" - .string "be using.\p" - .string "I can't decide between the POKéMON\n" - .string "{STR_VAR_1} and {STR_VAR_2}…\p" - .string "{PLAYER}, which do you think will give\n" - .string "even me a chance at winning?$" - -gText_082BE5F5:: @ 82BE5F5 - .string "Snivel… I… I understand!\n" - .string "Oh! I'm so sorry!\l" - .string "You've made me so happy, I'm crying…\p" - .string "I'll do my best to catch one\n" - .string "{STR_VAR_1}!\p" - .string "Thank you so much!$" - -gText_082BE679:: @ 82BE679 - .string "Yay! It's {PLAYER}!\n" - .string "Yay, you came at the right time, too!\l" - .string "I need your advice again!\p" - .string "Um, I'm all mixed up--should I use\n" - .string "my {STR_VAR_1} or {STR_VAR_2}…\p" - .string "Which do you think I should raise,\n" - .string "{PLAYER}?$" - -gText_082BE71E:: @ 82BE71E - .string "Oh, so my {STR_VAR_1} is better!\n" - .string "Okay, I'll do that!\p" - .string "Thanks for teaching me!$" - -gText_082BE762:: @ 82BE762 - .string "{PLAYER}, hello!\n" - .string "I have a question I wanted to ask.\p" - .string "I'm in a dilemma over whether I should\n" - .string "raise one {STR_VAR_1} or {STR_VAR_2}.\p" - .string "Which POKéMON do you think will\n" - .string "be stronger?$" - -gText_082BE7F8:: @ 82BE7F8 - .string "{STR_VAR_1} is your choice?\n" - .string "Okay, I got it!\p" - .string "I'll go catch a strong {STR_VAR_1}\n" - .string "right away!\p" - .string "See you again!$" - -gText_082BE850:: @ 82BE850 - .string "Hello, {PLAYER}…\p" - .string "Um, you've probably already forgotten\n" - .string "about someone like me…\p" - .string "…But that doesn't matter if you\n" - .string "could give me advice…\p" - .string "I can't decide on the one kind of\n" - .string "POKéMON I should raise…\p" - .string "I've narrowed the field to the POKéMON\n" - .string "{STR_VAR_1} and {STR_VAR_2}, but that's\l" - .string "where I became stuck…\p" - .string "{PLAYER}, you probably don't want to\n" - .string "bother, but please decide for me.$" - -gText_082BE99C:: @ 82BE99C - .string "But will a wild {STR_VAR_1} even pay\n" - .string "attention to me?\p" - .string "I will try!\p" - .string "But will I even be able to catch one…\n" - .string "No! I'll do my best!\p" - .string "Thank you!$" - -gText_082BEA1B:: @ 82BEA1B - .string "Oh, {PLAYER}{KUN}! I'm so glad to see you!\n" - .string "I was about to go looking for you!\p" - .string "Can you decide what kind of POKéMON\n" - .string "I should use?\p" - .string "For instance…\n" - .string "How about the POKéMON {STR_VAR_1}\l" - .string "and {STR_VAR_2}?\p" - .string "Which one do you think would be\n" - .string "better?$" - -gText_082BEAE9:: @ 82BEAE9 - .string "{STR_VAR_1}? That's great!\p" - .string "Knowing that you made the decision,\n" - .string "{PLAYER}{KUN}, I won't be so upset if\l" - .string "I lose.\p" - .string "Okay, I'll look to you for advice again.\n" - .string "Bye!$" - -gText_082BEB72:: @ 82BEB72 - .string "If it isn't {PLAYER}{KUN}! How's it going?\n" - .string "I'm busy again as always!\p" - .string "I want to do good with POKéMON, too,\n" - .string "but I haven't been able to decide\l" - .string "which POKéMON I should use.\p" - .string "You know how {STR_VAR_1} look strong?\n" - .string "But {STR_VAR_2} are tough to ignore.\p" - .string "{PLAYER}{KUN}, give me some of your good\n" - .string "advice! Which one'd be good for me?$" - -gText_082BEC8E:: @ 82BEC8E - .string "Okay, gotcha.\n" - .string "I'll find time somehow and catch me\l" - .string "that {STR_VAR_1} you recommended.\p" - .string "I'm glad I met a good mentor in you.\n" - .string "Thanks! See you around!$" - -gText_082BED16:: @ 82BED16 - .string "Oh!\n" - .string "Yay, it's {PLAYER}!\p" - .string "I didn't waste any time boasting to\n" - .string "my friends about meeting you!\p" - .string "I need to tap your mind again today.\n" - .string "It's an easy one for you!\p" - .string "Drum roll, please!\n" - .string "The question I have is…\p" - .string "If I were to raise a POKéMON,\n" - .string "and the choices were one {STR_VAR_1}\l" - .string "or {STR_VAR_2}, which should it be?$" - -gText_082BEE29:: @ 82BEE29 - .string "Ahhh!\n" - .string "{STR_VAR_1}, you say!\l" - .string "Thanks for a most cool answer!\p" - .string "I guess that's about all I wanted\n" - .string "to ask you today.\p" - .string "Let's meet here again, okay?\n" - .string "Thanks!$" - -gText_082BEEB4:: @ 82BEEB4 - .string "Oh, is it you, {PLAYER}?\n" - .string "I'm delighted to see you again!\p" - .string "Ever since I became your apprentice,\n" - .string "my confidence has been blooming.\p" - .string "I think I'm ready to raise a POKéMON\n" - .string "of my own!\p" - .string "{PLAYER}, may I impose on you to choose\n" - .string "which POKéMON I should raise?\p" - .string "The choices are the POKéMON\n" - .string "{STR_VAR_1} or {STR_VAR_2}…\l" - .string "Which POKéMON is right for me?$" - -gText_082BEFE2:: @ 82BEFE2 - .string "One {STR_VAR_1} it is!\n" - .string "I will find one right away!\p" - .string "Thank you, {PLAYER}.\n" - .string "I hope I can count on you again.\l" - .string "Please take care!$" - -gText_082BF04E:: @ 82BF04E - .string "Eek! {PLAYER}! I met you again!\n" - .string "I… I'm overjoyed!\p" - .string "Oh-oh-oh, I know!\n" - .string "I shouldn't pass up this opportunity!\p" - .string "May I ask a huge favor, {PLAYER}?\n" - .string "Please choose a POKéMON for me!\p" - .string "Please decide which would be better,\n" - .string "{STR_VAR_1} or {STR_VAR_2}!$" - -gText_082BF11D:: @ 82BF11D - .string "Wow! You decided for me!\n" - .string "One {STR_VAR_1} is what I'll raise to\l" - .string "the best of my ability.\p" - .string "I hope you'll be willing to teach me\n" - .string "some more another time.$" - -gText_082BF1A8:: @ 82BF1A8 - .string "Hey, hey!\n" - .string "My mentor, {PLAYER}{KUN}!\p" - .string "Hello, I've been looking for you\n" - .string "for some more of your sage advice!\p" - .string "Which kind of POKéMON would be right\n" - .string "for me, one {STR_VAR_1} or {STR_VAR_2}?\p" - .string "Don't be shy now.\n" - .string "Let's blurt it out!$" - -gText_082BF268:: @ 82BF268 - .string "Uh-huh, one {STR_VAR_1} it is!\n" - .string "OK, A-OK!\l" - .string "I'll get one in a BALL, like, cram!\p" - .string "All right, thanks, as always!\n" - .string "Adios!$" - -gText_082BF2D1:: @ 82BF2D1 - .string "{PLAYER}{KUN}, listen! Big news!\n" - .string "I caught a mirage POKéMON!\p" - .string "Of course I'm lying!\n" - .string "Wahahaha!\p" - .string "This is no lie, though.\n" - .string "I'm not very good at catching\l" - .string "POKéMON.\p" - .string "So, how about deciding for me which\n" - .string "kind of POKéMON I should catch,\l" - .string "master?\p" - .string "Which would be better?\n" - .string "{STR_VAR_1} or {STR_VAR_2}?$" - -gText_082BF3CF:: @ 82BF3CF - .string "Okay, so it's {STR_VAR_1} you chose?\n" - .string "I'll grab the other kind, then!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks, master!\n" - .string "I hope you'll keep teaching me!$" - -gText_082BF46A:: @ 82BF46A - .string "A-H-O-Y!\n" - .string "And that spells ahoy!\p" - .string "The rappin' SAILOR am I!\n" - .string "Surely you remember who am I?\p" - .string "Today, I have a POKéMON question\n" - .string "that begs your suggestion!\p" - .string "I have the choice between this\n" - .string "{STR_VAR_1} and {STR_VAR_2}, you see.\l" - .string "Which is the one to catch for me?$" - -gText_082BF551:: @ 82BF551 - .string "{STR_VAR_1}, you say, hey, hey!\n" - .string "I'll go get me one right away!\p" - .string "If it's advice I ever need,\n" - .string "{PLAYER}, your word I'll always heed!$" - -gText_082BF5C3:: @ 82BF5C3 - .string "Oh, wow, if it isn't {PLAYER}!\p" - .string "What should I do? Get your advice?\n" - .string "Why not? I'm already talking to you!\p" - .string "It's been a long time. Let me break\n" - .string "the ice. I'm also looking for advice!\l" - .string "Are you receiving me?\l" - .string "You are receiving me!\p" - .string "My POKéMON--which should I use?\n" - .string "It's either {STR_VAR_1} or {STR_VAR_2}.\l" - .string "Which do you choose?$" - -gText_082BF6E5:: @ 82BF6E5 - .string "If that {STR_VAR_1} is the best,\n" - .string "I'll do as you suggest!\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me.\p" - .string "See you again, my smart friend!$" - -gText_082BF773:: @ 82BF773 - .string "Oh, hi, {PLAYER}{KUN}…\n" - .string "I have this horrible headache…\p" - .string "I must've worried too much about\n" - .string "the kind of POKéMON I should raise.\p" - .string "So, things being this way,\n" - .string "I need you to decide for me.\p" - .string "{PLAYER}{KUN}, if I had to choose between\n" - .string "the POKéMON {STR_VAR_1} and\l" - .string "{STR_VAR_2}, which should it be?$" - -gText_082BF869:: @ 82BF869 - .string "Hm, one {STR_VAR_1}, all right.\n" - .string "I'll go look for one when I get better.\p" - .string "I hope I can keep hitting you up\n" - .string "for help like this.$" - -gText_082BF8DD:: @ 82BF8DD - .string "Er… Um…\n" - .string "{PLAYER}{KUN}…?\p" - .string "Please, don't look at me that way.\n" - .string "I'm getting all flustered…\l" - .string "I… I need your advice.\p" - .string "I… I'm really embarrassed, but I can't\n" - .string "decide which POKéMON to use.\p" - .string "If the choices were {STR_VAR_1} or\n" - .string "{STR_VAR_2}, which would be better?$" - -gText_082BF9BA:: @ 82BF9BA - .string "Oh… Okay!\n" - .string "I'll do my best with one {STR_VAR_1}.\p" - .string "I hope I can do my best without\n" - .string "getting all flustered.\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "If we meet again, I hope you will be\l" - .string "as helpful.$" - -gText_082BFA5A:: @ 82BFA5A - .string "Hm? You appear to be {PLAYER}{KUN}…\n" - .string "But are you really real?\p" - .string "No, no, if you are real, it's fine.\n" - .string "Incidentally, I would like to obtain\l" - .string "your advice.\p" - .string "It's about the POKéMON I am to use.\p" - .string "If the choices are the POKéMON\n" - .string "{STR_VAR_1} and {STR_VAR_2}, which is\l" - .string "more worthy of me?$" - -gText_082BFB4E:: @ 82BFB4E - .string "{STR_VAR_1}?\n" - .string "Are you certain?\p" - .string "I see. If that's the case, that's fine.\n" - .string "I thank you for your time.\p" - .string "I do hope it is something even I can\n" - .string "handle with aplomb.\p" - .string "Let us meet again!$" - -gText_082BFBF2:: @ 82BFBF2 - .string "Waaah! Oh, {PLAYER}!\n" - .string "Snivel… Hiccup…\p" - .string "I have a dilemma!\n" - .string "I can't decide on a move for\l" - .string "my {STR_VAR_1}…\p" - .string "Please, please, {PLAYER}.\n" - .string "Can you decide for me?\p" - .string "For my {STR_VAR_1}, which move would\n" - .string "be the better choice: {STR_VAR_2}\l" - .string "or {STR_VAR_3}?$" - -gText_082BFCAE:: @ 82BFCAE - .string "{STR_VAR_1}?\n" - .string "Waaaaah!\p" - .string "Oh! I'm so sorry, {PLAYER}!\n" - .string "You've made me so happy by deciding\l" - .string "the move, I'm crying…\p" - .string "Snivel…\n" - .string "Thank you so much!$" - -gText_082BFD26:: @ 82BFD26 - .string "Yay! Hi, {PLAYER}!\n" - .string "I need your advice again!\p" - .string "I want to teach my {STR_VAR_1}\n" - .string "a cool move.\p" - .string "I like either of the moves\n" - .string "{STR_VAR_2} or {STR_VAR_3}.\l" - .string "What's your recommendation?$" - -gText_082BFDB1:: @ 82BFDB1 - .string "{STR_VAR_1} is better? I guess so!\n" - .string "Okay, I'll go with that!\p" - .string "If we meet here again, please teach\n" - .string "me something else, teacher!$" - -gText_082BFE24:: @ 82BFE24 - .string "{PLAYER}, hello!\n" - .string "It's about my {STR_VAR_1}, but I'm\l" - .string "worried about its moves.\p" - .string "You see, it's the moves {STR_VAR_2}\n" - .string "and {STR_VAR_3}.\p" - .string "Which is stronger and better for\n" - .string "my {STR_VAR_1}?$" - -gText_082BFEAD:: @ 82BFEAD - .string "{STR_VAR_1} is your choice?\n" - .string "Okay, I got it!\p" - .string "I'll go teach {STR_VAR_1} to\n" - .string "my POKéMON right away!\p" - .string "See you again!$" - -gText_082BFF0A:: @ 82BFF0A - .string "Ohhh, {PLAYER}…\n" - .string "I'm hopeless, no, really!\p" - .string "I've decided to raise a POKéMON,\n" - .string "but now I can't even decide what\l" - .string "move I should let it learn…\p" - .string "I know that it doesn't mean anything\n" - .string "to you, {PLAYER}.\p" - .string "But it means a lot to me…\p" - .string "Please, {PLAYER}, could you choose\n" - .string "a move for my {STR_VAR_1}?\p" - .string "If you could even choose between\n" - .string "{STR_VAR_2} and {STR_VAR_3}…$" - -gText_082C0032:: @ 82C0032 - .string "I understand!\p" - .string "But will it even be willing to learn\n" - .string "{STR_VAR_1} for me…\l" - .string "No! I'll do my best!\p" - .string "Thank you!$" - -gText_082C0090:: @ 82C0090 - .string "Oh, {PLAYER}{KUN}!\n" - .string "I was just hoping to see you, too!\p" - .string "I was wondering what move would\n" - .string "be suitable for my {STR_VAR_1}.\p" - .string "I can't decide, so can you decide\n" - .string "for me instead?\p" - .string "For instance… How about the moves\n" - .string "{STR_VAR_2} and {STR_VAR_3}?\l" - .string "Which one would be better?$" - -gText_082C016E:: @ 82C016E - .string "{STR_VAR_1}? That's great!\p" - .string "Knowing that you made the decision,\n" - .string "{PLAYER}{KUN}, I won't be so upset if\l" - .string "I lose.\p" - .string "Okay, I'll look to you for advice again.\n" - .string "Bye!$" - -gText_082C01F7:: @ 82C01F7 - .string "How could things be this busy?\n" - .string "Hey, if it isn't {PLAYER}{KUN}!\l" - .string "How's it going?\p" - .string "Since I got up this morning, I've done\n" - .string "my jogging, swimming, and cooking!\p" - .string "You wouldn't believe how busy I am!\p" - .string "I can't even decide what move\n" - .string "my {STR_VAR_1} should learn!\p" - .string "{STR_VAR_2} looks good, huh?\n" - .string "But {STR_VAR_3}'s also decent.\p" - .string "{PLAYER}{KUN}, give me some of your good\n" - .string "advice! Which move'd be good for me?$" - -gText_082C034C:: @ 82C034C - .string "Okay, gotcha.\n" - .string "I'll make room in my schedule and\l" - .string "teach that move.\p" - .string "I'm glad I met a good mentor in you.\n" - .string "Thanks! See you around!$" - -gText_082C03CA:: @ 82C03CA - .string "Oh! Lucky!\n" - .string "I met you again, {PLAYER}!\l" - .string "I need to tap your mind again today.\p" - .string "Drum roll, please!\n" - .string "The question I have is…\p" - .string "For my {STR_VAR_1}, which is the move\n" - .string "best suited, {STR_VAR_2} or\l" - .string "{STR_VAR_3}?$" - -gText_082C046E:: @ 82C046E - .string "Ahhh!\n" - .string "{STR_VAR_1}, you say!\l" - .string "Thanks for a most cool answer!\p" - .string "I guess that's about all I wanted\n" - .string "to ask you today.\p" - .string "Let's meet here again, okay?\n" - .string "Thanks!$" - -gText_082C04F9:: @ 82C04F9 - .string "Oh, hello, {PLAYER}.\n" - .string "I trust you've been well?\p" - .string "I have to seek your advice again.\n" - .string "It's about my dearest {STR_VAR_1}.\p" - .string "What would be the ideal move for\n" - .string "my lovable {STR_VAR_1}?\l" - .string "{STR_VAR_2} or {STR_VAR_3}?$" - -gText_082C0598:: @ 82C0598 - .string "{STR_VAR_1} it is!\n" - .string "I will teach that right away!\p" - .string "Thank you, {PLAYER}.\n" - .string "I hope I can count on you again.\l" - .string "Please take care!$" - -gText_082C0602:: @ 82C0602 - .string "Eek! {PLAYER}! I met you again!\n" - .string "I… I'm overjoyed!\p" - .string "Whenever I'm in need, you're always\n" - .string "there for me, {PLAYER}!\p" - .string "Today, I want you to recommend\n" - .string "a move for me!\p" - .string "Please choose a move for\n" - .string "my {STR_VAR_1}!\p" - .string "Which move would be better,\n" - .string "{STR_VAR_2} or {STR_VAR_3}?$" - -gText_082C06D8:: @ 82C06D8 - .string "Oh-oh-oh! Thank you!\n" - .string "{STR_VAR_1} is it!\l" - .string "Perfectly understood!\p" - .string "I hope you'll be willing to teach me\n" - .string "some more another time.$" - -gText_082C074A:: @ 82C074A - .string "Hola, {PLAYER}{KUN}, bueno!\n" - .string "I'm hoping for some more of\l" - .string "your sage advice today!\p" - .string "What would be the best move for\n" - .string "my {STR_VAR_1}?\p" - .string "It should be something that'll\n" - .string "let me win just like that!\p" - .string "Would it be {STR_VAR_2}?\n" - .string "Or {STR_VAR_3}?$" - -gText_082C0809:: @ 82C0809 - .string "Uh-huh, {STR_VAR_1} it is!\n" - .string "Si, bueno!\l" - .string "I'll get it taught, like, ka-blam!\p" - .string "All right, thanks, as always!\n" - .string "Adios!$" - -gText_082C086E:: @ 82C086E - .string "{PLAYER}{KUN}, it's completely wild!\p" - .string "My POKéMON!\n" - .string "It learned six moves!\p" - .string "Of course I'm lying!\n" - .string "Wahahaha!\p" - .string "This is no lie, though.\n" - .string "I'm not very good at choosing moves\l" - .string "for my POKéMON.\p" - .string "So, how about deciding for me which\n" - .string "kind of move I should teach?\p" - .string "{STR_VAR_2} or {STR_VAR_3}--which\n" - .string "would go with my {STR_VAR_1} best?$" - -gText_082C0982:: @ 82C0982 - .string "Okay, so it's {STR_VAR_1} you chose?\n" - .string "I'll choose another move, then!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks, master!\n" - .string "I hope you'll keep teaching me!$" - -gText_082C0A1D:: @ 82C0A1D - .string "A-H-O-Y!\n" - .string "And that spells ahoy!\p" - .string "The rappin' SAILOR am I!\n" - .string "I'm always with it, don't ask me why.\p" - .string "Today, I have a move question\n" - .string "that begs your suggestion!\p" - .string "{STR_VAR_2} and {STR_VAR_3} are\n" - .string "the moves. What would be the best\l" - .string "for my {STR_VAR_1} so it grooves?$" - -gText_082C0AFD:: @ 82C0AFD - .string "{STR_VAR_1}, you say, hey, hey!\n" - .string "I'll go teach that right away!\p" - .string "If it's advice I ever need,\n" - .string "{PLAYER}, your word I'll always heed!$" - -gText_082C0B6F:: @ 82C0B6F - .string "Oh, yeahah, if it isn't {PLAYER}!\p" - .string "What should I do? Get your advice?\n" - .string "Why not? I'm already talking to you!\p" - .string "{PLAYER}, are you surprised by me?\n" - .string "I want your advice, can't you see?\p" - .string "Are you receiving me?\n" - .string "You are receiving me!\p" - .string "My {STR_VAR_1}--what should it use?\n" - .string "It's {STR_VAR_2} or {STR_VAR_3},\l" - .string "what do you choose?$" - -gText_082C0C7D:: @ 82C0C7D - .string "If that {STR_VAR_1} is the best,\n" - .string "I'll do as you suggest!\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me.\p" - .string "See you again, my smart friend!$" - -gText_082C0D0B:: @ 82C0D0B - .string "Gahack! Gaah! Oh, {PLAYER}{KUN}…\n" - .string "I have this lousy cold, I do…\p" - .string "I want to pick a move for my POKéMON,\n" - .string "but I'm not up to it…\p" - .string "So, things being this way,\n" - .string "I need you to decide for me.\p" - .string "{PLAYER}{KUN}, if I had to choose between\n" - .string "{STR_VAR_2} and {STR_VAR_3} for\l" - .string "my {STR_VAR_1}, which would it be?$" - -gText_082C0DFE:: @ 82C0DFE - .string "Hm, {STR_VAR_1}, all right. Cough!\n" - .string "I'll go teach it when I get better.\p" - .string "I hope I can keep hitting you up\n" - .string "for help like this.$" - -gText_082C0E71:: @ 82C0E71 - .string "Er… Um…\n" - .string "{PLAYER}{KUN}…?\p" - .string "Please, don't look at me that way.\n" - .string "I'm getting all flustered…\l" - .string "I… I need your advice.\p" - .string "I… I'm really embarrassed, but I can't\n" - .string "decide what move I should teach\l" - .string "my POKéMON.\p" - .string "It's for my {STR_VAR_1}.\n" - .string "If the choices were {STR_VAR_2} or\l" - .string "{STR_VAR_3}, which would be better?$" - -gText_082C0F6D:: @ 82C0F6D - .string "Oh… Okay!\n" - .string "I'll try that {STR_VAR_1}.\p" - .string "I hope I can teach that move…\n" - .string "This is so nerve-racking…\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "If we meet again, I hope you will be\l" - .string "as helpful.$" - -gText_082C1003:: @ 82C1003 - .string "Hm? You appear to be {PLAYER}{KUN}…\n" - .string "But are you really real?\p" - .string "Perhaps you're one of those popular\n" - .string "mimics?\p" - .string "No, no, if you are real, it's fine.\n" - .string "No need to be upset, I assure you!\p" - .string "Incidentally, I would like to obtain\n" - .string "your advice.\p" - .string "It's about my {STR_VAR_1}.\p" - .string "Which move would be better for it to\n" - .string "use, {STR_VAR_2} or {STR_VAR_3}?$" - -gText_082C1122:: @ 82C1122 - .string "{STR_VAR_1}?\n" - .string "There's no question about that?\p" - .string "I see. If that's the case, that's fine.\n" - .string "I thank you for your time.\p" - .string "I do hope it is something even\n" - .string "my POKéMON can learn.\p" - .string "Let us meet again!$" - -gText_082C11D1:: @ 82C11D1 - .string "Oh… {PLAYER}?\n" - .string "It is {PLAYER}!\l" - .string "Oh! Sniff…sob… Please, listen!\p" - .string "I… When I battle, I get so nervous,\n" - .string "I can't help crying even if I win…\p" - .string "I wish I could say something cool\n" - .string "when I win…\p" - .string "Please, please, {PLAYER}!\n" - .string "Could you maybe teach me something\l" - .string "cool to say when I win so I don't cry?$" - -gText_082C12D5:: @ 82C12D5 - .string "{STR_VAR_1}\p" - .string "Awesome! Wicked! Awoooh!\n" - .string "It's really cool!\p" - .string "Oh… I'm sorry…\n" - .string "I'm so happy, I'm crying…\p" - .string "Snivel… {PLAYER}!\n" - .string "Thank you so much for everything!\p" - .string "I will battle the best I can for\n" - .string "your sake, {PLAYER}!\p" - .string "{PLAYER}…\n" - .string "Next time… We should battle!$" - -gText_082C13AB:: @ 82C13AB - .string "Yay! It's {PLAYER}! Hello!\n" - .string "I wanted to ask you something!\p" - .string "I want to say something cool when\n" - .string "I win a match.\p" - .string "Do you have a cool saying that\n" - .string "you could recommend?$" - -gText_082C1444:: @ 82C1444 - .string "{STR_VAR_1}\p" - .string "Oh, wow! That is so cool!\n" - .string "Okay, I'll say that!\p" - .string "Thanks for teaching me all this time!\n" - .string "I'm going to do the best I can\l" - .string "wherever I go from now on!\p" - .string "When we meet again, it'll be for\n" - .string "a battle!$" - -gText_082C1501:: @ 82C1501 - .string "{PLAYER}, hello!\p" - .string "My POKéMON and I are ready for\n" - .string "anything, except for one thing.\p" - .string "I think it would be good if I had\n" - .string "something to shout when I win.\p" - .string "Could you think up something good\n" - .string "to say?$" - -gText_082C15B6:: @ 82C15B6 - .string "{STR_VAR_1}\p" - .string "…Cool!\n" - .string "I will use that!\p" - .string "I'm going out to battle all over\n" - .string "the place.\p" - .string "Who knows, I may even get to battle\n" - .string "you one day, {PLAYER}.\p" - .string "Next time, let's meet at a place\n" - .string "of battle!$" - -gText_082C165E:: @ 82C165E - .string "Hello, {PLAYER}…\n" - .string "I'm sorry to bug you, but I'm hopeless…\p" - .string "Even when…\n" - .string "Even when I win, I don't have anything\l" - .string "special to say…\p" - .string "I know that it doesn't mean anything\n" - .string "to you, {PLAYER}.\p" - .string "But it means a lot to me…\p" - .string "Please, {PLAYER}, what should I say\n" - .string "if I win a battle?$" - -gText_082C174F:: @ 82C174F - .string "{STR_VAR_1}\p" - .string "That's inspired…\p" - .string "Uh… Is it okay for someone like me\n" - .string "to even say that?\p" - .string "No! I'll do my best!\p" - .string "{PLAYER}, thank you so much for\n" - .string "putting up with me for so long…\p" - .string "I promise to do my best from now on.\p" - .string "I'm sure you'll quickly forget about\n" - .string "someone like me, but let's meet\l" - .string "somewhere again!$" - -gText_082C1862:: @ 82C1862 - .string "Oh, {PLAYER}{KUN}.\n" - .string "There's something I want you to hear.\p" - .string "I know that I don't always sound\n" - .string "nice or polite…\p" - .string "When I win a battle, I think I come\n" - .string "across as being arrogant.\p" - .string "I don't want people to dislike me,\n" - .string "so I want to say something nice to\l" - .string "someone I beat.\p" - .string "But I can't think of anything good!\n" - .string "Could you think something up for me?$" - -gText_082C19A0:: @ 82C19A0 - .string "{STR_VAR_1}\p" - .string "Not bad!\n" - .string "Yup, that's what I'll go with!\p" - .string "I'm going to hit the road and do what\n" - .string "I can with what you taught me in\l" - .string "my head and heart.\p" - .string "I'm sorry that I've been so pushy\n" - .string "with you!\p" - .string "Next time, we battle, okay?\n" - .string "See you!$" - -gText_082C1A76:: @ 82C1A76 - .string "Oh, I can't get over how busy I am!\n" - .string "Oh, hey, I was looking for you, {PLAYER}{KUN}.\p" - .string "Are you well as usual?\n" - .string "Things haven't changed for me at all.\p" - .string "I've got running, fighting, and mapping\n" - .string "to do. Why am I so busy?\p" - .string "But even though I'm busy, it'd be rude\n" - .string "to just turn on my heels and walk away\l" - .string "from a win without saying a word.\p" - .string "So, what would be a cool saying to\n" - .string "underline my coolness when I'm done\l" - .string "and walking away? {PLAYER}{KUN}, help me!$" - -gText_082C1C16:: @ 82C1C16 - .string "{STR_VAR_1}\p" - .string "Okay, gotcha.\n" - .string "I can find time to say that!\p" - .string "Honestly, I'm glad I met a good mentor\n" - .string "like you.\p" - .string "I'm going to make time somehow so\n" - .string "I can get into battling.\p" - .string "Thanks for everything, {PLAYER}{KUN}!\n" - .string "We have to battle, you and me, one day!$" - -gText_082C1CF5:: @ 82C1CF5 - .string "I lucked out again!\n" - .string "{PLAYER}! Am I glad to see you!\l" - .string "Like usual, I need your advice!\p" - .string "Drum roll, please!\n" - .string "The last question I have is…\p" - .string "If I win a battle and want to end\n" - .string "it with a cool flourish, what\l" - .string "should I say?$" - -gText_082C1DC1:: @ 82C1DC1 - .string "{STR_VAR_1}\p" - .string "That… That's fabulous!\n" - .string "It's dignified and cool! I claim it!\p" - .string "…Listen, I think I'm getting decent\n" - .string "at this, huh?\p" - .string "So, I'm thinking of challenging other\n" - .string "TRAINERS from now on.\p" - .string "{PLAYER}, your advice really helped me.\p" - .string "Maybe one day, there'll be a time when\n" - .string "we battle!\p" - .string "Thank you for everything!$" - -gText_082C1EDC:: @ 82C1EDC - .string "Oh, {PLAYER}.\n" - .string "I'm so glad I met you!\p" - .string "I no longer have any concerns with\n" - .string "regard to my POKéMON.\p" - .string "It's myself that worries me…\p" - .string "Do you know how a TRAINER says\n" - .string "a few things upon winning a battle?\p" - .string "Definitely, I wish I could do that,\n" - .string "too!\p" - .string "Please, what should I say when\n" - .string "I win a battle?$" - -gText_082C1FEC:: @ 82C1FEC - .string "{STR_VAR_1}\p" - .string "Ah! That saying! It refreshes me\n" - .string "and makes me feel reborn!\p" - .string "I must use that right away!\p" - .string "And now, I must take my leave,\n" - .string "{PLAYER}…\p" - .string "I will go out to battle many others,\n" - .string "but never will I forget your teachings.\p" - .string "Perhaps one day…\n" - .string "Farewell!$" - -gText_082C20D1:: @ 82C20D1 - .string "Eek! I spotted {PLAYER}!\n" - .string "I… I'm overjoyed to see you!\p" - .string "Oh-oh-oh! There's something I just\n" - .string "had to ask you!\p" - .string "A little while ago, I won a battle.\n" - .string "That part was giddying!\p" - .string "But it made me so overjoyed that\n" - .string "I choked up and couldn't say a thing!\p" - .string "So now, {PLAYER}, please, I want you to\n" - .string "think up an exit line for when I win!$" - -gText_082C21FF:: @ 82C21FF - .string "{STR_VAR_1}\p" - .string "Waaaaah!\n" - .string "I'm going to say that?!\l" - .string "I… I'm delirious with joy!\p" - .string "Th-th-thank you!\n" - .string "I have nothing left to regret now!\p" - .string "I'm going to travel now and battle\n" - .string "all sorts of people.\p" - .string "Everything, I owe it to you, {PLAYER}.\n" - .string "Really, really, thank you!\p" - .string "I've got to go now, but let's meet\n" - .string "in battle one day!$" - -gText_082C231C:: @ 82C231C - .string "Hola, bueno!\n" - .string "{PLAYER}{KUN}!\p" - .string "You know, I'm getting the itch to roam\n" - .string "and battle where I may.\p" - .string "But before I do, I want your advice\n" - .string "once again, please!\p" - .string "If I were to win a battle, what would\n" - .string "be a good boast I could say to my\l" - .string "fallen TRAINER opponent?$" - -gText_082C2407:: @ 82C2407 - .string "{STR_VAR_1}\p" - .string "Uh-huh, that's sweet!\n" - .string "Si, bueno!\l" - .string "I'll try saying that, like, ham!\p" - .string "And now, it's time to say good-bye!\n" - .string "Thanks for all sorts of things!\p" - .string "Give me a battle one day, OK?\n" - .string "Adios!$" - -gText_082C24B5:: @ 82C24B5 - .string "{PLAYER}{KUN}, there's big trouble!\p" - .string "When I win a battle, I brag about it\n" - .string "for an hour at least!\p" - .string "Of course I'm lying!\n" - .string "Wahahaha!\p" - .string "This is no lie, though.\n" - .string "I'm not very good at chatting.\p" - .string "So, how about deciding for me what\n" - .string "I should say after winning a battle,\l" - .string "master?$" - -gText_082C25B1:: @ 82C25B1 - .string "{STR_VAR_1}\p" - .string "That's what I should say, huh?\n" - .string "Then, I'll stay away from that!\p" - .string "Just kidding!\n" - .string "I'll obey your teaching, master!\p" - .string "Thanks for teaching me all this time,\n" - .string "master!\p" - .string "I'm finally understanding what being\n" - .string "a TRAINER is about.\p" - .string "I'm going to go out and win battles\n" - .string "against any TRAINER.\p" - .string "Maybe it'll be you one day, master!\p" - .string "That's all!\n" - .string "Farewell, my master!$" - -gText_082C2707:: @ 82C2707 - .string "A-H-O-Y!\n" - .string "And that spells ahoy!\p" - .string "The rappin' SAILOR am I!\n" - .string "This will be my last question,\l" - .string "don't you cry!\p" - .string "It's a saying question\n" - .string "that begs your suggestion!\p" - .string "If I win a match, what can I say\n" - .string "in a real cool way?$" - -gText_082C27D4:: @ 82C27D4 - .string "{STR_VAR_1}\p" - .string "Perfect! That's what I'll use.\n" - .string "I was right to make you choose!\p" - .string "And now, I think it'd be best,\n" - .string "if I were to fly the nest!\p" - .string "Thanks for all you taught me.\n" - .string "I'll be off on a battle spree!\p" - .string "B-O-N-V-O-Y-A-G-E!\n" - .string "And that spells bon voyage,\l" - .string "to you this is my homage!$" - -gText_082C28D6:: @ 82C28D6 - .string "Oh, yeah, {PLAYER}!\n" - .string "I found you again today!\p" - .string "What should I do? Ask you again?\n" - .string "Why not? I'm already asking you!\p" - .string "Anyways, {PLAYER}…\n" - .string "Are you receiving me?\l" - .string "You are receiving me!\l" - .string "I need some more advice for me!\p" - .string "It's about what I should yell.\n" - .string "Something cool to holler when\l" - .string "a battle ends well.\p" - .string "Come on, I wanna hear you say it!$" - -gText_082C2A0B:: @ 82C2A0B - .string "{STR_VAR_1}\p" - .string "All right, all right!\n" - .string "I'll use that because it's so tight!\p" - .string "I'm out of things to ask you.\n" - .string "Waving bye is all that's left to do.\p" - .string "But maybe one day we'll meet, with one\n" - .string "destined to go down in defeat.\p" - .string "But, it really is time to say farewell.\p" - .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don't you forget about me!\p" - .string "Take care, {PLAYER}!\n" - .string "Love ya!$" - -gText_082C2B50:: @ 82C2B50 - .string "{PLAYER}{KUN}, I'm finished…\n" - .string "My nose won't stop dripping…\p" - .string "I was trying to think up something\n" - .string "cool to say when I win a battle.\p" - .string "It inspired me so much, it made me cry,\n" - .string "and now my nose won't stop running…\p" - .string "So, things being this way,\n" - .string "I need you to decide for me, {PLAYER}{KUN}.\p" - .string "When I win a battle,\n" - .string "what should I say?$" - -gText_082C2C77:: @ 82C2C77 - .string "{STR_VAR_1}\p" - .string "… … …That's good.\n" - .string "No, it's awe inspiring!\l" - .string "It's bringing fresh tears to my eyes!\p" - .string "But in spite of my tears and runny\n" - .string "nose, I will use that saying!\p" - .string "I'm plumb out of things to ask you,\n" - .string "{PLAYER}{KUN}.\p" - .string "From now on, we're rivals!\n" - .string "Thanks for everything!$" - -gText_082C2D67:: @ 82C2D67 - .string "Er… Um…\n" - .string "{PLAYER}{KUN}…\p" - .string "Please, don't look at me that way.\n" - .string "You're making me all nervous.\p" - .string "I… I need your advice again.\n" - .string "I'll make it my last, though…\p" - .string "It's really embarrassing to ask,\n" - .string "but what if I win a battle?\l" - .string "What should I say?$" - -gText_082C2E41:: @ 82C2E41 - .string "{STR_VAR_1}\p" - .string "Oh… Okay!\n" - .string "I'll try to say that!\l" - .string "I might be too nervous to say it…\p" - .string "Thank you, {PLAYER}{KUN}.\n" - .string "I have to say good-bye now.\p" - .string "I'll obey all that you've taught me,\n" - .string "{PLAYER}{KUN}, and do the best I can.$" - -gText_082C2EF5:: @ 82C2EF5 - .string "Hm? You appear to be {PLAYER}{KUN}…\n" - .string "But are you really?\l" - .string "Perhaps a clever {PLAYER} DOLL?\p" - .string "Oh, no, no, no, don't worry!\n" - .string "If you really are real, please\l" - .string "forget about my rudeness.\p" - .string "No need to be so angry. All I wish for\n" - .string "is more of your fine advice.\p" - .string "It concerns a saying.\p" - .string "More precisely, what should I say\n" - .string "if I win a battle?$" - -gText_082C3023:: @ 82C3023 - .string "{STR_VAR_1}\p" - .string "… … … … … …\n" - .string "When I win a match…\p" - .string "{STR_VAR_1}\p" - .string "…Are you serious?\p" - .string "I see. If you are serious, that's fine.\n" - .string "I thank you for your time.\p" - .string "I do hope even I will be able to\n" - .string "put that saying to good use.\p" - .string "I seem to have run dry on what advice\n" - .string "I need.\p" - .string "I do believe it's high time I bid you\n" - .string "farewell and strike out on my own.\p" - .string "Thank you, my mentor!\n" - .string "I apologize for my skepticism!$" -- cgit v1.2.3 From 5e01871f8b00d6b0ef4921a35e0b2bf18c7b4183 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 13 Nov 2019 16:10:05 -0500 Subject: Document Trainer Hill --- data/scripts/field_poison.inc | 2 +- data/scripts/trainer_hill.inc | 53 +++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 31 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 40b4cf658..d45b480d1 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -39,7 +39,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN + setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_Lost diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index db6105249..805c63264 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -1,8 +1,4 @@ -TrainerHill_1F_MapScript1_2C8336: @ 82C8336 -TrainerHill_2F_MapScript1_2C8336: @ 82C8336 -TrainerHill_3F_MapScript1_2C8336: @ 82C8336 -TrainerHill_4F_MapScript1_2C8336: @ 82C8336 -TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 +TrainerHill_OnResume: @ 82C8336 setvar VAR_TEMP_2, 0 setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction @@ -17,67 +13,64 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 goto_if_eq TrainerHill_1F_EventScript_Lost end -TrainerHill_1F_MapScript2_2C8372: @ 82C8372 -TrainerHill_2F_MapScript2_2C8372: @ 82C8372 - map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C +TrainerHill_OnWarp: @ 82C8372 + map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_DummyOnWarp .2byte 0 -TrainerHill_1F_EventScript_2C837C:: @ 82C837C +TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C setvar VAR_TEMP_3, 1 @ forced stop -TrainerHill_1F_MapScript2_2C8381: @ 82C8381 -TrainerHill_2F_MapScript2_2C8381: @ 82C8381 -TrainerHill_3F_MapScript2_2C8381: @ 82C8381 -TrainerHill_4F_MapScript2_2C8381: @ 82C8381 -TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 - map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 - map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF +TrainerHill_OnFrame: @ 82C8381 + map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter + map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter .2byte 0 EventScript_TrainerHillTimer:: @ 82C8393 lockall - setvar VAR_0x8004, TRAINER_HILL_FUNC_7 + setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME special CallTrainerHillFunction - msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT + msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT releaseall end -TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 +TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, TRAINER_HILL_FUNC_9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT special CallTrainerHillFunction - compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83BF + compare VAR_RESULT, 1 @ VAR_RESULT always 0 here + goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter end -TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF +@ Never reached +TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end TrainerHill_1F_EventScript_Lost:: @ 82C83C9 - setvar VAR_0x8004, TRAINER_HILL_FUNC_12 + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS special CallTrainerHillFunction setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST special CallTrainerHillFunction setvar VAR_TEMP_1, 1 end -TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF -TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF +TrainerHill_EventScript_WarpToEntranceCounter:: @ 82C83DF setvar VAR_TEMP_1, 0 warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end -TrainerHill_1F_Movement_2C83EE:: @ 82C83EE +@ Unused +TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE set_invisible step_end -EventScript_2C83F0:: @ 82C83F0 - trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, TRAINER_HILL_FUNC_11 +@ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here +TrainerHill_EventScript_TrainerBattle:: @ 82C83F0 + trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText + setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT special CallTrainerHillFunction waitmessage waitbuttonpress -- cgit v1.2.3 From 4e6a69c29736bd9bb81049c6944e27ce46f8333c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 19 Nov 2019 11:36:38 -0500 Subject: WIP Document Apprentice --- data/scripts/apprentice.inc | 334 ++++++++++++++++++-------------------------- 1 file changed, 133 insertions(+), 201 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 337899496..dfb9f5727 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -1,269 +1,204 @@ -.macro apprentice_msg waitbuttonpress:req, which:req -setvar VAR_0x8004, APPRENTICE_FUNC_PRINT_MSG -setvar VAR_0x8005, \waitbuttonpress -setvar VAR_0x8006, \which -special CallApprenticeFunction -waitstate -.endm - -.macro apprentice_buff whichstringvar:req, tobuff:req -setvar VAR_0x8004, APPRENTICE_FUNC_16 -setvar VAR_0x8005, \whichstringvar -setvar VAR_0x8006, \tobuff -special CallApprenticeFunction -.endm - -.macro apprentice_menu which:req -setvar VAR_0x8004, APPRENTICE_FUNC_MENU -setvar VAR_0x8005, \which -special CallApprenticeFunction -waitstate -.endm - BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D lock faceplayer - setvar VAR_0x8004, APPRENTICE_FUNC_0 - special CallApprenticeFunction - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6900 - setvar VAR_0x8004, APPRENTICE_FUNC_SET_TRUE_1 - special CallApprenticeFunction + apprentice_gavelvlmode + compare VAR_RESULT, FALSE + goto_if_eq Apprentice_EventScript_FirstMeeting + apprentice_shouldcheckgone compare VAR_0x8004, FALSE @ Always TRUE here - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE - goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_2B6E90 - -BattleFrontier_BattleTowerLobby_EventScript_2B68BE: @ 82B68BE - setvar VAR_0x8004, APPRENTICE_FUNC_11 - special CallApprenticeFunction - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 - compare VAR_RESULT, 4 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF - compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C - compare VAR_RESULT, 5 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4 + goto_if_eq Apprentice_EventScript_AskQuestion + goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Apprentice_EventScript_Gone +Apprentice_EventScript_AskQuestion: @ 82B68BE + apprentice_getquestion + compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MON + goto_if_eq Apprentice_EventScript_UseWhichMon + compare VAR_RESULT, APPRENTICE_QUESTION_WHAT_ITEM + goto_if_eq Apprentice_EventScript_UseWhatHeldItem + compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MOVE + goto_if_eq Apprentice_EventScript_UseWhichMove + compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_FIRST + goto_if_eq Apprentice_EventScript_PutWhichMonFirst + compare VAR_RESULT, APPRENTICE_QUESTION_WIN_SPEECH + goto_if_eq Apprentice_EventScript_PickWinSpeech release releaseall end -BattleFrontier_BattleTowerLobby_EventScript_2B6900: @ 82B6900 +Apprentice_EventScript_FirstMeeting: @ 82B6900 apprentice_buff 0, APPRENTICE_BUFF_NAME - apprentice_msg FALSE, 0 -BattleFrontier_BattleTowerLobby_EventScript_2B6925: @ 82B6925 + apprentice_msg FALSE, APPRENTICE_MSG_PLEASE_TEACH +Apprentice_EventScript_WhichLvlMode: @ 82B6925 apprentice_menu APPRENTICE_ASK_YES_NO compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69BB - apprentice_msg FALSE, 2 + goto_if_eq Apprentice_EventScript_RejectTeach + apprentice_msg FALSE, APPRENTICE_MSG_WHICH_LVL_MODE apprentice_menu APPRENTICE_ASK_WHICH_LEVEL - setvar VAR_0x8004, APPRENTICE_FUNC_1 - setorcopyvar VAR_0x8005, VAR_RESULT - addvar VAR_0x8005, 1 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_3 - special CallApprenticeFunction + apprentice_setlvlmode VAR_RESULT + apprentice_3 apprentice_buff 0, APPRENTICE_BUFF_LEVEL - apprentice_msg TRUE, 3 - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_LVL_MODE + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B69BB: @ 82B69BB - apprentice_msg FALSE, 1 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6925 +@ Its impossible to fully reject an Apprentice, they just keep asking for you to teach them +Apprentice_EventScript_RejectTeach: @ 82B69BB + apprentice_msg FALSE, APPRENTICE_MSG_REJECT + goto Apprentice_EventScript_WhichLvlMode -BattleFrontier_BattleTowerLobby_EventScript_2B69D3: @ 82B69D3 - setvar VAR_0x8004, APPRENTICE_FUNC_14 - setvar VAR_0x8005, 2 - special CallApprenticeFunction +Apprentice_EventScript_UseWhichMon: @ 82B69D3 + apprentice_initquestion APPRENTICE_QUESTION_WHICH_MON apprentice_buff 0, APPRENTICE_BUFF_SPECIES1 apprentice_buff 1, APPRENTICE_BUFF_SPECIES2 - apprentice_msg FALSE, 6 + apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON apprentice_menu APPRENTICE_ASK_2SPECIES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ABA + call_if_eq Apprentice_EventScript_ChoseFirstMon compare VAR_0x8005, 1 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 - setvar VAR_0x8004, APPRENTICE_FUNC_12 - special CallApprenticeFunction - copyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, APPRENTICE_FUNC_13 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_5 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_12 - special CallApprenticeFunction - compare VAR_RESULT, 3 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 - setvar VAR_0x8004, APPRENTICE_FUNC_16 - setvar VAR_0x8005, 0 - copyvar VAR_0x8006, VAR_0x8007 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_15 - special CallApprenticeFunction - apprentice_msg TRUE, 7 - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + call_if_eq Apprentice_EventScript_ChoseSecondMon + apprentice_getnumpartymons + apprentice_setpartymon VAR_RESULT + apprentice_answeredquestion + apprentice_getnumpartymons + compare VAR_RESULT, MULTI_PARTY_SIZE + call_if_eq Apprentice_EventScript_LastMonSelected + apprentice_buffv 0, VAR_0x8007 + apprentice_freequestion + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B6ABA: @ 82B6ABA - setvar VAR_0x8007, 0 +Apprentice_EventScript_ChoseFirstMon: @ 82B6ABA + setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES1 return -BattleFrontier_BattleTowerLobby_EventScript_2B6AC0: @ 82B6AC0 - setvar VAR_0x8007, 1 +Apprentice_EventScript_ChoseSecondMon: @ 82B6AC0 + setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES2 return -BattleFrontier_BattleTowerLobby_EventScript_2B6AC6: @ 82B6AC6 +Apprentice_EventScript_LastMonSelected: @ 82B6AC6 setvar VAR_0x8004, APPRENTICE_FUNC_4 special CallApprenticeFunction return -BattleFrontier_BattleTowerLobby_EventScript_2B6ACF: @ 82B6ACF - setvar VAR_0x8004, APPRENTICE_FUNC_14 - setvar VAR_0x8005, 4 - special CallApprenticeFunction +Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF + apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 - apprentice_msg TRUE, 10 - setvar VAR_0x8004, APPRENTICE_FUNC_15 - special CallApprenticeFunction - -BattleFrontier_BattleTowerLobby_EventScript_2B6B09: @ 82B6B09 + apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM + apprentice_freequestion +Apprentice_EventScript_ChooseHoldItem: @ 82B6B09 fadescreen 1 setvar VAR_RESULT, 0 - setvar VAR_0x8004, APPRENTICE_FUNC_19 - special CallApprenticeFunction - waitstate + apprentice_openbag compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 + goto_if_eq Apprentice_EventScript_ConfirmHoldNothing setvar VAR_0x8004, APPRENTICE_FUNC_20 special CallApprenticeFunction compare VAR_RESULT, FALSE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C + goto_if_eq Apprentice_EventScript_AlreadySuggestedItem apprentice_buff 0, APPRENTICE_BUFF_ITEM - apprentice_msg TRUE, 12 - setvar VAR_0x8004, APPRENTICE_FUNC_5 - special CallApprenticeFunction - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_HELD_ITEM + apprentice_answeredquestion + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B6B81: @ 82B6B81 - setvar VAR_0x8004, APPRENTICE_FUNC_14 - setvar VAR_0x8005, 4 - special CallApprenticeFunction +Apprentice_EventScript_ConfirmHoldNothing: @ 82B6B81 + apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 - apprentice_msg FALSE, 13 + apprentice_msg FALSE, APPRENTICE_MSG_HOLD_NOTHING apprentice_menu APPRENTICE_ASK_GIVE - setvar VAR_0x8004, 15 - special CallApprenticeFunction + apprentice_freequestion compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 - -BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: @ 82B6BD4 - apprentice_msg TRUE, 14 - setvar VAR_0x8004, APPRENTICE_FUNC_5 - special CallApprenticeFunction - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + goto_if_eq Apprentice_EventScript_ChooseHoldItem +Apprentice_EventScript_HoldNothing: @ 82B6BD4 + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_NO_HELD_ITEM + apprentice_answeredquestion + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: @ 82B6C0C - setvar VAR_0x8004, APPRENTICE_FUNC_14 - setvar VAR_0x8005, 4 - special CallApprenticeFunction +Apprentice_EventScript_AlreadySuggestedItem: @ 82B6C0C + apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_buff 1, APPRENTICE_BUFF_SPECIES3 - apprentice_msg FALSE, 16 + apprentice_msg FALSE, APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED apprentice_menu APPRENTICE_ASK_GIVE - setvar VAR_0x8004, 15 - special CallApprenticeFunction + apprentice_freequestion compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4 + goto_if_eq Apprentice_EventScript_ChooseHoldItem + goto Apprentice_EventScript_HoldNothing end -BattleFrontier_BattleTowerLobby_EventScript_2B6C77: @ 82B6C77 - setvar VAR_0x8004, APPRENTICE_FUNC_14 - setvar VAR_0x8005, 3 - special CallApprenticeFunction +Apprentice_EventScript_UseWhichMove: @ 82B6C77 + apprentice_initquestion APPRENTICE_QUESTION_WHICH_MOVE apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 apprentice_buff 1, APPRENTICE_BUFF_MOVE1 apprentice_buff 2, APPRENTICE_BUFF_MOVE2 - apprentice_msg FALSE, 8 + apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MOVE apprentice_menu APPRENTICE_ASK_MOVES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D50 + call_if_eq Apprentice_EventScript_ChoseFirstMove compare VAR_0x8005, 1 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D56 - setvar VAR_0x8004, APPRENTICE_FUNC_17 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_5 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_16 - setvar VAR_0x8005, 0 - copyvar VAR_0x8006, VAR_0x8007 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_15 - special CallApprenticeFunction - apprentice_msg TRUE, 9 - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + call_if_eq Apprentice_EventScript_ChoseSecondMove + apprentice_setmove + apprentice_answeredquestion + apprentice_buffv 0, VAR_0x8007 + apprentice_freequestion + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B6D50: @ 82B6D50 - setvar VAR_0x8007, 3 +Apprentice_EventScript_ChoseFirstMove: @ 82B6D50 + setvar VAR_0x8007, APPRENTICE_BUFF_MOVE1 return -BattleFrontier_BattleTowerLobby_EventScript_2B6D56: @ 82B6D56 - setvar VAR_0x8007, 4 +Apprentice_EventScript_ChoseSecondMove: @ 82B6D56 + setvar VAR_0x8007, APPRENTICE_BUFF_MOVE2 return -BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: @ 82B6D5C - apprentice_msg FALSE, 4 +Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C + apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON_FIRST apprentice_menu APPRENTICE_ASK_3SPECIES - copyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x8004, APPRENTICE_FUNC_18 - special CallApprenticeFunction - setvar VAR_0x8004, APPRENTICE_FUNC_5 - special CallApprenticeFunction - apprentice_buff 0, APPRENTICE_BUFF_SPECIES4 - apprentice_msg TRUE, 5 - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + apprentice_setfirstmon VAR_RESULT + apprentice_answeredquestion + apprentice_buff 0, APPRENTICE_BUFF_FIRST_MON_SPECIES + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON_FIRST + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: @ 82B6DD4 - apprentice_msg TRUE, 11 +@ Last question, after which the Apprentice leaves (and is saved) to be replaced by another +Apprentice_EventScript_PickWinSpeech: @ 82B6DD4 + apprentice_msg TRUE, APPRENTICE_MSG_PICK_WIN_SPEECH setvar VAR_0x8004, APPRENTICE_FUNC_25 special CallApprenticeFunction setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE @@ -272,52 +207,49 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: @ 82B6DD4 faceplayer setvar VAR_0x8004, APPRENTICE_FUNC_21 special CallApprenticeFunction - apprentice_buff 0, APPRENTICE_BUFF_EASY_CHAT - apprentice_msg TRUE, 15 - setvar VAR_0x8004, APPRENTICE_FUNC_9 - special CallApprenticeFunction - call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D + apprentice_buff 0, APPRENTICE_BUFF_WIN_SPEECH + apprentice_msg TRUE, APPRENTICE_MSG_THANKS_WIN_SPEECH + apprentice_reset + call Apprentice_EventScript_Hide release releaseall switch VAR_FACING - case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 - goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 + case DIR_NORTH, Apprentice_EventScript_LeaveNorth + goto Apprentice_EventScript_Leave end -BattleFrontier_BattleTowerLobby_EventScript_2B6E4D: @ 82B6E4D +Apprentice_EventScript_Hide: @ 82B6E4D setflag FLAG_HIDE_APPRENTICE setflag FLAG_DAILY_APPRENTICE_LEAVES return -BattleFrontier_BattleTowerLobby_EventScript_2B6E54: @ 82B6E54 - setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE - special CallApprenticeFunction +Apprentice_EventScript_LeaveNorth: @ 82B6E54 + apprentice_shouldleave compare VAR_0x8004, FALSE @ Always TRUE here - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove - applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94 + goto_if_eq Apprentice_EventScript_DontMove + applymovement 6, Apprentice_Movement_LeaveNorth waitmovement 0 end -BattleFrontier_BattleTowerLobby_EventScript_2B6E72: @ 82B6E72 - setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE - special CallApprenticeFunction +Apprentice_EventScript_Leave: @ 82B6E72 + apprentice_shouldleave compare VAR_0x8004, FALSE @ Always TRUE here - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove - applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95 + goto_if_eq Apprentice_EventScript_DontMove + applymovement 6, Apprentice_Movement_Leave waitmovement 0 end -BattleFrontier_BattleTowerLobby_EventScript_2B6E90: @ 82B6E90 +Apprentice_EventScript_Gone: @ 82B6E90 release releaseall end -BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove: @ 82B6E93 +Apprentice_EventScript_DontMove: @ 82B6E93 end -BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94 +Apprentice_Movement_LeaveNorth: @ 82B6E94 walk_fast_right -BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 +Apprentice_Movement_Leave: @ 82B6E95 walk_fast_down walk_fast_down walk_fast_right -- cgit v1.2.3 From a05006421b29ac49ce7173bb431d8a0419f5c143 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 17:36:52 -0500 Subject: Document Apprentice --- data/scripts/apprentice.inc | 46 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index dfb9f5727..30001af2d 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -34,10 +34,10 @@ Apprentice_EventScript_WhichLvlMode: @ 82B6925 apprentice_msg FALSE, APPRENTICE_MSG_WHICH_LVL_MODE apprentice_menu APPRENTICE_ASK_WHICH_LEVEL apprentice_setlvlmode VAR_RESULT - apprentice_3 + apprentice_shufflespecies apprentice_buff 0, APPRENTICE_BUFF_LEVEL apprentice_msg TRUE, APPRENTICE_MSG_THANKS_LVL_MODE - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -70,7 +70,7 @@ Apprentice_EventScript_UseWhichMon: @ 82B69D3 apprentice_buffv 0, VAR_0x8007 apprentice_freequestion apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -87,8 +87,7 @@ Apprentice_EventScript_ChoseSecondMon: @ 82B6AC0 return Apprentice_EventScript_LastMonSelected: @ 82B6AC6 - setvar VAR_0x8004, APPRENTICE_FUNC_4 - special CallApprenticeFunction + apprentice_randomizequestions return Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF @@ -100,16 +99,15 @@ Apprentice_EventScript_ChooseHoldItem: @ 82B6B09 fadescreen 1 setvar VAR_RESULT, 0 apprentice_openbag - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Apprentice_EventScript_ConfirmHoldNothing - setvar VAR_0x8004, APPRENTICE_FUNC_20 - special CallApprenticeFunction + apprentice_trysetitem compare VAR_RESULT, FALSE goto_if_eq Apprentice_EventScript_AlreadySuggestedItem apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_msg TRUE, APPRENTICE_MSG_THANKS_HELD_ITEM apprentice_answeredquestion - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -128,7 +126,7 @@ Apprentice_EventScript_ConfirmHoldNothing: @ 82B6B81 Apprentice_EventScript_HoldNothing: @ 82B6BD4 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_NO_HELD_ITEM apprentice_answeredquestion - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -136,6 +134,8 @@ Apprentice_EventScript_HoldNothing: @ 82B6BD4 goto Apprentice_EventScript_Leave end +@ Because Battle Tower mons may not hold the same item, the player must suggest a +@ different item if theyve already told the Apprentice to use it for another mon Apprentice_EventScript_AlreadySuggestedItem: @ 82B6C0C apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM apprentice_buff 0, APPRENTICE_BUFF_ITEM @@ -157,15 +157,15 @@ Apprentice_EventScript_UseWhichMove: @ 82B6C77 apprentice_menu APPRENTICE_ASK_MOVES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if_eq Apprentice_EventScript_ChoseFirstMove + call_if_eq Apprentice_EventScript_ChoseMove1 compare VAR_0x8005, 1 - call_if_eq Apprentice_EventScript_ChoseSecondMove + call_if_eq Apprentice_EventScript_ChoseMove2 apprentice_setmove apprentice_answeredquestion apprentice_buffv 0, VAR_0x8007 apprentice_freequestion apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -173,22 +173,22 @@ Apprentice_EventScript_UseWhichMove: @ 82B6C77 goto Apprentice_EventScript_Leave end -Apprentice_EventScript_ChoseFirstMove: @ 82B6D50 +Apprentice_EventScript_ChoseMove1: @ 82B6D50 setvar VAR_0x8007, APPRENTICE_BUFF_MOVE1 return -Apprentice_EventScript_ChoseSecondMove: @ 82B6D56 +Apprentice_EventScript_ChoseMove2: @ 82B6D56 setvar VAR_0x8007, APPRENTICE_BUFF_MOVE2 return Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON_FIRST apprentice_menu APPRENTICE_ASK_3SPECIES - apprentice_setfirstmon VAR_RESULT + apprentice_setleadmon VAR_RESULT apprentice_answeredquestion - apprentice_buff 0, APPRENTICE_BUFF_FIRST_MON_SPECIES + apprentice_buff 0, APPRENTICE_BUFF_LEAD_MON_SPECIES apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON_FIRST - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -199,18 +199,16 @@ Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C @ Last question, after which the Apprentice leaves (and is saved) to be replaced by another Apprentice_EventScript_PickWinSpeech: @ 82B6DD4 apprentice_msg TRUE, APPRENTICE_MSG_PICK_WIN_SPEECH - setvar VAR_0x8004, APPRENTICE_FUNC_25 - special CallApprenticeFunction + apprentice_shiftsaved setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE call Common_ShowEasyChatScreen lock faceplayer - setvar VAR_0x8004, APPRENTICE_FUNC_21 - special CallApprenticeFunction + apprentice_save apprentice_buff 0, APPRENTICE_BUFF_WIN_SPEECH apprentice_msg TRUE, APPRENTICE_MSG_THANKS_WIN_SPEECH apprentice_reset - call Apprentice_EventScript_Hide + call Apprentice_EventScript_SetHideFlags release releaseall switch VAR_FACING @@ -218,7 +216,7 @@ Apprentice_EventScript_PickWinSpeech: @ 82B6DD4 goto Apprentice_EventScript_Leave end -Apprentice_EventScript_Hide: @ 82B6E4D +Apprentice_EventScript_SetHideFlags: @ 82B6E4D setflag FLAG_HIDE_APPRENTICE setflag FLAG_DAILY_APPRENTICE_LEAVES return -- cgit v1.2.3 From 2bf1e0600ee341970c4731640a351ded047a55c5 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 23 Nov 2019 08:09:25 -0500 Subject: Consolidate apprentice_buff macros --- data/scripts/apprentice.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 30001af2d..53b43a1f9 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -67,7 +67,7 @@ Apprentice_EventScript_UseWhichMon: @ 82B69D3 apprentice_getnumpartymons compare VAR_RESULT, MULTI_PARTY_SIZE call_if_eq Apprentice_EventScript_LastMonSelected - apprentice_buffv 0, VAR_0x8007 + apprentice_buff 0, VAR_0x8007 apprentice_freequestion apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON call Apprentice_EventScript_SetHideFlags @@ -162,7 +162,7 @@ Apprentice_EventScript_UseWhichMove: @ 82B6C77 call_if_eq Apprentice_EventScript_ChoseMove2 apprentice_setmove apprentice_answeredquestion - apprentice_buffv 0, VAR_0x8007 + apprentice_buff 0, VAR_0x8007 apprentice_freequestion apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE call Apprentice_EventScript_SetHideFlags -- cgit v1.2.3 From 4dfa959fa297195a040a8cd0436d561296076f0e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 21:46:29 -0500 Subject: Begin documenting Battle Pike and Frontier Util --- data/scripts/battle_pike.inc | 309 +++++++++++++++++------------------------- data/scripts/trainer_hill.inc | 4 +- 2 files changed, 127 insertions(+), 186 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 2a6da1a58..ca1e14d47 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -1,142 +1,127 @@ -BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE +BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp -BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25 + battlepike_setroomobjects + battlepike_getroomtype switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 - case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF + case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 + case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 + case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0 + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2 + case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 + case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93 + case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2 + case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93:: @ 82C3E93 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93:: @ 82C3E93 setobjectxyperm 1, 2, 5 setobjectxyperm 2, 6, 5 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2:: @ 82C3EA2 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2:: @ 82C3EA2 setobjectxyperm 1, 4, 4 setobjectxyperm 2, 3, 4 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1:: @ 82C3EB1 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1:: @ 82C3EB1 setobjectxyperm 1, 4, 4 setobjectxyperm 2, 0, 0 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0:: @ 82C3EC0 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0:: @ 82C3EC0 setobjectxyperm 1, 5, 5 setobjectxyperm 2, 0, 0 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF:: @ 82C3ECF setobjectxyperm 1, 4, 3 setobjectxyperm 2, 4, 4 end -BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 +BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom .2byte 0 -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 +BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction - compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 6 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 7 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 8 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + battlepike_getroomtype + compare VAR_RESULT, PIKE_ROOM_STATUS + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + compare VAR_RESULT, PIKE_ROOM_DOUBLE_BATTLE + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + compare VAR_RESULT, PIKE_ROOM_BRAIN + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35:: @ 82C3F35 setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F:: @ 82C3F3F setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E - setvar VAR_0x8007, 0 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F +BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E + setvar VAR_0x8007, PIKE_ROOM_LEFT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59:: @ 82C3F59 - setvar VAR_0x8007, 1 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F +BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp:: @ 82C3F59 + setvar VAR_0x8007, PIKE_ROOM_CENTER + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 - setvar VAR_0x8007, 2 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F +BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64 + setvar VAR_0x8007, PIKE_ROOM_RIGHT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 - special CallBattlePikeFunction +BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F + battlepike_getstreak addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + battlepike_setstreak VAR_RESULT + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction + frontier_setbattlenum VAR_RESULT + battlepike_setnextroom + battlepike_getroomtype switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 - case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_NPC, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_WILD_MONS, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom + case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 + call BattleFrontier_BattlePike_EventScript_CloseCurtain + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 255, 4, 7 waitstate end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A +BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 + call BattleFrontier_BattlePike_EventScript_CloseCurtain + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 255, 4, 19 waitstate end @@ -149,164 +134,122 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082:: @ 82C4082 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D +BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 + battlepike_ispartyfullhealth + compare VAR_RESULT, TRUE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing + compare VAR_RESULT, TRUE + call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing + battlepike_getstreak addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + battlepike_setstreak VAR_RESULT + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + frontier_setbattlenum VAR_RESULT + battlepike_isfinalroom + compare VAR_RESULT, TRUE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom + compare VAR_RESULT, FALSE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom waitstate end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED - setvar VAR_0x8005, 1 - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128 + battlepike_nohealing TRUE return -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED - setvar VAR_0x8005, 0 - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136 + battlepike_nohealing FALSE return -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A +BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 + call BattleFrontier_BattlePike_EventScript_CloseCurtain + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7 return -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A +BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 return -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004,BATTLE_PIKE_FUNC_7 - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 +BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_7 special CallBattlePikeFunction + battlepike_ispartyfullhealth + compare VAR_RESULT, TRUE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing + compare VAR_RESULT, TRUE + call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing + battlepike_getstreak addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + battlepike_setstreak VAR_RESULT + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + frontier_setbattlenum VAR_RESULT + battlepike_isfinalroom + compare VAR_RESULT, TRUE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom + compare VAR_RESULT, FALSE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom waitstate end -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 +BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202:: @ 82C4202 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D +BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D:: @ 82C420D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage end BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end -BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E -BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E +BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 0 - special CallFrontierUtilFunc + frontier_getchallengestatus compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 - + call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B setorcopyvar VAR_RESULT, VAR_0x8006 end -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 - special CallFrontierUtilFunc +BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves:: @ 82C4271 + frontier_resetsketch return -BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A -BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A +BattleFrontier_BattlePikeRoom_Movement_HidePlayer: @ 82C427A set_invisible step_end diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 805c63264..c655a3c9c 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -2,9 +2,7 @@ TrainerHill_OnResume: @ 82C8336 setvar VAR_TEMP_2, 0 setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc + frontier_getbattleoutcome compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_DREW -- cgit v1.2.3 From 08a8dc46e307120d7007531826b58ac5ee227564 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 23 Nov 2019 16:08:50 -0500 Subject: Use macros for Trainer Hill --- data/scripts/field_poison.inc | 5 ++--- data/scripts/trainer_hill.inc | 18 ++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index d45b480d1..f33292fe6 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -39,9 +39,8 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE - special CallTrainerHillFunction - compare VAR_RESULT, 1 + trainerhill_inchallenge + compare VAR_RESULT, TRUE goto_if_eq TrainerHill_1F_EventScript_Lost special Script_FadeOutMapMusic waitstate diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index c655a3c9c..e57cf923b 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -1,7 +1,6 @@ TrainerHill_OnResume: @ 82C8336 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER - special CallTrainerHillFunction + trainerhill_resumetimer frontier_getbattleoutcome compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_Lost @@ -26,16 +25,14 @@ TrainerHill_OnFrame: @ 82C8381 EventScript_TrainerHillTimer:: @ 82C8393 lockall - setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME - special CallTrainerHillFunction + trainerhill_gettime msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT releaseall end TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT - special CallTrainerHillFunction + trainerhill_clearresult compare VAR_RESULT, 1 @ VAR_RESULT always 0 here goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter end @@ -47,10 +44,8 @@ TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF end TrainerHill_1F_EventScript_Lost:: @ 82C83C9 - setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS - special CallTrainerHillFunction - setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST - special CallTrainerHillFunction + trainerhill_settrainerflags + trainerhill_lost setvar VAR_TEMP_1, 1 end @@ -68,8 +63,7 @@ TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE @ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here TrainerHill_EventScript_TrainerBattle:: @ 82C83F0 trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT - special CallTrainerHillFunction + trainerhill_postbattletext waitmessage waitbuttonpress closemessage -- cgit v1.2.3 From 63ee15fc28fee12a1a9433f52d392eb3c922a844 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 24 Nov 2019 16:58:40 -0500 Subject: Document Frontier Util --- data/scripts/battle_pike.inc | 20 ++++++++++---------- data/scripts/trainer_hill.inc | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index ca1e14d47..81440320c 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -92,9 +92,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F battlepike_getstreak addvar VAR_RESULT, 1 battlepike_setstreak VAR_RESULT - frontier_getbattlenum + frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 - frontier_setbattlenum VAR_RESULT + frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT battlepike_setnextroom battlepike_getroomtype switch VAR_RESULT @@ -160,9 +160,9 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 battlepike_getstreak addvar VAR_RESULT, 1 battlepike_setstreak VAR_RESULT - frontier_getbattlenum + frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 - frontier_setbattlenum VAR_RESULT + frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT battlepike_isfinalroom compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom @@ -204,9 +204,9 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 battlepike_getstreak addvar VAR_RESULT, 1 battlepike_setstreak VAR_RESULT - frontier_getbattlenum + frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 - frontier_setbattlenum VAR_RESULT + frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT battlepike_isfinalroom compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom @@ -229,17 +229,17 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D:: @ 82C420D end BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 - frontier_setchallengestatus CHALLENGE_STATUS_LOST + frontier_set FRONTIER_DATA_CHALLENGE_STATUS CHALLENGE_STATUS_LOST warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E setorcopyvar VAR_0x8006, VAR_RESULT - frontier_getchallengestatus - compare VAR_RESULT, 2 + frontier_get FRONTIER_DATA_CHALLENGE_STATUS + compare VAR_RESULT, CHALLENGE_STATUS_PAUSED goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - compare VAR_RESULT, 1 + compare VAR_RESULT, CHALLENGE_STATUS_SAVING goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index e57cf923b..ca692e1ef 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -1,7 +1,7 @@ TrainerHill_OnResume: @ 82C8336 setvar VAR_TEMP_2, 0 trainerhill_resumetimer - frontier_getbattleoutcome + frontier_get FRONTIER_DATA_BATTLE_OUTCOME compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_DREW -- cgit v1.2.3 From 41c1c9ca8a472573e5acaea26bf3682399f50e35 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 29 Nov 2019 02:00:19 -0500 Subject: Set up Battle Pike macros --- data/scripts/battle_pike.inc | 37 ++++++++++++++++++------------------- data/scripts/field_poison.inc | 5 ++--- 2 files changed, 20 insertions(+), 22 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 81440320c..a0f0f6618 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -3,8 +3,8 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25 - battlepike_setroomobjects - battlepike_getroomtype + pike_setroomobjects + pike_getroomtype switch VAR_RESULT case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 @@ -48,7 +48,7 @@ BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - battlepike_getroomtype + pike_getroomtype compare VAR_RESULT, PIKE_ROOM_STATUS goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE @@ -89,14 +89,14 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64 end BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT - battlepike_setnextroom - battlepike_getroomtype + pike_setnextroom + pike_getroomtype switch VAR_RESULT case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom @@ -152,18 +152,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D end BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 - battlepike_ispartyfullhealth + pike_ispartyfullhealth compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing compare VAR_RESULT, TRUE call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT - battlepike_isfinalroom + pike_isfinalroom compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom compare VAR_RESULT, FALSE @@ -172,11 +172,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 end BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128 - battlepike_nohealing TRUE + pike_nohealing TRUE return BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136 - battlepike_nohealing FALSE + pike_nohealing FALSE return BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144 @@ -194,20 +194,19 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C return BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_7 - special CallBattlePikeFunction - battlepike_ispartyfullhealth + pike_exitwildmonroom + pike_ispartyfullhealth compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing compare VAR_RESULT, TRUE call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT - battlepike_isfinalroom + pike_isfinalroom compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom compare VAR_RESULT, FALSE diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index f33292fe6..80e1a1ed8 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -29,9 +29,8 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 message gText_PlayerWhitedOut waitmessage waitbuttonpress - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN - special CallBattlePikeFunction - compare VAR_RESULT, 1 + pike_inchallenge + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePike_EventScript_Retire setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction -- cgit v1.2.3 From fdae25eab21128a7ec8074e6cb6fab27b3a263fe Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Dec 2019 09:52:16 -0500 Subject: Set up Battle Pyramid macros --- data/scripts/field_poison.inc | 7 +++---- data/scripts/obtain_item.inc | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 80e1a1ed8..d15da3399 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -32,11 +32,10 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 pike_inchallenge compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePike_EventScript_Retire - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN - special CallBattlePyramidFunction - compare VAR_RESULT, 1 + pyramid_inchallenge + compare VAR_RESULT, 1 @ On Pyramid floor goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 2 + compare VAR_RESULT, 2 @ On Pyramid peak goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 trainerhill_inchallenge compare VAR_RESULT, TRUE diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 206277cb7..77b795f60 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -128,8 +128,7 @@ EventScript_PickUpItem:: @ 8271C3A waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN - special CallBattlePyramidFunction + pyramid_inchallenge compare VAR_RESULT, 1 goto_if_eq EventScript_PutBattlePyramidItemInBag msgbox gText_PutItemInPocket, MSGBOX_DEFAULT -- cgit v1.2.3 From 7beddd16dd81d79ee886183053037e68910e01d5 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2019 13:10:39 -0500 Subject: Document missed scripts/text --- data/scripts/cable_club.inc | 27 ++++++++++++++------------- data/scripts/day_care.inc | 4 ++-- data/scripts/mauville_man.inc | 3 ++- 3 files changed, 18 insertions(+), 16 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 1b2e3f60f..f37596961 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -49,7 +49,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23 end @ Unused? -OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 +CableClub_EventScript_MysteryGiftThankYou2:: @ 8276B62 msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end @@ -301,7 +301,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7 end CableClub_EventScript_SelectBattleMode:: @ 8276EC2 - message CableClub_Text_WhichBattleMode + message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT @@ -795,39 +795,40 @@ EventScript_TradeCenter_Chair3:: @ 8277413 waitstate end +@ VAR_TEMP_1 for below scripts set by ReceiveGiftItem EventScript_RecordCenter_Spot0:: @ 827741D setvar VAR_0x8005, 0 special RecordMixingPlayerSpotTriggered waitstate - compare VAR_TEMP_1, 0 - goto_if_ne RecordCorner_EventScript_277471 + compare VAR_TEMP_1, ITEM_NONE + goto_if_ne RecordCorner_EventScript_ReceivedGiftItem end EventScript_RecordCenter_Spot1:: @ 8277432 setvar VAR_0x8005, 1 special RecordMixingPlayerSpotTriggered waitstate - compare VAR_TEMP_1, 0 - goto_if_ne RecordCorner_EventScript_277471 + compare VAR_TEMP_1, ITEM_NONE + goto_if_ne RecordCorner_EventScript_ReceivedGiftItem end EventScript_RecordCenter_Spot2:: @ 8277447 setvar VAR_0x8005, 2 special RecordMixingPlayerSpotTriggered waitstate - compare VAR_TEMP_1, 0 - goto_if_ne RecordCorner_EventScript_277471 + compare VAR_TEMP_1, ITEM_NONE + goto_if_ne RecordCorner_EventScript_ReceivedGiftItem end EventScript_RecordCenter_Spot3:: @ 827745C setvar VAR_0x8005, 3 special RecordMixingPlayerSpotTriggered waitstate - compare VAR_TEMP_1, 0 - goto_if_ne RecordCorner_EventScript_277471 + compare VAR_TEMP_1, ITEM_NONE + goto_if_ne RecordCorner_EventScript_ReceivedGiftItem end -RecordCorner_EventScript_277471:: @ 8277471 +RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471 bufferitemname 1, VAR_TEMP_1 message RecordCorner_Text_PlayerSentOverOneX waitmessage @@ -868,7 +869,7 @@ TradeCenter_EventScript_Attendant:: @ 82774B6 closemessage end -RecordCorner_EventScript_2774C6:: @ 82774C6 +RecordCorner_EventScript_Attendant:: @ 82774C6 compare VAR_TEMP_0, 0 goto_if_ne RecordCorner_EventScript_AlreadyMixed special Script_FacePlayer @@ -1090,7 +1091,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D end CableClub_EventScript_WirelessBattleSelect:: @ 827783B - message CableClub_Text_WhichBattleMode + message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 61763ba17..968464f9d 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -262,7 +262,7 @@ Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47 step_end @ Unused. Possibly a commented script, or a typo end added to the above Movement script -Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B +Route117_PokemonDayCare_EventScript_UnusedEnd:: @ 8291F5B end Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C @@ -279,7 +279,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C end @ Unused -Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 +Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95 special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 34622775a..a6585ca4d 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -289,7 +289,8 @@ MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE .string "Then tell me, have you any tales that\n" .string "are even remotely legendary?$" -MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844 +@ Unused +MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale: @ 828E844 .string "Incidentally… Would you care to hear\n" .string "another legendary tale?$" -- cgit v1.2.3 From a4191040c97fdd297e00f5fa68a0466e064e9e12 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 1 Dec 2019 19:19:47 -0500 Subject: Sync weather names --- data/scripts/abnormal_weather.inc | 426 ++++++++++++++++++++++++++++++++++++++ data/scripts/unusual_weather.inc | 426 -------------------------------------- 2 files changed, 426 insertions(+), 426 deletions(-) create mode 100644 data/scripts/abnormal_weather.inc delete mode 100644 data/scripts/unusual_weather.inc (limited to 'data/scripts') diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc new file mode 100644 index 000000000..9a900f315 --- /dev/null +++ b/data/scripts/abnormal_weather.inc @@ -0,0 +1,426 @@ +AbnormalWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 + setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 + setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 + setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute115East:: @ 827394C + setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute116North:: @ 827395F + setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 + setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 + setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 + setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 + setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB + setmetatile 10, 28, METATILE_General_RoughWater, 0 + setmetatile 11, 28, METATILE_General_RoughWater, 0 + setmetatile 9, 29, METATILE_General_RoughWater, 0 + setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 29, METATILE_General_RoughWater, 0 + setmetatile 9, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 31, METATILE_General_RoughWater, 0 + setmetatile 11, 31, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 + setmetatile 20, 53, METATILE_General_RoughWater, 0 + setmetatile 21, 53, METATILE_General_RoughWater, 0 + setmetatile 19, 54, METATILE_General_RoughWater, 0 + setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 54, METATILE_General_RoughWater, 0 + setmetatile 19, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 56, METATILE_General_RoughWater, 0 + setmetatile 21, 56, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 + setmetatile 8, 16, METATILE_General_RoughWater, 0 + setmetatile 9, 16, METATILE_General_RoughWater, 0 + setmetatile 7, 17, METATILE_General_RoughWater, 0 + setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 17, METATILE_General_RoughWater, 0 + setmetatile 7, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 19, METATILE_General_RoughWater, 0 + setmetatile 9, 19, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 + setmetatile 53, 18, METATILE_General_RoughWater, 0 + setmetatile 54, 18, METATILE_General_RoughWater, 0 + setmetatile 52, 19, METATILE_General_RoughWater, 0 + setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 19, METATILE_General_RoughWater, 0 + setmetatile 52, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 21, METATILE_General_RoughWater, 0 + setmetatile 54, 21, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F + setmetatile 57, 9, METATILE_General_RoughWater, 0 + setmetatile 58, 9, METATILE_General_RoughWater, 0 + setmetatile 56, 10, METATILE_General_RoughWater, 0 + setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 10, METATILE_General_RoughWater, 0 + setmetatile 56, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 12, METATILE_General_RoughWater, 0 + setmetatile 58, 12, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC + setmetatile 61, 30, METATILE_General_RoughWater, 0 + setmetatile 62, 30, METATILE_General_RoughWater, 0 + setmetatile 60, 31, METATILE_General_RoughWater, 0 + setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 31, METATILE_General_RoughWater, 0 + setmetatile 60, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 33, METATILE_General_RoughWater, 0 + setmetatile 62, 33, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 + setmetatile 16, 14, METATILE_General_RoughWater, 0 + setmetatile 17, 14, METATILE_General_RoughWater, 0 + setmetatile 15, 15, METATILE_General_RoughWater, 0 + setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 15, METATILE_General_RoughWater, 0 + setmetatile 15, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 17, METATILE_General_RoughWater, 0 + setmetatile 17, 17, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 + setmetatile 42, 19, METATILE_General_RoughWater, 0 + setmetatile 43, 19, METATILE_General_RoughWater, 0 + setmetatile 41, 20, METATILE_General_RoughWater, 0 + setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 20, METATILE_General_RoughWater, 0 + setmetatile 41, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 22, METATILE_General_RoughWater, 0 + setmetatile 43, 22, METATILE_General_RoughWater, 0 + return + +AbnormalWeather_EventScript_HideMapNamePopup:: @ 8273D13 + setflag FLAG_HIDE_MAP_NAME_POPUP + return + +AbnormalWeather_StartKyogreWeather:: @ 8273D17 + setweather WEATHER_DOWNPOUR + return + +AbnormalWeather_StartGroudonWeather:: @ 8273D1B + setweather WEATHER_DROUGHT + return + +AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F + lockall + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START + goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage + goto AbnormalWeather_EventScript_ShowSunEndedMessage + end + +AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 + closemessage + fadescreenswapbuffers 1 + setweather WEATHER_SUNNY + doweather + call AbnormalWeather_EventScript_CleanupMapTiles + special DrawWholeMapView + setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE + setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0 + clearflag FLAG_HIDE_MAP_NAME_POPUP + fadescreenswapbuffers 0 + releaseall + end + +AbnormalWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 + msgbox gText_AbnormalWeatherEnded_Rain, MSGBOX_DEFAULT + goto AbnormalWeather_EventScript_EndEventAndCleanup_2 + end + +AbnormalWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F + msgbox gText_AbnormalWeatherEnded_Sun, MSGBOX_DEFAULT + goto AbnormalWeather_EventScript_EndEventAndCleanup_2 + end + +AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D + switch VAR_ABNORMAL_WEATHER_LOCATION + case ABNORMAL_WEATHER_ROUTE_114_NORTH, AbnormalWeather_EventScript_CleanupRoute114North + case ABNORMAL_WEATHER_ROUTE_114_SOUTH, AbnormalWeather_EventScript_CleanupRoute114South + case ABNORMAL_WEATHER_ROUTE_115_WEST, AbnormalWeather_EventScript_CleanupRoute115West + case ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_EventScript_CleanupRoute115East + case ABNORMAL_WEATHER_ROUTE_116_NORTH, AbnormalWeather_EventScript_CleanupRoute116North + case ABNORMAL_WEATHER_ROUTE_116_SOUTH, AbnormalWeather_EventScript_CleanupRoute116South + case ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_EventScript_CleanupRoute118East + case ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_EventScript_CleanupRoute118West + case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_EventScript_CleanupRoute105North + case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_EventScript_CleanupRoute105South + case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_EventScript_CleanupRoute125West + case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_EventScript_CleanupRoute125East + case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_EventScript_CleanupRoute127North + case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_EventScript_CleanupRoute127South + case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_EventScript_CleanupRoute129West + case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_EventScript_CleanupRoute129East + return + +AbnormalWeather_EventScript_CleanupRoute114North:: @ 8273E23 + setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 + return + +AbnormalWeather_EventScript_CleanupRoute114South:: @ 8273E36 + setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 + return + +AbnormalWeather_EventScript_CleanupRoute115West:: @ 8273E49 + setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 + return + +AbnormalWeather_EventScript_CleanupRoute115East:: @ 8273E5C + setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 + return + +AbnormalWeather_EventScript_CleanupRoute116North:: @ 8273E6F + setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 + setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 + return + +AbnormalWeather_EventScript_CleanupRoute116South:: @ 8273E82 + setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 + return + +AbnormalWeather_EventScript_CleanupRoute118East:: @ 8273E95 + setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 + return + +AbnormalWeather_EventScript_CleanupRoute118West:: @ 8273EA8 + setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 + return + +AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB + setmetatile 10, 28, METATILE_General_CalmWater, 0 + setmetatile 11, 28, METATILE_General_CalmWater, 0 + setmetatile 9, 29, METATILE_General_CalmWater, 0 + setmetatile 10, 29, METATILE_General_CalmWater, 0 + setmetatile 11, 29, METATILE_General_CalmWater, 0 + setmetatile 12, 29, METATILE_General_CalmWater, 0 + setmetatile 9, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 30, METATILE_General_CalmWater, 0 + setmetatile 11, 30, METATILE_General_CalmWater, 0 + setmetatile 12, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 31, METATILE_General_CalmWater, 0 + setmetatile 11, 31, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28 + setmetatile 20, 53, METATILE_General_CalmWater, 0 + setmetatile 21, 53, METATILE_General_CalmWater, 0 + setmetatile 19, 54, METATILE_General_CalmWater, 0 + setmetatile 20, 54, METATILE_General_CalmWater, 0 + setmetatile 21, 54, METATILE_General_CalmWater, 0 + setmetatile 22, 54, METATILE_General_CalmWater, 0 + setmetatile 19, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 55, METATILE_General_CalmWater, 0 + setmetatile 21, 55, METATILE_General_CalmWater, 0 + setmetatile 22, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 56, METATILE_General_CalmWater, 0 + setmetatile 21, 56, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95 + setmetatile 8, 16, METATILE_General_CalmWater, 0 + setmetatile 9, 16, METATILE_General_CalmWater, 0 + setmetatile 7, 17, METATILE_General_CalmWater, 0 + setmetatile 8, 17, METATILE_General_CalmWater, 0 + setmetatile 9, 17, METATILE_General_CalmWater, 0 + setmetatile 10, 17, METATILE_General_CalmWater, 0 + setmetatile 7, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 18, METATILE_General_CalmWater, 0 + setmetatile 9, 18, METATILE_General_CalmWater, 0 + setmetatile 10, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 19, METATILE_General_CalmWater, 0 + setmetatile 9, 19, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002 + setmetatile 53, 18, METATILE_General_CalmWater, 0 + setmetatile 54, 18, METATILE_General_CalmWater, 0 + setmetatile 52, 19, METATILE_General_CalmWater, 0 + setmetatile 53, 19, METATILE_General_CalmWater, 0 + setmetatile 54, 19, METATILE_General_CalmWater, 0 + setmetatile 55, 19, METATILE_General_CalmWater, 0 + setmetatile 52, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 20, METATILE_General_CalmWater, 0 + setmetatile 54, 20, METATILE_General_CalmWater, 0 + setmetatile 55, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 21, METATILE_General_CalmWater, 0 + setmetatile 54, 21, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F + setmetatile 57, 9, METATILE_General_CalmWater, 0 + setmetatile 58, 9, METATILE_General_CalmWater, 0 + setmetatile 56, 10, METATILE_General_CalmWater, 0 + setmetatile 57, 10, METATILE_General_CalmWater, 0 + setmetatile 58, 10, METATILE_General_CalmWater, 0 + setmetatile 59, 10, METATILE_General_CalmWater, 0 + setmetatile 56, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 11, METATILE_General_CalmWater, 0 + setmetatile 58, 11, METATILE_General_CalmWater, 0 + setmetatile 59, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 12, METATILE_General_CalmWater, 0 + setmetatile 58, 12, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC + setmetatile 61, 30, METATILE_General_CalmWater, 0 + setmetatile 62, 30, METATILE_General_CalmWater, 0 + setmetatile 60, 31, METATILE_General_CalmWater, 0 + setmetatile 61, 31, METATILE_General_CalmWater, 0 + setmetatile 62, 31, METATILE_General_CalmWater, 0 + setmetatile 63, 31, METATILE_General_CalmWater, 0 + setmetatile 60, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 32, METATILE_General_CalmWater, 0 + setmetatile 62, 32, METATILE_General_CalmWater, 0 + setmetatile 63, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 33, METATILE_General_CalmWater, 0 + setmetatile 62, 33, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149 + setmetatile 16, 14, METATILE_General_CalmWater, 0 + setmetatile 17, 14, METATILE_General_CalmWater, 0 + setmetatile 15, 15, METATILE_General_CalmWater, 0 + setmetatile 16, 15, METATILE_General_CalmWater, 0 + setmetatile 17, 15, METATILE_General_CalmWater, 0 + setmetatile 18, 15, METATILE_General_CalmWater, 0 + setmetatile 15, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 16, METATILE_General_CalmWater, 0 + setmetatile 17, 16, METATILE_General_CalmWater, 0 + setmetatile 18, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 17, METATILE_General_CalmWater, 0 + setmetatile 17, 17, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6 + setmetatile 42, 19, METATILE_General_CalmWater, 0 + setmetatile 43, 19, METATILE_General_CalmWater, 0 + setmetatile 41, 20, METATILE_General_CalmWater, 0 + setmetatile 42, 20, METATILE_General_CalmWater, 0 + setmetatile 43, 20, METATILE_General_CalmWater, 0 + setmetatile 44, 20, METATILE_General_CalmWater, 0 + setmetatile 41, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 21, METATILE_General_CalmWater, 0 + setmetatile 43, 21, METATILE_General_CalmWater, 0 + setmetatile 44, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 22, METATILE_General_CalmWater, 0 + setmetatile 43, 22, METATILE_General_CalmWater, 0 + return + +AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223 + switch VAR_ABNORMAL_WEATHER_LOCATION + case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105North + case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105South + case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125West + case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125East + case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127North + case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127South + case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129West + case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129East + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 + setescapewarp MAP_ROUTE105, 255, 11, 29 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A + setescapewarp MAP_ROUTE105, 255, 21, 54 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 + setescapewarp MAP_ROUTE125, 255, 9, 17 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C + setescapewarp MAP_ROUTE125, 255, 54, 19 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 + setescapewarp MAP_ROUTE127, 255, 58, 10 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE + setescapewarp MAP_ROUTE127, 255, 62, 31 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 + setescapewarp MAP_ROUTE129, 255, 17, 15 + return + +AbnormalWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 + setescapewarp MAP_ROUTE129, 255, 43, 20 + return diff --git a/data/scripts/unusual_weather.inc b/data/scripts/unusual_weather.inc deleted file mode 100644 index ad6985ac8..000000000 --- a/data/scripts/unusual_weather.inc +++ /dev/null @@ -1,426 +0,0 @@ -UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 - setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 - setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 - setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 - setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C - setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F - setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 - setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 - setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 - setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 - setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB - setmetatile 10, 28, METATILE_General_RoughWater, 0 - setmetatile 11, 28, METATILE_General_RoughWater, 0 - setmetatile 9, 29, METATILE_General_RoughWater, 0 - setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 - setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 - setmetatile 12, 29, METATILE_General_RoughWater, 0 - setmetatile 9, 30, METATILE_General_RoughWater, 0 - setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 - setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 - setmetatile 12, 30, METATILE_General_RoughWater, 0 - setmetatile 10, 31, METATILE_General_RoughWater, 0 - setmetatile 11, 31, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 - setmetatile 20, 53, METATILE_General_RoughWater, 0 - setmetatile 21, 53, METATILE_General_RoughWater, 0 - setmetatile 19, 54, METATILE_General_RoughWater, 0 - setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 - setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 - setmetatile 22, 54, METATILE_General_RoughWater, 0 - setmetatile 19, 55, METATILE_General_RoughWater, 0 - setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 - setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 - setmetatile 22, 55, METATILE_General_RoughWater, 0 - setmetatile 20, 56, METATILE_General_RoughWater, 0 - setmetatile 21, 56, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 - setmetatile 8, 16, METATILE_General_RoughWater, 0 - setmetatile 9, 16, METATILE_General_RoughWater, 0 - setmetatile 7, 17, METATILE_General_RoughWater, 0 - setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 - setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 - setmetatile 10, 17, METATILE_General_RoughWater, 0 - setmetatile 7, 18, METATILE_General_RoughWater, 0 - setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 - setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 - setmetatile 10, 18, METATILE_General_RoughWater, 0 - setmetatile 8, 19, METATILE_General_RoughWater, 0 - setmetatile 9, 19, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 - setmetatile 53, 18, METATILE_General_RoughWater, 0 - setmetatile 54, 18, METATILE_General_RoughWater, 0 - setmetatile 52, 19, METATILE_General_RoughWater, 0 - setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 - setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 - setmetatile 55, 19, METATILE_General_RoughWater, 0 - setmetatile 52, 20, METATILE_General_RoughWater, 0 - setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 55, 20, METATILE_General_RoughWater, 0 - setmetatile 53, 21, METATILE_General_RoughWater, 0 - setmetatile 54, 21, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F - setmetatile 57, 9, METATILE_General_RoughWater, 0 - setmetatile 58, 9, METATILE_General_RoughWater, 0 - setmetatile 56, 10, METATILE_General_RoughWater, 0 - setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 - setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 - setmetatile 59, 10, METATILE_General_RoughWater, 0 - setmetatile 56, 11, METATILE_General_RoughWater, 0 - setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 - setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 - setmetatile 59, 11, METATILE_General_RoughWater, 0 - setmetatile 57, 12, METATILE_General_RoughWater, 0 - setmetatile 58, 12, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC - setmetatile 61, 30, METATILE_General_RoughWater, 0 - setmetatile 62, 30, METATILE_General_RoughWater, 0 - setmetatile 60, 31, METATILE_General_RoughWater, 0 - setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 - setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 - setmetatile 63, 31, METATILE_General_RoughWater, 0 - setmetatile 60, 32, METATILE_General_RoughWater, 0 - setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 - setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 - setmetatile 63, 32, METATILE_General_RoughWater, 0 - setmetatile 61, 33, METATILE_General_RoughWater, 0 - setmetatile 62, 33, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 - setmetatile 16, 14, METATILE_General_RoughWater, 0 - setmetatile 17, 14, METATILE_General_RoughWater, 0 - setmetatile 15, 15, METATILE_General_RoughWater, 0 - setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 - setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 - setmetatile 18, 15, METATILE_General_RoughWater, 0 - setmetatile 15, 16, METATILE_General_RoughWater, 0 - setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 - setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 - setmetatile 18, 16, METATILE_General_RoughWater, 0 - setmetatile 16, 17, METATILE_General_RoughWater, 0 - setmetatile 17, 17, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 - setmetatile 42, 19, METATILE_General_RoughWater, 0 - setmetatile 43, 19, METATILE_General_RoughWater, 0 - setmetatile 41, 20, METATILE_General_RoughWater, 0 - setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 44, 20, METATILE_General_RoughWater, 0 - setmetatile 41, 21, METATILE_General_RoughWater, 0 - setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 - setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 - setmetatile 44, 21, METATILE_General_RoughWater, 0 - setmetatile 42, 22, METATILE_General_RoughWater, 0 - setmetatile 43, 22, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13 - setflag FLAG_HIDE_MAP_NAME_POPUP - return - -UnusualWeather_StartKyogreWeather:: @ 8273D17 - setweather WEATHER_RAIN_HEAVY - return - -UnusualWeather_StartGroudonWeather:: @ 8273D1B - setweather WEATHER_DROUGHT - return - -UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F - lockall - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START - goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage - goto UnusualWeather_EventScript_ShowSunEndedMessage - end - -UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 - closemessage - fadescreenswapbuffers 1 - setweather WEATHER_SUNNY - doweather - call UnusualWeather_EventScript_CleanupMapTiles - special DrawWholeMapView - setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 - clearflag FLAG_HIDE_MAP_NAME_POPUP - fadescreenswapbuffers 0 - releaseall - end - -UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 - msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 - end - -UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F - msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 - end - -UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North - case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South - case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West - case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East - case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North - case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South - case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East - case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East - return - -UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 - setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 - setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 - setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 - setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C - setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F - setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 - setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 - setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 - setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 - setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB - setmetatile 10, 28, METATILE_General_CalmWater, 0 - setmetatile 11, 28, METATILE_General_CalmWater, 0 - setmetatile 9, 29, METATILE_General_CalmWater, 0 - setmetatile 10, 29, METATILE_General_CalmWater, 0 - setmetatile 11, 29, METATILE_General_CalmWater, 0 - setmetatile 12, 29, METATILE_General_CalmWater, 0 - setmetatile 9, 30, METATILE_General_CalmWater, 0 - setmetatile 10, 30, METATILE_General_CalmWater, 0 - setmetatile 11, 30, METATILE_General_CalmWater, 0 - setmetatile 12, 30, METATILE_General_CalmWater, 0 - setmetatile 10, 31, METATILE_General_CalmWater, 0 - setmetatile 11, 31, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 - setmetatile 20, 53, METATILE_General_CalmWater, 0 - setmetatile 21, 53, METATILE_General_CalmWater, 0 - setmetatile 19, 54, METATILE_General_CalmWater, 0 - setmetatile 20, 54, METATILE_General_CalmWater, 0 - setmetatile 21, 54, METATILE_General_CalmWater, 0 - setmetatile 22, 54, METATILE_General_CalmWater, 0 - setmetatile 19, 55, METATILE_General_CalmWater, 0 - setmetatile 20, 55, METATILE_General_CalmWater, 0 - setmetatile 21, 55, METATILE_General_CalmWater, 0 - setmetatile 22, 55, METATILE_General_CalmWater, 0 - setmetatile 20, 56, METATILE_General_CalmWater, 0 - setmetatile 21, 56, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 - setmetatile 8, 16, METATILE_General_CalmWater, 0 - setmetatile 9, 16, METATILE_General_CalmWater, 0 - setmetatile 7, 17, METATILE_General_CalmWater, 0 - setmetatile 8, 17, METATILE_General_CalmWater, 0 - setmetatile 9, 17, METATILE_General_CalmWater, 0 - setmetatile 10, 17, METATILE_General_CalmWater, 0 - setmetatile 7, 18, METATILE_General_CalmWater, 0 - setmetatile 8, 18, METATILE_General_CalmWater, 0 - setmetatile 9, 18, METATILE_General_CalmWater, 0 - setmetatile 10, 18, METATILE_General_CalmWater, 0 - setmetatile 8, 19, METATILE_General_CalmWater, 0 - setmetatile 9, 19, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 - setmetatile 53, 18, METATILE_General_CalmWater, 0 - setmetatile 54, 18, METATILE_General_CalmWater, 0 - setmetatile 52, 19, METATILE_General_CalmWater, 0 - setmetatile 53, 19, METATILE_General_CalmWater, 0 - setmetatile 54, 19, METATILE_General_CalmWater, 0 - setmetatile 55, 19, METATILE_General_CalmWater, 0 - setmetatile 52, 20, METATILE_General_CalmWater, 0 - setmetatile 53, 20, METATILE_General_CalmWater, 0 - setmetatile 54, 20, METATILE_General_CalmWater, 0 - setmetatile 55, 20, METATILE_General_CalmWater, 0 - setmetatile 53, 21, METATILE_General_CalmWater, 0 - setmetatile 54, 21, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F - setmetatile 57, 9, METATILE_General_CalmWater, 0 - setmetatile 58, 9, METATILE_General_CalmWater, 0 - setmetatile 56, 10, METATILE_General_CalmWater, 0 - setmetatile 57, 10, METATILE_General_CalmWater, 0 - setmetatile 58, 10, METATILE_General_CalmWater, 0 - setmetatile 59, 10, METATILE_General_CalmWater, 0 - setmetatile 56, 11, METATILE_General_CalmWater, 0 - setmetatile 57, 11, METATILE_General_CalmWater, 0 - setmetatile 58, 11, METATILE_General_CalmWater, 0 - setmetatile 59, 11, METATILE_General_CalmWater, 0 - setmetatile 57, 12, METATILE_General_CalmWater, 0 - setmetatile 58, 12, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC - setmetatile 61, 30, METATILE_General_CalmWater, 0 - setmetatile 62, 30, METATILE_General_CalmWater, 0 - setmetatile 60, 31, METATILE_General_CalmWater, 0 - setmetatile 61, 31, METATILE_General_CalmWater, 0 - setmetatile 62, 31, METATILE_General_CalmWater, 0 - setmetatile 63, 31, METATILE_General_CalmWater, 0 - setmetatile 60, 32, METATILE_General_CalmWater, 0 - setmetatile 61, 32, METATILE_General_CalmWater, 0 - setmetatile 62, 32, METATILE_General_CalmWater, 0 - setmetatile 63, 32, METATILE_General_CalmWater, 0 - setmetatile 61, 33, METATILE_General_CalmWater, 0 - setmetatile 62, 33, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 - setmetatile 16, 14, METATILE_General_CalmWater, 0 - setmetatile 17, 14, METATILE_General_CalmWater, 0 - setmetatile 15, 15, METATILE_General_CalmWater, 0 - setmetatile 16, 15, METATILE_General_CalmWater, 0 - setmetatile 17, 15, METATILE_General_CalmWater, 0 - setmetatile 18, 15, METATILE_General_CalmWater, 0 - setmetatile 15, 16, METATILE_General_CalmWater, 0 - setmetatile 16, 16, METATILE_General_CalmWater, 0 - setmetatile 17, 16, METATILE_General_CalmWater, 0 - setmetatile 18, 16, METATILE_General_CalmWater, 0 - setmetatile 16, 17, METATILE_General_CalmWater, 0 - setmetatile 17, 17, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 - setmetatile 42, 19, METATILE_General_CalmWater, 0 - setmetatile 43, 19, METATILE_General_CalmWater, 0 - setmetatile 41, 20, METATILE_General_CalmWater, 0 - setmetatile 42, 20, METATILE_General_CalmWater, 0 - setmetatile 43, 20, METATILE_General_CalmWater, 0 - setmetatile 44, 20, METATILE_General_CalmWater, 0 - setmetatile 41, 21, METATILE_General_CalmWater, 0 - setmetatile 42, 21, METATILE_General_CalmWater, 0 - setmetatile 43, 21, METATILE_General_CalmWater, 0 - setmetatile 44, 21, METATILE_General_CalmWater, 0 - setmetatile 42, 22, METATILE_General_CalmWater, 0 - setmetatile 43, 22, METATILE_General_CalmWater, 0 - return - -UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 - setescapewarp MAP_ROUTE105, 255, 11, 29 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A - setescapewarp MAP_ROUTE105, 255, 21, 54 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 - setescapewarp MAP_ROUTE125, 255, 9, 17 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C - setescapewarp MAP_ROUTE125, 255, 54, 19 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 - setescapewarp MAP_ROUTE127, 255, 58, 10 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE - setescapewarp MAP_ROUTE127, 255, 62, 31 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 - setescapewarp MAP_ROUTE129, 255, 17, 15 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 - setescapewarp MAP_ROUTE129, 255, 43, 20 - return -- cgit v1.2.3 From 49f1a90534180445d293761e2bdac165b49319a2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 9 Dec 2019 02:10:42 -0500 Subject: Document Battle Pike scripts --- data/scripts/battle_pike.inc | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index a0f0f6618..dd730a644 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -6,71 +6,71 @@ BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25 pike_setroomobjects pike_getroomtype switch VAR_RESULT - case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 - case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 - case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0 - case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2 - case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 - case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93 - case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2 - case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF + case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos + case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos + case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos + case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos + case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos + case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos + case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93:: @ 82C3E93 +BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos:: @ 82C3E93 setobjectxyperm 1, 2, 5 setobjectxyperm 2, 6, 5 end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2:: @ 82C3EA2 +BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos:: @ 82C3EA2 setobjectxyperm 1, 4, 4 setobjectxyperm 2, 3, 4 end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1:: @ 82C3EB1 +BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos:: @ 82C3EB1 setobjectxyperm 1, 4, 4 setobjectxyperm 2, 0, 0 end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0:: @ 82C3EC0 +BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos:: @ 82C3EC0 setobjectxyperm 1, 5, 5 setobjectxyperm 2, 0, 0 end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF:: @ 82C3ECF +BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos:: @ 82C3ECF setobjectxyperm 1, 4, 3 setobjectxyperm 2, 4, 4 end BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects .2byte 0 -BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 +BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST pike_getroomtype compare VAR_RESULT, PIKE_ROOM_STATUS - goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE - goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom compare VAR_RESULT, PIKE_ROOM_DOUBLE_BATTLE - goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom compare VAR_RESULT, PIKE_ROOM_BRAIN - goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35:: @ 82C3F35 +BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35 setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F:: @ 82C3F3F +BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially end BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E @@ -125,12 +125,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049 waitstate end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062 +BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom:: @ 82C4062 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D +BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall @@ -138,12 +138,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D closemessage end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082:: @ 82C4082 +BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom:: @ 82C4082 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D +BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall @@ -193,7 +193,7 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 return -BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 +BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174 pike_exitwildmonroom pike_ispartyfullhealth compare VAR_RESULT, TRUE @@ -214,12 +214,12 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 waitstate end -BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202:: @ 82C4202 +BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom:: @ 82C4202 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D:: @ 82C420D +BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall @@ -234,14 +234,14 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 end BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E - setorcopyvar VAR_0x8006, VAR_RESULT + setorcopyvar VAR_0x8006, VAR_RESULT @ Save VAR_RESULT from being overwritten frontier_get FRONTIER_DATA_CHALLENGE_STATUS compare VAR_RESULT, CHALLENGE_STATUS_PAUSED - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume compare VAR_RESULT, CHALLENGE_STATUS_SAVING - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B +BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume:: @ 82C426B setorcopyvar VAR_RESULT, VAR_0x8006 end -- cgit v1.2.3 From 75b0c9d7a9edabc742bc42f19d078fa2ae64870c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Dec 2019 03:28:55 -0500 Subject: Document Battle Pyramid scripts --- data/scripts/field_poison.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index d15da3399..ccdebd5cd 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -34,9 +34,9 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq BattleFrontier_BattlePike_EventScript_Retire pyramid_inchallenge compare VAR_RESULT, 1 @ On Pyramid floor - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost compare VAR_RESULT, 2 @ On Pyramid peak - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost trainerhill_inchallenge compare VAR_RESULT, TRUE goto_if_eq TrainerHill_1F_EventScript_Lost -- cgit v1.2.3 From 6967caefb246f9709032049b0ae2baee71f71eb6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Dec 2019 02:35:37 -0500 Subject: Split finditem_std from giveitem_std --- data/scripts/item_ball_scripts.inc | 330 ++++++++++++++++++------------------- 1 file changed, 165 insertions(+), 165 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 045fbb5a7..5e926afc0 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -1,659 +1,659 @@ Route102_EventScript_ItemPotion:: @ 8290CD8 - giveitem_std ITEM_POTION, 1, 1 + finditem_std ITEM_POTION end Route103_EventScript_ItemGuardSpec:: @ 8290CE5 - giveitem_std ITEM_GUARD_SPEC, 1, 1 + finditem_std ITEM_GUARD_SPEC end Route103_EventScript_ItemPPUp:: @ 8290CF2 - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end Route104_EventScript_ItemPPUp:: @ 8290CFF - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end Route104_EventScript_ItemPokeBall:: @ 8290D0C - giveitem_std ITEM_POKE_BALL, 1, 1 + finditem_std ITEM_POKE_BALL end Route104_EventScript_ItemXAccuracy:: @ 8290D19 - giveitem_std ITEM_X_ACCURACY, 1, 1 + finditem_std ITEM_X_ACCURACY end Route104_EventScript_ItemPotion:: @ 8290D26 - giveitem_std ITEM_POTION, 1, 1 + finditem_std ITEM_POTION end Route105_EventScript_ItemIron:: @ 8290D33 - giveitem_std ITEM_IRON, 1, 1 + finditem_std ITEM_IRON end Route106_EventScript_ItemProtein:: @ 8290D40 - giveitem_std ITEM_PROTEIN, 1, 1 + finditem_std ITEM_PROTEIN end Route108_EventScript_ItemStarPiece:: @ 8290D4D - giveitem_std ITEM_STAR_PIECE, 1, 1 + finditem_std ITEM_STAR_PIECE end Route109_EventScript_ItemPPUp:: @ 8290D5A - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end Route109_EventScript_ItemPotion:: @ 8290D67 - giveitem_std ITEM_POTION, 1, 1 + finditem_std ITEM_POTION end Route110_EventScript_ItemRareCandy:: @ 8290D74 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end Route110_EventScript_ItemDireHit:: @ 8290D81 - giveitem_std ITEM_DIRE_HIT, 1, 1 + finditem_std ITEM_DIRE_HIT end Route110_EventScript_ItemElixir:: @ 8290D8E - giveitem_std ITEM_ELIXIR, 1, 1 + finditem_std ITEM_ELIXIR end Route111_EventScript_ItemTM37:: @ 8290D9B - giveitem_std ITEM_TM37, 1, 1 + finditem_std ITEM_TM37 end Route111_EventScript_ItemStardust:: @ 8290DA8 - giveitem_std ITEM_STARDUST, 1, 1 + finditem_std ITEM_STARDUST end Route111_EventScript_ItemHPUp:: @ 8290DB5 - giveitem_std ITEM_HP_UP, 1, 1 + finditem_std ITEM_HP_UP end Route111_EventScript_ItemElixir:: @ 8290DC2 - giveitem_std ITEM_ELIXIR, 1, 1 + finditem_std ITEM_ELIXIR end Route112_EventScript_ItemNugget:: @ 8290DCF - giveitem_std ITEM_NUGGET, 1, 1 + finditem_std ITEM_NUGGET end Route113_EventScript_ItemMaxEther:: @ 8290DDC - giveitem_std ITEM_MAX_ETHER, 1, 1 + finditem_std ITEM_MAX_ETHER end Route113_EventScript_ItemSuperRepel:: @ 8290DE9 - giveitem_std ITEM_SUPER_REPEL, 1, 1 + finditem_std ITEM_SUPER_REPEL end Route113_EventScript_ItemHyperPotion:: @ 8290DF6 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem_std ITEM_HYPER_POTION end Route114_EventScript_ItemRareCandy:: @ 8290E03 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end Route114_EventScript_ItemProtein:: @ 8290E10 - giveitem_std ITEM_PROTEIN, 1, 1 + finditem_std ITEM_PROTEIN end Route114_EventScript_ItemEnergyPowder:: @ 8290E1D - giveitem_std ITEM_ENERGY_POWDER, 1, 1 + finditem_std ITEM_ENERGY_POWDER end Route115_EventScript_ItemSuperPotion:: @ 8290E2A - giveitem_std ITEM_SUPER_POTION, 1, 1 + finditem_std ITEM_SUPER_POTION end Route115_EventScript_ItemTM01:: @ 8290E37 - giveitem_std ITEM_TM01, 1, 1 + finditem_std ITEM_TM01 end Route115_EventScript_ItemIron:: @ 8290E44 - giveitem_std ITEM_IRON, 1, 1 + finditem_std ITEM_IRON end Route115_EventScript_ItemGreatBall:: @ 8290E51 - giveitem_std ITEM_GREAT_BALL, 1, 1 + finditem_std ITEM_GREAT_BALL end Route115_EventScript_ItemHealPowder:: @ 8290E5E - giveitem_std ITEM_HEAL_POWDER, 1, 1 + finditem_std ITEM_HEAL_POWDER end Route115_EventScript_ItemPPUp:: @ 8290E6B - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end Route116_EventScript_ItemXSpecial:: @ 8290E78 - giveitem_std ITEM_X_SPECIAL, 1, 1 + finditem_std ITEM_X_SPECIAL end Route116_EventScript_ItemEther:: @ 8290E85 - giveitem_std ITEM_ETHER, 1, 1 + finditem_std ITEM_ETHER end Route116_EventScript_ItemRepel:: @ 8290E92 - giveitem_std ITEM_REPEL, 1, 1 + finditem_std ITEM_REPEL end Route116_EventScript_ItemHPUp:: @ 8290E9F - giveitem_std ITEM_HP_UP, 1, 1 + finditem_std ITEM_HP_UP end Route116_EventScript_ItemPotion:: @ 8290EAC - giveitem_std ITEM_POTION, 1, 1 + finditem_std ITEM_POTION end Route117_EventScript_ItemGreatBall:: @ 8290EB9 - giveitem_std ITEM_GREAT_BALL, 1, 1 + finditem_std ITEM_GREAT_BALL end Route117_EventScript_ItemRevive:: @ 8290EC6 - giveitem_std ITEM_REVIVE, 1, 1 + finditem_std ITEM_REVIVE end Route118_EventScript_ItemHyperPotion:: @ 8290ED3 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem_std ITEM_HYPER_POTION end Route119_EventScript_ItemSuperRepel:: @ 8290EE0 - giveitem_std ITEM_SUPER_REPEL, 1, 1 + finditem_std ITEM_SUPER_REPEL end Route119_EventScript_ItemZinc:: @ 8290EED - giveitem_std ITEM_ZINC, 1, 1 + finditem_std ITEM_ZINC end Route119_EventScript_ItemElixir:: @ 8290EFA - giveitem_std ITEM_ELIXIR, 1, 1 + finditem_std ITEM_ELIXIR end Route119_EventScript_ItemLeafStone:: @ 8290F07 - giveitem_std ITEM_LEAF_STONE, 1, 1 + finditem_std ITEM_LEAF_STONE end Route119_EventScript_ItemRareCandy:: @ 8290F14 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end Route119_EventScript_ItemHyperPotion:: @ 8290F21 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem_std ITEM_HYPER_POTION end Route119_EventScript_ItemHyperPotion2:: @ 8290F2E - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem_std ITEM_HYPER_POTION end Route119_EventScript_ItemElixir2:: @ 8290F3B - giveitem_std ITEM_ELIXIR, 1, 1 + finditem_std ITEM_ELIXIR end Route120_EventScript_ItemNugget:: @ 8290F48 - giveitem_std ITEM_NUGGET, 1, 1 + finditem_std ITEM_NUGGET end Route120_EventScript_ItemFullHeal:: @ 8290F55 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem_std ITEM_FULL_HEAL end Route120_EventScript_ItemHyperPotion:: @ 8290F62 - giveitem_std ITEM_HYPER_POTION, 1, 1 + finditem_std ITEM_HYPER_POTION end Route120_EventScript_ItemNestBall:: @ 8290F6F - giveitem_std ITEM_NEST_BALL, 1, 1 + finditem_std ITEM_NEST_BALL end Route120_EventScript_ItemRevive:: @ 8290F7C - giveitem_std ITEM_REVIVE, 1, 1 + finditem_std ITEM_REVIVE end Route121_EventScript_ItemCarbos:: @ 8290F89 - giveitem_std ITEM_CARBOS, 1, 1 + finditem_std ITEM_CARBOS end Route121_EventScript_ItemRevive:: @ 8290F96 - giveitem_std ITEM_REVIVE, 1, 1 + finditem_std ITEM_REVIVE end Route121_EventScript_ItemZinc:: @ 8290FA3 - giveitem_std ITEM_ZINC, 1, 1 + finditem_std ITEM_ZINC end Route123_EventScript_ItemCalcium:: @ 8290FB0 - giveitem_std ITEM_CALCIUM, 1, 1 + finditem_std ITEM_CALCIUM end Route123_EventScript_ItemUltraBall:: @ 8290FBD - giveitem_std ITEM_ULTRA_BALL, 1, 1 + finditem_std ITEM_ULTRA_BALL end Route123_EventScript_ItemElixir:: @ 8290FCA - giveitem_std ITEM_ELIXIR, 1, 1 + finditem_std ITEM_ELIXIR end Route123_EventScript_ItemPPUp:: @ 8290FD7 - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end Route123_EventScript_ItemRevivalHerb:: @ 8290FE4 - giveitem_std ITEM_REVIVAL_HERB, 1, 1 + finditem_std ITEM_REVIVAL_HERB end Route124_EventScript_ItemRedShard:: @ 8290FF1 - giveitem_std ITEM_RED_SHARD, 1, 1 + finditem_std ITEM_RED_SHARD end Route124_EventScript_ItemBlueShard:: @ 8290FFE - giveitem_std ITEM_BLUE_SHARD, 1, 1 + finditem_std ITEM_BLUE_SHARD end Route124_EventScript_ItemYellowShard:: @ 829100B - giveitem_std ITEM_YELLOW_SHARD, 1, 1 + finditem_std ITEM_YELLOW_SHARD end Route125_EventScript_ItemBigPearl:: @ 8291018 - giveitem_std ITEM_BIG_PEARL, 1, 1 + finditem_std ITEM_BIG_PEARL end Route126_EventScript_ItemGreenShard:: @ 8291025 - giveitem_std ITEM_GREEN_SHARD, 1, 1 + finditem_std ITEM_GREEN_SHARD end Route127_EventScript_ItemZinc:: @ 8291032 - giveitem_std ITEM_ZINC, 1, 1 + finditem_std ITEM_ZINC end Route127_EventScript_ItemCarbos:: @ 829103F - giveitem_std ITEM_CARBOS, 1, 1 + finditem_std ITEM_CARBOS end Route127_EventScript_ItemRareCandy:: @ 829104C - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end Route132_EventScript_ItemRareCandy:: @ 8291059 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end Route132_EventScript_ItemProtein:: @ 8291066 - giveitem_std ITEM_PROTEIN, 1, 1 + finditem_std ITEM_PROTEIN end Route133_EventScript_ItemBigPearl:: @ 8291073 - giveitem_std ITEM_BIG_PEARL, 1, 1 + finditem_std ITEM_BIG_PEARL end Route133_EventScript_ItemStarPiece:: @ 8291080 - giveitem_std ITEM_STAR_PIECE, 1, 1 + finditem_std ITEM_STAR_PIECE end Route133_EventScript_ItemMaxRevive:: @ 829108D - giveitem_std ITEM_MAX_REVIVE, 1, 1 + finditem_std ITEM_MAX_REVIVE end Route134_EventScript_ItemCarbos:: @ 829109A - giveitem_std ITEM_CARBOS, 1, 1 + finditem_std ITEM_CARBOS end Route134_EventScript_ItemStarPiece:: @ 82910A7 - giveitem_std ITEM_STAR_PIECE, 1, 1 + finditem_std ITEM_STAR_PIECE end PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4 - giveitem_std ITEM_MAX_REVIVE, 1, 1 + finditem_std ITEM_MAX_REVIVE end PetalburgCity_EventScript_ItemEther:: @ 82910C1 - giveitem_std ITEM_ETHER, 1, 1 + finditem_std ITEM_ETHER end MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE - giveitem_std ITEM_X_SPEED, 1, 1 + finditem_std ITEM_X_SPEED end RustboroCity_EventScript_ItemXDefend:: @ 82910DB - giveitem_std ITEM_X_DEFEND, 1, 1 + finditem_std ITEM_X_DEFEND end LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8 - giveitem_std ITEM_MAX_REPEL, 1, 1 + finditem_std ITEM_MAX_REPEL end MossdeepCity_EventScript_ItemNetBall:: @ 82910F5 - giveitem_std ITEM_NET_BALL, 1, 1 + finditem_std ITEM_NET_BALL end PetalburgWoods_EventScript_ItemXAttack:: @ 8291102 - giveitem_std ITEM_X_ATTACK, 1, 1 + finditem_std ITEM_X_ATTACK end PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F - giveitem_std ITEM_GREAT_BALL, 1, 1 + finditem_std ITEM_GREAT_BALL end PetalburgWoods_EventScript_ItemEther:: @ 829111C - giveitem_std ITEM_ETHER, 1, 1 + finditem_std ITEM_ETHER end PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129 - giveitem_std ITEM_PARALYZE_HEAL, 1, 1 + finditem_std ITEM_PARALYZE_HEAL end RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136 - giveitem_std ITEM_POKE_BALL, 1, 1 + finditem_std ITEM_POKE_BALL end RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143 - giveitem_std ITEM_MAX_ETHER, 1, 1 + finditem_std ITEM_MAX_ETHER end GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150 - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem_std ITEM_ESCAPE_ROPE end GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D - giveitem_std ITEM_POKE_BALL, 1, 1 + finditem_std ITEM_POKE_BALL end GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A - giveitem_std ITEM_REPEL, 1, 1 + finditem_std ITEM_REPEL end GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177 - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end JaggedPass_EventScript_ItemBurnHeal:: @ 8291184 - giveitem_std ITEM_BURN_HEAL, 1, 1 + finditem_std ITEM_BURN_HEAL end FieryPath_EventScript_ItemFireStone:: @ 8291191 - giveitem_std ITEM_FIRE_STONE, 1, 1 + finditem_std ITEM_FIRE_STONE end FieryPath_EventScript_ItemTM06:: @ 829119E - giveitem_std ITEM_TM06, 1, 1 + finditem_std ITEM_TM06 end MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB - giveitem_std ITEM_TM23, 1, 1 + finditem_std ITEM_TM23 end MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem_std ITEM_FULL_HEAL end MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5 - giveitem_std ITEM_MOON_STONE, 1, 1 + finditem_std ITEM_MOON_STONE end MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2 - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF - giveitem_std ITEM_TM02, 1, 1 + finditem_std ITEM_TM02 end NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC - giveitem_std ITEM_ULTRA_BALL, 1, 1 + finditem_std ITEM_ULTRA_BALL end NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9 - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem_std ITEM_ESCAPE_ROPE end NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206 - giveitem_std ITEM_THUNDER_STONE, 1, 1 + finditem_std ITEM_THUNDER_STONE end NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem_std ITEM_FULL_HEAL end NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220 - giveitem_std ITEM_PARALYZE_HEAL, 1, 1 + finditem_std ITEM_PARALYZE_HEAL end AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D - giveitem_std ITEM_HARBOR_MAIL, 1, 1 + finditem_std ITEM_HARBOR_MAIL end AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem_std ITEM_ESCAPE_ROPE end AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247 - giveitem_std ITEM_DIVE_BALL, 1, 1 + finditem_std ITEM_DIVE_BALL end AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254 - giveitem_std ITEM_TM13, 1, 1 + finditem_std ITEM_TM13 end AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261 - giveitem_std ITEM_REVIVE, 1, 1 + finditem_std ITEM_REVIVE end AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E - giveitem_std ITEM_STORAGE_KEY, 1, 1 + finditem_std ITEM_STORAGE_KEY end AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B - giveitem_std ITEM_LUXURY_BALL, 1, 1 + finditem_std ITEM_LUXURY_BALL end AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288 - giveitem_std ITEM_SCANNER, 1, 1 + finditem_std ITEM_SCANNER end AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295 - giveitem_std ITEM_WATER_STONE, 1, 1 + finditem_std ITEM_WATER_STONE end AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2 - giveitem_std ITEM_TM18, 1, 1 + finditem_std ITEM_TM18 end ScorchedSlab_EventScript_ItemTM11:: @ 82912AF - giveitem_std ITEM_TM11, 1, 1 + finditem_std ITEM_TM11 end SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC - giveitem_std ITEM_TM22, 1, 1 + finditem_std ITEM_TM22 end SafariZone_North_EventScript_ItemCalcium:: @ 82912C9 - giveitem_std ITEM_CALCIUM, 1, 1 + finditem_std ITEM_CALCIUM end SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6 - giveitem_std ITEM_MAX_REVIVE, 1, 1 + finditem_std ITEM_MAX_REVIVE end SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3 - giveitem_std ITEM_NUGGET, 1, 1 + finditem_std ITEM_NUGGET end SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0 - giveitem_std ITEM_BIG_PEARL, 1, 1 + finditem_std ITEM_BIG_PEARL end MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD - giveitem_std ITEM_ULTRA_BALL, 1, 1 + finditem_std ITEM_ULTRA_BALL end MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A - giveitem_std ITEM_SUPER_REPEL, 1, 1 + finditem_std ITEM_SUPER_REPEL end MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317 - giveitem_std ITEM_SEA_INCENSE, 1, 1 + finditem_std ITEM_SEA_INCENSE end MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324 - giveitem_std ITEM_LAX_INCENSE, 1, 1 + finditem_std ITEM_LAX_INCENSE end MtPyre_6F_EventScript_ItemTM30:: @ 8291331 - giveitem_std ITEM_TM30, 1, 1 + finditem_std ITEM_TM30 end MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E - giveitem_std ITEM_MAX_POTION, 1, 1 + finditem_std ITEM_MAX_POTION end MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B - giveitem_std ITEM_TM48, 1, 1 + finditem_std ITEM_TM48 end AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358 - giveitem_std ITEM_MASTER_BALL, 1, 1 + finditem_std ITEM_MASTER_BALL end AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365 - giveitem_std ITEM_NUGGET, 1, 1 + finditem_std ITEM_NUGGET end AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372 - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem_std ITEM_MAX_ELIXIR end AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F - giveitem_std ITEM_NEST_BALL, 1, 1 + finditem_std ITEM_NEST_BALL end AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C - giveitem_std ITEM_MASTER_BALL, 1, 1 // Unused + finditem_std ITEM_MASTER_BALL // Unused end Route119_EventScript_ItemNugget:: @ 8291399 - giveitem_std ITEM_NUGGET, 1, 1 + finditem_std ITEM_NUGGET end Route119_EventScript_ItemMaxElixir:: @ 82913A6 - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem_std ITEM_MAX_ELIXIR end Route119_EventScript_ItemNestBall:: @ 82913B3 - giveitem_std ITEM_NEST_BALL, 1, 1 + finditem_std ITEM_NEST_BALL end ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0 - giveitem_std ITEM_BIG_PEARL, 1, 1 + finditem_std ITEM_BIG_PEARL end ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA - giveitem_std ITEM_ICE_HEAL, 1, 1 + finditem_std ITEM_ICE_HEAL end ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7 - giveitem_std ITEM_TM07, 1, 1 + finditem_std ITEM_TM07 end ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4 - giveitem_std ITEM_NEVER_MELT_ICE, 1, 1 + finditem_std ITEM_NEVER_MELT_ICE end SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401 - giveitem_std ITEM_TM26, 1, 1 + finditem_std ITEM_TM26 end Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E - giveitem_std ITEM_ORANGE_MAIL, 1, 1 + finditem_std ITEM_ORANGE_MAIL end Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B - giveitem_std ITEM_HARBOR_MAIL, 1, 1 + finditem_std ITEM_HARBOR_MAIL end Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428 - giveitem_std ITEM_WAVE_MAIL, 1, 1 + finditem_std ITEM_WAVE_MAIL end Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435 - giveitem_std ITEM_SHADOW_MAIL, 1, 1 + finditem_std ITEM_SHADOW_MAIL end Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442 - giveitem_std ITEM_WOOD_MAIL, 1, 1 + finditem_std ITEM_WOOD_MAIL end Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F - giveitem_std ITEM_MECH_MAIL, 1, 1 + finditem_std ITEM_MECH_MAIL end Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C - giveitem_std ITEM_GLITTER_MAIL, 1, 1 + finditem_std ITEM_GLITTER_MAIL end Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469 - giveitem_std ITEM_TROPIC_MAIL, 1, 1 + finditem_std ITEM_TROPIC_MAIL end Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476 - giveitem_std ITEM_BEAD_MAIL, 1, 1 + finditem_std ITEM_BEAD_MAIL end VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483 - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem_std ITEM_MAX_ELIXIR end VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490 - giveitem_std ITEM_PP_UP, 1, 1 + finditem_std ITEM_PP_UP end VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D - giveitem_std ITEM_TM29, 1, 1 + finditem_std ITEM_TM29 end VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA - giveitem_std ITEM_FULL_RESTORE, 1, 1 + finditem_std ITEM_FULL_RESTORE end VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7 - giveitem_std ITEM_FULL_HEAL, 1, 1 + finditem_std ITEM_FULL_HEAL end ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4 - giveitem_std ITEM_HP_UP, 1, 1 + finditem_std ITEM_HP_UP end ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1 - giveitem_std ITEM_CARBOS, 1, 1 + finditem_std ITEM_CARBOS end MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE - giveitem_std ITEM_RARE_CANDY, 1, 1 + finditem_std ITEM_RARE_CANDY end MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB - giveitem_std ITEM_MAX_ELIXIR, 1, 1 + finditem_std ITEM_MAX_ELIXIR end MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8 - giveitem_std ITEM_FULL_RESTORE, 1, 1 + finditem_std ITEM_FULL_RESTORE end MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505 - giveitem_std ITEM_NUGGET, 1, 1 + finditem_std ITEM_NUGGET end MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512 - giveitem_std ITEM_PP_MAX, 1, 1 + finditem_std ITEM_PP_MAX end MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F - giveitem_std ITEM_MAX_REVIVE, 1, 1 + finditem_std ITEM_MAX_REVIVE end MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C - giveitem_std ITEM_ESCAPE_ROPE, 1, 1 + finditem_std ITEM_ESCAPE_ROPE end -- cgit v1.2.3 From 96ec5e1b84f2c1d189dc67b53a113d0299b4f37b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Dec 2019 11:42:50 -0500 Subject: Use fadescreen constants --- data/scripts/abnormal_weather.inc | 4 ++-- data/scripts/apprentice.inc | 2 +- data/scripts/berry_blender.inc | 8 ++++---- data/scripts/berry_tree.inc | 2 +- data/scripts/cable_club.inc | 18 +++++++++--------- data/scripts/day_care.inc | 2 +- data/scripts/field_poison.inc | 4 ++-- data/scripts/lilycove_lady.inc | 8 ++++---- data/scripts/pc_transfer.inc | 2 +- data/scripts/players_house.inc | 4 ++-- data/scripts/safari_zone.inc | 2 +- data/scripts/secret_base.inc | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc index 9a900f315..88da0405f 100644 --- a/data/scripts/abnormal_weather.inc +++ b/data/scripts/abnormal_weather.inc @@ -179,7 +179,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 closemessage - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK setweather WEATHER_SUNNY doweather call AbnormalWeather_EventScript_CleanupMapTiles @@ -187,7 +187,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0 clearflag FLAG_HIDE_MAP_NAME_POPUP - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK releaseall end diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 53b43a1f9..b3ae904a0 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -96,7 +96,7 @@ Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM apprentice_freequestion Apprentice_EventScript_ChooseHoldItem: @ 82B6B09 - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_RESULT, 0 apprentice_openbag compare VAR_RESULT, FALSE diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 1d0862a65..b699c8e04 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -302,7 +302,7 @@ BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE @ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left BerryBlender_EventScript_DoBerryBlending: @ 8293D2C copyvar VAR_0x8004, VAR_0x8009 - fadescreen 1 + fadescreen FADE_TO_BLACK special DoBerryBlending waitstate releaseall @@ -629,7 +629,7 @@ BerryBlender_EventScript_FourPlayerLink: @ 8294139 BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147 setvar VAR_0x8004, 0 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 240 removeobject 239 removeobject 238 @@ -678,7 +678,7 @@ BerryBlender_EventScript_LinkError: @ 829419D end BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA - fadescreen 1 + fadescreen FADE_TO_BLACK specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 @@ -687,7 +687,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA end BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4 - fadescreen 0 + fadescreen FADE_FROM_BLACK switch VAR_0x8008 case 2, BerryBlender_EventScript_TwoPlayerLink case 3, BerryBlender_EventScript_ThreePlayerLink diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6b2da5ccb..f4b592b69 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -39,7 +39,7 @@ BerryTree_EventScript_WantToPlant:: @ 8274374 end BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393 - fadescreen 1 + fadescreen FADE_TO_BLACK closemessage special Bag_ChooseBerry waitstate diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f37596961..2da5fa6b6 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -723,7 +723,7 @@ EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E end EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -734,7 +734,7 @@ EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 end EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -745,7 +745,7 @@ EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 end EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -756,7 +756,7 @@ EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE end EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -838,14 +838,14 @@ RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471 CableClub_EventScript_ReadTrainerCard:: @ 827747E msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special Script_ShowLinkTrainerCard waitstate end CableClub_EventScript_ReadTrainerCardColored:: @ 827748D msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special Script_ShowLinkTrainerCard waitstate end @@ -1309,7 +1309,7 @@ EventScript_WirelessBoxResults:: @ 8277B8A specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE goto_if_eq CableClub_EventScript_AdapterNotConnected - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_801A42C waitstate msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT @@ -1408,7 +1408,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 compare VAR_RESULT, FALSE goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate @@ -1427,7 +1427,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 compare VAR_RESULT, FALSE goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 968464f9d..6506897ee 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -102,7 +102,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56 compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseSendDaycareMon waitstate compare VAR_0x8004, 255 diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index ccdebd5cd..3ce36b384 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -15,7 +15,7 @@ EventScript_FieldWhiteOut:: @ 82736D9 waitbuttonpress special Script_FadeOutMapMusic waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter special SetCB2WhiteOut waitstate @@ -42,7 +42,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq TrainerHill_1F_EventScript_Lost special Script_FadeOutMapMusic waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK special SetCB2WhiteOut waitstate end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index f553ea0ad..c2ff593cf 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -73,7 +73,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E end LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_RESULT, 0 special Script_FavorLadyOpenBagMenu waitstate @@ -326,7 +326,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778 LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785 msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_RESULT, 0 special Script_QuizLadyOpenBagMenu waitstate @@ -350,7 +350,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE special ClearQuizLadyPlayerAnswer setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 - fadescreen 1 + fadescreen FADE_TO_BLACK special QuizLadySetCustomQuestion waitstate compare VAR_RESULT, 0 @@ -418,7 +418,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0 end LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA - fadescreen 1 + fadescreen FADE_TO_BLACK special OpenPokeblockCaseForContestLady waitstate compare VAR_RESULT, 0xFFFF diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc index cc583022d..ec58b26f1 100644 --- a/data/scripts/pc_transfer.inc +++ b/data/scripts/pc_transfer.inc @@ -6,7 +6,7 @@ Common_EventScript_GetGiftMonPartySlot:: @ 827378B return Common_EventScript_NameReceivedBoxMon:: @ 8273797 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangeBoxPokemonNickname waitstate lock diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 1b706e603..58618efe7 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -101,14 +101,14 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F incrementgamestat GAME_STAT_CHECKED_CLOCK - fadescreen 1 + fadescreen FADE_TO_BLACK special Special_ViewWallClock waitstate releaseall end PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849 - fadescreen 1 + fadescreen FADE_TO_BLACK special StartWallClock waitstate return diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 72d1d3c92..6a811d935 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -52,7 +52,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC end SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0 - fadescreen 1 + fadescreen FADE_TO_BLACK special OpenPokeblockCaseOnFeeder waitstate compare VAR_RESULT, 0xFFFF diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 617b19b42..0f2ad02b1 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -214,10 +214,10 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8 msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK special MoveOutOfSecretBaseFromOutside closemessage - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance -- cgit v1.2.3 From d1cf9006fb4b29e63302c69c912e431a873626c0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 17 Dec 2019 03:24:44 -0500 Subject: Document some warp/field screen effect --- data/scripts/cable_club.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f37596961..8b4259151 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -391,7 +391,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD goto_if_eq CableClub_EventScript_WarpTo4PColosseum special SetCableClubWarp warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8 - special sub_80AF948 + special DoCableClubWarp waitstate end @@ -404,7 +404,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B CableClub_EventScript_WarpTo4PColosseum:: @ 8277036 special SetCableClubWarp warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 - special sub_80AF948 + special DoCableClubWarp waitstate end @@ -494,7 +494,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A release special SetCableClubWarp setwarp MAP_TRADE_CENTER, 255, 5, 8 - special sub_80AF948 + special DoCableClubWarp waitstate end @@ -569,7 +569,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C release special SetCableClubWarp setwarp MAP_RECORD_CORNER, 255, 8, 9 - special sub_80AF948 + special DoCableClubWarp waitstate end @@ -618,7 +618,7 @@ MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9 @ Unused CableClub_EventScript_CableClubWarp:: @ 8277306 special SetCableClubWarp - special sub_80AF948 + special DoCableClubWarp waitstate end -- cgit v1.2.3 From 9e08cfe55f632fd749ce64c0e54eb93bd10926dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Dec 2019 19:22:39 -0500 Subject: Remove uses of compare_var_to --- data/scripts/mevent_altering_cave.inc | 2 +- data/scripts/mevent_aurora_ticket.inc | 4 ++-- data/scripts/mevent_battle_card.inc | 2 +- data/scripts/mevent_mystic_ticket.inc | 4 ++-- data/scripts/mevent_old_sea_map.inc | 4 ++-- data/scripts/mevent_pichu.inc | 12 ++++++------ data/scripts/mevent_trainer.inc | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc index 072005934..499907edd 100644 --- a/data/scripts/mevent_altering_cave.inc +++ b/data/scripts/mevent_altering_cave.inc @@ -1,7 +1,7 @@ MysteryEventScript_AlteringCave:: @ 86756E3 setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + compare VAR_ALTERING_CAVE_WILD_SET, 10 vgoto_if_ne MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryEventScript_AlteringCave_: @ 86756FD diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc index 811c840aa..177d69681 100644 --- a/data/scripts/mevent_aurora_ticket.inc +++ b/data/scripts/mevent_aurora_ticket.inc @@ -7,13 +7,13 @@ MysteryEventScript_AuroraTicket:: @ 867533C checkflag FLAG_BATTLED_DEOXYS vgoto_if_eq AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, TRUE + compare VAR_RESULT, TRUE vgoto_if_eq AuroraTicket_Obtained vmessage sText_AuroraTicketForYou waitmessage waitbuttonpress checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, FALSE + compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace giveitem_std ITEM_AURORA_TICKET setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc index 8c36ed63a..77f9a9b24 100644 --- a/data/scripts/mevent_battle_card.inc +++ b/data/scripts/mevent_battle_card.inc @@ -4,7 +4,7 @@ MysteryEventScript_BattleCard:: @ 867513C vgoto_if_eq MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON specialvar VAR_0x8008, GetMysteryEventCardVal - compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES + compare VAR_0x8008, REQUIRED_CARD_BATTLES vgoto_if_ne MysteryEventScript_BattleCardInfo lock faceplayer diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc index 0264fb77f..9d532b043 100644 --- a/data/scripts/mevent_mystic_ticket.inc +++ b/data/scripts/mevent_mystic_ticket.inc @@ -9,13 +9,13 @@ MysteryEventScript_MysticTicket:: @ 867550B checkflag FLAG_CAUGHT_HO_OH vgoto_if_eq MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, TRUE + compare VAR_RESULT, TRUE vgoto_if_eq MysticTicket_Obtained vmessage sText_MysticTicketForYou waitmessage waitbuttonpress checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, FALSE + compare VAR_RESULT, FALSE vgoto_if_eq MysticTicket_NoBagSpace giveitem_std ITEM_MYSTIC_TICKET setflag FLAG_ENABLE_SHIP_NAVEL_ROCK diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc index dffb56caa..45c5f6728 100644 --- a/data/scripts/mevent_old_sea_map.inc +++ b/data/scripts/mevent_old_sea_map.inc @@ -7,13 +7,13 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 checkflag FLAG_CAUGHT_MEW vgoto_if_eq OldSeaMap_Obtained checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, TRUE + compare VAR_RESULT, TRUE vgoto_if_eq OldSeaMap_Obtained vmessage sText_MysteryGiftOldSeaMapForYou waitmessage waitbuttonpress checkitemspace ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, FALSE + compare VAR_RESULT, FALSE vgoto_if_eq OldSeaMap_NoBagSpace giveitem_std ITEM_OLD_SEA_MAP setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index 4df317564..4f5c739af 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -6,7 +6,7 @@ MysteryEventScript_SurfPichu:: @ 8674D3D SurfPichu_GiveIfPossible: @ 8674D4C specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE vgoto_if_eq SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg @@ -33,15 +33,15 @@ SurfPichu_GiveEgg: @ 8674D7E giveegg SPECIES_PICHU setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + compare VAR_EVENT_PICHU_SLOT, 1 vgoto_if_eq SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + compare VAR_EVENT_PICHU_SLOT, 2 vgoto_if_eq SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + compare VAR_EVENT_PICHU_SLOT, 3 vgoto_if_eq SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + compare VAR_EVENT_PICHU_SLOT, 4 vgoto_if_eq SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + compare VAR_EVENT_PICHU_SLOT, 5 vgoto_if_eq SurfPichu_Slot5 return diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc index 1b0117078..4114750d8 100644 --- a/data/scripts/mevent_trainer.inc +++ b/data/scripts/mevent_trainer.inc @@ -1,7 +1,7 @@ MysteryEventScript_VisitingTrainer:: @ 8674EC1 setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if_eq MysteryEventScript_VisitingTrainerArrived lock faceplayer -- cgit v1.2.3 From f2e7b1507e564ba3b6b027a17aeeec2f89fba8c8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 11 Jan 2020 12:02:58 -0500 Subject: Port some macro/script fixes from pokefirered --- data/scripts/berry_blender.inc | 4 +- data/scripts/cable_club.inc | 14 +- data/scripts/contest_hall.inc | 6 +- data/scripts/item_ball_scripts.inc | 330 +++++++++++++++++----------------- data/scripts/lilycove_lady.inc | 4 +- data/scripts/mevent_aurora_ticket.inc | 8 +- data/scripts/mevent_battle_card.inc | 5 +- data/scripts/mevent_mystic_ticket.inc | 11 +- data/scripts/mevent_old_sea_map.inc | 8 +- data/scripts/mevent_pichu.inc | 3 +- data/scripts/obtain_item.inc | 8 +- data/scripts/players_house.inc | 4 +- data/scripts/secret_power_tm.inc | 2 +- data/scripts/std_msgbox.inc | 48 +++++ data/scripts/trainer_battle.inc | 7 + 15 files changed, 254 insertions(+), 208 deletions(-) create mode 100644 data/scripts/std_msgbox.inc (limited to 'data/scripts') diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index b699c8e04..a3dc2a8e2 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -263,7 +263,7 @@ BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92 BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT - giveitem_std ITEM_PECHA_BERRY + giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY goto BerryBlender_EventScript_UseBerryBlender1 end @@ -551,7 +551,7 @@ BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028 BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032 msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT - giveitem_std ITEM_PECHA_BERRY + giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT release diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f27692448..ce299b864 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -41,7 +41,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23 goto_if_eq CableClub_EventScript_AlreadyGotEonTicket goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT - giveitem_std ITEM_EON_TICKET + giveitem ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET setvar VAR_DISTRIBUTE_EON_TICKET, 0 msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT @@ -383,7 +383,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -488,7 +488,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -563,7 +563,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -965,7 +965,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 5, 1 waitdooranim special Script_ResetUnionRoomTrade @@ -1296,7 +1296,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -1488,7 +1488,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E closemessage applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 release waitstate end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index cabf923b6..9775c40dc 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -15,7 +15,7 @@ LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3 msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT - giveitem_std ITEM_POKEBLOCK_CASE + giveitem ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT return @@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13 end LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C - giveitem_std ITEM_LUXURY_BALL + giveitem ITEM_LUXURY_BALL compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter setvar VAR_CONTEST_PRIZE_PICKUP, 0 @@ -1236,7 +1236,7 @@ ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8 return ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD - giveitem_std ITEM_LUXURY_BALL + giveitem ITEM_LUXURY_BALL compare VAR_RESULT, FALSE goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall lockall diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 5e926afc0..2876e9e8c 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -1,659 +1,659 @@ Route102_EventScript_ItemPotion:: @ 8290CD8 - finditem_std ITEM_POTION + finditem ITEM_POTION end Route103_EventScript_ItemGuardSpec:: @ 8290CE5 - finditem_std ITEM_GUARD_SPEC + finditem ITEM_GUARD_SPEC end Route103_EventScript_ItemPPUp:: @ 8290CF2 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route104_EventScript_ItemPPUp:: @ 8290CFF - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route104_EventScript_ItemPokeBall:: @ 8290D0C - finditem_std ITEM_POKE_BALL + finditem ITEM_POKE_BALL end Route104_EventScript_ItemXAccuracy:: @ 8290D19 - finditem_std ITEM_X_ACCURACY + finditem ITEM_X_ACCURACY end Route104_EventScript_ItemPotion:: @ 8290D26 - finditem_std ITEM_POTION + finditem ITEM_POTION end Route105_EventScript_ItemIron:: @ 8290D33 - finditem_std ITEM_IRON + finditem ITEM_IRON end Route106_EventScript_ItemProtein:: @ 8290D40 - finditem_std ITEM_PROTEIN + finditem ITEM_PROTEIN end Route108_EventScript_ItemStarPiece:: @ 8290D4D - finditem_std ITEM_STAR_PIECE + finditem ITEM_STAR_PIECE end Route109_EventScript_ItemPPUp:: @ 8290D5A - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route109_EventScript_ItemPotion:: @ 8290D67 - finditem_std ITEM_POTION + finditem ITEM_POTION end Route110_EventScript_ItemRareCandy:: @ 8290D74 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route110_EventScript_ItemDireHit:: @ 8290D81 - finditem_std ITEM_DIRE_HIT + finditem ITEM_DIRE_HIT end Route110_EventScript_ItemElixir:: @ 8290D8E - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route111_EventScript_ItemTM37:: @ 8290D9B - finditem_std ITEM_TM37 + finditem ITEM_TM37 end Route111_EventScript_ItemStardust:: @ 8290DA8 - finditem_std ITEM_STARDUST + finditem ITEM_STARDUST end Route111_EventScript_ItemHPUp:: @ 8290DB5 - finditem_std ITEM_HP_UP + finditem ITEM_HP_UP end Route111_EventScript_ItemElixir:: @ 8290DC2 - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route112_EventScript_ItemNugget:: @ 8290DCF - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end Route113_EventScript_ItemMaxEther:: @ 8290DDC - finditem_std ITEM_MAX_ETHER + finditem ITEM_MAX_ETHER end Route113_EventScript_ItemSuperRepel:: @ 8290DE9 - finditem_std ITEM_SUPER_REPEL + finditem ITEM_SUPER_REPEL end Route113_EventScript_ItemHyperPotion:: @ 8290DF6 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route114_EventScript_ItemRareCandy:: @ 8290E03 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route114_EventScript_ItemProtein:: @ 8290E10 - finditem_std ITEM_PROTEIN + finditem ITEM_PROTEIN end Route114_EventScript_ItemEnergyPowder:: @ 8290E1D - finditem_std ITEM_ENERGY_POWDER + finditem ITEM_ENERGY_POWDER end Route115_EventScript_ItemSuperPotion:: @ 8290E2A - finditem_std ITEM_SUPER_POTION + finditem ITEM_SUPER_POTION end Route115_EventScript_ItemTM01:: @ 8290E37 - finditem_std ITEM_TM01 + finditem ITEM_TM01 end Route115_EventScript_ItemIron:: @ 8290E44 - finditem_std ITEM_IRON + finditem ITEM_IRON end Route115_EventScript_ItemGreatBall:: @ 8290E51 - finditem_std ITEM_GREAT_BALL + finditem ITEM_GREAT_BALL end Route115_EventScript_ItemHealPowder:: @ 8290E5E - finditem_std ITEM_HEAL_POWDER + finditem ITEM_HEAL_POWDER end Route115_EventScript_ItemPPUp:: @ 8290E6B - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route116_EventScript_ItemXSpecial:: @ 8290E78 - finditem_std ITEM_X_SPECIAL + finditem ITEM_X_SPECIAL end Route116_EventScript_ItemEther:: @ 8290E85 - finditem_std ITEM_ETHER + finditem ITEM_ETHER end Route116_EventScript_ItemRepel:: @ 8290E92 - finditem_std ITEM_REPEL + finditem ITEM_REPEL end Route116_EventScript_ItemHPUp:: @ 8290E9F - finditem_std ITEM_HP_UP + finditem ITEM_HP_UP end Route116_EventScript_ItemPotion:: @ 8290EAC - finditem_std ITEM_POTION + finditem ITEM_POTION end Route117_EventScript_ItemGreatBall:: @ 8290EB9 - finditem_std ITEM_GREAT_BALL + finditem ITEM_GREAT_BALL end Route117_EventScript_ItemRevive:: @ 8290EC6 - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end Route118_EventScript_ItemHyperPotion:: @ 8290ED3 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route119_EventScript_ItemSuperRepel:: @ 8290EE0 - finditem_std ITEM_SUPER_REPEL + finditem ITEM_SUPER_REPEL end Route119_EventScript_ItemZinc:: @ 8290EED - finditem_std ITEM_ZINC + finditem ITEM_ZINC end Route119_EventScript_ItemElixir:: @ 8290EFA - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route119_EventScript_ItemLeafStone:: @ 8290F07 - finditem_std ITEM_LEAF_STONE + finditem ITEM_LEAF_STONE end Route119_EventScript_ItemRareCandy:: @ 8290F14 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route119_EventScript_ItemHyperPotion:: @ 8290F21 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route119_EventScript_ItemHyperPotion2:: @ 8290F2E - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route119_EventScript_ItemElixir2:: @ 8290F3B - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route120_EventScript_ItemNugget:: @ 8290F48 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end Route120_EventScript_ItemFullHeal:: @ 8290F55 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end Route120_EventScript_ItemHyperPotion:: @ 8290F62 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route120_EventScript_ItemNestBall:: @ 8290F6F - finditem_std ITEM_NEST_BALL + finditem ITEM_NEST_BALL end Route120_EventScript_ItemRevive:: @ 8290F7C - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end Route121_EventScript_ItemCarbos:: @ 8290F89 - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end Route121_EventScript_ItemRevive:: @ 8290F96 - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end Route121_EventScript_ItemZinc:: @ 8290FA3 - finditem_std ITEM_ZINC + finditem ITEM_ZINC end Route123_EventScript_ItemCalcium:: @ 8290FB0 - finditem_std ITEM_CALCIUM + finditem ITEM_CALCIUM end Route123_EventScript_ItemUltraBall:: @ 8290FBD - finditem_std ITEM_ULTRA_BALL + finditem ITEM_ULTRA_BALL end Route123_EventScript_ItemElixir:: @ 8290FCA - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route123_EventScript_ItemPPUp:: @ 8290FD7 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route123_EventScript_ItemRevivalHerb:: @ 8290FE4 - finditem_std ITEM_REVIVAL_HERB + finditem ITEM_REVIVAL_HERB end Route124_EventScript_ItemRedShard:: @ 8290FF1 - finditem_std ITEM_RED_SHARD + finditem ITEM_RED_SHARD end Route124_EventScript_ItemBlueShard:: @ 8290FFE - finditem_std ITEM_BLUE_SHARD + finditem ITEM_BLUE_SHARD end Route124_EventScript_ItemYellowShard:: @ 829100B - finditem_std ITEM_YELLOW_SHARD + finditem ITEM_YELLOW_SHARD end Route125_EventScript_ItemBigPearl:: @ 8291018 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end Route126_EventScript_ItemGreenShard:: @ 8291025 - finditem_std ITEM_GREEN_SHARD + finditem ITEM_GREEN_SHARD end Route127_EventScript_ItemZinc:: @ 8291032 - finditem_std ITEM_ZINC + finditem ITEM_ZINC end Route127_EventScript_ItemCarbos:: @ 829103F - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end Route127_EventScript_ItemRareCandy:: @ 829104C - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route132_EventScript_ItemRareCandy:: @ 8291059 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route132_EventScript_ItemProtein:: @ 8291066 - finditem_std ITEM_PROTEIN + finditem ITEM_PROTEIN end Route133_EventScript_ItemBigPearl:: @ 8291073 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end Route133_EventScript_ItemStarPiece:: @ 8291080 - finditem_std ITEM_STAR_PIECE + finditem ITEM_STAR_PIECE end Route133_EventScript_ItemMaxRevive:: @ 829108D - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end Route134_EventScript_ItemCarbos:: @ 829109A - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end Route134_EventScript_ItemStarPiece:: @ 82910A7 - finditem_std ITEM_STAR_PIECE + finditem ITEM_STAR_PIECE end PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4 - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end PetalburgCity_EventScript_ItemEther:: @ 82910C1 - finditem_std ITEM_ETHER + finditem ITEM_ETHER end MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE - finditem_std ITEM_X_SPEED + finditem ITEM_X_SPEED end RustboroCity_EventScript_ItemXDefend:: @ 82910DB - finditem_std ITEM_X_DEFEND + finditem ITEM_X_DEFEND end LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8 - finditem_std ITEM_MAX_REPEL + finditem ITEM_MAX_REPEL end MossdeepCity_EventScript_ItemNetBall:: @ 82910F5 - finditem_std ITEM_NET_BALL + finditem ITEM_NET_BALL end PetalburgWoods_EventScript_ItemXAttack:: @ 8291102 - finditem_std ITEM_X_ATTACK + finditem ITEM_X_ATTACK end PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F - finditem_std ITEM_GREAT_BALL + finditem ITEM_GREAT_BALL end PetalburgWoods_EventScript_ItemEther:: @ 829111C - finditem_std ITEM_ETHER + finditem ITEM_ETHER end PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129 - finditem_std ITEM_PARALYZE_HEAL + finditem ITEM_PARALYZE_HEAL end RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136 - finditem_std ITEM_POKE_BALL + finditem ITEM_POKE_BALL end RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143 - finditem_std ITEM_MAX_ETHER + finditem ITEM_MAX_ETHER end GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150 - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D - finditem_std ITEM_POKE_BALL + finditem ITEM_POKE_BALL end GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A - finditem_std ITEM_REPEL + finditem ITEM_REPEL end GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end JaggedPass_EventScript_ItemBurnHeal:: @ 8291184 - finditem_std ITEM_BURN_HEAL + finditem ITEM_BURN_HEAL end FieryPath_EventScript_ItemFireStone:: @ 8291191 - finditem_std ITEM_FIRE_STONE + finditem ITEM_FIRE_STONE end FieryPath_EventScript_ItemTM06:: @ 829119E - finditem_std ITEM_TM06 + finditem ITEM_TM06 end MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB - finditem_std ITEM_TM23 + finditem ITEM_TM23 end MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5 - finditem_std ITEM_MOON_STONE + finditem ITEM_MOON_STONE end MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF - finditem_std ITEM_TM02 + finditem ITEM_TM02 end NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC - finditem_std ITEM_ULTRA_BALL + finditem ITEM_ULTRA_BALL end NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9 - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206 - finditem_std ITEM_THUNDER_STONE + finditem ITEM_THUNDER_STONE end NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220 - finditem_std ITEM_PARALYZE_HEAL + finditem ITEM_PARALYZE_HEAL end AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D - finditem_std ITEM_HARBOR_MAIL + finditem ITEM_HARBOR_MAIL end AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247 - finditem_std ITEM_DIVE_BALL + finditem ITEM_DIVE_BALL end AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254 - finditem_std ITEM_TM13 + finditem ITEM_TM13 end AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261 - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E - finditem_std ITEM_STORAGE_KEY + finditem ITEM_STORAGE_KEY end AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B - finditem_std ITEM_LUXURY_BALL + finditem ITEM_LUXURY_BALL end AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288 - finditem_std ITEM_SCANNER + finditem ITEM_SCANNER end AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295 - finditem_std ITEM_WATER_STONE + finditem ITEM_WATER_STONE end AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2 - finditem_std ITEM_TM18 + finditem ITEM_TM18 end ScorchedSlab_EventScript_ItemTM11:: @ 82912AF - finditem_std ITEM_TM11 + finditem ITEM_TM11 end SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC - finditem_std ITEM_TM22 + finditem ITEM_TM22 end SafariZone_North_EventScript_ItemCalcium:: @ 82912C9 - finditem_std ITEM_CALCIUM + finditem ITEM_CALCIUM end SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6 - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD - finditem_std ITEM_ULTRA_BALL + finditem ITEM_ULTRA_BALL end MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A - finditem_std ITEM_SUPER_REPEL + finditem ITEM_SUPER_REPEL end MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317 - finditem_std ITEM_SEA_INCENSE + finditem ITEM_SEA_INCENSE end MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324 - finditem_std ITEM_LAX_INCENSE + finditem ITEM_LAX_INCENSE end MtPyre_6F_EventScript_ItemTM30:: @ 8291331 - finditem_std ITEM_TM30 + finditem ITEM_TM30 end MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E - finditem_std ITEM_MAX_POTION + finditem ITEM_MAX_POTION end MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B - finditem_std ITEM_TM48 + finditem ITEM_TM48 end AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358 - finditem_std ITEM_MASTER_BALL + finditem ITEM_MASTER_BALL end AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372 - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F - finditem_std ITEM_NEST_BALL + finditem ITEM_NEST_BALL end AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C - finditem_std ITEM_MASTER_BALL // Unused + finditem ITEM_MASTER_BALL // Unused end Route119_EventScript_ItemNugget:: @ 8291399 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end Route119_EventScript_ItemMaxElixir:: @ 82913A6 - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end Route119_EventScript_ItemNestBall:: @ 82913B3 - finditem_std ITEM_NEST_BALL + finditem ITEM_NEST_BALL end ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA - finditem_std ITEM_ICE_HEAL + finditem ITEM_ICE_HEAL end ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7 - finditem_std ITEM_TM07 + finditem ITEM_TM07 end ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4 - finditem_std ITEM_NEVER_MELT_ICE + finditem ITEM_NEVER_MELT_ICE end SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401 - finditem_std ITEM_TM26 + finditem ITEM_TM26 end Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E - finditem_std ITEM_ORANGE_MAIL + finditem ITEM_ORANGE_MAIL end Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B - finditem_std ITEM_HARBOR_MAIL + finditem ITEM_HARBOR_MAIL end Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428 - finditem_std ITEM_WAVE_MAIL + finditem ITEM_WAVE_MAIL end Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435 - finditem_std ITEM_SHADOW_MAIL + finditem ITEM_SHADOW_MAIL end Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442 - finditem_std ITEM_WOOD_MAIL + finditem ITEM_WOOD_MAIL end Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F - finditem_std ITEM_MECH_MAIL + finditem ITEM_MECH_MAIL end Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C - finditem_std ITEM_GLITTER_MAIL + finditem ITEM_GLITTER_MAIL end Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469 - finditem_std ITEM_TROPIC_MAIL + finditem ITEM_TROPIC_MAIL end Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476 - finditem_std ITEM_BEAD_MAIL + finditem ITEM_BEAD_MAIL end VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483 - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D - finditem_std ITEM_TM29 + finditem ITEM_TM29 end VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA - finditem_std ITEM_FULL_RESTORE + finditem ITEM_FULL_RESTORE end VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4 - finditem_std ITEM_HP_UP + finditem ITEM_HP_UP end ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1 - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8 - finditem_std ITEM_FULL_RESTORE + finditem ITEM_FULL_RESTORE end MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512 - finditem_std ITEM_PP_MAX + finditem ITEM_PP_MAX end MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index c2ff593cf..bdd670031 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -129,7 +129,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510 setvar VAR_0x8004, 0 specialvar VAR_0x8004, FavorLadyGetPrize msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT - giveitem_std VAR_0x8004 + giveitem VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize compare VAR_RESULT, 1 @@ -297,7 +297,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724 setvar VAR_0x8005, 0 special BufferQuizPrizeItem special SetQuizLadyState_Complete - giveitem_std VAR_0x8005 + giveitem VAR_0x8005 compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc index 177d69681..f26be068f 100644 --- a/data/scripts/mevent_aurora_ticket.inc +++ b/data/scripts/mevent_aurora_ticket.inc @@ -2,10 +2,8 @@ MysteryEventScript_AuroraTicket:: @ 867533C setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if_eq AuroraTicket_Obtained - checkflag FLAG_BATTLED_DEOXYS - vgoto_if_eq AuroraTicket_Obtained + vgoto_if_set FLAG_RECEIVED_AURORA_TICKET, AuroraTicket_Obtained + vgoto_if_set FLAG_BATTLED_DEOXYS, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, TRUE vgoto_if_eq AuroraTicket_Obtained @@ -15,7 +13,7 @@ MysteryEventScript_AuroraTicket:: @ 867533C checkitemspace ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace - giveitem_std ITEM_AURORA_TICKET + giveitem ITEM_AURORA_TICKET setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_RECEIVED_AURORA_TICKET vmessage sText_AuroraTicketUseAtPort diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc index 77f9a9b24..70462bdd9 100644 --- a/data/scripts/mevent_battle_card.inc +++ b/data/scripts/mevent_battle_card.inc @@ -1,7 +1,6 @@ MysteryEventScript_BattleCard:: @ 867513C setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_eq MysteryEventScript_BattleCardInfo + vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON specialvar VAR_0x8008, GetMysteryEventCardVal compare VAR_0x8008, REQUIRED_CARD_BATTLES @@ -11,7 +10,7 @@ MysteryEventScript_BattleCard:: @ 867513C vmessage sText_MysteryGiftBattleCountCard_WonPrize waitmessage waitbuttonpress - giveitem_std ITEM_POTION + giveitem ITEM_POTION release setflag FLAG_MYSTERY_EVENT_DONE end diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc index 9d532b043..8f938dc33 100644 --- a/data/scripts/mevent_mystic_ticket.inc +++ b/data/scripts/mevent_mystic_ticket.inc @@ -2,12 +2,9 @@ MysteryEventScript_MysticTicket:: @ 867550B setvaddress MysteryEventScript_MysticTicket lock faceplayer - checkflag FLAG_RECEIVED_MYSTIC_TICKET - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_LUGIA - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_HO_OH - vgoto_if_eq MysticTicket_Obtained + vgoto_if_set FLAG_RECEIVED_MYSTIC_TICKET, MysticTicket_Obtained + vgoto_if_set FLAG_CAUGHT_LUGIA, MysticTicket_Obtained + vgoto_if_set FLAG_CAUGHT_HO_OH, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, TRUE vgoto_if_eq MysticTicket_Obtained @@ -17,7 +14,7 @@ MysteryEventScript_MysticTicket:: @ 867550B checkitemspace ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE vgoto_if_eq MysticTicket_NoBagSpace - giveitem_std ITEM_MYSTIC_TICKET + giveitem ITEM_MYSTIC_TICKET setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_RECEIVED_MYSTIC_TICKET vmessage sText_MysticTicketUseAtPort diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc index 45c5f6728..0fb3c1002 100644 --- a/data/scripts/mevent_old_sea_map.inc +++ b/data/scripts/mevent_old_sea_map.inc @@ -2,10 +2,8 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 setvaddress MysteryEventScript_OldSeaMap lock faceplayer - checkflag FLAG_RECEIVED_OLD_SEA_MAP - vgoto_if_eq OldSeaMap_Obtained - checkflag FLAG_CAUGHT_MEW - vgoto_if_eq OldSeaMap_Obtained + vgoto_if_set FLAG_RECEIVED_OLD_SEA_MAP, OldSeaMap_Obtained + vgoto_if_set FLAG_CAUGHT_MEW, OldSeaMap_Obtained checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, TRUE vgoto_if_eq OldSeaMap_Obtained @@ -15,7 +13,7 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 checkitemspace ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, FALSE vgoto_if_eq OldSeaMap_NoBagSpace - giveitem_std ITEM_OLD_SEA_MAP + giveitem ITEM_OLD_SEA_MAP setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND setflag FLAG_RECEIVED_OLD_SEA_MAP vmessage sText_MysteryGiftOldSeaMapUseAtPort diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index 4f5c739af..cc947e396 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -1,7 +1,6 @@ MysteryEventScript_SurfPichu:: @ 8674D3D setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_ne SurfPichu_GiveIfPossible + vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible returnram SurfPichu_GiveIfPossible: @ 8674D4C diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 77b795f60..3afd92588 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -1,5 +1,5 @@ Std_ObtainItem:: @ 8271AD3 - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT call EventScript_ObtainItemMessage return @@ -73,7 +73,7 @@ EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 return Std_ObtainDecoration:: @ 8271BB7 - givedecoration VAR_0x8000 + adddecoration VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call EventScript_ObtainDecorationMessage return @@ -118,7 +118,7 @@ Std_FindItem:: @ 8271BFD EventScript_PickUpItem:: @ 8271C3A removeobject VAR_LAST_TALKED - giveitem VAR_0x8004, VAR_0x8005 + additem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, BufferTMHMMoveName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 @@ -156,7 +156,7 @@ EventScript_NoRoomToPickUpItem:: @ 8271CA1 EventScript_HiddenItemScript:: @ 8271CB7 lockall waitse - giveitem VAR_0x8005, 1 + additem VAR_0x8005 copyvar VAR_0x8007, VAR_RESULT bufferitemnameplural 1, VAR_0x8005, 1 checkitemtype VAR_0x8005 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 58618efe7..8f15fcd58 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -345,7 +345,7 @@ PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43 PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51 goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT - giveitem_std ITEM_AMULET_COIN + giveitem ITEM_AMULET_COIN compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT @@ -448,7 +448,7 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 compare VAR_0x8008, FEMALE call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT - giveitem_std ITEM_SS_TICKET + giveitem ITEM_SS_TICKET msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT closemessage delay 20 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 7be69ec58..6684ec98b 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -44,7 +44,7 @@ Route111_EventScript_SecretPowerMan:: @ 82765FF end Route111_EventScript_GiveSecretPower:: @ 827661E - giveitem_std ITEM_TM43 + giveitem ITEM_TM43 compare VAR_RESULT, FALSE goto_if_eq Route111_EventScript_NoRoomForSecretPower msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc new file mode 100644 index 000000000..1d82bb381 --- /dev/null +++ b/data/scripts/std_msgbox.inc @@ -0,0 +1,48 @@ +Std_MsgboxNPC: @ 8271315 + lock + faceplayer + message 0x0 + waitmessage + waitbuttonpress + release + return + +Std_MsgboxSign: @ 8271320 + lockall + message 0x0 + waitmessage + waitbuttonpress + releaseall + return + +Std_MsgboxDefault: @ 827132A + message 0x0 + waitmessage + waitbuttonpress + return + +Std_MsgboxYesNo: @ 8271332 + message 0x0 + waitmessage + yesnobox 20, 8 + return + +Std_MsgboxGetPoints: @ 827133C + message 0x0 + playfanfare MUS_ME_POINTGET + waitfanfare + waitmessage + return + +Std_10: @ 8271347 + pokenavcall 0x0 + waitmessage + return + +EventScript_UnusedReturn: @ 827134E + return + +Common_EventScript_SaveGame:: @ 827134F + special SaveGame + waitstate + return diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 0ba8bcda6..d609fcc93 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -130,3 +130,10 @@ EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript releaseall end + +Std_MsgboxAutoclose:: @ 8271494 + message 0x0 + waitmessage + waitbuttonpress + release + return -- cgit v1.2.3 From 6a470ddfdaf4480190792823464fcc05df8704f7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 04:26:26 -0500 Subject: Some script clean up, document secret base secrets show --- data/scripts/secret_base.inc | 42 ++++++++++++++++++------------------- data/scripts/shared_secret_base.inc | 20 +++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 0f2ad02b1..aa5f63b9e 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -364,7 +364,7 @@ SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25 end SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT @@ -401,7 +401,7 @@ SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D end SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7 - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT @@ -438,7 +438,7 @@ SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15 end SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT @@ -475,7 +475,7 @@ SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D end SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97 - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT @@ -512,7 +512,7 @@ SecretBase_EventScript_Trainer4PreChampion:: @ 8276005 end SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT @@ -549,7 +549,7 @@ SecretBase_EventScript_Trainer5PreChampion:: @ 827607D end SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087 - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT @@ -586,7 +586,7 @@ SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5 end SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT @@ -623,7 +623,7 @@ SecretBase_EventScript_Trainer7PreChampion:: @ 827616D end SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177 - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT @@ -660,7 +660,7 @@ SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5 end SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT @@ -697,7 +697,7 @@ SecretBase_EventScript_Trainer9PreChampion:: @ 827625D end SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267 - special sub_80EB300 + special DeclinedSecretBaseBattle setvar VAR_RESULT, 0 special SetBattledOwnerFromResult msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT @@ -716,35 +716,35 @@ SecretBase_EventScript_BattleTrainer:: @ 8276286 special DoSpecialTrainerBattle waitstate compare VAR_RESULT, B_OUTCOME_DREW - call_if_eq SecretBase_EventScript_2762BD + call_if_eq SecretBase_EventScript_DrewSecretBaseBattle compare VAR_RESULT, B_OUTCOME_WON - call_if_eq SecretBase_EventScript_2762C1 + call_if_eq SecretBase_EventScript_WonSecretBaseBattle compare VAR_RESULT, B_OUTCOME_LOST - call_if_eq SecretBase_EventScript_2762C5 + call_if_eq SecretBase_EventScript_LostSecretBaseBattle special HealPlayerParty release end -SecretBase_EventScript_2762BD:: @ 82762BD - special sub_80EB438 +SecretBase_EventScript_DrewSecretBaseBattle:: @ 82762BD + special DrewSecretBaseBattle return -SecretBase_EventScript_2762C1:: @ 82762C1 - special sub_80EB368 +SecretBase_EventScript_WonSecretBaseBattle:: @ 82762C1 + special WonSecretBaseBattle return -SecretBase_EventScript_2762C5:: @ 82762C5 - special sub_80EB3D0 +SecretBase_EventScript_LostSecretBaseBattle:: @ 82762C5 + special LostSecretBaseBattle return .include "data/scripts/secret_power_tm.inc" SecretBase_EventScript_DollInteract:: @ 82766A2 - special sub_80EB290 + special CheckInteractedWithFriendsDollDecor end SecretBase_EventScript_CushionInteract:: @ 82766A6 - special sub_80EB2C8 + special CheckInteractedWithFriendsCushionDecor end SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index de5dcc703..0fa61a214 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -157,33 +157,33 @@ SecretBase_EventScript_PCTurnOff:: @ 823B66E end @ Unused -SecretBase_EventScript_23B674:: @ 823B674 - special SetSecretBaseSecretsTvFlags_Poster +SecretBase_EventScript_Poster:: @ 823B674 + special CheckInteractedWithFriendsPosterDecor end @ Unused -SecretBase_EventScript_23B678:: @ 823B678 - special SetSecretBaseSecretsTvFlags_MiscFurnature +SecretBase_EventScript_FurnitureBottom:: @ 823B678 + special CheckInteractedWithFriendsFurnitureBottom end @ Unused -SecretBase_EventScript_23B67C:: @ 823B67C - special SetSecretBaseSecretsTvFlags_LargeDecorationSpot +SecretBase_EventScript_FurnitureMiddle:: @ 823B67C + special CheckInteractedWithFriendsFurnitureMiddle end @ Unused -SecretBase_EventScript_23B680:: @ 823B680 - special SetSecretBaseSecretsTvFlags_SmallDecorationSpot +SecretBase_EventScript_FurnitureTop:: @ 823B680 + special CheckInteractedWithFriendsFurnitureTop end SecretBase_EventScript_SandOrnament:: @ 823B684 - special SetSecretBaseSecretsTvFlags_SandOrnament + special CheckInteractedWithFriendsSandOrnament dofieldeffect FLDEFF_SAND_PILLAR waitstate end SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C - special GetShieldToyTVDecorationInfo + special InteractWithShieldOrTVDecoration compare VAR_RESULT, 0 goto_if_eq SecretBase_EventScript_BattleTowerShield compare VAR_RESULT, 1 -- cgit v1.2.3 From c27a4778eecb8b6c32969ab7520e2d5eaf44f3b9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 15:12:10 -0500 Subject: Standardize prebattle -> intro --- data/scripts/gabby_and_ty.inc | 20 ++++++++++---------- data/scripts/secret_base.inc | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 456f56f45..90b3b3088 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -149,61 +149,61 @@ GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6 end GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16 - trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_TyBattle2:: @ 828CE36 - trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56 - trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_TyBattle3:: @ 828CE76 - trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96 - trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6 - trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6 - trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6 - trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16 - trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 - trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index aa5f63b9e..7bb20e378 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -346,7 +346,7 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6 goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer0PostBattle - msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer0Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle setvar VAR_RESULT, 1 @@ -383,7 +383,7 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer1PostBattle - msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer1Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle setvar VAR_RESULT, 1 @@ -420,7 +420,7 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6 goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer2PostBattle - msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer2Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle setvar VAR_RESULT, 1 @@ -457,7 +457,7 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer3PostBattle - msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer3Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle setvar VAR_RESULT, 1 @@ -494,7 +494,7 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6 goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer4PostBattle - msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer4Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle setvar VAR_RESULT, 1 @@ -531,7 +531,7 @@ SecretBase_EventScript_Trainer5:: @ 827602E goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer5PostBattle - msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer5Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle setvar VAR_RESULT, 1 @@ -568,7 +568,7 @@ SecretBase_EventScript_Trainer6:: @ 82760A6 goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer6PostBattle - msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer6Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle setvar VAR_RESULT, 1 @@ -605,7 +605,7 @@ SecretBase_EventScript_Trainer7:: @ 827611E goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer7PostBattle - msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer7Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle setvar VAR_RESULT, 1 @@ -642,7 +642,7 @@ SecretBase_EventScript_Trainer8:: @ 8276196 goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer8PostBattle - msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer8Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle setvar VAR_RESULT, 1 @@ -679,7 +679,7 @@ SecretBase_EventScript_Trainer9:: @ 827620E goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_Trainer9PostBattle - msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO + msgbox SecretBase_Text_Trainer9Intro, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle setvar VAR_RESULT, 1 -- cgit v1.2.3 From e736c2d2fd7bfb7cbc722a4bdf2e8c7d6bb4376d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 15:26:14 -0500 Subject: Document some easy chat specials --- data/scripts/mystery_event_club.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 6687bbd47..16e9a657f 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -41,7 +41,7 @@ MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB MysteryEventClub_EventScript_ShowProfile:: @ 82915D5 setvar VAR_0x8004, 0 - special sub_811EECC + special ShowEasyChatProfile waitmessage delay 80 msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT -- cgit v1.2.3 From 10220d3b76021044b3e1f7ebc7a2b3b4812813f8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 15:46:49 -0500 Subject: Label TryRecordMixLinkup --- data/scripts/cable_club.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f27692448..006ad9688 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -525,7 +525,7 @@ CableClub_EventScript_RecordCorner:: @ 82771DB goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2E74 + special TryRecordMixLinkup waitstate special sub_80B2EA8 waitstate -- cgit v1.2.3 From c19289596da7ccd86219d3f7e246a2e48a2f9ed7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 12 Jan 2020 23:24:52 -0500 Subject: Give/Take to Add/Remove for silent script macros --- data/scripts/berry_tree.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f4b592b69..18378077c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -45,7 +45,7 @@ BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393 waitstate compare VAR_ITEM_ID, 0 goto_if_eq BerryTree_EventScript_CancelPlanting - takeitem VAR_ITEM_ID, 1 + removeitem VAR_ITEM_ID call BerryTree_EventScript_PlantBerry BerryTree_EventScript_CancelPlanting:: @ 82743AF -- cgit v1.2.3 From 22931846d680de2bc585093678db3f5721aab891 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 13 Jan 2020 21:13:33 -0500 Subject: Fix Colosseum name porymap issue --- data/scripts/cable_club.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4f2fab0f4..4cf046c02 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365 releaseall end -EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374 +EventScript_BattleColosseum_2P_PlayerSpot0:: @ 8277374 setvar VAR_0x8005, 0 special ColosseumPlayerSpotTriggered waitstate end -EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E +EventScript_BattleColosseum_2P_PlayerSpot1:: @ 827737E setvar VAR_0x8005, 1 special ColosseumPlayerSpotTriggered waitstate end -EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 +EventScript_BattleColosseum_4P_PlayerSpot0:: @ 8277388 fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger setvar VAR_0x8005, 0 special ColosseumPlayerSpotTriggered waitstate end -EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 +EventScript_BattleColosseum_4P_PlayerSpot1:: @ 82773A3 fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger setvar VAR_0x8005, 1 special ColosseumPlayerSpotTriggered waitstate end -EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE +EventScript_BattleColosseum_4P_PlayerSpot2:: @ 82773BE fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger setvar VAR_0x8005, 2 special ColosseumPlayerSpotTriggered waitstate end -EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 +EventScript_BattleColosseum_4P_PlayerSpot3:: @ 82773D9 fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger setvar VAR_0x8005, 3 special ColosseumPlayerSpotTriggered waitstate end -EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4 +EventScript_BattleColosseum_4P_CancelSpotTrigger:: @ 82773F4 end EventScript_TradeCenter_Chair0:: @ 82773F5 @@ -855,9 +855,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C closemessage end -BattleColosseum2P_EventScript_Attendant:: @ 82774A6 +BattleColosseum_2P_EventScript_Attendant:: @ 82774A6 special Script_FacePlayer - msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT + msgbox BattleColosseum_2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT special Script_ClearHeldMovement closemessage end -- cgit v1.2.3