diff options
Diffstat (limited to 'data/maps')
36 files changed, 927 insertions, 934 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 9ab463d7c..3d278308c 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -1015,7 +1015,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA end BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 - setvar VAR_0x8004, 20 + setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3 end diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/ContestHall/map.json index 664a32b29..1402a9afa 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/ContestHall/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_LINK_CONTEST_ROOM1", - "name": "LinkContestRoom1", - "layout": "LAYOUT_LINK_CONTEST_ROOM1", + "id": "MAP_CONTEST_HALL", + "name": "ContestHall", + "layout": "LAYOUT_CONTEST_HALL", "music": "MUS_CONTEST0", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -181,7 +181,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_LINK_CONTEST_POKE_BALL" + "flag": "FLAG_HIDE_CONTEST_POKE_BALL" }, { "graphics_id": "EVENT_OBJ_GFX_VAR_3", diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc new file mode 100644 index 000000000..e1ef9b708 --- /dev/null +++ b/data/maps/ContestHall/scripts.inc @@ -0,0 +1,460 @@ +ContestHall_MapScripts:: @ 823B781 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ContestHall_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, ContestHall_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition + map_script MAP_SCRIPT_ON_RESUME, ContestHall_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn + .byte 0 + +ContestHall_OnReturn: @ 823B79B + special LoadLinkContestPlayerPalettes + end + +ContestHall_OnTransition: @ 823B79F + call ContestHall_EventScript_ReadyContestMusic + setvar VAR_TEMP_0, 1 + call ContestHall_EventScript_AddRandomAudienceMembers + end + +ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF + call ContestHall_EventScript_TryWaitForLink + special ScriptGetMultiplayerId + compare VAR_RESULT, 0 + call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1 + compare VAR_RESULT, 1 + call_if_eq ContestHall_EventScript_SaveContestMusicPlayer2 + compare VAR_RESULT, 2 + call_if_eq ContestHall_EventScript_SaveContestMusicPlayer3 + compare VAR_RESULT, 3 + call_if_eq ContestHall_EventScript_SaveContestMusicPlayer4 + compare VAR_RESULT, 4 + call_if_eq ContestHall_EventScript_SaveContestMusic + return + +ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF + savebgm MUS_TEST1 + return + +ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3 + savebgm MUS_TEST2 + return + +ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7 + savebgm MUS_TEST3 + return + +ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB + savebgm MUS_TEST4 + return + +ContestHall_EventScript_SaveContestMusic:: @ 823B7FF + savebgm MUS_CONTEST0 + return + +ContestHall_OnResume: @ 823B803 + compare VAR_TEMP_9, 1 + call_if_eq ContestHall_EventScript_ReShowAudience + end + +ContestHall_EventScript_ReShowAudience:: @ 823B80F + call ContestHall_EventScript_CreateAudience + return + +ContestHall_OnFrame: @ 823B815 + map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest + .2byte 0 + +ContestHall_OnWarp: @ 823B81F + map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects + .2byte 0 + +ContestHall_EventScript_Contest:: @ 823B829 + call ContestHall_EventScript_DoContest + call ContestHall_EventScript_SetExitWarp + end + +ContestHall_EventScript_SetContestObjects:: @ 823B834 + special LoadLinkContestPlayerPalettes + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + call ContestHall_EventScript_CreateAudience + end + +@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist) +@ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience +ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842 + call ContestHall_EventScript_GetRandomAudienceGfxId + call ContestHall_EventScript_SetRandomAudienceGfx + compare VAR_TEMP_0, 8 + goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers + return + +ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858 + switch VAR_TEMP_0 + case 1, ContestHall_EventScript_SetRandomAudience1 + case 2, ContestHall_EventScript_SetRandomAudience2 + case 3, ContestHall_EventScript_SetRandomAudience3 + case 4, ContestHall_EventScript_SetRandomAudience4 + case 5, ContestHall_EventScript_SetRandomAudience5 + case 6, ContestHall_EventScript_SetRandomAudience6 + case 7, ContestHall_EventScript_SetRandomAudience7 + end + +ContestHall_EventScript_SetRandomAudience1:: @ 823B8AB + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_SetRandomAudience2:: @ 823B8B6 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_SetRandomAudience3:: @ 823B8C1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_SetRandomAudience4:: @ 823B8CC + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_SetRandomAudience5:: @ 823B8D7 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_SetRandomAudience6:: @ 823B8E2 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8 + setvar VAR_RESULT, 32 + special ScriptRandom + addvar VAR_RESULT, 1 + switch VAR_RESULT + case 1, ContestHall_EventScript_RandomAudienceNinjaBoy + case 2, ContestHall_EventScript_RandomAudienceTwin + case 3, ContestHall_EventScript_RandomAudienceBoy1 + case 4, ContestHall_EventScript_RandomAudienceGirl1 + case 5, ContestHall_EventScript_RandomAudienceGirl2 + case 6, ContestHall_EventScript_RandomAudienceLittleBoy + case 7, ContestHall_EventScript_RandomAudienceGirl + case 8, ContestHall_EventScript_RandomAudienceBoy3 + case 9, ContestHall_EventScript_RandomAudienceGirl3 + case 10, ContestHall_EventScript_RandomAudienceRichBoy + case 11, ContestHall_EventScript_RandomAudienceFatMan + case 12, ContestHall_EventScript_RandomAudiencePokefanF + case 13, ContestHall_EventScript_RandomAudienceMan1 + case 14, ContestHall_EventScript_RandomAudienceWoman2 + case 15, ContestHall_EventScript_RandomAudienceExpertM + case 16, ContestHall_EventScript_RandomAudienceExpertF + case 17, ContestHall_EventScript_RandomAudiencePokefanM + case 18, ContestHall_EventScript_RandomAudienceWoman4 + case 19, ContestHall_EventScript_RandomAudienceCook + case 20, ContestHall_EventScript_RandomAudienceLass + case 21, ContestHall_EventScript_RandomAudienceOldWoman + case 22, ContestHall_EventScript_RandomAudienceCamper + case 23, ContestHall_EventScript_RandomAudiencePicnicker + case 24, ContestHall_EventScript_RandomAudienceMan3 + case 25, ContestHall_EventScript_RandomAudienceWoman5 + case 26, ContestHall_EventScript_RandomAudienceYoungster + case 27, ContestHall_EventScript_RandomAudienceBugCatcher + case 28, ContestHall_EventScript_RandomAudiencePsychicM + case 29, ContestHall_EventScript_RandomAudienceSchoolKidM + case 30, ContestHall_EventScript_RandomAudienceBlackBelt + case 31, ContestHall_EventScript_RandomAudienceBeauty + case 32, ContestHall_EventScript_RandomAudienceScientist1 + end + +ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B + setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY + return + +ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN + return + +ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1 + return + +ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D + setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1 + return + +ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2 + return + +ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY + return + +ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F + setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL + return + +ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3 + return + +ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B + setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3 + return + +ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY + return + +ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN + return + +ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD + setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F + return + +ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1 + return + +ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2 + return + +ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF + setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M + return + +ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F + return + +ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB + setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M + return + +ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4 + return + +ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK + return + +ContestHall_EventScript_RandomAudienceLass:: @ 823BADD + setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS + return + +ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN + return + +ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER + return + +ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF + setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER + return + +ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3 + return + +ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB + setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5 + return + +ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER + return + +ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER + return + +ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D + setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M + return + +ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M + return + +ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT + return + +ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F + setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY + return + +ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25 + setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1 + return + +ContestHall_EventScript_CreateAudience:: @ 823BB2B + specialvar VAR_RESULT, IsWirelessContest + compare VAR_RESULT, TRUE + goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience + switch VAR_CONTEST_TYPE + case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_CreateNormalContestAudience + case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_CreateSuperContestAudience + case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_CreateHyperContestAudience + case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_CreateMasterContestAudience + case CONTEST_TYPE_LINK, ContestHall_EventScript_CreateMasterContestAudience + return + +ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + return + +ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + return + +ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH + return + +ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH + return + +ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST + createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + return + +ContestHall_EventScript_SetExitWarp:: @ 823BE44 + special ClearLinkContestFlags + switch VAR_CONTEST_TYPE + case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_SetExitWarpNormalContest + case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_SetExitWarpSuperContest + case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_SetExitWarpHyperContest + case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_SetExitWarpMasterContest + case CONTEST_TYPE_LINK, ContestHall_EventScript_SetExitWarpLinkContest + return + +ContestHall_EventScript_SetExitWarpNormalContest:: @ 823BE84 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +ContestHall_EventScript_SetExitWarpSuperContest:: @ 823BE8E + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +ContestHall_EventScript_SetExitWarpHyperContest:: @ 823BE98 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +ContestHall_EventScript_SetExitWarpMasterContest:: @ 823BEA2 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +ContestHall_EventScript_SetExitWarpLinkContest:: @ 823BEAC + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + waitstate + end + +LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6 + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan + compare VAR_RESULT, FEMALE + goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay + return + +LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return + diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/ContestHallBeauty/map.json index f312d4c2b..daad0f962 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_LINK_CONTEST_ROOM5", - "name": "LinkContestRoom5", - "layout": "LAYOUT_LINK_CONTEST_ROOM5", + "id": "MAP_CONTEST_HALL_BEAUTY", + "name": "ContestHallBeauty", + "layout": "LAYOUT_CONTEST_HALL_BEAUTY", "music": "MUS_CONTEST0", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/ContestHallCool/map.json index fb0bf29e0..d1c2e985c 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/ContestHallCool/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_LINK_CONTEST_ROOM3", - "name": "LinkContestRoom3", - "layout": "LAYOUT_LINK_CONTEST_ROOM3", + "id": "MAP_CONTEST_HALL_COOL", + "name": "ContestHallCool", + "layout": "LAYOUT_CONTEST_HALL_COOL", "music": "MUS_CONTEST0", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/ContestHallCute/map.json index b02da178f..d6b16dc4e 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/ContestHallCute/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_LINK_CONTEST_ROOM2", - "name": "LinkContestRoom2", - "layout": "LAYOUT_LINK_CONTEST_ROOM2", + "id": "MAP_CONTEST_HALL_CUTE", + "name": "ContestHallCute", + "layout": "LAYOUT_CONTEST_HALL_CUTE", "music": "MUS_CONTEST0", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/ContestHallSmart/map.json index 85d12ece4..12d3cccd8 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_LINK_CONTEST_ROOM4", - "name": "LinkContestRoom4", - "layout": "LAYOUT_LINK_CONTEST_ROOM4", + "id": "MAP_CONTEST_HALL_SMART", + "name": "ContestHallSmart", + "layout": "LAYOUT_CONTEST_HALL_SMART", "music": "MUS_CONTEST0", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json new file mode 100644 index 000000000..070211173 --- /dev/null +++ b/data/maps/ContestHallTough/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_CONTEST_HALL_TOUGH", + "name": "ContestHallTough", + "layout": "LAYOUT_CONTEST_HALL_TOUGH", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" +}
\ No newline at end of file diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index f5e09a026..a94c81ae9 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 81EB1FA FallarborTown_OnTransition: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setvar VAR_CONTEST_HALL_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index ada0490e3..66746ad37 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C LilycoveCity_OnTransition: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY - setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setvar VAR_CONTEST_HALL_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call Common_EventScript_SetupRivalGfxId diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index a76bba10d..744ed4174 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_Blender2Man", + "script": "BerryBlender_EventScript_Blender2Man", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_Blender2Twin", + "script": "BerryBlender_EventScript_Blender2Twin", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_Blender3PokefanF", + "script": "BerryBlender_EventScript_Blender3PokefanF", "flag": "0" }, { @@ -219,7 +219,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_ContestLobby_EventScript_Blender1ExpertM", + "script": "BerryBlender_EventScript_Blender1ExpertM", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT" }, { @@ -378,7 +378,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderLink" + "script": "BerryBlender_EventScript_BerryBlenderLink" }, { "type": "sign", @@ -386,7 +386,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender3" + "script": "BerryBlender_EventScript_BerryBlender3" }, { "type": "sign", @@ -450,7 +450,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender1" + "script": "BerryBlender_EventScript_BerryBlender1" }, { "type": "sign", @@ -458,7 +458,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender2" + "script": "BerryBlender_EventScript_BerryBlender2" }, { "type": "sign", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 4c44ced89..ecd8e2b95 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,166 +1,166 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_OnFrame .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 + call LilycoveCity_ContestLobby_EventScript_TryShowContestReporter + call LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster end -LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 +LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster:: @ 821A227 getpricereduction POKENEWS_BLENDMASTER - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_ShowBlendMaster clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER return -LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C +LilycoveCity_ContestLobby_EventScript_ShowBlendMaster:: @ 821A23C setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER return -LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 - map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255 - map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427 +LilycoveCity_ContestLobby_OnFrame: @ 821A243 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_TryDoContestArtist + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist .2byte 0 -LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 - goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264 +LilycoveCity_ContestLobby_EventScript_TryDoContestArtist:: @ 821A255 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_ContestArtist setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end -LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 +LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264 lockall addobject 4 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A407 + applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer waitmovement 4 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A418 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall fadescreen 1 showcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO + msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA + goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum compare VAR_RESULT, NO - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2E4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting releaseall end -LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA - msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum:: @ 821A2AA + msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT closemessage - special sub_80F88DC + special SaveMuseumContestPainting setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon - compare VAR_RESULT, 1 - call_if_eq LilycoveCity_ContestLobby_EventScript_21A314 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F + compare VAR_RESULT, TRUE + call_if_eq LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon + applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistExit waitmovement 0 removeobject 4 - call LilycoveCity_ContestLobby_EventScript_21A360 - call LilycoveCity_ContestLobby_EventScript_21A3B6 + call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons + call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag releaseall end -LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO +LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: @ 821A2E4 + msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA - msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum + msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F + applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistExit waitmovement 0 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end -LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 +LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - special sub_80F8390 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A + special BufferContestWinnerMonName + applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistBeginToExit waitmovement 0 playse SE_PIN applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E + applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT - msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_OkaySeeYou, MSGBOX_DEFAULT closemessage return -LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360 +LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360 specialvar VAR_0x8004, CountPlayerContestPaintings switch VAR_0x8004 - case 1, LilycoveCity_ContestLobby_EventScript_21A3A2 - case 2, LilycoveCity_ContestLobby_EventScript_21A3A6 - case 3, LilycoveCity_ContestLobby_EventScript_21A3AA - case 4, LilycoveCity_ContestLobby_EventScript_21A3AE - case 5, LilycoveCity_ContestLobby_EventScript_21A3B2 + case 1, LilycoveCity_ContestLobby_EventScript_ShowPatron1 + case 2, LilycoveCity_ContestLobby_EventScript_ShowPatron2 + case 3, LilycoveCity_ContestLobby_EventScript_ShowPatron3 + case 4, LilycoveCity_ContestLobby_EventScript_ShowPatron4 + case 5, LilycoveCity_ContestLobby_EventScript_ShowTourists return -LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2 +LilycoveCity_ContestLobby_EventScript_ShowPatron1:: @ 821A3A2 clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 return -LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6 +LilycoveCity_ContestLobby_EventScript_ShowPatron2:: @ 821A3A6 clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 return -LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA +LilycoveCity_ContestLobby_EventScript_ShowPatron3:: @ 821A3AA clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 return -LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE +LilycoveCity_ContestLobby_EventScript_ShowPatron4:: @ 821A3AE clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 return -LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2 +LilycoveCity_ContestLobby_EventScript_ShowTourists:: @ 821A3B2 clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS return -LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6 +LilycoveCity_ContestLobby_EventScript_SetPaintingFlag:: @ 821A3B6 switch VAR_CONTEST_CATEGORY - case 0, LilycoveCity_ContestLobby_EventScript_21A3F3 - case 1, LilycoveCity_ContestLobby_EventScript_21A3F7 - case 2, LilycoveCity_ContestLobby_EventScript_21A3FB - case 3, LilycoveCity_ContestLobby_EventScript_21A3FF - case 4, LilycoveCity_ContestLobby_EventScript_21A403 + case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_MadeCoolPainting + case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting + case CONTEST_CATEGORY_CUTE, LilycoveCity_ContestLobby_EventScript_MadeCutePainting + case CONTEST_CATEGORY_SMART, LilycoveCity_ContestLobby_EventScript_MadeSmartPainting + case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_MadeToughPainting return -LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3 +LilycoveCity_ContestLobby_EventScript_MadeCoolPainting:: @ 821A3F3 setflag FLAG_COOL_PAINTING_MADE return -LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7 +LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting:: @ 821A3F7 setflag FLAG_BEAUTY_PAINTING_MADE return -LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB +LilycoveCity_ContestLobby_EventScript_MadeCutePainting:: @ 821A3FB setflag FLAG_CUTE_PAINTING_MADE return -LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF +LilycoveCity_ContestLobby_EventScript_MadeSmartPainting:: @ 821A3FF setflag FLAG_SMART_PAINTING_MADE return -LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 +LilycoveCity_ContestLobby_EventScript_MadeToughPainting:: @ 821A403 setflag FLAG_TOUGH_PAINTING_MADE return -LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 +LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer: @ 821A407 walk_down walk_down walk_down @@ -170,7 +170,7 @@ LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 walk_right step_end -LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F +LilycoveCity_ContestLobby_Movement_ArtistExit: @ 821A40F walk_down walk_down walk_down @@ -181,17 +181,17 @@ LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F walk_down step_end -LilycoveCity_ContestLobby_Movement_21A418: @ 821A418 +LilycoveCity_ContestLobby_Movement_PlayerFaceArtist: @ 821A418 walk_in_place_fastest_left step_end -LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A +LilycoveCity_ContestLobby_Movement_ArtistBeginToExit: @ 821A41A walk_down walk_down walk_down step_end -LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E +LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer: @ 821A41E delay_16 delay_16 delay_16 @@ -202,79 +202,79 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E walk_in_place_fastest_right step_end -LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 - goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436 +LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist:: @ 821A427 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_LinkContestArtist setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end -LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 +LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436 lockall addobject 11 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A533 + applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer waitmovement 11 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A545 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall fadescreen 1 showcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO + msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A + goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink compare VAR_RESULT, NO - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A4B4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink end -LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A - msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink:: @ 821A47A + msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT closemessage - special sub_80F88DC + special SaveMuseumContestPainting setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon - compare VAR_RESULT, 1 - call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C + compare VAR_RESULT, TRUE + call_if_eq LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon + applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistExit waitmovement 0 removeobject 11 - call LilycoveCity_ContestLobby_EventScript_21A360 - call LilycoveCity_ContestLobby_EventScript_21A3B6 + call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons + call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag releaseall end -LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO +LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink:: @ 821A4B4 + msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A - msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink + msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT closemessage - applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C + applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistExit waitmovement 0 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end -LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 +LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4 incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET - special sub_80F8390 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 + special BufferContestWinnerMonName + applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit waitmovement 0 playse SE_PIN applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B + applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT - msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_OkaySeeYou, MSGBOX_DEFAULT closemessage return -LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 +LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer: @ 821A533 walk_down walk_down walk_down @@ -285,7 +285,7 @@ LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 walk_left step_end -LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C +LilycoveCity_ContestLobby_Movement_LinkArtistExit: @ 821A53C walk_down walk_down walk_down @@ -296,17 +296,17 @@ LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C walk_down step_end -LilycoveCity_ContestLobby_Movement_21A545: @ 821A545 +LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist: @ 821A545 walk_in_place_fastest_right step_end -LilycoveCity_ContestLobby_Movement_21A547: @ 821A547 +LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit: @ 821A547 walk_down walk_down walk_down step_end -LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B +LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer: @ 821A54B delay_16 delay_16 delay_16 @@ -317,122 +317,124 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B walk_in_place_fastest_left step_end +@ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554 - special sub_80F9154 - specialvar VAR_RESULT, sub_80F8D24 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A5CF - call LilycoveCity_ContestLobby_EventScript_279CC5 - call LilycoveCity_ContestLobby_EventScript_21A670 + special ClearLinkContestFlags + specialvar VAR_RESULT, IsContestDebugActive @ Always FALSE + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_ContestLobby_EventScript_SetDebug + call LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist + call LilycoveCity_ContestLobby_EventScript_LeadToContestHall special SetContestTrainerGfxIds - call LilycoveCity_ContestLobby_EventScript_23BEB6 - call LilycoveCity_ContestLobby_EventScript_21A585 - call LilycoveCity_ContestLobby_EventScript_21A5EF + call LilycoveCity_ContestLobby_EventScript_SetPlayerGfx + call LilycoveCity_ContestLobby_EventScript_SetContestType + call LilycoveCity_ContestLobby_EventScript_WarpToContestHall waitstate end -LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585 +LilycoveCity_ContestLobby_EventScript_SetContestType:: @ 821A585 switch VAR_CONTEST_RANK - case 0, LilycoveCity_ContestLobby_EventScript_21A5B7 - case 1, LilycoveCity_ContestLobby_EventScript_21A5BD - case 2, LilycoveCity_ContestLobby_EventScript_21A5C3 - case 3, LilycoveCity_ContestLobby_EventScript_21A5C9 + case CONTEST_RANK_NORMAL, LilycoveCity_ContestLobby_EventScript_SetNormalContestType + case CONTEST_RANK_SUPER, LilycoveCity_ContestLobby_EventScript_SetSuperContestType + case CONTEST_RANK_HYPER, LilycoveCity_ContestLobby_EventScript_SetHyperContestType + case CONTEST_RANK_MASTER, LilycoveCity_ContestLobby_EventScript_SetMasterContestType return -LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7 - setvar VAR_CONTEST_LOCATION, 1 +LilycoveCity_ContestLobby_EventScript_SetNormalContestType:: @ 821A5B7 + setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL return -LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD - setvar VAR_CONTEST_LOCATION, 2 +LilycoveCity_ContestLobby_EventScript_SetSuperContestType:: @ 821A5BD + setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER return -LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3 - setvar VAR_CONTEST_LOCATION, 3 +LilycoveCity_ContestLobby_EventScript_SetHyperContestType:: @ 821A5C3 + setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER return -LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 - setvar VAR_CONTEST_LOCATION, 4 +LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9 + setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER return -LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF +@ Functionally unused +LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 giveitem ITEM_CONTEST_PASS, 1 setvar VAR_0x800B, 8 - setvar VAR_CONTEST_RANK, 3 + setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end -LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF - setflag FLAG_ENTERED_LINK_CONTEST +LilycoveCity_ContestLobby_EventScript_WarpToContestHall:: @ 821A5EF + setflag FLAG_ENTERED_CONTEST switch VAR_CONTEST_CATEGORY - case 0, LilycoveCity_ContestLobby_EventScript_21A62F - case 1, LilycoveCity_ContestLobby_EventScript_21A63C - case 2, LilycoveCity_ContestLobby_EventScript_21A649 - case 3, LilycoveCity_ContestLobby_EventScript_21A656 - case 4, LilycoveCity_ContestLobby_EventScript_21A663 + case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall + case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall + case CONTEST_CATEGORY_CUTE, LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall + case CONTEST_CATEGORY_SMART, LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall + case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall return -LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F - setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 - special sub_80AFC60 +LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall:: @ 821A62F + setwarp MAP_CONTEST_HALL_COOL, 255, 7, 5 + special DoContestHallWarp waitstate return -LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C - setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 - special sub_80AFC60 +LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall:: @ 821A63C + setwarp MAP_CONTEST_HALL_BEAUTY, 255, 7, 5 + special DoContestHallWarp waitstate return -LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649 - setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 - special sub_80AFC60 +LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall:: @ 821A649 + setwarp MAP_CONTEST_HALL_CUTE, 255, 7, 5 + special DoContestHallWarp waitstate return -LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656 - setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 - special sub_80AFC60 +LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall:: @ 821A656 + setwarp MAP_CONTEST_HALL_SMART, 255, 7, 5 + special DoContestHallWarp waitstate return -LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663 - setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 - special sub_80AFC60 +LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall:: @ 821A663 + setwarp MAP_CONTEST_HALL_TOUGH, 255, 7, 5 + special DoContestHallWarp waitstate return -LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 +LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670 lockall - applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5 + applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter waitmovement 0 playse SE_HASHI setmetatile 12, 2, METATILE_Contest_WallShadow, 1 setmetatile 12, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView - applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9 + applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter waitmovement 0 playse SE_HASHI setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 - applymovement 1, LilycoveCity_ContestLobby_Movement_21A706 + applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6F2 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_ComeThroughHere, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6E8 + applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall waitmovement 0 releaseall return -LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 +LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall: @ 821A6E8 walk_left walk_left walk_left @@ -444,24 +446,24 @@ LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 set_invisible step_end -LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2 +LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist: @ 821A6F2 walk_in_place_fastest_left walk_left step_end -LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5 +LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter: @ 821A6F5 walk_left walk_left walk_in_place_fastest_down step_end -LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9 +LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter: @ 821A6F9 walk_down walk_down walk_in_place_fastest_up step_end -LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD +LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall: @ 821A6FD walk_left walk_left walk_left @@ -472,32 +474,32 @@ LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD set_invisible step_end -LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 +LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer: @ 821A706 walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708 - msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC + msgbox LilycoveCity_ContestLobby_Text_MasterRankHereICome, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711 - msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC + msgbox LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A - msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC + msgbox LilycoveCity_ContestLobby_Text_ContestFeastForEyes, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723 - msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC + msgbox LilycoveCity_ContestLobby_Text_ToughContestIsExtreme, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C - msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC + msgbox LilycoveCity_ContestLobby_Text_LavishedCareOnMon, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735 - msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC + msgbox LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E @@ -543,11 +545,11 @@ LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761 end LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768 - msgbox LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready, MSGBOX_NPC + msgbox BerryBlender_Text_LetsGetBlendingAlready, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771 - msgbox LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC + msgbox BerryBlender_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A @@ -571,46 +573,46 @@ LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784 LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT + msgbox BerryBlender_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8 lock - msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT + msgbox BerryBlender_Text_WhoaAwesome, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3 lock - msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT + msgbox BerryBlender_Text_WickedlyFast, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE lock - msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT + msgbox BerryBlender_Text_WhatAnExpert, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT + msgbox BerryBlender_Text_MadeAmazingPokeblocksWithMaster, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT + msgbox BerryBlender_Text_QualitiesOfBlendMaster, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT + msgbox BerryBlender_Text_MasterWorksOnSkillsInMountains, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection end @@ -622,343 +624,343 @@ LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9 end LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806 - special sub_80F9154 + special ClearLinkContestFlags lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_27C063, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A819 + msgbox LilycoveCity_ContestLobby_Text_LinkContestReception, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest end -LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 - message LilycoveCity_ContestLobby_Text_27C0F6 +LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest:: @ 821A819 + message LilycoveCity_ContestLobby_Text_EnterContest3 waitmessage multichoice 0, 0, MULTI_ENTERINFO, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21A856 - case 1, LilycoveCity_ContestLobby_EventScript_21A90D - case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F + case 0, LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest + case 1, LilycoveCity_ContestLobby_EventScript_LinkContestInfo + case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 - msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO +LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest:: @ 821A856 + msgbox LilycoveCity_ContestLobby_Text_ProgressWillBeSaved, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest call Common_EventScript_SaveGame - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F - message LilycoveCity_ContestLobby_Text_27C8FD + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest + message LilycoveCity_ContestLobby_Text_WhichContestMode waitmessage specialvar VAR_TEMP_D, IsWirelessAdapterConnected multichoice 0, 0, MULTI_LINK_CONTEST_MODE, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21A8BB - case 1, LilycoveCity_ContestLobby_EventScript_21A8C6 - case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F + case 0, LilycoveCity_ContestLobby_EventScript_EmeraldMode @ Shortened to E-Mode + case 1, LilycoveCity_ContestLobby_EventScript_GlobalMode @ Shortened to G-Mode + case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB +LilycoveCity_ContestLobby_EventScript_EmeraldMode:: @ 821A8BB setvar VAR_TEMP_C, 0 - goto LilycoveCity_ContestLobby_EventScript_21A8DC + goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType end -LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 +LilycoveCity_ContestLobby_EventScript_GlobalMode:: @ 821A8C6 setvar VAR_TEMP_C, 1 compare VAR_TEMP_D, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAFC - goto LilycoveCity_ContestLobby_EventScript_21A8DC + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode + goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType end -LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC - message LilycoveCity_ContestLobby_Text_27C119 +LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC + message LilycoveCity_ContestLobby_Text_EnterWhichContest3 waitmessage multichoice 0, 0, MULTI_CONTEST_TYPE, 0 switch VAR_RESULT - case 5, LilycoveCity_ContestLobby_EventScript_21A97F - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F + case CONTEST_CATEGORIES_COUNT, LilycoveCity_ContestLobby_EventScript_CancelLinkContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest copyvar VAR_CONTEST_CATEGORY, VAR_RESULT - goto LilycoveCity_ContestLobby_EventScript_21A98C + goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon end -LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D - message LilycoveCity_ContestLobby_Text_27C0DA +LilycoveCity_ContestLobby_EventScript_LinkContestInfo:: @ 821A90D + message LilycoveCity_ContestLobby_Text_WhichTopic2 waitmessage multichoice 0, 0, MULTI_LINK_CONTEST_INFO, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21A955 - case 1, LilycoveCity_ContestLobby_EventScript_21A963 - case 2, LilycoveCity_ContestLobby_EventScript_21A971 - case 3, LilycoveCity_ContestLobby_EventScript_21A819 - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A819 + case 0, LilycoveCity_ContestLobby_EventScript_ExplainLinkContest + case 1, LilycoveCity_ContestLobby_EventScript_ExplainEMode + case 2, LilycoveCity_ContestLobby_EventScript_ExplainGMode + case 3, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest end -LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 - msgbox LilycoveCity_ContestLobby_Text_27C340, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A90D +LilycoveCity_ContestLobby_EventScript_ExplainLinkContest:: @ 821A955 + msgbox LilycoveCity_ContestLobby_Text_ExplainLinkContest, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo end -LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963 - msgbox LilycoveCity_ContestLobby_Text_27C5B1, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A90D +LilycoveCity_ContestLobby_EventScript_ExplainEMode:: @ 821A963 + msgbox LilycoveCity_ContestLobby_Text_ExplainEMode, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo end -LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971 - msgbox LilycoveCity_ContestLobby_Text_27C742, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A90D +LilycoveCity_ContestLobby_EventScript_ExplainGMode:: @ 821A971 + msgbox LilycoveCity_ContestLobby_Text_ExplainGMode, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo end -LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F +LilycoveCity_ContestLobby_EventScript_CancelLinkContest:: @ 821A97F special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C - msgbox LilycoveCity_ContestLobby_Text_27C1C3, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon:: @ 821A98C + msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon3, MSGBOX_DEFAULT setvar VAR_CONTEST_RANK, 0 choosecontestmon compare VAR_0x8004, 255 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F - special sub_80F7F30 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9E0 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare VAR_RESULT, 2 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare VAR_RESULT, 3 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9EE - compare VAR_RESULT, 4 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9FC + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest + special TryEnterContestMon + compare VAR_RESULT, CANT_ENTER_CONTEST + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank + compare VAR_RESULT, CAN_ENTER_CONTEST_EQUAL_RANK + goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest + compare VAR_RESULT, CAN_ENTER_CONTEST_HIGH_RANK + goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest + compare VAR_RESULT, CANT_ENTER_CONTEST_EGG + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg + compare VAR_RESULT, CANT_ENTER_CONTEST_FAINTED + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted end -LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 - msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A98C +LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank:: @ 821A9E0 + msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon end -LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE - msgbox LilycoveCity_ContestLobby_Text_27C186, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A98C +LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg:: @ 821A9EE + msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart2, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon end -LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC - msgbox LilycoveCity_ContestLobby_Text_27C140, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A98C +LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted:: @ 821A9FC + msgbox LilycoveCity_ContestLobby_Text_MonInNoCondition2, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon end -LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A +LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest:: @ 821AA0A copyvar VAR_0x8008, VAR_0x8004 - goto LilycoveCity_ContestLobby_EventScript_21AA15 + goto LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest end -LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 +LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15 compare VAR_TEMP_D, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AB4B + goto_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupType compare VAR_TEMP_D, 2 - goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F - message LilycoveCity_ContestLobby_Text_27BF85 + goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest + message LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel waitmessage copyvar VAR_0x8004, VAR_RESULT compare VAR_TEMP_C, 0 - call_if_eq LilycoveCity_ContestLobby_EventScript_21AABB + call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkEMode compare VAR_TEMP_C, 1 - call_if_eq LilycoveCity_ContestLobby_EventScript_21AAC0 + call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkGMode compare VAR_TEMP_C, 2 - goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest compare VAR_RESULT, 4 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices compare VAR_RESULT, 3 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices compare VAR_RESULT, 5 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest compare VAR_RESULT, 6 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAEF + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkError compare VAR_RESULT, 10 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAE1 - message3 LilycoveCity_ContestLobby_Text_27BEEC + goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference + message3 LilycoveCity_ContestLobby_Text_Transmitting contestlinktransfer switch VAR_0x8004 - case 0, LilycoveCity_ContestLobby_EventScript_21AB17 - case 1, LilycoveCity_ContestLobby_EventScript_21AAC5 - case 2, LilycoveCity_ContestLobby_EventScript_21AB09 + case 0, LilycoveCity_ContestLobby_EventScript_StartLinkContest + case 1, LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest + case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError end -LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB - special sub_80B3028 +LilycoveCity_ContestLobby_EventScript_TryLinkEMode:: @ 821AABB + special TryContestEModeLinkup waitstate return -LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0 - special sub_80B3000 +LilycoveCity_ContestLobby_EventScript_TryLinkGMode:: @ 821AAC0 + special TryContestGModeLinkup waitstate return -LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5 - msgbox LilycoveCity_ContestLobby_Text_27BF0E, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A97F +LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest:: @ 821AAC5 + msgbox LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3 - msgbox LilycoveCity_ContestLobby_Text_27BF4B, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A97F +LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices:: @ 821AAD3 + msgbox LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 - msgbox LilycoveCity_ContestLobby_Text_27C254, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A97F +LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference:: @ 821AAE1 + msgbox LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF +LilycoveCity_ContestLobby_EventScript_CancelLinkError:: @ 821AAEF special CloseLink msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC +LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode:: @ 821AAFC special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27C879, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09 - msgbox LilycoveCity_ContestLobby_Text_27BEFA, MSGBOX_DEFAULT - goto LilycoveCity_ContestLobby_EventScript_21A97F +LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError:: @ 821AB09 + msgbox LilycoveCity_ContestLobby_Text_TransmissionError, MSGBOX_DEFAULT + goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 - special sub_80F84B0 +LilycoveCity_ContestLobby_EventScript_StartLinkContest:: @ 821AB17 + special GetContestPlayerId addvar VAR_0x8004, 1 buffernumberstring 1, VAR_0x8004 - messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8 + messageautoscroll LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX waitmessage subvar VAR_0x8004, 1 - call LilycoveCity_ContestLobby_EventScript_21AC49 - setvar VAR_LINK_CONTEST_ROOM_STATE, 1 - special sub_80F8AFC - setvar VAR_CONTEST_LOCATION, 5 - setvar VAR_CONTEST_RANK, 3 - call LilycoveCity_ContestLobby_EventScript_21A5EF - end - -LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B - compare VAR_CONTEST_CATEGORY, 0 - call_if_eq LilycoveCity_ContestLobby_EventScript_21AB88 - compare VAR_CONTEST_CATEGORY, 1 - call_if_eq LilycoveCity_ContestLobby_EventScript_21AB8E - compare VAR_CONTEST_CATEGORY, 2 - call_if_eq LilycoveCity_ContestLobby_EventScript_21AB94 - compare VAR_CONTEST_CATEGORY, 3 - call_if_eq LilycoveCity_ContestLobby_EventScript_21AB9A - compare VAR_CONTEST_CATEGORY, 4 - call_if_eq LilycoveCity_ContestLobby_EventScript_21ABA0 - goto LilycoveCity_ContestLobby_EventScript_21ABA6 - end - -LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88 - setvar VAR_0x8004, 15 + call LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall + setvar VAR_CONTEST_HALL_STATE, 1 + special SetLinkContestPlayerGfx + setvar VAR_CONTEST_TYPE, CONTEST_TYPE_LINK + setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER + call LilycoveCity_ContestLobby_EventScript_WarpToContestHall + end + +LilycoveCity_ContestLobby_EventScript_SetLinkGroupType:: @ 821AB4B + compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_COOL + call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest + compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_BEAUTY + call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest + compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_CUTE + call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest + compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_SMART + call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest + compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_TOUGH + call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest + goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader + end + +LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest:: @ 821AB88 + setvar VAR_0x8004, LINK_GROUP_COOL_CONTEST return -LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E - setvar VAR_0x8004, 16 +LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest:: @ 821AB8E + setvar VAR_0x8004, LINK_GROUP_BEAUTY_CONTEST return -LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94 - setvar VAR_0x8004, 17 +LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest:: @ 821AB94 + setvar VAR_0x8004, LINK_GROUP_CUTE_CONTEST return -LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A - setvar VAR_0x8004, 18 +LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest:: @ 821AB9A + setvar VAR_0x8004, LINK_GROUP_SMART_CONTEST return -LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0 - setvar VAR_0x8004, 19 +LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest:: @ 821ABA0 + setvar VAR_0x8004, LINK_GROUP_TOUGH_CONTEST return -LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 - message Text_DecideLinkLeader +LilycoveCity_ContestLobby_EventScript_DecideLinkLeader:: @ 821ABA6 + message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_21AC0B - case 1, LilycoveCity_ContestLobby_EventScript_21ABE3 - case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F + case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup + case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup + case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest end -LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 - call LilycoveCity_ContestLobby_EventScript_21AC33 +LilycoveCity_ContestLobby_EventScript_TryLeadGroup:: @ 821ABE3 + call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided compare VAR_RESULT, 5 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader compare VAR_RESULT, 8 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABE3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup release end -LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B - call LilycoveCity_ContestLobby_EventScript_21AC38 +LilycoveCity_ContestLobby_EventScript_TryJoinGroup:: @ 821AC0B + call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D + goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided compare VAR_RESULT, 5 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader compare VAR_RESULT, 8 - goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC0B + goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup release end -LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33 +LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader:: @ 821AC33 special TryBecomeLinkLeader waitstate return -LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38 +LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup:: @ 821AC38 special TryJoinLinkGroup waitstate return -LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D - message3 LilycoveCity_ContestLobby_Text_27BEEC +LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided:: @ 821AC3D + message3 LilycoveCity_ContestLobby_Text_Transmitting contestlinktransfer - goto LilycoveCity_ContestLobby_EventScript_21AB17 + goto LilycoveCity_ContestLobby_EventScript_StartLinkContest end -LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 - messageautoscroll LilycoveCity_ContestLobby_Text_27C043 +LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49 + messageautoscroll LilycoveCity_ContestLobby_Text_ContestBeginShortly waitmessage delay 20 closemessage - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD + applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter waitmovement 0 playse SE_HASHI setmetatile 17, 2, METATILE_Contest_WallShadow, 1 setmetatile 17, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1 + applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter waitmovement 0 playse SE_HASHI setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF + applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACDB + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist waitmovement 0 - messageautoscroll LilycoveCity_ContestLobby_Text_27B653 + messageautoscroll LilycoveCity_ContestLobby_Text_ComeThroughHere waitmessage delay 20 closemessage - call LilycoveCity_ContestLobby_EventScript_27AD92 - applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACD0 + call LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer + applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall waitmovement 0 release return -LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 +LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall: @ 821ACD0 walk_right walk_right walk_right @@ -971,23 +973,23 @@ LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 set_invisible step_end -LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB +LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist: @ 821ACDB walk_right step_end -LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD +LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter: @ 821ACDD walk_right walk_right walk_in_place_fastest_down step_end -LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1 +LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter: @ 821ACE1 walk_down walk_down walk_in_place_fastest_up step_end -LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 +LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall: @ 821ACE5 walk_right walk_right walk_right @@ -999,34 +1001,34 @@ LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 set_invisible step_end -LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF +LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer: @ 821ACEF walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1 lock faceplayer - goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase + msgbox LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD55, MSGBOX_DEFAULT +LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase:: @ 821AD06 + msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries, MSGBOX_DEFAULT release end -LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10 +LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase: @ 821AD10 .string "Yippee!\p" .string "The lady at the reception counter\n" .string "gave me a case for {POKEBLOCK}S!$" -LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55 +LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries: @ 821AD55 .string "Make {POKEBLOCK}S and put them in there.\p" .string "When you make a {POKEBLOCK}, everyone\n" .string "has to put in a different BERRY.$" -LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9 +LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint: @ 821ADB9 .string "Congratulations!\p" .string "I did a painting of your POKéMON to\n" .string "commemorate its victory…\p" @@ -1035,7 +1037,7 @@ LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9 .string "painting better than I usually do.\l" .string "Look, see?$" -LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 +LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum: @ 821AE78 .string "What do you think? I'm confident in\n" .string "what I've done, but do you like it?\p" .string "A work of this caliber, it wouldn't look\n" @@ -1044,7 +1046,7 @@ LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 .string "for paintings?\p" .string "Do you think I should take this there?$" -LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63 +LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum: @ 821AF63 .string "What, really? Then, sure, I will take\n" .string "this painting there right now.\p" .string "I'll give it a proper title, too.\p" @@ -1053,34 +1055,34 @@ LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63 .string "Please check if they did accept this.\n" .string "Thank you!$" -LilycoveCity_ContestLobby_Text_21B030: @ 821B030 +LilycoveCity_ContestLobby_Text_TakeMementoOfPainting: @ 821B030 .string "Oh, that's right!\p" .string "As a memento of me painting your\n" .string "POKéMON, please take this.$" -LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E +LilycoveCity_ContestLobby_Text_ReceivedARibbon: @ 821B07E .string "{PLAYER} received a RIBBON.$" -LilycoveCity_ContestLobby_Text_21B094: @ 821B094 +LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon: @ 821B094 .string "{PLAYER} put the RIBBON on\n" .string "{STR_VAR_1}.$" -LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD +LilycoveCity_ContestLobby_Text_OkaySeeYou: @ 821B0AD .string "Okay, see you!$" -LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC +LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum: @ 821B0BC .string "Oh… Then, I guess I'll just take\n" .string "this home with me…\p" .string "But, you know, I would like to take\n" .string "this to the art museum… Okay?$" -LilycoveCity_ContestLobby_Text_21B132: @ 821B132 +LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs: @ 821B132 .string "Oh, fine, that's the way it is.\n" .string "I will hang this in my own house.\p" .string "I'll just have to try harder next time.\n" .string "Well, be seeing you.$" -LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 +LilycoveCity_ContestLobby_Text_MasterRankHereICome: @ 821B1B1 .string "Hoo, boy… Master Rank CONTESTS,\n" .string "here I come.\p" .string "The world will know that my dearest\n" @@ -1088,31 +1090,31 @@ LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 .string "existence. The time has come!\l" .string "Uheheheh.$" -LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D +LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere: @ 821B24D .string "You can see a whole variety of\n" .string "POKéMON here.\p" .string "That's why I make this place a regular\n" .string "part of my daily stroll.$" -LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA +LilycoveCity_ContestLobby_Text_ContestFeastForEyes: @ 821B2BA .string "Wow, coming out to a CONTEST is\n" .string "a feast for these eyes!\p" .string "Would you look at all the POKéMON\n" .string "that just scream to be painted?$" -LilycoveCity_ContestLobby_Text_21B334: @ 821B334 +LilycoveCity_ContestLobby_Text_ToughContestIsExtreme: @ 821B334 .string "The TOUGHNESS CONTEST is like\n" .string "extreme, man!\p" .string "Those muscular appeals…\n" .string "Cascading sweat… I swoon!$" -LilycoveCity_ContestLobby_Text_21B392: @ 821B392 +LilycoveCity_ContestLobby_Text_LavishedCareOnMon: @ 821B392 .string "Day in and day out, I lavished my care\n" .string "on this POKéMON.\p" .string "Its condition is peaking.\n" .string "Today, victory is mine!$" -LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC +LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily: @ 821B3FC .string "I made {POKEBLOCK}S with Mom, Dad, and\n" .string "Big Sister. They turned out great!\p" .string "I bet you can make smoother, better\n" diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 6348829ba..09da9a00e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition .byte 0 -LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 +LilycoveCity_PokemonTrainerFanClub_OnFrame: @ 821C790 map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A .2byte 0 @@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft @@ -118,7 +118,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1 return LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 - setvar VAR_0x8005, 8 + setvar VAR_0x8005, NUM_TRAINER_CLUB_MEMBERS setvar VAR_0x8004, 8 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 @@ -469,7 +469,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 setvar VAR_0x8004, 15 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 @@ -481,13 +481,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan:: @ 821CD67 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT release end @@ -608,11 +608,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF end -LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00 +LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00 .string "Oh, wow!\n" .string "It's {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12 +LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12 .string "I've heard the news!\n" .string "You're really strong, aren't you?\p" .string "We always argue about who is the\n" @@ -833,11 +833,11 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE .string "{STR_VAR_1} is definitely stronger!\n" .string "I'm positive!$" -LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72 +LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive: @ 821DE72 .string "You…\p" .string "Impressive!$" -LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83 +LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth: @ 821DE83 .string "Your true worth, it is fine if only\n" .string "I recognized it.\p" .string "The others I doubt will understand\n" diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc deleted file mode 100644 index 9fb83a7a9..000000000 --- a/data/maps/LinkContestRoom1/scripts.inc +++ /dev/null @@ -1,458 +0,0 @@ -LinkContestRoom1_MapScripts:: @ 823B781 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F - map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 - map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 - map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B - .byte 0 - -LinkContestRoom1_MapScript1_23B79B: @ 823B79B - special sub_80F8B94 - end - -LinkContestRoom1_OnTransition: @ 823B79F - call LinkContestRoom1_EventScript_23B7AF - setvar VAR_TEMP_0, 1 - call LinkContestRoom1_EventScript_23B842 - end - -LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF - call LinkContestRoom1_EventScript_27A133 - special ScriptGetMultiplayerId - compare VAR_RESULT, 0 - call_if_eq LinkContestRoom1_EventScript_23B7EF - compare VAR_RESULT, 1 - call_if_eq LinkContestRoom1_EventScript_23B7F3 - compare VAR_RESULT, 2 - call_if_eq LinkContestRoom1_EventScript_23B7F7 - compare VAR_RESULT, 3 - call_if_eq LinkContestRoom1_EventScript_23B7FB - compare VAR_RESULT, 4 - call_if_eq LinkContestRoom1_EventScript_23B7FF - return - -LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF - savebgm MUS_TEST1 - return - -LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 - savebgm MUS_TEST2 - return - -LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 - savebgm MUS_TEST3 - return - -LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB - savebgm MUS_TEST4 - return - -LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF - savebgm MUS_CONTEST0 - return - -LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare VAR_TEMP_9, 1 - call_if_eq LinkContestRoom1_EventScript_23B80F - end - -LinkContestRoom1_EventScript_23B80F:: @ 823B80F - call LinkContestRoom1_EventScript_23BB2B - return - -LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829 - .2byte 0 - -LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834 - .2byte 0 - -LinkContestRoom1_EventScript_23B829:: @ 823B829 - call LinkContestRoom1_EventScript_279F97 - call LinkContestRoom1_EventScript_23BE44 - end - -LinkContestRoom1_EventScript_23B834:: @ 823B834 - special sub_80F8B94 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN - call LinkContestRoom1_EventScript_23BB2B - end - -LinkContestRoom1_EventScript_23B842:: @ 823B842 - call LinkContestRoom1_EventScript_23B8F8 - call LinkContestRoom1_EventScript_23B858 - compare VAR_TEMP_0, 8 - goto_if_lt LinkContestRoom1_EventScript_23B842 - return - -LinkContestRoom1_EventScript_23B858:: @ 823B858 - switch VAR_TEMP_0 - case 1, LinkContestRoom1_EventScript_23B8AB - case 2, LinkContestRoom1_EventScript_23B8B6 - case 3, LinkContestRoom1_EventScript_23B8C1 - case 4, LinkContestRoom1_EventScript_23B8CC - case 5, LinkContestRoom1_EventScript_23B8D7 - case 6, LinkContestRoom1_EventScript_23B8E2 - case 7, LinkContestRoom1_EventScript_23B8ED - end - -LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB - copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 - copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 - copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC - copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 - copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 - copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED - copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 - setvar VAR_RESULT, 32 - special ScriptRandom - addvar VAR_RESULT, 1 - switch VAR_RESULT - case 1, LinkContestRoom1_EventScript_23BA6B - case 2, LinkContestRoom1_EventScript_23BA71 - case 3, LinkContestRoom1_EventScript_23BA77 - case 4, LinkContestRoom1_EventScript_23BA7D - case 5, LinkContestRoom1_EventScript_23BA83 - case 6, LinkContestRoom1_EventScript_23BA89 - case 7, LinkContestRoom1_EventScript_23BA8F - case 8, LinkContestRoom1_EventScript_23BA95 - case 9, LinkContestRoom1_EventScript_23BA9B - case 10, LinkContestRoom1_EventScript_23BAA1 - case 11, LinkContestRoom1_EventScript_23BAA7 - case 12, LinkContestRoom1_EventScript_23BAAD - case 13, LinkContestRoom1_EventScript_23BAB3 - case 14, LinkContestRoom1_EventScript_23BAB9 - case 15, LinkContestRoom1_EventScript_23BABF - case 16, LinkContestRoom1_EventScript_23BAC5 - case 17, LinkContestRoom1_EventScript_23BACB - case 18, LinkContestRoom1_EventScript_23BAD1 - case 19, LinkContestRoom1_EventScript_23BAD7 - case 20, LinkContestRoom1_EventScript_23BADD - case 21, LinkContestRoom1_EventScript_23BAE3 - case 22, LinkContestRoom1_EventScript_23BAE9 - case 23, LinkContestRoom1_EventScript_23BAEF - case 24, LinkContestRoom1_EventScript_23BAF5 - case 25, LinkContestRoom1_EventScript_23BAFB - case 26, LinkContestRoom1_EventScript_23BB01 - case 27, LinkContestRoom1_EventScript_23BB07 - case 28, LinkContestRoom1_EventScript_23BB0D - case 29, LinkContestRoom1_EventScript_23BB13 - case 30, LinkContestRoom1_EventScript_23BB19 - case 31, LinkContestRoom1_EventScript_23BB1F - case 32, LinkContestRoom1_EventScript_23BB25 - end - -LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B - setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY - return - -LinkContestRoom1_EventScript_23BA71:: @ 823BA71 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN - return - -LinkContestRoom1_EventScript_23BA77:: @ 823BA77 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1 - return - -LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1 - return - -LinkContestRoom1_EventScript_23BA83:: @ 823BA83 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2 - return - -LinkContestRoom1_EventScript_23BA89:: @ 823BA89 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY - return - -LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL - return - -LinkContestRoom1_EventScript_23BA95:: @ 823BA95 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3 - return - -LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3 - return - -LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY - return - -LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN - return - -LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD - setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F - return - -LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1 - return - -LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2 - return - -LinkContestRoom1_EventScript_23BABF:: @ 823BABF - setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M - return - -LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F - return - -LinkContestRoom1_EventScript_23BACB:: @ 823BACB - setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M - return - -LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4 - return - -LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK - return - -LinkContestRoom1_EventScript_23BADD:: @ 823BADD - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS - return - -LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN - return - -LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER - return - -LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF - setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER - return - -LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3 - return - -LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5 - return - -LinkContestRoom1_EventScript_23BB01:: @ 823BB01 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER - return - -LinkContestRoom1_EventScript_23BB07:: @ 823BB07 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER - return - -LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D - setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M - return - -LinkContestRoom1_EventScript_23BB13:: @ 823BB13 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M - return - -LinkContestRoom1_EventScript_23BB19:: @ 823BB19 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT - return - -LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY - return - -LinkContestRoom1_EventScript_23BB25:: @ 823BB25 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1 - return - -LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_CONTEST_LOCATION - case 1, LinkContestRoom1_EventScript_23BB78 - case 2, LinkContestRoom1_EventScript_23BB8B - case 3, LinkContestRoom1_EventScript_23BBE6 - case 4, LinkContestRoom1_EventScript_23BC92 - case 5, LinkContestRoom1_EventScript_23BC92 - return - -LinkContestRoom1_EventScript_23BB78:: @ 823BB78 - createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH - return - -LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH - return - -LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH - return - -LinkContestRoom1_EventScript_23BC92:: @ 823BC92 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH - return - -LinkContestRoom1_EventScript_23BD86:: @ 823BD86 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH - return - -LinkContestRoom1_EventScript_23BE44:: @ 823BE44 - special sub_80F9154 - switch VAR_CONTEST_LOCATION - case 1, LinkContestRoom1_EventScript_23BE84 - case 2, LinkContestRoom1_EventScript_23BE8E - case 3, LinkContestRoom1_EventScript_23BE98 - case 4, LinkContestRoom1_EventScript_23BEA2 - case 5, LinkContestRoom1_EventScript_23BEAC - return - -LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 - waitstate - end - -LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 - checkplayergender - compare VAR_RESULT, MALE - goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare VAR_RESULT, FEMALE - goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 - return - -LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - return - -LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - return - diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom5/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json deleted file mode 100644 index 38bfcd979..000000000 --- a/data/maps/LinkContestRoom6/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_LINK_CONTEST_ROOM6", - "name": "LinkContestRoom6", - "layout": "LAYOUT_LINK_CONTEST_ROOM6", - "music": "MUS_CONTEST0", - "region_map_section": "MAPSEC_DYNAMIC", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, - "allow_running": false, - "show_map_name": false, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom6/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 83dd8b420..9f951e83d 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -14,7 +14,7 @@ SlateportCity_OnTransition: @ 81DCC6C SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY - setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setvar VAR_CONTEST_HALL_STATE, 0 setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index eff7edfa7..25de15889 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96 lock faceplayer - goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest + goto_if_unset FLAG_ENTERED_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_MeetChairman switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index 3e4387b6a..bcad9e1d7 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index 42a719c17..4a6708006 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index ad18b00af..da7f875b3 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index 0e1528e59..8d5b033db 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index 8765e9771..89c95c51b 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index c7220897b..3e2878962 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -13,6 +13,6 @@ "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" + "shared_events_map": "ContestHall", + "shared_scripts_map": "ContestHall" }
\ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index a4eeb00d8..2f075346c 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 81EB566 VerdanturfTown_OnTransition: @ 81EB56C setflag FLAG_VISITED_VERDANTURF_TOWN - setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setvar VAR_CONTEST_HALL_STATE, 0 end VerdanturfTown_EventScript_Twin:: @ 81EB575 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 190e41fc8..cc4b5b137 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -460,18 +460,18 @@ "TradeCenter", "RecordCorner", "BattleColosseum4P", - "LinkContestRoom1", + "ContestHall", "UnknownLinkContestRoom_25_29", "UnknownLinkContestRoom_25_30", "UnknownLinkContestRoom_25_31", "UnknownLinkContestRoom_25_32", "UnknownLinkContestRoom_25_33", "UnknownLinkContestRoom_25_34", - "LinkContestRoom2", - "LinkContestRoom3", - "LinkContestRoom4", - "LinkContestRoom5", - "LinkContestRoom6", + "ContestHallBeauty", + "ContestHallTough", + "ContestHallCool", + "ContestHallSmart", + "ContestHallCute", "InsideOfTruck", "SSTidalCorridor", "SSTidalLowerDeck", |