diff options
85 files changed, 1220 insertions, 1286 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 19e42c9e9..b080f07a6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3,6 +3,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/berry.h" +#include "constants/cable_club.h" #include "constants/contest.h" #include "constants/daycare.h" #include "constants/decorations.h" @@ -1569,64 +1570,16 @@ EventScript_CableClub_SetVarResult0:: @ 8273755 setvar VAR_RESULT, 0 return -BattleFrontier_PokemonCenter_2F_EventScript_27375B:: @ 827375B -DewfordTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -EverGrandeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -EverGrandeCity_PokemonLeague_2F_EventScript_27375B:: @ 827375B -FallarborTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -FortreeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -LavaridgeTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -LilycoveCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -MauvilleCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -MossdeepCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -OldaleTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -PacifidlogTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -PetalburgCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -RustboroCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -SlateportCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -SootopolisCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -VerdanturfTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B - call OldaleTown_PokemonCenter_2F_EventScript_27751B +Common_EventScript_UnionRoomAttendant:: @ 827375B + call CableClub_EventScript_UnionRoomAttendant end -BattleFrontier_PokemonCenter_2F_EventScript_273761:: @ 8273761 -DewfordTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -EverGrandeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -EverGrandeCity_PokemonLeague_2F_EventScript_273761:: @ 8273761 -FallarborTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -FortreeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -LavaridgeTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -LilycoveCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -MauvilleCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -MossdeepCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -OldaleTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -PacifidlogTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -PetalburgCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -RustboroCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -SlateportCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -SootopolisCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -VerdanturfTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 - call OldaleTown_PokemonCenter_2F_EventScript_277672 +Common_EventScript_WirelessClubAttendant:: @ 8273761 + call CableClub_EventScript_WirelessClubAttendant end -BattleFrontier_PokemonCenter_2F_EventScript_273767:: @ 8273767 -DewfordTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -EverGrandeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -EverGrandeCity_PokemonLeague_2F_EventScript_273767:: @ 8273767 -FallarborTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -FortreeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -LavaridgeTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -LilycoveCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -MauvilleCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -MossdeepCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -OldaleTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -PacifidlogTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -PetalburgCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -RustboroCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -SlateportCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -SootopolisCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -VerdanturfTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 - call OldaleTown_PokemonCenter_2F_EventScript_2776A4 +Common_EventScript_DirectCornerAttendant:: @ 8273767 + call CableClub_EventScript_DirectCornerAttendant end Common_EventScript_RemoveStaticPokemon:: @ 827376D diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 888faa268..00205942d 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -926,16 +926,16 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 return BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, USING_BATTLE_TOWER message gText_PleaseWaitForLink waitmessage setvar VAR_0x8005, 0 - special sub_80B2DA4 + special TryBattleLinkup waitstate compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 compare VAR_RESULT, 4 @@ -943,7 +943,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 compare VAR_RESULT, 5 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 compare VAR_RESULT, 6 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 11 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 end @@ -952,7 +952,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F - msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT release end @@ -965,7 +965,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT + msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT release end @@ -1020,7 +1020,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 end BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 - message BattleFrontier_BattleTowerLobby_Text_2792CD + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT @@ -1031,7 +1031,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 end BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 - call BattleFrontier_BattleTowerLobby_EventScript_277B30 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 @@ -1044,7 +1044,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 return BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 - call BattleFrontier_BattleTowerLobby_EventScript_277B35 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 167f9afa0..310328a5c 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index caa6fed8a..fa93cde5f 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index 59ede7f6a..135733d5f 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9 + call CableClub_EventScript_Colosseum end -BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF + call CableClub_EventScript_TradeCenter end -BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index bde0f84fb..e8a1bf70a 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 2792a9a20..6ebca2ae0 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index f49560d8c..fee3a7726 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +DewfordTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC62A + call CableClub_EventScript_Colosseum end -DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +DewfordTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC630 + call CableClub_EventScript_TradeCenter end -DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +DewfordTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC636 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index e3bf7ada8..da1118a59 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index f1dcd3868..b99590829 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 690032b8a..6a77b3e8a 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,20 +1,21 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8229CF5 + call CableClub_EventScript_Colosseum end -EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8229CFB + call CableClub_EventScript_TradeCenter end -EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8229D01 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 25899420f..b3c562b4e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index 0d0bb68a1..a016be34b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index 2a2652938..13bf1ab65 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -1,19 +1,20 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum:: @ 8229D1C + call CableClub_EventScript_Colosseum end -EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter:: @ 8229D22 + call CableClub_EventScript_TradeCenter end -EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner:: @ 8229D28 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 5954ca787..2f1a28234 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 029a4a9c6..60bca57a9 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 0d5332647..6cffeef72 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00 + call CableClub_EventScript_Colosseum end -FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06 + call CableClub_EventScript_TradeCenter end -FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 2b7594959..64779a285 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 79bdfad30..42aca8164 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index 2ab9510f3..96dfd6e55 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653 + call CableClub_EventScript_Colosseum end -FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659 + call CableClub_EventScript_TradeCenter end -FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 3968430dd..dbd67b11d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 95d1e194f..2ee196f9b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index c8e52468f..d202f8fc0 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FFCAC + call CableClub_EventScript_Colosseum end -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FFCB2 + call CableClub_EventScript_TradeCenter end -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FFCB8 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index a5ab9601c..837cc28ad 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -810,7 +810,7 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT release end @@ -908,12 +908,12 @@ LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B end LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33 - special BerryBlenderLinkBecomeLeader + special TryBecomeLinkLeader waitstate return LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38 - special BerryBlenderLinkJoinGroup + special TryJoinLinkGroup waitstate return diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 615153530..aac909c42 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 6bfb1c4cb..cd1324cbe 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index 9bbf4f349..d71277872 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +LilycoveCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821C772 + call CableClub_EventScript_Colosseum end -LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 821C778 + call CableClub_EventScript_TradeCenter end -LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821C77E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 6343bd090..629618827 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 4afcc3882..000f0cf64 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", + "script": "MauvilleCity_PokemonCenter_2F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index c0200ea1f..49977d6b3 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,27 +1,28 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +MauvilleCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821101D + call CableClub_EventScript_Colosseum end -MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +MauvilleCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8211023 + call CableClub_EventScript_TradeCenter end -MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +MauvilleCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8211029 + call CableClub_EventScript_RecordCorner end -MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F - msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC +MauvilleCity_PokemonCenter_2F_EventScript_Youngster:: @ 821102F + msgbox MauvilleCity_PokemonCenter_2F_Text_Youngster, MSGBOX_NPC end -MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 +MauvilleCity_PokemonCenter_2F_Text_Youngster: @ 8211038 .string "Did you know that you can link battle\n" .string "at the COLOSSEUM here?\p" .string "They put up your record on the wall\n" diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 8ea28a474..3e64c45fd 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", + "script": "MossdeepCity_GameCorner_1F_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", + "script": "MossdeepCity_GameCorner_1F_EventScript_InfoMan", "flag": "0" } ], @@ -72,7 +72,7 @@ "y": 0, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_GameCorner_1F_EventScript_224B5D" + "script": "RS_MysteryEventsHouse_EventScript_Door" }, { "type": "sign", @@ -80,7 +80,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_GameCorner_1F_EventScript_277E9D" + "script": "MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords" }, { "type": "sign", @@ -88,7 +88,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_GameCorner_1F_EventScript_277E96" + "script": "MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index db9a1f854..4839d6a18 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,80 +1,87 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 - map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant .2byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 - map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B +@ Script is redundant, the label in the goto also does lock and faceplayer +MossdeepCity_GameCorner_1F_EventScript_InfoMan:: @ 8224B4B lock faceplayer - goto MossdeepCity_GameCorner_1F_EventScript_277C34 + goto MossdeepCity_GameCorner_1F_EventScript_InfoMan2 release end -MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 +@ Script is redundant, the label in the goto also does lock and faceplayer +MossdeepCity_GameCorner_1F_EventScript_OldMan:: @ 8224B54 lock faceplayer - goto MossdeepCity_GameCorner_1F_EventScript_277C91 + goto MossdeepCity_GameCorner_1F_EventScript_OldMan2 release end -MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D - msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN + +@ Everything below is leftover from RS +@ The house that was here in RS was moved to Sootopolis and replaced by the Game Corner +@ The text below is unused and duplicated in its replacement in Sootopolis City +@ And the BG Door event was moved inaccessibly into a wall + +RS_MysteryEventsHouse_EventScript_Door:: @ 8224B5D + msgbox RS_MysteryEventsHouse_Text_DoorIsLocked, MSGBOX_SIGN end -MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 +RS_MysteryEventsHouse_Text_OldManGreeting: @ 8224B66 .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" -MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD +RS_MysteryEventsHouse_Text_DoorIsLocked: @ 8224BFD .string "The door appears to be locked.$" -MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C +RS_MysteryEventsHouse_Text_ChallengeVisitingTrainer: @ 8224C1C .string "A TRAINER named {STR_VAR_1} is\n" .string "visiting my home.\p" .string "Would you like to challenge\n" .string "{STR_VAR_1}?$" -MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 +RS_MysteryEventsHouse_Text_YouWontBattle: @ 8224C64 .string "You won't battle? I'm disappointed\n" .string "that I can't see you battle…$" -MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 +RS_MysteryEventsHouse_Text_KeepItToA3On3: @ 8224CA4 .string "Oh, good, good!\p" .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" -MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B +RS_MysteryEventsHouse_Text_SaveYourProgress: @ 8224D0B .string "Before you two battle, you should\n" .string "save your progress.$" -MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41 +RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch: @ 8224D41 .string "I hope to see a good match!$" -MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D +RS_MysteryEventsHouse_Text_BattleTie: @ 8224D5D .string "So, it became a standoff.\p" .string "It was a brilliant match in which\n" .string "neither side conceded a step!$" -MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7 +RS_MysteryEventsHouse_Text_BattleWon: @ 8224DB7 .string "That was superlative!\p" .string "Why, it was like seeing myself in\n" .string "my youth again!$" -MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF +RS_MysteryEventsHouse_Text_BattleLost: @ 8224DFF .string "Ah, too bad for you!\p" .string "But it was a good match.\n" .string "I hope you can win next time.$" - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 6611238ab..a02816883 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 88bf3caf2..aa8691ac8 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", + "script": "MossdeepCity_PokemonCenter_2F_EventScript_Woman5", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 1c9c89fef..82a099a80 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,27 +1,28 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349 + call CableClub_EventScript_Colosseum end -MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F + call CableClub_EventScript_TradeCenter end -MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355 + call CableClub_EventScript_RecordCorner end -MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B - msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC +MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B + msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC end -MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 +MossdeepCity_PokemonCenter_2F_Text_Woman5: @ 8222364 .string "If I win a whole lot of link battles\n" .string "and show everyone how good I am,\l" .string "I might get a fan following!$" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 87c8693a7..ed25733d7 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index cddd0a5a3..c3e41775d 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index aead0bd65..e0f83308f 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +OldaleTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC22D + call CableClub_EventScript_Colosseum end -OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +OldaleTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC233 + call CableClub_EventScript_TradeCenter end -OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +OldaleTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC239 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 1a30d620b..5066858bf 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index c5f7c9907..25d8abd04 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index fcb4f1ab4..f1189f787 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +PacifidlogTown_PokemonCenter_2F_EventScript_Colosseum:: @ 820364A + call CableClub_EventScript_Colosseum end -PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +PacifidlogTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8203650 + call CableClub_EventScript_TradeCenter end -PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +PacifidlogTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8203656 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 85a16914f..0cda6f614 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 279c5e44b..067d6f237 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index d2370c6b1..89deb5dc3 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +PetalburgCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8207D56 + call CableClub_EventScript_Colosseum end -PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +PetalburgCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8207D5C + call CableClub_EventScript_TradeCenter end -PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +PetalburgCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8207D62 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 116d0fb50..4ae6e9bd2 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index db6388bba..812cb7c02 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index 3c62abc4a..406c2619a 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8214EF3 + call CableClub_EventScript_Colosseum end -RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8214EF9 + call CableClub_EventScript_TradeCenter end -RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8214EFF + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index a7ad50f1b..f63464424 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SingleBattleColosseum_EventScript_2774A6", + "script": "SingleBattleColosseum_EventScript_Attendant", "flag": "0" } ], diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index a6c344a21..8ad506d5b 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index e6ad0518b..74cccebf0 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index a9d48f43d..bd996ec76 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +SlateportCity_PokemonCenter_2F_EventScript_Colosseum:: @ 820DC36 + call CableClub_EventScript_Colosseum end -SlateportCity_PokemonCenter_2F_EventScript_20DC3C:: @ 820DC3C - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +SlateportCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 820DC3C + call CableClub_EventScript_TradeCenter end -SlateportCity_PokemonCenter_2F_EventScript_20DC42:: @ 820DC42 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +SlateportCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 820DC42 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 41a180c4f..ff0b8e07c 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 33308de7b..6c00e8e21 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 4c9fce912..0d20671dd 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +SootopolisCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8226782 + call CableClub_EventScript_Colosseum end -SootopolisCity_PokemonCenter_2F_EventScript_226788:: @ 8226788 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +SootopolisCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8226788 + call CableClub_EventScript_TradeCenter end -SootopolisCity_PokemonCenter_2F_EventScript_22678E:: @ 822678E - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +SootopolisCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 822678E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 1c409132d..98e7d46c1 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "TradeCenter_EventScript_2774B6", + "script": "TradeCenter_EventScript_Attendant", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index f785e8771..123e66408 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom .byte 0 VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index bfa6db09e..26f0d3aaa 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index 0964fa96f..bafbff336 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition .byte 0 -VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +VerdanturfTown_PokemonCenter_2F_EventScript_Colosseum:: @ 82028AC + call CableClub_EventScript_Colosseum end -VerdanturfTown_PokemonCenter_2F_EventScript_2028B2:: @ 82028B2 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +VerdanturfTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 82028B2 + call CableClub_EventScript_TradeCenter end -VerdanturfTown_PokemonCenter_2F_EventScript_2028B8:: @ 82028B8 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +VerdanturfTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 82028B8 + call CableClub_EventScript_RecordCorner end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 3fcb25807..6b2c87520 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,558 +1,492 @@ -PokemonCenter_2F_OnTransition: @ 8276ACF - call OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift +CableClub_MapScript_OnTransition: @ 8276ACF + call CableClub_EventScript_HideOrShowMysteryGiftMan end -OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift:: @ 8276AD5 - specialvar VAR_RESULT, sub_813B514 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB +CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 8276AD5 + specialvar VAR_RESULT, ShouldDistributeEonTicket + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_ShowMysteryGiftMan specialvar VAR_RESULT, ValidateReceivedWonderCard - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF - goto OldaleTown_PokemonCenter_2F_EventScript_276AFB + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_HideMysteryGiftMan + goto CableClub_EventScript_ShowMysteryGiftMan end -OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB +CableClub_EventScript_ShowMysteryGiftMan:: @ 8276AFB clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return -OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF +CableClub_EventScript_HideMysteryGiftMan:: @ 8276AFF setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return -BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -DewfordTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -EverGrandeCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -EverGrandeCity_PokemonLeague_2F_EventScript_276B03:: @ 8276B03 -FallarborTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -FortreeCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -LavaridgeTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -LilycoveCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -MauvilleCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -MossdeepCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -OldaleTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -PacifidlogTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -PetalburgCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -RustboroCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -SlateportCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 - specialvar VAR_RESULT, sub_813B514 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 - goto OldaleTown_PokemonCenter_2F_EventScript_276B19 +CableClub_EventScript_MysteryGiftMan:: @ 8276B03 + specialvar VAR_RESULT, ShouldDistributeEonTicket + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_DistributeEonTicket + goto CableClub_EventScript_AlreadyGotEonTicket end -OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 +CableClub_EventScript_AlreadyGotEonTicket:: @ 8276B19 gotoram -OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A +@ Unused? +CableClub_EventScript_MysteryGiftThankYou:: @ 8276B1A msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC end -OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 +CableClub_EventScript_DistributeEonTicket:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - goto_if_set FLAG_SYS_HAS_EON_TICKET, OldaleTown_PokemonCenter_2F_EventScript_276B19 - msgbox gUnknown_08273594, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AlreadyGotEonTicket + goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket + msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET - setvar VAR_ALWAYS_ZERO_0x403F, 0 - msgbox gUnknown_082735F2, MSGBOX_DEFAULT + setvar VAR_DISTRIBUTE_EON_TICKET, 0 + msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT release end +@ Unused? OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end -BattleFrontier_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -DewfordTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C: @ 8276B6C -FallarborTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -FortreeCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -LilycoveCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -MauvilleCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -MossdeepCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -OldaleTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -PetalburgCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C - map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE +CableClub_MapScript2_OnWarp: @ 8276B6C + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant .2byte 0 -MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE -OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE +CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD + goto_if_eq CableClub_EventScript_DontTurnAttendant turnobject VAR_0x8007, DIR_WEST +CableClub_EventScript_DontTurnAttendant:: @ 8276BBD + end + +CableClub_MapScript1_OnLoad: @ 8276BBE + compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER + goto_if_eq CableClub_EventScript_OnLoadFromTradeCenter + compare VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER + goto_if_eq CableClub_EventScript_OnLoadFromRecordCorner + compare VAR_CABLE_CLUB_STATE, USING_UNION_ROOM + goto_if_eq CableClub_EventScript_OnLoadFromUnionRoom + compare VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH + goto_if_eq CableClub_EventScript_OnLoadFromBerryCrush + compare VAR_CABLE_CLUB_STATE, USING_MINIGAME + goto_if_eq CableClub_EventScript_OnLoadFromGameCorner + end + +CableClub_EventScript_OnLoadFromColosseum:: @ 8276C17 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromTradeCenter:: @ 8276C1D + call CableClub_EventScript_OpenDirectCornerBarrier + end -OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD - end - -BattleFrontier_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -DewfordTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE: @ 8276BBE -FallarborTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -FortreeCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -LilycoveCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -MauvilleCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -MossdeepCity_GameCorner_1F_MapScript1_276BBE: @ 8276BBE -MossdeepCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -OldaleTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -PetalburgCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare VAR_CABLE_CLUB_STATE, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare VAR_CABLE_CLUB_STATE, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare VAR_CABLE_CLUB_STATE, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare VAR_CABLE_CLUB_STATE, 7 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare VAR_CABLE_CLUB_STATE, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C17:: @ 8276C17 - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C1D:: @ 8276C1D - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C23:: @ 8276C23 - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C29:: @ 8276C29 - call OldaleTown_PokemonCenter_2F_EventScript_277BBE - end - -OldaleTown_PokemonCenter_2F_EventScript_276C2F:: @ 8276C2F - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C35:: @ 8276C35 - call OldaleTown_PokemonCenter_2F_EventScript_277C0A - end - -BattleFrontier_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -DewfordTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B: @ 8276C3B -FallarborTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -FortreeCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -LilycoveCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -MauvilleCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -MossdeepCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -OldaleTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -PetalburgCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B - map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 - map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 - map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C - map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C - map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D +CableClub_EventScript_OnLoadFromRecordCorner:: @ 8276C23 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromUnionRoom:: @ 8276C29 + call CableClub_EventScript_OpenUnionRoomBarrier + end + +CableClub_EventScript_OnLoadFromBerryCrush:: @ 8276C2F + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35 + call EventScript_OpenMossdeepGameCornerBarrier + end + +CableClub_MapScript2_OnFrame: @ 8276C3B + map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_ExitTradeCenter + map_script_2 VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER, CableClub_EventScript_ExitRecordCorner + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_ExitUnionRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85 +CableClub_EventScript_ExitLinkRoom:: @ 8276C85 lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CB5 - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -MossdeepCity_GameCorner_1F_EventScript_276C9D:: @ 8276C9D -OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D +CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CB5 - call OldaleTown_PokemonCenter_2F_EventScript_277C1D + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call EventScript_CloseMossdeepGameCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 +CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 +CableClub_EventScript_ExitTradeCenter:: @ 8276CE7 lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CFF - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_PlayerExitTradeCenter + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF +CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call OldaleTown_PokemonCenter_2F_EventScript_276DAE + call CableClub_EventScript_TrainerCardDataOverwritten return -OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C +CableClub_EventScript_ExitRecordCorner:: @ 8276D2C lockall - call OldaleTown_PokemonCenter_2F_EventScript_276D44 - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_PlayerExitRecordCorner + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 +CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + goto_if_eq CableClub_EventScript_ExitRecordCornerRet + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 - -OldaleTown_PokemonCenter_2F_EventScript_276D6B:: @ 8276D6B +CableClub_EventScript_ExitRecordCornerRet:: @ 8276D6B return -OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C +CableClub_EventScript_ExitUnionRoom:: @ 8276D6C lockall - call OldaleTown_PokemonCenter_2F_EventScript_276D84 - call OldaleTown_PokemonCenter_2F_EventScript_277BD1 + call CableClub_EventScript_PlayerExitUnionRoom + call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 +CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84 setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call OldaleTown_PokemonCenter_2F_EventScript_276DAE + call CableClub_EventScript_TrainerCardDataOverwritten return -OldaleTown_PokemonCenter_2F_EventScript_276DAE:: @ 8276DAE - message OldaleTown_PokemonCenter_2F_Text_278521 +CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE + message CableClub_Text_TrainerCardDataOverwritten waitmessage playse SE_PIN delay 60 - message OldaleTown_PokemonCenter_2F_Text_27854C + message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F +CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 +CableClub_EventScript_Tutorial:: @ 8276DE0 lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 - msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT + msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_276E10 + applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter waitmovement 0 delay 30 - msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT + msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2 releaseall end -OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10 +CableClub_Movement_PlayerApproachCounter: @ 8276E10 walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 - message OldaleTown_PokemonCenter_2F_Text_277EA4 +CableClub_EventScript_WelcomeToCableClub:: @ 8276E13 + message CableClub_Text_WelcomeWhichCableClubService waitmessage delay 28 - goto OldaleTown_PokemonCenter_2F_EventScript_276E30 + goto CableClub_EventScript_SelectCableClubRoom end -OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 - msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276E30 +CableClub_EventScript_UnusedWelcomeToCableClub:: @ 8276E22 + msgbox CableClub_Text_WhichService, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectCableClubRoom end -OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 +CableClub_EventScript_SelectCableClubRoom:: @ 8276E30 setvar VAR_0x8004, 0 - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_CableClubUnlockedRecordCorner multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75 +CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75 multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_RecordCorner + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 +CableClub_EventScript_Colosseum:: @ 8276EB7 copyvar VAR_0x8007, VAR_LAST_TALKED - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 - message OldaleTown_PokemonCenter_2F_Text_2790BE +CableClub_EventScript_SelectBattleMode:: @ 8276EC2 + message CableClub_Text_WhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E - case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55 - case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15 - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_SingleBattleMode + case 1, CableClub_EventScript_DoubleBattleMode + case 2, CableClub_EventScript_MultiBattleMode + case 3, CableClub_EventScript_BattleModeInfo + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 - msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 +CableClub_EventScript_BattleModeInfo:: @ 8276F15 + msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 - setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 +CableClub_EventScript_SingleBattleMode:: @ 8276F23 + setvar VAR_0x8004, USING_SINGLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E +CableClub_EventScript_DoubleBattleMode:: @ 8276F2E special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 - setvar VAR_0x8004, 2 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 + goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle + setvar VAR_0x8004, USING_DOUBLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F47:: @ 8276F47 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 +CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 8276F47 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 - setvar VAR_0x8004, 5 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 +CableClub_EventScript_MultiBattleMode:: @ 8276F55 + setvar VAR_0x8004, USING_MULTI_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 +CableClub_EventScript_TryEnterColosseum:: @ 8276F60 call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2DA4 + special TryBattleLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD + goto_if_eq CableClub_EventScript_EnterColosseum compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277046 + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD +CableClub_EventScript_EnterColosseum:: @ 8276FBD special HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release - compare VAR_0x8004, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277036 + compare VAR_0x8004, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_WarpToDoubleColosseum special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B - applymovement EVENT_OBJ_ID_PLAYER, Movement_277352 +@ Unused +CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036 +CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036 special SetCableClubWarp warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046 +CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 8277046 switch VAR_0x8004 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277094 - case 2, OldaleTown_PokemonCenter_2F_EventScript_277083 - case 5, OldaleTown_PokemonCenter_2F_EventScript_277072 - goto OldaleTown_PokemonCenter_2F_EventScript_27730E + case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle + case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle + case USING_MULTI_BATTLE, CableClub_EventScript_AbortLinkNeedFourPlayers + goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants end -OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072 +CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 8277072 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27833D, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_NeedFourPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083 +CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 8277083 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278307, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_CantDoubleBattleWithXPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094 +CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 8277094 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_CantSingleBattleWithXPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 - special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278372, MSGBOX_DEFAULT +CableClub_EventScript_ConfirmNumberAndRestart:: @ 82770A5 + special CloseLink @ Redundant + msgbox CableClub_Text_PleaseConfirmNumberAndRestart, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 +CableClub_EventScript_TradeCenter:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_277199 + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2E4C + special TryTradeLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27713A + goto_if_eq CableClub_EventScript_EnterTradeCenter compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 7 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB + goto_if_eq CableClub_EventScript_AbortLinkPlayerNotReady compare VAR_RESULT, 9 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 + goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end -OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A - setvar VAR_0x8004, 3 +CableClub_EventScript_EnterTradeCenter:: @ 827713A + setvar VAR_0x8004, USING_TRADE_CENTER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -564,31 +498,31 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 +CableClub_EventScript_CheckPartyTradeRequirements:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_2771BF - specialvar VAR_RESULT, sub_80F9370 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD + goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_2771BF:: @ 82771BF - msgbox OldaleTown_PokemonCenter_2F_Text_278027, MSGBOX_DEFAULT +CableClub_EventScript_NeedTwoMonsToTrade:: @ 82771BF + msgbox CableClub_Text_NeedTwoMonsToTrade, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD - msgbox OldaleTown_PokemonCenter_2F_Text_278061, MSGBOX_DEFAULT +CableClub_EventScript_CantTradeEnigmaBerry:: @ 82771CD + msgbox CableClub_Text_CantTradeEnigmaBerry, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB +CableClub_EventScript_RecordCorner:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage special sub_80B2E74 @@ -596,38 +530,38 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB special sub_80B2EA8 waitstate compare VAR_RESULT, 12 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277328 + goto_if_eq CableClub_EventScript_AbortLinkForeignGame compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27724C + goto_if_eq CableClub_EventScript_EnterRecordCorner compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C - setvar VAR_0x8004, 4 +CableClub_EventScript_EnterRecordCorner:: @ 827724C + setvar VAR_0x8004, USING_RECORD_CORNER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -639,71 +573,70 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitstate end -OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB +CableClub_EventScript_AbortLinkPlayerNotReady:: @ 82772AB special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278565, MSGBOX_DEFAULT + msgbox CableClub_Text_NotSetUpForFarAwayRegion, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8 +CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 82772B8 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, MSGBOX_DEFAULT + msgbox CableClub_Text_OtherTrainerNotReady, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5 -OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5 +CableClub_EventScript_AbortLinkConnectionError:: @ 82772C5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2 -OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2 +CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 82772D2 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, MSGBOX_DEFAULT + msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF +CableClub_EventScript_AbortLinkDifferentSelections:: @ 82772DF special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC +CableClub_EventScript_AbortLink:: @ 82772EC special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278291, MSGBOX_DEFAULT + msgbox CableClub_Text_PleaseVisitAgain, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9 +MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9 special CloseLink - msgbox MossdeepCity_GameCorner_1F_Text_278D51, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_1F_Text_ComeAgain, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306 +@ Unused +CableClub_EventScript_CableClubWarp:: @ 8277306 special SetCableClubWarp special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E +CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 827730E special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, MSGBOX_DEFAULT + msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B +CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 827731B special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, MSGBOX_DEFAULT + msgbox CableClub_Text_YouHaveAMonThatCantBeTaken, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 +CableClub_EventScript_AbortLinkForeignGame:: @ 8277328 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278651, MSGBOX_DEFAULT + msgbox CableClub_Text_CantMixWithJapaneseGame, MSGBOX_DEFAULT release end @@ -712,54 +645,56 @@ CableClub_EventScript_WirelessClubAdjustements:: @ 8277335 release end -OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F +CableClub_EventScript_NotReadyYet:: @ 827733F msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT releaseall end -OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349 +Movement_AttendantFaceDown: @ 8277349 face_down step_end -OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B +@ Unused +Movement_AttendantFaceRight: @ 827734B face_right step_end -MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D -OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D +Movement_AttendantFaceLeft: @ 827734D face_left step_end -OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F +Movement_PlayerExitLinkRoom: @ 827734F walk_down walk_down step_end -Movement_277352: @ 8277352 +@ Functionally unused +Movement_PlayerApproachLinkRoomRight: @ 8277352 walk_right walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356 +Movement_PlayerApproachLinkRoomLeft: @ 8277356 walk_left walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A +Movement_PlayerEnterLinkRoom: @ 827735A walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C +@ Unused +Movement_PlayerFaceAttendantLeft: @ 827735C face_left step_end -OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E +Movement_PlayerFaceAttendantRight: @ 827735E face_right step_end -MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 +Movement_PlayerEnterMinigameRoom: @ 8277360 walk_left walk_up walk_up @@ -894,62 +829,62 @@ EventScript_RecordCenter_Spot3:: @ 827745C RecordCorner_EventScript_277471:: @ 8277471 bufferitemname 1, VAR_TEMP_1 - message RecordCorner_Text_27863C + message RecordCorner_Text_PlayerSentOverOneX waitmessage waitbuttonpress releaseall end -gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E - msgbox Text_278452, MSGBOX_DEFAULT +CableClub_EventScript_ReadTrainerCard:: @ 827747E + msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT fadescreen 1 - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D - msgbox Text_27847B, MSGBOX_DEFAULT +CableClub_EventScript_ReadTrainerCardColored:: @ 827748D + msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT fadescreen 1 - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C - msgbox Text_27842E, MSGBOX_DEFAULT +CableClub_EventScript_TooBusyToNotice:: @ 827749C + msgbox CableClub_Text_TooBusyToNotice, MSGBOX_DEFAULT closemessage end -SingleBattleColosseum_EventScript_2774A6:: @ 82774A6 - special sub_8098574 - msgbox SingleBattleColosseum_Text_2784B4, MSGBOX_DEFAULT - special sub_809859C +SingleBattleColosseum_EventScript_Attendant:: @ 82774A6 + special Script_FacePlayer + msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT + special Script_ClearHeldMovement closemessage end -TradeCenter_EventScript_2774B6:: @ 82774B6 - special sub_8098574 - msgbox TradeCenter_Text_2784E2, MSGBOX_DEFAULT - special sub_809859C +TradeCenter_EventScript_Attendant:: @ 82774B6 + special Script_FacePlayer + msgbox TradeCenter_Text_TakeSeatStartTrade, MSGBOX_DEFAULT + special Script_ClearHeldMovement closemessage end RecordCorner_EventScript_2774C6:: @ 82774C6 compare VAR_TEMP_0, 0 - goto_if_ne RecordCorner_EventScript_2774E0 - special sub_8098574 - message RecordCorner_Text_27861C + goto_if_ne RecordCorner_EventScript_AlreadyMixed + special Script_FacePlayer + message RecordCorner_Text_TakeSeatAndWait waitmessage waitbuttonpress - special sub_809859C + special Script_ClearHeldMovement closemessage end -RecordCorner_EventScript_2774E0:: @ 82774E0 - special sub_8098574 - message RecordCorner_Text_27850E +RecordCorner_EventScript_AlreadyMixed:: @ 82774E0 + special Script_FacePlayer + message RecordCorner_Text_ThanksForComing waitmessage waitbuttonpress - special sub_809859C + special Script_ClearHeldMovement closemessage end @@ -969,70 +904,70 @@ EventScript_TerminateLink:: @ 8277509 EventScript_DoLinkRoomExit:: @ 8277513 special CleanupLinkRoomState - special sub_80AF9F8 + special ReturnFromLinkRoom waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B +CableClub_EventScript_UnionRoomAttendant:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277668 - message OldaleTown_PokemonCenter_2F_Text_27940D + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_UnionRoomAdapterNotConnected + message CableClub_Text_WelcomeUnionRoomEnter waitmessage - goto OldaleTown_PokemonCenter_2F_EventScript_27755C + goto CableClub_EventScript_UnionRoomSelect end -OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C +CableClub_EventScript_UnionRoomSelect:: @ 827755C multichoice 17, 6, MULTI_YESNOINFO, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F - case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 2, OldaleTown_PokemonCenter_2F_EventScript_277593 - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_EnterUnionRoom + case 1, CableClub_EventScript_AbortLink + case 2, CableClub_EventScript_UnionRoomInfo + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 - message OldaleTown_PokemonCenter_2F_Text_2794B8 +CableClub_EventScript_UnionRoomInfo:: @ 8277593 + message CableClub_Text_UnionRoomInfo waitmessage - goto OldaleTown_PokemonCenter_2F_EventScript_27755C + goto CableClub_EventScript_UnionRoomSelect end -OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F - call OldaleTown_PokemonCenter_2F_EventScript_277626 +CableClub_EventScript_EnterUnionRoom:: @ 827759F + call CableClub_EventScript_CheckPartyUnionRoomRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT + goto_if_eq CableClub_EventScript_AbortLink + msgbox CableClub_Text_EnjoyUnionRoom, MSGBOX_DEFAULT closemessage special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, USING_UNION_ROOM copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - call OldaleTown_PokemonCenter_2F_EventScript_277BBE + call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim - special sub_8018090 + special Script_ResetUnionRoomTrade special SetCableClubWarp warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate @@ -1040,329 +975,325 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 +CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_27764C - specialvar VAR_RESULT, sub_80F9370 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27765A + goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C - msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT +CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 827764C + msgbox CableClub_Text_NeedTwoMonsForUnionRoom, MSGBOX_DEFAULT goto EventScript_CableClub_SetVarResult0 end -OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A - msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT +CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 827765A + msgbox CableClub_Text_NoEnigmaBerryInUnionRoom, MSGBOX_DEFAULT goto EventScript_CableClub_SetVarResult0 end -OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 - msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, MSGBOX_DEFAULT +CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 8277668 + msgbox CableClub_Text_UnionRoomAdapterNotConnected, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 +CableClub_EventScript_WirelessClubAttendant:: @ 8277672 lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements - msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO + msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A - msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT + goto_if_eq CableClub_EventScript_DontAskAboutLinking + msgbox CableClub_Text_ExplainWirelessClub, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_27769A:: @ 827769A - msgbox OldaleTown_PokemonCenter_2F_Text_279C91, MSGBOX_DEFAULT +CableClub_EventScript_DontAskAboutLinking:: @ 827769A + msgbox CableClub_Text_HopeYouEnjoyWirelessSystem, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 +CableClub_EventScript_DirectCornerAttendant:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 - message OldaleTown_PokemonCenter_2F_Text_279013 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_WelcomeToCableClub + message CableClub_Text_WelcomeWhichDirectCornerRoom waitmessage delay 28 - goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 + goto CableClub_EventScript_DirectCornerSelectService end -OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 +CableClub_EventScript_DirectCornerSelectService:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_DirectCornerNoBerry + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerSelectAllServices multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessBerryCrush + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E +CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7 - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessRecordMix + case 3, CableClub_EventScript_WirelessBerryCrush + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB +CableClub_EventScript_DirectCornerNoBerry:: @ 827778B + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerHasRecordMix multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB +CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessRecordMix + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D - msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO +CableClub_EventScript_WirelessTrade:: @ 827780D + msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_277199 + goto_if_eq CableClub_EventScript_AbortLink + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 3 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B - message OldaleTown_PokemonCenter_2F_Text_2790BE +CableClub_EventScript_WirelessBattleSelect:: @ 827783B + message CableClub_Text_WhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E - case 1, OldaleTown_PokemonCenter_2F_EventScript_277899 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessSingleBattle + case 1, CableClub_EventScript_WirelessDoubleBattle + case 2, CableClub_EventScript_WirelessMultiBattle + case 3, CableClub_EventScript_WirelessBattleInfo + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E +CableClub_EventScript_WirelessSingleBattle:: @ 827788E setvar VAR_0x8004, 0 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 +CableClub_EventScript_WirelessDoubleBattle:: @ 8277899 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 + goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778B2:: @ 82778B2 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_27783B +CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT + goto CableClub_EventScript_WirelessBattleSelect end -OldaleTown_PokemonCenter_2F_EventScript_2778C0:: @ 82778C0 +CableClub_EventScript_WirelessMultiBattle:: @ 82778C0 setvar VAR_0x8004, 2 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB - msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_27783B +CableClub_EventScript_WirelessBattleInfo:: @ 82778CB + msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT + goto CableClub_EventScript_WirelessBattleSelect end -OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 - msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO +CableClub_EventScript_WirelessRecordMix:: @ 82778D9 + msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 12 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 - msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO +CableClub_EventScript_WirelessBerryCrush:: @ 82778F7 + msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink special HasAtLeastOneBerry - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277923 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush setvar VAR_0x8004, 5 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 - msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 +CableClub_EventScript_NeedBerryForBerryCrush:: @ 8277923 + msgbox CableClub_Text_NeedBerryForBerryCrush, MSGBOX_DEFAULT + goto CableClub_EventScript_DirectCornerSelectService end -OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 +CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931 call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink switch VAR_0x8004 - case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 0, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 2, OldaleTown_PokemonCenter_2F_EventScript_277A16 - case 5, OldaleTown_PokemonCenter_2F_EventScript_277AA3 - case 12, OldaleTown_PokemonCenter_2F_EventScript_277AA3 + case 3, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 0, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 1, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 2, CableClub_EventScript_ChooseLinkLeaderFrom4 + case 5, CableClub_EventScript_ChooseLinkLeader + case 12, CableClub_EventScript_ChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 - message OldaleTown_PokemonCenter_2F_Text_2792CD +CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989 + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE - case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroup2Players + case 1, CableClub_EventScript_TryLeadGroup2Players + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroup2Players:: @ 82779C6 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 + goto_if_eq CableClub_EventScript_TryLeadGroup2Players release return -OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE + goto_if_eq CableClub_EventScript_TryJoinGroup2Players release return -OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 - message OldaleTown_PokemonCenter_2F_Text_279334 +CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16 + message CableClub_Text_ChooseGroupLeaderOfFour waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B - case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroup4Players + case 1, CableClub_EventScript_TryLeadGroup4Players + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroup4Players:: @ 8277A53 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 + goto_if_eq CableClub_EventScript_TryLeadGroup4Players release return -OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B + goto_if_eq CableClub_EventScript_TryJoinGroup4Players release return -OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 - message OldaleTown_PokemonCenter_2F_Text_2793A3 +CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3 + message CableClub_Text_ChooseGroupLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroupXPlayers + case 1, CableClub_EventScript_TryLeadGroupXPlayers + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroupXPlayers:: @ 8277AE0 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 + goto_if_eq CableClub_EventScript_TryLeadGroupXPlayers release return -OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroupXPlayers:: @ 8277B08 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 + goto_if_eq CableClub_EventScript_TryJoinGroupXPlayers release return -BattleFrontier_BattleTowerLobby_EventScript_277B30:: @ 8277B30 -MossdeepCity_GameCorner_1F_EventScript_277B30:: @ 8277B30 -OldaleTown_PokemonCenter_2F_EventScript_277B30:: @ 8277B30 - special BerryBlenderLinkBecomeLeader +CableClub_EventScript_TryBecomeLinkLeader:: @ 8277B30 + special TryBecomeLinkLeader waitstate return -BattleFrontier_BattleTowerLobby_EventScript_277B35:: @ 8277B35 -MossdeepCity_GameCorner_1F_EventScript_277B35:: @ 8277B35 -OldaleTown_PokemonCenter_2F_EventScript_277B35:: @ 8277B35 - special BerryBlenderLinkJoinGroup +CableClub_EventScript_TryJoinLinkGroup:: @ 8277B35 + special TryJoinLinkGroup waitstate return -OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A - messageautoscroll OldaleTown_PokemonCenter_2F_Text_2781A5 +CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A + messageautoscroll CableClub_Text_DirectYouToYourRoom waitmessage delay 60 closemessage copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -1373,256 +1304,240 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A EventScript_WirelessBoxResults:: @ 8277B8A lockall - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_27733F + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq EventScript_277BB4 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AdapterNotConnected fadescreen 1 special sub_801A42C waitstate - msgbox OldaleTown_PokemonCenter_2F_Text_27874F, MSGBOX_DEFAULT + msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT releaseall end -EventScript_277BB4:: @ 8277BB4 - msgbox OldaleTown_PokemonCenter_2F_Text_27871F, MSGBOX_DEFAULT +CableClub_EventScript_AdapterNotConnected:: @ 8277BB4 + msgbox CableClub_Text_AdapterNotConnected, MSGBOX_DEFAULT releaseall end -OldaleTown_PokemonCenter_2F_EventScript_277BBE:: @ 8277BBE +CableClub_EventScript_OpenUnionRoomBarrier:: @ 8277BBE setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277BD1:: @ 8277BD1 +CableClub_EventScript_CloseUnionRoomBarrier:: @ 8277BD1 setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -OldaleTown_PokemonCenter_2F_EventScript_277BE4:: @ 8277BE4 +CableClub_EventScript_OpenDirectCornerBarrier:: @ 8277BE4 setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277BF7:: @ 8277BF7 +CableClub_EventScript_CloseDirectCornerBarrier:: @ 8277BF7 setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -MossdeepCity_GameCorner_1F_EventScript_277C0A:: @ 8277C0A -OldaleTown_PokemonCenter_2F_EventScript_277C0A:: @ 8277C0A +EventScript_OpenMossdeepGameCornerBarrier:: @ 8277C0A setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277C1D:: @ 8277C1D +EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1 return -BattleFrontier_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -DewfordTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -EverGrandeCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -EverGrandeCity_PokemonLeague_1F_MapScript1_277C30: @ 8277C30 -FallarborTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -FortreeCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -LavaridgeTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -LilycoveCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -MauvilleCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -MossdeepCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -OldaleTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -PacifidlogTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -PetalburgCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -RustboroCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -SlateportCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -SootopolisCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -VerdanturfTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 - special sub_8016934 - end - -MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 +CableClub_MapScript1_InitUnionRoom: @ 8277C30 + special InitUnionRoom + end + +MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34 lock faceplayer - message MossdeepCity_GameCorner_1F_Text_278A7D + message MossdeepCity_GameCorner_1F_Text_DescribeWhichGame waitmessage multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277C73 - case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D - case 2, MossdeepCity_GameCorner_1F_EventScript_277C87 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87 + case 0, MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo + case 1, MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo + case 2, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit end -MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 - msgbox MossdeepCity_GameCorner_1F_Text_278ACB, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo:: @ 8277C73 + msgbox MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C7D:: @ 8277C7D - msgbox MossdeepCity_GameCorner_1F_Text_278BF1, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo:: @ 8277C7D + msgbox MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C87:: @ 8277C87 - msgbox MossdeepCity_GameCorner_1F_Text_278CAC, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit:: @ 8277C87 + msgbox MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 +MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91 lock faceplayer - message MossdeepCity_GameCorner_1F_Text_278CEB + message MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E48 + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected delay 60 - message MossdeepCity_GameCorner_1F_Text_278DAD + message MossdeepCity_GameCorner_1F_Text_PlayWhichGame waitmessage multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9 - case 1, MossdeepCity_GameCorner_1F_EventScript_277D35 - case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case 0, MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump + case 1, MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking + case 2, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 +MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 setvar VAR_0x8005, 0 - special sub_802C920 - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT + special DoesPartyHavePokemonJumpSpecies + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon + msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 - special sub_81B8958 + special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_AbortMinigame call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame setvar VAR_0x8004, 4 - goto MossdeepCity_GameCorner_1F_EventScript_277D81 + goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end -MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 +MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 setvar VAR_0x8005, 1 - special sub_8027A5C - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT + special DoesPartyHaveDodrio + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon + msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 - special sub_81B8958 + special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_AbortMinigame call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame setvar VAR_0x8004, 6 - goto MossdeepCity_GameCorner_1F_EventScript_277D81 + goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end -MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 - message MossdeepCity_GameCorner_1F_Text_2793A3 +MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81 + message CableClub_Text_ChooseGroupLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6 - case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE - case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case 0, MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup + case 1, MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader + case 2, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE - call MossdeepCity_GameCorner_1F_EventScript_277B30 +MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader:: @ 8277DBE + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom compare VAR_RESULT, 5 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DBE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader release return -MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 - call MossdeepCity_GameCorner_1F_EventScript_277B35 +MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup:: @ 8277DE6 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom compare VAR_RESULT, 5 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup release return -MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E - messageautoscroll MossdeepCity_GameCorner_1F_Text_278E00 +MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E + messageautoscroll MossdeepCity_GameCorner_1F_Text_AllGoodToGo waitmessage delay 60 closemessage copyvar VAR_0x8007, VAR_LAST_TALKED - call MossdeepCity_GameCorner_1F_EventScript_277C0A + call EventScript_OpenMossdeepGameCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end -MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 +MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48 delay 60 - msgbox MossdeepCity_GameCorner_1F_Text_278D68, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_1F_Text_AdapterNotConnected, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO +MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55 + msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame compare VAR_0x8005, 0 - call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E84 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements compare VAR_0x8005, 1 - call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E8D - goto MossdeepCity_GameCorner_1F_EventScript_2772F9 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements + goto MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277E84:: @ 8277E84 - msgbox MossdeepCity_GameCorner_1F_Text_278EDC, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements:: @ 8277E84 + msgbox MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed, MSGBOX_DEFAULT return -MossdeepCity_GameCorner_1F_EventScript_277E8D:: @ 8277E8D - msgbox MossdeepCity_GameCorner_1F_Text_278FA4, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements:: @ 8277E8D + msgbox MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed, MSGBOX_DEFAULT return -MossdeepCity_GameCorner_1F_EventScript_277E96:: @ 8277E96 +MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords:: @ 8277E96 lockall - special sub_802E3C4 + special ShowPokemonJumpRecords waitstate releaseall end -MossdeepCity_GameCorner_1F_EventScript_277E9D:: @ 8277E9D +MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords:: @ 8277E9D lockall - special sub_8027AAC + special ShowDodrioBerryPickingRecords waitstate releaseall end -OldaleTown_PokemonCenter_2F_Text_277EA4: @ 8277EA4 + +CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4 .string "Welcome to the POKéMON CABLE\n" .string "CLUB.\p" .string "Which of our services do you wish\n" .string "to use?$" -OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1 +CableClub_Text_WhichService: @ 8277EF1 .string "Which of our services do you wish\n" .string "to use?$" @@ -1638,18 +1553,19 @@ CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 .string "You can use the RECORD CORNER with\n" .string "others using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277FDD: @ 8277FDD +@ Unused +CableClub_Text_CloseThisMenu: @ 8277FDD .string "Close this menu.$" -OldaleTown_PokemonCenter_2F_Text_277FEE: @ 8277FEE +CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE .string "For a DOUBLE BATTLE, you must\n" .string "have at least two POKéMON.$" -OldaleTown_PokemonCenter_2F_Text_278027: @ 8278027 +CableClub_Text_NeedTwoMonsToTrade: @ 8278027 .string "For trading, you must have at\n" .string "least two POKéMON with you.$" -OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061 +CableClub_Text_CantTradeEnigmaBerry: @ 8278061 .string "A POKéMON holding the {STR_VAR_1}\n" .string "BERRY can't be traded.$" @@ -1671,54 +1587,50 @@ gText_AwaitingLinkup:: @ 8278131 .string "Awaiting linkup…\n" .string "… … B Button: Cancel$" -OldaleTown_PokemonCenter_2F_Text_278157:: @ 8278157 +@ Unused +CableClub_Text_OkayToSaveProgress:: @ 8278157 .string "Your progress must be saved before\n" .string "linking. Is it okay to save?$" -OldaleTown_PokemonCenter_2F_Text_278197: @ 8278197 +CableClub_Text_PleaseEnter: @ 8278197 .string "Please enter.$" -OldaleTown_PokemonCenter_2F_Text_2781A5: @ 82781A5 +CableClub_Text_DirectYouToYourRoom: @ 82781A5 .string "I'll direct you to your room now.$" -LilycoveCity_ContestLobby_Text_2781C7: @ 82781C7 -OldaleTown_PokemonCenter_2F_Text_2781C7: @ 82781C7 +Text_SomeoneIsNotReadyToLink: @ 82781C7 .string "Someone is not ready to link.\p" .string "Please come back after everyone\n" .string "has made preparations.$" -LilycoveCity_ContestLobby_Text_27821C: @ 827821C -OldaleTown_PokemonCenter_2F_Text_27821C: @ 827821C +Text_LinkErrorPleaseReset: @ 827821C .string "Sorry, we have a link error…\n" .string "Please reset and try again.$" -BattleFrontier_BattleTowerLobby_Text_278255: @ 8278255 -LilycoveCity_ContestLobby_Text_278255: @ 8278255 -OldaleTown_PokemonCenter_2F_Text_278255: @ 8278255 +Text_PlayersMadeDifferentSelections: @ 8278255 .string "The link partners appear to have\n" .string "made different selections.$" -OldaleTown_PokemonCenter_2F_Text_278291: @ 8278291 +CableClub_Text_PleaseVisitAgain: @ 8278291 .string "Please do visit again.$" -BattleFrontier_BattleTowerLobby_Text_2782A8: @ 82782A8 -OldaleTown_PokemonCenter_2F_Text_2782A8: @ 82782A8 +CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8 .string "The number of participants is\n" .string "incorrect.$" -OldaleTown_PokemonCenter_2F_Text_2782D1: @ 82782D1 +CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1 .string "The SINGLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -OldaleTown_PokemonCenter_2F_Text_278307: @ 8278307 +CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307 .string "The DOUBLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -OldaleTown_PokemonCenter_2F_Text_27833D: @ 827833D +CableClub_Text_NeedFourPlayers: @ 827833D .string "There must be four players to play\n" .string "this Battle Mode.$" -OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372 +CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372 .string "Please confirm the number of\n" .string "players and start again.$" @@ -1731,58 +1643,58 @@ Text_TerminateLinkPleaseWait: @ 82783E9 .string "You will be escorted out of\l" .string "the room. Please wait.$" -Text_27842E: @ 827842E +CableClub_Text_TooBusyToNotice: @ 827842E .string "This TRAINER is too busy to\n" .string "notice…$" -Text_278452: @ 8278452 +CableClub_Text_GotToLookAtTrainerCard: @ 8278452 .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!$" -Text_27847B: @ 827847B +CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!\p" .string "It's a {STR_VAR_2} card!$" -SingleBattleColosseum_Text_2784B4: @ 82784B4 +SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4 .string "Please take your place and start\n" .string "your battle.$" -TradeCenter_Text_2784E2: @ 82784E2 +TradeCenter_Text_TakeSeatStartTrade: @ 82784E2 .string "Please take your seat and start\n" .string "your trade.$" -RecordCorner_Text_27850E: @ 827850E +RecordCorner_Text_ThanksForComing: @ 827850E .string "Thanks for coming.$" -OldaleTown_PokemonCenter_2F_Text_278521: @ 8278521 +CableClub_Text_TrainerCardDataOverwritten: @ 8278521 .string "The TRAINER CARD data will\n" .string "be overwritten.$" -OldaleTown_PokemonCenter_2F_Text_27854C: @ 827854C +CableClub_Text_HopeToSeeYouAgain: @ 827854C .string "I hope to see you again!$" -OldaleTown_PokemonCenter_2F_Text_278565: @ 8278565 +CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565 .string "I'm awfully sorry.\p" .string "We're not set up to conduct trades\n" .string "with TRAINERS far away in another\l" .string "region yet…$" -OldaleTown_PokemonCenter_2F_Text_2785C9: @ 82785C9 +CableClub_Text_OtherTrainerNotReady: @ 82785C9 .string "The other TRAINER is not ready.$" -OldaleTown_PokemonCenter_2F_Text_2785E9: @ 82785E9 +CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9 .string "You have at least one POKéMON\n" .string "that can't be taken.$" -RecordCorner_Text_27861C: @ 827861C +RecordCorner_Text_TakeSeatAndWait: @ 827861C .string "Please take your seat and wait.$" -RecordCorner_Text_27863C: @ 827863C +RecordCorner_Text_PlayerSentOverOneX: @ 827863C .string "{STR_VAR_1} sent over one\n" .string "{STR_VAR_2}.$" -OldaleTown_PokemonCenter_2F_Text_278651: @ 8278651 +CableClub_Text_CantMixWithJapaneseGame: @ 8278651 .string "Sorry, there is a transmission error.\p" .string "You may not mix records with \n" .string "Japanese Ruby or Sapphire games.\p" @@ -1790,18 +1702,20 @@ OldaleTown_PokemonCenter_2F_Text_278651: @ 8278651 .string "Japanese Emerald and overseas Ruby\l" .string "or Sapphire games at the same time.$" -OldaleTown_PokemonCenter_2F_Text_27871F: @ 827871F +CableClub_Text_AdapterNotConnected: @ 827871F .string "The Wireless Adapter is not\n" .string "connected properly.$" -OldaleTown_PokemonCenter_2F_Text_27874F: @ 827874F +CableClub_Text_ParticipantsStepUpToCounter: @ 827874F .string "Participants are asked to step up\n" .string "to the reception counter.$" -OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B +@ Unused +CableClub_Text_Hello: @ 827878B .string "Hello!$" -OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792 +@ Unused +CableClub_Text_PleaseWait: @ 8278792 .string "Please wait.$" CableClub_Text_YouMayTradeHere:: @ 827879F @@ -1830,29 +1744,31 @@ CableClub_Text_CancelSelectedItem:: @ 827889C OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC .string "Which battle mode would you like?$" -OldaleTown_PokemonCenter_2F_Text_2788DE: @ 82788DE +@ Unused +CableClub_Text_ReturnsToPreviousStep: @ 82788DE .string "Returns to the previous step.$" -OldaleTown_PokemonCenter_2F_Text_2788FC: @ 82788FC +CableClub_Text_NeedBerryForBerryCrush: @ 82788FC .string "To use the BERRY CRUSH service,\n" .string "you must have at least one BERRY.$" -OldaleTown_PokemonCenter_2F_Text_27893E: @ 827893E +CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E .string "To enter the UNION ROOM, you must\n" .string "have at least two POKéMON.$" -OldaleTown_PokemonCenter_2F_Text_27897B: @ 827897B +CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B .string "No POKéMON holding the {STR_VAR_1}\n" .string "BERRY may enter the UNION ROOM.$" -OldaleTown_PokemonCenter_2F_Text_2789B5: @ 82789B5 +CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5 .string "This is the POKéMON WIRELESS CLUB\n" .string "UNION ROOM.\p" .string "Unfortunately, your Wireless\n" .string "Adapter is not connected properly.\p" .string "Please do come again.$" -OldaleTown_PokemonCenter_2F_Text_278A39: @ 8278A39 +@ Unused +CableClub_Text_OhExcuseMe: @ 8278A39 .string "Oh…\n" .string "Excuse me!$" @@ -1861,12 +1777,12 @@ CableClub_Text_PlayerIsWaiting: @ 8278A48 .string "right now.\l" .string "Go for it!$" -MossdeepCity_GameCorner_1F_Text_278A7D: @ 8278A7D +MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D .string "I can explain game rules to you,\n" .string "if you'd like.\p" .string "Which game should I describe?$" -MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB +MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB .string "“POKéMON JUMP”\p" .string "Make your POKéMON skip the VINE WHIP\n" .string "rope with the A Button.\p" @@ -1879,7 +1795,7 @@ MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB .string "Good things happen if everyone\n" .string "jumps in time.$" -MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1 +MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1 .string "“DODRIO BERRY-PICKING”\p" .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" @@ -1888,46 +1804,47 @@ MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1 .string "To play this game, you must have\n" .string "a DODRIO.$" -MossdeepCity_GameCorner_1F_Text_278CAC: @ 8278CAC +MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC .string "If you want to play a game,\n" .string "please tell the old man beside me.$" -MossdeepCity_GameCorner_1F_Text_278CEB: @ 8278CEB +MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB .string "Hi, welcome!\n" .string "Are you here to play games using\l" .string "Wireless Communication?\p" .string "Can you wait just a little bit?$" -MossdeepCity_GameCorner_1F_Text_278D51: @ 8278D51 +MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51 .string "All right, come again!$" -MossdeepCity_GameCorner_1F_Text_278D68: @ 8278D68 +MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68 .string "The Wireless Adapter isn't connected.\n" .string "Come back when it's hooked up!$" -MossdeepCity_GameCorner_1F_Text_278DAD: @ 8278DAD +MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD .string "All right, which game did you want\n" .string "to play?$" -MossdeepCity_GameCorner_1F_Text_278DD9: @ 8278DD9 +MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9 .string "Which POKéMON would you like to\n" .string "enter?$" -MossdeepCity_GameCorner_1F_Text_278E00: @ 8278E00 +MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00 .string "Okay, you're all good to go.\n" .string "Don't let the others beat you!$" -MossdeepCity_GameCorner_1F_Text_278E3C: @ 8278E3C +@ Unused +MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C .string "Are you leaving now?\n" .string "Do come again!$" -MossdeepCity_GameCorner_1F_Text_278E60: @ 8278E60 +MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60 .string "It doesn't look like you have any\n" .string "POKéMON that you can enter…\p" .string "Would you like me to explain what\n" .string "kinds of POKéMON can enter?$" -MossdeepCity_GameCorner_1F_Text_278EDC: @ 8278EDC +MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC .string "“POKéMON JUMP” is open to POKéMON\n" .string "around 28 inches or less.\p" .string "What you can't enter are those\n" @@ -1936,15 +1853,16 @@ MossdeepCity_GameCorner_1F_Text_278EDC: @ 8278EDC .string "swim, burrow, or fly.\p" .string "That's all you need to know.$" -MossdeepCity_GameCorner_1F_Text_278FA4: @ 8278FA4 +MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4 .string "DODRIO BERRY-PICKING is a game that \n" .string "only DODRIO may enter.$" -MossdeepCity_GameCorner_1F_Text_278FE0: @ 8278FE0 +@ Unused +MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0 .string "Could you retry this from the start\n" .string "again, please?$" -OldaleTown_PokemonCenter_2F_Text_279013: @ 8279013 +CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013 .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB DIRECT CORNER.\p" .string "You may interact directly with\n" @@ -1952,22 +1870,22 @@ OldaleTown_PokemonCenter_2F_Text_279013: @ 8279013 .string "Which room would you like to\n" .string "enter?$" -OldaleTown_PokemonCenter_2F_Text_27909D: @ 827909D +CableClub_Text_TradePokemon: @ 827909D .string "Would you like to trade POKéMON?$" -OldaleTown_PokemonCenter_2F_Text_2790BE: @ 82790BE +CableClub_Text_WhichBattleMode: @ 82790BE .string "Which Battle Mode would you like\n" .string "to play?$" -OldaleTown_PokemonCenter_2F_Text_2790E8: @ 82790E8 +CableClub_Text_AccessRecordCorner: @ 82790E8 .string "Would you like to access\n" .string "the RECORD CORNER?$" -OldaleTown_PokemonCenter_2F_Text_279114: @ 8279114 +CableClub_Text_UseBerryCrush: @ 8279114 .string "Would you like to use the\n" .string "BERRY CRUSH System?$" -OldaleTown_PokemonCenter_2F_Text_279142: @ 8279142 +CableClub_Text_ExplainBattleModes: @ 8279142 .string "There are three Battle Modes.\p" .string "SINGLE BATTLE is for two TRAINERS\n" .string "with one or more POKéMON each.\p" @@ -1982,27 +1900,25 @@ OldaleTown_PokemonCenter_2F_Text_279142: @ 8279142 .string "Each TRAINER can have one POKéMON\n" .string "in battle at a time.$" -BattleFrontier_BattleTowerLobby_Text_2792CD: @ 82792CD -OldaleTown_PokemonCenter_2F_Text_2792CD: @ 82792CD +CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD .string "Please decide which of you two\n" .string "will become the LEADER.\p" .string "The other player must then choose\n" .string "“JOIN GROUP.”$" -OldaleTown_PokemonCenter_2F_Text_279334: @ 8279334 +CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334 .string "Please decide which of you four\n" .string "will become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -MossdeepCity_GameCorner_1F_Text_2793A3: @ 82793A3 -OldaleTown_PokemonCenter_2F_Text_2793A3: @ 82793A3 +CableClub_Text_ChooseGroupLeader: @ 82793A3 .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -OldaleTown_PokemonCenter_2F_Text_27940D: @ 827940D +CableClub_Text_WelcomeUnionRoomEnter: @ 827940D .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB UNION ROOM.\p" .string "You may interact directly with\n" @@ -2010,7 +1926,7 @@ OldaleTown_PokemonCenter_2F_Text_27940D: @ 827940D .string "whom you may not even know.\p" .string "Would you like to enter the ROOM?$" -OldaleTown_PokemonCenter_2F_Text_2794B8: @ 82794B8 +CableClub_Text_UnionRoomInfo: @ 82794B8 .string "The TRAINERS in the UNION ROOM\n" .string "will be those players around you\l" .string "who have also entered the ROOM.\p" @@ -2024,11 +1940,11 @@ OldaleTown_PokemonCenter_2F_Text_2794B8: @ 82794B8 .string "trade.\p" .string "Would you like to enter the ROOM?$" -OldaleTown_PokemonCenter_2F_Text_27961C: @ 827961C +CableClub_Text_EnjoyUnionRoom: @ 827961C .string "I hope you enjoy your time in\n" .string "the UNION ROOM.$" -OldaleTown_PokemonCenter_2F_Text_27964A: @ 827964A +CableClub_Text_FirstTimeRightThisWay: @ 827964A .string "Hello!\n" .string "My name is TEALA.\p" .string "This must be your first time\n" @@ -2039,7 +1955,7 @@ OldaleTown_PokemonCenter_2F_Text_27964A: @ 827964A .string "floor of our POKéMON CENTER.\p" .string "Right this way, please.$" -OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 +CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718 .string "On the top floor, there are two\n" .string "rooms.\p" .string "First, the room on the left.\n" @@ -2061,14 +1977,14 @@ OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -OldaleTown_PokemonCenter_2F_Text_279937: @ 8279937 +CableClub_Text_AskAboutLinking: @ 8279937 .string "Hello, {PLAYER}!\p" .string "It's me, TEALA, the POKéMON\n" .string "CENTER 2F attendant.\p" .string "Is there something you needed to\n" .string "ask me about linking?$" -OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA +CableClub_Text_ExplainWirelessClub: @ 82799AA .string "Let me explain how the POKéMON\n" .string "WIRELESS CLUB works.\p" .string "On this, the top floor, there are\n" @@ -2097,6 +2013,6 @@ OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -OldaleTown_PokemonCenter_2F_Text_279C91: @ 8279C91 +CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91 .string "I hope you enjoy the Wireless\n" .string "Communication System.$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 10ced77c4..9590f3140 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -667,13 +667,13 @@ EventScript_PblocLink_NoPokeblock: @ 829416C EventScript_PblocLink_SomeoneNotReady: @ 8294176 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT + msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_DifferentSelections: @ 8294183 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT releaseall end @@ -685,7 +685,7 @@ EventScript_PblocLink_CloseLink: @ 8294190 EventScript_PblocLink_LinkError: @ 829419D special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT releaseall end @@ -745,12 +745,12 @@ EventScript_PblocLink_TryJoinGroup: @ 829425D end EventScript_PblocLink_BecomeLeader: @ 8294285 - special BerryBlenderLinkBecomeLeader + special TryBecomeLinkLeader waitstate return EventScript_PblocLink_JoinGroup: @ 829428A - special BerryBlenderLinkJoinGroup + special TryJoinLinkGroup waitstate return diff --git a/data/specials.inc b/data/specials.inc index 6a328ca9e..4b5055dcd 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -11,7 +11,7 @@ gSpecials:: @ 81DBA64 def_special HealPlayerParty def_special SetCableClubWarp def_special sub_80AF948 - def_special sub_80AF9F8 + def_special ReturnFromLinkRoom def_special CleanupLinkRoomState def_special ExitLinkRoom def_special SetPlayerSecretBase @@ -36,8 +36,8 @@ gSpecials:: @ 81DBA64 def_special SetBattledOwnerFromResult def_special DoSecretBasePCTurnOffEffect def_special RecordMixingPlayerSpotTriggered - def_special sub_80B2DA4 - def_special sub_80B2E4C + def_special TryBattleLinkup + def_special TryTradeLinkup def_special sub_80B2E74 def_special sub_80B2EA8 def_special CloseLink @@ -51,7 +51,7 @@ gSpecials:: @ 81DBA64 def_special SavePlayerParty def_special LoadPlayerParty def_special ChooseHalfPartyForBattle - def_special sp02A_crash_sound + def_special Script_ShowLinkTrainerCard def_special EventObjectInteractionGetBerryTreeData def_special EventObjectInteractionGetBerryName def_special EventObjectInteractionGetBerryCountString @@ -305,8 +305,8 @@ gSpecials:: @ 81DBA64 def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon def_special Special_AreLeadMonEVsMaxedOut - def_special sub_8098574 - def_special sub_809859C + def_special Script_FacePlayer + def_special Script_ClearHeldMovement def_special InitRoamer def_special TryUpdateRusturfTunnelState def_special IsGrassTypeInParty @@ -349,7 +349,7 @@ gSpecials:: @ 81DBA64 def_special MonOTNameMatchesPlayer def_special BufferLottoTicketNumber def_special sub_81653CC - def_special sub_80F9370 + def_special DoesPartyHaveEnigmaBerry def_special ScriptRandom def_special sub_81AFDD0 def_special sub_80EDCE8 @@ -424,22 +424,22 @@ gSpecials:: @ 81DBA64 def_special StartPlayerDescendMirageTower def_special BufferTMHMMoveName def_special IsWirelessAdapterConnected - def_special BerryBlenderLinkBecomeLeader - def_special BerryBlenderLinkJoinGroup + def_special TryBecomeLinkLeader + def_special TryJoinLinkGroup def_special UnionRoomSpecial def_special sub_801A42C - def_special sub_8016934 + def_special InitUnionRoom def_special BufferUnionRoomPlayerName def_special sub_801DC20 - def_special sub_81B8958 - def_special sub_8018090 + def_special ChooseMonForWirelessMinigame + def_special Script_ResetUnionRoomTrade def_special IsBadEggInParty def_special ValidateReceivedWonderCard def_special HasAtLeastOneBerry - def_special sub_802C920 - def_special sub_802E3C4 - def_special sub_8027A5C - def_special sub_8027AAC + def_special DoesPartyHavePokemonJumpSpecies + def_special ShowPokemonJumpRecords + def_special DoesPartyHaveDodrio + def_special ShowDodrioBerryPickingRecords def_special OffsetCameraForBattle def_special GetDeptStoreDefaultFloorChoice def_special BufferVarsForIVRater @@ -512,7 +512,7 @@ gSpecials:: @ 81DBA64 def_special GetLilycoveSSTidalSelection def_special TurnOnTVScreen def_special sub_81D4A90 - def_special sub_813B514 + def_special ShouldDistributeEonTicket def_special sub_813B568 def_special sub_813B534 def_special CallTrainerHillFunction diff --git a/data/text/mevent.inc b/data/text/mevent.inc index 44c456f1c..8a82ff4c3 100644 --- a/data/text/mevent.inc +++ b/data/text/mevent.inc @@ -30,13 +30,13 @@ gUnknown_08273559:: @ 8273559 .string "Once you save your game, you can\n" .string "access the MYSTERY EVENT.$" -gUnknown_08273594:: @ 8273594 +Mevent_Text_TheresATicketForYou:: @ 8273594 .string "Thank you for using the MYSTERY\n" .string "EVENT System.\p" .string "You must be {PLAYER}.\n" .string "There is a ticket here for you.$" -gUnknown_082735F2:: @ 82735F2 +Mevent_Text_TryUsingItAtLilycovePort:: @ 82735F2 .string "It appears to be for use at\n" .string "the LILYCOVE CITY port.\p" .string "Why not give it a try and see what\n" diff --git a/include/constants/cable_club.h b/include/constants/cable_club.h new file mode 100644 index 000000000..f2aa4120c --- /dev/null +++ b/include/constants/cable_club.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_CABLE_CLUB_H +#define GUARD_CONSTANTS_CABLE_CLUB_H + +// States for VAR_CABLE_CLUB_STATE +#define USING_SINGLE_BATTLE 1 +#define USING_DOUBLE_BATTLE 2 +#define USING_TRADE_CENTER 3 +#define USING_RECORD_CORNER 4 +#define USING_MULTI_BATTLE 5 +#define USING_UNION_ROOM 6 +#define USING_BERRY_CRUSH 7 +#define USING_MINIGAME 8 +#define USING_BATTLE_TOWER 9 + +#endif //GUARD_CONSTANTS_CABLE_CLUB_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 72b15654e..3fde9cc11 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -77,7 +77,7 @@ #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D #define VAR_ALTERING_CAVE_WILD_SET 0x403E -#define VAR_ALWAYS_ZERO_0x403F 0x403F // This var is read and written, but is always zero. +#define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. Presumably meant to be set externally by Mystery Gift distribution #define VAR_DAYS 0x4040 #define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_2 0x4042 diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h index 55e8fa880..ac802a2b5 100644 --- a/include/dodrio_berry_picking.h +++ b/include/dodrio_berry_picking.h @@ -2,7 +2,7 @@ #define GUARD_DODRIO_BERRY_PICKING_H void sub_802493C(u16 a0, void (*callback)(void)); -void sub_8027A5C(void); -void sub_8027AAC(void); +void DoesPartyHaveDodrio(void); +void ShowDodrioBerryPickingRecords(void); #endif // GUARD_DODRIO_BERRY_PICKING_H diff --git a/include/link.h b/include/link.h index c14084066..847ea38ba 100644 --- a/include/link.h +++ b/include/link.h @@ -48,6 +48,28 @@ #define EXTRACT_LINK_ERRORS(status) \ (((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT) +#define LINKTYPE_0x1111 0x1111 // trade +#define LINKTYPE_0x1122 0x1122 // trade +#define LINKTYPE_0x1133 0x1133 // trade +#define LINKTYPE_0x1144 0x1144 // trade +#define LINKTYPE_BATTLE 0x2211 +#define LINKTYPE_0x2222 0x2222 // unused battle? +#define LINKTYPE_SINGLE_BATTLE 0x2233 +#define LINKTYPE_DOUBLE_BATTLE 0x2244 +#define LINKTYPE_MULTI_BATTLE 0x2255 +#define LINKTYPE_BATTLE_TOWER_50 0x2266 +#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277 +#define LINKTYPE_0x2288 0x2288 // battle? +#define LINKTYPE_0x3311 0x3311 +#define LINKTYPE_0x3322 0x3322 +#define LINKTYPE_0x4411 0x4411 +#define LINKTYPE_BERRY_BLENDER 0x4422 +#define LINKTYPE_0x5501 0x5501 // mystery event +#define LINKTYPE_0x5502 0x5502 // unused? +#define LINKTYPE_0x5503 0x5503 // eReader +#define LINKTYPE_0x6601 0x6601 +#define LINKTYPE_0x6602 0x6602 + #define LINKCMD_SEND_LINK_TYPE 0x2222 #define LINKCMD_0x2FFE 0x2FFE #define LINKCMD_SEND_HELD_KEYS 0x4444 diff --git a/include/party_menu.h b/include/party_menu.h index d76e50788..fc4020b27 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -124,7 +124,7 @@ void InitChooseHalfPartyForBattle(u8 unused); void sub_81B8558(void); void sub_81B8904(u8 initArg, MainCallback callback); void sub_81B892C(void); -void sub_81B8958(void); +void ChooseMonForWirelessMinigame(void); void OpenPartyMenuInBattle(u8 arg); void sub_81B89F0(void); void sub_81B8C68(void); diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index 28b19f9b1..4586ad6a6 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -4,10 +4,10 @@ #include "main.h" void sub_802A9A8(u16 monId, MainCallback callback); -bool32 sub_802C908(u16 species); -void sub_802C920(void); +bool32 IsSpeciesAllowedInPokemonJump(u16 species); +void DoesPartyHavePokemonJumpSpecies(void); void ResetPokeJumpResults(void); -void sub_802E3C4(void); +void ShowPokemonJumpRecords(void); void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority); bool32 sub_802EB84(void); diff --git a/src/berry_blender.c b/src/berry_blender.c index 6c8d9c812..435e508f6 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1174,7 +1174,7 @@ static void sub_8080018(void) { case 0: sub_8080588(); - gLinkType = 0x4422; + gLinkType = LINKTYPE_BERRY_BLENDER; sBerryBlenderData->field_72 = 0; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { @@ -1517,7 +1517,7 @@ static void sub_80808D4(void) sBerryBlenderData->playAgainState = 0; sBerryBlenderData->loadGfxState = 0; - gLinkType = 0x4422; + gLinkType = LINKTYPE_BERRY_BLENDER; sBerryBlenderData->mainState++; break; case 1: diff --git a/src/cable_club.c b/src/cable_club.c index 303cc76d1..4a0589668 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -30,6 +30,8 @@ #include "trainer_card.h" #include "party_menu.h" #include "window.h" +#include "constants/battle_frontier.h" +#include "constants/cable_club.h" #include "constants/songs.h" static const struct WindowTemplate gUnknown_08550594 = { @@ -457,7 +459,7 @@ static void task_map_chg_seq_0807EC34(u16 *a0, u32 taskId) if (*a0 == 1) { - if (gLinkType == 0x2266 || gLinkType == 0x2277) + if (gLinkType == LINKTYPE_BATTLE_TOWER_50 || gLinkType == LINKTYPE_BATTLE_TOWER_OPEN) { if (sub_80B2AF4(trainerCards[0].monSpecies, trainerCards[1].monSpecies)) { @@ -550,45 +552,42 @@ static bool8 sub_80B2D6C(u8 taskId) return FALSE; } -void sub_80B2DA4(u8 arg0) +void TryBattleLinkup(u8 arg0) { u8 r3 = 2; u8 r2 = 2; switch (gSpecialVar_0x8004) { - case 1: + case USING_SINGLE_BATTLE: r3 = 2; - gLinkType = 0x2233; + gLinkType = LINKTYPE_SINGLE_BATTLE; break; - case 2: + case USING_DOUBLE_BATTLE: r3 = 2; - gLinkType = 0x2244; + gLinkType = LINKTYPE_DOUBLE_BATTLE; break; - case 5: + case USING_MULTI_BATTLE: r3 = 4; r2 = 4; - gLinkType = 0x2255; + gLinkType = LINKTYPE_MULTI_BATTLE; break; - case 9: + case USING_BATTLE_TOWER: r3 = 2; - if (gSaveBlock2Ptr->frontier.lvlMode == 0) - { - gLinkType = 0x2266; - } + if (gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_50) + gLinkType = LINKTYPE_BATTLE_TOWER_50; else - { - gLinkType = 0x2277; - } + gLinkType = LINKTYPE_BATTLE_TOWER_OPEN; + break; } sub_80B236C(r3, r2); } -void sub_80B2E4C(void) +void TryTradeLinkup(void) { - gLinkType = 0x1133; + gLinkType = LINKTYPE_0x1133; gBattleTypeFlags = 0; sub_80B236C(2, 2); } @@ -596,7 +595,7 @@ void sub_80B2E4C(void) void sub_80B2E74(void) { gSpecialVar_Result = 0; - gLinkType = 0x3311; + gLinkType = LINKTYPE_0x3311; gBattleTypeFlags = 0; sub_80B236C(2, 4); } @@ -681,21 +680,21 @@ static void sub_80B2EE4(u8 taskId) void sub_80B2FD8(void) { - gLinkType = 0x4411; + gLinkType = LINKTYPE_0x4411; gBattleTypeFlags = 0; sub_80B236C(2, 4); } void sub_80B3000(void) { - gLinkType = 0x6601; + gLinkType = LINKTYPE_0x6601; gBattleTypeFlags = 0; sub_80B236C(4, 4); } void sub_80B3028(void) { - gLinkType = 0x6602; + gLinkType = LINKTYPE_0x6602; gBattleTypeFlags = 0; sub_80B236C(2, 4); } @@ -707,30 +706,30 @@ u8 sub_80B3050(void) switch (gSpecialVar_0x8004) { - case 1: - gLinkType = 0x2233; + case USING_SINGLE_BATTLE: + gLinkType = LINKTYPE_SINGLE_BATTLE; break; - case 2: - gLinkType = 0x2244; + case USING_DOUBLE_BATTLE: + gLinkType = LINKTYPE_DOUBLE_BATTLE; break; - case 5: - gLinkType = 0x2255; + case USING_MULTI_BATTLE: + gLinkType = LINKTYPE_MULTI_BATTLE; break; - case 9: - if (gSaveBlock2Ptr->frontier.lvlMode == 0) + case USING_BATTLE_TOWER: + if (gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_50) { - gLinkType = 0x2266; + gLinkType = LINKTYPE_BATTLE_TOWER_50; } else { - gLinkType = 0x2277; + gLinkType = LINKTYPE_BATTLE_TOWER_OPEN; } break; - case 3: - gLinkType = 0x1111; + case USING_TRADE_CENTER: + gLinkType = LINKTYPE_0x1111; break; - case 4: - gLinkType = 0x3322; + case USING_RECORD_CORNER: + gLinkType = LINKTYPE_0x3322; break; } @@ -790,21 +789,21 @@ void sub_80B3254(void) SaveGame(); } -static void sub_80B3260(int a0) +static void SetLinkBattleTypeFlags(int linkService) { - switch (a0) + switch (linkService) { - case 1: + case USING_SINGLE_BATTLE: gBattleTypeFlags = BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER; break; - case 2: + case USING_DOUBLE_BATTLE: gBattleTypeFlags = BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER; break; - case 5: + case USING_MULTI_BATTLE: ReducePlayerPartyToSelectedMons(); gBattleTypeFlags = BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER | BATTLE_TYPE_MULTI; break; - case 9: + case USING_BATTLE_TOWER: gBattleTypeFlags = BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER | BATTLE_TYPE_MULTI; break; } @@ -818,7 +817,7 @@ static void sub_80B32B4(u8 taskId) { case 0: FadeScreen(1, 0); - gLinkType = 0x2211; + gLinkType = LINKTYPE_BATTLE; ClearLinkCallback_2(); task->data[0]++; break; @@ -845,7 +844,7 @@ static void sub_80B32B4(u8 taskId) else PlayMapChosenOrBattleBGM(MUS_BATTLE20); - sub_80B3260(gSpecialVar_0x8004); + SetLinkBattleTypeFlags(gSpecialVar_0x8004); CleanupOverworldWindowsAndTilemaps(); gTrainerBattleOpponent_A = 0x800; SetMainCallback2(CB2_InitBattle); @@ -864,7 +863,7 @@ static void sub_80B33BC(u8 taskId) { case 0: FadeScreen(1, 0); - gLinkType = 0x2211; + gLinkType = LINKTYPE_BATTLE; ClearLinkCallback_2(); data[0] = 1; break; @@ -910,8 +909,8 @@ static void sub_80B33BC(u8 taskId) else PlayMapChosenOrBattleBGM(MUS_BATTLE20); - gLinkPlayers[0].linkType = 0x2211; - sub_80B3260(gSpecialVar_0x8004); + gLinkPlayers[0].linkType = LINKTYPE_BATTLE; + SetLinkBattleTypeFlags(gSpecialVar_0x8004); CleanupOverworldWindowsAndTilemaps(); gTrainerBattleOpponent_A = 0x800; SetMainCallback2(CB2_InitBattle); @@ -973,7 +972,7 @@ void sub_80B360C(void) SavePlayerBag(); sub_813BF10(); - if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2) + if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE || gSpecialVar_0x8004 == USING_DOUBLE_BATTLE) { UpdatePlayerLinkBattleRecords(gLocalLinkPlayerId ^ 1); if (gWirelessCommType) @@ -1004,7 +1003,10 @@ void sub_80B360C(void) void CleanupLinkRoomState(void) { - if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5 || gSpecialVar_0x8004 == 9) + if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE + || gSpecialVar_0x8004 == USING_DOUBLE_BATTLE + || gSpecialVar_0x8004 == USING_MULTI_BATTLE + || gSpecialVar_0x8004 == USING_BATTLE_TOWER) { LoadPlayerParty(); SavePlayerBag(); @@ -1159,7 +1161,7 @@ void nullsub_37(void) // Note: VAR_0x8005 is set to the ID of the player spot. void ColosseumPlayerSpotTriggered(void) { - gLinkType = 0x2211; + gLinkType = LINKTYPE_BATTLE; if (gWirelessCommType != 0) { @@ -1178,7 +1180,7 @@ static void sub_80B39A4(void) ScriptContext1_Stop(); } -void sp02A_crash_sound(void) +void Script_ShowLinkTrainerCard(void) { ShowTrainerCardInLink(gSpecialVar_0x8006, CB2_ReturnToFieldContinueScriptPlayMapMusic); } @@ -1300,6 +1302,6 @@ void sub_80B3BC4(void) { if (gWirelessCommType == 0) { - gLinkType = 0x2288; + gLinkType = LINKTYPE_0x2288; } } diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 4b636e2b9..503a912c0 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -245,7 +245,7 @@ static u32 sub_8027DFC(u32 arg0); static u32 IncrementWithLimit(u32 arg0, u32 arg1); static u32 Min(u32 arg0, u32 arg1); static u32 sub_80276C0(u8 arg0); -static void sub_8027ACC(u8 taskId); +static void Task_ShowDodrioBerryPickingRecords(u8 taskId); static void sub_8029314(u8 taskId); static void sub_8027BEC(u8 windowId, s32 width); static void nullsub_15(struct Sprite *sprite); @@ -2580,7 +2580,7 @@ static u8 sub_8027A48(u8 id) return gUnknown_02022C98->unk34[id]; } -void sub_8027A5C(void) +void DoesPartyHaveDodrio(void) { int i; for (i = 0; i < PARTY_SIZE; i++) @@ -2588,18 +2588,18 @@ void sub_8027A5C(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) && GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_DODRIO) { - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; return; } } - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } -void sub_8027AAC(void) +void ShowDodrioBerryPickingRecords(void) { - u8 taskId = CreateTask(sub_8027ACC, 0); - sub_8027ACC(taskId); + u8 taskId = CreateTask(Task_ShowDodrioBerryPickingRecords, 0); + Task_ShowDodrioBerryPickingRecords(taskId); } // Data related to printing saved results. @@ -2621,7 +2621,7 @@ ALIGNED(4) static const u8 gUnknown_082F7B44[][2] = {{25}, {41}, {57}}; static const u8 gUnknown_082F7B4A[][2] = {{25}, {41}, {73}}; -static void sub_8027ACC(u8 taskId) +static void Task_ShowDodrioBerryPickingRecords(u8 taskId) { struct WindowTemplate window; s32 i, width, widthCurr; diff --git a/src/ereader_screen.c b/src/ereader_screen.c index 0e865558a..4497556ea 100755 --- a/src/ereader_screen.c +++ b/src/ereader_screen.c @@ -88,7 +88,7 @@ static u8 sub_81D4DE8(struct Unk03006370 *arg0) static void sub_81D4E30(void) { memset(gDecompressionBuffer, 0, 0x2000); - gLinkType = 0x5503; + gLinkType = LINKTYPE_0x5503; OpenLink(); SetSuppressLinkErrorMessage(TRUE); } diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index 22a29fd5d..c64a2ab22 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -108,12 +108,12 @@ void sub_8098524(void) UnfreezeEventObjects(); } -void sub_8098574(void) +void Script_FacePlayer(void) { EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); } -void sub_809859C(void) +void Script_ClearHeldMovement(void) { EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 9a5d47156..ff82f8c42 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -638,7 +638,7 @@ static void Task_ReturnToWorldFromLinkRoom(u8 taskId) } } -void sub_80AF9F8(void) +void ReturnFromLinkRoom(void) { CreateTask(Task_ReturnToWorldFromLinkRoom, 10); } diff --git a/src/field_specials.c b/src/field_specials.c index 7a43eca67..f7f134d01 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3737,12 +3737,11 @@ bool32 IsTrainerRegistered(void) } // Always returns FALSE -bool32 sub_813B514(void) +bool32 ShouldDistributeEonTicket(void) { - if (!VarGet(VAR_ALWAYS_ZERO_0x403F)) - { + if (!VarGet(VAR_DISTRIBUTE_EON_TICKET)) return FALSE; - } + return TRUE; } diff --git a/src/link.c b/src/link.c index db72be19a..edb4181e3 100644 --- a/src/link.c +++ b/src/link.c @@ -282,7 +282,7 @@ void LinkTestScreen(void) ResetTasks(); SetVBlankCallback(sub_80096BC); ResetBlockSend(); - gLinkType = 0x1111; + gLinkType = LINKTYPE_0x1111; OpenLink(); SeedRng(gMain.vblankCounter2); for (i = 0; i < MAX_LINK_PLAYERS; i++) @@ -1349,7 +1349,7 @@ bool8 sub_800AA60(void) { if (gLinkPlayers[i].trainerId == gSavedLinkPlayers[i].trainerId) { - if (gLinkType == 0x2288) + if (gLinkType == LINKTYPE_0x2288) { if (gLinkType == gLinkPlayers[i].linkType) { diff --git a/src/link_rfu.c b/src/link_rfu.c index 3b533a3a4..f7f6c7d65 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -4741,7 +4741,7 @@ void sub_8011AFC(void) SetVBlankCallback(sub_8011AE8); if (IsWirelessAdapterConnected()) { - gLinkType = 0x1111; + gLinkType = LINKTYPE_0x1111; sub_800B488(); OpenLink(); SeedRng(gMain.vblankCounter2); diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index c77a48615..14c00fd96 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -152,7 +152,7 @@ static void CB2_MysteryEventMenu(void) if (!IsTextPrinterActive(0)) { gMain.state++; - gLinkType = 0x5501; + gLinkType = LINKTYPE_0x5501; OpenLink(); } break; diff --git a/src/overworld.c b/src/overworld.c index 8a8544259..d796a670f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -85,9 +85,9 @@ extern const u8 EventScript_WhiteOut[]; extern const u8 EventScript_ResetMrBriney[]; extern const u8 EventScript_DoLinkRoomExit[]; -extern const u8 gEventScript_TradeRoom_TooBusyToNotice[]; -extern const u8 gEventScript_TradeRoom_ReadTrainerCard_NoColor[]; -extern const u8 gEventScript_TradeRoom_ReadTrainerCard_Normal[]; +extern const u8 CableClub_EventScript_TooBusyToNotice[]; +extern const u8 CableClub_EventScript_ReadTrainerCard[]; +extern const u8 CableClub_EventScript_ReadTrainerCardColored[]; extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[]; extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[]; extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[]; @@ -2765,13 +2765,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) if (linkPlayerId != 4) { if (!player->isLocalPlayer) - return gEventScript_TradeRoom_TooBusyToNotice; + return CableClub_EventScript_TooBusyToNotice; else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE) - return gEventScript_TradeRoom_TooBusyToNotice; + return CableClub_EventScript_TooBusyToNotice; else if (!GetLinkTrainerCardColor(linkPlayerId)) - return gEventScript_TradeRoom_ReadTrainerCard_NoColor; + return CableClub_EventScript_ReadTrainerCard; else - return gEventScript_TradeRoom_ReadTrainerCard_Normal; + return CableClub_EventScript_ReadTrainerCardColored; } return GetInteractedLinkPlayerScript(&otherPlayerPos, player->field_C, player->facing); diff --git a/src/party_menu.c b/src/party_menu.c index b3938ef2a..cb6b53036 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -240,7 +240,7 @@ static void sub_81B3300(const u8*); static void sub_81B1B8C(u8); static void DisplayPartyPokemonHPCheck(struct Pokemon*, struct Struct203CEDC*, u8); static void DisplayPartyPokemonHPBarCheck(struct Pokemon*, struct Struct203CEDC*); -static bool16 sub_81B2134(struct Pokemon*); +static bool16 IsMonAllowedInPokemonJump(struct Pokemon*); static bool16 sub_81B2164(struct Pokemon*); static void sub_81B2248(u8); static void sub_81B227C(u8); @@ -3007,7 +3007,7 @@ static void sub_81B209C(void) if (gSpecialVar_0x8005 == 0) { for (i = 0; i < gPlayerPartyCount; i++) - *ptr += sub_81B2134(&gPlayerParty[i]) << i; + *ptr += IsMonAllowedInPokemonJump(&gPlayerParty[i]) << i; } else { @@ -3017,9 +3017,9 @@ static void sub_81B209C(void) } } -static bool16 sub_81B2134(struct Pokemon *mon) +static bool16 IsMonAllowedInPokemonJump(struct Pokemon *mon) { - if (GetMonData(mon, MON_DATA_IS_EGG) != TRUE && sub_802C908(GetMonData(mon, MON_DATA_SPECIES))) + if (GetMonData(mon, MON_DATA_IS_EGG) != TRUE && IsSpeciesAllowedInPokemonJump(GetMonData(mon, MON_DATA_SPECIES))) return TRUE; return FALSE; } @@ -6761,7 +6761,7 @@ void sub_81B892C(void) InitPartyMenu(0, 0, 12, 0, 4, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic); } -void sub_81B8958(void) +void ChooseMonForWirelessMinigame(void) { InitPartyMenu(11, 0, 13, 0, 1, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic); } diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index cc9c2f4ff..9b733fa4c 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -158,7 +158,7 @@ static void sub_802AA60(struct PokemonJump1 *); static void sub_802AA94(struct PokemonJump1 *); static void sub_802AB20(void); static void sub_802AB98(void); -static s16 sub_802AC00(u16 species); +static s16 GetPokemonJumpSpeciesIdx(u16 species); static void sub_802AC2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon); static void sub_802AC6C(void); static void sub_802ACA0(u8 taskId); @@ -288,7 +288,7 @@ static void sub_802D598(void); static void sub_802D5E4(void); static void sub_802D72C(void); static void sub_802D688(void); -static void sub_802E3E4(u8 taskId); +static void Task_ShowPokemonJumpRecords(u8 taskId); static void sub_802E6D0(u8 taskId); static void sub_802EB98(u8 taskId); static void sub_802E500(u16 windowId, int width); @@ -501,7 +501,7 @@ static void sub_802AB20(void) for (i = 0; i < MAX_RFU_PLAYERS; i++) { - index = sub_802AC00(gUnknown_02022CFC->unk82A8[i].species); + index = GetPokemonJumpSpeciesIdx(gUnknown_02022CFC->unk82A8[i].species); gUnknown_02022CFC->unk82E4[i].unkC = gPkmnJumpSpecies[index].unk2; } @@ -524,7 +524,7 @@ static void sub_802AB98(void) } } -static s16 sub_802AC00(u16 species) +static s16 GetPokemonJumpSpeciesIdx(u16 species) { u32 i; for (i = 0; i < ARRAY_COUNT(gPkmnJumpSpecies); i++) @@ -533,7 +533,7 @@ static s16 sub_802AC00(u16 species) return i; } - return -1; + return -1; // species isnt allowed } static void sub_802AC2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon) @@ -2204,12 +2204,12 @@ static u8 *sub_802C8E8(u8 multiplayerId) return gUnknown_02022CFC->unk82E4[multiplayerId].unk1C; } -bool32 sub_802C908(u16 species) +bool32 IsSpeciesAllowedInPokemonJump(u16 species) { - return sub_802AC00(species) > -1; + return GetPokemonJumpSpeciesIdx(species) > -1; } -void sub_802C920(void) +void DoesPartyHavePokemonJumpSpecies(void) { int i; @@ -2218,15 +2218,15 @@ void sub_802C920(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES)) { u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); - if (sub_802C908(species)) + if (IsSpeciesAllowedInPokemonJump(species)) { - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; return; } } } - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } // Large group of data. @@ -3922,10 +3922,10 @@ static void sub_802E3A8(void) pokeJump->field6++; } -void sub_802E3C4(void) +void ShowPokemonJumpRecords(void) { - u8 taskId = CreateTask(sub_802E3E4, 0); - sub_802E3E4(taskId); + u8 taskId = CreateTask(Task_ShowPokemonJumpRecords, 0); + Task_ShowPokemonJumpRecords(taskId); } static const struct WindowTemplate gUnknown_082FE270 = @@ -3941,7 +3941,7 @@ static const struct WindowTemplate gUnknown_082FE270 = static const u8 *const gUnknown_082FE278[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow}; -static void sub_802E3E4(u8 taskId) +static void Task_ShowPokemonJumpRecords(u8 taskId) { struct WindowTemplate window; int i, width, widthCurr; diff --git a/src/scrcmd.c b/src/scrcmd.c index 9861f9dae..8ddd23d6d 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2218,6 +2218,8 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx) return FALSE; } +// TODO: Should be renamed. Name implies general usage, but its specifically for Wonder Card +// See GetSavedRamScriptIfValid, which is NULL if ValidateReceivedWonderCard returns FALSE bool8 ScrCmd_gotoram(struct ScriptContext *ctx) { const u8* v1 = GetSavedRamScriptIfValid(); diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index a80fe49ff..f8206797b 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -610,7 +610,7 @@ static bool8 CheckPartyMonHasHeldItem(u16 item) return FALSE; } -bool8 sub_80F9370(void) +bool8 DoesPartyHaveEnigmaBerry(void) { bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY); if (hasItem == TRUE) diff --git a/src/trade.c b/src/trade.c index 196d9659c..de2b354ca 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1559,7 +1559,7 @@ static void sub_80773D0(void) if (!gReceivedRemoteLinkPlayers) { - gLinkType = 0x1122; + gLinkType = LINKTYPE_0x1122; gUnknown_0203229C->unk_A8 = 0; if (gWirelessCommType) @@ -4134,7 +4134,7 @@ void sub_807AE50(void) case 0: if (!gReceivedRemoteLinkPlayers) { - gLinkType = 0x1144; + gLinkType = LINKTYPE_0x1144; CloseLink(); } gUnknown_020322A0 = AllocZeroed(sizeof(*gUnknown_020322A0)); diff --git a/src/union_room.c b/src/union_room.c index 8ae111926..af2a552f3 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -44,6 +44,7 @@ #include "union_room_player_avatar.h" #include "window.h" #include "constants/battle_frontier.h" +#include "constants/cable_club.h" #include "constants/game_stat.h" #include "constants/maps.h" #include "constants/rgb.h" @@ -1249,7 +1250,7 @@ bool32 sub_80126CC(u32 caseId) } } -void BerryBlenderLinkBecomeLeader(void) +void TryBecomeLinkLeader(void) { u8 taskId; struct UnkStruct_Leader *dataPtr; @@ -1831,7 +1832,7 @@ u8 sub_8013398(struct UnkStruct_Main0 *arg0) return ret; } -void BerryBlenderLinkJoinGroup(void) +void TryJoinLinkGroup(void) { u8 taskId; struct UnkStruct_Group *dataPtr; @@ -2421,7 +2422,7 @@ void sub_8014210(u16 battleFlags) HealPlayerParty(); SavePlayerParty(); LoadPlayerBag(); - gLinkPlayers[0].linkType = 0x2211; + gLinkPlayers[0].linkType = LINKTYPE_BATTLE; gLinkPlayers[GetMultiplayerId()].id = GetMultiplayerId(); gLinkPlayers[GetMultiplayerId() ^ 1].id = GetMultiplayerId() ^ 1; gMain.savedCallback = sub_80B360C; @@ -2429,18 +2430,18 @@ void sub_8014210(u16 battleFlags) PlayBattleBGM(); } -void sub_8014290(u16 arg0, u16 x, u16 y) +static void sub_8014290(u16 linkService, u16 x, u16 y) { - VarSet(VAR_CABLE_CLUB_STATE, arg0); + VarSet(VAR_CABLE_CLUB_STATE, linkService); SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); SetDynamicWarpWithCoords(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); WarpIntoMap(); } -void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) +void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 linkService) { - gSpecialVar_0x8004 = arg4; - VarSet(VAR_CABLE_CLUB_STATE, arg4); + gSpecialVar_0x8004 = linkService; + VarSet(VAR_CABLE_CLUB_STATE, linkService); gFieldLinkPlayerCount = GetLinkPlayerCount(); gLocalLinkPlayerId = GetMultiplayerId(); SetCableClubWarp(); @@ -2506,7 +2507,7 @@ void sub_801440C(u8 taskId) HealPlayerParty(); SavePlayerParty(); LoadPlayerBag(); - sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, 1); + sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_SINGLE_BATTLE); SetMainCallback2(sub_8014384); break; case 2: @@ -2515,7 +2516,7 @@ void sub_801440C(u8 taskId) SavePlayerParty(); LoadPlayerBag(); sub_80143E4(gBlockSendBuffer, TRUE); - sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, 2); + sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_DOUBLE_BATTLE); SetMainCallback2(sub_8014384); break; case 3: @@ -2524,19 +2525,19 @@ void sub_801440C(u8 taskId) SavePlayerParty(); LoadPlayerBag(); sub_80143E4(gBlockSendBuffer, TRUE); - sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, 5); + sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, USING_MULTI_BATTLE); SetMainCallback2(sub_8014384); break; case 4: sub_80143E4(gBlockSendBuffer, TRUE); CleanupOverworldWindowsAndTilemaps(); - sub_8014304(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, 3); + sub_8014304(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, USING_TRADE_CENTER); SetMainCallback2(sub_8014384); break; case 15: sub_80143E4(gBlockSendBuffer, TRUE); CleanupOverworldWindowsAndTilemaps(); - sub_8014304(MAP_GROUP(RECORD_CORNER), MAP_NUM(RECORD_CORNER), 8, 9, 4); + sub_8014304(MAP_GROUP(RECORD_CORNER), MAP_NUM(RECORD_CORNER), 8, 9, USING_RECORD_CORNER); SetMainCallback2(sub_8014384); break; case 68: @@ -2562,15 +2563,15 @@ void sub_801440C(u8 taskId) SetMainCallback2(sub_80141A4); break; case 9: - sub_8014290(8, 5, 1); + sub_8014290(USING_MINIGAME, 5, 1); sub_802A9A8(GetCursorSelectionMonId(), CB2_LoadMap); break; case 10: - sub_8014290(7, 9, 1); + sub_8014290(USING_BERRY_CRUSH, 9, 1); sub_8020C70(CB2_LoadMap); break; case 11: - sub_8014290(8, 5, 1); + sub_8014290(USING_MINIGAME, 5, 1); sub_802493C(GetCursorSelectionMonId(), CB2_LoadMap); break; } @@ -2594,7 +2595,7 @@ void sub_8014790(u8 taskId) { case 14: case 28: - gLinkPlayers[0].linkType = 0x2211; + gLinkPlayers[0].linkType = LINKTYPE_BATTLE; gLinkPlayers[0].id = 0; gLinkPlayers[1].id = 2; sendBuff[0] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[0] - 1], MON_DATA_SPECIES); @@ -4097,14 +4098,14 @@ bool32 sub_80168DC(struct UnkStruct_URoom *arg0) return TRUE; } -void sub_8016934(void) +void InitUnionRoom(void) { struct UnkStruct_URoom *ptr; sUnionRoomPlayerName[0] = EOS; CreateTask(sub_801697C, 0); gUnknown_02022C30.uRoom = gUnknown_02022C30.uRoom; // Needed to match. - gUnknown_02022C30.uRoom = ptr = AllocZeroed(0x26C); + gUnknown_02022C30.uRoom = ptr = AllocZeroed(sizeof(struct UnkStruct_URoom)); gUnknown_03000DA8 = gUnknown_02022C30.uRoom; ptr->state = 0; ptr->textState = 0; @@ -5205,7 +5206,7 @@ void sub_801807C(struct TradeUnkStruct *arg0) arg0->personality = 0; } -void sub_8018090(void) +void Script_ResetUnionRoomTrade(void) { sub_801807C(&gUnknown_02022C40); } |