diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-03 18:00:53 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-06-06 16:10:03 -0400 |
commit | 3f97763181c486cf537ac187036b086e1f222cfc (patch) | |
tree | 07ea98a326f5bbd570f7babc94f2662c4833f43d /data | |
parent | 9190af73b7ebe690be7204c023d4c14d0241af29 (diff) |
Document cable_club.c
Diffstat (limited to 'data')
-rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 18 | ||||
-rw-r--r-- | data/maps/LilycoveCity_ContestLobby/scripts.inc | 10 | ||||
-rw-r--r-- | data/scripts/berry_blender.inc | 10 | ||||
-rw-r--r-- | data/scripts/cable_club.inc | 32 | ||||
-rw-r--r-- | data/specials.inc | 4 |
5 files changed, 37 insertions, 37 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 843cacef4..79e000bd3 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -786,19 +786,19 @@ BattleFrontier_BattleTowerLobby_EventScript_TryCableLink:: @ 823F2C5 setvar VAR_0x8005, 0 special TryBattleLinkup waitstate - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful - compare VAR_RESULT, 2 + compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady - compare VAR_RESULT, 3 + compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections - compare VAR_RESULT, 4 + compare VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge - compare VAR_RESULT, 6 + compare VAR_RESULT, LINKUP_CONNECTION_ERROR goto_if_eq CableClub_EventScript_AbortLinkConnectionError - compare VAR_RESULT, 11 + compare VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink end @@ -853,7 +853,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF message BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn waitmessage tower_save CHALLENGE_STATUS_SAVING - special sub_80A08CC + special SaveForBattleTowerLink waitstate playse SE_SAVE waitse @@ -914,7 +914,7 @@ BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful:: @ 823F496 message BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn waitmessage tower_save CHALLENGE_STATUS_SAVING - special sub_80A08CC + special SaveForBattleTowerLink waitstate playse SE_SAVE waitse diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 12b598346..70d4c106d 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -767,15 +767,15 @@ LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15 call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkGMode compare VAR_TEMP_C, 2 goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest - compare VAR_RESULT, 4 + compare VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices - compare VAR_RESULT, 3 + compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest - compare VAR_RESULT, 6 + compare VAR_RESULT, LINKUP_CONNECTION_ERROR goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkError - compare VAR_RESULT, 10 + compare VAR_RESULT, LINKUP_FAILED_CONTEST_GMODE goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference message3 LilycoveCity_ContestLobby_Text_Transmitting contestlinktransfer diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 975408daf..6501ce129 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -600,15 +600,15 @@ BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB waitmessage special TryBerryBlenderLinkup waitstate - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq BerryBlender_EventScript_SpawnLinkPartners - compare VAR_RESULT, 2 + compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY goto_if_eq BerryBlender_EventScript_CloseLinkNotReady - compare VAR_RESULT, 3 + compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq BerryBlender_EventScript_CloseLink - compare VAR_RESULT, 6 + compare VAR_RESULT, LINKUP_CONNECTION_ERROR goto_if_eq BerryBlender_EventScript_LinkError end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f206fdd98..df14800cc 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -452,21 +452,21 @@ CableClub_EventScript_TradeCenter:: @ 82770B2 waitmessage special TryTradeLinkup waitstate - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq CableClub_EventScript_EnterTradeCenter - compare VAR_RESULT, 2 + compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady - compare VAR_RESULT, 3 + compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections - compare VAR_RESULT, 4 + compare VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq CableClub_EventScript_AbortLink - compare VAR_RESULT, 6 + compare VAR_RESULT, LINKUP_CONNECTION_ERROR goto_if_eq CableClub_EventScript_AbortLinkConnectionError - compare VAR_RESULT, 7 + compare VAR_RESULT, LINKUP_PLAYER_NOT_READY goto_if_eq CableClub_EventScript_AbortLinkPlayerNotReady - compare VAR_RESULT, 9 + compare VAR_RESULT, LINKUP_PARTNER_NOT_READY goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end @@ -527,21 +527,21 @@ CableClub_EventScript_RecordCorner:: @ 82771DB waitmessage special TryRecordMixLinkup waitstate - special sub_80B2EA8 + special ValidateMixingGameLanguage waitstate - compare VAR_RESULT, 12 + compare VAR_RESULT, LINKUP_FOREIGN_GAME goto_if_eq CableClub_EventScript_AbortLinkForeignGame - compare VAR_RESULT, 1 + compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq CableClub_EventScript_EnterRecordCorner - compare VAR_RESULT, 2 + compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady - compare VAR_RESULT, 3 + compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections - compare VAR_RESULT, 4 + compare VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants - compare VAR_RESULT, 5 + compare VAR_RESULT, LINKUP_FAILED goto_if_eq CableClub_EventScript_AbortLink - compare VAR_RESULT, 6 + compare VAR_RESULT, LINKUP_CONNECTION_ERROR goto_if_eq CableClub_EventScript_AbortLinkConnectionError end diff --git a/data/specials.inc b/data/specials.inc index 3cbffb365..5d48e62f9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -39,7 +39,7 @@ gSpecials:: @ 81DBA64 def_special TryBattleLinkup def_special TryTradeLinkup def_special TryRecordMixLinkup - def_special sub_80B2EA8 + def_special ValidateMixingGameLanguage def_special CloseLink def_special ColosseumPlayerSpotTriggered def_special PlayerEnteredTradeSeat @@ -502,7 +502,7 @@ gSpecials:: @ 81DBA64 def_special CreateAbnormalWeatherEvent def_special GetAbnormalWeatherMapNameAndType def_special GetMartEmployeeObjectEventId - def_special sub_80A08CC + def_special SaveForBattleTowerLink def_special Unused_SetWeatherSunny def_special SetUnlockedPokedexFlags def_special IsTrainerRegistered |