diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-11-10 10:59:15 -0500 |
---|---|---|
committer | huderlem <huderlem@gmail.com> | 2019-11-13 18:20:55 -0600 |
commit | af83b41dd19a49121f23d188015959d8072e4d7f (patch) | |
tree | 913414f4989412e8e267d28e6e92c4912caedbbb | |
parent | c0ae1cbc1c9c5c31c129009d521c4d62d15d1c95 (diff) |
Document Contest Hall berry blenders and misc
-rw-r--r-- | data/maps/LilycoveCity_ContestHall/map.json | 76 | ||||
-rw-r--r-- | data/maps/LilycoveCity_ContestHall/scripts.inc | 214 | ||||
-rw-r--r-- | data/maps/LilycoveCity_ContestLobby/map.json | 86 | ||||
-rw-r--r-- | data/maps/LilycoveCity_ContestLobby/scripts.inc | 96 | ||||
-rw-r--r-- | data/scripts/berry_blender.inc | 747 | ||||
-rw-r--r-- | data/scripts/contest_hall.inc | 4 | ||||
-rw-r--r-- | data/scripts/interview.inc | 2 | ||||
-rw-r--r-- | data/scripts/new_game.inc | 2 | ||||
-rw-r--r-- | data/scripts/pokeblocks.inc | 759 | ||||
-rw-r--r-- | data/specials.inc | 2 | ||||
-rw-r--r-- | data/text/berries.inc | 6 | ||||
-rw-r--r-- | data/text/contest_hall.inc | 18 | ||||
-rw-r--r-- | include/constants/field_specials.h | 3 | ||||
-rw-r--r-- | include/constants/flags.h | 4 | ||||
-rw-r--r-- | include/item_menu.h | 2 | ||||
-rw-r--r-- | include/link.h | 4 | ||||
-rw-r--r-- | src/berry_blender.c | 8 | ||||
-rwxr-xr-x | src/berry_crush.c | 2 | ||||
-rw-r--r-- | src/cable_club.c | 6 | ||||
-rw-r--r-- | src/field_specials.c | 26 | ||||
-rwxr-xr-x | src/item_menu.c | 2 | ||||
-rw-r--r-- | src/link.c | 2 |
22 files changed, 1033 insertions, 1038 deletions
diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 3522c7963..456c7eec8 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -24,7 +24,7 @@ "movement_range_y": 4, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B485", + "script": "LilycoveCity_ContestHall_EventScript_Boy1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B48E", + "script": "LilycoveCity_ContestHall_EventScript_Boy2", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B497", + "script": "LilycoveCity_ContestHall_EventScript_Girl", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B4A9", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestMC", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B4C0", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestJudge", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B4D7", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestant1", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B4EE", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestant2", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B505", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestant3", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B51C", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestant4", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B533", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience1", "flag": "0" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B56A", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience4", "flag": "0" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B53C", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience2", "flag": "0" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B581", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestMC", "flag": "0" }, { @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B598", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestJudge", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B5AF", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant1", "flag": "0" }, { @@ -219,7 +219,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B5C6", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant2", "flag": "0" }, { @@ -232,7 +232,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B5DD", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant3", "flag": "0" }, { @@ -245,7 +245,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B5F4", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant4", "flag": "0" }, { @@ -258,7 +258,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B60B", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience1", "flag": "0" }, { @@ -271,7 +271,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B639", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience3", "flag": "0" }, { @@ -284,7 +284,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B622", + "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience2", "flag": "0" }, { @@ -297,7 +297,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B553", + "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience3", "flag": "0" }, { @@ -310,7 +310,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B650", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestMC", "flag": "0" }, { @@ -323,7 +323,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B667", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestJudge", "flag": "0" }, { @@ -336,7 +336,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B67E", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestant1", "flag": "0" }, { @@ -349,7 +349,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B695", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestant2", "flag": "0" }, { @@ -362,7 +362,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B6AC", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestant3", "flag": "0" }, { @@ -375,7 +375,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B6C3", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestant4", "flag": "0" }, { @@ -388,7 +388,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B6DA", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience1", "flag": "0" }, { @@ -401,7 +401,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B71C", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience3", "flag": "0" }, { @@ -414,7 +414,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B705", + "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience2", "flag": "0" }, { @@ -427,7 +427,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestHall_EventScript_21B4A0", + "script": "LilycoveCity_ContestHall_EventScript_Sailor", "flag": "0" } ], @@ -469,7 +469,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestHall_EventScript_21B733" + "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign" }, { "type": "sign", @@ -477,7 +477,7 @@ "y": 28, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestHall_EventScript_21B73C" + "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign" }, { "type": "sign", @@ -485,7 +485,7 @@ "y": 28, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestHall_EventScript_21B745" + "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign" }, { "type": "sign", @@ -493,7 +493,7 @@ "y": 28, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestHall_EventScript_21B745" + "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign" }, { "type": "sign", @@ -501,7 +501,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestHall_EventScript_21B733" + "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign" }, { "type": "sign", @@ -509,7 +509,7 @@ "y": 28, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestHall_EventScript_21B73C" + "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign" } ] }
\ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 5823b6da4..fb98c72f6 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -1,319 +1,319 @@ LilycoveCity_ContestHall_MapScripts:: @ 821B484 .byte 0 -LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485 - msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC +LilycoveCity_ContestHall_EventScript_Boy1:: @ 821B485 + msgbox LilycoveCity_ContestHall_Text_TodayWonSmartnessContest, MSGBOX_NPC end -LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E - msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC +LilycoveCity_ContestHall_EventScript_Boy2:: @ 821B48E + msgbox LilycoveCity_ContestHall_Text_EnteredBunchOfContests, MSGBOX_NPC end -LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497 - msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC +LilycoveCity_ContestHall_EventScript_Girl:: @ 821B497 + msgbox LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks, MSGBOX_NPC end -LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0 - msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC +LilycoveCity_ContestHall_EventScript_Sailor:: @ 821B4A0 + msgbox LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous, MSGBOX_NPC end -LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 +LilycoveCity_ContestHall_EventScript_SmartContestMC:: @ 821B4A9 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 +LilycoveCity_ContestHall_EventScript_SmartContestJudge:: @ 821B4C0 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 +LilycoveCity_ContestHall_EventScript_SmartContestant1:: @ 821B4D7 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_EnteredWrongContest, MSGBOX_DEFAULT closemessage applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE +LilycoveCity_ContestHall_EventScript_SmartContestant2:: @ 821B4EE lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_RaisedMonToBeSmart, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 +LilycoveCity_ContestHall_EventScript_SmartContestant3:: @ 821B505 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext, MSGBOX_DEFAULT closemessage applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C +LilycoveCity_ContestHall_EventScript_SmartContestant4:: @ 821B51C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife, MSGBOX_DEFAULT closemessage applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533 - msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN +LilycoveCity_ContestHall_EventScript_SmartContestAudience1:: @ 821B533 + msgbox LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa, MSGBOX_SIGN end -LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C +LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: @ 821B53C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves, MSGBOX_DEFAULT closemessage applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 +LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: @ 821B553 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers, MSGBOX_DEFAULT closemessage applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A +LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: @ 821B56A lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_StillLoveSmartnessContests, MSGBOX_DEFAULT closemessage applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 +LilycoveCity_ContestHall_EventScript_BeautyContestMC:: @ 821B581 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest, MSGBOX_DEFAULT closemessage applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 +LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: @ 821B598 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty, MSGBOX_DEFAULT closemessage applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF +LilycoveCity_ContestHall_EventScript_BeautyContestant1:: @ 821B5AF lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty, MSGBOX_DEFAULT closemessage applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 +LilycoveCity_ContestHall_EventScript_BeautyContestant2:: @ 821B5C6 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_OverdidGrooming, MSGBOX_DEFAULT closemessage applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD +LilycoveCity_ContestHall_EventScript_BeautyContestant3:: @ 821B5DD lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam, MSGBOX_DEFAULT closemessage applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 +LilycoveCity_ContestHall_EventScript_BeautyContestant4:: @ 821B5F4 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe, MSGBOX_DEFAULT closemessage applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B +LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: @ 821B60B lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy, MSGBOX_DEFAULT closemessage applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 +LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: @ 821B622 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon, MSGBOX_DEFAULT closemessage applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 +LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: @ 821B639 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone, MSGBOX_DEFAULT closemessage applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 +LilycoveCity_ContestHall_EventScript_CuteContestMC:: @ 821B650 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_InTheMiddleOfContest, MSGBOX_DEFAULT closemessage applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 +LilycoveCity_ContestHall_EventScript_CuteContestJudge:: @ 821B667 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals, MSGBOX_DEFAULT closemessage applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E +LilycoveCity_ContestHall_EventScript_CuteContestant1:: @ 821B67E lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_MyAzurillWasDistracted, MSGBOX_DEFAULT closemessage applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 +LilycoveCity_ContestHall_EventScript_CuteContestant2:: @ 821B695 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_NeverWonBattleButContest, MSGBOX_DEFAULT closemessage applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC +LilycoveCity_ContestHall_EventScript_CuteContestant3:: @ 821B6AC lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_PetalDanceIsMarvel, MSGBOX_DEFAULT closemessage applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 +LilycoveCity_ContestHall_EventScript_CuteContestant4:: @ 821B6C3 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter, MSGBOX_DEFAULT closemessage applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA +LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: @ 821B6DA lockall applymovement 29, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_MyChildIsInContest, MSGBOX_DEFAULT closemessage applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 delay 25 - msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_ComeOnDear, MSGBOX_DEFAULT releaseall end -LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 +LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: @ 821B705 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn, MSGBOX_DEFAULT closemessage applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C +LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: @ 821B71C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest, MSGBOX_DEFAULT closemessage applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733 - msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN +LilycoveCity_ContestHall_EventScript_BeautyStageSign:: @ 821B733 + msgbox LilycoveCity_ContestHall_Text_BeautyContestStage, MSGBOX_SIGN end -LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C - msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN +LilycoveCity_ContestHall_EventScript_CuteStageSign:: @ 821B73C + msgbox LilycoveCity_ContestHall_Text_CuteContestStage, MSGBOX_SIGN end -LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745 - msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN +LilycoveCity_ContestHall_EventScript_SmartStageSign:: @ 821B745 + msgbox LilycoveCity_ContestHall_Text_SmartContestStage, MSGBOX_SIGN end -LilycoveCity_ContestHall_Text_21B74E: @ 821B74E +LilycoveCity_ContestHall_Text_TodayWonSmartnessContest: @ 821B74E .string "This POKéMON won the BEAUTY CONTEST\n" .string "here before.\p" .string "Well, guess what? Today, I made it\n" .string "win a SMARTNESS CONTEST!\p" .string "My abilities scare even me…$" -LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7 +LilycoveCity_ContestHall_Text_EnteredBunchOfContests: @ 821B7D7 .string "I've entered a bunch of CONTESTS,\n" .string "so I'm seeing how things work.\p" .string "If you're in a COOLNESS CONTEST,\n" @@ -321,29 +321,29 @@ LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7 .string "But smart moves and cute moves\n" .string "don't go over well, for instance.$" -LilycoveCity_ContestHall_Text_21B899: @ 821B899 +LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks: @ 821B899 .string "That young man who won earlier had\n" .string "a whole bunch of different {POKEBLOCK}S.\p" .string "Can you win if you had that many\n" .string "of those things?$" -LilycoveCity_ContestHall_Text_21B911: @ 821B911 +LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous: @ 821B911 .string "Whoa, isn't this place humongous!\p" .string "The tension in the air… It's not\n" .string "like a CONTEST hall in the sticks.$" -LilycoveCity_ContestHall_Text_21B977: @ 821B977 +LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal: @ 821B977 .string "MC: Okay, SMART POKéMON and their\n" .string "TRAINERS, are you ready?!\p" .string "Give it your best showing!\n" .string "Let's appeal!$" -LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC +LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest: @ 821B9DC .string "JUDGE: Are you enjoying this CONTEST?\p" .string "Come back with three friends, and\n" .string "all of you may enter a CONTEST!$" -LilycoveCity_ContestHall_Text_21BA44: @ 821BA44 +LilycoveCity_ContestHall_Text_EnteredWrongContest: @ 821BA44 .string "Ayayayay…\n" .string "I entered the wrong CONTEST.\p" .string "I entered this tough POKéMON in\n" @@ -351,7 +351,7 @@ LilycoveCity_ContestHall_Text_21BA44: @ 821BA44 .string "Come on, wow them with a smart-looking\n" .string "ROCK SMASH.$" -LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5 +LilycoveCity_ContestHall_Text_RaisedMonToBeSmart: @ 821BAD5 .string "I've spent many a year, and all my\n" .string "wisdom besides, raising this POKéMON\l" .string "to be smart.\p" @@ -359,54 +359,54 @@ LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5 .string "young pup's POKéMON.\p" .string "My dear wife, are you seeing this?$" -LilycoveCity_ContestHall_Text_21BB84: @ 821BB84 +LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext: @ 821BB84 .string "There it is!\p" .string "If my POKéMON pulls a smart move next,\n" .string "the audience's excitement will peak!$" -LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD +LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife: @ 821BBDD .string "Oh, dear, no!\p" .string "My darling ZUBAT's LEECH LIFE is so\n" .string "cute I kept using it over and over!\p" .string "But these mean people don't appreciate\n" .string "it at all!$" -LilycoveCity_ContestHall_Text_21BC65: @ 821BC65 +LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa: @ 821BC65 .string "Kiyaaah! You're beautiful, Grandpa!$" -LilycoveCity_ContestHall_Text_21BC89: @ 821BC89 +LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves: @ 821BC89 .string "Even when TRAINERS enter the same\n" .string "kind of POKéMON, they all seem to use\l" .string "different moves for appeals.\p" .string "It's just like the way people have\n" .string "different styles for battling.$" -LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 +LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers: @ 821BD30 .string "I think the POKéMON look smarter\n" .string "than their TRAINERS. By a lot.$" -LilycoveCity_ContestHall_Text_21BD70: @ 821BD70 +LilycoveCity_ContestHall_Text_StillLoveSmartnessContests: @ 821BD70 .string "When all's said and done, I still love\n" .string "SMARTNESS CONTESTS.\p" .string "That intellectual green color…\n" .string "It's so… So… Cool.$" -LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD +LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest: @ 821BDDD .string "MC: Are you entering the BEAUTY\n" .string "CONTEST, too? Good luck!$" -LilycoveCity_ContestHall_Text_21BE16: @ 821BE16 +LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty: @ 821BE16 .string "JUDGE: Ah, every POKéMON here is\n" .string "a model of pristine beauty!\p" .string "Why, I almost forgot to score them!$" -LilycoveCity_ContestHall_Text_21BE77: @ 821BE77 +LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty: @ 821BE77 .string "A POKéMON this beautiful…\n" .string "There isn't another one like it.\p" .string "Everyone's eyes will be glued to\n" .string "my beauty.$" -LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE +LilycoveCity_ContestHall_Text_OverdidGrooming: @ 821BEDE .string "Waaaah!\p" .string "I brushed and groomed my POKéMON\n" .string "carefully for this CONTEST…\p" @@ -414,96 +414,96 @@ LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE .string "My POKéMON's coat turned all scraggly…\p" .string "What should I do?$" -LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E +LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam: @ 821BF6E .string "This AURORA BEAM is so dazzling,\n" .string "the JUDGE won't be able to see it.\p" .string "Uh, wait a second…\n" .string "That'll be meaningless, then!$" -LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3 +LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe: @ 821BFE3 .string "This pretty POKéMON looks just like\n" .string "me when I was younger.\p" .string "Right when I said that, my husband\n" .string "spewed the coffee he was drinking.\p" .string "Did I say something funny?$" -LilycoveCity_ContestHall_Text_21C07F: @ 821C07F +LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy: @ 821C07F .string "You know, if I win at a BEAUTY\n" .string "CONTEST, sure it makes me\l" .string "happy. More than usual, anyway.$" -LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8 +LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon: @ 821C0D8 .string "Wahahahah!\p" .string "Will you take a gander at all those\n" .string "pretty POKéMON!\l" .string "I just love this sort of glitz!$" -LilycoveCity_ContestHall_Text_21C137: @ 821C137 +LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone: @ 821C137 .string "You can't always win on just beauty\n" .string "alone.\p" .string "You have to groom your POKéMON so\n" .string "it's nice and glossy like mine.$" -LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4 +LilycoveCity_ContestHall_Text_InTheMiddleOfContest: @ 821C1A4 .string "MC: Uh-oh! Hello!\n" .string "We're in the middle of a CONTEST!\p" .string "Please enter at our registration\n" .string "counter and come out, okay?$" -LilycoveCity_ContestHall_Text_21C215: @ 821C215 +LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals: @ 821C215 .string "JUDGE: Oh, such charming and cute\n" .string "appeals!\p" .string "Oh, my goodness! What a perfectly\n" .string "adorable WATER SPORT appeal!$" -LilycoveCity_ContestHall_Text_21C27F: @ 821C27F +LilycoveCity_ContestHall_Text_MyAzurillWasDistracted: @ 821C27F .string "Oh, no… My sweet AZURILL was\n" .string "distracted by another POKéMON.$" -LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB +LilycoveCity_ContestHall_Text_NeverWonBattleButContest: @ 821C2BB .string "My POKéMON has never won in a battle,\n" .string "but put it in a CONTEST and look out!$" -LilycoveCity_ContestHall_Text_21C307: @ 821C307 +LilycoveCity_ContestHall_Text_PetalDanceIsMarvel: @ 821C307 .string "My POKéMON's PETAL DANCE is a marvel\n" .string "of elegance.\p" .string "I won't let anyone disturb its\n" .string "performance.$" -LilycoveCity_ContestHall_Text_21C365: @ 821C365 +LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter: @ 821C365 .string "Everyone's POKéMON are very cute.\p" .string "However, if my POKéMON were to make\n" .string "a cute appeal…\p" .string "I'm sure that it would be so much \n" .string "cuter than the others.$" -LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4 +LilycoveCity_ContestHall_Text_MyChildIsInContest: @ 821C3F4 .string "My child is in this CONTEST.$" -LilycoveCity_ContestHall_Text_21C411: @ 821C411 +LilycoveCity_ContestHall_Text_ComeOnDear: @ 821C411 .string "Come on, dear. Go for it!\n" .string "Your POKéMON is the best!$" -LilycoveCity_ContestHall_Text_21C445: @ 821C445 +LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest: @ 821C445 .string "I think that girl over there is\n" .string "the cutest of the lot.\p" .string "What's that? They're judging\n" .string "POKéMON by their looks?$" -LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1 +LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn: @ 821C4B1 .string "Ohh, seeing all these cute POKéMON,\n" .string "they make we want to get my own!\p" .string "I'm going to go catch some!$" -LilycoveCity_ContestHall_Text_21C512: @ 821C512 +LilycoveCity_ContestHall_Text_BeautyContestStage: @ 821C512 .string "BEAUTY CONTEST STAGE\n" .string "BE ALLURED BY BEAUTIFUL POKéMON!$" -LilycoveCity_ContestHall_Text_21C548: @ 821C548 +LilycoveCity_ContestHall_Text_CuteContestStage: @ 821C548 .string "CUTENESS CONTEST STAGE\n" .string "BE CHARMED BY CUTE POKéMON!$" -LilycoveCity_ContestHall_Text_21C57B: @ 821C57B +LilycoveCity_ContestHall_Text_SmartContestStage: @ 821C57B .string "SMARTNESS CONTEST STAGE\n" .string "BE IMPRESSED BY SMART POKéMON!$" diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 3cbb48f21..a76bba10d 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A554", + "script": "LilycoveCity_ContestLobby_EventScript_ContestReceptionist", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A806", + "script": "LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_293FA2", + "script": "LilycoveCity_ContestLobby_EventScript_Blender2Man", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A708", + "script": "LilycoveCity_ContestLobby_EventScript_BlackBelt", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A711", + "script": "LilycoveCity_ContestLobby_EventScript_Girl", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A71A", + "script": "LilycoveCity_ContestLobby_EventScript_Artist", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_28CA59", + "script": "LilycoveCity_ContestLobby_EventScript_Reporter", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A768", + "script": "LilycoveCity_ContestLobby_EventScript_Blender3Boy", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_293FB4", + "script": "LilycoveCity_ContestLobby_EventScript_Blender2Twin", "flag": "0" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A72C", + "script": "LilycoveCity_ContestLobby_EventScript_Fisherman", "flag": "0" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A723", + "script": "LilycoveCity_ContestLobby_EventScript_FatMan", "flag": "0" }, { @@ -193,7 +193,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A735", + "script": "LilycoveCity_ContestLobby_EventScript_NinjaBoy", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_293FAB", + "script": "LilycoveCity_ContestLobby_EventScript_Blender3PokefanF", "flag": "0" }, { @@ -219,8 +219,8 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_293FBD", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT" + "script": "LilycoveCity_ContestLobby_EventScript_Blender1ExpertM", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT" }, { "graphics_id": "EVENT_OBJ_GFX_GIRL_1", @@ -232,7 +232,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A771", + "script": "LilycoveCity_ContestLobby_EventScript_Blender3Girl", "flag": "0" }, { @@ -245,8 +245,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A7B3", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_CAMPER", @@ -258,8 +258,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A7BE", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", @@ -271,8 +271,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A7C9", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2", @@ -284,8 +284,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A7D9", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", @@ -297,8 +297,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A7E9", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", @@ -310,8 +310,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A7A8", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", @@ -323,8 +323,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21A798", - "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + "script": "LilycoveCity_ContestLobby_EventScript_BlendMaster", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", @@ -336,7 +336,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_21ACF1", + "script": "LilycoveCity_ContestLobby_EventScript_LittleGirl", "flag": "0" } ], @@ -378,7 +378,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EventScript_PblockLink" + "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderLink" }, { "type": "sign", @@ -386,7 +386,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_293E1E" + "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender3" }, { "type": "sign", @@ -394,7 +394,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A753" + "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner4" }, { "type": "sign", @@ -402,7 +402,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A75A" + "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner5" }, { "type": "sign", @@ -410,7 +410,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A761" + "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner6" }, { "type": "sign", @@ -418,7 +418,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A77A" + "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords" }, { "type": "sign", @@ -426,7 +426,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A73E" + "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner1" }, { "type": "sign", @@ -434,7 +434,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A745" + "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner2" }, { "type": "sign", @@ -442,7 +442,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A74C" + "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner3" }, { "type": "sign", @@ -450,7 +450,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EventScript_Pblock1_Ask" + "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender1" }, { "type": "sign", @@ -458,7 +458,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_293D4D" + "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender2" }, { "type": "sign", @@ -466,7 +466,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_21A784" + "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults" } ] }
\ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 54364eaf3..4c44ced89 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -3,6 +3,8 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 +@ Some scripts for this room are split into data/scripts/contest_hall and data/scripts/berry_blender + LilycoveCity_ContestLobby_OnTransition: @ 821A21C call LilycoveCity_ContestLobby_EventScript_28CB2B call LilycoveCity_ContestLobby_EventScript_21A227 @@ -12,13 +14,13 @@ LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 getpricereduction POKENEWS_BLENDMASTER compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C - clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER return LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT - clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER return LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 @@ -41,7 +43,7 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 - drawcontestwinner 0 + showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, YES @@ -215,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 - drawcontestwinner 0 + showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A @@ -315,7 +317,7 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B walk_in_place_fastest_left step_end -LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 +LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554 special sub_80F9154 specialvar VAR_RESULT, sub_80F8D24 compare VAR_RESULT, 1 @@ -355,7 +357,7 @@ LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 giveitem ITEM_CONTEST_PASS, 1 setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, 3 @@ -474,81 +476,81 @@ LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 walk_in_place_fastest_right step_end -LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 +LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708 msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711 +LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711 msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A +LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723 +LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723 msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C +LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735 +LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735 msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E +LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E lockall fadescreen 1 - drawcontestwinner 1 + showcontestwinner 1 releaseall end -LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745 +LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745 lockall fadescreen 1 - drawcontestwinner 2 + showcontestwinner 2 releaseall end -LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C +LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C lockall fadescreen 1 - drawcontestwinner 3 + showcontestwinner 3 releaseall end -LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753 +LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753 lockall fadescreen 1 - drawcontestwinner 4 + showcontestwinner 4 releaseall end -LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A +LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A lockall fadescreen 1 - drawcontestwinner 5 + showcontestwinner 5 releaseall end -LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761 +LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761 lockall fadescreen 1 - drawcontestwinner 6 + showcontestwinner 6 releaseall end -LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768 - msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC +LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768 + msgbox LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771 - msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC +LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771 + msgbox LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC end -LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A +LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A lockall special ShowBerryBlenderRecordWindow waitbuttonpress @@ -556,7 +558,7 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A releaseall end -LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 +LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784 lockall setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 7 @@ -566,60 +568,60 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 releaseall end -LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798 +LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A7F9 + msgbox LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end -LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8 +LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8 lock msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3 +LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3 lock msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE +LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE lock msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9 +LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9 lock faceplayer msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A7F9 + goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end -LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9 +LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9 lock faceplayer msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A7F9 + goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end -LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 +LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9 lock faceplayer msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A7F9 + goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end -LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 +LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9 closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 +LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806 special sub_80F9154 lock faceplayer @@ -1001,7 +1003,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF walk_in_place_fastest_left step_end -LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 +LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1 lock faceplayer goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06 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 diff --git a/data/specials.inc b/data/specials.inc index cfc50e49c..e087a8421 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64 def_special PlayerEnteredTradeSeat def_special nullsub_37 def_special sub_80B3254 - def_special sub_80B2FD8 + def_special TryBerryBlenderLinkup def_special GetLinkPartnerNames def_special SpawnLinkPartnerEventObject def_special SavePlayerParty diff --git a/data/text/berries.inc b/data/text/berries.inc index 349919db0..17443ea3c 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -72,18 +72,18 @@ Route120_Text_2A7217: @ 82A7217 .string "I'll get more BERRIES from\n" .string "the BERRY MASTER.$" -LilycoveCity_Text_2A7244: @ 82A7244 +LilycoveCity_Text_BerrySuitsYou: @ 82A7244 .string "When it gets right down to it…\p" .string "The same way suits suit me perfectly,\n" .string "a crisp breeze suits the sea.\p" .string "And you, a BERRY suits you to a “T”…\p" .string "Why should that be so?$" -LilycoveCity_Text_2A72E3: @ 82A72E3 +LilycoveCity_Text_BecauseYoureTrainer: @ 82A72E3 .string "When it gets right down to it…\p" .string "It's because you're a TRAINER!$" -LilycoveCity_Text_2A7321: @ 82A7321 +LilycoveCity_Text_PokeblocksSuitPokemon: @ 82A7321 .string "When it gets right down to it…\p" .string "The way dignified simplicity suits me,\n" .string "{POKEBLOCK}S perfectly suit POKéMON.$" diff --git a/data/text/contest_hall.inc b/data/text/contest_hall.inc index 21753d35c..21cfce597 100644 --- a/data/text/contest_hall.inc +++ b/data/text/contest_hall.inc @@ -1,34 +1,34 @@ -LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C +LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster: @ 82C427C .string "BLEND MASTER: Indeed I am!\n" .string "The BLEND MASTER am I!\p" .string "Blend with me, and you shall witness\n" .string "the mastery I bring to blending!$" -LilycoveCity_ContestLobby_Text_2C42F4: @ 82C42F4 +LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction: @ 82C42F4 .string "BLEND MASTER: Hmmm! So, you wish to\n" .string "see my mastery in action?$" -LilycoveCity_ContestLobby_Text_2C4332: @ 82C4332 +LilycoveCity_ContestLobby_Text_TooBusyNowIsee: @ 82C4332 .string "Hmmm!\p" .string "So, you are too busy now, I see!\p" .string "But fear not!\n" .string "I shall be here all day!\l" .string "Hurry back from your errand!$" -LilycoveCity_ContestLobby_Text_2C439D: @ 82C439D +LilycoveCity_ContestLobby_Text_BlendMasterNoBerries: @ 82C439D .string "Hmmm!\p" .string "You haven't got a single BERRY!\p" .string "I shall be here all day!\n" .string "Hurry back with some BERRIES!$" -LilycoveCity_ContestLobby_Text_2C43FA: @ 82C43FA +LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA .string "Of course!\n" .string "Of course!\p" .string "Incidentally…\n" .string "You do know how to blend {POKEBLOCK}S\l" .string "from BERRIES?$" -LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C +LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending: @ 82C444C .string "Hmmm!\p" .string "Ah, but it is a simple process!\p" .string "When the BLENDER's arrow comes to\n" @@ -37,20 +37,20 @@ LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C .string "When you see how precisely I press\n" .string "the A Button, you will understand.$" -LilycoveCity_ContestLobby_Text_2C451B: @ 82C451B +LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender: @ 82C451B .string "Fine!\p" .string "Let's get started, then!\p" .string "All together with the BLEND MASTER,\n" .string "let's BERRY BLENDER!$" -LilycoveCity_ContestLobby_Text_2C4573: @ 82C4573 +LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase: @ 82C4573 .string "Hmmm!\p" .string "You don't appear to have gotten\n" .string "the {POKEBLOCK} CASE!\p" .string "I shall be here all day!\n" .string "Obtain the {POKEBLOCK} CASE and hurry back!$" -LilycoveCity_ContestLobby_Text_2C45E8: @ 82C45E8 +LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull: @ 82C45E8 .string "Hmmm!\p" .string "Your {POKEBLOCK} CASE appears to be full!\p" .string "I shall be here all day!\n" diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index 5ec38d1d4..cbc5e96a3 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -49,4 +49,7 @@ #define DEPT_STORE_FLOORNUM_11F 14 #define DEPT_STORE_FLOORNUM_ROOFTOP 15 +// Pokemon Trainer Fan Club +#define NUM_TRAINER_CLUB_MEMBERS 8 + #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 54778435e..00aa328f7 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -872,7 +872,7 @@ #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D #define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER 0x340 #define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 #define FLAG_HIDE_ROUTE_128_STEVEN 0x342 #define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 @@ -913,7 +913,7 @@ #define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 #define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 #define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT 0x369 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A #define FLAG_HIDE_ROUTE_111_PLAYER_DESCENT 0x36B #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C diff --git a/include/item_menu.h b/include/item_menu.h index b1275549d..a21a6da4f 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -82,7 +82,7 @@ void CB2_GoToSellMenu(void); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); -void sub_81AABF0(void (*callback)(void)); +void ChooseBerrySetCallback(void (*callback)(void)); void CB2_ChooseBerry(void); void unknown_ItemMenu_Confirm(u8 taskId); void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); diff --git a/include/link.h b/include/link.h index 499405fc1..32dfaf51e 100644 --- a/include/link.h +++ b/include/link.h @@ -87,7 +87,7 @@ #define LINKTYPE_0x2288 0x2288 // battle? #define LINKTYPE_0x3311 0x3311 #define LINKTYPE_0x3322 0x3322 -#define LINKTYPE_0x4411 0x4411 +#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 #define LINKTYPE_BERRY_BLENDER 0x4422 #define LINKTYPE_0x5501 0x5501 // mystery event #define LINKTYPE_0x5502 0x5502 // unused? @@ -290,7 +290,7 @@ void sub_800AF18(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 un void sub_800B348(void); void sub_800B3A4(u32 who); bool32 sub_800A07C(void); -void sub_800AB98(void); +void ResetLinkPlayerCount(void); void sub_800AA04(u8 a0); void sub_800B4C0(void); bool32 sub_800B504(void); diff --git a/src/berry_blender.c b/src/berry_blender.c index b4874c3b1..72f3056d3 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1030,7 +1030,7 @@ static void sub_807FAC8(void) UnsetBgTilemapBuffer(2); UnsetBgTilemapBuffer(1); SetVBlankCallback(NULL); - sub_81AABF0(sub_807FFA4); + ChooseBerrySetCallback(sub_807FFA4); sBerryBlenderData->mainState = 0; } @@ -1109,7 +1109,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum) sBerryBlenderData->playersNo = 2; StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); - if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS)) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER)) StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]); else StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]); @@ -1432,7 +1432,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, { opponentBerryId = sOpponentBerrySets[opponentSetId][i]; var = playerBerryItemId - 163; - if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER) && gSpecialVar_0x8004 == 1) { opponentSetId %= 5; opponentBerryId = sSpecialOpponentBerrySets[opponentSetId]; @@ -1632,7 +1632,7 @@ static void sub_80808D4(void) if (gSpecialVar_0x8004 == 1) { - if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS)) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER)) sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10); else sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10); diff --git a/src/berry_crush.c b/src/berry_crush.c index 8b4c7a545..74a71f089 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -249,7 +249,7 @@ static void sub_8020D8C(void) void sub_8020E1C(void) { DestroyTask(gUnknown_02022C90->unkA); - sub_81AABF0(sub_8020D8C); + ChooseBerrySetCallback(sub_8020D8C); } static void sub_8020E3C(void) diff --git a/src/cable_club.c b/src/cable_club.c index 1375789c3..26239eb50 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -203,7 +203,7 @@ static void sub_80B2634(u8 taskId) if (data[0] == 0) { OpenLinkTimed(); - sub_800AB98(); + ResetLinkPlayerCount(); ResetLinkPlayers(); data[5] = AddWindow(&gUnknown_08550594); } @@ -678,9 +678,9 @@ static void sub_80B2EE4(u8 taskId) } } -void sub_80B2FD8(void) +void TryBerryBlenderLinkup(void) { - gLinkType = LINKTYPE_0x4411; + gLinkType = LINKTYPE_BERRY_BLENDER_SETUP; gBattleTypeFlags = 0; sub_80B236C(2, 4); } diff --git a/src/field_specials.c b/src/field_specials.c index 109d57fd1..3d92f621d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -4051,7 +4051,7 @@ void UpdateTrainerFanClubGameClear(void) u8 sub_813BADC(u8 a0) { - static const u8 gUnknown_085B3470[] = { 0x02, 0x01, 0x02, 0x01 }; + static const u8 gUnknown_085B3470[] = { 2, 1, 2, 1 }; if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2) { @@ -4078,12 +4078,15 @@ u8 sub_813BADC(u8 a0) static u16 sub_813BB74(void) { - static const u8 gUnknown_085B3474[] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; + static const u8 gUnknown_085B3474[NUM_TRAINER_CLUB_MEMBERS] = + { + 8, 9, 10, 11, 12, 13, 14, 15 + }; u8 i; u8 retVal = 0; - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_085B3474); i++) { if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B3474[i]) & 1)) { @@ -4101,7 +4104,10 @@ static u16 sub_813BB74(void) static u16 sub_813BC00(void) { - static const u8 gUnknown_085B347C[] = { 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09 }; + static const u8 gUnknown_085B347C[NUM_TRAINER_CLUB_MEMBERS] = + { + 8, 13, 14, 11, 10, 12, 15, 9 + }; u8 i; u8 retVal = 0; @@ -4111,7 +4117,7 @@ static u16 sub_813BC00(void) return 0; } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_085B347C); i++) { if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B347C[i]) & 1) != 0) { @@ -4137,7 +4143,7 @@ u16 GetNumMovedLilycoveFanClubMembers(void) u8 i; u8 retVal = 0; - for (i = 0; i < 8; i++) + for (i = 0; i < NUM_TRAINER_CLUB_MEMBERS; i++) { if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> (i + 8)) & 1) != 0) { @@ -4160,7 +4166,7 @@ void UpdateMovedLilycoveFanClubMembers(void) gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2Ptr->playTimeHours; break; } - else if (i == 8) + else if (i == NUM_TRAINER_CLUB_MEMBERS) { break; } @@ -4266,14 +4272,10 @@ void sub_813BF10(void) if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2) { sub_813BA30(); - if (gBattleOutcome == 1) - { + if (gBattleOutcome == B_OUTCOME_WON) sub_813BB74(); - } else - { sub_813BC00(); - } } } diff --git a/src/item_menu.c b/src/item_menu.c index 2814aa5b9..40a0f0439 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -477,7 +477,7 @@ void CB2_ChooseBerry(void) GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } -void sub_81AABF0(void (*callback)(void)) +void ChooseBerrySetCallback(void (*callback)(void)) { GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback); } diff --git a/src/link.c b/src/link.c index 3ca8236ed..b010558a5 100644 --- a/src/link.c +++ b/src/link.c @@ -1399,7 +1399,7 @@ void sub_800AB18(void) } } -void sub_800AB98(void) +void ResetLinkPlayerCount(void) { gSavedLinkPlayerCount = 0; gSavedMultiplayerId = 0; |