5 files changed, 14 insertions, 20 deletions
diff --git a/include/cable_club.h b/include/cable_club.h
index a5a6acfa4..c493691c1 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -2,6 +2,7 @@
 #define GUARD_CABLE_CLUB_H
 
 #include "task.h"
+#include "constants/cable_club.h"
 
 void CreateTask_EnterCableClubSeat(TaskFunc taskFunc);
 u8 CreateTask_ReestablishCableClubLink(void);
diff --git a/include/constants/cable_club.h b/include/constants/cable_club.h
index cbdd049db..3515ffa2c 100644
--- a/include/constants/cable_club.h
+++ b/include/constants/cable_club.h
@@ -28,4 +28,8 @@
 #define LINKUP_FAILED_BATTLE_TOWER  11
 #define LINKUP_FOREIGN_GAME         12
 
+#define CABLE_SEAT_WAITING 0
+#define CABLE_SEAT_SUCCESS 1
+#define CABLE_SEAT_FAILED  2
+
 #endif //GUARD_CONSTANTS_CABLE_CLUB_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index ecb40c266..f5151ce20 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -607,7 +607,7 @@ extern const u8 EventScript_BattleColosseum_2P_PlayerSpot0[];
 extern const u8 EventScript_BattleColosseum_2P_PlayerSpot1[];
 extern const u8 EventScript_TradeCenter_Chair1[];
 extern const u8 EventScript_TradeCenter_Chair0[];
-extern const u8 EventScript_ConfirmLeaveTradeRoom[];
+extern const u8 EventScript_ConfirmLeaveCableClubRoom[];
 extern const u8 EventScript_TerminateLink[];
 
 #endif // GUARD_EVENT_SCRIPTS_H
diff --git a/include/global.h b/include/global.h
index 497fb40b1..18e2bfea7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1055,14 +1055,4 @@ struct MapPosition
     s8 height;
 };
 
-struct TradeRoomPlayer
-{
-    u8 playerId;
-    u8 isLocalPlayer;
-    u8 c;
-    u8 facing;
-    struct MapPosition pos;
-    u16 field_C;
-};
-
 #endif // GUARD_GLOBAL_H
diff --git a/include/overworld.h b/include/overworld.h
index 6efaa6ccb..16c75861c 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -7,17 +7,17 @@
 #define LINK_KEY_CODE_DPAD_UP 0x13
 #define LINK_KEY_CODE_DPAD_LEFT 0x14
 #define LINK_KEY_CODE_DPAD_RIGHT 0x15
-#define LINK_KEY_CODE_UNK_2 0x16
+#define LINK_KEY_CODE_READY 0x16
 #define LINK_KEY_CODE_EXIT_ROOM 0x17
 #define LINK_KEY_CODE_START_BUTTON 0x18
 #define LINK_KEY_CODE_A_BUTTON 0x19
-#define LINK_KEY_CODE_UNK_4 0x1A // I'd guess this is the B button?
+#define LINK_KEY_CODE_IDLE 0x1A
 
 // These two are a hack to stop user input until link stuff can be
 // resolved.
 #define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B 
 #define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C
-#define LINK_KEY_CODE_UNK_7 0x1D
+#define LINK_KEY_CODE_EXIT_SEAT 0x1D
 #define LINK_KEY_CODE_UNK_8 0x1E
 
 #define MOVEMENT_MODE_FREE 0
@@ -143,15 +143,14 @@ void CB2_ReturnToFieldFromMultiplayer(void);
 void CB2_ReturnToFieldWithOpenMenu(void);
 void CB2_ReturnToFieldContinueScript(void);
 void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
-void sub_80861E8(void);
+void CB2_ReturnToFieldFadeFromBlack(void);
 void CB2_ContinueSavedGame(void);
 void ResetAllMultiplayerState(void);
-u32 sub_8087214(void);
-bool32 sub_808727C(void);
-u16 sub_8087288(void);
-u16 sub_808729C(void);
+u32 GetCableClubPartnersReady(void);
+u16 SetInCableClubSeat(void);
+u16 SetLinkWaitingForScript(void);
 u16 QueueExitLinkRoomKey(void);
-u16 sub_80872C4(void);
+u16 SetStartedCableClubActivity(void);
 bool32 Overworld_LinkRecvQueueLengthMoreThan2(void);
 bool32 Overworld_RecvKeysFromLinkIsRunning(void);
 bool32 Overworld_SendKeysToLinkIsRunning(void);