diff --git a/include/applications/frontier/battle_arcade/main.h b/include/applications/frontier/battle_arcade/main.h index 28a1b26db80..52d201de339 100644 --- a/include/applications/frontier/battle_arcade/main.h +++ b/include/applications/frontier/battle_arcade/main.h @@ -32,8 +32,8 @@ typedef struct BattleArcadeAppArgs { BOOL BattleArcadeApp_Init(ApplicationManager *appMan, int *state); BOOL BattleArcadeApp_Main(ApplicationManager *appMan, int *state); BOOL BattleArcadeApp_Exit(ApplicationManager *appMan, int *state); -void BattleArcadeApp_HandleInitialLayoutCmd(int netID, int unused, void *data, void *context); -void BattleArcadeApp_HandleResultCmd(int netID, int unused, void *data, void *context); -void BattleArcadeApp_HandleUnusedCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleArcadeHandleInitialLayout(int netID, int unused, void *data, void *context); +void CommCmd_BattleArcadeHandleResult(int netID, int unused, void *data, void *context); +void CommCmd_BattleArcadeUnused(int netID, int unused, void *data, void *context); #endif // POKEPLATINUM_APPLICATIONS_BATTLE_ARCADE_MAIN_H diff --git a/include/applications/frontier/battle_castle/opponent_app.h b/include/applications/frontier/battle_castle/opponent_app.h index 7843fad70fd..12455c008b7 100644 --- a/include/applications/frontier/battle_castle/opponent_app.h +++ b/include/applications/frontier/battle_castle/opponent_app.h @@ -6,9 +6,9 @@ BOOL BattleCastleOpponentApp_Init(ApplicationManager *appMan, int *state); BOOL BattleCastleOpponentApp_Main(ApplicationManager *appMan, int *state); BOOL BattleCastleOpponentApp_Exit(ApplicationManager *appMan, int *state); -void BattleCastleOpponentApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context); -void BattleCastleOpponentApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context); -void BattleCastleOpponentApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context); -void BattleCastleOpponentApp_HandleExitAppCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleOpponentHandlePlayerInfo(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleOpponentHandlePurchaseInfo(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleOpponentUpdateCursorCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleOpponentHandleExitApp(int netID, int unused, void *data, void *context); #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_OPPONENT_MAIN_H diff --git a/include/applications/frontier/battle_castle/self_app.h b/include/applications/frontier/battle_castle/self_app.h index 0399521eeba..02dbca98061 100644 --- a/include/applications/frontier/battle_castle/self_app.h +++ b/include/applications/frontier/battle_castle/self_app.h @@ -6,9 +6,9 @@ BOOL BattleCastleSelfApp_Init(ApplicationManager *appMan, int *state); BOOL BattleCastleSelfApp_Main(ApplicationManager *appMan, int *state); BOOL BattleCastleSelfApp_Exit(ApplicationManager *appMan, int *state); -void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context); -void BattleCastleSelfApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context); -void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context); -void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleHandlePlayerInfo(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastlePurchaseInfo(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleHandleUpdateCursor(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleHandleExitApp(int netID, int unused, void *data, void *context); #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SELF_MAIN_H diff --git a/include/applications/frontier/battle_factory/main.h b/include/applications/frontier/battle_factory/main.h index 21aa677b8da..aca419e82ad 100644 --- a/include/applications/frontier/battle_factory/main.h +++ b/include/applications/frontier/battle_factory/main.h @@ -21,9 +21,9 @@ typedef struct BattleFactoryAppArgs { int BattleFactoryApp_Init(ApplicationManager *appMan, int *state); int BattleFactoryApp_Main(ApplicationManager *appMan, int *state); int BattleFactoryApp_Exit(ApplicationManager *appMan, int *state); -void BattleFactoryApp_DummyCommCommand(int netID, int unused, void *data, void *context); -void BattleFactoryApp_HandleSelectionUpdateCmd(int netID, int unused, void *data, void *context); -void BattleFactoryApp_DummyCommCommand2(int netID, int unused, void *data, void *context); -void BattleFactoryApp_HandleTradeResultCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleFactoryDummy(int netID, int unused, void *data, void *context); +void CommCmd_BattleFactoryHandleSelectionUpdate(int netID, int unused, void *data, void *context); +void CommCmd_BattleFactoryDummy2(int netID, int unused, void *data, void *context); +void CommCmd_BattleFactoryHandleTradeResult(int netID, int unused, void *data, void *context); #endif // POKEPLATINUM_APPLICATIONS_BATTLE_FACTORY_MAIN_H diff --git a/include/applications/frontier/battle_hall/main.h b/include/applications/frontier/battle_hall/main.h index 892189830e4..14d83fa5c51 100644 --- a/include/applications/frontier/battle_hall/main.h +++ b/include/applications/frontier/battle_hall/main.h @@ -23,8 +23,8 @@ typedef struct BattleHallAppArgs { BOOL BattleHallApp_Init(ApplicationManager *appMan, int *state); BOOL BattleHallApp_Main(ApplicationManager *appMan, int *state); BOOL BattleHallApp_Exit(ApplicationManager *appMan, int *state); -void BattleHall_DummyCommCommand(int netID, int unused, void *unused2, void *unused3); -void BattleHall_HandleTypeSelectionMsg(int netID, int unused, void *data, void *context); -void BattleHall_HandlePartnerDecisionCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleHallDummy(int netID, int unused, void *unused2, void *unused3); +void CommCmd_BattleHallHandleTypeSelectionMsg(int netID, int unused, void *data, void *context); +void CommCmd_BattleHallHandlePartnerDecision(int netID, int unused, void *data, void *context); #endif // POKEPLATINUM_APPLICATIONS_BATTLE_HALL_MAIN_H diff --git a/include/comm_command.h b/include/comm_command.h new file mode 100644 index 00000000000..37140e04c82 --- /dev/null +++ b/include/comm_command.h @@ -0,0 +1,16 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_H +#define POKEPLATINUM_COMM_COMMAND_H + +#include "struct_defs/comm_cmd_table.h" + +void CommCmdManager_Init(const CommCmdTable *param0, int param1, void *param2); +void CommCmdManager_Free(void); +void CommCommCmdManager_Callback(int param0, int param1, int param2, void *param3); +int CommCmdManager_PacketSizeOf(int param0); +BOOL CommCmdManager_CheckCmdHasBuffer(int param0); +void *CommCmdManager_TryCreateRecvBuffer(int param0, int param1, int param2); +int CommPacketSizeOf_Variable(void); +int CommPacketSizeOf_Nothing(void); +int CommPacketSizeOf_NetId(void); + +#endif // POKEPLATINUM_COMM_COMMAND_H diff --git a/include/unk_0207A6DC.h b/include/comm_command_battle.h similarity index 90% rename from include/unk_0207A6DC.h rename to include/comm_command_battle.h index fd3fa70e4e3..8a30ead541d 100644 --- a/include/unk_0207A6DC.h +++ b/include/comm_command_battle.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0207A6DC_H -#define POKEPLATINUM_UNK_0207A6DC_H +#ifndef POKEPLATINUM_COMM_COMMAND_BATTLE_H +#define POKEPLATINUM_COMM_COMMAND_BATTLE_H #include "struct_decls/battle_system.h" #include "struct_defs/link_battle_comm_state.h" @@ -23,4 +23,4 @@ BOOL sub_0207ABD0(LinkBattleCommState *linkBattleCommState, int param1, int para BOOL sub_0207AC28(LinkBattleCommState *linkBattleCommState, int param1); BOOL sub_0207AC54(LinkBattleCommState *linkBattleCommState, int param1, int param2); -#endif // POKEPLATINUM_UNK_0207A6DC_H +#endif // POKEPLATINUM_COMM_COMMAND_BATTLE_H diff --git a/include/unk_02095AF0.h b/include/comm_command_contest.h similarity index 75% rename from include/unk_02095AF0.h rename to include/comm_command_contest.h index 5b2ce341266..25067576acf 100644 --- a/include/unk_02095AF0.h +++ b/include/comm_command_contest.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_02095AF0_H -#define POKEPLATINUM_UNK_02095AF0_H +#ifndef POKEPLATINUM_COMM_COMMAND_CONTEST_H +#define POKEPLATINUM_COMM_COMMAND_CONTEST_H #include "struct_defs/struct_02029C88.h" #include "struct_defs/struct_02095C60.h" @@ -12,4 +12,4 @@ BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1); BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1); BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1); -#endif // POKEPLATINUM_UNK_02095AF0_H +#endif // POKEPLATINUM_COMM_COMMAND_CONTEST_H diff --git a/include/comm_command_draw.h b/include/comm_command_draw.h new file mode 100644 index 00000000000..1bc27612fdc --- /dev/null +++ b/include/comm_command_draw.h @@ -0,0 +1,17 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_DRAW_H +#define POKEPLATINUM_COMM_COMMAND_DRAW_H + +void sub_02095E98(void *param0); +void CommCmd_Field_Draw_118(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_119(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_120(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_124(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_126(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_125(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_123(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_121(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_122(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_127(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_Draw_128(int param0, int param1, void *param2, void *param3); + +#endif // POKEPLATINUM_COMM_COMMAND_DRAW_H diff --git a/include/comm_command_field.h b/include/comm_command_field.h new file mode 100644 index 00000000000..082bd1f0cb4 --- /dev/null +++ b/include/comm_command_field.h @@ -0,0 +1,11 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_FIELD_H +#define POKEPLATINUM_COMM_COMMAND_FIELD_H + +void CommCmd_Field_Dummy(int param0, int param1, void *param2, void *param3); +void CommFieldCmd_Init(void *param0); +int sub_02099530(void); +int sub_02099538(void); +int sub_02099540(void); +int sub_02099544(void); + +#endif // POKEPLATINUM_COMM_COMMAND_FIELD_H diff --git a/include/unk_0209BA80.h b/include/comm_command_frontier.h similarity index 76% rename from include/unk_0209BA80.h rename to include/comm_command_frontier.h index 5bdb75ac30e..8f96f8811e0 100644 --- a/include/unk_0209BA80.h +++ b/include/comm_command_frontier.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0209BA80_H -#define POKEPLATINUM_UNK_0209BA80_H +#ifndef POKEPLATINUM_COMM_COMMAND_FRONTIER_H +#define POKEPLATINUM_COMM_COMMAND_FRONTIER_H #include "struct_defs/battle_tower.h" #include "struct_defs/struct_0209BBA4.h" @@ -12,4 +12,4 @@ BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2); BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1); BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1); -#endif // POKEPLATINUM_UNK_0209BA80_H +#endif // POKEPLATINUM_COMM_COMMAND_FRONTIER_H diff --git a/include/comm_command_record_corner.h b/include/comm_command_record_corner.h new file mode 100644 index 00000000000..41e2fa29a4e --- /dev/null +++ b/include/comm_command_record_corner.h @@ -0,0 +1,14 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_RECORD_CORNER_H +#define POKEPLATINUM_COMM_COMMAND_RECORD_CORNER_H + +void sub_020961E8(void *param0); +void CommCmd_Field_RecordCorner_115(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_111(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_112(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_110(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_108(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_109(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_113(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_114(int param0, int param1, void *param2, void *param3); + +#endif // POKEPLATINUM_COMM_COMMAND_RECORD_CORNER_H diff --git a/include/unk_0209BDF8.h b/include/comm_command_spin_trade.h similarity index 78% rename from include/unk_0209BDF8.h rename to include/comm_command_spin_trade.h index 6338ef0b189..65dfd874a73 100644 --- a/include/unk_0209BDF8.h +++ b/include/comm_command_spin_trade.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0209BDF8_H -#define POKEPLATINUM_UNK_0209BDF8_H +#ifndef POKEPLATINUM_COMM_COMMAND_SPIN_TRADE_H +#define POKEPLATINUM_COMM_COMMAND_SPIN_TRADE_H #include "constants/heap.h" @@ -14,4 +14,4 @@ BOOL sub_0209BEBC(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u3 int sub_0209C16C(void); void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1); -#endif // POKEPLATINUM_UNK_0209BDF8_H +#endif // POKEPLATINUM_COMM_COMMAND_SPIN_TRADE_H diff --git a/include/comm_command_trade.h b/include/comm_command_trade.h new file mode 100644 index 00000000000..328d1637da1 --- /dev/null +++ b/include/comm_command_trade.h @@ -0,0 +1,19 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_TRADE_H +#define POKEPLATINUM_COMM_COMMAND_TRADE_H + +#include "struct_decls/struct_02095E80_decl.h" + +#include "field/field_system_decl.h" + +void sub_02095CD4(void *param0); +void CommCmd_Trade_22(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_23(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_24(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_25(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_26(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_27(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_30(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_28(int param0, int param1, void *param2, void *param3); +void sub_02095E60(FieldSystem *fieldSystem, UnkStruct_02095E80 *param1); + +#endif // POKEPLATINUM_COMM_COMMAND_TRADE_H diff --git a/include/comm_command_waiting_room.h b/include/comm_command_waiting_room.h new file mode 100644 index 00000000000..38602b72927 --- /dev/null +++ b/include/comm_command_waiting_room.h @@ -0,0 +1,9 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_WAITING_ROOM_H +#define POKEPLATINUM_COMM_COMMAND_WAITING_ROOM_H + +#include "struct_defs/comm_cmd_table.h" + +const CommCmdTable *sub_02039A58(void); +int sub_02039A60(void); + +#endif // POKEPLATINUM_COMM_COMMAND_WAITING_ROOM_H diff --git a/include/comm_manager.h b/include/comm_manager.h index 7ebf4ab114d..172d325aa69 100644 --- a/include/comm_manager.h +++ b/include/comm_manager.h @@ -45,8 +45,8 @@ void CommManager_SetState_MixRecords(void); void CommManager_StartMixRecordsClient(int connectionID); void CommManager_SetState_SpinTrade(void); void CommManager_StartSpinTradeClient(int connectionID); -void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *confirmationMessage, void *unused_3); -void CommManager_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *confirmationMessage, void *unused_3); +void CommCmd_ValidateConfirmationMessage(int netID, int unused_1, void *confirmationMessage, void *unused_3); +void CommCmd_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *confirmationMessage, void *unused_3); int CommManager_ConfirmationMessage_sizeof(void); void CommManager_SetMaxNumConnections(int maxNumConnection); void CommManager_InitializePoketchLinkSearch(SaveData *saveData); @@ -59,7 +59,7 @@ BOOL CommManager_ExitOrReset(void); void CommManager_SetUnk34(int errorCode, int errorType, int error); int CommManager_StartWifiBattle(int target); int CommManager_GetMatchmakingState(); -void CommManager_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3); +void CommCmd_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3); BOOL CommManager_GetDisconnectedWifi(void); BOOL CommManager_IsLoginBattleWifi(void); BOOL CommManager_IsLoginBattleMatchWifi(void); diff --git a/include/comm_player_manager.h b/include/comm_player_manager.h index 7e275ab9907..ecc18e705bf 100644 --- a/include/comm_player_manager.h +++ b/include/comm_player_manager.h @@ -103,13 +103,13 @@ u32 CommPlayer_Size(void); void CommPlayer_Destroy(u8 netId, BOOL param1, BOOL param2); BOOL CommPlayerMan_IsFieldSystemActive(void); void sub_02057FC4(BOOL param0); -void sub_02058018(int netId, int param1, void *param2, void *unused); +void CommCmd_Field_62(int netId, int param1, void *param2, void *unused); void sub_0205805C(FieldSystem *fieldSystem, BOOL param1); BOOL CommPlayer_CheckNPCCollision(int x, int z); -void CommPlayer_RecvLocation(int netId, int unused0, void *src, void *unused1); -void CommPlayer_RecvDelete(int unused0, int unused1, void *src, void *unused2); +void CommCmd_RecvPlayerLocation(int netId, int unused0, void *src, void *unused1); +void CommCmd_DeletePlayer(int unused0, int unused1, void *src, void *unused2); int CommPacketSizeOf_RecvLocation(void); -void CommPlayer_RecvLocationAndInit(int netId, int size, void *src, void *unused); +void CommCmd_RecvPlayerLocationAndInit(int netId, int size, void *src, void *unused); void CommPlayer_StartSlide(int netId, int dir, BOOL isHurlTrap); void CommPlayer_StopSlide(int netId); void CommPlayer_EndCurrentSlide(int netId); @@ -138,7 +138,7 @@ int CommPlayerMan_GetLinkNetIDAtLocation(int xPos, int zPos); void CommPlayerMan_SetMovementEnabled(int netId, BOOL movementEnabled); BOOL CommPlayerMan_IsMovementEnabled(int netId); BOOL sub_020590C4(void); -void sub_02059180(int netId, int unused0, void *src, void *unused3); +void CommCmd_Field_94(int netId, int unused0, void *src, void *unused3); void CommPlayer_SetBattleDir(void); BOOL sub_0205928C(void); int CommPlayer_GetOppositeDir(int dir); diff --git a/include/communication_information.h b/include/communication_information.h index 3af7feb8212..6fdec8bb3b7 100644 --- a/include/communication_information.h +++ b/include/communication_information.h @@ -12,10 +12,10 @@ void CommInfo_Delete(void); BOOL CommInfo_IsInitialized(void); void CommInfo_SendPlayerInfo(void); int CommPlayerInfo_Size(void); -void CommunicatitonInformaion_FinishReading(int unused0, int unused1, void *unused2, void *unused3); +void CommCmd_FinishRecvPlayerInfo(int unused0, int unused1, void *unused2, void *unused3); BOOL CommInfo_IsDataFinishedReading(void); -void CommInfo_RecvPlayerDataArray(int netId, int unused1, void *src, void *unused3); -void CommInfo_RecvPlayerData(int netId, int unused1, void *src, void *unused3); +void CommCmd_RecvPlayerInfoArray(int netId, int unused1, void *src, void *unused3); +void CommCmd_RecvPlayerInfo(int netId, int unused1, void *src, void *unused3); BOOL CommInfo_ServerSendArray(void); BOOL CommInfo_IsReceivingData(void); void CommInfo_InitPlayer(int netId); diff --git a/include/communication_system.h b/include/communication_system.h index 13243f13670..3c5e010792f 100644 --- a/include/communication_system.h +++ b/include/communication_system.h @@ -47,9 +47,9 @@ void CommSys_DisableSendMovementData(void); BOOL CommSys_IsSendingMovementData(void); BOOL CommSys_WriteToQueueServer(int cmd, const void *data, int param2); BOOL CommSys_WriteToQueue(int cmd, const void *data, int size); -void sub_02036008(int unused0, int unused1, void *param2, void *unused3); -void sub_02036030(int unused0, int unused1, void *param2, void *unused3); -void sub_02036058(int unused0, int unused1, void *param2, void *unused3); +void CommCmd_10(int unused0, int unused1, void *param2, void *unused3); +void CommCmd_11(int unused0, int unused1, void *param2, void *unused3); +void CommCmd_12(int unused0, int unused1, void *param2, void *unused3); u16 CommSys_CurNetId(void); BOOL CommSys_SendDataFixedSize(int cmd, const void *data); BOOL CommSys_SendMessage(int cmd); @@ -60,7 +60,7 @@ int CommType_MaxPlayers(int param0); int CommType_MinPlayers(int param0); void CommSys_SetAlone(BOOL param0); BOOL CommSys_IsAlone(void); -void sub_0203619C(int param0, int param1, void *param2, void *param3); +void CommCmd_2(int param0, int param1, void *param2, void *param3); void CommSys_Seed(MATHRandContext32 *rand); BOOL CommSys_IsCmdQueuedServer(int cmd); BOOL CommSys_IsCmdQueued(int cmd); diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h new file mode 100644 index 00000000000..f016b063334 --- /dev/null +++ b/include/constants/communication/comm_command.h @@ -0,0 +1,327 @@ +#ifndef POKEPLATINUM_CONSTANTS_COMM_COMMAND_H +#define POKEPLATINUM_CONSTANTS_COMM_COMMAND_H + +// Base Communication Commands used globally. +enum CommCommand_Common { + COMM_CMD_NONE = 0, + COMM_CMD_1, + COMM_CMD_2, + COMM_CMD_RECV_PLAYER_INFO, + COMM_CMD_RECV_PLAYER_INFO_ARRAY, + COMM_CMD_RECV_PLAYER_INFO_FINISH, + COMM_CMD_VALIDATE_CONFIRMATION, + COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE, + COMM_CMD_8, + COMM_CMD_9, + COMM_CMD_10, + COMM_CMD_11, + COMM_CMD_12, + COMM_CMD_SWAP_CMD_TABLE, + COMM_CMD_DEINIT_MANAGER, + COMM_CMD_FINISH_SWAP_CMD_TABLE, + COMM_CMD_16, + COMM_CMD_17, + COMM_CMD_18, + COMM_CMD_19, + COMM_CMD_20, + COMM_CMD_DISCONNECT_WIFI, + COMM_CMD_MAX_COMMON, +}; + +// Communication Commands used for the Frontier +enum CommCommand_Frontier { + COMM_CMD_F_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_F_23, + COMM_CMD_F_24, + COMM_CMD_F_25, + COMM_CMD_F_26, + COMM_CMD_F_27, + COMM_CMD_F_28, + COMM_CMD_FACTORY_DUMMY, + COMM_CMD_FACTORY_SELECTION_UPDATE, + COMM_CMD_FACTORY_DUMMY2, + COMM_CMD_FACTORY_TRADE_RESULT, + COMM_CMD_F_33, + COMM_CMD_F_34, + COMM_CMD_F_35, + COMM_CMD_F_36, + COMM_CMD_F_37, + COMM_CMD_F_38, + COMM_CMD_HALL_DUMMY, + COMM_CMD_HALL_TYPE_SELECTION_MSG, + COMM_CMD_HALL_PARTNER_DECISION, + COMM_CMD_F_42, + COMM_CMD_F_43, + COMM_CMD_F_44, + COMM_CMD_F_45, + COMM_CMD_F_46, + COMM_CMD_F_47, + COMM_CMD_F_48, + COMM_CMD_CASTLE_PLAYER_INFO, + COMM_CMD_CASTLE_PURCHASE_INFO, + COMM_CMD_CASTLE_UPDATE_CURSOR, + COMM_CMD_CASTLE_EXIT, + COMM_CMD_CASTLE_OPP_PLAYER_INFO, + COMM_CMD_CASTLE_OPP_PURCHASE_INFO, + COMM_CMD_CASTLE_OPP_UPDATE_CURSOR, + COMM_CMD_CASTLE_OPP_EXIT, + COMM_CMD_F_57, + COMM_CMD_F_58, + COMM_CMD_F_59, + COMM_CMD_F_60, + COMM_CMD_F_61, + COMM_CMD_F_62, + COMM_CMD_F_63, + COMM_CMD_F_64, + COMM_CMD_F_65, + COMM_CMD_F_66, + COMM_CMD_F_67, + COMM_CMD_F_68, + COMM_CMD_F_69, + COMM_CMD_F_70, + COMM_CMD_ARCADE_INIT_LAYOUT, + COMM_CMD_ARCADE_RESULT, + COMM_CMD_ARCADE_UNUSED, + COMM_CMD_MAX_FRONTIER, +}; + +// Communication Commands used for Field movement +enum CommCommand_Field { + COMM_CMD_RECV_PLAYER_LOCATION = COMM_CMD_MAX_COMMON, + COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT, + COMM_CMD_VENDOR_TALK_REQUEST, + COMM_CMD_VENDOR_TALK, + COMM_CMD_VENDOR_TALK_SERVER, + COMM_CMD_OPEN_MENU_REQUEST, + COMM_CMD_INTERACT_EVENT, + COMM_CMD_OPEN_MENU_EVENT, + COMM_CMD_TALK_EVENT, + COMM_CMD_PROCESS_ALL_DATA_SENT_MSG, + COMM_CMD_TRY_PLACE_TRAP, + COMM_CMD_REMOVE_BURIED_TRAP_INDEX_UNUSED, + COMM_CMD_PLACE_TRAP_RESULT, + COMM_CMD_LOAD_LINK_TRAPS, + COMM_CMD_RECV_LOAD_TRAPS, + COMM_CMD_TRIGGER_TRAP, + COMM_CMD_CALL_SECOND_TRAP_EFFECT, + COMM_CMD_START_SLIDE_ANIM_UNUSED, + COMM_CMD_ESCAPE_HOLE, + COMM_CMD_ESCAPE_TRAP, + COMM_CMD_ESCAPED_TRAP, + COMM_CMD_END_TRAP_EFFECT, + COMM_CMD_TRAP_HELP, + COMM_CMD_TRIGGERD_TRAP_BITS, + COMM_CMD_QUEUE_SEND_TRAP_RADAR_RESULTS, + COMM_CMD_RECV_TRAP_RADAR_RESULTS, + COMM_CMD_UNDERGROUND_TOUCH_INPUT, + COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS, + COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS, + COMM_CMD_DISENGAGE_TRAP, + COMM_CMD_DELETE_PLAYER, + COMM_CMD_BASE_INFO, + COMM_CMD_ENTER_BASE, + COMM_CMD_BASE_ENTRANCE_BUFFER, + COMM_CMD_CLEAR_TRANSITION_STATUS, + COMM_CMD_EXIT_BASE, + COMM_CMD_BASE_TRANSMITION_PROMPT, + COMM_CMD_BASE_TRANSITION_EVENT, + COMM_CMD_SECRET_BASE_GOOD_INTERACTION, + COMM_CMD_ENTER_BASE_FAILED, + COMM_CMD_FIELD_62, + COMM_CMD_RETRIEVE_BURIED_SPHERES, + COMM_CMD_INTERACT_MINING_SPOT, + COMM_CMD_CONFIRM_START_MINING_RESULT, + COMM_CMD_CONFIRM_START_MINING, + COMM_CMD_RECV_MINING_END, + COMM_CMD_MINING_LINK_INPUT, + COMM_CMD_MINING_LINK_INPUT_SERVER, + COMM_CMD_PLAYER_STATE_UNDERGROUND, + COMM_CMD_START_TREASURE_RADAR, + COMM_CMD_MINING_SPOT_RADAR, + COMM_CMD_REQUEST_TALK_UPDATE_SERVER, + COMM_CMD_RESPONSE_TALK_UPDATE_SERVER, + COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER, + COMM_CMD_TALK_UPDATE_SERVER, + COMM_CMD_SEND_GIFT_SERVER, + COMM_CMD_RECV_GIFT_OFFER, + COMM_CMD_SEND_TALK_MSG_SERVER, + COMM_CMD_RECV_TALK_MSG_SERVER, + COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER, + COMM_CMD_UNDERGROUND_RECORD, + COMM_CMD_UNDERGROUND_PC_INTERACT, + COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE, + COMM_CMD_UNDERGROUND_FLAG_EVENT, + COMM_CMD_CREATE_SECRET_BASE_REQUEST, + COMM_CMD_CREATE_SECRET_BASE_EVENT, + COMM_CMD_TRAINER_CASE_COPIED, + COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG, + COMM_CMD_UNDERGROUND_TAKEN_FLAG, + COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO, + COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER, + COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK, + COMM_CMD_FIELD_94, + COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM, + COMM_CMD_UNDERGROUND_FLAG_RANK_UP, + COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT, + COMM_CMD_FIELD_98, + COMM_CMD_FIELD_99, + COMM_CMD_FIELD_100, + COMM_CMD_FIELD_101, + COMM_CMD_FIELD_102, + COMM_CMD_FIELD_103, + COMM_CMD_FIELD_104, + COMM_CMD_FIELD_105, + COMM_CMD_FIELD_106, + COMM_CMD_FIELD_107, + COMM_CMD_FIELD_RECORD_108, + COMM_CMD_FIELD_RECORD_109, + COMM_CMD_FIELD_RECORD_110, + COMM_CMD_FIELD_RECORD_111, + COMM_CMD_FIELD_RECORD_112, + COMM_CMD_FIELD_RECORD_113, + COMM_CMD_FIELD_RECORD_114, + COMM_CMD_FIELD_RECORD_115, + COMM_CMD_FIELD_RECORD_116, + COMM_CMD_FIELD_RECORD_117, + COMM_CMD_FIELD_DRAWING_118, + COMM_CMD_FIELD_DRAWING_119, + COMM_CMD_FIELD_DRAWING_120, + COMM_CMD_FIELD_DRAWING_121, + COMM_CMD_FIELD_DRAWING_122, + COMM_CMD_FIELD_DRAWING_123, + COMM_CMD_FIELD_DRAWING_124, + COMM_CMD_FIELD_DRAWING_125, + COMM_CMD_FIELD_DRAWING_126, + COMM_CMD_FIELD_DRAWING_127, + COMM_CMD_FIELD_DRAWING_128, + COMM_CMD_FIELD_DRAWING_129, + COMM_CMD_FIELD_SPIN_TRADE_130, + COMM_CMD_FIELD_SPIN_TRADE_131, + COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE, + COMM_CMD_FIELD_133, + COMM_CMD_FIELD_134, + COMM_CMD_MAX_FIELD +}; + +// Communication Commands used for Battle +enum CommCommand_Battle { + COMM_CMD_BATTLE_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_BATTLE_23, + COMM_CMD_BATTLE_24, + COMM_CMD_BATTLE_25, + COMM_CMD_BATTLE_26, + COMM_CMD_BATTLE_27, + COMM_CMD_BATTLE_28, + COMM_CMD_BATTLE_29, + COMM_CMD_BATTLE_30, + COMM_CMD_BATTLE_31, + COMM_CMD_BATTLE_32, + COMM_CMD_BATTLE_33, + COMM_CMD_MAX_BATTLE, +}; + +// Communication Commands used for trades in the Union Room +enum CommCommand_Trade { + COMM_CMD_TRADE_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_TRADE_23, + COMM_CMD_TRADE_24, + COMM_CMD_TRADE_25, + COMM_CMD_TRADE_26, + COMM_CMD_TRADE_27, + COMM_CMD_TRADE_28, + COMM_CMD_TRADE_29, + COMM_CMD_TRADE_30, + COMM_CMD_TRADE_31, + COMM_CMD_TRADE_32, +}; + +// Communication Commands used for P2P waiting rooms +enum CommCommand_WaitingRoom { + COMM_CMD_WAITING_ROOM_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_WAITING_ROOM_23, + COMM_CMD_WAITING_ROOM_24, +}; + +// Communication Commands used for Poffin Cooking minigame +enum CommCommand_PoffinCooking { + COMM_CMD_POFFIN_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_POFFIN_23, + COMM_CMD_POFFIN_24, + COMM_CMD_POFFIN_25, + COMM_CMD_POFFIN_26, + COMM_CMD_POFFIN_27, + COMM_CMD_POFFIN_28, + COMM_CMD_POFFIN_29, + COMM_CMD_POFFIN_30, + COMM_CMD_POFFIN_31, + COMM_CMD_POFFIN_32, + COMM_CMD_MAX_POFFIN, +}; + +// Communication Commands used for Contests +enum CommCommand_Contest { + COMM_CMD_CONTEST_DUMMY = COMM_CMD_MAX_COMMON, + COMM_CMD_CONTEST_23, + COMM_CMD_CONTEST_24, + COMM_CMD_CONTEST_25, + COMM_CMD_CONTEST_26, + COMM_CMD_CONTEST_27, + COMM_CMD_CONTEST_28, + COMM_CMD_CONTEST_29, + COMM_CMD_CONTEST_30, + COMM_CMD_CONTEST_31, + COMM_CMD_CONTEST_32, + COMM_CMD_CONTEST_33, + COMM_CMD_CONTEST_34, + COMM_CMD_CONTEST_35, + COMM_CMD_CONTEST_36, + COMM_CMD_CONTEST_37, +}; + +// Communication Commands used for Wifi Plaze Minigames +enum CommCommand_Minigame { + COMM_CMD_MINIGAME_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_MINIGAME_23, + COMM_CMD_MINIGAME_24, + COMM_CMD_MINIGAME_25, + COMM_CMD_MINIGAME_26, +}; + +// Communication Commands used for Swalot Plop minigame +enum CommCommand_SwalotPlop { + COMM_COMMAND_SWALOT_PLOP_22 = COMM_CMD_MAX_COMMON, + COMM_COMMAND_SWALOT_PLOP_23, + COMM_COMMAND_SWALOT_PLOP_24, + COMM_COMMAND_SWALOT_PLOP_25, + COMM_COMMAND_SWALOT_PLOP_26, + COMM_COMMAND_SWALOT_PLOP_27, + COMM_COMMAND_SWALOT_PLOP_28, + COMM_COMMAND_SWALOT_PLOP_29, +}; + +// Communication Commands used for Mime Jr. Top minigame +enum CommCommand_MimeJrTop { + COMM_CMD_MIME_TOP_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_MIME_TOP_23, + COMM_CMD_MIME_TOP_24, + COMM_CMD_MIME_TOP_25, + COMM_CMD_MIME_TOP_26, + COMM_CMD_MAX_MIME_TOP, +}; + +// Communication Commands used for Wobbuffet Pop minigame +enum CommCommand_WobbuffetPop { + COMM_CMD_WOB_POP_NONE = COMM_CMD_MAX_COMMON, + COMM_CMD_WOB_POP_23, + COMM_CMD_WOB_POP_24, + COMM_CMD_WOB_POP_25, + COMM_CMD_MAX_WOB_POP, +}; + +// Communication Commands used for Mystery Gift +enum CommCommand_MysteryGift { + COMM_CMD_MYSTERY_GIFT_22 = COMM_CMD_MAX_COMMON, + COMM_CMD_MYSTERY_GIFT_23 +}; + +#endif diff --git a/include/constants/communication/comm_sync.h b/include/constants/communication/comm_sync.h index cea2b73baaa..eae2a0f7aa0 100644 --- a/include/constants/communication/comm_sync.h +++ b/include/constants/communication/comm_sync.h @@ -8,6 +8,13 @@ enum CommSync { SYNC_BATTLE_ROOM_RETURN = 30, + SYNC_51 = 51, + SYNC_52, + SYNC_53, + SYNC_54, + SYNC_55, + SYNC_56, + SYNC_BATTLE_END_CONNECTION = 91, SYNC_PAUSE_BATTLE, diff --git a/include/field_comm_manager.h b/include/field_comm_manager.h index 32da513ce3d..c76b8b956a8 100644 --- a/include/field_comm_manager.h +++ b/include/field_comm_manager.h @@ -40,9 +40,9 @@ void FieldCommManager_ReconnectBattleClient(void); void FieldCommManager_EnterBattleRoom(FieldSystem *fieldSystem); void FieldCommManager_EndBattleNoSync(void); void FieldCommManager_EndBattleSync(void); -void FieldCommManager_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3); +void CommCmd_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3); BOOL FieldCommManager_IsInMovementState(void); -void FieldCommManager_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3); +void CommCmd_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3); u8 *FieldCommManager_GetTrainerCase(int netId, void *unused1, int unused2); SecretBase *FieldCommManager_GetCurrentOccupiedSecretBase(SaveData *saveData); void FieldCommManager_PauseUndergroundResources(void); diff --git a/include/functypes/funcptr_02032868.h b/include/functypes/funcptr_02032868.h index 84668d8dd0b..109ac981f4d 100644 --- a/include/functypes/funcptr_02032868.h +++ b/include/functypes/funcptr_02032868.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02032868_H #define POKEPLATINUM_FUNCPTR_02032868_H -typedef int (*UnkFuncPtr_02032868)(void); +typedef int (*CommCmdSizeFunc)(void); #endif // POKEPLATINUM_FUNCPTR_02032868_H diff --git a/include/functypes/funcptr_0203290C.h b/include/functypes/funcptr_0203290C.h index 568141fa3e5..964132edbec 100644 --- a/include/functypes/funcptr_0203290C.h +++ b/include/functypes/funcptr_0203290C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_0203290C_H #define POKEPLATINUM_FUNCPTR_0203290C_H -typedef u8 *(*UnkFuncPtr_0203290C)(int, void *, int); +typedef u8 *(*CommCmdBuffFunc)(int, void *, int); #endif // POKEPLATINUM_FUNCPTR_0203290C_H diff --git a/include/functypes/funcptr_020F8E60.h b/include/functypes/funcptr_020F8E60.h index e68a92510f6..2d182abfd62 100644 --- a/include/functypes/funcptr_020F8E60.h +++ b/include/functypes/funcptr_020F8E60.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_020F8E60_H #define POKEPLATINUM_FUNCPTR_020F8E60_H -typedef void (*UnkFuncPtr_020F8E60)(int, int, void *, void *); +typedef void (*CommCmdRecvFunc)(int, int, void *, void *); #endif // POKEPLATINUM_FUNCPTR_020F8E60_H diff --git a/include/main_menu/comm_command_mystery_gift.h b/include/main_menu/comm_command_mystery_gift.h new file mode 100644 index 00000000000..a4eaa1dfb21 --- /dev/null +++ b/include/main_menu/comm_command_mystery_gift.h @@ -0,0 +1,6 @@ +#ifndef POKEPLATINUM_MAIN_MENU_COMM_COMMAND_MYSTERY_GIFT_H +#define POKEPLATINUM_MAIN_MENU_COMM_COMMAND_MYSTERY_GIFT_H + +void ov97_0222D2F8(void *param0); + +#endif // POKEPLATINUM_MAIN_MENU_COMM_COMMAND_MYSTERY_GIFT_H diff --git a/include/main_menu/ov97_0222D04C.h b/include/main_menu/ov97_0222D04C.h index 0aa10e9c937..095f53c66cd 100644 --- a/include/main_menu/ov97_0222D04C.h +++ b/include/main_menu/ov97_0222D04C.h @@ -10,11 +10,11 @@ void ov97_0222D1F0(const void *param0, int param1); void ov97_0222D200(MysteryGiftAppData *param0, int param1); void ov97_0222D234(int param0); int ov97_0222D250(MysteryGiftAppData *param0); -void ov97_0222D284(int param0, int param1, void *param2, void *param3); +void CommCmd_MysteryGift_22(int param0, int param1, void *param2, void *param3); int ov97_0222D2A0(void); int ov97_0222D2B0(void); u8 *ov97_0222D2B8(int param0, void *param1, int param2); -void ov97_0222D2C4(int param0, int param1, void *param2, void *param3); +void CommCmd_MysteryGift_23(int param0, int param1, void *param2, void *param3); void ov97_0222D2DC(void); #endif // POKEPLATINUM_MAIN_MENU_0222D04C_H diff --git a/include/main_menu/ov97_0222D2F8.h b/include/main_menu/ov97_0222D2F8.h deleted file mode 100644 index 497d1878582..00000000000 --- a/include/main_menu/ov97_0222D2F8.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_MAIN_MENU_0222D2F8_H -#define POKEPLATINUM_MAIN_MENU_0222D2F8_H - -void ov97_0222D2F8(void *param0); - -#endif // POKEPLATINUM_MAIN_MENU_0222D2F8_H diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h index 27ef22d1f46..abff7bd53e8 100644 --- a/include/overlay006/ov6_022489E4.h +++ b/include/overlay006/ov6_022489E4.h @@ -10,21 +10,21 @@ #include "pokemon.h" #include "string_gf.h" -void ov6_022489E4(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_26(int param0, int param1, void *param2, void *param3); BOOL ov6_02248A64(Contest *param0); -void ov6_02248AC8(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_27(int param0, int param1, void *param2, void *param3); BOOL ov6_02248AF0(Contest *param0, int param1, const Pokemon *param2); -void ov6_02248B30(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_28(int param0, int param1, void *param2, void *param3); BOOL ov6_02248B70(Contest *param0, Pokemon **param1); -void ov6_02248BC0(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_29(int param0, int param1, void *param2, void *param3); BOOL ov6_02248BE8(Contest *param0, int param1, const UnkStruct_ov6_02248BE8 *param2); -void ov6_02248C28(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_30(int param0, int param1, void *param2, void *param3); BOOL ov6_02248C68(Contest *param0, int param1, const UnkStruct_020954F0 *param2); -void ov6_02248CBC(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_31(int param0, int param1, void *param2, void *param3); BOOL ov6_02248CE8(Contest *param0, int param1, const String *param2); -void ov6_02248D38(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_36(int param0, int param1, void *param2, void *param3); BOOL ov6_02248D64(Contest *param0, int param1, void *param2); -void ov6_02248DA0(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_37(int param0, int param1, void *param2, void *param3); BOOL ov6_02248DD8(Contest *param0, int param1, const UnkStruct_ov6_02248DD8 *param2); #endif // POKEPLATINUM_OV6_022489E4_H diff --git a/include/overlay017/ov17_02252CEC.h b/include/overlay017/ov17_02252CEC.h index 56dc0956f07..1aeb5683a4a 100644 --- a/include/overlay017/ov17_02252CEC.h +++ b/include/overlay017/ov17_02252CEC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV17_02252CEC_H #define POKEPLATINUM_OV17_02252CEC_H -void ov17_02252CEC(int param0, int param1, void *param2, void *param3); -void ov17_02252D7C(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_24(int param0, int param1, void *param2, void *param3); +void CommCmd_Contest_25(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV17_02252CEC_H diff --git a/include/overlay083/comm_command_poffin_cooking.h b/include/overlay083/comm_command_poffin_cooking.h new file mode 100644 index 00000000000..e4593e6b882 --- /dev/null +++ b/include/overlay083/comm_command_poffin_cooking.h @@ -0,0 +1,9 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_POFFIN_COOKING_H +#define POKEPLATINUM_COMM_COMMAND_POFFIN_COOKING_H + +#include "struct_defs/comm_cmd_table.h" + +const CommCmdTable *ov83_0223D144(void); +int ov83_0223D14C(void); + +#endif // POKEPLATINUM_COMM_COMMAND_POFFIN_COOKING_H diff --git a/include/overlay083/ov83_0223D144.h b/include/overlay083/ov83_0223D144.h deleted file mode 100644 index abe81a0514a..00000000000 --- a/include/overlay083/ov83_0223D144.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_OV83_0223D144_H -#define POKEPLATINUM_OV83_0223D144_H - -#include "struct_defs/comm_cmd_table.h" - -const CommCmdTable *ov83_0223D144(void); -int ov83_0223D14C(void); - -#endif // POKEPLATINUM_OV83_0223D144_H diff --git a/include/overlay083/ov83_0223D150.h b/include/overlay083/ov83_0223D150.h index 3ea9039b76f..b85152c5854 100644 --- a/include/overlay083/ov83_0223D150.h +++ b/include/overlay083/ov83_0223D150.h @@ -7,17 +7,17 @@ void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1); void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0); -void ov83_0223D204(int param0, int param1, void *param2, void *param3); -void ov83_0223D210(int param0, int param1, void *param2, void *param3); -void ov83_0223D21C(int param0, int param1, void *param2, void *param3); -void ov83_0223D258(int param0, int param1, void *param2, void *param3); -void ov83_0223D2E8(int param0, int param1, void *param2, void *param3); -void ov83_0223D354(int param0, int param1, void *param2, void *param3); -void ov83_0223D3A8(int param0, int param1, void *param2, void *param3); -void ov83_0223D3D8(int param0, int param1, void *param2, void *param3); -void ov83_0223D3F8(int param0, int param1, void *param2, void *param3); -void ov83_0223D410(int param0, int param1, void *param2, void *param3); -void ov83_0223D430(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_22(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_23(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_24(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_25(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_26(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_31(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_32(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_27(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_28(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_29(int param0, int param1, void *param2, void *param3); +void CommCmd_Poffin_30(int param0, int param1, void *param2, void *param3); int ov83_0223D4AC(void); int ov83_0223D4B0(void); int ov83_0223D4B4(void); diff --git a/include/overlay104/ov104_0222ECE8.h b/include/overlay104/ov104_0222ECE8.h index 4b452b6cb91..93ebb1dc69f 100644 --- a/include/overlay104/ov104_0222ECE8.h +++ b/include/overlay104/ov104_0222ECE8.h @@ -6,59 +6,59 @@ #include "overlay104/struct_battle_factory.h" #include "overlay104/struct_battle_hall.h" -void ov104_0222ECE8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_33(int param0, int param1, void *param2, void *param3); BOOL ov104_0222ED00(BattleHall *param0); -void ov104_0222ED2C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_34(int param0, int param1, void *param2, void *param3); BOOL ov104_0222ED44(BattleHall *param0); -void ov104_0222ED74(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_35(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EDA8(BattleHall *param0); -void ov104_0222EDDC(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_36(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EE14(BattleHall *param0, u8 param1); -void ov104_0222EE38(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_37(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EE60(BattleHall *param0); -void ov104_0222EEA8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_38(int param0, int param1, void *param2, void *param3); u8 *ov104_0222EED8(int param0, void *param1, int param2); BOOL ov104_0222EEF8(BattleFactory *param0); -void ov104_0222EF30(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EF64(BattleFactory *param0); -void ov104_0222EF94(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_23(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EFCC(BattleFactory *param0); -void ov104_0222F03C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_24(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F0B4(BattleFactory *param0); -void ov104_0222F124(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_25(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1); -void ov104_0222F1C4(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_26(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1); -void ov104_0222F210(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_27(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F238(BattleFactory *param0); -void ov104_0222F31C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_28(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F3B8(BattleCastle *param0); -void ov104_0222F418(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_42(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F44C(BattleCastle *param0); -void ov104_0222F480(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_43(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F4B8(BattleCastle *param0); -void ov104_0222F530(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_44(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F5D4(BattleCastle *param0); -void ov104_0222F650(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_45(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1); -void ov104_0222F6E8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_46(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F710(BattleCastle *param0, u16 param1); -void ov104_0222F730(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_47(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F758(BattleCastle *param0); -void ov104_0222F7BC(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_48(int param0, int param1, void *param2, void *param3); u8 *ov104_0222F84C(int param0, void *param1, int param2); BOOL ov104_0222F86C(BattleArcade *param0); -void ov104_0222F8A0(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_65(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F8D0(BattleArcade *param0); -void ov104_0222F908(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_66(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F944(BattleArcade *param0); -void ov104_0222F9C0(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_67(int param0, int param1, void *param2, void *param3); BOOL ov104_0222FA38(BattleArcade *param0, u16 param1); -void ov104_0222FA5C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_68(int param0, int param1, void *param2, void *param3); BOOL ov104_0222FA84(BattleArcade *param0, u16 param1); -void ov104_0222FAA8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_69(int param0, int param1, void *param2, void *param3); BOOL ov104_0222FAD0(BattleArcade *param0); -void ov104_0222FB34(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_70(int param0, int param1, void *param2, void *param3); u8 *ov104_0222FBC4(int param0, void *param1, int param2); #endif // POKEPLATINUM_OV104_0222ECE8_H diff --git a/include/overlay114/comm_command_minigame.h b/include/overlay114/comm_command_minigame.h new file mode 100644 index 00000000000..5f0497b7611 --- /dev/null +++ b/include/overlay114/comm_command_minigame.h @@ -0,0 +1,9 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_MINIGAME_H +#define POKEPLATINUM_COMM_COMMAND_MINIGAME_H + +#include "struct_defs/comm_cmd_table.h" + +const CommCmdTable *COMM_COMMAND_MINIGAME(void); +int ov114_02260040(void); + +#endif // POKEPLATINUM_COMM_COMMAND_MINIGAME_H diff --git a/include/overlay114/ov114_02260038.h b/include/overlay114/ov114_02260038.h deleted file mode 100644 index 75950ac6a8e..00000000000 --- a/include/overlay114/ov114_02260038.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_OV114_02260038_H -#define POKEPLATINUM_OV114_02260038_H - -#include "struct_defs/comm_cmd_table.h" - -const CommCmdTable *ov114_02260038(void); -int ov114_02260040(void); - -#endif // POKEPLATINUM_OV114_02260038_H diff --git a/include/overlay114/ov114_02260044.h b/include/overlay114/ov114_02260044.h index 234c4275018..efa75c0b397 100644 --- a/include/overlay114/ov114_02260044.h +++ b/include/overlay114/ov114_02260044.h @@ -8,10 +8,10 @@ void ov114_02260044(UnkStruct_ov114_0225E854 *param0); void ov114_02260060(UnkStruct_ov114_0225D678 *param0); int ov114_0226007C(void); int ov114_02260080(void); -void ov114_02260084(int param0, int param1, void *param2, void *param3); -void ov114_02260090(int param0, int param1, void *param2, void *param3); -void ov114_022600A0(int param0, int param1, void *param2, void *param3); -void ov114_022600B0(int param0, int param1, void *param2, void *param3); -void ov114_022600BC(int param0, int param1, void *param2, void *param3); +void CommCmd_Minigame_26(int param0, int param1, void *param2, void *param3); +void CommCmd_Minigame_22(int param0, int param1, void *param2, void *param3); +void CommCmd_Minigame_23(int param0, int param1, void *param2, void *param3); +void CommCmd_Minigame_24(int param0, int param1, void *param2, void *param3); +void CommCmd_Minigame_25(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV114_02260044_H diff --git a/include/overlay115/comm_command_swalot_plop.h b/include/overlay115/comm_command_swalot_plop.h new file mode 100644 index 00000000000..5f70ddc495a --- /dev/null +++ b/include/overlay115/comm_command_swalot_plop.h @@ -0,0 +1,9 @@ +#ifndef POKEPLATINUM_COMM_COMMAND_SWALOT_PLOP_H +#define POKEPLATINUM_COMM_COMMAND_SWALOT_PLOP_H + +#include "struct_defs/comm_cmd_table.h" + +const CommCmdTable *ov115_02265A18(void); +int ov115_02265A20(void); + +#endif // POKEPLATINUM_COMM_COMMAND_SWALOT_PLOP_H diff --git a/include/overlay115/ov115_02265A18.h b/include/overlay115/ov115_02265A18.h deleted file mode 100644 index 30a67b9a226..00000000000 --- a/include/overlay115/ov115_02265A18.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_OV115_02265A18_H -#define POKEPLATINUM_OV115_02265A18_H - -#include "struct_defs/comm_cmd_table.h" - -const CommCmdTable *ov115_02265A18(void); -int ov115_02265A20(void); - -#endif // POKEPLATINUM_OV115_02265A18_H diff --git a/include/overlay115/ov115_02265A24.h b/include/overlay115/ov115_02265A24.h index 4b0d29705d4..6f57099177d 100644 --- a/include/overlay115/ov115_02265A24.h +++ b/include/overlay115/ov115_02265A24.h @@ -5,14 +5,14 @@ void ov115_02265A24(UnkStruct_ov115_0226095C *param0); int ov115_02265A40(void); -void ov115_02265A44(int param0, int param1, void *param2, void *param3); -void ov115_02265A50(int param0, int param1, void *param2, void *param3); -void ov115_02265A5C(int param0, int param1, void *param2, void *param3); -void ov115_02265A84(int param0, int param1, void *param2, void *param3); -void ov115_02265A94(int param0, int param1, void *param2, void *param3); -void ov115_02265AA4(int param0, int param1, void *param2, void *param3); -void ov115_02265AB4(int param0, int param1, void *param2, void *param3); -void ov115_02265AC0(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_22(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlot_23(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_24(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_25(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_26(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_28(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_29(int param0, int param1, void *param2, void *param3); +void CommCmd_SwalotPlop_27(int param0, int param1, void *param2, void *param3); int ov115_02265AD0(void); int ov115_02265AD4(void); int ov115_02265AD8(void); diff --git a/include/overlay116/ov116_02260440.h b/include/overlay116/comm_command_mime_jr_top.h similarity index 59% rename from include/overlay116/ov116_02260440.h rename to include/overlay116/comm_command_mime_jr_top.h index 42000406a85..3b98df92adf 100644 --- a/include/overlay116/ov116_02260440.h +++ b/include/overlay116/comm_command_mime_jr_top.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_OV116_02260440_H -#define POKEPLATINUM_OV116_02260440_H +#ifndef POKEPLATINUM_COMM_COMMAND_MINE_JR_TOP_H +#define POKEPLATINUM_COMM_COMMAND_MINE_JR_TOP_H #include "struct_defs/comm_cmd_table.h" @@ -9,4 +9,4 @@ const CommCmdTable *ov116_0226049C(void); int ov116_022604A4(void); void ov116_022604A8(UnkStruct_ov116_0226139C *param0); -#endif // POKEPLATINUM_OV116_02260440_H +#endif // POKEPLATINUM_COMM_COMMAND_MINE_JR_TOP_H diff --git a/include/overlay117/ov117_022665FC.h b/include/overlay117/comm_command_wobbuffet_pop.h similarity index 68% rename from include/overlay117/ov117_022665FC.h rename to include/overlay117/comm_command_wobbuffet_pop.h index 4e3c63ec123..3ba87235138 100644 --- a/include/overlay117/ov117_022665FC.h +++ b/include/overlay117/comm_command_wobbuffet_pop.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_OV117_022665FC_H -#define POKEPLATINUM_OV117_022665FC_H +#ifndef POKEPLATINUM_COMM_COMMAND_WOBBUFFET_POP_H +#define POKEPLATINUM_COMM_COMMAND_WOBBUFFET_POP_H #include "overlay117/struct_ov117_02261280_decl.h" #include "overlay117/struct_ov117_022621D4.h" @@ -9,4 +9,4 @@ BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 * BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0); BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0); -#endif // POKEPLATINUM_OV117_022665FC_H +#endif // POKEPLATINUM_COMM_COMMAND_WOBBUFFET_POP_H diff --git a/include/struct_defs/comm_cmd_table.h b/include/struct_defs/comm_cmd_table.h index 490c561d314..e3aecd611cd 100644 --- a/include/struct_defs/comm_cmd_table.h +++ b/include/struct_defs/comm_cmd_table.h @@ -6,9 +6,9 @@ #include "functypes/funcptr_020F8E60.h" typedef struct CommCmdTable { - UnkFuncPtr_020F8E60 unk_00; - UnkFuncPtr_02032868 unk_04; - UnkFuncPtr_0203290C unk_08; + CommCmdRecvFunc recvFunc; // Receive communication function + CommCmdSizeFunc sizeFunc; // Size function + CommCmdBuffFunc buffFunc; // Buffer creation function, usually NULL } CommCmdTable; #endif // POKEPLATINUM_STRUCT_DEF_COMM_CMD_TABLE_H diff --git a/include/underground/manager.h b/include/underground/manager.h index ef9406d5f4d..08858cdcdfb 100644 --- a/include/underground/manager.h +++ b/include/underground/manager.h @@ -81,9 +81,9 @@ BOOL UndergroundMan_FormatCommonStringWith2TrainerNames(TrainerInfo *trainerInfo BOOL UndergroundMan_FormatCommonStringWithTrainerName(TrainerInfo *trainerInfo, int index, int bankEntry, String *dest); BOOL UndergroundMan_AreCoordinatesOccupied(int x, int z); BOOL UndergroundMan_CheckForTouchInput(void); -void UndergroundMan_ProcessTouchInput(int netID, int unused1, void *data, void *unused3); -void UndergroundMan_ProcessTouchRadarTrapResults(int unused0, int size, void *data, void *unused3); -void UndergroundMan_ProcessTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3); +void CommCmd_UndergroundTouchInput(int netID, int unused1, void *data, void *unused3); +void CommCmd_UndergroundTouchRadarTrapResults(int unused0, int size, void *data, void *unused3); +void CommCmd_UndergroundTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3); int UndergroundMan_CalcCoordsIndexGet(CoordinatesU16 *coordinates); int UndergroundMan_CalcCoordsIndexInsert(CoordinatesU16 *coordinates); void UndergroundMan_InitCoordsOrderingState(int orderedArrayLength, GetCoordinatesFunc getCoordsFunc); @@ -91,7 +91,7 @@ void UndergroundMan_OpenMenu(void); void UndergroundMan_ProgressInteractCooldown(void); void UndergroundMan_ProcessInteract(u8 flags); int CommPacketSizeOf_InteractEvent(void); -void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, void *unused3); +void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *unused3); void UndergroundMan_Process(void); void UndergroundMan_InitAllResources(FieldSystem *fieldSystem); void UndergroundMan_PauseResources(void); @@ -119,14 +119,14 @@ void UndergroundMan_SetStoredPosKey(u16 menuKey); void UndergroundMan_StoreCursorAndListPos(u16 menuKey, u16 cursorPos, u16 listPos); u16 UndergroundMan_GetStoredListPos(u16 menuKey); u16 UndergroundMan_GetStoredCursorPos(u16 menuKey); -void UndergroundMan_ProcessVendorTalkRequest(int unused0, int unused1, void *data, void *unused3); +void CommCmd_VendorTalkRequest(int unused0, int unused1, void *data, void *unused3); void UndergroundMan_SetCurrentSysTask(void *ctx, SysTask *sysTask, EndSysTaskFunc endFunc); void UndergroundMan_ClearCurrentSysTaskInfo(void); BOOL UndergroundMan_ForceEndCurrentSysTask(void); BOOL UndergroundMan_ShouldFieldSystemBeResumed(int netID); void UndergroundMan_SendPlayerState(void); -void UndergroundMan_ProcessPlayerState(int netID, int unused1, void *data, void *unused3); +void CommCmd_UndergroundPlayerState(int netID, int unused1, void *data, void *unused3); int CommPacketSizeOf_UndergroundPlayerState(void); -void UndergroundMan_ProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_UndergroundProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3); #endif // POKEPLATINUM_UNDERGROUND_MANAGER_H diff --git a/include/underground/mining.h b/include/underground/mining.h index c85e794f5bb..1eb1c46ccff 100644 --- a/include/underground/mining.h +++ b/include/underground/mining.h @@ -17,13 +17,13 @@ void MiningEnv_Free(void); BOOL Mining_CheckForMiningSpotInteract(int netID, CoordinatesU16 *coordinates); void Mining_SpawnMiningSpotNearBuriedSphere(int buriedSphereX, int buriedSphereZ, MATHRandContext16 *rand); void Mining_SendRadarResults(void); -void Mining_ProcessMiningSpotInteract(int unused0, int unused1, void *data, void *unused3); -void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3); -void Mining_ProcessStartMiningConfirm(int unused0, int unused1, void *data, void *unused3); -void Mining_ProcessMiningGameEnd(int netID, int unused1, void *unused2, void *unused3); -void Mining_ProcessLinkInput(int netID, int unused1, void *data, void *unused3); +void CommCmd_InteractMiningSpot(int unused0, int unused1, void *data, void *unused3); +void CommCmd_ConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3); +void CommCmd_ConfirmStartMining(int unused0, int unused1, void *data, void *unused3); +void CommCmd_RecvMiningGameEnd(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_MiningLinkInput(int netID, int unused1, void *data, void *unused3); int CommPacketSizeOf_MiningLinkInput(void); -void Mining_ProcessLinkInputServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_MiningLinkInputServer(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_MiningLinkInputWithNetID(void); BOOL Mining_IsMiningSpotAtCoordinates(int x, int z); int NormalRadar_GetXCoordOfMiningSpot(int radarIndex); @@ -32,8 +32,8 @@ int TreasureRadar_GetXCoordOfMiningSpot(int radarIndex); int TreasureRadar_GetZCoordOfMiningSpot(int radarIndex); void TreasureRadar_Start(void); void TreasureRadar_Exit(void); -void Mining_ProcessTreasureRadarStart(int netID, int unused1, void *unused2, void *unused3); -void Mining_ProcessMiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3); +void CommCmd_StartTreasureRadar(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_MiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_MiningSpotRadarResult(void); BOOL Mining_GetQueuedMessage(String *dest); void Mining_ClearMessageQueue(void); diff --git a/include/underground/pc.h b/include/underground/pc.h index 35b0e883005..08445777e0a 100644 --- a/include/underground/pc.h +++ b/include/underground/pc.h @@ -8,9 +8,9 @@ int UndergroundPC_GetPCOwnerNetIDAtCoordinates(CoordinatesU16 *coordinates, int dir); BOOL UndergroundPC_TryUsePC(int netID, CoordinatesU16 *coordinates); -void UndergroundPC_ProcessPCInteraction(int unused0, int unused1, void *data, void *data2); +void CommCmd_IntreactUndergroundPC(int unused0, int unused1, void *data, void *data2); int CommPacketSizeOf_PCInteraction(void); -void UndergroundPC_ProcessTakeFlagAttempt(int unused0, int unused1, void *data, void *unused3); -void UndergroundPC_ProcessTakenFlag(int unused0, int unused1, void *data, void *unused3); +void CommCmd_AttemptUndergroundTakeFlag(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundTakenFlag(int unused0, int unused1, void *data, void *unused3); #endif // POKEPLATINUM_UNDERGROUND_PC_H diff --git a/include/underground/player.h b/include/underground/player.h index 281f97def27..57bb1bcb53d 100644 --- a/include/underground/player.h +++ b/include/underground/player.h @@ -22,27 +22,27 @@ enum FlagEventType { }; void UndergroundPlayer_DeleteAllPlayers(void); -void UndergroundPlayer_ProcessOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3); -void UndergroundPlayer_ProcessOpenMenuEvent(int unused0, int unused1, void *data, void *unused3); -void UndergroundPlayer_ProcessTalkEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_UndergroundOpenMenuEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundTalkEvent(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_FlagEvent(void); -void UndergroundPlayer_ProcessFlagEventType(int netID, int unused1, void *data, void *unused3); +void CommCmd_UndergroundFlagEventType(int netID, int unused1, void *data, void *unused3); BOOL UndergroundPlayer_TalkHeldFlagCheck(int netID, int targetNetID, BOOL blockInteraction); BOOL UndergroundPlayer_BuriedObjectHeldFlagCheck(int netID); -void UndergroundPlayer_ProcessFlagEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundFlagEvent(int unused0, int unused1, void *data, void *unused3); void UndergroundPlayer_ClearHeldFlagInfo(void); u8 *UndergroundPlayer_GetHeldFlagInfoBuffer(int unused0, void *unused1, int unused2); void UndergroundPlayer_SendHeldFlagOwnerInfo(void); int CommPacketSizeOf_TrainerInfo(void); -void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3); -void UndergroundPlayer_ProcessHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3); +void CommCmd_UndergroundHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_HeldFlagInfo(void); -void UndergroundPlayer_ProcessHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3); BOOL UndergroundPlayer_HaveLinksReceivedHeldFlagData(void); void UndergroundPlayer_ResetHeldFlagInfo(void); BOOL UndergroundPlayer_IsAffectedByTrap(int netID); -void UndergroundPlayer_ProcessVendorTalk(int netID, int unused1, void *unused2, void *unused3); -void UndergroundPlayer_ProcessVendorTalkServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundVendorTalk(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_UndergroundVendorTalkServer(int unused0, int unused1, void *data, void *unused3); int UndergroundPlayer_GetXPos(int netID); int UndergroundPlayer_GetZPos(int netID); void UndergroundPlayer_UpdateStatus(int netID, int status); diff --git a/include/underground/player_talk.h b/include/underground/player_talk.h index d25198c1a26..516f5c7fa0b 100644 --- a/include/underground/player_talk.h +++ b/include/underground/player_talk.h @@ -7,16 +7,16 @@ typedef void (*ExitCallback)(int); void UndergroundTalk_Start(int linkNetID, ExitCallback exitCallback, FieldSystem *fieldSystem); void UndergroundTalkResponse_Start(int unused, int linkNetID, FieldSystem *fieldSystem); -void UndergroundTalk_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3); -void UndergroundTalkResponse_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3); -void UndergroundTalkResponse_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3); -void UndergroundTalk_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3); +void CommCmd_RequestUndergroundTalkStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundTalkResponseStateUpdateServer(int unused0, int size, void *data, void *unused3); +void CommCmd_UndergroundTalkStateUpdateServer(int unused0, int size, void *data, void *unused3); int CommPacketSizeOf_TalkStateChangeRequest(void); -void UndergroundTalk_SendGiftServer(int unused0, int unused1, void *data, void *unused3); -void UndergroundTalkResponse_ReceiveGiftOffer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundSendGiftServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundRecvGiftOffer(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_Gift(void); -void UndergroundTalk_SendTalkMessageServer(int unused0, int unused1, void *data, void *unused3); -void UndergroundTalk_ReceiveTalkMessage(int unused0, int unused1, void *data, void *unused3); +void CommCmd_SendUndergroundTalkMessageServer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_RecvUndergroundTalkMessage(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_TalkMessage(void); void UndergroundTalk_ExitConversation(void); diff --git a/include/underground/records.h b/include/underground/records.h index a717746308b..53687add9d3 100644 --- a/include/underground/records.h +++ b/include/underground/records.h @@ -23,8 +23,8 @@ int RecordsEnv_Size(void); void UndergroundRecords_ShowTrainerCase(BgConfig *bgConfig, TrainerInfo *trainerInfo, ExitRecordScreenCallback exitCallback, void *exitCallbackArg, BOOL isCurrentTrainer); void UndergroundRecords_SendRecord(int targetNetID); void UndergroundRecords_RetrieveTrainerScore(void); -void UndergroundRecords_SendRecordServer(int unused0, int size, void *data, void *unused3); -void UndergroundRecords_ProcessLinkRecord(int unused0, int size, void *data, void *unused3); +void CommCmd_SendUndergroundRecordServer(int unused0, int size, void *data, void *unused3); +void CommCmd_UndergroundRecord(int unused0, int size, void *data, void *unused3); BOOL UndergroundRecords_IsLinkRecordReceived(void); void UndergroundRecords_ClearLinkRecordReceived(void); void UndergroundRecords_PrintEntryForDecoration(UndergroundRecord *undergroundRecord, int bankEntry); diff --git a/include/underground/secret_bases.h b/include/underground/secret_bases.h index ce90c1a051e..7a02bbe08e4 100644 --- a/include/underground/secret_bases.h +++ b/include/underground/secret_bases.h @@ -32,30 +32,30 @@ void SecretBases_ClearAllBaseInfo(void); int SecretBasesEnv_Size(void); void SecretBases_ClearBaseEntranceData(int netID); void SecretBases_RemoveEntrance(int netID); -void SecretBases_ProcessBaseTransitionPromptEvent(int unused0, int unused1, void *data, void *unused3); -void SecretBases_ProcessFailedBaseEnter(int unused0, int unused1, void *data, void *unused3); +void CommCmd_SecretBaseTransitionPrompt(int unused0, int unused1, void *data, void *unused3); +void CommCmd_FailedSecretBaseEnter(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_BaseTransitionPromptEvent(void); -void SecretBases_ProcessBaseTransitionEvent(int netID, int unused1, void *data, void *unused3); +void CommCmd_SecretBaseTransitionEvent(int netID, int unused1, void *data, void *unused3); int CommPacketSizeOf_BaseTransitionEvent(void); BOOL SecretBases_CheckForEnterExit(int netID, int x, int z); int CommPacketSizeOf_BaseExitEvent(void); -void SecretBases_ProcessBaseExitEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3); void SecretBases_RequestClearTransitioningStatus(void); -void SecretBases_ClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_ClearSecretBaseTransitioningStatus(int netID, int unused1, void *unused2, void *unused3); BOOL SecretBases_IsPlayerMidBaseTransition(int netID); void SecretBases_SendBaseInfo(void); void SecretBases_SendEnteredBase(int baseOwnerNetID); -void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *unused3); -void SecretBases_ProcessBaseInfo(int netID, int unused1, void *data, void *unused3); +void CommCmd_RecvSecretBaseEnter(int unused0, int unused1, void *data, void *unused3); +void CommCmd_SecretBaseInfo(int netID, int unused1, void *data, void *unused3); int CommPacketSizeOf_SecretBaseInfo(void); BOOL SecretBases_HaveLinksReceivedBaseData(void); void SecretBases_ClearLinksReceivedBaseData(void); -void SecretBases_ProcessBaseEntrancesBuffer(int unused0, int unused1, void *data, void *unused3); +void CommCmd_SecretBaseEntranceBuffer(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_BaseEntrancesBuffer(void); void SecretBases_UseDiggerDrill(void); int CommPacketSizeOf_SecretBaseCreateEvent(void); -void SecretBases_ProcessBaseCreateRequest(int netID, int unused1, void *data, void *unused3); -void SecretBases_ProcessBaseCreateEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_CreateSecretBaseRequest(int netID, int unused1, void *data, void *unused3); +void CommCmd_CreateSecretBaseEvent(int unused0, int unused1, void *data, void *unused3); BOOL SecretBases_GetQueuedMessage(String *dest); SecretBase *SecretBases_GetCurrentOccupiedBase(SaveData *saveData); int SecretBases_GetBaseXCoordinate(void); @@ -66,13 +66,13 @@ void SecretBases_EraseBaseDecorationMessageBox(void); void SecretBases_SetGoodNameForPrinter(enum Good goodID); void SecretBases_SetTwoDigitNumberWithIndexForPrinter(int num, int index); BOOL SecretBases_CheckForInteractableGood(int netID, CoordinatesU16 *coordinates); -void SecretBases_ProcessGoodInteractionEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_SecretBaseGoodInteraction(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_GoodInteractionEvent(void); void SecretBases_QueueObtainedFlagMessage(int netID, int flagOwnerNetID); void SecretBases_QueueTookFlagMessage(int netID, int victimNetID); void SecretBases_QueueTookBackFlagMessage(int netID); -void SecretBases_ProcessFlagRankUp(int netID, int unused1, void *data, void *unused3); -void SecretBases_ProcessFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3); +void CommCmd_UndergroundFlagRankUp(int netID, int unused1, void *data, void *unused3); +void CommCmd_UndergroundFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_FlagRankUpEvent(void); BOOL SecretBases_CheckPlayerTriggeredTool(int netID); BOOL SecretBases_ClearToolEffectFlag(int netID); diff --git a/include/underground/spheres.h b/include/underground/spheres.h index c3361276784..3e346c0ad65 100644 --- a/include/underground/spheres.h +++ b/include/underground/spheres.h @@ -21,7 +21,7 @@ void Spheres_DisableBuriedSphereSparkles(void); void Spheres_EnableBuriedSphereSparkles(void); void SpheresEnv_Free(void); void Spheres_AdvanceBuriedSphereSparkleTimer(void); -void Spheres_ProcessRetrieveBuriedSphereRequest(int unused, int unused2, void *src, void *unused3); +void CommCmd_RetrieveBuriedSpheresRequest(int unused, int unused2, void *src, void *unused3); void TouchRadarSearch_Init(TouchRadarSearchContext *ctx, int radius); BOOL TouchRadarSearch_GetNextCoords(TouchRadarSearchContext *ctx, CoordinatesS16 *out); void Spheres_TryBurySphere(enum SphereType sphereType, int sphereSize, int x, int z); diff --git a/include/underground/traps.h b/include/underground/traps.h index 8c4b98f68b2..0d8bf3b2e36 100644 --- a/include/underground/traps.h +++ b/include/underground/traps.h @@ -23,49 +23,49 @@ int CommPacketSizeOf_AllTrapsPlacedPlayer(void); void Underground_SendPlacedTrap(u8 trapID); void Traps_SendTrapRadarResults(void); void Traps_SendPlacedTraps(void); -void Traps_TryPlaceTrap(int netID, int unused1, void *data, void *unused3); +void CommCmd_TryPlaceTrap(int netID, int unused1, void *data, void *unused3); int CommPacketSizeOf_PlaceTrapResult(void); enum Trap Traps_SpawnRandomTrap(int x, int z, MATHRandContext16 *rand, int index); void Traps_LoadSpawnedTraps(void); -void Traps_ProcessPlaceTrapResult(int unused0, int unused1, void *data, void *unused3); -void Traps_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3); +void CommCmd_PlaceTrapResult(int unused0, int unused1, void *data, void *unused3); +void CommCmd_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_2Bytes_Unused(void); -void Traps_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3); -void Traps_ReceiveLoadTrapsResult(int unused0, int unused1, void *data, void *unused3); +void CommCmd_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3); +void CommCmd_RecvLoadTraps(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_LoadTrapsResult(void); BOOL Traps_HaveLinksReceivedPlacedTraps(void); void Traps_ClearLinksReceivedPlacedTraps(void); int CommPacketSizeOf_CoordinatesU16(void); BOOL Traps_TryDisengageTrap(int netID, CoordinatesU16 *unused, u8 flags); int CommPacketSizeOf_TriggeredTrap(void); -void Traps_ProcessDisengagedTrap(int unused0, int unused1, void *data, void *unused3); +void CommCmd_DisengagedTrap(int unused0, int unused1, void *data, void *unused3); BOOL Traps_IsTrapAtCoordinates(int x, int z); int CommPacketSizeOf_TriggeredTrap2(void); void Traps_HandleTriggeredTool(int victimNetID, int setterNetID, enum Trap trapID, int x, int z, int victimDir); BOOL Traps_CheckPlayerSteppedOnTrap(int netID); BOOL Traps_HasPlayerTriggeredTool(int netID); -void Traps_HandleTriggeredTrap(int unused0, int unused1, void *data, void *unused3); -void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3); -void Traps_StartLinkSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3); +void CommCmd_TriggeredTraps(int unused0, int unused1, void *data, void *unused3); +void CommCmd_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3); +void CommCmd_StartSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3); void Traps_SendTriggeredTrapBits(void); -void Traps_ProcessTriggeredTrapBits(int unused0, int unused1, void *data, void *unused3); +void CommCmd_TriggeredTrapBits(int unused0, int unused1, void *data, void *unused3); BOOL Traps_GetQueuedMessage(String *dest); BOOL Traps_GetQueuedMessage2(String *dest); void Traps_ForceEndCurrentTrapEffectClient(int netID, BOOL allowToolStepBack); int CommPacketSizeOf_EscapedTrap(void); -void Traps_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3); -void Traps_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3); -void Traps_ProcessEscapedTrap(int unused0, int unused1, void *data, void *unused3); -void Traps_EscapeHole(int unused0, int unused1, void *data, void *unused3); +void CommCmd_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_EscapedTrap(int unused0, int unused1, void *data, void *unused3); +void CommCmd_EscapeHole(int unused0, int unused1, void *data, void *unused3); void Traps_HelpLink(int netID, int linkNetID); -void Traps_ProcessTrapHelp(int unused0, int unused1, void *data, void *unused3); +void CommCmd_TrapHelp(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_TrapHelpData(void); int TrapRadar_GetXCoordOfBuriedTrap(int radarIndex); int TrapRadar_GetZCoordOfBuriedTrap(int radarIndex); void TrapRadar_Start(void); void TrapRadar_Exit(void); -void Traps_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3); -void Traps_ReceiveTrapRadarResults(int unused0, int unused1, void *data, void *unused3); +void CommCmd_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3); +void CommCmd_RecvTrapRadarResults(int unused0, int unused1, void *data, void *unused3); int CommPacketSizeOf_TrapRadarResult(void); void Traps_Dummy2(BgConfig *bgConfig); void TouchRadar_StartTask(FieldSystem *fieldSystem, int touchedTileX, int touchedTileZ, int touchX, int touchY, u8 *trapResults, int trapResultCount, u8 *miningSpotResults, int miningSpotResultCount, u8 *buriedSphereResults, int buriedSphereResultCount); diff --git a/include/unk_02032798.h b/include/unk_02032798.h deleted file mode 100644 index fc0750726a9..00000000000 --- a/include/unk_02032798.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02032798_H -#define POKEPLATINUM_UNK_02032798_H - -#include "struct_defs/comm_cmd_table.h" - -void CommCmd_Init(const CommCmdTable *param0, int param1, void *param2); -void sub_020327E0(void); -void CommCmd_Callback(int param0, int param1, int param2, void *param3); -int CommCmd_PacketSizeOf(int param0); -BOOL sub_020328D0(int param0); -void *sub_0203290C(int param0, int param1, int param2); -int CommPacketSizeOf_Variable(void); -int CommPacketSizeOf_Nothing(void); -int CommPacketSizeOf_NetId(void); - -#endif // POKEPLATINUM_UNK_02032798_H diff --git a/include/unk_020363E8.h b/include/unk_020363E8.h index 0abd80d6f66..a88d70df933 100644 --- a/include/unk_020363E8.h +++ b/include/unk_020363E8.h @@ -13,7 +13,7 @@ void CommTiming_StartSync(u8 syncNo); void sub_0203650C(void); BOOL CommTiming_IsSyncState(u8 syncState); int CommTool_GetSyncNo(int netId); -void sub_02036574(int param0, int param1, void *param2, void *param3); +void CommCmd_19(int param0, int param1, void *param2, void *param3); int sub_02036590(void); void sub_02036594(u8 param0, u8 param1); int CommList_Get(int param0, u8 param1); @@ -21,7 +21,7 @@ void CommList_Refresh(void); void CommTool_ClearReceivedTempDataAllPlayers(void); BOOL sub_02036614(int param0, const void *param1); const void *sub_0203664C(int param0); -void sub_02036670(int param0, int param1, void *param2, void *param3); +void CommCmd_20(int param0, int param1, void *param2, void *param3); int CommTool_TempDataSize(void); #endif // POKEPLATINUM_UNK_020363E8_H diff --git a/include/unk_02039A58.h b/include/unk_02039A58.h deleted file mode 100644 index 8db5ad4b16a..00000000000 --- a/include/unk_02039A58.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02039A58_H -#define POKEPLATINUM_UNK_02039A58_H - -#include "struct_defs/comm_cmd_table.h" - -const CommCmdTable *sub_02039A58(void); -int sub_02039A60(void); - -#endif // POKEPLATINUM_UNK_02039A58_H diff --git a/include/unk_0204FA34.h b/include/unk_0204FA34.h index 4210e94e487..afe30da7009 100644 --- a/include/unk_0204FA34.h +++ b/include/unk_0204FA34.h @@ -14,7 +14,7 @@ typedef struct BattleHallSameSpeciesCheck { u16 *speciesAreDifferent; } BattleHallSameSpeciesCheck; -void BattleHall_ProcessSelectedSpeciesMsg(int netID, int unused, void *data, void *context); +void CommCmd_BattleHallSelectedSpeciesMsg(int netID, int unused, void *data, void *context); void sub_0204FA50(SaveData *saveData, BattleHallStreakFlags *param1, u8 param2); #endif // POKEPLATINUM_UNK_0204FA34_H diff --git a/include/unk_0205001C.h b/include/unk_0205001C.h index 4ef72facf01..3f0dcec6b25 100644 --- a/include/unk_0205001C.h +++ b/include/unk_0205001C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_UNK_0205001C_H #define POKEPLATINUM_UNK_0205001C_H -void sub_0205001C(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_133(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_0205001C_H diff --git a/include/unk_02050548.h b/include/unk_02050548.h index dc18e264fe0..d398f8b9b4f 100644 --- a/include/unk_02050548.h +++ b/include/unk_02050548.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_UNK_02050548_H #define POKEPLATINUM_UNK_02050548_H -void sub_02050548(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_134(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_02050548_H diff --git a/include/unk_0205A0D8.h b/include/unk_0205A0D8.h index 2ce81515f84..8c426f1214e 100644 --- a/include/unk_0205A0D8.h +++ b/include/unk_0205A0D8.h @@ -5,10 +5,10 @@ #include "functypes/funcptr_0205AB10.h" void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1); -void sub_0205B0C0(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_106(int param0, int param1, void *param2, void *param3); int sub_0205B0E4(void); u8 *sub_0205B0F4(int param0, void *param1, int param2); -void sub_0205B110(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_107(int param0, int param1, void *param2, void *param3); void sub_0205B2D4(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_0205A0D8_H diff --git a/include/unk_0205B33C.h b/include/unk_0205B33C.h index c57c65172f7..48259930fa4 100644 --- a/include/unk_0205B33C.h +++ b/include/unk_0205B33C.h @@ -24,17 +24,17 @@ u32 sub_0205B8D8(UnkStruct_0205B43C *param0); u32 sub_0205B8DC(UnkStruct_0205B43C *param0); u32 sub_0205B91C(UnkStruct_0205B43C *param0); void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2); -void sub_0205B988(int param0, int param1, void *param2, void *param3); -void sub_0205B98C(int param0, int param1, void *param2, void *param3); -void sub_0205B990(int param0, int param1, void *param2, void *param3); -void sub_0205B9AC(int param0, int param1, void *param2, void *param3); -void sub_0205B9C4(int param0, int param1, void *param2, void *param3); -void sub_0205B9E0(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_98(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_100(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_102(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_99(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_103(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_104(int param0, int param1, void *param2, void *param3); int sub_0205B9E8(UnkStruct_0205B43C *param0); int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1); -void sub_0205BA08(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_105(int param0, int param1, void *param2, void *param3); u8 *sub_0205BA5C(int param0, void *param1, int param2); -void sub_0205BA6C(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_101(int param0, int param1, void *param2, void *param3); u16 sub_0205BA7C(UnkStruct_0205B43C *param0); void sub_0205BAAC(int param0); int UnionRoom_GetTrainerCasePlayerMessage(StringTemplate *strTemplate); diff --git a/include/unk_02095CD4.h b/include/unk_02095CD4.h deleted file mode 100644 index 83e6a9914c0..00000000000 --- a/include/unk_02095CD4.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02095CD4_H -#define POKEPLATINUM_UNK_02095CD4_H - -#include "struct_decls/struct_02095E80_decl.h" - -#include "field/field_system_decl.h" - -void sub_02095CD4(void *param0); -void sub_02095CFC(int param0, int param1, void *param2, void *param3); -void sub_02095D74(int param0, int param1, void *param2, void *param3); -void sub_02095D94(int param0, int param1, void *param2, void *param3); -void sub_02095DA4(int param0, int param1, void *param2, void *param3); -void sub_02095DA8(int param0, int param1, void *param2, void *param3); -void sub_02095DAC(int param0, int param1, void *param2, void *param3); -void sub_02095DB8(int param0, int param1, void *param2, void *param3); -void sub_02095DFC(int param0, int param1, void *param2, void *param3); -void sub_02095E60(FieldSystem *fieldSystem, UnkStruct_02095E80 *param1); - -#endif // POKEPLATINUM_UNK_02095CD4_H diff --git a/include/unk_02095E98.h b/include/unk_02095E98.h deleted file mode 100644 index 37c34667199..00000000000 --- a/include/unk_02095E98.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02095E98_H -#define POKEPLATINUM_UNK_02095E98_H - -void sub_02095E98(void *param0); -void sub_02095EAC(int param0, int param1, void *param2, void *param3); -void sub_02095F40(int param0, int param1, void *param2, void *param3); -void sub_02095F68(int param0, int param1, void *param2, void *param3); -void sub_02095F9C(int param0, int param1, void *param2, void *param3); -void sub_02095FE4(int param0, int param1, void *param2, void *param3); -void sub_020960D4(int param0, int param1, void *param2, void *param3); -void sub_020960D8(int param0, int param1, void *param2, void *param3); -void sub_0209610C(int param0, int param1, void *param2, void *param3); -void sub_02096110(int param0, int param1, void *param2, void *param3); -void sub_02096114(int param0, int param1, void *param2, void *param3); -void sub_0209612C(int param0, int param1, void *param2, void *param3); - -#endif // POKEPLATINUM_UNK_02095E98_H diff --git a/include/unk_020961E8.h b/include/unk_020961E8.h deleted file mode 100644 index 8e1d856d025..00000000000 --- a/include/unk_020961E8.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef POKEPLATINUM_UNK_020961E8_H -#define POKEPLATINUM_UNK_020961E8_H - -void sub_020961E8(void *param0); -void sub_0209621C(int param0, int param1, void *param2, void *param3); -void sub_02096264(int param0, int param1, void *param2, void *param3); -void sub_02096274(int param0, int param1, void *param2, void *param3); -void sub_02096360(int param0, int param1, void *param2, void *param3); -void sub_02096380(int param0, int param1, void *param2, void *param3); -void sub_02096384(int param0, int param1, void *param2, void *param3); -void sub_02096388(int param0, int param1, void *param2, void *param3); -void sub_020963A0(int param0, int param1, void *param2, void *param3); - -#endif // POKEPLATINUM_UNK_020961E8_H diff --git a/include/unk_02099500.h b/include/unk_02099500.h deleted file mode 100644 index c9ce90b9fd0..00000000000 --- a/include/unk_02099500.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02099500_H -#define POKEPLATINUM_UNK_02099500_H - -void sub_02099510(int param0, int param1, void *param2, void *param3); -void CommFieldCmd_Init(void *param0); -int sub_02099530(void); -int sub_02099538(void); -int sub_02099540(void); -int sub_02099544(void); - -#endif // POKEPLATINUM_UNK_02099500_H diff --git a/include/unk_0209C390.h b/include/unk_0209C390.h index 1e9d8b6782b..fe6112e7c74 100644 --- a/include/unk_0209C390.h +++ b/include/unk_0209C390.h @@ -8,8 +8,8 @@ void sub_0209C3AC(void); int sub_0209C3C4(void); int sub_0209C3C8(void); int sub_0209C3CC(void); -void sub_0209C3D0(int param0, int param1, void *param2, void *param3); -void sub_0209C3E0(int param0, int param1, void *param2, void *param3); -void sub_0209C3F0(int param0, int param1, void *param2, void *param3); +void CommCmd_WaitingRoom_22(int param0, int param1, void *param2, void *param3); +void CommCmd_WaitingRoom_23(int param0, int param1, void *param2, void *param3); +void CommCmd_WaitingRoom_24(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_0209C390_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index b0eb9fb674c..cbc5d6bf805 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -155,7 +155,7 @@ Static main Object main.nef.p/src_comm_ring.c.o Object main.nef.p/src_unk_020322D8.c.o Object main.nef.p/src_unk_0203266C.c.o - Object main.nef.p/src_unk_02032798.c.o + Object main.nef.p/src_comm_command.c.o Object main.nef.p/src_communication_information.c.o Object main.nef.p/src_unk_02033200.c.o Object main.nef.p/src_communication_system.c.o @@ -167,7 +167,7 @@ Static main Object main.nef.p/src_unk_0203909C.c.o Object main.nef.p/src_network_icon.c.o Object main.nef.p/src_unk_02039814.c.o - Object main.nef.p/src_unk_02039A58.c.o + Object main.nef.p/src_comm_command_waiting_room.c.o Object main.nef.p/src_unk_02039A64.c.o Object main.nef.p/src_map_matrix.c.o Object main.nef.p/src_map_header.c.o @@ -295,7 +295,7 @@ Static main Object main.nef.p/src_dexmode_checker.c.o Object main.nef.p/src_height_weight_data.c.o Object main.nef.p/src_battle_regulation_validation.c.o - Object main.nef.p/src_unk_0207A6DC.c.o + Object main.nef.p/src_comm_command_battle.c.o Object main.nef.p/src_evolution.c.o Object main.nef.p/src_unk_0207C63C.c.o Object main.nef.p/src_type_icon.c.o @@ -328,10 +328,10 @@ Static main Object main.nef.p/src_unk_02092494.c.o Object main.nef.p/src_contest.c.o Object main.nef.p/src_unk_02094EDC.c.o - Object main.nef.p/src_unk_02095AF0.c.o - Object main.nef.p/src_unk_02095CD4.c.o - Object main.nef.p/src_unk_02095E98.c.o - Object main.nef.p/src_unk_020961E8.c.o + Object main.nef.p/src_comm_command_contest.c.o + Object main.nef.p/src_comm_command_trade.c.o + Object main.nef.p/src_comm_command_draw.c.o + Object main.nef.p/src_comm_command_record_corner.c.o Object main.nef.p/src_item_use_pokemon.c.o Object main.nef.p/src_unk_020972FC.c.o Object main.nef.p/src_berry_data.c.o @@ -346,7 +346,7 @@ Static main Object main.nef.p/src_rowan_intro_app_template.c.o Object main.nef.p/src_applications_poffin_case_main.c.o Object main.nef.p/src_poffin_sprite.c.o - Object main.nef.p/src_unk_02099500.c.o + Object main.nef.p/src_comm_command_field.c.o Object main.nef.p/src_wifi_overlays.c.o Object main.nef.p/src_unk_02099604.c.o Object main.nef.p/src_unk_020996D0.c.o @@ -364,8 +364,8 @@ Static main Object main.nef.p/src_error_message_reset.c.o Object main.nef.p/src_unk_0209B6F8.c.o Object main.nef.p/src_unk_0209BA18.c.o - Object main.nef.p/src_unk_0209BA80.c.o - Object main.nef.p/src_unk_0209BDF8.c.o + Object main.nef.p/src_comm_command_frontier.c.o + Object main.nef.p/src_comm_command_spin_trade.c.o Object main.nef.p/src_unk_0209C194.c.o Object main.nef.p/src_unk_0209C370.c.o Object main.nef.p/src_unk_0209C390.c.o @@ -1337,7 +1337,7 @@ Overlay overlay83 After overlay82 Object main.nef.p/src_overlay083_ov83_0223B5A0.c.o Object main.nef.p/src_overlay083_ov83_0223C958.c.o - Object main.nef.p/src_overlay083_ov83_0223D144.c.o + Object main.nef.p/src_overlay083_comm_command_poffin_cooking.c.o Object main.nef.p/src_overlay083_ov83_0223D150.c.o Object main.nef.p/src_overlay083_ov83_0223D4CC.c.o Object main.nef.p/src_overlay083_ov83_0223D6A8.c.o @@ -1454,7 +1454,7 @@ Overlay main_menu Object main.nef.p/src_main_menu_main_menu.c.o Object main.nef.p/src_main_menu_ranger_link.c.o Object main.nef.p/src_main_menu_ov97_0222D04C.c.o - Object main.nef.p/src_main_menu_ov97_0222D2F8.c.o + Object main.nef.p/src_main_menu_comm_command_mystery_gift.c.o Object main.nef.p/src_main_menu_mystery_gift_app.c.o Object main.nef.p/src_main_menu_wonder_cards_app.c.o Object main.nef.p/src_main_menu_ov97_02232054.c.o @@ -1653,7 +1653,7 @@ Overlay overlay114 { After overlay66 Object main.nef.p/src_overlay114_ov114_0225C700.c.o - Object main.nef.p/src_overlay114_ov114_02260038.c.o + Object main.nef.p/src_overlay114_comm_command_minigame.c.o Object main.nef.p/src_overlay114_ov114_02260044.c.o } @@ -1663,14 +1663,14 @@ Overlay overlay115 Object main.nef.p/src_overlay115_ov115_02260440.c.o Object main.nef.p/src_overlay115_ov115_02260BBC.c.o Object main.nef.p/src_overlay115_ov115_02260CEC.c.o - Object main.nef.p/src_overlay115_ov115_02265A18.c.o + Object main.nef.p/src_overlay115_comm_command_swalot_plop.c.o Object main.nef.p/src_overlay115_ov115_02265A24.c.o } Overlay overlay116 { After overlay114 - Object main.nef.p/src_overlay116_ov116_02260440.c.o + Object main.nef.p/src_overlay116_comm_command_mime_jr_top.c.o Object main.nef.p/src_overlay116_ov116_022604C4.c.o Object main.nef.p/src_overlay116_ov116_02261870.c.o Object main.nef.p/src_overlay116_ov116_02262A44.c.o @@ -1687,7 +1687,7 @@ Overlay overlay117 Object main.nef.p/src_overlay117_ov117_022626B0.c.o Object main.nef.p/src_overlay117_ov117_02263AF0.c.o Object main.nef.p/src_overlay117_ov117_02266498.c.o - Object main.nef.p/src_overlay117_ov117_022665FC.c.o + Object main.nef.p/src_overlay117_comm_command_wobbuffet_pop.c.o Object main.nef.p/src_overlay117_ov117_022666C0.c.o } diff --git a/src/applications/frontier/battle_arcade/main.c b/src/applications/frontier/battle_arcade/main.c index 37a65ebcd7c..deb42f01e8d 100644 --- a/src/applications/frontier/battle_arcade/main.c +++ b/src/applications/frontier/battle_arcade/main.c @@ -18,6 +18,7 @@ #include "battle_frontier_save.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "communication_system.h" #include "font.h" #include "game_options.h" @@ -48,7 +49,6 @@ #include "trainer_info.h" #include "unk_02030494.h" #include "unk_020363E8.h" -#include "unk_0209BA80.h" #include "vram_transfer.h" FS_EXTERN_OVERLAY(overlay104); @@ -1115,7 +1115,7 @@ static void CreateInitialLayoutPayload(BattleArcadeApp *app, u16 cmd) i += 1; } -void BattleArcadeApp_HandleInitialLayoutCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleArcadeHandleInitialLayout(int netID, int unused, void *data, void *context) { BattleArcadeApp *app = context; const u16 *payload = data; @@ -1159,7 +1159,7 @@ static u16 GetRandomNumber(BattleArcadeApp *app) return LCRNG_Next(); } -void BattleArcadeApp_HandleResultCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleArcadeHandleResult(int netID, int unused, void *data, void *context) { BattleArcadeApp *app = context; const u16 *payload = data; @@ -1190,7 +1190,7 @@ static void UnusedCommCommandPayload(BattleArcadeApp *app, u16 cmd) app->commPayload[1] = app->cursorPos; } -void BattleArcadeApp_HandleUnusedCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleArcadeUnused(int netID, int unused, void *data, void *context) { BattleArcadeApp *app = context; const u16 *payload = data; diff --git a/src/applications/frontier/battle_castle/opponent_app.c b/src/applications/frontier/battle_castle/opponent_app.c index e8a386a183a..776f26600c9 100644 --- a/src/applications/frontier/battle_castle/opponent_app.c +++ b/src/applications/frontier/battle_castle/opponent_app.c @@ -20,6 +20,7 @@ #include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "communication_information.h" #include "communication_system.h" #include "font.h" @@ -56,7 +57,7 @@ #include "trainer_info.h" #include "unk_020302D0.h" #include "unk_020363E8.h" -#include "unk_0209BA80.h" +#include "unk_0205DFC4.h" #include "vram_transfer.h" #include "res/text/bank/battle_castle_opponent_app.h" @@ -2343,7 +2344,7 @@ static void CreatePlayerInfoPayload(BattleCastleOpponentApp *app, u16 cmd) i += 3; } -void BattleCastleOpponentApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleOpponentHandlePlayerInfo(int netID, int unused, void *data, void *context) { BattleCastleOpponentApp *app = context; const u16 *payload = data; @@ -2380,7 +2381,7 @@ static void CreatePurchaseInfoPayload(BattleCastleOpponentApp *app, u16 cmd, u16 app->commPayload[5] = app->selectedMenuEntry; } -void BattleCastleOpponentApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleOpponentHandlePurchaseInfo(int netID, int unused, void *data, void *context) { BattleCastleOpponentApp *app = context; const u16 *payload = data; @@ -2414,7 +2415,7 @@ static void CreateUpdateCursorPayload(BattleCastleOpponentApp *app, u16 cmd) app->commPayload[1] = app->selectedMonSlot; } -void BattleCastleOpponentApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleOpponentUpdateCursorCmd(int netID, int unused, void *data, void *context) { BattleCastleOpponentApp *app = context; const u16 *payload = data; @@ -2432,7 +2433,7 @@ static void CreateExitAppPayload(BattleCastleOpponentApp *app) app->commPayload[0] = TRUE; } -void BattleCastleOpponentApp_HandleExitAppCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleOpponentHandleExitApp(int netID, int unused, void *data, void *context) { BattleCastleOpponentApp *app = context; const u16 *payload = data; diff --git a/src/applications/frontier/battle_castle/self_app.c b/src/applications/frontier/battle_castle/self_app.c index 05c97bb7a92..a0f3617aee6 100644 --- a/src/applications/frontier/battle_castle/self_app.c +++ b/src/applications/frontier/battle_castle/self_app.c @@ -18,6 +18,7 @@ #include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "communication_information.h" #include "communication_system.h" #include "font.h" @@ -57,7 +58,6 @@ #include "unk_020302D0.h" #include "unk_020363E8.h" #include "unk_0208C098.h" -#include "unk_0209BA80.h" #include "vram_transfer.h" #include "res/text/bank/battle_castle_self_app.h" @@ -416,12 +416,12 @@ static BOOL IsMonMissingPP(Pokemon *mon); static void CloseMessageBox(Window *window); BOOL SendCommMessage(BattleCastleSelfApp *app, u16 cmd, u16 slot); void CreatePlayerInfoPayload(BattleCastleSelfApp *app, u16 cmd); -void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleHandlePlayerInfo(int netID, int unused, void *data, void *context); void CreatePurchaseInfoPayload(BattleCastleSelfApp *app, u16 cmd, u16 slot); void CreateUpdateCursorPayload(BattleCastleSelfApp *app, u16 cmd); -void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleHandleUpdateCursor(int netID, int unused, void *data, void *context); void CreateExitAppPayload(BattleCastleSelfApp *app); -void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context); +void CommCmd_BattleCastleHandleExitApp(int netID, int unused, void *data, void *context); static void ApplyItemEffect(Pokemon *mon, u16 itemID); static void PrintPlayersAndPartnersNames(BattleCastleSelfApp *app, Window *window); static void HealPokemon(BattleCastleSelfApp *app, u8 slot, u8 menuOption); @@ -3056,7 +3056,7 @@ void CreatePlayerInfoPayload(BattleCastleSelfApp *app, u16 cmd) i += 3; } -void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleHandlePlayerInfo(int netID, int unused, void *data, void *context) { BattleCastleSelfApp *app = context; const u16 *payload = data; @@ -3093,7 +3093,7 @@ void CreatePurchaseInfoPayload(BattleCastleSelfApp *app, u16 cmd, u16 slot) app->commPayload[5] = app->selectedMenuEntry; } -void BattleCastleSelfApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastlePurchaseInfo(int netID, int unused, void *data, void *context) { BattleCastleSelfApp *app = context; const u16 *payload = data; @@ -3127,7 +3127,7 @@ void CreateUpdateCursorPayload(BattleCastleSelfApp *app, u16 cmd) app->commPayload[1] = app->selectedMonSlot; } -void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleHandleUpdateCursor(int netID, int unused, void *data, void *context) { BattleCastleSelfApp *app = context; const u16 *payload = data; @@ -3145,7 +3145,7 @@ void CreateExitAppPayload(BattleCastleSelfApp *app) app->commPayload[0] = TRUE; } -void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleCastleHandleExitApp(int netID, int unused, void *data, void *context) { BattleCastleSelfApp *app = context; const u16 *payload = data; diff --git a/src/applications/frontier/battle_factory/main.c b/src/applications/frontier/battle_factory/main.c index 097b9a4d9be..7ba2caac668 100644 --- a/src/applications/frontier/battle_factory/main.c +++ b/src/applications/frontier/battle_factory/main.c @@ -17,6 +17,7 @@ #include "overlay104/ov104_0223A7F4.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "communication_information.h" #include "communication_system.h" #include "coordinates.h" @@ -53,7 +54,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_020363E8.h" -#include "unk_0209BA80.h" #include "vram_transfer.h" #include "constdata/const_020F410C.h" @@ -2848,7 +2848,7 @@ void DummyCreatePayload(BattleFactoryApp *app, u16 cmd) app->commPayload[0] = cmd; } -void BattleFactoryApp_DummyCommCommand(int netID, int unused, void *data, void *context) +void CommCmd_BattleFactoryDummy(int netID, int unused, void *data, void *context) { if (CommSys_CurNetId() == netID) { return; @@ -2880,7 +2880,7 @@ void CreateUpdateSelectionPayload(BattleFactoryApp *app, u16 cmd, u16 unused) } } -void BattleFactoryApp_HandleSelectionUpdateCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleFactoryHandleSelectionUpdate(int netID, int unused, void *data, void *context) { int i; BattleFactoryApp *app = context; @@ -2908,7 +2908,7 @@ void BattleFactoryApp_HandleSelectionUpdateCmd(int netID, int unused, void *data app->partnerListingUpdateNeeded = TRUE; } -void BattleFactoryApp_DummyCommCommand2(int netID, int unused, void *data, void *context) +void CommCmd_BattleFactoryDummy2(int netID, int unused, void *data, void *context) { GF_ASSERT(FALSE); } @@ -2949,7 +2949,7 @@ void CreateTradeResultPayload(BattleFactoryApp *app, u16 cmd, u16 tradedMon) app->commPayload[3] = app->selectedIndices[1]; } -void BattleFactoryApp_HandleTradeResultCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleFactoryHandleTradeResult(int netID, int unused, void *data, void *context) { BattleFactoryApp *app = context; const u16 *payload = data; diff --git a/src/applications/frontier/battle_hall/main.c b/src/applications/frontier/battle_hall/main.c index ce7a792f307..8ac2141c2e4 100644 --- a/src/applications/frontier/battle_hall/main.c +++ b/src/applications/frontier/battle_hall/main.c @@ -13,6 +13,7 @@ #include "battle_hall_save.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "communication_system.h" #include "dexmode_checker.h" #include "font.h" @@ -46,7 +47,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_020363E8.h" -#include "unk_0209BA80.h" #include "vram_transfer.h" #include "constdata/const_020F410C.h" @@ -1424,7 +1424,7 @@ static void DummyCreatePayload(BattleHallApp *app, u16 dummy) app->commPayload[0] = dummy; } -void BattleHall_DummyCommCommand(int netID, int unused, void *unused2, void *unused3) +void CommCmd_BattleHallDummy(int netID, int unused, void *unused2, void *unused3) { if (CommSys_CurNetId() == netID) { return; @@ -1447,7 +1447,7 @@ static void CreateTypeSelectionPayload(BattleHallApp *app, u16 cmd, u16 cursorPo app->commPayload[3] = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); } -void BattleHall_HandleTypeSelectionMsg(int netID, int unused, void *data, void *context) +void CommCmd_BattleHallHandleTypeSelectionMsg(int netID, int unused, void *data, void *context) { BattleHallApp *app = context; const u16 *payload = data; @@ -1479,7 +1479,7 @@ static void CreateDecisionPayload(BattleHallApp *app, u16 cmd, u16 decision) app->commPayload[1] = decision; } -void BattleHall_HandlePartnerDecisionCmd(int netID, int unused, void *data, void *context) +void CommCmd_BattleHallHandlePartnerDecision(int netID, int unused, void *data, void *context) { BattleHallApp *app = context; const u16 *payload = data; diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c index 5a9ce1834cb..117aa58c5ac 100644 --- a/src/battle/battle_controller.c +++ b/src/battle/battle_controller.c @@ -21,13 +21,13 @@ #include "battle/message_defs.h" #include "battle/struct_ov16_0224DDA8.h" +#include "comm_command_battle.h" #include "communication_system.h" #include "flags.h" #include "move_table.h" #include "party.h" #include "pokemon.h" #include "unk_0202F1D4.h" -#include "unk_0207A6DC.h" static void BattleController_SendLocalMessage(BattleSystem *battleSys, int recipient, int battler, void *message, u8 size); static void SendMessage(BattleSystem *battleSys, int recipient, int battler, void *message, u8 size); diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 383f4b47712..cdba54889c3 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -5,6 +5,7 @@ #include #include "constants/battle.h" +#include "constants/communication/comm_command.h" #include "constants/game_options.h" #include "constants/heap.h" #include "constants/items.h" @@ -4051,7 +4052,7 @@ static void BattleControllerPlayer_EndFight(BattleSystem *battleSys, BattleConte } if (battleType & BATTLE_TYPE_LINK) { - CommSys_SendMessage(22); + CommSys_SendMessage(COMM_CMD_BATTLE_22); } battleCtx->command = BATTLE_CONTROL_END_WAIT; diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c index dc1c48993f7..61f1bd04e69 100644 --- a/src/battle/battle_main.c +++ b/src/battle/battle_main.c @@ -37,6 +37,7 @@ #include "bag.h" #include "bg_window.h" #include "cell_transfer.h" +#include "comm_command_battle.h" #include "comm_manager.h" #include "communication_system.h" #include "evolution.h" @@ -84,7 +85,6 @@ #include "unk_02033200.h" #include "unk_020363E8.h" #include "unk_02038F8C.h" -#include "unk_0207A6DC.h" #include "unk_0208C098.h" #include "vram_transfer.h" diff --git a/src/comm_command.c b/src/comm_command.c new file mode 100644 index 00000000000..312a23ca878 --- /dev/null +++ b/src/comm_command.c @@ -0,0 +1,316 @@ +#include "comm_command.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "functypes/funcptr_02032868.h" +#include "functypes/funcptr_0203290C.h" +#include "functypes/funcptr_020F8E60.h" + +#include "comm_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "heap.h" +#include "unk_020363E8.h" + +typedef struct { + const CommCmdTable *cmdTable; + int cmdTableSize; + void *data; + u8 swapCommandTableFlag[8]; + u8 commandTableSwapped; // never accessed +} CommCmdManager; + +static void CommCmd_SwapCommandTable(int param0, int param1, void *param2, void *param3); +static void CommCmd_DeinitCommCmdManager(int param0, int param1, void *param2, void *param3); +static void CommCmd_FinishSwapCmdTable(int param0, int param1, void *param2, void *param3); +static int CommPacketSizeOf_Two(void); + +/** + * CommCmdTable used by all communication methods + */ +static const CommCmdTable sCommCmdTable_Common[] = { + [COMM_CMD_NONE] = { NULL, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_1] = { NULL, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_2] = { CommCmd_2, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_RECV_PLAYER_INFO] = { CommCmd_RecvPlayerInfo, CommPlayerInfo_Size, NULL }, + [COMM_CMD_RECV_PLAYER_INFO_ARRAY] = { CommCmd_RecvPlayerInfoArray, CommPlayerInfo_Size, NULL }, + [COMM_CMD_RECV_PLAYER_INFO_FINISH] = { CommCmd_FinishRecvPlayerInfo, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_VALIDATE_CONFIRMATION] = { CommCmd_ValidateConfirmationMessage, CommManager_ConfirmationMessage_sizeof, NULL }, + [COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE] = { CommCmd_ValidateConfirmationResponseMessage, CommManager_ConfirmationMessage_sizeof, NULL }, + [COMM_CMD_8] = { NULL, NULL, NULL }, + [COMM_CMD_9] = { NULL, NULL, NULL }, + [COMM_CMD_10] = { CommCmd_10, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_11] = { CommCmd_11, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_12] = { CommCmd_12, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_SWAP_CMD_TABLE] = { CommCmd_SwapCommandTable, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_DEINIT_MANAGER] = { CommCmd_DeinitCommCmdManager, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FINISH_SWAP_CMD_TABLE] = { CommCmd_FinishSwapCmdTable, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_16] = { CommCmd_16, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_17] = { CommCmd_17, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_18] = { CommCmd_18, CommPacketSizeOf_Two, NULL }, + [COMM_CMD_19] = { CommCmd_19, sub_02036590, NULL }, + [COMM_CMD_20] = { CommCmd_20, CommTool_TempDataSize, NULL }, + [COMM_CMD_DISCONNECT_WIFI] = { CommCmd_DisconnectWifi, CommPacketSizeOf_Nothing, NULL } +}; + +static CommCmdManager *sCommCmdManager = NULL; + +/** + * @brief Initializes the Communication Command Manager + * + * @param extraCmdTable + * @param cmdTableSize + * @param data + */ +void CommCmdManager_Init(const CommCmdTable *cmdTable, int cmdTableSize, void *data) +{ + int i; + + if (!sCommCmdManager) { + sCommCmdManager = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommCmdManager)); + } + + sCommCmdManager->cmdTable = cmdTable; + sCommCmdManager->cmdTableSize = cmdTableSize; + sCommCmdManager->data = data; + + for (i = 0; i < (7 + 1); i++) { + sCommCmdManager->swapCommandTableFlag[i] = 0; + } + + sCommCmdManager->commandTableSwapped = FALSE; +} + +/** + * @brief Frees the Communication Command Manager + */ +void CommCmdManager_Free(void) +{ + if (sCommCmdManager) { + Heap_Free(sCommCmdManager); + sCommCmdManager = NULL; + } +} + +/** + * @brief Calls the communication command specified by cmd + * + * @param netID + * @param cmd + * @param size + * @param data + */ +void CommCommCmdManager_Callback(int netID, int cmd, int size, void *data) +{ + CommCmdRecvFunc recvFunc; + + if (cmd < COMM_CMD_MAX_COMMON) { + recvFunc = sCommCmdTable_Common[cmd].recvFunc; + } else { + GF_ASSERT(sCommCmdManager); + + if (cmd > (sCommCmdManager->cmdTableSize + COMM_CMD_MAX_COMMON)) { + sub_020363BC(); + return; + } + + recvFunc = sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].recvFunc; + } + + if (recvFunc != NULL) { + if (sCommCmdManager) { + recvFunc(netID, size, data, sCommCmdManager->data); + } else { + recvFunc(netID, size, data, NULL); + } + } +} + +/** + * @brief Gets the sizeof the packet sent by the comm command + * + * @param cmd + * + * @return Output of _sizeof() function associated with cmd return. Default 0 + */ +int CommCmdManager_PacketSizeOf(int cmd) +{ + int size = 0; + CommCmdSizeFunc sizeFunc; + + if (cmd < COMM_CMD_MAX_COMMON) { + sizeFunc = sCommCmdTable_Common[cmd].sizeFunc; + } else { + GF_ASSERT(sCommCmdManager); + + if (sCommCmdManager == NULL) { + sub_020363BC(); + return size; + } + + if (cmd > (sCommCmdManager->cmdTableSize + COMM_CMD_MAX_COMMON)) { + GF_ASSERT(FALSE); + sub_020363BC(); + return size; + } + + sizeFunc = sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].sizeFunc; + } + + if (sizeFunc != NULL) { + size = sizeFunc(); + } + + return size; +} + +/** + * @brief Checks if the specified command has a receive buffer function + * + * @param cmd + * + * @return TRUE if the associated buffer function is not NULL + */ +BOOL CommCmdManager_CheckCmdHasBuffer(int cmd) +{ + if (cmd < COMM_CMD_MAX_COMMON) { + return sCommCmdTable_Common[cmd].buffFunc != NULL; + } + + return sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].buffFunc != NULL; +} + +/** + * @brief Creates a buffer specified by the cmd's corresponding receive buffer function + * + * @param cmd + * @param netID + * @param size + * + * @return Pointer to the buffer if created, NULL otherwise + */ +void *CommCmdManager_TryCreateRecvBuffer(int cmd, int netId, int size) +{ + CommCmdBuffFunc buffFunc; + + if (cmd < COMM_CMD_MAX_COMMON) { + buffFunc = sCommCmdTable_Common[cmd].buffFunc; + return buffFunc(netId, NULL, size); + } else { + buffFunc = sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].buffFunc; + return buffFunc(netId, sCommCmdManager->data, size); + } + + return NULL; +} + +/** + * @brief Gets the constant that indicates the message has a variable size instead of a fixed one. + * + * @return PACKET_SIZE_VARIABLE + */ +int CommPacketSizeOf_Variable(void) +{ + return PACKET_SIZE_VARIABLE; +} + +/** + * @brief Used for when the function doesn't receive any data + * + * @return 0 + */ +int CommPacketSizeOf_Nothing(void) +{ + return 0; +} + +/** + * @brief Used for when the function only sends a NetID + * + * @return 1 + */ +int CommPacketSizeOf_NetId(void) +{ + return 1; +} + +/** + * @brief Returns 2 + * + * @return 2 + */ +static int CommPacketSizeOf_Two(void) +{ + return 2; +} + +/** + * @brief Waits for a response from all connected players before swapping the secondary command table. + * + * @param netID + * @param size + * @param unused2 + * @param unused3 + */ +static void CommCmd_SwapCommandTable(int netID, int size, void *unused2, void *unused3) +{ + int i; + + if (CommSys_CurNetId() != 0) { + return; + } + + sCommCmdManager->swapCommandTableFlag[netID] = 1; + + for (i = 0; i < (7 + 1); i++) { + if (!CommSys_IsPlayerConnected(i)) { + continue; + } + + if (!sCommCmdManager->swapCommandTableFlag[i]) { + return; + } + } + + CommSys_SendDataServer(COMM_CMD_DEINIT_MANAGER, NULL, 0); +} + +/** + * @brief Deinitializes the Communication Command Manager without freeing it. Usually used to swap the secondary command table. + * + * @param netID + * @param size + * @param unused2 + * @param unused3 + */ +static void CommCmd_DeinitCommCmdManager(int netID, int size, void *param2, void *param3) +{ + sCommCmdManager->cmdTable = NULL; + sCommCmdManager->cmdTableSize = 0; + sCommCmdManager->data = NULL; + sCommCmdManager->commandTableSwapped = TRUE; + + CommSys_SendDataFixedSize(COMM_CMD_FINISH_SWAP_CMD_TABLE, param2); +} + +/** + * @brief Waits for a response after finishing swapping the command table, reseting the swap flags. + * + * @param netID + * @param size + * @param unused2 + * @param unused3 + */ +static void CommCmd_FinishSwapCmdTable(int netID, int size, void *param2, void *param3) +{ + if (CommSys_CurNetId() != 0) { + return; + } + + sCommCmdManager->swapCommandTableFlag[netID] = 0; +} diff --git a/src/unk_0207A6DC.c b/src/comm_command_battle.c similarity index 77% rename from src/unk_0207A6DC.c rename to src/comm_command_battle.c index b1d220acbb3..d1d0fb5717f 100644 --- a/src/unk_0207A6DC.c +++ b/src/comm_command_battle.c @@ -1,9 +1,11 @@ -#include "unk_0207A6DC.h" +#include "comm_command_battle.h" #include #include #include "constants/battle.h" +#include "constants/communication/comm_command.h" +#include "constants/communication/comm_sync.h" #include "struct_decls/battle_system.h" #include "struct_defs/chatot_cry.h" @@ -19,6 +21,7 @@ #include "charcode_util.h" #include "chatot_cry.h" +#include "comm_command.h" #include "communication_system.h" #include "heap.h" #include "pal_pad.h" @@ -27,7 +30,6 @@ #include "sys_task_manager.h" #include "trainer_info.h" #include "unk_0202F1D4.h" -#include "unk_02032798.h" #include "unk_020363E8.h" void sub_0207A81C(BattleSystem *battleSys, int param1, int param2, void *param3, u8 param4); @@ -62,34 +64,36 @@ static u8 *sub_0207A7FC(int param0, void *param1, int param2); static u8 *sub_0207A804(int param0, void *param1, int param2); static u8 *sub_0207A80C(int param0, void *param1, int param2); static u8 *sub_0207A814(int param0, void *param1, int param2); -static void sub_0207A8A8(int param0, int param1, void *param2, void *param3); -static void sub_0207A934(int param0, int param1, void *param2, void *param3); -static void sub_0207A9BC(int param0, int param1, void *param2, void *param3); -static void sub_0207AA28(int param0, int param1, void *param2, void *param3); -static void sub_0207AA90(int param0, int param1, void *param2, void *param3); -static void sub_0207AB8C(int param0, int param1, void *param2, void *param3); -static void sub_0207AC18(int param0, int param1, void *param2, void *param3); -static void sub_0207ACA4(int param0, int param1, void *param2, void *param3); -static void sub_0207ADB4(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_23(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_24(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_25(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_26(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_27(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_28(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_29_30(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_31_32(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_22(int param0, int param1, void *param2, void *param3); static void sub_0207ACB4(SysTask *param0, void *param1); static void sub_0207AD40(SysTask *param0, void *param1); -static void sub_0207AE34(int param0, int param1, void *param2, void *param3); +static void CommCmd_Battle_33(int param0, int param1, void *param2, void *param3); static void PalPad_CreateNetworkObject(TrainerInfo *param0, PalPad *param1, PalPad *param2); +// clang-format off static const CommCmdTable Unk_020F099C[] = { - { sub_0207ADB4, CommPacketSizeOf_Variable, NULL }, - { sub_0207A8A8, CommPacketSizeOf_Variable, NULL }, - { sub_0207A934, sub_0207A758, NULL }, - { sub_0207A9BC, sub_0207A75C, sub_0207A778 }, - { sub_0207AA28, sub_0207A774, sub_0207A798 }, - { sub_0207AA90, sub_0207A764, sub_0207A7B8 }, - { sub_0207AB8C, sub_0207A76C, sub_0207A7D4 }, - { sub_0207AC18, sub_0207A774, sub_0207A7F4 }, - { sub_0207AC18, sub_0207A774, sub_0207A7FC }, - { sub_0207ACA4, sub_0207A764, sub_0207A804 }, - { sub_0207ACA4, sub_0207A764, sub_0207A80C }, - { sub_0207AE34, sub_0207AE64, sub_0207A814 } + [COMM_CMD_BATTLE_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_22, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_BATTLE_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_23, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_BATTLE_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_24, sub_0207A758, NULL }, + [COMM_CMD_BATTLE_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_25, sub_0207A75C, sub_0207A778 }, + [COMM_CMD_BATTLE_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_26, sub_0207A774, sub_0207A798 }, + [COMM_CMD_BATTLE_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_27, sub_0207A764, sub_0207A7B8 }, + [COMM_CMD_BATTLE_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_28, sub_0207A76C, sub_0207A7D4 }, + [COMM_CMD_BATTLE_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_29_30, sub_0207A774, sub_0207A7F4 }, + [COMM_CMD_BATTLE_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_29_30, sub_0207A774, sub_0207A7FC }, + [COMM_CMD_BATTLE_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_31_32, sub_0207A764, sub_0207A804 }, + [COMM_CMD_BATTLE_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_31_32, sub_0207A764, sub_0207A80C }, + [COMM_CMD_BATTLE_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_33, sub_0207AE64, sub_0207A814 } }; +// clang-format on void sub_0207A6DC(void *param0) { @@ -107,7 +111,7 @@ void sub_0207A6DC(void *param0) v2 = (UnkStruct_0207ACB4 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207ACB4)); v3 = (UnkStruct_0207AD40 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207AD40)); - CommCmd_Init(Unk_020F099C, v0, param0); + CommCmdManager_Init(Unk_020F099C, v0, param0); v2->battleSys = battleSys; v2->unk_04 = 0; @@ -124,7 +128,7 @@ void sub_0207A6DC(void *param0) void sub_0207A744(void *param0) { int v0 = sizeof(Unk_020F099C) / sizeof(CommCmdTable); - CommCmd_Init(Unk_020F099C, v0, param0); + CommCmdManager_Init(Unk_020F099C, v0, param0); } static int sub_0207A758(void) @@ -266,7 +270,7 @@ void sub_0207A81C(BattleSystem *battleSys, int param1, int param2, void *param3, Heap_Free(info); } -static void sub_0207A8A8(int param0, int param1, void *param2, void *param3) +static void CommCmd_Battle_23(int param0, int param1, void *param2, void *param3) { BattleSystem *battleSys = (BattleSystem *)param3; int v1; @@ -294,14 +298,14 @@ BOOL sub_0207A8F4(LinkBattleCommState *linkBattleCommState, u32 param1) return 0; } - if (CommTiming_IsSyncState(51) == 0) { + if (CommTiming_IsSyncState(SYNC_51) == 0) { return 0; } - return CommSys_SendData(24, (void *)¶m1, 4); + return CommSys_SendData(COMM_CMD_BATTLE_24, (void *)¶m1, 4); } -static void sub_0207A934(int param0, int param1, void *param2, void *param3) +static void CommCmd_Battle_24(int param0, int param1, void *param2, void *param3) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)param3; @@ -330,14 +334,14 @@ BOOL sub_0207A988(LinkBattleCommState *linkBattleCommState) return 0; } - if (CommTiming_IsSyncState(52) == 0) { + if (CommTiming_IsSyncState(SYNC_52) == 0) { return 0; } - return CommSys_SendDataHuge(25, (void *)&linkBattleCommState->sendBuffer[0], TrainerInfo_Size()); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_25, (void *)&linkBattleCommState->sendBuffer[0], TrainerInfo_Size()); } -static void sub_0207A9BC(int param0, int param1, void *param2, void *commState) +static void CommCmd_Battle_25(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; linkBattleCommState->recvCount++; @@ -363,14 +367,14 @@ BOOL sub_0207A9F8(LinkBattleCommState *linkBattleCommState) return 0; } - if (CommTiming_IsSyncState(53) == 0) { + if (CommTiming_IsSyncState(SYNC_53) == 0) { return 0; } - return CommSys_SendDataHuge(26, (void *)&linkBattleCommState->sendBuffer[0], sizeof(Trainer)); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_26, (void *)&linkBattleCommState->sendBuffer[0], sizeof(Trainer)); } -static void sub_0207AA28(int param0, int param1, void *param2, void *commState) +static void CommCmd_Battle_26(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; linkBattleCommState->recvCount++; @@ -396,14 +400,14 @@ BOOL sub_0207AA5C(LinkBattleCommState *linkBattleCommState) return 0; } - if (CommTiming_IsSyncState(54) == 0) { + if (CommTiming_IsSyncState(SYNC_54) == 0) { return 0; } - return CommSys_SendDataHuge(27, (void *)&linkBattleCommState->sendBuffer[0], Party_SaveSize()); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_27, (void *)&linkBattleCommState->sendBuffer[0], Party_SaveSize()); } -static void sub_0207AA90(int param0, int param1, void *param2, void *commState) +static void CommCmd_Battle_27(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; @@ -430,11 +434,11 @@ BOOL sub_0207AAC8(LinkBattleCommState *linkBattleCommState) return 0; } - if (CommTiming_IsSyncState(55) == 0) { + if (CommTiming_IsSyncState(SYNC_55) == 0) { return 0; } - return CommSys_SendDataHuge(28, (void *)&linkBattleCommState->sendBuffer[0], 1000); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_28, (void *)&linkBattleCommState->sendBuffer[0], 1000); } BOOL sub_0207AAFC(LinkBattleCommState *linkBattleCommState) @@ -473,14 +477,14 @@ BOOL sub_0207AB58(LinkBattleCommState *linkBattleCommState) // SEND pal pad data return 0; } - if (CommTiming_IsSyncState(56) == 0) { + if (CommTiming_IsSyncState(SYNC_56) == 0) { return 0; } - return CommSys_SendDataHuge(33, (void *)linkBattleCommState->sendBuffer, 1000); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_33, (void *)linkBattleCommState->sendBuffer, 1000); } -static void sub_0207AB8C(int param0, int param1, void *param2, void *commState) +static void CommCmd_Battle_28(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; linkBattleCommState->recvCount++; @@ -511,13 +515,14 @@ BOOL sub_0207ABD0(LinkBattleCommState *linkBattleCommState, int param1, int para } if (param1 == 1) { - return CommSys_SendDataHuge(29, (void *)&linkBattleCommState->sendBuffer[0], sizeof(Trainer)); + + return CommSys_SendDataHuge(COMM_CMD_BATTLE_29, (void *)&linkBattleCommState->sendBuffer[0], sizeof(Trainer)); } else { - return CommSys_SendDataHuge(30, (void *)&linkBattleCommState->sendBuffer[0], sizeof(Trainer)); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_30, (void *)&linkBattleCommState->sendBuffer[0], sizeof(Trainer)); } } -static void sub_0207AC18(int param0, int param1, void *param2, void *commState) +static void CommCmd_Battle_29_30(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; linkBattleCommState->recvCount++; @@ -548,13 +553,13 @@ BOOL sub_0207AC54(LinkBattleCommState *linkBattleCommState, int param1, int para } if (param1 == 1) { - return CommSys_SendDataHuge(31, (void *)&linkBattleCommState->sendBuffer[0], Party_SaveSize()); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_31, (void *)&linkBattleCommState->sendBuffer[0], Party_SaveSize()); } else { - return CommSys_SendDataHuge(32, (void *)&linkBattleCommState->sendBuffer[0], Party_SaveSize()); + return CommSys_SendDataHuge(COMM_CMD_BATTLE_32, (void *)&linkBattleCommState->sendBuffer[0], Party_SaveSize()); } } -static void sub_0207ACA4(int param0, int param1, void *param2, void *commState) +static void CommCmd_Battle_31_32(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; linkBattleCommState->recvCount++; @@ -591,7 +596,7 @@ void sub_0207ACB4(SysTask *param0, void *param1) v5 = sizeof(BattleMessageInfo) + (v1[v2[0] + 2] | (v1[v2[0] + 3] << 8)); - if (CommSys_SendData(23, (void *)&v1[v2[0]], v5) == 1) { + if (CommSys_SendData(COMM_CMD_BATTLE_23, (void *)&v1[v2[0]], v5) == 1) { v2[0] += v5; } break; @@ -641,7 +646,7 @@ void sub_0207AD40(SysTask *param0, void *param1) } } -static void sub_0207ADB4(int param0, int param1, void *param2, void *param3) +static void CommCmd_Battle_22(int param0, int param1, void *param2, void *param3) { BattleSystem *battleSys = (BattleSystem *)param3; @@ -667,7 +672,7 @@ static void PalPad_CreateNetworkObject(TrainerInfo *trainerInfo, PalPad *source, } } -void sub_0207AE34(int param0, int param1, void *param2, void *commState) +void CommCmd_Battle_33(int param0, int param1, void *param2, void *commState) { LinkBattleCommState *linkBattleCommState = (LinkBattleCommState *)commState; diff --git a/src/comm_command_contest.c b/src/comm_command_contest.c new file mode 100644 index 00000000000..f53c4be2201 --- /dev/null +++ b/src/comm_command_contest.c @@ -0,0 +1,213 @@ +#include "comm_command_contest.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" +#include "struct_defs/struct_02029C88.h" +#include "struct_defs/struct_02095B28.h" +#include "struct_defs/struct_02095C60.h" + +#include "overlay006/ov6_022489E4.h" +#include "overlay017/ov17_02252CEC.h" +#include "overlay017/struct_ov17_0224EDE0.h" + +#include "comm_command.h" +#include "communication_system.h" +#include "contest.h" +#include "heap.h" +#include "unk_020298BC.h" + +static void CommCmd_Contest_23(int param0, int param1, void *param2, void *param3); +static u8 *sub_02095B04(int param0, void *param1, int param2); +static void CommCmd_Contest_32(int param0, int param1, void *param2, void *param3); +static void CommCmd_Contest_33(int param0, int param1, void *param2, void *param3); +static void CommCmd_Contest_34(int param0, int param1, void *param2, void *param3); +static void CommCmd_Contest_35(int param0, int param1, void *param2, void *param3); +static int sub_02095B24(void); +static int sub_02095B28(void); + +// clang-format off +static const CommCmdTable Unk_020F58FC[] = { + [COMM_CMD_CONTEST_DUMMY - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_CONTEST_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_23, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_CONTEST_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_24, CommPacketSizeOf_Variable, sub_02095B04 }, + [COMM_CMD_CONTEST_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_25, sub_02095B24, NULL }, + [COMM_CMD_CONTEST_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_26, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CONTEST_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_27, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CONTEST_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_28, CommPacketSizeOf_Variable, sub_02095B04 }, + [COMM_CMD_CONTEST_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_29, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CONTEST_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_30, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CONTEST_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_31, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CONTEST_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_32, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CONTEST_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_33, CommPacketSizeOf_Variable, sub_02095B04 }, + [COMM_CMD_CONTEST_34 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_34, sub_02095B28, NULL }, + [COMM_CMD_CONTEST_35 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_35, sub_02095B28, NULL }, + [COMM_CMD_CONTEST_36 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_36, CommPacketSizeOf_Variable, sub_02095B04 }, + [COMM_CMD_CONTEST_37 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_37, CommPacketSizeOf_Variable, NULL } +}; +// clang-format on + +void sub_02095AF0(void *param0) +{ + int v0 = sizeof(Unk_020F58FC) / sizeof(CommCmdTable); + CommCmdManager_Init(Unk_020F58FC, v0, param0); +} + +static u8 *sub_02095B04(int param0, void *param1, int param2) +{ + Contest *v0 = param1; + + GF_ASSERT(param2 < 1024); + return v0->unk_969[param0]; +} + +static int sub_02095B24(void) +{ + return sizeof(UnkStruct_ov17_0224EDE0); +} + +static int sub_02095B28(void) +{ + return sizeof(UnkStruct_02095B28); +} + +static void CommCmd_Contest_23(int param0, int param1, void *param2, void *param3) +{ + return; +} + +static void CommCmd_Contest_32(int param0, int param1, void *param2, void *param3) +{ + Contest *v0 = param3; + int v1; + int v2; + u8 *v3; + + v1 = sub_02029C64(); + v3 = param2; + v2 = v3[v1]; + + MI_CpuCopy8(param2, v0->unk_00.unk_E8[v2], v1); + + v0->unk_568++; +} + +BOOL sub_02095B5C(Contest *param0, int param1, const UnkStruct_02029C88 *param2) +{ + u8 *v0; + int v1; + int v2; + + v1 = sub_02029C64(); + v0 = Heap_Alloc(HEAP_ID_20, v1 + 1); + MI_CpuCopy8(param2, v0, v1); + v0[v1] = param1; + + if (CommSys_SendData(COMM_CMD_CONTEST_32, v0, v1 + 1) == 1) { + v2 = 1; + } else { + v2 = 0; + } + + Heap_Free(v0); + return v2; +} + +static void CommCmd_Contest_33(int param0, int param1, void *param2, void *param3) +{ + Contest *v0 = param3; + int v1, v2; + u8 *v3; + int v4; + + v1 = sub_02029C64(); + v2 = v1 * 4; + v3 = param2; + + GF_ASSERT(v2 < 1024); + + for (v4 = 0; v4 < 4; v4++) { + MI_CpuCopy8(&v3[v1 * v4], v0->unk_00.unk_E8[v4], v1); + } + + v0->unk_568++; +} + +BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1) +{ + u8 *v0; + int v1, v2; + int v3; + int v4; + + v1 = sub_02029C64(); + v2 = v1 * 4; + + GF_ASSERT(v2 < 1024); + + v0 = param0->unk_569; + + for (v4 = 0; v4 < 4; v4++) { + MI_CpuCopy8(param1[v4], &v0[v1 * v4], v1); + } + + if (CommSys_SendDataHuge(COMM_CMD_CONTEST_33, v0, v2) == 1) { + v3 = 1; + } else { + v3 = 0; + } + + return v3; +} + +static void CommCmd_Contest_34(int param0, int param1, void *param2, void *param3) +{ + Contest *v0 = param3; + MI_CpuCopy8(param2, &v0->unk_1984.unk_00, param1); +} + +BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1) +{ + if (param0->unk_16 == 0) { + param0->unk_00.unk_00 = param1; + return 1; + } + + if (param0->unk_14 != param0->unk_15) { + return 0; + } + + param0->unk_08.unk_00 = param1; + + if (CommSys_SendData(COMM_CMD_CONTEST_34, ¶m0->unk_08, sizeof(UnkStruct_02095B28)) == 1) { + return 1; + } + + return 0; +} + +static void CommCmd_Contest_35(int param0, int param1, void *param2, void *param3) +{ + Contest *v0 = param3; + UnkStruct_02095B28 *v1 = param2; + v0->unk_1984.unk_10[param0] = v1->unk_04; +} + +BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1) +{ + if (param0->unk_16 == 0) { + param0->unk_10[0] = param1; + return 1; + } + + param0->unk_08.unk_04 = param1; + + if (CommSys_SendData(COMM_CMD_CONTEST_35, ¶m0->unk_08, sizeof(UnkStruct_02095B28)) == 1) { + return 1; + } + + return 0; +} diff --git a/src/comm_command_draw.c b/src/comm_command_draw.c new file mode 100644 index 00000000000..7e0bb6d834d --- /dev/null +++ b/src/comm_command_draw.c @@ -0,0 +1,372 @@ +#include "comm_command_draw.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" +#include "struct_defs/struct_02095EAC_sub1.h" +#include "struct_defs/struct_02095EAC_t.h" +#include "struct_defs/struct_02095FE4.h" + +#include "overlay058/ov58_021D0D80.h" +#include "overlay058/struct_ov58_021D2820.h" + +#include "bg_window.h" +#include "comm_command.h" +#include "comm_command_field.h" +#include "comm_manager.h" +#include "communication_system.h" +#include "wireless_manager.h" + +typedef struct UnkStruct_02095EAC_t UnkStruct_02095EAC; + +static u8 *sub_020961D0(int param0, void *param1, int param2); +static int sub_020961E0(void); +static int sub_020961E4(void); +static void sub_0209617C(UnkStruct_02095EAC *param0, int param1); +static void CommCmd_Field_Draw_129(int param0, int param1, void *param2, void *param3); + +// clang-format off +static const CommCmdTable Unk_020F5A40[] = { + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, sub_020961E0, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_DRAWING_118 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_118, sub_02099538, sub_020961D0 }, + [COMM_CMD_FIELD_DRAWING_119 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_119, sub_02099540 }, + [COMM_CMD_FIELD_DRAWING_120 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_120, sub_02099544 }, + [COMM_CMD_FIELD_DRAWING_121 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_121, CommPacketSizeOf_NetId }, + [COMM_CMD_FIELD_DRAWING_122 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_122, CommPacketSizeOf_NetId }, + [COMM_CMD_FIELD_DRAWING_123 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_123, CommPacketSizeOf_NetId }, + [COMM_CMD_FIELD_DRAWING_124 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_124, CommPacketSizeOf_Nothing }, + [COMM_CMD_FIELD_DRAWING_125 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_125, CommPacketSizeOf_Nothing }, + [COMM_CMD_FIELD_DRAWING_126 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_126, sub_020961E4 }, + [COMM_CMD_FIELD_DRAWING_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_127, CommPacketSizeOf_Nothing }, + [COMM_CMD_FIELD_DRAWING_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_128, CommPacketSizeOf_Nothing }, + [COMM_CMD_FIELD_DRAWING_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_129, CommPacketSizeOf_Nothing }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL } +}; +// clang-format on + +void sub_02095E98(void *param0) +{ + int v0 = sizeof(Unk_020F5A40) / sizeof(CommCmdTable); + CommCmdManager_Init(Unk_020F5A40, v0, param0); +} + +void CommCmd_Field_Draw_118(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + + if (CommSys_CurNetId() != 0) { + UnkStruct_02095EAC_sub1 *v1 = (UnkStruct_02095EAC_sub1 *)param2; + + if (v1->unk_3EC * 1000 > 30 * 15 * 32) { + MI_CpuCopyFast(v1->unk_00, &v0->unk_4434[v1->unk_3EC * 1000], (30 * 15 * 32) % 1000); + } else { + MI_CpuCopyFast(v1->unk_00, &v0->unk_4434[v1->unk_3EC * 1000], 1000); + } + + MI_CpuCopyFast(v0->unk_4434, v0->unk_32C.pixels, 30 * 15 * 32); + Window_CopyToVRAM(&v0->unk_32C); + } else { + UnkStruct_02095EAC_sub1 *v2 = (UnkStruct_02095EAC_sub1 *)param2; + + if (v0->unk_4430 * 1000 < 30 * 15 * 32) { + v0->unk_4430++; + sub_0209617C(v0, v0->unk_4430); + } else { + CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_124, NULL, 0); + } + } +} + +void CommCmd_Field_Draw_119(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2; + + if (param0 != 0) { + v0->unk_9421[param0] = *v1; + } +} + +void CommCmd_Field_Draw_120(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2; + + if (v0 == NULL) { + return; + } + + if (param0 == 0) { + int v2; + + for (v2 = 0; v2 < 5; v2++) { + v0->unk_43E6[v2] = v1[v2]; + } + } + + if (v0->unk_43E6[0].unk_09 == 2) { + (void)0; + } +} + +void CommCmd_Field_Draw_124(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + + ov58_021D2434(v0, 3, 0); + MI_CpuClearFast(v0->unk_4434, 30 * 15 * 32); + + if (CommSys_CurNetId() == 0) { + v0->unk_37C = CommSys_ConnectedCount(); + v0->unk_380 = WirelessManager_GetConnectedBitmap(); + v0->unk_9458 = 1; + } +} + +void CommCmd_Field_Draw_126(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095FE4 v1; + UnkStruct_02095FE4 *v2 = param2; + + if (param0 != 0) { + if (CommSys_CurNetId() == 0) { + v1 = *v2; + v1.unk_00 = param0; + v1.unk_01 = v0->unk_37C; + + switch (v2->unk_02) { + case 0: + if ((v0->unk_37C != CommSys_ConnectedCount()) || (v0->unk_37C != ov58_021D2A4C()) || (v0->unk_37C != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) { + v1.unk_03 = 0; + } else { + v0->unk_9418 |= 1 << param0; + v1.unk_03 = 1; + CommManager_SetMaxNumConnections(CommSys_ConnectedCount()); + } + break; + case 1: + break; + } + + CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_126, &v1, sizeof(UnkStruct_02095FE4)); + } + } else { + switch (v2->unk_02) { + case 0: + if (v2->unk_00 == CommSys_CurNetId()) { + if (v2->unk_03 == 0) { + ov58_021D2434(v0, 9, v2->unk_00); + } else { + v0->unk_941C = v2->unk_01; + ov58_021D2434(v0, 8, v2->unk_00); + } + } + break; + case 1: + ov58_021D2434(v0, 21, v2->unk_00); + break; + } + } +} + +void CommCmd_Field_Draw_125(int param0, int param1, void *param2, void *param3) +{ + return; +} + +void CommCmd_Field_Draw_123(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + u8 v1 = *(u8 *)param2; + + ov58_021D2434(v0, 1, v1); + + if ((CommSys_CurNetId() == 0) && (v0->unk_364 == 1)) { + v0->unk_4430 = 0; + sub_0209617C(v0, v0->unk_4430); + } +} + +void CommCmd_Field_Draw_121(int param0, int param1, void *param2, void *param3) +{ + return; +} + +void CommCmd_Field_Draw_122(int param0, int param1, void *param2, void *param3) +{ + return; +} + +void CommCmd_Field_Draw_127(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + + if (CommSys_CurNetId() != 0) { + ov58_021D2434(v0, 15, 0); + } +} + +void CommCmd_Field_Draw_128(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + u8 v1; + + GF_ASSERT(CommSys_CurNetId() == 0); + + if (CommSys_CurNetId() == 0) { + if (v0->unk_9460 != 0) { + v1 = param0; + CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_123, &v1, 1); + } else { + v0->unk_9460 = 1; + } + } + + CommManager_SetErrorHandling(0, 1); +} + +static void CommCmd_Field_Draw_129(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + v0->unk_9458 = 1; +} + +static void sub_0209617C(UnkStruct_02095EAC *param0, int param1) +{ + u8 *v0 = (u8 *)param0->unk_32C.pixels; + + MI_CpuCopyFast(&v0[param1 * 1000], param0->unk_7C74.unk_00, 1000); + + { + int v1; + u32 *v2, v3; + + v2 = (u32 *)param0->unk_7C74.unk_00; + + for (v3 = 0, v1 = 0; v1 < 1000 / 4; v1++) { + v3 ^= v2[v1]; + } + + param0->unk_7C74.unk_3E8 = v3; + } + + param0->unk_7C74.unk_3EC = param1; + + CommSys_SendDataHugeServer(COMM_CMD_FIELD_DRAWING_118, ¶m0->unk_7C74, sizeof(UnkStruct_02095EAC_sub1)); +} + +static u8 *sub_020961D0(int param0, void *param1, int param2) +{ + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param1; + return (u8 *)&v0->unk_8064[param0]; +} + +static int sub_020961E0(void) +{ + return 4; +} + +static int sub_020961E4(void) +{ + return sizeof(UnkStruct_02095FE4); +} diff --git a/src/comm_command_field.c b/src/comm_command_field.c new file mode 100644 index 00000000000..ce16ef6c58f --- /dev/null +++ b/src/comm_command_field.c @@ -0,0 +1,212 @@ +#include "comm_command_field.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "underground/manager.h" +#include "underground/mining.h" +#include "underground/pc.h" +#include "underground/player.h" +#include "underground/player_talk.h" +#include "underground/records.h" +#include "underground/secret_bases.h" +#include "underground/spheres.h" +#include "underground/traps.h" + +#include "comm_command.h" +#include "comm_player_manager.h" +#include "field_comm_manager.h" +#include "trainer_case.h" +#include "trainer_info.h" +#include "unk_0204FA34.h" +#include "unk_0205001C.h" +#include "unk_02050548.h" +#include "unk_0205A0D8.h" +#include "unk_0205B33C.h" + +static int CommPacketSizeOf_TrainerCase(void); +static int sub_02099548(void); +static int sub_0209954C(void); + +static int CommPacketSizeOf_3Bytes_Unused(void) +{ + return 3; +} + +static int sub_02099504(void) +{ + return 24; +} + +static int sub_02099508(void) +{ + return 236 * 6 + 4 * 2; +} + +// clang-format off +static const CommCmdTable Unk_020F68A4[] = { + [COMM_CMD_RECV_PLAYER_LOCATION - COMM_CMD_MAX_COMMON] = { CommCmd_RecvPlayerLocation, CommPacketSizeOf_RecvLocation, NULL }, + [COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT - COMM_CMD_MAX_COMMON] = { CommCmd_RecvPlayerLocationAndInit, CommPacketSizeOf_RecvLocationAndInit, NULL }, + [COMM_CMD_VENDOR_TALK_REQUEST - COMM_CMD_MAX_COMMON] = { CommCmd_VendorTalkRequest, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_VENDOR_TALK - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundVendorTalk, CommPacketSizeOf_Nothing, NULL }, // 25 + [COMM_CMD_VENDOR_TALK_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundVendorTalkServer, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_OPEN_MENU_REQUEST - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundOpenMenuRequest, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_INTERACT_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundInteractEvent, CommPacketSizeOf_InteractEvent, NULL }, + [COMM_CMD_OPEN_MENU_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundOpenMenuEvent, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_TALK_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkEvent, CommPacketSizeOf_Variable, NULL }, // 30 + [COMM_CMD_PROCESS_ALL_DATA_SENT_MSG - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundProcessAllDataSentMessage, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_TRY_PLACE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_TryPlaceTrap, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_REMOVE_BURIED_TRAP_INDEX_UNUSED - COMM_CMD_MAX_COMMON] = { CommCmd_RemoveBuriedTrapAtIndex_Unused, CommPacketSizeOf_2Bytes_Unused, NULL }, // corresponding cmd never sent + [COMM_CMD_PLACE_TRAP_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_PlaceTrapResult, CommPacketSizeOf_PlaceTrapResult, NULL }, + [COMM_CMD_LOAD_LINK_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_LoadLinkPlacedTraps, CommPacketSizeOf_AllTrapsPlacedPlayer, NULL }, // 35 + [COMM_CMD_RECV_LOAD_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_RecvLoadTraps, CommPacketSizeOf_LoadTrapsResult, NULL }, + [COMM_CMD_TRIGGER_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_TriggeredTraps, CommPacketSizeOf_TriggeredTrap2, NULL }, + [COMM_CMD_CALL_SECOND_TRAP_EFFECT - COMM_CMD_MAX_COMMON] = { CommCmd_CallSecondTrapEffectServerFunc, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_START_SLIDE_ANIM_UNUSED - COMM_CMD_MAX_COMMON] = { CommCmd_StartSlideAnimation_Unused, CommPacketSizeOf_3Bytes_Unused, NULL }, // corresponding cmd never sent + [COMM_CMD_ESCAPE_HOLE - COMM_CMD_MAX_COMMON] = { CommCmd_EscapeHole, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_ESCAPE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_EscapeTrapServer, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_ESCAPED_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_EscapedTrap, CommPacketSizeOf_EscapedTrap, NULL }, + [COMM_CMD_END_TRAP_EFFECT - COMM_CMD_MAX_COMMON] = { CommCmd_EndCurrentTrapEffectServer, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_TRAP_HELP - COMM_CMD_MAX_COMMON] = { CommCmd_TrapHelp, CommPacketSizeOf_TrapHelpData, NULL }, + [COMM_CMD_TRIGGERD_TRAP_BITS - COMM_CMD_MAX_COMMON] = { CommCmd_TriggeredTrapBits, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_QUEUE_SEND_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_QueueSendTrapRadarResults, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_RECV_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_RecvTrapRadarResults, CommPacketSizeOf_TrapRadarResult, NULL }, + [COMM_CMD_UNDERGROUND_TOUCH_INPUT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchInput, CommPacketSizeOf_CoordinatesU16, NULL }, + [COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchRadarTrapResults, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchRadarMiningSpotResults, CommPacketSizeOf_Variable, NULL }, // 50 + [COMM_CMD_DISENGAGE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_DisengagedTrap, CommPacketSizeOf_TriggeredTrap, NULL }, + [COMM_CMD_DELETE_PLAYER - COMM_CMD_MAX_COMMON] = { CommCmd_DeletePlayer, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_BASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseInfo, CommPacketSizeOf_SecretBaseInfo, NULL }, + [COMM_CMD_ENTER_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_RecvSecretBaseEnter, CommPacketSizeOf_SecretBaseInfo, NULL }, + [COMM_CMD_BASE_ENTRANCE_BUFFER - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseEntranceBuffer, CommPacketSizeOf_BaseEntrancesBuffer, NULL }, // 55 + [COMM_CMD_CLEAR_TRANSITION_STATUS - COMM_CMD_MAX_COMMON] = { CommCmd_ClearSecretBaseTransitioningStatus, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_EXIT_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseExit, CommPacketSizeOf_BaseExitEvent, NULL }, + [COMM_CMD_BASE_TRANSMITION_PROMPT - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseTransitionPrompt, CommPacketSizeOf_BaseTransitionPromptEvent, NULL }, + [COMM_CMD_BASE_TRANSITION_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseTransitionEvent, CommPacketSizeOf_BaseTransitionEvent, NULL }, + [COMM_CMD_SECRET_BASE_GOOD_INTERACTION - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseGoodInteraction, CommPacketSizeOf_GoodInteractionEvent, NULL }, // 60 + [COMM_CMD_ENTER_BASE_FAILED - COMM_CMD_MAX_COMMON] = { CommCmd_FailedSecretBaseEnter, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_62 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_62, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_RETRIEVE_BURIED_SPHERES - COMM_CMD_MAX_COMMON] = { CommCmd_RetrieveBuriedSpheresRequest, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_INTERACT_MINING_SPOT - COMM_CMD_MAX_COMMON] = { CommCmd_InteractMiningSpot, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_CONFIRM_START_MINING_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_ConfirmStartMiningResult, CommPacketSizeOf_NetId, NULL }, // 65 + [COMM_CMD_CONFIRM_START_MINING - COMM_CMD_MAX_COMMON] = { CommCmd_ConfirmStartMining, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_RECV_MINING_END - COMM_CMD_MAX_COMMON] = { CommCmd_RecvMiningGameEnd, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_MINING_LINK_INPUT - COMM_CMD_MAX_COMMON] = { CommCmd_MiningLinkInput, CommPacketSizeOf_MiningLinkInput, NULL }, + [COMM_CMD_MINING_LINK_INPUT_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_MiningLinkInputServer, CommPacketSizeOf_MiningLinkInputWithNetID, NULL }, + [COMM_CMD_PLAYER_STATE_UNDERGROUND - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundPlayerState, CommPacketSizeOf_UndergroundPlayerState, NULL }, + [COMM_CMD_START_TREASURE_RADAR - COMM_CMD_MAX_COMMON] = { CommCmd_StartTreasureRadar, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_MINING_SPOT_RADAR - COMM_CMD_MAX_COMMON] = { CommCmd_MiningSpotRadarResult, CommPacketSizeOf_MiningSpotRadarResult, NULL }, + [COMM_CMD_REQUEST_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_RequestUndergroundTalkStateAndUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, + [COMM_CMD_RESPONSE_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, + [COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkResponseStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, // 75 + [COMM_CMD_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, + [COMM_CMD_SEND_GIFT_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundSendGiftServer, CommPacketSizeOf_Gift, NULL }, + [COMM_CMD_RECV_GIFT_OFFER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundRecvGiftOffer, CommPacketSizeOf_Gift, NULL }, + [COMM_CMD_SEND_TALK_MSG_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_SendUndergroundTalkMessageServer, CommPacketSizeOf_TalkMessage, NULL }, + [COMM_CMD_RECV_TALK_MSG_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_RecvUndergroundTalkMessage, CommPacketSizeOf_TalkMessage, NULL }, + [COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_SendUndergroundRecordServer, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_UNDERGROUND_RECORD - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundRecord, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_UNDERGROUND_PC_INTERACT - COMM_CMD_MAX_COMMON] = { CommCmd_IntreactUndergroundPC, CommPacketSizeOf_PCInteraction, NULL }, // 83 + [COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagEventType, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_UNDERGROUND_FLAG_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagEvent, CommPacketSizeOf_FlagEvent, NULL }, + [COMM_CMD_CREATE_SECRET_BASE_REQUEST - COMM_CMD_MAX_COMMON] = { CommCmd_CreateSecretBaseRequest, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_CREATE_SECRET_BASE_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_CreateSecretBaseEvent, CommPacketSizeOf_SecretBaseCreateEvent, NULL }, + [COMM_CMD_TRAINER_CASE_COPIED - COMM_CMD_MAX_COMMON] = { CommCmd_SetTrainerCaseCopiedFlag, CommPacketSizeOf_TrainerCase, FieldCommManager_GetTrainerCase }, + [COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG - COMM_CMD_MAX_COMMON] = { CommCmd_AttemptUndergroundTakeFlag, CommPacketSizeOf_PCInteraction, NULL }, + [COMM_CMD_UNDERGROUND_TAKEN_FLAG - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTakenFlag, CommPacketSizeOf_PCInteraction, NULL }, // 90 + [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfo, CommPacketSizeOf_TrainerInfo, NULL }, + [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfoServer, CommPacketSizeOf_HeldFlagInfo, UndergroundPlayer_GetHeldFlagInfoBuffer }, + [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfoAck, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_94 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_94, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM - COMM_CMD_MAX_COMMON] = { CommCmd_UpdateBattleRoomMovement, CommPacketSizeOf_NetId, NULL }, // 95 + [COMM_CMD_UNDERGROUND_FLAG_RANK_UP - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagRankUp, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagRankUpEvent, CommPacketSizeOf_FlagRankUpEvent, NULL }, + [COMM_CMD_FIELD_98 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_98, TrainerInfo_Size, NULL }, + [COMM_CMD_FIELD_99 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_99, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_100 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_100, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_101 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_101, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_102 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_102, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_103 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_103, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_104 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_104, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_105 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_105, CommPacketSizeOf_TrainerCase, sub_0205BA5C }, + [COMM_CMD_FIELD_106 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_106, sub_0205B0E4, sub_0205B0F4 }, + [COMM_CMD_FIELD_107 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_107, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_RECORD_108 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_RECORD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_RECORD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_RECORD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_RECORD_112 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099548, NULL }, + [COMM_CMD_FIELD_RECORD_113 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_RECORD_114 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_RECORD_115 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_RECORD_116 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099530, NULL }, + [COMM_CMD_FIELD_RECORD_117 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_DRAWING_118 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099538, NULL }, + [COMM_CMD_FIELD_DRAWING_119 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099540, NULL }, + [COMM_CMD_FIELD_DRAWING_120 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099544, NULL }, + [COMM_CMD_FIELD_DRAWING_121 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_DRAWING_122 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_DRAWING_123 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }, + [COMM_CMD_FIELD_DRAWING_124 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_DRAWING_125 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_DRAWING_126 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_0209954C, NULL }, + [COMM_CMD_FIELD_DRAWING_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_DRAWING_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_DRAWING_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_SPIN_TRADE_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099504, NULL }, + [COMM_CMD_FIELD_SPIN_TRADE_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL }, + [COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_FIELD_133 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_133, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_FIELD_134 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_134, CommPacketSizeOf_Variable, NULL } +}; +// clang-format on + +void CommCmd_Field_Dummy(int param0, int param1, void *param2, void *param3) +{ + return; +} + +void CommFieldCmd_Init(void *param0) +{ + int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable); + CommCmdManager_Init(Unk_020F68A4, v0, param0); +} + +static int CommPacketSizeOf_TrainerCase(void) +{ + return sizeof(TrainerCase); +} + +int sub_02099530(void) +{ + return 3000 + 8; +} + +int sub_02099538(void) +{ + return 1008; +} + +int sub_02099540(void) +{ + return 10; +} + +int sub_02099544(void) +{ + return 10 * 5; +} + +static int sub_02099548(void) +{ + return 4; +} + +static int sub_0209954C(void) +{ + return 4; +} diff --git a/src/comm_command_frontier.c b/src/comm_command_frontier.c new file mode 100644 index 00000000000..013fb31fd3e --- /dev/null +++ b/src/comm_command_frontier.c @@ -0,0 +1,391 @@ +#include "comm_command_frontier.h" + +#include +#include + +#include "constants/battle_tower.h" +#include "constants/communication/comm_command.h" + +#include "struct_defs/battle_tower.h" +#include "struct_defs/comm_cmd_table.h" +#include "struct_defs/struct_0209BBA4.h" + +#include "applications/frontier/battle_arcade/main.h" +#include "applications/frontier/battle_castle/opponent_app.h" +#include "applications/frontier/battle_castle/self_app.h" +#include "applications/frontier/battle_factory/main.h" +#include "applications/frontier/battle_hall/main.h" +#include "overlay104/ov104_0222ECE8.h" +#include "overlay104/ov104_0223C164.h" + +#include "battle_frontier_save.h" +#include "battle_frontier_stats.h" +#include "comm_command.h" +#include "communication_system.h" +#include "party.h" +#include "pokemon.h" +#include "unk_0205DFC4.h" + +static void CommCmd_Frontier_62(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BB08(BattleTower *battleTower); +static void CommCmd_Frontier_63(int param0, int param1, void *param2, void *param3); +static void CommCmd_Frontier_64(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0); +void CommCmd_Frontier_57(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1); +void CommCmd_Frontier_58(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2); +void CommCmd_Frontier_59(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1); +void CommCmd_Frontier_60(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1); +void CommCmd_Frontier_61(int param0, int param1, void *param2, void *param3); + +// clang-format off +static const CommCmdTable Unk_020F8BF0[] = { + [COMM_CMD_F_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_22, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_23, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_24, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_25, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_26, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_27, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_28, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_FACTORY_DUMMY - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryDummy, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_FACTORY_SELECTION_UPDATE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryHandleSelectionUpdate, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_FACTORY_DUMMY2 - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryDummy2, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_FACTORY_TRADE_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryHandleTradeResult, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_33, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_34 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_34, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_35 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_35, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_36 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_36, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_37 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_37, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_38 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_38, CommPacketSizeOf_Variable, ov104_0222EED8 }, + [COMM_CMD_HALL_DUMMY - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallDummy, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_HALL_TYPE_SELECTION_MSG - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallHandleTypeSelectionMsg, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_HALL_PARTNER_DECISION - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallHandlePartnerDecision, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_42 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_42, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_43 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_43, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_44 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_44, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_45 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_45, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_46 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_46, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_47 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_47, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_48 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_48, CommPacketSizeOf_Variable, ov104_0222F84C }, + [COMM_CMD_CASTLE_PLAYER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleHandlePlayerInfo, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_PURCHASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastlePurchaseInfo, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_UPDATE_CURSOR - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleHandleUpdateCursor, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_EXIT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleHandleExitApp, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_OPP_PLAYER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentHandlePlayerInfo, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_OPP_PURCHASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentHandlePurchaseInfo, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_OPP_UPDATE_CURSOR - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentUpdateCursorCmd, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_CASTLE_OPP_EXIT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentHandleExitApp, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_57 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_57, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_58 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_58, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_59 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_59, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_60 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_60, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_61 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_61, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_62 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_62, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_63 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_63, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_64 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_64, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_65 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_65, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_66 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_66, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_67 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_67, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_68 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_68, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_69 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_69, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_F_70 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_70, CommPacketSizeOf_Variable, ov104_0222FBC4 }, + [COMM_CMD_ARCADE_INIT_LAYOUT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleArcadeHandleInitialLayout, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_ARCADE_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleArcadeHandleResult, CommPacketSizeOf_Variable, NULL }, + [COMM_CMD_ARCADE_UNUSED - COMM_CMD_MAX_COMMON] = { CommCmd_BattleArcadeUnused, CommPacketSizeOf_Variable, NULL } +}; +// clang-format on + +void sub_0209BA80(void *param0) +{ + int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable); + CommCmdManager_Init(Unk_020F8BF0, v0, param0); +} + +static void CommCmd_Frontier_62(int param0, int param1, void *param2, void *param3) +{ + u16 v0; + int v1; + BattleTower *battleTower = param3; + const u16 *v3 = param2; + + v0 = 0; + v1 = 0; + battleTower->unk_8D4++; + + if (CommSys_CurNetId() == param0) { + return; + } + + battleTower->partnerGender = (u8)v3[0]; + battleTower->unk_16[0] = v3[1]; + battleTower->unk_16[1] = v3[2]; + battleTower->unk_14 = v3[3]; + battleTower->partnerID = BT_PARTNERS_COUNT + battleTower->partnerGender; + + if ((battleTower->unk_2E[0] == battleTower->unk_16[0]) || (battleTower->unk_2E[0] == battleTower->unk_16[1])) { + v0 += 1; + } + + if ((battleTower->unk_2E[1] == battleTower->unk_16[0]) || (battleTower->unk_2E[1] == battleTower->unk_16[1])) { + v0 += 2; + } + + battleTower->unk_8D8 = v0; + return; +} + +BOOL sub_0209BB08(BattleTower *battleTower) +{ + int v0, v1; + + v1 = (14 * 2); + + MI_CpuCopy8(battleTower->trainerIDs, battleTower->unk_83E, v1); + + if (CommSys_SendData(COMM_CMD_F_63, battleTower->unk_83E, v1) == 1) { + v0 = 1; + } else { + v0 = 0; + } + + return v0; +} + +static void CommCmd_Frontier_63(int param0, int param1, void *param2, void *param3) +{ + int v0; + BattleTower *battleTower = param3; + const u16 *v2 = param2; + + v0 = 0; + battleTower->unk_8D4++; + + if (CommSys_CurNetId() == param0) { + return; + } + + if (CommSys_CurNetId() == 0) { + return; + } + + MI_CpuCopy8(v2, battleTower->trainerIDs, BT_OPPONENTS_COUNT * 2 * sizeof(u16)); + return; +} + +static void CommCmd_Frontier_64(int param0, int param1, void *param2, void *param3) +{ + int v0; + BattleTower *battleTower = param3; + const u16 *v2 = param2; + + v0 = 0; + + battleTower->unk_8D8 = 0; + battleTower->unk_8D4++; + + if (CommSys_CurNetId() == param0) { + return; + } + + if (battleTower->unk_10_3 || v2[0]) { + battleTower->unk_8D8 = 1; + } + + return; +} + +BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0) +{ + int v0, v1, v2; + + v1 = 40; + param0->unk_08[0] = param0->unk_A0; + + v2 = ov104_0223C264(param0->unk_A0); + param0->unk_08[1] = BattleFrontierSave_GetStat(SaveData_GetBattleFrontier(param0->saveData), v2, BattleFrontierStats_GetHostFriendIdx(v2)); + + if (CommSys_SendData(COMM_CMD_F_57, param0->unk_08, v1) == 1) { + v0 = 1; + } else { + v0 = 0; + } + + return v0; +} + +void CommCmd_Frontier_57(int param0, int param1, void *param2, void *param3) +{ + u16 v0; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; + + v1->unk_6F++; + + if (CommSys_CurNetId() == param0) { + return; + } + + v1->unk_6E = (u8)v2[0]; + v1->unk_72 = v2[1]; + + return; +} + +BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1) +{ + int v0, v1 = 40; + param0->unk_08[0] = param1; + + if (CommSys_SendData(COMM_CMD_F_58, param0->unk_08, v1) == 1) { + v0 = 1; + } else { + v0 = 0; + } + + return v0; +} + +void CommCmd_Frontier_58(int param0, int param1, void *param2, void *param3) +{ + int v0; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; + + v0 = 0; + v1->unk_6F++; + + if (CommSys_CurNetId() == param0) { + return; + } + + v1->unk_59 = (u8)v2[0]; + return; +} + +BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2) +{ + int v0, v1; + Pokemon *v2; + Party *v3; + + v1 = 40; + v3 = SaveData_GetParty(param0->saveData); + + param0->unk_6A[0] = param1; + param0->unk_6A[1] = param2; + + if (param1 == 0xff) { + param0->unk_76[0] = 0; + param0->unk_7E[0] = 0; + param0->unk_76[1] = 0; + param0->unk_7E[1] = 0; + } else { + v2 = Party_GetPokemonBySlotIndex(v3, param1); + + param0->unk_76[0] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL); + param0->unk_7E[0] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL); + + v2 = Party_GetPokemonBySlotIndex(v3, param2); + + param0->unk_76[1] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL); + param0->unk_7E[1] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL); + } + + param0->unk_08[0] = param0->unk_76[0]; + param0->unk_08[1] = param0->unk_7E[0]; + param0->unk_08[2] = param0->unk_76[1]; + param0->unk_08[3] = param0->unk_7E[1]; + + if (CommSys_SendData(COMM_CMD_F_59, param0->unk_08, v1) == 1) { + v0 = 1; + } else { + v0 = 0; + } + + return v0; +} + +void CommCmd_Frontier_59(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_0209BBA4 *v0 = param3; + const u16 *v1 = param2; + + v0->unk_6F++; + + if (CommSys_CurNetId() == param0) { + return; + } + + v0->unk_86[0] = v1[0]; + v0->unk_8E[0] = v1[1]; + v0->unk_86[1] = v1[2]; + v0->unk_8E[1] = v1[3]; + + return; +} + +BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1) +{ + int v0, v1 = 40; + + param0->unk_08[0] = param1; + + if (CommSys_SendData(COMM_CMD_F_60, param0->unk_08, v1) == 1) { + v0 = 1; + } else { + v0 = 0; + } + + return v0; +} + +void CommCmd_Frontier_60(int param0, int param1, void *param2, void *param3) +{ + int v0; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; + + v0 = 0; + v1->unk_6F++; + + if (CommSys_CurNetId() == param0) { + return; + } + + v1->unk_74 = v2[0]; + return; +} + +BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1) +{ + int v0, v1 = 40; + param0->unk_08[0] = param1; + + if (CommSys_SendData(COMM_CMD_F_61, param0->unk_08, v1) == 1) { + v0 = 1; + } else { + v0 = 0; + } + + return v0; +} + +void CommCmd_Frontier_61(int param0, int param1, void *param2, void *param3) +{ + int v0; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; + + v0 = 0; + v1->unk_6F++; + + if (CommSys_CurNetId() == param0) { + return; + } + + v1->unk_71 = (u8)v2[0]; + return; +} diff --git a/src/comm_command_record_corner.c b/src/comm_command_record_corner.c new file mode 100644 index 00000000000..a22f13cb64e --- /dev/null +++ b/src/comm_command_record_corner.c @@ -0,0 +1,330 @@ +#include "comm_command_record_corner.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" +#include "struct_defs/struct_020961E8_t.h" +#include "struct_defs/struct_02096274.h" + +#include "overlay059/ov59_021D0D80.h" +#include "overlay059/struct_ov59_021D30E0.h" + +#include "comm_command.h" +#include "comm_command_field.h" +#include "comm_manager.h" +#include "communication_system.h" +#include "math_util.h" +#include "sound_playback.h" +#include "wireless_manager.h" + +typedef struct UnkStruct_020961E8_t UnkStruct_020961E8; + +static int sub_02096400(void); +static int sub_02096404(void); +static u8 *sub_0209640C(int param0, void *param1, int param2); +static int sub_02096408(void); +static void sub_020963C0(UnkStruct_020961E8 *param0, int param1); +void CommCmd_Field_RecordCorner_116(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_RecordCorner_117(int param0, int param1, void *param2, void *param3); + +// clang-format off +static const CommCmdTable Unk_020F5F68[] = { + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + [COMM_CMD_FIELD_RECORD_108 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_108, sub_02096404 }, + [COMM_CMD_FIELD_RECORD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_109, sub_02096404 }, + [COMM_CMD_FIELD_RECORD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_110, sub_02096404 }, + [COMM_CMD_FIELD_RECORD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_111, sub_02096400 }, + [COMM_CMD_FIELD_RECORD_112 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_112, sub_02096408 }, + [COMM_CMD_FIELD_RECORD_113 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_113, sub_02096400 }, + [COMM_CMD_FIELD_RECORD_114 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_114, sub_02096400 }, + [COMM_CMD_FIELD_RECORD_115 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_115, sub_02096400 }, + [COMM_CMD_FIELD_RECORD_116 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_116, sub_02099530, sub_0209640C }, + [COMM_CMD_FIELD_RECORD_117 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_117, sub_02096404 }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL }, + { CommCmd_Field_Dummy, sub_02096400, NULL } +}; +// clang-format on + +void sub_020961E8(void *param0) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param0; + int v1; + int v2 = sizeof(Unk_020F5F68) / sizeof(CommCmdTable); + + CommCmdManager_Init(Unk_020F5F68, v2, param0); + + for (v1 = 0; v1 < 5; v1++) { + (void)0; + } +} + +void CommCmd_Field_RecordCorner_116(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + v0->unk_4A98++; +} + +void CommCmd_Field_RecordCorner_117(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + u8 *v1 = (u8 *)param2; + + if (param0 == 0) { + if (v0->unk_4AA0 != *v1) { + (void)0; + } + + v0->unk_4AA0 = *v1; + } +} + +void CommCmd_Field_RecordCorner_115(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + + v0->unk_4A98 = 0; + v0->unk_4AA4 = 1; + + sub_020963C0(v0, CommSys_CurNetId()); + + ov59_021D1D40(v0); + ov59_021D2204(v0, 25, param0); + + CommManager_SetErrorHandling(1, 1); + Sound_PlayEffect(SEQ_SE_DP_F209); +} + +void CommCmd_Field_RecordCorner_111(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + ov59_021D2204(v0, 2, 0); +} + +void CommCmd_Field_RecordCorner_112(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_02096274 v1; + UnkStruct_02096274 *v2 = param2; + + if (param0 != 0) { + if (CommSys_CurNetId() == 0) { + v1 = *v2; + v1.unk_00 = param0; + v1.unk_01 = v0->unk_4AAC; + + switch (v2->unk_02) { + case 0: + if ((v0->unk_4AAC != CommSys_ConnectedCount()) || (v0->unk_4AAC != ov59_021D2544()) || (v0->unk_4AAC != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) { + v1.unk_03 = 0; + } else { + v0->unk_4AB4 |= 1 << param0; + v1.unk_03 = 1; + + CommManager_SetMaxNumConnections(CommSys_ConnectedCount()); + } + break; + case 1: + break; + } + + CommSys_SendData(COMM_CMD_FIELD_RECORD_112, &v1, sizeof(UnkStruct_02096274)); + } + } else { + switch (v2->unk_02) { + case 0: + if (v2->unk_00 == CommSys_CurNetId()) { + if (v2->unk_03 == 0) { + ov59_021D2204(v0, 8, v2->unk_00); + } else { + v0->unk_4AC0 = v2->unk_01; + ov59_021D2204(v0, 7, v2->unk_00); + } + } + break; + case 1: + ov59_021D2204(v0, 19, v2->unk_00); + break; + } + } +} + +void CommCmd_Field_RecordCorner_110(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + u8 v1 = *(u8 *)param2; + + ov59_021D22EC(v0, 1, v1); + + if (CommSys_CurNetId() == 0) { + v0->unk_414 = 0; + } +} + +void CommCmd_Field_RecordCorner_108(int param0, int param1, void *param2, void *param3) +{ + return; +} + +void CommCmd_Field_RecordCorner_109(int param0, int param1, void *param2, void *param3) +{ + return; +} + +void CommCmd_Field_RecordCorner_113(int param0, int param1, void *param2, void *param3) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + + if (CommSys_CurNetId() != 0) { + ov59_021D2204(v0, 13, 0); + } +} + +void CommCmd_Field_RecordCorner_114(int param0, int param1, void *param2, void *param3) +{ + u8 v0; + + if (CommSys_CurNetId() == 0) { + v0 = param0; + CommSys_SendData(COMM_CMD_FIELD_RECORD_110, &v0, 1); + } +} + +static void sub_020963C0(UnkStruct_020961E8 *param0, int param1) +{ + { + int v0; + u32 *v1, v2; + + v1 = (u32 *)param0->unk_418.unk_00; + + for (v2 = 0, v0 = 0; v0 < 3000 / 4; v0++) { + v2 ^= v1[v0]; + } + + param0->unk_418.unk_BB8 = v2; + } + + param0->unk_418.unk_BBC = LCRNG_Next(); + CommSys_SendDataHuge(COMM_CMD_FIELD_RECORD_116, ¶m0->unk_418, sizeof(UnkStruct_ov59_021D30E0)); +} + +static int sub_02096400(void) +{ + return 0; +} + +static int sub_02096404(void) +{ + return 1; +} + +static int sub_02096408(void) +{ + return sizeof(UnkStruct_02096274); +} + +static u8 *sub_0209640C(int param0, void *param1, int param2) +{ + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param1; + return (u8 *)&v0->unk_FD8[param0]; +} diff --git a/src/unk_0209BDF8.c b/src/comm_command_spin_trade.c similarity index 53% rename from src/unk_0209BDF8.c rename to src/comm_command_spin_trade.c index 9df3790e01b..801706e73bb 100644 --- a/src/unk_0209BDF8.c +++ b/src/comm_command_spin_trade.c @@ -1,8 +1,10 @@ -#include "unk_0209BDF8.h" +#include "comm_command_spin_trade.h" #include #include +#include "constants/communication/comm_command.h" + #include "struct_defs/comm_cmd_table.h" #include "struct_defs/struct_0209BDF8.h" #include "struct_defs/struct_0209BF64.h" @@ -15,14 +17,14 @@ #include "overlay109/struct_ov109_021D1048.h" #include "overlay109/struct_ov109_021D17EC.h" +#include "comm_command.h" +#include "comm_command_field.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" #include "heap.h" -#include "unk_02032798.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" -#include "unk_02099500.h" #include "wireless_manager.h" typedef struct { @@ -33,7 +35,7 @@ typedef struct { static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u32 param3); static const CommCmdTable Unk_020F8EA8[135]; -static const UnkFuncPtr_020F8E60 Unk_020F8E60[18]; +static const CommCmdRecvFunc Unk_020F8E60[18]; UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, enum HeapID heapID) { @@ -57,7 +59,7 @@ void sub_0209BE38(UnkStruct_0209BDF8 *param0) void sub_0209BE50(UnkStruct_0209BDF8 *param0) { - CommCmd_Init(Unk_020F8EA8, 135, param0); + CommCmdManager_Init(Unk_020F8EA8, 135, param0); } void sub_0209BE64(UnkStruct_0209BDF8 *param0) @@ -79,7 +81,7 @@ static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *par v1->unk_00 = param1; memcpy(v1->unk_04, param2, param3); - v0 = CommSys_SendData(130, v1, 24); + v0 = CommSys_SendData(COMM_CMD_FIELD_SPIN_TRADE_130, v1, 24); return v0; } @@ -94,7 +96,7 @@ BOOL sub_0209BEBC(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u3 return sub_0209BE84(param0, param1, param2, param3); } -static void sub_0209BED0(int param0, int param1, void *param2, void *param3) +static void CommCmd_Field_SpinTrade_130(int param0, int param1, void *param2, void *param3) { UnkStruct_0209BE84 *v0 = param2; @@ -106,7 +108,7 @@ static void sub_0209BED0(int param0, int param1, void *param2, void *param3) Unk_020F8E60[v0->unk_00](param0, param1, v0->unk_04, param3); } -static void sub_0209BEF0(int param0, int param1, void *param2, void *param3) +static void CommCmd_Field_SpinTrade_131(int param0, int param1, void *param2, void *param3) { void *v0; UnkStruct_0209BDF8 *v1 = param3; @@ -357,120 +359,122 @@ void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1) return (void *)v0; } +// clang-format off static const CommCmdTable Unk_020F8EA8[135] = { - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_0209BED0, sub_0209C154, NULL }, - { sub_0209BEF0, sub_0209C158, sub_0209C160 } + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_FIELD_SPIN_TRADE_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_SpinTrade_130, sub_0209C154, NULL }, + [COMM_CMD_FIELD_SPIN_TRADE_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_SpinTrade_131, sub_0209C158, sub_0209C160 } }; +// clang-format on -static const UnkFuncPtr_020F8E60 Unk_020F8E60[18] = { +static const CommCmdRecvFunc Unk_020F8E60[18] = { sub_0209C040, sub_0209BF54, sub_0209BF64, diff --git a/src/unk_02095CD4.c b/src/comm_command_trade.c similarity index 58% rename from src/unk_02095CD4.c rename to src/comm_command_trade.c index 3fb0231b271..772607067d8 100644 --- a/src/unk_02095CD4.c +++ b/src/comm_command_trade.c @@ -1,8 +1,10 @@ -#include "unk_02095CD4.h" +#include "comm_command_trade.h" #include #include +#include "constants/communication/comm_command.h" + #include "struct_decls/struct_02095E80_decl.h" #include "struct_defs/comm_cmd_table.h" #include "struct_defs/struct_02095E80_t.h" @@ -10,16 +12,16 @@ #include "field/field_system.h" #include "overlay088/ov88_0223B140.h" +#include "comm_command.h" #include "communication_system.h" #include "pal_pad.h" #include "party.h" #include "unk_0202D778.h" -#include "unk_02032798.h" -void sub_02095DFC(int param0, int param1, void *param2, void *param3); -void sub_02095E28(int param0, int param1, void *param2, void *param3); -void sub_02095DBC(int param0, int param1, void *param2, void *param3); -void sub_02095DCC(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_28(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_29(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_31(int param0, int param1, void *param2, void *param3); +void CommCmd_Trade_32(int param0, int param1, void *param2, void *param3); static int sub_02095CE8(u8 param0); static int sub_02095E78(void); static int sub_02095E74(void); @@ -27,24 +29,26 @@ static u8 *sub_02095E80(int param0, void *param1, int param2); static int sub_02095E68(void); static int sub_02095E70(void); +// clang-format off static const CommCmdTable Unk_020F59BC[] = { - { sub_02095CFC, sub_02095E78, sub_02095E80 }, - { sub_02095D74, CommPacketSizeOf_NetId }, - { sub_02095D94, CommPacketSizeOf_NetId }, - { sub_02095DA4, CommPacketSizeOf_NetId }, - { sub_02095DA8, CommPacketSizeOf_NetId }, - { sub_02095DAC, CommPacketSizeOf_NetId }, - { sub_02095DFC, sub_02095E74, sub_02095E80 }, - { sub_02095E28, sub_02095E68, sub_02095E80 }, - { sub_02095DB8, CommPacketSizeOf_Nothing }, - { sub_02095DBC, CommPacketSizeOf_NetId }, - { sub_02095DCC, sub_02095E70 } + [COMM_CMD_TRADE_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_22, sub_02095E78, sub_02095E80 }, + [COMM_CMD_TRADE_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_23, CommPacketSizeOf_NetId }, + [COMM_CMD_TRADE_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_24, CommPacketSizeOf_NetId }, + [COMM_CMD_TRADE_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_25, CommPacketSizeOf_NetId }, + [COMM_CMD_TRADE_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_26, CommPacketSizeOf_NetId }, + [COMM_CMD_TRADE_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_27, CommPacketSizeOf_NetId }, + [COMM_CMD_TRADE_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_28, sub_02095E74, sub_02095E80 }, + [COMM_CMD_TRADE_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_29, sub_02095E68, sub_02095E80 }, + [COMM_CMD_TRADE_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_30, CommPacketSizeOf_Nothing }, + [COMM_CMD_TRADE_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_31, CommPacketSizeOf_NetId }, + [COMM_CMD_TRADE_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_32, sub_02095E70 } }; +// clang-format on void sub_02095CD4(void *param0) { int v0 = sizeof(Unk_020F59BC) / sizeof(CommCmdTable); - CommCmd_Init(Unk_020F59BC, v0, param0); + CommCmdManager_Init(Unk_020F59BC, v0, param0); } static int sub_02095CE8(u8 param0) @@ -60,7 +64,7 @@ static int sub_02095CE8(u8 param0) return param0 - 6; } -void sub_02095CFC(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_22(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; UnkStruct_02095E80 *v1 = fieldSystem->unk_88; @@ -71,7 +75,7 @@ void sub_02095CFC(int param0, int param1, void *param2, void *param3) if ((v1->unk_58) * (236 * 6 + 4 * 2) >= Party_SaveSize()) { if (CommSys_CurNetId() == 1) { - ov88_0223D058(v1, 27, 0); + ov88_0223D058(v1, COMM_CMD_TRADE_27, 0); } else { ov88_0223D098(CommSys_CurNetId(), v1->unk_2270, v1->unk_50); } @@ -83,7 +87,7 @@ void sub_02095CFC(int param0, int param1, void *param2, void *param3) } } -void sub_02095D74(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_23(int param0, int param1, void *param2, void *param3) { UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; u8 *v1 = (u8 *)param2; @@ -93,7 +97,7 @@ void sub_02095D74(int param0, int param1, void *param2, void *param3) } } -void sub_02095D94(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_24(int param0, int param1, void *param2, void *param3) { UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; u8 *v1 = (u8 *)param2; @@ -101,28 +105,28 @@ void sub_02095D94(int param0, int param1, void *param2, void *param3) v0->unk_60[param0] = *v1; } -void sub_02095DA4(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_25(int param0, int param1, void *param2, void *param3) { return; } -void sub_02095DA8(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_26(int param0, int param1, void *param2, void *param3) { return; } -void sub_02095DAC(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_27(int param0, int param1, void *param2, void *param3) { UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; v0->unk_54 = 2; } -void sub_02095DB8(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_30(int param0, int param1, void *param2, void *param3) { return; } -void sub_02095DBC(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_31(int param0, int param1, void *param2, void *param3) { UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; u8 *v1 = (u8 *)param2; @@ -130,7 +134,7 @@ void sub_02095DBC(int param0, int param1, void *param2, void *param3) v0->unk_2318 = *v1; } -void sub_02095DCC(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_32(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; int v1; @@ -150,7 +154,7 @@ void sub_02095DCC(int param0, int param1, void *param2, void *param3) } } -void sub_02095DFC(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_28(int param0, int param1, void *param2, void *param3) { UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; @@ -160,7 +164,7 @@ void sub_02095DFC(int param0, int param1, void *param2, void *param3) } } -void sub_02095E28(int param0, int param1, void *param2, void *param3) +void CommCmd_Trade_29(int param0, int param1, void *param2, void *param3) { UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; diff --git a/src/comm_command_waiting_room.c b/src/comm_command_waiting_room.c new file mode 100644 index 00000000000..b94232bf0df --- /dev/null +++ b/src/comm_command_waiting_room.c @@ -0,0 +1,28 @@ +#include "comm_command_waiting_room.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "unk_0209C390.h" + +// clang-format off +static const CommCmdTable Unk_020E5F24[] = { + [COMM_CMD_WAITING_ROOM_22 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_22, sub_0209C3C8, NULL }, + [COMM_CMD_WAITING_ROOM_23 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_23, sub_0209C3C4, NULL }, + [COMM_CMD_WAITING_ROOM_24 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_24, sub_0209C3CC, NULL } +}; +// clang-format on + +const CommCmdTable *sub_02039A58(void) +{ + return Unk_020E5F24; +} + +int sub_02039A60(void) +{ + return sizeof(Unk_020E5F24) / sizeof(CommCmdTable); +} diff --git a/src/comm_manager.c b/src/comm_manager.c index 1101c3c1275..0b12172fc04 100644 --- a/src/comm_manager.c +++ b/src/comm_manager.c @@ -5,6 +5,7 @@ #include #include "constants/communication/comm_available_connections.h" +#include "constants/communication/comm_command.h" #include "constants/communication/comm_error.h" #include "constants/communication/comm_type.h" @@ -14,6 +15,7 @@ #include "battle_regulation.h" #include "bg_window.h" +#include "comm_command.h" #include "communication_information.h" #include "communication_system.h" #include "heap.h" @@ -24,7 +26,6 @@ #include "system.h" #include "trainer_info.h" #include "unk_0203266C.h" -#include "unk_02032798.h" #include "unk_02033200.h" #include "unk_02039814.h" #include "wireless_manager.h" @@ -175,7 +176,7 @@ static void CommManager_Initialize(SaveData *saveData, int commType) sCommMan->commType = commType; CommSys_Seed(&sCommMan->rand); - CommCmd_Init(NULL, 0, NULL); + CommCmdManager_Init(NULL, 0, NULL); if ((commType != COMM_TYPE_UNION) && (commType != COMM_TYPE_PARTY) && (commType != COMM_TYPE_MYSTERY_GIFT)) { NetworkIcon_Init(); @@ -191,7 +192,7 @@ static void CommManager_Free(void) return; } - sub_020327E0(); + CommCmdManager_Free(); if (sCommMan->unk_00) { Heap_Free(sCommMan->unk_00); @@ -1480,7 +1481,7 @@ static void CommTask_ConnectUnionClient(void) } if (sCommMan->timer > (120 - 10)) { - CommSys_SendDataFixedSize(6, sFreakConfirmationMessage); + CommSys_SendDataFixedSize(COMM_CMD_VALIDATE_CONFIRMATION, sFreakConfirmationMessage); } if (sCommMan->timer != 0) { @@ -1578,10 +1579,10 @@ void CommManager_StartDrawServer(void) if (CommSys_CurNetId() == 0) { u8 data = 0; - CommSys_SendDataFixedSize(10, &data); + CommSys_SendDataFixedSize(COMM_CMD_10, &data); } else { u8 data = 0; - CommSys_SendDataFixedSize(10, &data); + CommSys_SendDataFixedSize(COMM_CMD_10, &data); } } @@ -1744,7 +1745,7 @@ static void CommTask_ConnectingDraw(void) * @param confirmationMessage * @param unused_3 */ -void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg, void *unused_3) +void CommCmd_ValidateConfirmationMessage(int netID, int unused_1, void *msg, void *unused_3) { int i; u8 *confirmation = msg; @@ -1766,13 +1767,13 @@ void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg, if (success && (!sCommMan->pauseUnion)) { sGameConfirmationMessage[0] = netID; // "[netID]GAME" indicates a success - CommSys_SendDataFixedSizeServer(7, sGameConfirmationMessage); + CommSys_SendDataFixedSizeServer(COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE, sGameConfirmationMessage); return; } // "[netID]FULL" indicates a failure sFullConfirmationMessage[0] = netID; - CommSys_SendDataFixedSizeServer(7, sFullConfirmationMessage); + CommSys_SendDataFixedSizeServer(COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE, sFullConfirmationMessage); } /** @@ -1783,7 +1784,7 @@ void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg, * @param confirmationMessage * @param unused_3 */ -void CommManager_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *msg, void *unused_3) +void CommCmd_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *msg, void *unused_3) { u8 netID; int i; @@ -2363,7 +2364,7 @@ static void CommTask_EndMatchmakingWifi(void) /** * @brief Ends wifi matchmaking and sets the disconnected from wifi flag. Params unused */ -void CommManager_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3) +void CommCmd_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3) { if (CommSys_CurNetId() == 0) { sCommMan->unk_4C = 0; @@ -2516,7 +2517,7 @@ void CommManager_EndBattleWifiMatch(void) { u8 netID = CommSys_CurNetId(); - CommSys_SendDataFixedSize(21, &netID); + CommSys_SendDataFixedSize(COMM_CMD_DISCONNECT_WIFI, &netID); } /** diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 4ca08f2871e..c8f9e0f147b 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -5,6 +5,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/communication/comm_packets.h" #include "constants/heap.h" #include "generated/movement_actions.h" @@ -281,7 +282,7 @@ void CommPlayer_SendXZPos(BOOL param0, int x, int z) data[4] = data[4] | 0x80; } - CommSys_SendDataFixedSize(22, data); + CommSys_SendDataFixedSize(COMM_CMD_RECV_PLAYER_LOCATION, data); sCommPlayerManager->sendAllPos = TRUE; } @@ -330,7 +331,7 @@ static void CommPlayer_SendPosNetId(int netId, const CommPlayerLocation *playerL data[0] += ((playerLocation->dir % 4) << 4); data[0] += (playerLocation->moveSpeed << 6); - CommSys_SendDataServer(23, data, 0); + CommSys_SendDataServer(COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT, data, 0); } void CommPlayer_SendDataTask(void *data) @@ -527,7 +528,7 @@ static void sub_02057EF8(void *unused) } u8 netId_u8 = netId; - CommPlayer_RecvDelete(0, 1, &netId_u8, sCommPlayerManager->fieldSystem); + CommCmd_DeletePlayer(0, 1, &netId_u8, sCommPlayerManager->fieldSystem); } } } @@ -548,7 +549,7 @@ void sub_02057FC4(BOOL param0) sCommPlayerManager->isFieldSystemActive = param0; } - CommSys_SendDataFixedSize(62, &sCommPlayerManager->isFieldSystemActive); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_62, &sCommPlayerManager->isFieldSystemActive); } } @@ -557,12 +558,12 @@ static void sub_02057FF0(BOOL param0) if (sCommPlayerManager != NULL) { if (sCommPlayerManager->isFieldSystemActive != param0) { sCommPlayerManager->isFieldSystemActive = param0; - CommSys_SendDataFixedSize(62, &sCommPlayerManager->isFieldSystemActive); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_62, &sCommPlayerManager->isFieldSystemActive); } } } -void sub_02058018(int netId, int param1, void *param2, void *unused) +void CommCmd_Field_62(int netId, int param1, void *param2, void *unused) { u8 *buffer = (u8 *)param2; @@ -757,7 +758,7 @@ static void CommPlayer_Move(SysTask *unused0, void *unused1) u8 data = netId; sCommPlayerManager->holeMovementsLeft[netId] = 1; - CommSys_SendDataFixedSizeServer(40, &data); + CommSys_SendDataFixedSizeServer(COMM_CMD_ESCAPE_HOLE, &data); continue; } @@ -796,7 +797,7 @@ static void CommPlayer_Move(SysTask *unused0, void *unused1) if (sCommPlayerManager->alteredMovementStepsLeft[netId] == 0) { u8 v10 = 1; - Traps_EscapeTrapServer(netId, 1, &v10, NULL); + CommCmd_EscapeTrapServer(netId, 1, &v10, NULL); } } } @@ -805,7 +806,7 @@ static void CommPlayer_Move(SysTask *unused0, void *unused1) } } -void CommPlayer_RecvLocation(int netId, int unused0, void *src, void *unused1) +void CommCmd_RecvPlayerLocation(int netId, int unused0, void *src, void *unused1) { u8 *buffer = (u8 *)src; CommPlayerLocation *playerLocation; @@ -845,7 +846,7 @@ void CommPlayer_RecvLocation(int netId, int unused0, void *src, void *unused1) } } -void CommPlayer_RecvDelete(int unused0, int unused1, void *src, void *unused2) +void CommCmd_DeletePlayer(int unused0, int unused1, void *src, void *unused2) { u8 *buffer = (u8 *)src; u8 netId = buffer[0]; @@ -875,7 +876,7 @@ int CommPacketSizeOf_RecvLocation(void) return COMM_PACKET_SIZE_LOCATION; } -void CommPlayer_RecvLocationAndInit(int netId, int size, void *src, void *unused) +void CommCmd_RecvPlayerLocationAndInit(int netId, int size, void *src, void *unused) { u8 *buffer = (u8 *)src; CommPlayerLocation *playerLocation; @@ -1135,7 +1136,7 @@ static BOOL CommPlayer_MoveSlide(int netId, int speed) } else if (sCommPlayerManager->slideTilesLeft[netId] == 0) { u8 data = 1; - Traps_EscapeTrapServer(netId, 1, &data, NULL); + CommCmd_EscapeTrapServer(netId, 1, &data, NULL); return TRUE; } @@ -1495,7 +1496,7 @@ BOOL sub_020590C4(void) return v8; } -void sub_02059180(int netId, int unused0, void *src, void *unused3) +void CommCmd_Field_94(int netId, int unused0, void *src, void *unused3) { u8 *buffer = src; @@ -1539,7 +1540,7 @@ static void sub_020591A8(void) for (netJd = 0; netJd < connectedPlayers; netJd++) { if ((CommPlayer_GetXServerIfActive(netId) == v6[netJd].unk_00) && (CommPlayer_GetZServerIfActive(netId) == v6[netJd].unk_02)) { sCommPlayerManager->unk_F2[netId] = 1; - CommSys_SendDataFixedSizeServer(95, &netId); + CommSys_SendDataFixedSizeServer(COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM, &netId); } } } @@ -1677,7 +1678,7 @@ void CommPlayerMan_ResumeFieldSystemWithContextBit(int contextBit) if (sCommPlayerManager->pauseBits == PAUSE_BIT_TRAPS) { u8 data = 1; - CommSys_SendDataFixedSize(62, &data); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_62, &data); } if (sCommPlayerManager->pauseBits == 0) { diff --git a/src/communication_information.c b/src/communication_information.c index 2e6db313018..74c7023ec92 100644 --- a/src/communication_information.c +++ b/src/communication_information.c @@ -4,6 +4,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/heap.h" #include "struct_decls/wi_fi_list.h" @@ -145,7 +146,7 @@ void CommInfo_SendPlayerInfo(void) BattleRegulation_Copy(sCommInfo->regulation, (BattleRegulation *)sCommInfo->playerInfo[netId].regulationBuffer); } - CommSys_SendData(3, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo)); + CommSys_SendData(COMM_CMD_RECV_PLAYER_INFO, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo)); } int CommPlayerInfo_Size(void) @@ -153,7 +154,7 @@ int CommPlayerInfo_Size(void) return sizeof(CommPlayerInfo); } -void CommunicatitonInformaion_FinishReading(int unused0, int unused1, void *unused2, void *unused3) +void CommCmd_FinishRecvPlayerInfo(int unused0, int unused1, void *unused2, void *unused3) { if (sCommInfo) { sCommInfo->dataFinishedReading = TRUE; @@ -167,7 +168,7 @@ BOOL CommInfo_IsDataFinishedReading(void) return sCommInfo->dataFinishedReading; } -void CommInfo_RecvPlayerDataArray(int netId, int param1, void *src, void *unused) +void CommCmd_RecvPlayerInfoArray(int netId, int param1, void *src, void *unused) { CommPlayerInfo *playerInfo = (CommPlayerInfo *)src; @@ -195,7 +196,7 @@ void CommInfo_RecvPlayerDataArray(int netId, int param1, void *src, void *unused } } -void CommInfo_RecvPlayerData(int netId, int param1, void *src, void *param3) +void CommCmd_RecvPlayerInfo(int netId, int param1, void *src, void *param3) { if (!sCommInfo) { return; diff --git a/src/communication_system.c b/src/communication_system.c index 652d64aebf9..57cdcec35fa 100644 --- a/src/communication_system.c +++ b/src/communication_system.c @@ -4,6 +4,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/heap.h" #include "struct_defs/comm_queue_man.h" @@ -12,6 +13,7 @@ #include "nintendo_wfc/main.h" +#include "comm_command.h" #include "comm_manager.h" #include "comm_ring.h" #include "communication_information.h" @@ -22,7 +24,6 @@ #include "system.h" #include "unk_020322D8.h" #include "unk_0203266C.h" -#include "unk_02032798.h" #include "unk_02033200.h" #include "unk_020363E8.h" #include "wireless_manager.h" @@ -1404,7 +1405,7 @@ int CommSys_SendRingRemainingSize(void) static void CommSys_EndCallback(int netId, int command, int param2, void *param3, CommRecvPackage *param4) { - CommCmd_Callback(netId, command, param2, param3); + CommCommCmdManager_Callback(netId, command, param2, param3); param4->unk_0A = 0xee; param4->unk_08 = 0xffff; param4->unk_04 = NULL; @@ -1437,7 +1438,7 @@ static void CommSys_RecvDataSingle(CommRing *ring, int netId, u8 *buffer, CommRe if (param3->unk_08 != 0xffff) { size = param3->unk_08; } else { - size = CommCmd_PacketSizeOf(cmd); + size = CommCmdManager_PacketSizeOf(cmd); if (sCommunicationSystem->unk_6B1) { return; @@ -1457,9 +1458,9 @@ static void CommSys_RecvDataSingle(CommRing *ring, int netId, u8 *buffer, CommRe param3->unk_08 = size; } - if (sub_020328D0(cmd)) { + if (CommCmdManager_CheckCmdHasBuffer(cmd)) { if (param3->unk_04 == NULL) { - param3->unk_04 = sub_0203290C(cmd, netId, param3->unk_08); + param3->unk_04 = CommCmdManager_TryCreateRecvBuffer(cmd, netId, param3->unk_08); } v3 = CommRing_Read(ring, buffer, size - param3->unk_00); @@ -1672,9 +1673,9 @@ static void CommSys_Transmission(void) switch (sCommunicationSystem->transmissionState) { case 1: if (CommSys_TransmissionType() == 1) { - v0 = CommSys_SendDataFixedSize(11, &sCommunicationSystem->unk_6A4); + v0 = CommSys_SendDataFixedSize(COMM_CMD_11, &sCommunicationSystem->unk_6A4); } else { - v0 = CommSys_SendDataServer(11, &sCommunicationSystem->unk_6A4, 1); + v0 = CommSys_SendDataServer(COMM_CMD_11, &sCommunicationSystem->unk_6A4, 1); } if (v0) { @@ -1682,7 +1683,7 @@ static void CommSys_Transmission(void) } break; case 3: - if (CommSys_SendDataFixedSize(12, &sCommunicationSystem->unk_6A4)) { + if (CommSys_SendDataFixedSize(COMM_CMD_12, &sCommunicationSystem->unk_6A4)) { CommSys_SwitchTransitionType(sCommunicationSystem->unk_6A4); sCommunicationSystem->transmissionState = 0; } @@ -1690,7 +1691,7 @@ static void CommSys_Transmission(void) } } -void sub_02036008(int unused0, int unused1, void *param2, void *unused3) +void CommCmd_10(int unused0, int unused1, void *param2, void *unused3) { u8 *v0 = param2; @@ -1702,7 +1703,7 @@ void sub_02036008(int unused0, int unused1, void *param2, void *unused3) sCommunicationSystem->unk_6A4 = v0[0]; } -void sub_02036030(int unused0, int unused1, void *param2, void *unused3) +void CommCmd_11(int unused0, int unused1, void *param2, void *unused3) { u8 *v0 = param2; @@ -1714,7 +1715,7 @@ void sub_02036030(int unused0, int unused1, void *param2, void *unused3) sCommunicationSystem->transmissionState = 3; } -void sub_02036058(int unused0, int unused1, void *param2, void *unused3) +void CommCmd_12(int unused0, int unused1, void *param2, void *unused3) { u8 *v0 = param2; @@ -1815,7 +1816,7 @@ BOOL CommSys_IsAlone(void) return FALSE; } -void sub_0203619C(int param0, int param1, void *param2, void *param3) +void CommCmd_2(int param0, int param1, void *param2, void *param3) { u8 v0; diff --git a/src/contest.c b/src/contest.c index bde60c05f03..16bd45c4f41 100644 --- a/src/contest.c +++ b/src/contest.c @@ -32,6 +32,7 @@ #include "assert.h" #include "brightness_controller.h" #include "chatot_cry.h" +#include "comm_command_contest.h" #include "communication_information.h" #include "communication_system.h" #include "field_task.h" @@ -58,7 +59,6 @@ #include "unk_020298BC.h" #include "unk_020363E8.h" #include "unk_02094EDC.h" -#include "unk_02095AF0.h" #include "vars_flags.h" FS_EXTERN_OVERLAY(overlay17); diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c index 6055f930cc6..366e9845079 100644 --- a/src/field_comm_manager.c +++ b/src/field_comm_manager.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/communication/comm_sync.h" #include "constants/communication/comm_type.h" #include "constants/graphics.h" @@ -14,6 +15,7 @@ #include "underground/manager.h" #include "appearance.h" +#include "comm_command_field.h" #include "comm_manager.h" #include "comm_player_manager.h" #include "communication_information.h" @@ -33,7 +35,6 @@ #include "unk_02033200.h" #include "unk_020363E8.h" #include "unk_0205A0D8.h" -#include "unk_02099500.h" static void FieldCommManager_RunTask(SysTask *task, void *unused); static void FieldCommManager_SetTask(FieldCommTask task, int time); @@ -479,7 +480,7 @@ static void FieldCommTask_EnterBattleRoom_SendPos(void) CommPlayer_SendPos(FALSE); u8 data = 1; - CommSys_SendDataFixedSize(94, &data); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data); StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1); ResetVisibleHardwareWindows(DS_SCREEN_MAIN); @@ -524,7 +525,7 @@ static void FieldCommTask_WaitBattleRoomMovement(void) sFieldCommMan->battleRoomMovement = FALSE; u8 data = 1; - CommSys_SendDataFixedSize(94, &data); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data); FieldCommManager_SetTask(FieldCommTask_BattleRoomMovement, 0); } @@ -549,7 +550,7 @@ static void FieldCommManager_UnknownCallback(BOOL param0, const Party *party) FieldCommManager_SetTask(FieldCommTask_InitializeVsBattle, 3); } else { u8 data = 3; - CommSys_SendDataFixedSize(94, &data); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data); FieldCommManager_SetTask(FieldCommTask_WaitBattleRoomMovement, 0); } @@ -591,7 +592,7 @@ static void FieldCommTask_BattleRoomMovement(void) FieldCommManager_SetTask(FieldCommTask_02059C8C, 5); u8 data = 0; - CommSys_SendDataFixedSize(94, &data); + CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data); } FieldCommManager_CheckExitRoom(); @@ -605,7 +606,7 @@ static void FieldCommTask_BattleRoomMovement(void) * @param message * @param unused3 */ -void FieldCommManager_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3) +void CommCmd_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3) { u8 *data = message; @@ -756,7 +757,7 @@ static void FieldCommTask_ReinitBattleClient(void) * @param unused2 * @param unused3 */ -void FieldCommManager_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3) +void CommCmd_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3) { sFieldCommMan->trainerCaseCopied[netId] = 1; } @@ -784,7 +785,7 @@ static void FieldCommTask_StartCopyTrainerCase(void) int netId = CommSys_CurNetId(); if (CommTiming_IsSyncState(SYNC_SEND_TRAINER_CASE)) { - CommSys_SendDataHuge(88, sFieldCommMan->trainerCase[netId], sizeof(TrainerCase)); + CommSys_SendDataHuge(COMM_CMD_TRAINER_CASE_COPIED, sFieldCommMan->trainerCase[netId], sizeof(TrainerCase)); FieldCommManager_SetTask(FieldCommTask_CopyTrainerCase, 0); } } diff --git a/src/main_menu/comm_command_mystery_gift.c b/src/main_menu/comm_command_mystery_gift.c new file mode 100644 index 00000000000..48ab69eddba --- /dev/null +++ b/src/main_menu/comm_command_mystery_gift.c @@ -0,0 +1,25 @@ +#include "main_menu/comm_command_mystery_gift.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "main_menu/ov97_0222D04C.h" + +#include "comm_command.h" + +// clang-format off +static const CommCmdTable Unk_ov97_0223D704[] = { + [COMM_CMD_MYSTERY_GIFT_22 - COMM_CMD_MAX_COMMON] = { CommCmd_MysteryGift_22, ov97_0222D2B0, ov97_0222D2B8 }, + [COMM_CMD_MYSTERY_GIFT_23 - COMM_CMD_MAX_COMMON] = { CommCmd_MysteryGift_23, CommPacketSizeOf_Nothing, NULL } +}; +// clang-format on + +void ov97_0222D2F8(void *param0) +{ + int v0 = sizeof(Unk_ov97_0223D704) / sizeof(CommCmdTable); + CommCmdManager_Init(Unk_ov97_0223D704, v0, param0); +} diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c index f9ee973faae..699947d5138 100644 --- a/src/main_menu/ov97_0222D04C.c +++ b/src/main_menu/ov97_0222D04C.c @@ -3,8 +3,10 @@ #include #include +#include "constants/communication/comm_command.h" + +#include "main_menu/comm_command_mystery_gift.h" #include "main_menu/mystery_gift_app.h" -#include "main_menu/ov97_0222D2F8.h" #include "comm_manager.h" #include "communication_information.h" @@ -172,7 +174,7 @@ void ov97_0222D1C4(MysteryGiftAppData *param0, SaveData *saveData, int param2) void ov97_0222D1F0(const void *param0, int param1) { - CommSys_SendDataHugeServer(22, param0, param1); + CommSys_SendDataHugeServer(COMM_CMD_MYSTERY_GIFT_22, param0, param1); } void ov97_0222D200(MysteryGiftAppData *param0, int param1) @@ -215,7 +217,7 @@ int ov97_0222D250(MysteryGiftAppData *param0) return -1; } -void ov97_0222D284(int param0, int param1, void *param2, void *param3) +void CommCmd_MysteryGift_22(int param0, int param1, void *param2, void *param3) { if (Unk_ov97_0223F1A4->unk_27 != param0) { return; @@ -239,7 +241,7 @@ u8 *ov97_0222D2B8(int param0, void *param1, int param2) return (u8 *)&Unk_ov97_0223F1A4->unk_68; } -void ov97_0222D2C4(int param0, int param1, void *param2, void *param3) +void CommCmd_MysteryGift_23(int param0, int param1, void *param2, void *param3) { Unk_ov97_0223F1A4->unk_3C1[param0] = 1; } diff --git a/src/main_menu/ov97_0222D2F8.c b/src/main_menu/ov97_0222D2F8.c deleted file mode 100644 index 16c6e96e8a2..00000000000 --- a/src/main_menu/ov97_0222D2F8.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "main_menu/ov97_0222D2F8.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "main_menu/ov97_0222D04C.h" - -#include "unk_02032798.h" - -static const CommCmdTable Unk_ov97_0223D704[] = { - { ov97_0222D284, ov97_0222D2B0, ov97_0222D2B8 }, - { ov97_0222D2C4, CommPacketSizeOf_Nothing, NULL } -}; - -void ov97_0222D2F8(void *param0) -{ - int v0 = sizeof(Unk_ov97_0223D704) / sizeof(CommCmdTable); - CommCmd_Init(Unk_ov97_0223D704, v0, param0); -} diff --git a/src/meson.build b/src/meson.build index efd24e03ab2..f2c7ab5e50c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -144,7 +144,7 @@ pokeplatinum_c = files( 'comm_ring.c', 'unk_020322D8.c', 'unk_0203266C.c', - 'unk_02032798.c', + 'comm_command.c', 'communication_information.c', 'unk_02033200.c', 'communication_system.c', @@ -156,7 +156,7 @@ pokeplatinum_c = files( 'unk_0203909C.c', 'network_icon.c', 'unk_02039814.c', - 'unk_02039A58.c', + 'comm_command_waiting_room.c', 'unk_02039A64.c', 'map_matrix.c', 'map_header_data.c', @@ -279,7 +279,7 @@ pokeplatinum_c = files( 'dexmode_checker.c', 'height_weight_data.c', 'battle_regulation_validation.c', - 'unk_0207A6DC.c', + 'comm_command_battle.c', 'evolution.c', 'unk_0207C63C.c', 'type_icon.c', @@ -311,10 +311,10 @@ pokeplatinum_c = files( 'unk_02092494.c', 'contest.c', 'unk_02094EDC.c', - 'unk_02095AF0.c', - 'unk_02095CD4.c', - 'unk_02095E98.c', - 'unk_020961E8.c', + 'comm_command_contest.c', + 'comm_command_trade.c', + 'comm_command_draw.c', + 'comm_command_record_corner.c', 'item_use_pokemon.c', 'unk_020972FC.c', 'berry_data.c', @@ -328,7 +328,7 @@ pokeplatinum_c = files( 'pokedex_data_index.c', 'applications/poffin_case/main.c', 'poffin_sprite.c', - 'unk_02099500.c', + 'comm_command_field.c', 'wifi_overlays.c', 'unk_02099604.c', 'unk_020996D0.c', @@ -345,8 +345,8 @@ pokeplatinum_c = files( 'unk_0209B344.c', 'unk_0209B6F8.c', 'unk_0209BA18.c', - 'unk_0209BA80.c', - 'unk_0209BDF8.c', + 'comm_command_frontier.c', + 'comm_command_spin_trade.c', 'unk_0209C194.c', 'unk_0209C370.c', 'unk_0209C390.c', @@ -827,7 +827,7 @@ pokeplatinum_c = files( 'overlay082/ov82_0223B2E0.c', 'overlay083/ov83_0223B5A0.c', 'overlay083/ov83_0223C958.c', - 'overlay083/ov83_0223D144.c', + 'overlay083/comm_command_poffin_cooking.c', 'overlay083/ov83_0223D150.c', 'overlay083/ov83_0223D4CC.c', 'overlay083/ov83_0223D6A8.c', @@ -874,7 +874,7 @@ pokeplatinum_c = files( 'main_menu/main_menu.c', 'main_menu/ranger_link.c', 'main_menu/ov97_0222D04C.c', - 'main_menu/ov97_0222D2F8.c', + 'main_menu/comm_command_mystery_gift.c', 'main_menu/mystery_gift_app.c', 'main_menu/wonder_cards_app.c', 'main_menu/ov97_02232054.c', @@ -987,14 +987,14 @@ pokeplatinum_c = files( 'overlay113/ov113_02260620.c', 'overlay113/ov113_022607D8.c', 'overlay114/ov114_0225C700.c', - 'overlay114/ov114_02260038.c', + 'overlay114/comm_command_minigame.c', 'overlay114/ov114_02260044.c', 'overlay115/ov115_02260440.c', 'overlay115/ov115_02260BBC.c', 'overlay115/ov115_02260CEC.c', - 'overlay115/ov115_02265A18.c', + 'overlay115/comm_command_swalot_plop.c', 'overlay115/ov115_02265A24.c', - 'overlay116/ov116_02260440.c', + 'overlay116/comm_command_mime_jr_top.c', 'overlay116/ov116_022604C4.c', 'overlay116/ov116_02261870.c', 'overlay116/ov116_02262A44.c', @@ -1006,7 +1006,7 @@ pokeplatinum_c = files( 'overlay117/ov117_022626B0.c', 'overlay117/ov117_02263AF0.c', 'overlay117/ov117_02266498.c', - 'overlay117/ov117_022665FC.c', + 'overlay117/comm_command_wobbuffet_pop.c', 'overlay117/ov117_022666C0.c', 'applications/party_menu/form_change.c', 'cutscenes/egg_hatch/graphics.c', diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index 27117595c78..f6bff3dffb9 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "struct_defs/struct_020954F0.h" #include "overlay006/struct_ov6_02248BE8.h" @@ -24,7 +26,7 @@ typedef struct { static int ov6_02248A94(UnkStruct_ov6_02248A94 *param0[4], int connectionCount, u8 *param2); -void ov6_022489E4(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_26(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; @@ -54,7 +56,7 @@ BOOL ov6_02248A64(Contest *param0) v0.unk_01 = param0->unk_00.playerContestantID; v0.unk_02 = param0->unk_00.unk_112; - if (CommSys_SendData(26, &v0, sizeof(UnkStruct_ov6_02248A94)) == 1) { + if (CommSys_SendData(COMM_CMD_CONTEST_26, &v0, sizeof(UnkStruct_ov6_02248A94)) == 1) { return 1; } @@ -75,7 +77,7 @@ static int ov6_02248A94(UnkStruct_ov6_02248A94 *param0[4], int connectionCount, return v1; } -void ov6_02248AC8(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_27(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; int v1; @@ -102,7 +104,7 @@ BOOL ov6_02248AF0(Contest *param0, int param1, const Pokemon *param2) MI_CpuCopy8(param2, v0, v1); v0[v1] = param1; - if (CommSys_SendData(27, v0, v1 + 1) == 1) { + if (CommSys_SendData(COMM_CMD_CONTEST_27, v0, v1 + 1) == 1) { v2 = 1; } else { v2 = 0; @@ -112,7 +114,7 @@ BOOL ov6_02248AF0(Contest *param0, int param1, const Pokemon *param2) return v2; } -void ov6_02248B30(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_28(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; int v1, v2; @@ -145,7 +147,7 @@ BOOL ov6_02248B70(Contest *param0, Pokemon **param1) MI_CpuCopy8(param1[v4], &v0[v1 * v4], v1); } - if (CommSys_SendDataHuge(28, v0, v2) == 1) { + if (CommSys_SendDataHuge(COMM_CMD_CONTEST_28, v0, v2) == 1) { v3 = 1; } else { v3 = 0; @@ -154,7 +156,7 @@ BOOL ov6_02248B70(Contest *param0, Pokemon **param1) return v3; } -void ov6_02248BC0(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_29(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; int v1; @@ -181,7 +183,7 @@ BOOL ov6_02248BE8(Contest *param0, int param1, const UnkStruct_ov6_02248BE8 *par MI_CpuCopy8(param2, v0, v1); v0[v1] = param1; - if (CommSys_SendData(29, v0, v1 + 1) == 1) { + if (CommSys_SendData(COMM_CMD_CONTEST_29, v0, v1 + 1) == 1) { v2 = 1; } else { v2 = 0; @@ -191,7 +193,7 @@ BOOL ov6_02248BE8(Contest *param0, int param1, const UnkStruct_ov6_02248BE8 *par return v2; } -void ov6_02248C28(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_30(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; int v1; @@ -226,7 +228,7 @@ BOOL ov6_02248C68(Contest *param0, int param1, const UnkStruct_020954F0 *param2) v0[v1 - 1] = param0->unk_00.unk_10E; - if (CommSys_SendData(30, v0, v1) == 1) { + if (CommSys_SendData(COMM_CMD_CONTEST_30, v0, v1) == 1) { v2 = 1; } else { v2 = 0; @@ -236,7 +238,7 @@ BOOL ov6_02248C68(Contest *param0, int param1, const UnkStruct_020954F0 *param2) return v2; } -void ov6_02248CBC(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_31(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; int contestantID, v2, v3; @@ -274,7 +276,7 @@ BOOL ov6_02248CE8(Contest *contest, int param1, const String *trainerNames) v2[2] = 0; v2[3] = 0; - if (CommSys_SendData(31, v2, v0 + v1) == 1) { + if (CommSys_SendData(COMM_CMD_CONTEST_31, v2, v0 + v1) == 1) { v3 = 1; } else { v3 = 0; @@ -284,7 +286,7 @@ BOOL ov6_02248CE8(Contest *contest, int param1, const String *trainerNames) return v3; } -void ov6_02248D38(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_36(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; int v1; @@ -315,7 +317,7 @@ BOOL ov6_02248D64(Contest *param0, int param1, void *param2) v0[v1] = param1; - if (CommSys_SendDataHuge(36, v0, v1 + 1) == 1) { + if (CommSys_SendDataHuge(COMM_CMD_CONTEST_36, v0, v1 + 1) == 1) { v2 = 1; } else { v2 = 0; @@ -324,7 +326,7 @@ BOOL ov6_02248D64(Contest *param0, int param1, void *param2) return v2; } -void ov6_02248DA0(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_37(int param0, int param1, void *param2, void *param3) { Contest *contest = param3; int v1; @@ -355,7 +357,7 @@ BOOL ov6_02248DD8(Contest *param0, int param1, const UnkStruct_ov6_02248DD8 *par MI_CpuCopy8(param2, v0, v1); v0[v1] = param1; - if (CommSys_SendData(37, v0, v1 + 1) == 1) { + if (CommSys_SendData(COMM_CMD_CONTEST_37, v0, v1 + 1) == 1) { v2 = 1; } else { v2 = 0; diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c index 65246eccc96..36a45c62935 100644 --- a/src/overlay017/ov17_0224CFB8.c +++ b/src/overlay017/ov17_0224CFB8.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "overlay017/ov17_0223DAD0.h" #include "overlay017/ov17_022492DC.h" #include "overlay017/ov17_0224A0FC.h" @@ -543,7 +545,7 @@ static void ov17_0224D6CC(SysTask *param0, void *param1) ov17_0224B20C(v0->unk_04, &v0->unk_08); v0->unk_12 = 0; } else { - if (CommSys_SendDataFixedSize(25, &v0->unk_08) == 1) { + if (CommSys_SendDataFixedSize(COMM_CMD_CONTEST_25, &v0->unk_08) == 1) { v0->unk_12 = 0; } } diff --git a/src/overlay017/ov17_0224F18C.c b/src/overlay017/ov17_0224F18C.c index 7ab2528de40..69299bf84f5 100644 --- a/src/overlay017/ov17_0224F18C.c +++ b/src/overlay017/ov17_0224F18C.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "overlay017/struct_ov17_02243C28.h" #include "overlay017/struct_ov17_02243C80.h" #include "overlay017/struct_ov17_0224F30C.h" @@ -143,7 +145,7 @@ BOOL ov17_0224F35C(UnkStruct_ov17_0224F30C *param0) v0 = (void *)param0->unk_10; - if (CommSys_SendDataHuge(24, param0->unk_10, v0->unk_00) == 1) { + if (CommSys_SendDataHuge(COMM_CMD_CONTEST_24, param0->unk_10, v0->unk_00) == 1) { param0->unk_A10 = 0; return 1; } diff --git a/src/overlay017/ov17_02252CEC.c b/src/overlay017/ov17_02252CEC.c index 91c88a1df5e..eb2ec51fea5 100644 --- a/src/overlay017/ov17_02252CEC.c +++ b/src/overlay017/ov17_02252CEC.c @@ -13,7 +13,7 @@ #include "contest.h" -void ov17_02252CEC(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_24(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; UnkStruct_ov17_0224F30C *v1; @@ -46,7 +46,7 @@ void ov17_02252CEC(int param0, int param1, void *param2, void *param3) v1->unk_A11[param0] = 1; } -void ov17_02252D7C(int param0, int param1, void *param2, void *param3) +void CommCmd_Contest_25(int param0, int param1, void *param2, void *param3) { Contest *v0 = param3; UnkStruct_ov17_0224DF54 *v1 = v0->unk_150; diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index b7e24fa7819..c55361c0698 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -47,6 +47,7 @@ #include "bg_window.h" #include "brightness_controller.h" +#include "comm_command_contest.h" #include "font.h" #include "game_options.h" #include "game_records.h" @@ -74,7 +75,6 @@ #include "unk_020298BC.h" #include "unk_020363E8.h" #include "unk_02094EDC.h" -#include "unk_02095AF0.h" #include "yes_no_touch_menu.h" typedef struct { diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 928829069f0..dbe730548e9 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -16,6 +16,7 @@ #include "overlay022/struct_ov22_0225AE9C.h" #include "bg_window.h" +#include "comm_command_contest.h" #include "font.h" #include "game_options.h" #include "message.h" @@ -29,7 +30,6 @@ #include "string_gf.h" #include "sys_task.h" #include "text.h" -#include "unk_02095AF0.h" static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1); static void ov22_0225A718(BgConfig *param0, const Options *options); diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index ef205b71883..b91821e1b25 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "struct_decls/struct_02095EAC_decl.h" #include "struct_defs/struct_0203DDFC.h" #include "struct_defs/struct_02095EAC_t.h" @@ -13,6 +15,7 @@ #include "bg_window.h" #include "char_transfer.h" +#include "comm_command_draw.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -48,7 +51,6 @@ #include "unk_020363E8.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" -#include "unk_02095E98.h" #include "vram_transfer.h" #include "wireless_manager.h" #include "yes_no_touch_menu.h" @@ -248,7 +250,7 @@ int ov58_021D0F08(ApplicationManager *appMan, int *param1) if (IsScreenFadeDone()) { if (CommSys_CurNetId() != 0) { if (ov58_021D2A30() >= 2) { - CommSys_SendData(128, NULL, 0); + CommSys_SendData(COMM_CMD_FIELD_DRAWING_128, NULL, 0); *param1 = 1; } break; @@ -1036,7 +1038,7 @@ static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1) ov58_021D2CB0(param0, 7); - CommSys_SendData(126, &v1, sizeof(UnkStruct_02095FE4)); + CommSys_SendData(COMM_CMD_FIELD_DRAWING_126, &v1, sizeof(UnkStruct_02095FE4)); Window_EraseMessageBox(¶m0->unk_33C, 1); } @@ -1095,7 +1097,7 @@ static int ov58_021D1FD4(UnkStruct_02095EAC *param0, int param1) v0.unk_02 = 1; v0.unk_00 = CommSys_CurNetId(); - CommSys_SendData(126, &v0, sizeof(UnkStruct_02095FE4)); + CommSys_SendData(COMM_CMD_FIELD_DRAWING_126, &v0, sizeof(UnkStruct_02095FE4)); param0->unk_941E = 0; ov58_021D2CB0(param0, 10); } @@ -1186,7 +1188,7 @@ static int ov58_021D2180(UnkStruct_02095EAC *param0, int param1) switch (v0) { case YES_NO_TOUCH_MENU_YES: ov58_021D2CB0(param0, 15); - CommSys_SendDataServer(127, NULL, 0); + CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_127, NULL, 0); StringTemplate_SetPlayerName(param0->unk_0C, 0, CommInfo_TrainerInfo(0)); param1 = 2; ov58_021D2D10(param0); @@ -1653,11 +1655,11 @@ static void ov58_021D29C8(UnkStruct_02095EAC *param0) if (sub_02036284()) { param0->unk_43DC.unk_09 = param0->unk_9458; param0->unk_9421[0] = param0->unk_43DC; - CommSys_SendDataServer(120, param0->unk_9421, 10 * 5); + CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_120, param0->unk_9421, 10 * 5); } } else { if (sub_0203629C()) { - CommSys_SendData(119, ¶m0->unk_43DC, 10); + CommSys_SendData(COMM_CMD_FIELD_DRAWING_119, ¶m0->unk_43DC, 10); } } } diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 500f481c326..ab40d3a0e7f 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "generated/trainer_score_events.h" #include "struct_decls/struct_020961E8_decl.h" @@ -16,6 +17,7 @@ #include "appearance.h" #include "bg_window.h" #include "char_transfer.h" +#include "comm_command_record_corner.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -54,7 +56,6 @@ #include "unk_02038ED4.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" -#include "unk_020961E8.h" #include "vram_transfer.h" #include "wireless_manager.h" @@ -245,7 +246,7 @@ int ov59_021D0F00(ApplicationManager *appMan, int *param1) if (CommSys_CurNetId() != 0) { if (ov59_021D2528() > 2) { - CommSys_SendData(114, NULL, 0); + CommSys_SendData(COMM_CMD_FIELD_RECORD_114, NULL, 0); } } } @@ -725,7 +726,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0) ov59_021D2628(param0, 3, 0); ov59_021D19B0(param0, 22); - CommSys_SendData(117, &v0, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v0, 1); ov59_021D28D8(param0, 0); } else { @@ -746,7 +747,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0) ov59_021D2628(param0, 4, 0); ov59_021D19B0(param0, 4); - CommSys_SendData(117, &v1, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v1, 1); ov59_021D28D8(param0, 0); } else { Sound_PlayEffect(SEQ_SE_DP_CUSTOM06); @@ -757,7 +758,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0) if ((CommSys_CurNetId() == 0) && (CommSys_ConnectedCount() == param0->unk_4AAC)) { u8 v2 = 0; - CommSys_SendData(117, &v2, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v2, 1); } } } @@ -797,7 +798,7 @@ static int ov59_021D19E4(UnkStruct_020961E8 *param0, int param1) if (CommSys_CurNetId() == 0) { int v0 = 0; - CommSys_SendData(117, &v0, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v0, 1); } param0->unk_3A8 = 3; @@ -860,7 +861,7 @@ static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1) if (CommSys_CurNetId() == 0) { int v2 = 0; - CommSys_SendData(117, &v2, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v2, 1); ov59_021D28D8(param0, 1); } @@ -881,7 +882,7 @@ static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1) param0->unk_4AC2 = 0; param0->unk_3A8 = 6; - CommSys_SendData(112, &v3, sizeof(UnkStruct_02096274)); + CommSys_SendData(COMM_CMD_FIELD_RECORD_112, &v3, sizeof(UnkStruct_02096274)); } } @@ -920,7 +921,7 @@ static int ov59_021D1B8C(UnkStruct_020961E8 *param0, int param1) v0.unk_02 = 1; v0.unk_00 = CommSys_CurNetId(); - CommSys_SendData(112, &v0, sizeof(UnkStruct_02096274)); + CommSys_SendData(COMM_CMD_FIELD_RECORD_112, &v0, sizeof(UnkStruct_02096274)); param0->unk_4AC2 = 0; param0->unk_3A8 = 9; @@ -967,7 +968,7 @@ static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1) if (v1 == 0xfffffffe) { int v2 = 0; - CommSys_SendData(117, &v2, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v2, 1); ov59_021D28D8(param0, 1); ov59_021D19B0(param0, 0); } else { @@ -990,7 +991,7 @@ static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1) static int ov59_021D1D14(UnkStruct_020961E8 *param0, int param1) { if (param0->unk_4ABB == 0) { - if (CommSys_SendData(115, NULL, 0) == 1) { + if (CommSys_SendData(COMM_CMD_FIELD_RECORD_115, NULL, 0) == 1) { param0->unk_4ABB = 1; } } @@ -1126,11 +1127,11 @@ static int ov59_021D1F24(UnkStruct_020961E8 *param0, int param1) param0->unk_3A8 = 0; - CommSys_SendData(117, &v1, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v1, 1); ov59_021D28D8(param0, 1); } else { param0->unk_3A8 = 13; - CommSys_SendData(113, NULL, 0); + CommSys_SendData(COMM_CMD_FIELD_RECORD_113, NULL, 0); StringTemplate_SetPlayerName(param0->unk_24, 0, CommInfo_TrainerInfo(0)); } @@ -1343,7 +1344,7 @@ void ov59_021D22EC(UnkStruct_020961E8 *param0, int param1, u8 param2) if (CommSys_CurNetId() == 0) { int v0 = 1; - CommSys_SendData(117, &v0, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v0, 1); } break; case 19: @@ -1660,7 +1661,7 @@ static int ov59_021D292C(UnkStruct_020961E8 *param0, int param1) if (v0 > param0->unk_4AAC) { u8 v1 = 1; - CommSys_SendData(117, &v1, 1); + CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v1, 1); param0->unk_4AB0 = 1; } else { param0->unk_4AB0 = 0; diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 6f3c67d49dd..e737efb332d 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "generated/journal_online_events.h" #include "struct_defs/struct_0207DE04.h" @@ -1279,7 +1280,7 @@ static void ov65_0223758C(UnkStruct_ov65_022367A8 *param0) for (v0 = 1; v0 < 4; v0++) { if (sub_02032DC4(v0) == 1) { v1.unk_00 = v0; - v2 = CommSys_SendData(22, &v1, sizeof(UnkStruct_ov65_022366E4)); + v2 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v1, sizeof(UnkStruct_ov65_022366E4)); GF_ASSERT(v2 == 1); CommInfo_InitPlayer(v0); } @@ -1297,7 +1298,7 @@ static void ov65_022375CC(UnkStruct_ov65_022367A8 *param0) for (v0 = 1; v0 < 4; v0++) { if (sub_02032DE0(v0) == 1) { v1.unk_00 = v0; - v2 = CommSys_SendData(22, &v1, sizeof(UnkStruct_ov65_022366E4)); + v2 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v1, sizeof(UnkStruct_ov65_022366E4)); GF_ASSERT(v2 == 1); CommInfo_InitPlayer(v0); } @@ -1438,7 +1439,7 @@ static void ov65_02237808(UnkStruct_ov65_022367A8 *param0, u32 param1) v0.unk_00 = param1; v0.unk_04 = 2; - v1 = CommSys_SendData(22, &v0, sizeof(UnkStruct_ov65_022366E4)); + v1 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v0, sizeof(UnkStruct_ov65_022366E4)); GF_ASSERT(v1 == 1); } @@ -1571,7 +1572,7 @@ static void ov65_02237970(UnkStruct_ov65_022367A8 *param0) BOOL v6; memcpy(v5.unk_00, param0->unk_00.unk_20, sizeof(u8) * 4); - CommSys_SendData(24, &v5, sizeof(UnkStruct_ov65_02236760)); + CommSys_SendData(COMM_CMD_WAITING_ROOM_24, &v5, sizeof(UnkStruct_ov65_02236760)); } } @@ -1662,7 +1663,7 @@ static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p CommInfo_InitPlayer(v1); - v3 = CommSys_SendData(22, &v2, sizeof(UnkStruct_ov65_022366E4)); + v3 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v2, sizeof(UnkStruct_ov65_022366E4)); GF_ASSERT(v3 == 1); } else { param0->unk_00.unk_06 = v1; @@ -1769,7 +1770,7 @@ static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p param0->unk_00.unk_05 = 1; } - v2 = CommSys_SendData(22, &v1, sizeof(UnkStruct_ov65_022366E4)); + v2 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v1, sizeof(UnkStruct_ov65_022366E4)); GF_ASSERT(v2 == 1); param0->unk_00.unk_06 = 0xff; @@ -1884,7 +1885,7 @@ static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p BOOL v0; if (param0->unk_00.unk_08 == 0) { - v0 = CommSys_SendData(23, NULL, 0); + v0 = CommSys_SendData(COMM_CMD_WAITING_ROOM_23, NULL, 0); if (v0) { param0->unk_00.unk_05 = 14; diff --git a/src/overlay083/comm_command_poffin_cooking.c b/src/overlay083/comm_command_poffin_cooking.c new file mode 100644 index 00000000000..469d79ffbc8 --- /dev/null +++ b/src/overlay083/comm_command_poffin_cooking.c @@ -0,0 +1,38 @@ +#include "overlay083/comm_command_poffin_cooking.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "overlay083/ov83_0223D150.h" + +#include "poffin.h" + +// clang-format off +static const CommCmdTable Unk_ov83_02240390[] = { + [COMM_CMD_POFFIN_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_22, ov83_0223D4AC, NULL }, + [COMM_CMD_POFFIN_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_23, ov83_0223D4AC, NULL }, + [COMM_CMD_POFFIN_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_24, ov83_0223D4B4, NULL }, + [COMM_CMD_POFFIN_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_25, ov83_0223D4B8, NULL }, + [COMM_CMD_POFFIN_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_26, ov83_0223D4BC, NULL }, + [COMM_CMD_POFFIN_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_27, ov83_0223D4C0, NULL }, + [COMM_CMD_POFFIN_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_28, Poffin_SizeOf, NULL }, + [COMM_CMD_POFFIN_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_29, ov83_0223D4B0, NULL }, + [COMM_CMD_POFFIN_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_30, ov83_0223D4B0, NULL }, + [COMM_CMD_POFFIN_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_31, ov83_0223D4C4, NULL }, + [COMM_CMD_POFFIN_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_32, ov83_0223D4C8, NULL } +}; +// clang-format on + +const CommCmdTable *ov83_0223D144(void) +{ + return Unk_ov83_02240390; +} + +int ov83_0223D14C(void) +{ + return sizeof(Unk_ov83_02240390) / sizeof(CommCmdTable); +} diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 0d4b8fbaec6..10e8c0aa1a7 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "generated/game_records.h" #include "generated/trainer_score_events.h" @@ -305,7 +306,7 @@ static int ov83_0223B920(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 BOOL v0; if (ov83_0223D570(param1->unk_148C) == 0) { - v0 = ov83_0223D508(22, NULL, 0, param1->unk_148C); + v0 = ov83_0223D508(COMM_CMD_POFFIN_22, NULL, 0, param1->unk_148C); if (v0 == 0) { return param1->unk_0C; @@ -349,7 +350,7 @@ static int ov83_0223B964(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 break; case 2: - v0 = ov83_0223D508(25, ¶m1->unk_1494.unk_00, ov83_0223D4B8(), param1->unk_148C); + v0 = ov83_0223D508(COMM_CMD_POFFIN_25, ¶m1->unk_1494.unk_00, ov83_0223D4B8(), param1->unk_148C); if (v0 == 1) { return param1->unk_0C + 1; @@ -447,7 +448,7 @@ static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 v0 = ov83_0223FDD8(¶m1->unk_34C, ¶m1->unk_1494, param1->unk_1488); if (v0 == 1) { - v0 = ov83_0223D508(23, NULL, 0, param1->unk_148C); + v0 = ov83_0223D508(COMM_CMD_POFFIN_23, NULL, 0, param1->unk_148C); return param1->unk_0C; } else { ov83_0223FFA0(¶m1->unk_34C); @@ -481,7 +482,7 @@ static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 } if (v1) { - v0 = ov83_0223D508(26, ¶m1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C); + v0 = ov83_0223D508(COMM_CMD_POFFIN_26, ¶m1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C); param1->unk_15DC = 0; for (v2 = 1; v2 < (7 + 1); v2++) { @@ -493,13 +494,13 @@ static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 } } else { if (param1->unk_1666) { - v0 = ov83_0223D508(32, ¶m1->unk_1494.unk_04.unk_00, ov83_0223D4C8(), param1->unk_148C); + v0 = ov83_0223D508(COMM_CMD_POFFIN_32, ¶m1->unk_1494.unk_04.unk_00, ov83_0223D4C8(), param1->unk_148C); param1->unk_1666--; } } } } else { - v0 = ov83_0223D508(26, ¶m1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C); + v0 = ov83_0223D508(COMM_CMD_POFFIN_26, ¶m1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C); param1->unk_15DC = 0; } @@ -599,7 +600,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 if (ov83_0223D570(param1->unk_148C) == 0) { v0 = Poffin_New(param1->heapID); ov83_0223FFD4(¶m1->unk_34C, v0, ¶m1->unk_1494, param1->unk_1488, param1->heapID); - v1 = ov83_0223D508(28, v0, Poffin_SizeOf(), param1->unk_148C); + v1 = ov83_0223D508(COMM_CMD_POFFIN_28, v0, Poffin_SizeOf(), param1->unk_148C); Heap_Free(v0); if (v1 == 1) { @@ -612,7 +613,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 case 5: if (ov83_0223D570(param1->unk_148C) == 0) { ov83_022401AC(¶m1->unk_34C, ¶m1->unk_1494, param1->unk_1488); - v1 = ov83_0223D508(27, ¶m1->unk_1494.unk_20, ov83_0223D4C0(), param1->unk_148C); + v1 = ov83_0223D508(COMM_CMD_POFFIN_27, ¶m1->unk_1494.unk_20, ov83_0223D4C0(), param1->unk_148C); if (v1 == 1) { (*param2)++; @@ -739,7 +740,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 break; case 9: param1->unk_3B4 = 1; - v1 = ov83_0223D508(30, ¶m1->unk_3B4, ov83_0223D4B0(), param1->unk_148C); + v1 = ov83_0223D508(COMM_CMD_POFFIN_30, ¶m1->unk_3B4, ov83_0223D4B0(), param1->unk_148C); if (v1 == 1) { return param1->unk_0C + 1; @@ -758,7 +759,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 break; case 11: param1->unk_3B4 = 0; - v1 = ov83_0223D508(30, ¶m1->unk_3B4, ov83_0223D4B0(), param1->unk_148C); + v1 = ov83_0223D508(COMM_CMD_POFFIN_30, ¶m1->unk_3B4, ov83_0223D4B0(), param1->unk_148C); if (v1 == 1) { return param1->unk_0C + 1; diff --git a/src/overlay083/ov83_0223D144.c b/src/overlay083/ov83_0223D144.c deleted file mode 100644 index 5552692d23b..00000000000 --- a/src/overlay083/ov83_0223D144.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "overlay083/ov83_0223D144.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "overlay083/ov83_0223D150.h" - -#include "poffin.h" - -static const CommCmdTable Unk_ov83_02240390[] = { - { ov83_0223D204, ov83_0223D4AC, NULL }, - { ov83_0223D210, ov83_0223D4AC, NULL }, - { ov83_0223D21C, ov83_0223D4B4, NULL }, - { ov83_0223D258, ov83_0223D4B8, NULL }, - { ov83_0223D2E8, ov83_0223D4BC, NULL }, - { ov83_0223D3D8, ov83_0223D4C0, NULL }, - { ov83_0223D3F8, Poffin_SizeOf, NULL }, - { ov83_0223D410, ov83_0223D4B0, NULL }, - { ov83_0223D430, ov83_0223D4B0, NULL }, - { ov83_0223D354, ov83_0223D4C4, NULL }, - { ov83_0223D3A8, ov83_0223D4C8, NULL } -}; - -const CommCmdTable *ov83_0223D144(void) -{ - return Unk_ov83_02240390; -} - -int ov83_0223D14C(void) -{ - return sizeof(Unk_ov83_02240390) / sizeof(CommCmdTable); -} diff --git a/src/overlay083/ov83_0223D150.c b/src/overlay083/ov83_0223D150.c index aaaf93518de..93344d30705 100644 --- a/src/overlay083/ov83_0223D150.c +++ b/src/overlay083/ov83_0223D150.c @@ -3,8 +3,10 @@ #include #include +#include "constants/communication/comm_command.h" + +#include "overlay083/comm_command_poffin_cooking.h" #include "overlay083/ov83_0223B5A0.h" -#include "overlay083/ov83_0223D144.h" #include "overlay083/ov83_0223D4CC.h" #include "overlay083/ov83_0223F7F4.h" #include "overlay083/struct_ov83_0223B784.h" @@ -56,19 +58,19 @@ void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0) param0->unk_148C = NULL; } -void ov83_0223D204(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_22(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; ov83_0223B774(v0, 3); } -void ov83_0223D210(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_23(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; ov83_0223B77C(v0, 8); } -void ov83_0223D21C(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_24(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; @@ -77,7 +79,7 @@ void ov83_0223D21C(int param0, int param1, void *param2, void *param3) ov83_0223B774(v0, 5); } -void ov83_0223D258(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_25(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; int v1; @@ -97,12 +99,12 @@ void ov83_0223D258(int param0, int param1, void *param2, void *param3) if (v2 >= v0->unk_1488) { ov83_0223FF44(&v0->unk_34C, &v0->unk_1494.unk_34.unk_10, v0->unk_1488); - ov83_0223D508(24, &v0->unk_1494.unk_34, ov83_0223D4B4(), v0->unk_148C); + ov83_0223D508(COMM_CMD_POFFIN_24, &v0->unk_1494.unk_34, ov83_0223D4B4(), v0->unk_148C); } } } -void ov83_0223D2E8(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_26(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; UnkStruct_ov83_0223D2E8 *v1; @@ -130,7 +132,7 @@ void ov83_0223D2E8(int param0, int param1, void *param2, void *param3) v0->unk_1666++; } -void ov83_0223D354(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_31(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; UnkStruct_ov83_0223FCE8 *v1; @@ -154,7 +156,7 @@ void ov83_0223D354(int param0, int param1, void *param2, void *param3) } } -void ov83_0223D3A8(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_32(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; @@ -162,7 +164,7 @@ void ov83_0223D3A8(int param0, int param1, void *param2, void *param3) v0->unk_165C[param0]++; } -void ov83_0223D3D8(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_27(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; @@ -170,13 +172,13 @@ void ov83_0223D3D8(int param0, int param1, void *param2, void *param3) ov83_0223B774(v0, 10); } -void ov83_0223D3F8(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_28(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; memcpy(v0->unk_1494.unk_100, param2, param1); } -void ov83_0223D410(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_29(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; @@ -184,7 +186,7 @@ void ov83_0223D410(int param0, int param1, void *param2, void *param3) ov83_0223B774(v0, 12); } -void ov83_0223D430(int param0, int param1, void *param2, void *param3) +void CommCmd_Poffin_30(int param0, int param1, void *param2, void *param3) { UnkStruct_ov83_0223B784 *v0 = param3; int v1; @@ -206,7 +208,7 @@ void ov83_0223D430(int param0, int param1, void *param2, void *param3) } if (v2 >= v0->unk_1488) { - ov83_0223D508(29, &v3, ov83_0223D4B0(), v0->unk_148C); + ov83_0223D508(COMM_CMD_POFFIN_29, &v3, ov83_0223D4B0(), v0->unk_148C); } } } diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c index fed0101fda0..758bed58449 100644 --- a/src/overlay083/ov83_0223D4CC.c +++ b/src/overlay083/ov83_0223D4CC.c @@ -7,12 +7,12 @@ #include "nintendo_wfc/main.h" +#include "comm_command.h" #include "comm_manager.h" #include "communication_system.h" #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02032798.h" typedef struct { BOOL unk_00; @@ -46,7 +46,7 @@ UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, v v0->unk_04 = NULL; if (param3 == 1) { - CommCmd_Init(param0, param1, param2); + CommCmdManager_Init(param0, param1, param2); } else { v0->unk_04 = ov83_0223D584(param0, param1, param2, heapID); } @@ -117,7 +117,7 @@ static void ov83_0223D5CC(SysTask *param0, void *param1) for (v1 = 0; v1 < 8; v1++) { if (v0->unk_00[v1].unk_00 == 1) { - v0->unk_190[v0->unk_00[v1].unk_04].unk_00( + v0->unk_190[v0->unk_00[v1].unk_04].recvFunc( 0, v0->unk_00[v1].unk_30, v0->unk_00[v1].unk_08, v0->unk_198); memset(&v0->unk_00[v1], 0, sizeof(UnkStruct_ov83_0223D5CC)); @@ -147,7 +147,7 @@ static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const voi GF_ASSERT(v2); param1 -= 22; - v1 = param0->unk_190[param1].unk_04(); + v1 = param0->unk_190[param1].sizeFunc(); GF_ASSERT(v1 == param3); GF_ASSERT(param3 < 38); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index cad84f0e1f5..75907eac620 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/communication/comm_error.h" #include "generated/game_records.h" #include "generated/species.h" @@ -25,6 +26,7 @@ #include "character_sprite.h" #include "charcode_util.h" #include "chatot_cry.h" +#include "comm_command_trade.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -77,7 +79,6 @@ #include "unk_02038F8C.h" #include "unk_0203909C.h" #include "unk_02092494.h" -#include "unk_02095CD4.h" #include "vars_flags.h" #include "vram_transfer.h" #include "wifi_list.h" @@ -585,7 +586,7 @@ static int ov88_0223B914(UnkStruct_02095E80 *param0) } if (CommSys_CurNetId() == 0) { - ov88_0223D044(CommSys_CurNetId(), 31, LCRNG_RandMod(60) + 3); + ov88_0223D044(CommSys_CurNetId(), COMM_CMD_TRADE_31, LCRNG_RandMod(60) + 3); } ov88_0223D0C0(param0->saveData); @@ -819,7 +820,7 @@ static int ov88_0223BED8(UnkStruct_02095E80 *param0) ov88_0223CFF4(¶m0->unk_14C[1], ¶m0->unk_88[1], param0->unk_39C[1], param0->unk_6F4, 1); ov88_0223CEF0(¶m0->unk_90); - ov88_0223D058(param0, 23, param0->unk_88[0]); + ov88_0223D058(param0, COMM_CMD_TRADE_23, param0->unk_88[0]); return 1; } @@ -1624,7 +1625,7 @@ static void *ov88_0223D08C(Party *param0, int param1) void ov88_0223D098(int param0, Party *param1, int param2) { if (CommSys_IsPlayerConnected(param0)) { - CommSys_SendDataHuge(22, ov88_0223D08C(param1, param2), 236 * 6 + 4 * 2); + CommSys_SendDataHuge(COMM_CMD_TRADE_22, ov88_0223D08C(param1, param2), 236 * 6 + 4 * 2); } } @@ -1632,7 +1633,7 @@ static void ov88_0223D0C0(SaveData *saveData) { u8 *v0 = SaveData_GetRibbons(saveData); - CommSys_SendData(32, v0, 14); + CommSys_SendData(COMM_CMD_TRADE_32, v0, 14); } static void ov88_0223D0D4(TrainerInfo *param0, PalPad *param1, PalPad *param2) @@ -1654,12 +1655,12 @@ static void ov88_0223D0D4(TrainerInfo *param0, PalPad *param1, PalPad *param2) param2->associatedTrainerGenders[v0] = param1[v0].gender; } - CommSys_SendDataHuge(28, param2, sizeof(PalPad)); + CommSys_SendDataHuge(COMM_CMD_TRADE_28, param2, sizeof(PalPad)); } static void ov88_0223D140(ChatotCry *param0) { - CommSys_SendDataHuge(29, param0, 1000); + CommSys_SendDataHuge(COMM_CMD_TRADE_29, param0, 1000); } static int ov88_0223D150(UnkStruct_02095E80 *param0) @@ -1746,7 +1747,7 @@ static int ov88_0223D318(UnkStruct_02095E80 *param0) case 0: Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 28, FONT_MESSAGE, param0->unk_184, param0->unk_178); - ov88_0223D058(param0, 24, 1); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 1); param0->unk_226C = ov88_0223DA00; param0->unk_5C = 0; break; @@ -2113,7 +2114,7 @@ static int ov88_0223DC84(UnkStruct_02095E80 *param0) { Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); - ov88_0223D058(param0, 24, 2); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 2); param0->unk_226C = ov88_0223DCE0; @@ -2279,7 +2280,7 @@ static int ov88_0223E110(UnkStruct_02095E80 *param0) static void ov88_0223E1AC(UnkStruct_02095E80 *param0) { - ov88_0223D058(param0, 24, 3); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 3); param0->unk_5C = 1; } @@ -2308,17 +2309,17 @@ static int ov88_0223E20C(UnkStruct_02095E80 *param0) case 1: ov88_0223E1C0(param0, 23, 37); param0->unk_226C = ov88_0223E41C; - ov88_0223D058(param0, 24, 4); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 4); break; case 2: ov88_0223E1C0(param0, 23, 38); param0->unk_226C = ov88_0223E41C; - ov88_0223D058(param0, 24, 4); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 4); break; } } else { param0->unk_226C = ov88_0223E41C; - ov88_0223D058(param0, 24, 4); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 4); } break; @@ -2326,7 +2327,7 @@ static int ov88_0223E20C(UnkStruct_02095E80 *param0) Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223E41C; - ov88_0223D058(param0, 24, 4); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 4); break; default: break; @@ -2355,7 +2356,7 @@ static int ov88_0223E384(UnkStruct_02095E80 *param0) Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223E41C; - ov88_0223D058(param0, 24, 4); + ov88_0223D058(param0, COMM_CMD_TRADE_24, 4); break; default: break; diff --git a/src/overlay104/frscrcmd_battle_arcade.c b/src/overlay104/frscrcmd_battle_arcade.c index 61e02d31df4..9289dc80000 100644 --- a/src/overlay104/frscrcmd_battle_arcade.c +++ b/src/overlay104/frscrcmd_battle_arcade.c @@ -22,6 +22,7 @@ #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223C634.h" +#include "comm_command_frontier.h" #include "communication_information.h" #include "field_battle_data_transfer.h" #include "gx_layers.h" @@ -36,7 +37,6 @@ #include "trainer_info.h" #include "unk_02030494.h" #include "unk_0209B6F8.h" -#include "unk_0209BA80.h" #include "constdata/const_020EA358.h" diff --git a/src/overlay104/frscrcmd_battle_castle.c b/src/overlay104/frscrcmd_battle_castle.c index f443272d1ec..2ceb4ca3ecc 100644 --- a/src/overlay104/frscrcmd_battle_castle.c +++ b/src/overlay104/frscrcmd_battle_castle.c @@ -19,6 +19,7 @@ #include "battle_frontier_save.h" #include "battle_frontier_stats.h" +#include "comm_command_frontier.h" #include "communication_system.h" #include "field_battle_data_transfer.h" #include "heap.h" @@ -26,7 +27,6 @@ #include "pokemon.h" #include "unk_020302D0.h" #include "unk_0209B6F8.h" -#include "unk_0209BA80.h" #include "constdata/const_020EA358.h" diff --git a/src/overlay104/frscrcmd_battle_factory.c b/src/overlay104/frscrcmd_battle_factory.c index dfcb5bceef5..be8d4cce1d8 100644 --- a/src/overlay104/frscrcmd_battle_factory.c +++ b/src/overlay104/frscrcmd_battle_factory.c @@ -17,6 +17,7 @@ #include "overlay104/struct_ov104_02230BE4.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "field_battle_data_transfer.h" #include "heap.h" #include "party.h" @@ -26,7 +27,6 @@ #include "sys_task_manager.h" #include "unk_0202FF4C.h" #include "unk_0209B6F8.h" -#include "unk_0209BA80.h" #include "constdata/const_020EA358.h" diff --git a/src/overlay104/frscrcmd_battle_hall.c b/src/overlay104/frscrcmd_battle_hall.c index 6c2d9d088ab..a06748b1741 100644 --- a/src/overlay104/frscrcmd_battle_hall.c +++ b/src/overlay104/frscrcmd_battle_hall.c @@ -20,6 +20,7 @@ #include "savedata/save_table.h" #include "battle_hall_save.h" +#include "comm_command_frontier.h" #include "field_battle_data_transfer.h" #include "gx_layers.h" #include "heap.h" @@ -28,7 +29,6 @@ #include "sound.h" #include "tv_segment.h" #include "unk_0209B6F8.h" -#include "unk_0209BA80.h" #include "constdata/const_020EA358.h" diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c index 4f110438417..ececb3f217c 100644 --- a/src/overlay104/ov104_0222ECE8.c +++ b/src/overlay104/ov104_0222ECE8.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_020305B8_decl.h" @@ -26,61 +28,61 @@ #include "unk_02030494.h" BOOL ov104_0222EEF8(BattleFactory *param0); -void ov104_0222EF30(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EF64(BattleFactory *param0); -void ov104_0222EF94(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_23(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EFCC(BattleFactory *param0); -void ov104_0222F03C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_24(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F0B4(BattleFactory *param0); -void ov104_0222F124(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_25(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1); -void ov104_0222F1C4(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_26(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1); -void ov104_0222F210(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_27(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F238(BattleFactory *param0); -void ov104_0222F31C(int param0, int param1, void *param2, void *param3); -void ov104_0222ECE8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_28(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_33(int param0, int param1, void *param2, void *param3); BOOL ov104_0222ED00(BattleHall *param0); -void ov104_0222ED2C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_34(int param0, int param1, void *param2, void *param3); BOOL ov104_0222ED44(BattleHall *param0); -void ov104_0222ED74(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_35(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EDA8(BattleHall *param0); -void ov104_0222EDDC(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_36(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EE14(BattleHall *param0, u8 param1); -void ov104_0222EE38(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_37(int param0, int param1, void *param2, void *param3); BOOL ov104_0222EE60(BattleHall *param0); -void ov104_0222EEA8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_38(int param0, int param1, void *param2, void *param3); u8 *ov104_0222EED8(int param0, void *param1, int param2); BOOL ov104_0222F3B8(BattleCastle *param0); -void ov104_0222F418(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_42(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F44C(BattleCastle *param0); -void ov104_0222F480(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_43(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F4B8(BattleCastle *param0); -void ov104_0222F530(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_44(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F5D4(BattleCastle *param0); -void ov104_0222F650(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_45(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1); -void ov104_0222F6E8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_46(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F710(BattleCastle *param0, u16 param1); -void ov104_0222F730(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_47(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F758(BattleCastle *param0); -void ov104_0222F7BC(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_48(int param0, int param1, void *param2, void *param3); u8 *ov104_0222F84C(int param0, void *param1, int param2); BOOL ov104_0222F86C(BattleArcade *param0); -void ov104_0222F8A0(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_65(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F8D0(BattleArcade *param0); -void ov104_0222F908(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_66(int param0, int param1, void *param2, void *param3); BOOL ov104_0222F944(BattleArcade *param0); -void ov104_0222F9C0(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_67(int param0, int param1, void *param2, void *param3); BOOL ov104_0222FA38(BattleArcade *param0, u16 param1); -void ov104_0222FA5C(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_68(int param0, int param1, void *param2, void *param3); BOOL ov104_0222FA84(BattleArcade *param0, u16 param1); -void ov104_0222FAA8(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_69(int param0, int param1, void *param2, void *param3); BOOL ov104_0222FAD0(BattleArcade *param0); -void ov104_0222FB34(int param0, int param1, void *param2, void *param3); +void CommCmd_Frontier_70(int param0, int param1, void *param2, void *param3); u8 *ov104_0222FBC4(int param0, void *param1, int param2); -void ov104_0222ECE8(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_33(int param0, int param1, void *param2, void *param3) { BattleHall *v0 = param3; const u16 *v1 = param2; @@ -107,7 +109,7 @@ BOOL ov104_0222ED00(BattleHall *param0) v1 += 1; v1 += (7 + 1); - if (CommSys_SendData(34, v3, v5) == 1) { + if (CommSys_SendData(COMM_CMD_F_34, v3, v5) == 1) { v4 = 1; } else { v4 = 0; @@ -116,7 +118,7 @@ BOOL ov104_0222ED00(BattleHall *param0) return v4; } -void ov104_0222ED2C(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_34(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleHall *v2 = param3; @@ -151,7 +153,7 @@ BOOL ov104_0222ED44(BattleHall *param0) v3 += (10 * 2); - if (CommSys_SendData(35, v4, v6) == 1) { + if (CommSys_SendData(COMM_CMD_F_35, v4, v6) == 1) { v5 = 1; } else { v5 = 0; @@ -160,7 +162,7 @@ BOOL ov104_0222ED44(BattleHall *param0) return v5; } -void ov104_0222ED74(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_35(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleHall *v2 = param3; @@ -200,7 +202,7 @@ BOOL ov104_0222EDA8(BattleHall *param0) v1 += (10 * 2); - if (CommSys_SendData(36, v2, v4) == 1) { + if (CommSys_SendData(COMM_CMD_F_36, v2, v4) == 1) { v3 = 1; } else { v3 = 0; @@ -209,7 +211,7 @@ BOOL ov104_0222EDA8(BattleHall *param0) return v3; } -void ov104_0222EDDC(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_36(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleHall *v2 = param3; @@ -243,7 +245,7 @@ BOOL ov104_0222EE14(BattleHall *param0, u8 param1) v0[0] = param1; - if (CommSys_SendData(37, v0, v2) == 1) { + if (CommSys_SendData(COMM_CMD_F_37, v0, v2) == 1) { v1 = 1; } else { v1 = 0; @@ -252,7 +254,7 @@ BOOL ov104_0222EE14(BattleHall *param0, u8 param1) return v1; } -void ov104_0222EE38(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_37(int param0, int param1, void *param2, void *param3) { BattleHall *v0 = param3; const u16 *v1 = param2; @@ -282,7 +284,7 @@ BOOL ov104_0222EE60(BattleHall *param0) MI_CpuCopy8(v5, ¶m0->unk_784[0], v4); - if (CommSys_SendDataHuge(38, param0->unk_784, v3) == 1) { + if (CommSys_SendDataHuge(COMM_CMD_F_38, param0->unk_784, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -291,7 +293,7 @@ BOOL ov104_0222EE60(BattleHall *param0) return v2; } -void ov104_0222EEA8(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_38(int param0, int param1, void *param2, void *param3) { int v0, v1, v2; BattleHall *v3 = param3; @@ -335,7 +337,7 @@ BOOL ov104_0222EEF8(BattleFactory *param0) v1 += 4; v1 += (7 + 1); - if (CommSys_SendData(22, v3, v5) == 1) { + if (CommSys_SendData(COMM_CMD_F_22, v3, v5) == 1) { v4 = 1; } else { v4 = 0; @@ -344,7 +346,7 @@ BOOL ov104_0222EEF8(BattleFactory *param0) return v4; } -void ov104_0222EF30(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleFactory *v2 = param3; @@ -381,7 +383,7 @@ BOOL ov104_0222EF64(BattleFactory *param0) v1 += (7 * 2); - if (CommSys_SendData(23, v2, v4) == 1) { + if (CommSys_SendData(COMM_CMD_F_23, v2, v4) == 1) { v3 = 1; } else { v3 = 0; @@ -390,7 +392,7 @@ BOOL ov104_0222EF64(BattleFactory *param0) return v3; } -void ov104_0222EF94(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_23(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleFactory *v2 = param3; @@ -443,7 +445,7 @@ BOOL ov104_0222EFCC(BattleFactory *param0) v1 += (6 * 2); - if (CommSys_SendData(24, v2, v4) == 1) { + if (CommSys_SendData(COMM_CMD_F_24, v2, v4) == 1) { v3 = 1; } else { v3 = 0; @@ -452,7 +454,7 @@ BOOL ov104_0222EFCC(BattleFactory *param0) return v3; } -void ov104_0222F03C(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_24(int param0, int param1, void *param2, void *param3) { int v0, v1; Pokemon *v2; @@ -519,7 +521,7 @@ BOOL ov104_0222F0B4(BattleFactory *param0) v1 += (4 * 2); - if (CommSys_SendData(25, v2, v4) == 1) { + if (CommSys_SendData(COMM_CMD_F_25, v2, v4) == 1) { v3 = 1; } else { v3 = 0; @@ -528,7 +530,7 @@ BOOL ov104_0222F0B4(BattleFactory *param0) return v3; } -void ov104_0222F124(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_25(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleFactory *v2 = param3; @@ -575,7 +577,7 @@ BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1) v0[0] = param1; - if (CommSys_SendData(26, v0, v2) == 1) { + if (CommSys_SendData(COMM_CMD_F_26, v0, v2) == 1) { v1 = 1; } else { v1 = 0; @@ -584,7 +586,7 @@ BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1) return v1; } -void ov104_0222F1C4(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_26(int param0, int param1, void *param2, void *param3) { BattleFactory *v0 = param3; const u16 *v1 = param2; @@ -608,7 +610,7 @@ BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1) v0[0] = param1; - if (CommSys_SendData(27, v0, v2) == 1) { + if (CommSys_SendData(COMM_CMD_F_27, v0, v2) == 1) { v1 = 1; } else { v1 = 0; @@ -617,7 +619,7 @@ BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1) return v1; } -void ov104_0222F210(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_27(int param0, int param1, void *param2, void *param3) { BattleFactory *v0 = param3; const u16 *v1 = param2; @@ -672,7 +674,7 @@ BOOL ov104_0222F238(BattleFactory *param0) v2 += (v0 * 2); - if (CommSys_SendData(28, v3, v5) == 1) { + if (CommSys_SendData(COMM_CMD_F_28, v3, v5) == 1) { v4 = 1; } else { v4 = 0; @@ -681,7 +683,7 @@ BOOL ov104_0222F238(BattleFactory *param0) return v4; } -void ov104_0222F31C(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_28(int param0, int param1, void *param2, void *param3) { int v0, v1; u8 v2; @@ -738,7 +740,7 @@ BOOL ov104_0222F3B8(BattleCastle *param0) param0->unk_3C0[v1] = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType)); v1 += 1; - if (CommSys_SendData(42, param0->unk_3C0, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_42, param0->unk_3C0, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -747,7 +749,7 @@ BOOL ov104_0222F3B8(BattleCastle *param0) return v2; } -void ov104_0222F418(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_42(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleCastle *v2 = param3; @@ -785,7 +787,7 @@ BOOL ov104_0222F44C(BattleCastle *param0) v1 += (7 * 2); - if (CommSys_SendData(43, param0->unk_3C0, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_43, param0->unk_3C0, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -794,7 +796,7 @@ BOOL ov104_0222F44C(BattleCastle *param0) return v2; } -void ov104_0222F480(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_43(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleCastle *v2 = param3; @@ -850,7 +852,7 @@ BOOL ov104_0222F4B8(BattleCastle *param0) param0->unk_3C0[1] = param0->unk_A1B; - if (CommSys_SendData(44, param0->unk_3C0, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_44, param0->unk_3C0, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -859,7 +861,7 @@ BOOL ov104_0222F4B8(BattleCastle *param0) return v2; } -void ov104_0222F530(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_44(int param0, int param1, void *param2, void *param3) { Pokemon *v0; int v1, v2; @@ -935,7 +937,7 @@ BOOL ov104_0222F5D4(BattleCastle *param0) v1 += (4 * 2); - if (CommSys_SendData(45, param0->unk_3C0, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_45, param0->unk_3C0, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -944,7 +946,7 @@ BOOL ov104_0222F5D4(BattleCastle *param0) return v2; } -void ov104_0222F650(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_45(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleCastle *v2 = param3; @@ -988,7 +990,7 @@ BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1) int v0, v1 = 40; param0->unk_3C0[0] = param1; - if (CommSys_SendData(46, param0->unk_3C0, v1) == 1) { + if (CommSys_SendData(COMM_CMD_F_46, param0->unk_3C0, v1) == 1) { v0 = 1; } else { v0 = 0; @@ -997,7 +999,7 @@ BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1) return v0; } -void ov104_0222F6E8(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_46(int param0, int param1, void *param2, void *param3) { int v0; BattleCastle *v1 = param3; @@ -1019,7 +1021,7 @@ BOOL ov104_0222F710(BattleCastle *param0, u16 param1) int v0, v1 = 40; param0->unk_3C0[0] = param1; - if (CommSys_SendData(47, param0->unk_3C0, v1) == 1) { + if (CommSys_SendData(COMM_CMD_F_47, param0->unk_3C0, v1) == 1) { v0 = 1; } else { v0 = 0; @@ -1028,7 +1030,7 @@ BOOL ov104_0222F710(BattleCastle *param0, u16 param1) return v0; } -void ov104_0222F730(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_47(int param0, int param1, void *param2, void *param3) { int v0; BattleCastle *v1 = param3; @@ -1061,7 +1063,7 @@ BOOL ov104_0222F758(BattleCastle *param0) MI_CpuCopy8(v6, ¶m0->unk_410[v0 * v4], v4); } - if (CommSys_SendDataHuge(48, param0->unk_410, v3) == 1) { + if (CommSys_SendDataHuge(COMM_CMD_F_48, param0->unk_410, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -1070,7 +1072,7 @@ BOOL ov104_0222F758(BattleCastle *param0) return v2; } -void ov104_0222F7BC(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_48(int param0, int param1, void *param2, void *param3) { u8 v0; int v1, v2, v3; @@ -1124,7 +1126,7 @@ BOOL ov104_0222F86C(BattleArcade *param0) v1 += 3; - if (CommSys_SendData(65, param0->unk_424, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_65, param0->unk_424, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -1133,7 +1135,7 @@ BOOL ov104_0222F86C(BattleArcade *param0) return v2; } -void ov104_0222F8A0(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_65(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleArcade *v2 = param3; @@ -1167,7 +1169,7 @@ BOOL ov104_0222F8D0(BattleArcade *param0) v1 += (7 * 2); - if (CommSys_SendData(66, param0->unk_424, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_66, param0->unk_424, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -1176,7 +1178,7 @@ BOOL ov104_0222F8D0(BattleArcade *param0) return v2; } -void ov104_0222F908(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_66(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleArcade *v2 = param3; @@ -1228,7 +1230,7 @@ BOOL ov104_0222F944(BattleArcade *param0) v1 += (4 * 2); - if (CommSys_SendData(67, param0->unk_424, v3) == 1) { + if (CommSys_SendData(COMM_CMD_F_67, param0->unk_424, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -1237,7 +1239,7 @@ BOOL ov104_0222F944(BattleArcade *param0) return v2; } -void ov104_0222F9C0(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_67(int param0, int param1, void *param2, void *param3) { int v0, v1; BattleArcade *v2 = param3; @@ -1281,7 +1283,7 @@ BOOL ov104_0222FA38(BattleArcade *param0, u16 param1) int v0, v1 = 40; param0->unk_424[0] = param1; - if (CommSys_SendData(68, param0->unk_424, v1) == 1) { + if (CommSys_SendData(COMM_CMD_F_68, param0->unk_424, v1) == 1) { v0 = 1; } else { v0 = 0; @@ -1290,7 +1292,7 @@ BOOL ov104_0222FA38(BattleArcade *param0, u16 param1) return v0; } -void ov104_0222FA5C(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_68(int param0, int param1, void *param2, void *param3) { int v0; BattleArcade *v1 = param3; @@ -1312,7 +1314,7 @@ BOOL ov104_0222FA84(BattleArcade *param0, u16 param1) int v0, v1 = 40; param0->unk_424[0] = param1; - if (CommSys_SendData(69, param0->unk_424, v1) == 1) { + if (CommSys_SendData(COMM_CMD_F_69, param0->unk_424, v1) == 1) { v0 = 1; } else { v0 = 0; @@ -1321,7 +1323,7 @@ BOOL ov104_0222FA84(BattleArcade *param0, u16 param1) return v0; } -void ov104_0222FAA8(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_69(int param0, int param1, void *param2, void *param3) { int v0; BattleArcade *v1 = param3; @@ -1354,7 +1356,7 @@ BOOL ov104_0222FAD0(BattleArcade *param0) MI_CpuCopy8(v6, ¶m0->unk_474[v0 * v4], v4); } - if (CommSys_SendDataHuge(70, param0->unk_474, v3) == 1) { + if (CommSys_SendDataHuge(COMM_CMD_F_70, param0->unk_474, v3) == 1) { v2 = 1; } else { v2 = 0; @@ -1363,7 +1365,7 @@ BOOL ov104_0222FAD0(BattleArcade *param0) return v2; } -void ov104_0222FB34(int param0, int param1, void *param2, void *param3) +void CommCmd_Frontier_70(int param0, int param1, void *param2, void *param3) { u8 v0; int v1, v2, v3; diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c index 4c4efdd16c6..7eca2db9909 100644 --- a/src/overlay104/ov104_022395F0.c +++ b/src/overlay104/ov104_022395F0.c @@ -20,6 +20,7 @@ #include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "battle_hall_save.h" +#include "comm_command_frontier.h" #include "communication_system.h" #include "heap.h" #include "item_use_pokemon.h" @@ -28,7 +29,6 @@ #include "unk_02049D08.h" #include "unk_0204FA34.h" #include "unk_0209B6F8.h" -#include "unk_0209BA80.h" static BOOL ov104_02239680(FrontierScriptContext *param0); static BOOL ov104_02239C20(FrontierScriptContext *param0); diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c index 415b05983b2..bea9aea56df 100644 --- a/src/overlay104/ov104_02239C58.c +++ b/src/overlay104/ov104_02239C58.c @@ -12,6 +12,7 @@ #include "field/field_system.h" #include "bag.h" +#include "comm_command_frontier.h" #include "dexmode_checker.h" #include "heap.h" #include "mail.h" @@ -20,7 +21,6 @@ #include "savedata.h" #include "unk_0202D778.h" #include "unk_0209B6F8.h" -#include "unk_0209BA80.h" #include "constdata/const_020F410C.h" diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 1ef44095e16..08f673a8382 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "generated/game_records.h" #include "generated/journal_online_events.h" #include "generated/text_banks.h" @@ -18,6 +19,7 @@ #include "bag.h" #include "bg_window.h" #include "camera.h" +#include "comm_command_spin_trade.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -53,7 +55,6 @@ #include "unk_020363E8.h" #include "unk_02038ED4.h" #include "unk_02092494.h" -#include "unk_0209BDF8.h" #include "vram_transfer.h" typedef struct { @@ -724,7 +725,7 @@ static int ov109_021D11A0(UnkStruct_ov109_021D0F70 *param0) { int v0; u32 v1 = (u32)param0->unk_24; - v0 = CommSys_SendDataHuge(131, (void *)v1, 236 * 6 + 4 * 2); + v0 = CommSys_SendDataHuge(COMM_CMD_FIELD_SPIN_TRADE_131, (void *)v1, 236 * 6 + 4 * 2); if (v0) { param0->unk_00 = 14; diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 65d45f7b1f5..a8f79fa4509 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -16,6 +16,7 @@ #include "appearance.h" #include "bg_window.h" #include "char_transfer.h" +#include "comm_command_spin_trade.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -54,7 +55,6 @@ #include "unk_020363E8.h" #include "unk_02038ED4.h" #include "unk_0205B33C.h" -#include "unk_0209BDF8.h" #include "vram_transfer.h" #include "wireless_manager.h" diff --git a/src/overlay114/comm_command_minigame.c b/src/overlay114/comm_command_minigame.c new file mode 100644 index 00000000000..04bef7112dc --- /dev/null +++ b/src/overlay114/comm_command_minigame.c @@ -0,0 +1,30 @@ +#include "overlay114/comm_command_minigame.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "overlay114/ov114_02260044.h" + +// clang-format off +static const CommCmdTable Unk_ov114_022603E4[] = { + [COMM_CMD_MINIGAME_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_22, ov114_0226007C, NULL }, + [COMM_CMD_MINIGAME_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_23, ov114_0226007C, NULL }, + [COMM_CMD_MINIGAME_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_24, ov114_0226007C, NULL }, + [COMM_CMD_MINIGAME_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_25, ov114_0226007C, NULL }, + [COMM_CMD_MINIGAME_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_26, ov114_02260080, NULL }, +}; +// clang-format on + +const CommCmdTable *ov114_02260038(void) +{ + return Unk_ov114_022603E4; +} + +int ov114_02260040(void) +{ + return sizeof(Unk_ov114_022603E4) / sizeof(CommCmdTable); +} diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 23270c4c5d9..50cc6edd6e6 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/graphics.h" #include "struct_decls/wi_fi_list.h" @@ -1823,7 +1824,7 @@ static void ov114_0225D688(SysTask *param0, void *param1) break; } - CommSys_SendData(26, &v8, sizeof(u32)); + CommSys_SendData(COMM_CMD_MINIGAME_26, &v8, sizeof(u32)); } v0->unk_00++; @@ -3231,9 +3232,9 @@ static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_022 if (v0 == YES_NO_TOUCH_MENU_YES || v0 == YES_NO_TOUCH_MENU_NO) { if (v0 == YES_NO_TOUCH_MENU_YES) { - CommSys_SendData(22, NULL, 0); + CommSys_SendData(COMM_CMD_MINIGAME_22, NULL, 0); } else if (v0 == YES_NO_TOUCH_MENU_NO) { - CommSys_SendData(23, NULL, 0); + CommSys_SendData(COMM_CMD_MINIGAME_23, NULL, 0); } ov114_0225D368(param1, param2, 15, 1); @@ -3322,9 +3323,9 @@ static void ov114_0225F424(UnkStruct_ov114_0225F270 *param0, u32 param1, BOOL pa if (v1 == param3) { if (param0->unk_1D) { - CommSys_SendData(24, NULL, 0); + CommSys_SendData(COMM_CMD_MINIGAME_24, NULL, 0); } else { - CommSys_SendData(25, NULL, 0); + CommSys_SendData(COMM_CMD_MINIGAME_25, NULL, 0); } } } diff --git a/src/overlay114/ov114_02260038.c b/src/overlay114/ov114_02260038.c deleted file mode 100644 index 99b79e920f1..00000000000 --- a/src/overlay114/ov114_02260038.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "overlay114/ov114_02260038.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "overlay114/ov114_02260044.h" - -static const CommCmdTable Unk_ov114_022603E4[] = { - { ov114_02260090, ov114_0226007C, NULL }, - { ov114_022600A0, ov114_0226007C, NULL }, - { ov114_022600B0, ov114_0226007C, NULL }, - { ov114_022600BC, ov114_0226007C, NULL }, - { ov114_02260084, ov114_02260080, NULL }, -}; - -const CommCmdTable *ov114_02260038(void) -{ - return Unk_ov114_022603E4; -} - -int ov114_02260040(void) -{ - return sizeof(Unk_ov114_022603E4) / sizeof(CommCmdTable); -} diff --git a/src/overlay114/ov114_02260044.c b/src/overlay114/ov114_02260044.c index 8ba7bcc1de1..23c5f28be37 100644 --- a/src/overlay114/ov114_02260044.c +++ b/src/overlay114/ov114_02260044.c @@ -3,21 +3,21 @@ #include #include +#include "overlay114/comm_command_minigame.h" #include "overlay114/ov114_0225C700.h" -#include "overlay114/ov114_02260038.h" #include "overlay114/struct_ov114_0225D678_decl.h" #include "overlay114/struct_ov114_0225E854_decl.h" -#include "unk_02032798.h" +#include "comm_command.h" void ov114_02260044(UnkStruct_ov114_0225E854 *param0) { - CommCmd_Init(ov114_02260038(), ov114_02260040(), param0); + CommCmdManager_Init(ov114_02260038(), ov114_02260040(), param0); } void ov114_02260060(UnkStruct_ov114_0225D678 *param0) { - CommCmd_Init(ov114_02260038(), ov114_02260040(), param0); + CommCmdManager_Init(ov114_02260038(), ov114_02260040(), param0); } int ov114_0226007C(void) @@ -30,27 +30,27 @@ int ov114_02260080(void) return sizeof(u32); } -void ov114_02260084(int param0, int param1, void *param2, void *param3) +void CommCmd_Minigame_26(int param0, int param1, void *param2, void *param3) { ov114_0225CA24(param3, *((u32 *)param2)); } -void ov114_02260090(int param0, int param1, void *param2, void *param3) +void CommCmd_Minigame_22(int param0, int param1, void *param2, void *param3) { ov114_0225CA2C(param3, param0, 1); } -void ov114_022600A0(int param0, int param1, void *param2, void *param3) +void CommCmd_Minigame_23(int param0, int param1, void *param2, void *param3) { ov114_0225CA2C(param3, param0, 0); } -void ov114_022600B0(int param0, int param1, void *param2, void *param3) +void CommCmd_Minigame_24(int param0, int param1, void *param2, void *param3) { ov114_0225CA44(param3, 1); } -void ov114_022600BC(int param0, int param1, void *param2, void *param3) +void CommCmd_Minigame_25(int param0, int param1, void *param2, void *param3) { ov114_0225CA44(param3, 0); } diff --git a/src/overlay115/comm_command_swalot_plop.c b/src/overlay115/comm_command_swalot_plop.c new file mode 100644 index 00000000000..577025b58b5 --- /dev/null +++ b/src/overlay115/comm_command_swalot_plop.c @@ -0,0 +1,33 @@ +#include "overlay115/comm_command_swalot_plop.h" + +#include +#include + +#include "constants/communication/comm_command.h" + +#include "struct_defs/comm_cmd_table.h" + +#include "overlay115/ov115_02265A24.h" + +// clang-format off +static const CommCmdTable Unk_ov115_0226664C[] = { + [COMM_COMMAND_SWALOT_PLOP_22 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_22, ov115_02265A40, NULL }, + [COMM_COMMAND_SWALOT_PLOP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlot_23, ov115_02265A40, NULL }, + [COMM_COMMAND_SWALOT_PLOP_24 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_24, ov115_02265AD0, NULL }, + [COMM_COMMAND_SWALOT_PLOP_25 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_25, ov115_02265AD8, NULL }, + [COMM_COMMAND_SWALOT_PLOP_26 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_26, ov115_02265AD4, NULL }, + [COMM_COMMAND_SWALOT_PLOP_27 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_27, ov115_02265ADC, NULL }, + [COMM_COMMAND_SWALOT_PLOP_28 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_28, ov115_02265AD8, NULL }, + [COMM_COMMAND_SWALOT_PLOP_29 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_29, ov115_02265A40, NULL }, +}; +// clang-format on + +const CommCmdTable *ov115_02265A18(void) +{ + return Unk_ov115_0226664C; +} + +int ov115_02265A20(void) +{ + return sizeof(Unk_ov115_0226664C) / sizeof(CommCmdTable); +} diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c index 9858a583b16..b7cfcd23dfa 100644 --- a/src/overlay115/ov115_02260440.c +++ b/src/overlay115/ov115_02260440.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "nintendo_wfc/main.h" #include "overlay114/ov114_0225C700.h" #include "overlay114/struct_ov114_0225C76C.h" @@ -206,7 +208,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1) if (IsScreenFadeDone()) { if (v0->unk_44 == 0) { - v2 = CommSys_SendData(22, NULL, 0); + v2 = CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_22, NULL, 0); if (v2) { (*param1)++; @@ -235,7 +237,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1) u32 v5; v5 = ov115_02261274(v0->unk_34); - v2 = CommSys_SendData(25, &v5, sizeof(u32)); + v2 = CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_25, &v5, sizeof(u32)); if (v2) { (*param1)++; @@ -251,7 +253,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1) BOOL v7; v6 = ov115_02260C64(v0->unk_30); - v7 = ov115_02260BA0(v0, 27, &v6, sizeof(u32)); + v7 = ov115_02260BA0(v0, COMM_COMMAND_SWALOT_PLOP_27, &v6, sizeof(u32)); if (v7 == 1) { ov115_02260C5C(v0->unk_30); @@ -259,7 +261,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1) } if (v2 == 0) { - ov115_02260BA0(v0, 23, NULL, 0); + ov115_02260BA0(v0, COMM_COMMAND_SWALOT_PLOP_23, NULL, 0); } } @@ -277,7 +279,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1) UnkStruct_ov115_02265AD4 v8; ov115_02260CBC(v0->unk_30, &v8); - v2 = CommSys_SendData(26, &v8, sizeof(UnkStruct_ov115_02265AD4)); + v2 = CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_26, &v8, sizeof(UnkStruct_ov115_02265AD4)); if (v2) { (*param1)++; @@ -470,7 +472,7 @@ void ov115_022609E4(UnkStruct_ov115_0226095C *param0, u32 param1, u32 param2) if (v2 == 1) { param0->unk_7C++; - CommSys_SendData(29, NULL, 0); + CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_29, NULL, 0); } } } @@ -492,7 +494,7 @@ static void ov115_02260A5C(UnkStruct_ov115_0226095C *param0) UnkStruct_ov115_02265AD0 v0; while (ov115_02261224(param0->unk_34, &v0) == 1) { - ov115_02260BA0(param0, 24, &v0, sizeof(UnkStruct_ov115_02265AD0)); + ov115_02260BA0(param0, COMM_COMMAND_SWALOT_PLOP_24, &v0, sizeof(UnkStruct_ov115_02265AD0)); } } @@ -511,7 +513,7 @@ static void ov115_02260A90(UnkStruct_ov115_0226095C *param0) if ((v0 % 30) == 0) { if (param0->unk_80 == 1) { v1 = ov115_02261274(param0->unk_34); - v2 = ov115_02260BA0(param0, 28, &v1, sizeof(u32)); + v2 = ov115_02260BA0(param0, COMM_COMMAND_SWALOT_PLOP_28, &v1, sizeof(u32)); GF_ASSERT(v2); param0->unk_80 = 0; diff --git a/src/overlay115/ov115_02265A18.c b/src/overlay115/ov115_02265A18.c deleted file mode 100644 index f92f9989935..00000000000 --- a/src/overlay115/ov115_02265A18.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "overlay115/ov115_02265A18.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "overlay115/ov115_02265A24.h" - -static const CommCmdTable Unk_ov115_0226664C[] = { - { ov115_02265A44, ov115_02265A40, NULL }, - { ov115_02265A50, ov115_02265A40, NULL }, - { ov115_02265A5C, ov115_02265AD0, NULL }, - { ov115_02265A84, ov115_02265AD8, NULL }, - { ov115_02265A94, ov115_02265AD4, NULL }, - { ov115_02265AC0, ov115_02265ADC, NULL }, - { ov115_02265AA4, ov115_02265AD8, NULL }, - { ov115_02265AB4, ov115_02265A40, NULL }, -}; - -const CommCmdTable *ov115_02265A18(void) -{ - return Unk_ov115_0226664C; -} - -int ov115_02265A20(void) -{ - return sizeof(Unk_ov115_0226664C) / sizeof(CommCmdTable); -} diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c index 54665045ae3..1289cd86ed6 100644 --- a/src/overlay115/ov115_02265A24.c +++ b/src/overlay115/ov115_02265A24.c @@ -3,18 +3,18 @@ #include #include +#include "overlay115/comm_command_swalot_plop.h" #include "overlay115/ov115_02260440.h" -#include "overlay115/ov115_02265A18.h" #include "overlay115/struct_ov115_0226095C_decl.h" #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" +#include "comm_command.h" #include "communication_system.h" -#include "unk_02032798.h" void ov115_02265A24(UnkStruct_ov115_0226095C *param0) { - CommCmd_Init(ov115_02265A18(), ov115_02265A20(), param0); + CommCmdManager_Init(ov115_02265A18(), ov115_02265A20(), param0); } int ov115_02265A40(void) @@ -22,19 +22,19 @@ int ov115_02265A40(void) return 0; } -void ov115_02265A44(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_22(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; ov115_0226095C(v0); } -void ov115_02265A50(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlot_23(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; ov115_02260964(v0); } -void ov115_02265A5C(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_24(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; @@ -45,33 +45,33 @@ void ov115_02265A5C(int param0, int param1, void *param2, void *param3) } } -void ov115_02265A84(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_25(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; ov115_02260994(v0, *((u32 *)param2), param0); } -void ov115_02265A94(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_26(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; ov115_022609B4(v0, param2, param0); } -void ov115_02265AA4(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_28(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; u32 v1 = *((u32 *)param2); ov115_022609E4(v0, v1, param0); } -void ov115_02265AB4(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_29(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; ov115_02260A48(v0); } -void ov115_02265AC0(int param0, int param1, void *param2, void *param3) +void CommCmd_SwalotPlop_27(int param0, int param1, void *param2, void *param3) { UnkStruct_ov115_0226095C *v0 = param3; u32 v1 = *((u32 *)param2); diff --git a/src/overlay116/ov116_02260440.c b/src/overlay116/comm_command_mime_jr_top.c similarity index 53% rename from src/overlay116/ov116_02260440.c rename to src/overlay116/comm_command_mime_jr_top.c index b4689ede729..84f27a88b4c 100644 --- a/src/overlay116/ov116_02260440.c +++ b/src/overlay116/comm_command_mime_jr_top.c @@ -1,8 +1,10 @@ -#include "overlay116/ov116_02260440.h" +#include "overlay116/comm_command_mime_jr_top.h" #include #include +#include "constants/communication/comm_command.h" + #include "struct_defs/comm_cmd_table.h" #include "overlay116/ov116_022604C4.h" @@ -12,29 +14,31 @@ #include "overlay116/struct_ov116_02260498.h" #include "overlay116/struct_ov116_0226139C.h" +#include "comm_command.h" #include "math_util.h" -#include "unk_02032798.h" -static void ov116_02260440(int param0, int param1, void *param2, void *param3); -static void ov116_02260458(int param0, int param1, void *param2, void *param3); -static void ov116_02260464(int param0, int param1, void *param2, void *param3); -static void ov116_02260478(int param0, int param1, void *param2, void *param3); -static void ov116_02260484(int param0, int param1, void *param2, void *param3); +static void CommCmd_MimeJrTop_22(int param0, int param1, void *param2, void *param3); +static void CommCmd_MimeJrTop_23(int param0, int param1, void *param2, void *param3); +static void CommCmd_MimeJrTop_24(int param0, int param1, void *param2, void *param3); +static void CommCmd_MimeJrTop_25(int param0, int param1, void *param2, void *param3); +static void CommCmd_MimeJrTop_26(int param0, int param1, void *param2, void *param3); static int ov116_02260488(void); static int ov116_0226048C(void); static int ov116_02260490(void); static int ov116_02260494(void); static int ov116_02260498(void); +// clang-format off static const CommCmdTable Unk_ov116_02267740[] = { - { ov116_02260440, ov116_0226048C, NULL }, - { ov116_02260458, ov116_02260488, NULL }, - { ov116_02260464, ov116_02260490, NULL }, - { ov116_02260478, ov116_02260494, NULL }, - { ov116_02260484, ov116_02260498, NULL } + [COMM_CMD_MIME_TOP_22 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_22, ov116_0226048C, NULL }, + [COMM_CMD_MIME_TOP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_23, ov116_02260488, NULL }, + [COMM_CMD_MIME_TOP_24 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_24, ov116_02260490, NULL }, + [COMM_CMD_MIME_TOP_25 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_25, ov116_02260494, NULL }, + [COMM_CMD_MIME_TOP_26 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_26, ov116_02260498, NULL } }; +// clang-format on -static void ov116_02260440(int param0, int param1, void *param2, void *param3) +static void CommCmd_MimeJrTop_22(int param0, int param1, void *param2, void *param3) { UnkStruct_ov116_0226139C *v0 = param3; @@ -44,27 +48,27 @@ static void ov116_02260440(int param0, int param1, void *param2, void *param3) ov116_022617D4(v0); } -static void ov116_02260458(int param0, int param1, void *param2, void *param3) +static void CommCmd_MimeJrTop_23(int param0, int param1, void *param2, void *param3) { UnkStruct_ov116_0226139C *v0 = param3; ov116_022617DC(v0); } -static void ov116_02260464(int param0, int param1, void *param2, void *param3) +static void CommCmd_MimeJrTop_24(int param0, int param1, void *param2, void *param3) { UnkStruct_ov116_0226139C *v0 = param3; UnkStruct_ov116_02260490 *v1 = ((UnkStruct_ov116_02260490 *)param2); v0->unk_04->unk_2858[param0].unk_00 = v1->unk_00; } -static void ov116_02260478(int param0, int param1, void *param2, void *param3) +static void CommCmd_MimeJrTop_25(int param0, int param1, void *param2, void *param3) { UnkStruct_ov116_0226139C *v0 = param3; UnkStruct_ov116_02260494 *v1 = ((UnkStruct_ov116_02260494 *)param2); v0->unk_24.unk_00[param0].unk_00 = v1->unk_00; } -static void ov116_02260484(int param0, int param1, void *param2, void *param3) +static void CommCmd_MimeJrTop_26(int param0, int param1, void *param2, void *param3) { UnkStruct_ov116_0226139C *v0 = param3; } @@ -106,5 +110,5 @@ int ov116_022604A4(void) void ov116_022604A8(UnkStruct_ov116_0226139C *param0) { - CommCmd_Init(ov116_0226049C(), ov116_022604A4(), param0); + CommCmdManager_Init(ov116_0226049C(), ov116_022604A4(), param0); } diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index 159b9ad9fb3..c949b0c9610 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -3,11 +3,12 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/graphics.h" #include "nintendo_wfc/main.h" #include "overlay114/ov114_0225C700.h" -#include "overlay116/ov116_02260440.h" +#include "overlay116/comm_command_mime_jr_top.h" #include "overlay116/ov116_02261870.h" #include "overlay116/ov116_02262A44.h" #include "overlay116/ov116_02262A8C.h" @@ -484,7 +485,7 @@ int ov116_02260CF4(ApplicationManager *appMan, int *param1) if (v1) { if (ov116_022617C4(v0) == 1) { v0->unk_14.unk_04 = v0->unk_78; - CommSys_SendData(22, &v0->unk_14, sizeof(UnkStruct_ov116_0226048C)); + CommSys_SendData(COMM_CMD_MIME_TOP_22, &v0->unk_14, sizeof(UnkStruct_ov116_0226048C)); } } @@ -523,7 +524,7 @@ int ov116_02260CF4(ApplicationManager *appMan, int *param1) if (ov116_022617C4(v0) == 1) { if (ov116_02262A74(v0->unk_00) == 0) { Sound_StopEffect(1393, 0); - CommSys_SendData(23, NULL, 0); + CommSys_SendData(COMM_CMD_MIME_TOP_23, NULL, 0); } } ov116_02263B30(v0->unk_04); @@ -553,7 +554,7 @@ int ov116_02260CF4(ApplicationManager *appMan, int *param1) v0->unk_1C.unk_00 = 1; } - CommSys_SendData(25, &v0->unk_1C, sizeof(UnkStruct_ov116_02260494)); + CommSys_SendData(COMM_CMD_MIME_TOP_25, &v0->unk_1C, sizeof(UnkStruct_ov116_02260494)); ov116_0226178C(v0, v1, 14, param1); break; case 14: diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c index df420c8c785..0abfa60d7f3 100644 --- a/src/overlay116/ov116_02262A8C.c +++ b/src/overlay116/ov116_02262A8C.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "overlay116/ov116_02261870.h" #include "overlay116/ov116_0226432C.h" #include "overlay116/ov116_02266FEC.h" @@ -896,7 +898,7 @@ static void ov116_022639BC(UnkStruct_ov116_02262A8C *param0) ov116_02263DB8(param0); param0->unk_2858[param0->unk_00].unk_00 = 1; - CommSys_SendData(24, ¶m0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490)); + CommSys_SendData(COMM_CMD_MIME_TOP_24, ¶m0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490)); param0->unk_279C.unk_38 = 0; param0->unk_279C.unk_1E = 0; @@ -930,7 +932,7 @@ static void ov116_022639BC(UnkStruct_ov116_02262A8C *param0) } ov116_02262AE4(param0); - CommSys_SendData(24, ¶m0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490)); + CommSys_SendData(COMM_CMD_MIME_TOP_24, ¶m0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490)); } else { param0->unk_2858[param0->unk_00].unk_00 = 0; } diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/comm_command_wobbuffet_pop.c similarity index 53% rename from src/overlay117/ov117_022665FC.c rename to src/overlay117/comm_command_wobbuffet_pop.c index be186c89e83..2c9883e8a61 100644 --- a/src/overlay117/ov117_022665FC.c +++ b/src/overlay117/comm_command_wobbuffet_pop.c @@ -1,35 +1,39 @@ -#include "overlay117/ov117_022665FC.h" +#include "overlay117/comm_command_wobbuffet_pop.h" #include #include +#include "constants/communication/comm_command.h" + #include "struct_defs/comm_cmd_table.h" #include "overlay117/ov117_02260668.h" #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_022621D4.h" +#include "comm_command.h" #include "communication_system.h" -#include "unk_02032798.h" -static void ov117_02266618(int param0, int param1, void *param2, void *param3); -static void ov117_0226663C(int param0, int param1, void *param2, void *param3); -static void ov117_02266660(int param0, int param1, void *param2, void *param3); +static void CommCmd_WobPop_24(int param0, int param1, void *param2, void *param3); +static void CommCmd_WobPop_25(int param0, int param1, void *param2, void *param3); +static void CommCmd_WobPop_23(int param0, int param1, void *param2, void *param3); static int ov117_02266610(void); static int ov117_02266614(void); +// clang-format off static const CommCmdTable Unk_ov117_02266FE4[] = { - { NULL, CommPacketSizeOf_Nothing, NULL }, - { ov117_02266660, ov117_02266614, NULL }, - { ov117_02266618, ov117_02266610, NULL }, - { ov117_0226663C, CommPacketSizeOf_Nothing, NULL } + [COMM_CMD_WOB_POP_NONE - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL }, + [COMM_CMD_WOB_POP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_WobPop_23, ov117_02266614, NULL }, + [COMM_CMD_WOB_POP_24 - COMM_CMD_MAX_COMMON] = { CommCmd_WobPop_24, ov117_02266610, NULL }, + [COMM_CMD_WOB_POP_25 - COMM_CMD_MAX_COMMON] = { CommCmd_WobPop_25, CommPacketSizeOf_Nothing, NULL } }; +// clang-format on void ov117_022665FC(void *param0) { int v0 = sizeof(Unk_ov117_02266FE4) / sizeof(CommCmdTable); - CommCmd_Init(Unk_ov117_02266FE4, v0, param0); + CommCmdManager_Init(Unk_ov117_02266FE4, v0, param0); GF_ASSERT(sizeof(UnkStruct_ov117_022621D4) < 256); } @@ -43,7 +47,7 @@ static int ov117_02266614(void) return sizeof(u32); } -static void ov117_02266618(int param0, int param1, void *param2, void *param3) +static void CommCmd_WobPop_24(int param0, int param1, void *param2, void *param3) { UnkStruct_ov117_02261280 *v0 = param3; ov117_02262044(v0, param0, param2); @@ -51,14 +55,14 @@ static void ov117_02266618(int param0, int param1, void *param2, void *param3) BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1) { - if (CommSys_SendData(24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) { + if (CommSys_SendData(COMM_CMD_WOB_POP_24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) { return 1; } return 0; } -static void ov117_0226663C(int param0, int param1, void *param2, void *param3) +static void CommCmd_WobPop_25(int param0, int param1, void *param2, void *param3) { UnkStruct_ov117_02261280 *v0 = param3; v0->unk_2FC0 = 1; @@ -66,14 +70,14 @@ static void ov117_0226663C(int param0, int param1, void *param2, void *param3) BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0) { - if (CommSys_SendData(25, NULL, 0) == 1) { + if (CommSys_SendData(COMM_CMD_WOB_POP_25, NULL, 0) == 1) { return 1; } return 0; } -static void ov117_02266660(int param0, int param1, void *param2, void *param3) +static void CommCmd_WobPop_23(int param0, int param1, void *param2, void *param3) { UnkStruct_ov117_02261280 *v0 = param3; u32 *v1 = param2; @@ -97,7 +101,7 @@ BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0) { u32 v0 = 100; - if (CommSys_SendData(23, &v0, sizeof(u32)) == 1) { + if (CommSys_SendData(COMM_CMD_WOB_POP_23, &v0, sizeof(u32)) == 1) { return 1; } diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index cf608a1eea2..4a405e40c45 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -8,9 +8,9 @@ #include "nintendo_wfc/main.h" #include "overlay114/ov114_0225C700.h" +#include "overlay117/comm_command_wobbuffet_pop.h" #include "overlay117/ov117_022626B0.h" #include "overlay117/ov117_02263AF0.h" -#include "overlay117/ov117_022665FC.h" #include "overlay117/ov117_022666C0.h" #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_02261C2C.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index ca68244eea5..382916fda7c 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -96,6 +96,7 @@ #include "binoculars_vista_lighthouse.h" #include "camera.h" #include "clear_game.h" +#include "comm_command_field.h" #include "comm_manager.h" #include "comm_player_manager.h" #include "communication_system.h" @@ -212,7 +213,6 @@ #include "unk_0207DA28.h" #include "unk_02097B18.h" #include "unk_020985E4.h" -#include "unk_02099500.h" #include "unk_02099604.h" #include "unk_0209ACF4.h" #include "unk_0209B344.h" diff --git a/src/scrcmd_battle_hall.c b/src/scrcmd_battle_hall.c index 3766ccd14c0..a9265152077 100644 --- a/src/scrcmd_battle_hall.c +++ b/src/scrcmd_battle_hall.c @@ -4,6 +4,7 @@ #include #include "constants/battle_frontier.h" +#include "constants/communication/comm_command.h" #include "generated/game_records.h" #include "applications/party_menu/defs.h" @@ -16,6 +17,7 @@ #include "battle_frontier_stats.h" #include "battle_hall_save.h" #include "battle_hall_win_records.h" +#include "comm_command_field.h" #include "communication_system.h" #include "dexmode_checker.h" #include "field_script_context.h" @@ -35,7 +37,6 @@ #include "unk_0202D778.h" #include "unk_0204FA34.h" #include "unk_0205DFC4.h" -#include "unk_02099500.h" #include "constdata/const_020F410C.h" @@ -216,7 +217,7 @@ static BOOL CheckPartnerUsesDifferentSpeciesTask(FieldTask *task) switch (data->taskState) { case 0: - if (CommSys_SendData(132, data, sizeof(BattleHallSameSpeciesCheck)) == TRUE) { + if (CommSys_SendData(COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE, data, sizeof(BattleHallSameSpeciesCheck)) == TRUE) { data->taskState++; } break; diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c index 39a32dd5a19..2e66e7ca493 100644 --- a/src/underground/comm_manager.c +++ b/src/underground/comm_manager.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "generated/trainer_score_events.h" #include "field/field_system.h" @@ -326,7 +327,7 @@ static void CommManUnderground_ConnectTaskClient(void) UndergroundMan_ForceEndCurrentSysTask(); CommPlayer_CopyPersonal(0); - Traps_EndCurrentTrapEffectServer(0, 0, NULL, NULL); + CommCmd_EndCurrentTrapEffectServer(0, 0, NULL, NULL); Traps_ForceEndCurrentTrapEffectClient(0, TRUE); CommInfo_InitPlayer(0); @@ -382,7 +383,7 @@ static void CommManUnderground_MainTaskServer(void) UndergroundPlayer_ClearHeldFlagInfo(); SecretBases_AbortBaseEnter(); - CommSys_SendMessage(43); + CommSys_SendMessage(COMM_CMD_END_TRAP_EFFECT); Traps_ForceEndCurrentTrapEffectClient(CommSys_CurNetId(), TRUE); UndergroundMan_ForceEndCurrentSysTask(); @@ -477,7 +478,7 @@ static void CommManUnderground_WaitForBaseDataReceiptTaskClient(void) CommManUnderground_DebugPrintDummy("\u0094\u00E9\u0096\u00A7\u008A\u00EE\u0092\u006E\u0082\u00CC\u0088\u00CA\u0092\u0075\u0082\u00AA\u0082\u00AB\u0082\u00BD"); // 秘密基地の位置がきた SecretBases_ClearLinksReceivedBaseData(); CommPlayer_SendPos(TRUE); - CommSys_SendMessage(31); + CommSys_SendMessage(COMM_CMD_PROCESS_ALL_DATA_SENT_MSG); CommManUnderground_SetFieldCommManTask(CommManUnderground_MainTaskClient, 0); return; } diff --git a/src/underground/manager.c b/src/underground/manager.c index b666614e665..d6cf4bb533b 100644 --- a/src/underground/manager.c +++ b/src/underground/manager.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/field/map.h" #include "constants/field/map_matrix.h" #include "constants/field_base_tiles.h" @@ -369,7 +370,7 @@ BOOL UndergroundMan_CheckForTouchInput(void) sUndergroundMan->touchedTileCoords.x = x; sUndergroundMan->touchedTileCoords.z = z; - CommSys_SendData(48, &touchedTileCoords, sizeof(CoordinatesU16)); + CommSys_SendData(COMM_CMD_UNDERGROUND_TOUCH_INPUT, &touchedTileCoords, sizeof(CoordinatesU16)); return TRUE; } @@ -417,13 +418,13 @@ static void UndergroundMan_StartTouchRadar(int netID, CoordinatesU16 *touchedTil buffer[0] = netID; size = UndergroundMan_TouchRadarSearch(buffer, Traps_IsTrapAtCoordinates, touchedTileCoords); - CommSys_SendDataServer(49, buffer, size); + CommSys_SendDataServer(COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS, buffer, size); size = UndergroundMan_TouchRadarSearch(buffer, Mining_IsMiningSpotAtCoordinates, touchedTileCoords); - CommSys_SendDataServer(50, buffer, size); + CommSys_SendDataServer(COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS, buffer, size); } -void UndergroundMan_ProcessTouchInput(int netID, int unused1, void *data, void *unused3) +void CommCmd_UndergroundTouchInput(int netID, int unused1, void *data, void *unused3) { CoordinatesU16 *touchedTileCoords = data; @@ -439,7 +440,7 @@ void UndergroundMan_ProcessTouchInput(int netID, int unused1, void *data, void * UndergroundMan_StartTouchRadar(netID, touchedTileCoords); } -void UndergroundMan_ProcessTouchRadarTrapResults(int unused0, int size, void *data, void *unused3) +void CommCmd_UndergroundTouchRadarTrapResults(int unused0, int size, void *data, void *unused3) { u8 *buffer = data; @@ -451,7 +452,7 @@ void UndergroundMan_ProcessTouchRadarTrapResults(int unused0, int size, void *da sUndergroundMan->touchRadarTrapResultCount = size - 1; } -void UndergroundMan_ProcessTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3) +void CommCmd_UndergroundTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3) { u8 *buffer = data; u8 sphereResults[MAX_TOUCH_RADAR_RESULTS_OF_TYPE + 1]; @@ -541,7 +542,7 @@ void UndergroundMan_InitCoordsOrderingState(int orderedArrayLength, GetCoordinat void UndergroundMan_OpenMenu(void) { if (CommPlayer_GetMovementTimer(CommSys_CurNetId()) == 0) { - CommSys_SendMessage(27); + CommSys_SendMessage(COMM_CMD_OPEN_MENU_REQUEST); CommSys_Dummy(); } } @@ -581,7 +582,7 @@ void UndergroundMan_ProcessInteract(u8 flags) .pos = COORDS_TO_EVENT_POS(x, z) }; - CommSys_SendDataFixedSize(28, &event); + CommSys_SendDataFixedSize(COMM_CMD_INTERACT_EVENT, &event); CommSys_Dummy(); sUndergroundMan->interactCooldown = 8; @@ -592,7 +593,7 @@ int CommPacketSizeOf_InteractEvent(void) return sizeof(InteractEvent); } -void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, void *unused3) +void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *unused3) { TalkEvent talkEvent; InteractEvent *event = data; @@ -623,7 +624,7 @@ void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, voi talkEvent.talkTargetNetID = linkNetID; talkEvent.netID = netID; - CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent)); + CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent)); CommPlayerMan_SetMovementEnabled(netID, FALSE); } else if (UndergroundPlayer_TalkHeldFlagCheck(netID, linkNetID, FALSE)) { return; @@ -635,7 +636,7 @@ void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, voi talkEvent.talkTargetNetID = linkNetID; talkEvent.netID = netID; - CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent)); + CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent)); CommPlayerMan_SetMovementEnabled(netID, FALSE); } } else if (!CommPlayerMan_IsMovementEnabled(netID)) { @@ -645,7 +646,7 @@ void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, voi talkEvent.talkTargetNetID = linkNetID; talkEvent.netID = netID; - CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent)); + CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent)); CommPlayerMan_SetMovementEnabled(netID, FALSE); } else { talkEvent.result = TALK_RESULT_SUCCESS; @@ -653,7 +654,7 @@ void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, voi talkEvent.netID = netID; if (CommPlayerMan_IsMovementEnabled(linkNetID)) { - if (CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent))) { + if (CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent))) { CommPlayerMan_SetMovementEnabled(netID, FALSE); CommPlayerMan_SetMovementEnabled(linkNetID, FALSE); CommPlayer_LookTowardsServer(netID, linkNetID); @@ -689,7 +690,7 @@ void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, voi return; } - CommSys_SendDataFixedSizeServer(24, &netIDBuffer); + CommSys_SendDataFixedSizeServer(COMM_CMD_VENDOR_TALK_REQUEST, &netIDBuffer); CommPlayerMan_SetMovementEnabled(netID, FALSE); return; @@ -701,7 +702,7 @@ void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, voi } if (event->pos == COORDS_TO_EVENT_POS(coordinates.x, coordinates.z)) { - CommSys_SendDataFixedSizeServer(63, &netIDBuffer); + CommSys_SendDataFixedSizeServer(COMM_CMD_RETRIEVE_BURIED_SPHERES, &netIDBuffer); CommPlayerMan_SetMovementEnabled(netID, FALSE); } } @@ -1101,14 +1102,14 @@ u16 UndergroundMan_GetStoredCursorPos(u16 menuKey) return 0; } -void UndergroundMan_ProcessVendorTalkRequest(int unused0, int unused1, void *data, void *unused3) +void CommCmd_VendorTalkRequest(int unused0, int unused1, void *data, void *unused3) { u8 *buffer = data; int netID = *buffer; if (netID == CommSys_CurNetId()) { UndergroundVendors_StartShopMenuTask(sUndergroundMan->fieldSystem); - CommSys_SendMessage(25); + CommSys_SendMessage(COMM_CMD_VENDOR_TALK); CommPlayerMan_PauseFieldSystem(); } } @@ -1198,10 +1199,10 @@ void UndergroundMan_SendPlayerState(void) .isMining = Mining_IsMiningGameTaskActive() }; - CommSys_SendDataFixedSize(70, &playerState); + CommSys_SendDataFixedSize(COMM_CMD_PLAYER_STATE_UNDERGROUND, &playerState); } -void UndergroundMan_ProcessPlayerState(int netID, int unused1, void *data, void *unused3) +void CommCmd_UndergroundPlayerState(int netID, int unused1, void *data, void *unused3) { UndergroundPlayerState *playerState = data; @@ -1216,7 +1217,7 @@ int CommPacketSizeOf_UndergroundPlayerState(void) return sizeof(UndergroundPlayerState); } -void UndergroundMan_ProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_UndergroundProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3) { sUndergroundMan->initialized[netID] = TRUE; } diff --git a/src/underground/menus.c b/src/underground/menus.c index 10364c6839d..259e1de91e3 100644 --- a/src/underground/menus.c +++ b/src/underground/menus.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/heap.h" #include "constants/start_menu.h" #include "generated/traps.h" @@ -1488,7 +1489,7 @@ static void UndergroundMenu_MainHoldingFlag(SysTask *sysTask, void *data) UndergroundMan_ClearCurrentSysTaskInfo(); UndergroundMenu_Free(sysTask, data, TRUE); u8 flagEventType = FLAG_EVENT_DISCARD; - CommSys_SendDataFixedSize(84, &flagEventType); + CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE, &flagEventType); return; case UNDERGROUND_MENU_STATE_UNUSED: if (!UndergroundTextPrinter_IsPrinterActive(UndergroundMan_GetCaptureFlagTextPrinter())) { diff --git a/src/underground/mining.c b/src/underground/mining.c index 8f9cc7ff9ad..a18eead8d76 100644 --- a/src/underground/mining.c +++ b/src/underground/mining.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/field/map.h" #include "constants/field/map_matrix.h" #include "constants/field_base_tiles.h" @@ -814,7 +815,7 @@ BOOL Mining_CheckForMiningSpotInteract(int netID, CoordinatesU16 *coordinates) return TRUE; } - CommSys_SendDataServer(64, &buffer, 1); + CommSys_SendDataServer(COMM_CMD_INTERACT_MINING_SPOT, &buffer, 1); CommPlayerMan_SetMovementEnabled(netID, 0); sMiningEnv->currentUsedMiningSpots[netID] = miningSpot; @@ -1104,7 +1105,7 @@ static void Mining_ForceEndConfirmStartMiningTask(SysTask *sysTask, void *data) SysTask_Done(sysTask); } -void Mining_ProcessMiningSpotInteract(int unused0, int unused1, void *data, void *unused3) +void CommCmd_InteractMiningSpot(int unused0, int unused1, void *data, void *unused3) { u8 *netID = data; @@ -1137,7 +1138,7 @@ static void Mining_ConfirmStartMiningTask(SysTask *sysTask, void *unused) CommPlayerMan_ResumeFieldSystem(); } - CommSys_SendDataFixedSize(65, &confirmResult); + CommSys_SendDataFixedSize(COMM_CMD_CONFIRM_START_MINING_RESULT, &confirmResult); sMiningEnv->confirmStartMiningMenu = NULL; UndergroundTextPrinter_EraseMessageBoxWindow(UndergroundMan_GetCommonTextPrinter()); @@ -1148,7 +1149,7 @@ static void Mining_ConfirmStartMiningTask(SysTask *sysTask, void *unused) } } -void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3) +void CommCmd_ConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3) { Underground *underground = SaveData_GetUnderground(sMiningEnv->fieldSystem->saveData); MiningSpot *miningSpot = sMiningEnv->currentUsedMiningSpots[netID]; @@ -1157,7 +1158,7 @@ void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data, if (*confirmResult && miningSpot) { if (miningSpot->alwaysFF == 0xFF) { - CommSys_SendDataServer(66, &buffer, 1); + CommSys_SendDataServer(COMM_CMD_CONFIRM_START_MINING, &buffer, 1); miningSpot->alwaysFF = 0xFF; miningSpot->x = 0xffff; @@ -1174,7 +1175,7 @@ void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data, } } -void Mining_ProcessStartMiningConfirm(int unused0, int unused1, void *data, void *unused3) +void CommCmd_ConfirmStartMining(int unused0, int unused1, void *data, void *unused3) { u8 *netID = data; @@ -1186,13 +1187,13 @@ void Mining_ProcessStartMiningConfirm(int unused0, int unused1, void *data, void sMiningEnv->miningMessagesQueued[*netID] = TRUE; } -void Mining_ProcessMiningGameEnd(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_RecvMiningGameEnd(int netID, int unused1, void *unused2, void *unused3) { sMiningEnv->isPlayerMining[netID] = FALSE; sMiningEnv->normalRadarTimer[netID] = 0; } -void Mining_ProcessLinkInput(int netID, int unused1, void *data, void *unused3) +void CommCmd_MiningLinkInput(int netID, int unused1, void *data, void *unused3) { MiningLinkInput *linkInput = data; MiningLinkInputWithNetID linkInputWithNetID; @@ -1201,7 +1202,7 @@ void Mining_ProcessLinkInput(int netID, int unused1, void *data, void *unused3) linkInputWithNetID.touchX = linkInput->touchX; linkInputWithNetID.touchY = linkInput->touchY; - CommSys_SendDataFixedSizeServer(69, &linkInputWithNetID); + CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_LINK_INPUT_SERVER, &linkInputWithNetID); } int CommPacketSizeOf_MiningLinkInput(void) @@ -1209,7 +1210,7 @@ int CommPacketSizeOf_MiningLinkInput(void) return sizeof(MiningLinkInput); } -void Mining_ProcessLinkInputServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_MiningLinkInputServer(int unused0, int unused1, void *data, void *unused3) { MiningLinkInputWithNetID *linkInput = data; @@ -1656,7 +1657,7 @@ static void Mining_GameTask(SysTask *sysTask, void *data) SecretBases_EnableBaseEntranceGraphics(); Spheres_EnableBuriedSphereSparkles(); - CommSys_SendDataFixedSize(67, &ctx->dugUpAllItems); + CommSys_SendDataFixedSize(COMM_CMD_RECV_MINING_END, &ctx->dugUpAllItems); CommPlayerMan_ResumeFieldSystem(); sMiningEnv->miningGameTask = NULL; @@ -2731,7 +2732,7 @@ static BOOL Mining_MainGameLoop(MiningGameContext *ctx) damageToWall = 8; } - CommSys_SendDataFixedSize(68, &input); + CommSys_SendDataFixedSize(COMM_CMD_MINING_LINK_INPUT, &input); if (sMiningEnv->wallIntegrity > damageToWall) { sMiningEnv->wallIntegrity -= damageToWall; @@ -2980,7 +2981,7 @@ void TreasureRadar_Start(void) TreasureRadarContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(TreasureRadarContext)); MI_CpuFill8(ctx, 0, sizeof(TreasureRadarContext)); - CommSys_SendMessage(71); + CommSys_SendMessage(COMM_CMD_START_TREASURE_RADAR); ctx->timer = MAX_MINING_SPOTS / 3 - 10; @@ -2998,7 +2999,7 @@ void TreasureRadar_Exit(void) } } -void Mining_ProcessTreasureRadarStart(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_StartTreasureRadar(int netID, int unused1, void *unused2, void *unused3) { sMiningEnv->treasureRadarIndex[netID] = 1; } @@ -3018,7 +3019,7 @@ static void Mining_SendTreasureRadarResults(void) result.x = miningSpot->x; result.z = miningSpot->z; result.netID = netID; - CommSys_SendDataFixedSizeServer(72, &result); + CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_SPOT_RADAR, &result); // bug: can potentially lead to out of bounds array access sMiningEnv->treasureRadarIndex[netID] = index + 3; break; @@ -3035,7 +3036,7 @@ static void Mining_SendTreasureRadarResults(void) } } -void Mining_ProcessMiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3) +void CommCmd_MiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3) { MiningSpotRadarResult *radarResult = data; @@ -3104,7 +3105,7 @@ static void Mining_SendNormalRadarResults(void) result.x = miningSpot->x; result.z = miningSpot->z; - CommSys_SendDataFixedSizeServer(72, &result); + CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_SPOT_RADAR, &result); } } else { MiningSpotRadarResult result; @@ -3113,7 +3114,7 @@ static void Mining_SendNormalRadarResults(void) result.x = 0; result.z = 0; - CommSys_SendDataFixedSizeServer(72, &result); + CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_SPOT_RADAR, &result); } } } diff --git a/src/underground/pc.c b/src/underground/pc.c index df75b5e6c3f..11d735c2f9d 100644 --- a/src/underground/pc.c +++ b/src/underground/pc.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/field_base_tiles.h" #include "constants/map_object.h" @@ -200,12 +201,12 @@ BOOL UndergroundPC_TryUsePC(int netID, CoordinatesU16 *coordinates) } else { if (UndergroundPlayer_IsHoldingFlag(netID)) { u8 flagEventType = FLAG_EVENT_REGISTER; - UndergroundPlayer_ProcessFlagEventType(netID, 1, &flagEventType, NULL); + CommCmd_UndergroundFlagEventType(netID, 1, &flagEventType, NULL); return TRUE; } } - CommSys_SendDataFixedSizeServer(83, &pcInteraction); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_PC_INTERACT, &pcInteraction); return TRUE; } @@ -217,7 +218,7 @@ static void UndergroundPC_ResumeFieldSystem(int unused) CommPlayerMan_ResumeFieldSystemWithContextBit(PAUSE_BIT_LINK_PC); } -void UndergroundPC_ProcessPCInteraction(int unused0, int unused1, void *data, void *data2) +void CommCmd_IntreactUndergroundPC(int unused0, int unused1, void *data, void *data2) { PCInteraction *pcInteraction = data; FieldSystem *fieldSystem = data2; @@ -876,7 +877,7 @@ static void UndergroundPC_TakeFlagPromptTask(SysTask *sysTask, void *data) if (input == MENU_NOTHING_CHOSEN) { return; } else if (input == MENU_YES) { - CommSys_SendDataFixedSize(89, &ctx->pcInteraction); + CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG, &ctx->pcInteraction); } else { CommPlayerMan_ResumeFieldSystemWithContextBit(PAUSE_BIT_LINK_PC); UndergroundTextPrinter_EraseMessageBoxWindow(UndergroundMan_GetCommonTextPrinter()); @@ -925,16 +926,16 @@ static void UndergroundPC_StartTakeFlagPromptTask(FieldSystem *fieldSystem, PCIn UndergroundMan_SetCurrentSysTask(ctx, ctx->sysTask, UndergroundPC_EndFlagPromptTask); } -void UndergroundPC_ProcessTakeFlagAttempt(int unused0, int unused1, void *data, void *unused3) +void CommCmd_AttemptUndergroundTakeFlag(int unused0, int unused1, void *data, void *unused3) { PCInteraction *pcInteraction = data; if (UndergroundPlayer_TryTakeFlagFromBase(pcInteraction->playerNetID, pcInteraction->pcNetID)) { - CommSys_SendDataFixedSizeServer(90, pcInteraction); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_TAKEN_FLAG, pcInteraction); } } -void UndergroundPC_ProcessTakenFlag(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundTakenFlag(int unused0, int unused1, void *data, void *unused3) { PCInteraction *pcInteraction = data; diff --git a/src/underground/player.c b/src/underground/player.c index 56a013fd293..7484f7f7b07 100644 --- a/src/underground/player.c +++ b/src/underground/player.c @@ -4,6 +4,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "generated/trainer_score_events.h" #include "struct_defs/comm_player_location.h" @@ -161,7 +162,7 @@ static void UndergroundPlayer_CloseMenuCallback(int unused) } } -void UndergroundPlayer_ProcessOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_UndergroundOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3) { CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); @@ -177,14 +178,14 @@ void UndergroundPlayer_ProcessOpenMenuRequest(int netID, int unused1, void *unus } } - if (CommSys_SendDataServer(29, &event, sizeof(OpenMenuEvent))) { + if (CommSys_SendDataServer(COMM_CMD_OPEN_MENU_EVENT, &event, sizeof(OpenMenuEvent))) { if (event.result != MENU_RESULT_FAIL) { CommPlayerMan_SetMovementEnabled(netID, FALSE); } } } -void UndergroundPlayer_ProcessOpenMenuEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundOpenMenuEvent(int unused0, int unused1, void *data, void *unused3) { CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); OpenMenuEvent *event = data; @@ -207,7 +208,7 @@ void UndergroundPlayer_ProcessOpenMenuEvent(int unused0, int unused1, void *data } } -void UndergroundPlayer_ProcessTalkEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundTalkEvent(int unused0, int unused1, void *data, void *unused3) { CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); TalkEvent *event = data; @@ -260,7 +261,7 @@ int CommPacketSizeOf_FlagEvent(void) return sizeof(FlagEvent); } -void UndergroundPlayer_ProcessFlagEventType(int netID, int unused1, void *data, void *unused3) +void CommCmd_UndergroundFlagEventType(int netID, int unused1, void *data, void *unused3) { u8 *flagEventType = data; FlagEvent event; @@ -270,11 +271,11 @@ void UndergroundPlayer_ProcessFlagEventType(int netID, int unused1, void *data, switch (*flagEventType) { case FLAG_EVENT_DISCARD: event.type = FLAG_EVENT_DISCARD; - CommSys_SendDataFixedSizeServer(85, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event); break; case FLAG_EVENT_REGISTER: event.type = FLAG_EVENT_REGISTER; - CommSys_SendDataFixedSizeServer(85, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event); CommPlayerMan_SetMovementEnabled(netID, FALSE); break; } @@ -350,7 +351,7 @@ BOOL UndergroundPlayer_TalkHeldFlagCheck(int netID, int targetNetID, BOOL blockI event.targetNetID = targetNetID; CommPlayerMan_SetMovementEnabled(netID, FALSE); - CommSys_SendDataFixedSizeServer(85, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event); return TRUE; } @@ -366,7 +367,7 @@ BOOL UndergroundPlayer_BuriedObjectHeldFlagCheck(int netID) } event.netID = netID; - CommSys_SendDataFixedSizeServer(85, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event); return TRUE; } @@ -395,7 +396,7 @@ static void UndergroundPlayer_HandleCurrentPlayerLosingFlag(FlagEvent *event, BO Sound_PlayEffect(SEQ_SE_DP_CARD10); } -void UndergroundPlayer_ProcessFlagEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundFlagEvent(int unused0, int unused1, void *data, void *unused3) { CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); FlagEvent *event = data; @@ -493,7 +494,7 @@ void UndergroundPlayer_ProcessFlagEvent(int unused0, int unused1, void *data, vo if (prevFlagRank == UndergroundRecord_GetFlagRank(undergroundRecord)) { UndergroundTextPrinter_PrintText(UndergroundMan_GetCaptureFlagTextPrinter(), UndergroundCaptureFlag_Text_ObtainedFlagWasRegistered, TRUE, UndergroundPlayer_ResumeFieldSystemCallback); } else { - CommSys_SendDataFixedSize(96, &prevFlagRank); + CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_RANK_UP, &prevFlagRank); } Sound_FadeOutAndPlayBGM(4, SEQ_TANKOU, 60, 0, 0xFF, NULL); @@ -532,7 +533,7 @@ void UndergroundPlayer_SendHeldFlagOwnerInfo(void) commPlayerMan->linksReceivedHeldFlagData = FALSE; if (commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]) { - CommSys_SendDataFixedSize(91, commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]); + CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO, commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]); } else { TrainerInfo *trainerInfo = TrainerInfo_New(HEAP_ID_COMMUNICATION); String *name = String_Init(20, HEAP_ID_COMMUNICATION); @@ -541,7 +542,7 @@ void UndergroundPlayer_SendHeldFlagOwnerInfo(void) GF_ASSERT(name); TrainerInfo_SetNameFromString(trainerInfo, name); - CommSys_SendDataFixedSize(91, trainerInfo); + CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO, trainerInfo); String_Free(name); Heap_Free(trainerInfo); } @@ -552,7 +553,7 @@ int CommPacketSizeOf_TrainerInfo(void) return sizeof(TrainerInfo); } -void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3) +void CommCmd_UndergroundHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3) { CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); const TrainerInfo *flagOwnerInfo = data; @@ -570,11 +571,11 @@ void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, for (int netID = 0; netID < MAX_CONNECTED_PLAYERS; netID++) { if (commPlayerMan->heldFlagInfo[netID].netID != NETID_NONE) { commPlayerMan->heldFlagInfo[netID].netID = netID; - CommSys_SendDataHugeServer(92, &commPlayerMan->heldFlagInfo[netID], sizeof(HeldFlagInfo)); + CommSys_SendDataHugeServer(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER, &commPlayerMan->heldFlagInfo[netID], sizeof(HeldFlagInfo)); } } - CommSys_SendDataServer(93, &buffer, sizeof(u8)); + CommSys_SendDataServer(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK, &buffer, sizeof(u8)); String_Free(name); commPlayerMan->updatingHeldFlags = TRUE; @@ -583,7 +584,7 @@ void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, } } -void UndergroundPlayer_ProcessHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3) { CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); HeldFlagInfo *heldFlagInfo = data; @@ -606,7 +607,7 @@ int CommPacketSizeOf_HeldFlagInfo(void) return sizeof(HeldFlagInfo); } -void UndergroundPlayer_ProcessHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3) { u8 *netID = data; CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); @@ -663,13 +664,13 @@ BOOL UndergroundPlayer_IsAffectedByTrap(int netID) return FALSE; } -void UndergroundPlayer_ProcessVendorTalk(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_UndergroundVendorTalk(int netID, int unused1, void *unused2, void *unused3) { u8 data = netID; - CommSys_SendDataFixedSizeServer(26, &data); + CommSys_SendDataFixedSizeServer(COMM_CMD_VENDOR_TALK_SERVER, &data); } -void UndergroundPlayer_ProcessVendorTalkServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundVendorTalkServer(int unused0, int unused1, void *data, void *unused3) { u8 *netID = data; UndergroundMan_QueueTalkedToVendorMessage(*netID); diff --git a/src/underground/player_talk.c b/src/underground/player_talk.c index 59b098a0f85..7baf10acdd3 100644 --- a/src/underground/player_talk.c +++ b/src/underground/player_talk.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/field_base_tiles.h" #include "generated/trainer_score_events.h" @@ -261,7 +262,7 @@ static void UndergroundTalkResponse_RequestLinkTalkStateUpdate(ResponseMenu *men .newState = newState }; - CommSys_SendDataFixedSize(74, &req); + CommSys_SendDataFixedSize(COMM_CMD_RESPONSE_TALK_UPDATE_SERVER, &req); } static void UndergroundTalk_RequestLinkTalkStateUpdate(TalkMenu *menu, int newState) @@ -271,7 +272,7 @@ static void UndergroundTalk_RequestLinkTalkStateUpdate(TalkMenu *menu, int newSt .newState = newState }; - CommSys_SendDataFixedSize(73, &req); + CommSys_SendDataFixedSize(COMM_CMD_REQUEST_TALK_UPDATE_SERVER, &req); } static void UndergroundTalk_PrintMessage(TalkMenu *menu, int bankEntry) @@ -443,7 +444,7 @@ static BOOL UndergroundTalk_HandleQuestionsMenu(SysTask *sysTask, void *data) message.recipientNetID = menu->linkNetID; message.type = MESSAGE_TYPE_QUESTION; - CommSys_SendDataFixedSize(79, &message); + CommSys_SendDataFixedSize(COMM_CMD_SEND_TALK_MSG_SERVER, &message); menu->questionIndex = input; menu->state = TALK_MENU_STATE_PRINT_SELECTED_QUESTION; @@ -506,7 +507,7 @@ static BOOL UndergroundTalk_HandleAnswersMenu(SysTask *sysTask, void *data) message.index = menu->questionIndex * ANSWERS_PER_QUESTION + input; message.recipientNetID = menu->linkNetID; message.type = MESSAGE_TYPE_TALK_ANSWER; - CommSys_SendDataFixedSize(79, &message); + CommSys_SendDataFixedSize(COMM_CMD_SEND_TALK_MSG_SERVER, &message); UndergroundTextPrinter_SetUndergroundAnswer(UndergroundMan_GetCommonTextPrinter(), message.index); UndergroundTextPrinter_SetUndergroundAnswerWithIndex(UndergroundMan_GetCommonTextPrinter(), 6, menu->linkAnswerIndex); @@ -551,7 +552,7 @@ static void UndergroundTalk_HandleGiftConfirmMenu(SysTask *unused, TalkMenu *men if (input == MENU_YES) { menu->sentGift.recipientNetID = menu->linkNetID; - CommSys_SendDataFixedSize(77, &menu->sentGift); + CommSys_SendDataFixedSize(COMM_CMD_SEND_GIFT_SERVER, &menu->sentGift); menu->state = TALK_MENU_STATE_GIFT_OFFERED; } else { UndergroundTalk_PrintMessage(menu, UndergroundCommon_Text_NextTimeWillBeFine); @@ -1102,7 +1103,7 @@ static BOOL UndergroundTalkResponse_HandleAnswersMenu(SysTask *sysTask, void *da message.recipientNetID = menu->linkNetID; message.type = MESSAGE_TYPE_RESPONSE_ANSWER; - CommSys_SendDataFixedSize(79, &message); + CommSys_SendDataFixedSize(COMM_CMD_SEND_TALK_MSG_SERVER, &message); UndergroundTalkResponse_RequestLinkTalkStateUpdate(menu, TALK_MENU_STATE_LINK_ANSWERED); break; } @@ -1339,17 +1340,17 @@ void UndergroundTalkResponse_Start(int unused, int linkNetID, FieldSystem *field menu->sysTask = SysTask_Start(UndergroundTalkResponse_Main, menu, 10000); } -void UndergroundTalk_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RequestUndergroundTalkStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3) { - CommSys_SendDataFixedSizeServer(75, data); + CommSys_SendDataFixedSizeServer(COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER, data); } -void UndergroundTalkResponse_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3) { - CommSys_SendDataFixedSizeServer(76, data); + CommSys_SendDataFixedSizeServer(COMM_CMD_TALK_UPDATE_SERVER, data); } -void UndergroundTalkResponse_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3) +void CommCmd_UndergroundTalkResponseStateUpdateServer(int unused0, int size, void *data, void *unused3) { TalkStateChangeRequest *req = data; @@ -1359,7 +1360,7 @@ void UndergroundTalkResponse_HandleLinkTalkStateUpdateServer(int unused0, int si } } -void UndergroundTalk_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3) +void CommCmd_UndergroundTalkStateUpdateServer(int unused0, int size, void *data, void *unused3) { TalkStateChangeRequest *req = data; @@ -1376,12 +1377,12 @@ int CommPacketSizeOf_TalkStateChangeRequest(void) return sizeof(TalkStateChangeRequest); } -void UndergroundTalk_SendGiftServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundSendGiftServer(int unused0, int unused1, void *data, void *unused3) { - CommSys_SendDataFixedSizeServer(78, data); + CommSys_SendDataFixedSizeServer(COMM_CMD_RECV_GIFT_OFFER, data); } -void UndergroundTalkResponse_ReceiveGiftOffer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundRecvGiftOffer(int unused0, int unused1, void *data, void *unused3) { ResponseMenu *menu = sCurrentResponseMenu; Gift *gift = data; @@ -1412,12 +1413,12 @@ int CommPacketSizeOf_Gift(void) return sizeof(Gift); } -void UndergroundTalk_SendTalkMessageServer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_SendUndergroundTalkMessageServer(int unused0, int unused1, void *data, void *unused3) { - CommSys_SendDataFixedSizeServer(80, data); + CommSys_SendDataFixedSizeServer(COMM_CMD_RECV_TALK_MSG_SERVER, data); } -void UndergroundTalk_ReceiveTalkMessage(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RecvUndergroundTalkMessage(int unused0, int unused1, void *data, void *unused3) { ResponseMenu *responseMenu = sCurrentResponseMenu; TalkMenu *talkMenu = sCurrentTalkMenu; diff --git a/src/underground/records.c b/src/underground/records.c index 3e3880e80f0..2adf0d57476 100644 --- a/src/underground/records.c +++ b/src/underground/records.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/field_base_tiles.h" #include "constants/heap.h" @@ -249,7 +250,7 @@ void UndergroundRecords_SendRecord(int targetNetID) MI_CpuCopy8(recordsEnv->record, &buffer->undergroundRecord, size); - CommSys_SendData(81, buffer, size + 1); + CommSys_SendData(COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER, buffer, size + 1); Heap_Free(buffer); } @@ -264,12 +265,12 @@ void UndergroundRecords_RetrieveTrainerScore(void) UndergroundRecord_SetTrainerScore(recordsEnv->record, trainerScore); } -void UndergroundRecords_SendRecordServer(int unused0, int size, void *data, void *unused3) +void CommCmd_SendUndergroundRecordServer(int unused0, int size, void *data, void *unused3) { - CommSys_SendDataServer(82, data, size); + CommSys_SendDataServer(COMM_CMD_UNDERGROUND_RECORD, data, size); } -void UndergroundRecords_ProcessLinkRecord(int unused0, int size, void *data, void *unused3) +void CommCmd_UndergroundRecord(int unused0, int size, void *data, void *unused3) { RecordBuffer *buffer = data; diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c index eb7838c6342..f159f427bcb 100644 --- a/src/underground/secret_bases.c +++ b/src/underground/secret_bases.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/field_base_tiles.h" #include "constants/heap.h" #include "constants/map_object.h" @@ -653,7 +654,7 @@ static int SecretBases_GetEntranceOwnerNetIDFromCoords(int x, int z) return NETID_NONE; } -void SecretBases_ProcessBaseTransitionPromptEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_SecretBaseTransitionPrompt(int unused0, int unused1, void *data, void *unused3) { BaseTransitionPromptEvent *event = data; @@ -672,7 +673,7 @@ void SecretBases_ProcessBaseTransitionPromptEvent(int unused0, int unused1, void } } -void SecretBases_ProcessFailedBaseEnter(int unused0, int unused1, void *data, void *unused3) +void CommCmd_FailedSecretBaseEnter(int unused0, int unused1, void *data, void *unused3) { u8 *netID = data; @@ -689,7 +690,7 @@ int CommPacketSizeOf_BaseTransitionPromptEvent(void) return sizeof(BaseTransitionPromptEvent); } -void SecretBases_ProcessBaseTransitionEvent(int netID, int unused1, void *data, void *unused3) +void CommCmd_SecretBaseTransitionEvent(int netID, int unused1, void *data, void *unused3) { BaseTransitionEvent *event = data; u8 buffer = netID; @@ -703,7 +704,7 @@ void SecretBases_ProcessBaseTransitionEvent(int netID, int unused1, void *data, if (event->entering) { if (!SecretBases_TryEnterBase(event->baseOwnerNetID, netID)) { secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = NETID_NONE; - CommSys_SendDataFixedSizeServer(61, &buffer); + CommSys_SendDataFixedSizeServer(COMM_CMD_ENTER_BASE_FAILED, &buffer); } } else { SecretBases_ExitBase(event->baseOwnerNetID, netID, FALSE); @@ -784,7 +785,7 @@ static void SecretBases_ExitBase(int baseOwnerNetID, int netID, BOOL forceExit) event.dir = dir; event.forceExit = forceExit; - CommSys_SendDataFixedSizeServer(57, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_EXIT_BASE, &event); CommPlayerMan_SetMovementEnabled(netID, FALSE); } @@ -822,7 +823,7 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z) promptEvent.netID = netID; promptEvent.baseOwnerNetID = baseOwnerNetID; - CommSys_SendDataFixedSizeServer(58, &promptEvent); + CommSys_SendDataFixedSizeServer(COMM_CMD_BASE_TRANSMITION_PROMPT, &promptEvent); CommPlayerMan_SetMovementEnabled(netID, FALSE); return TRUE; @@ -847,7 +848,7 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z) promptEvent.netID = netID; promptEvent.baseOwnerNetID = baseOwnerNetID; - CommSys_SendDataFixedSizeServer(58, &promptEvent); + CommSys_SendDataFixedSizeServer(COMM_CMD_BASE_TRANSMITION_PROMPT, &promptEvent); CommPlayerMan_SetMovementEnabled(netID, FALSE); return TRUE; @@ -864,7 +865,7 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z) secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = 0; UndergroundPlayer_MoveToFromSecretBaseServer(netID, exitEvent.x, exitEvent.z, exitEvent.dir); - CommSys_SendDataFixedSizeServer(57, &exitEvent); + CommSys_SendDataFixedSizeServer(COMM_CMD_EXIT_BASE, &exitEvent); return TRUE; } @@ -898,7 +899,7 @@ static void SecretBases_EndBaseTransitionPromptTaskFail(SysTask *sysTask, void * event.baseOwnerNetID = ctx->baseOwnerNetID; event.entering = FALSE; - CommSys_SendDataFixedSize(59, &event); + CommSys_SendDataFixedSize(COMM_CMD_BASE_TRANSITION_EVENT, &event); SysTask_Done(sysTask); Heap_Free(ctx); @@ -987,7 +988,7 @@ static void SecretBases_ExitBasePromptTask(SysTask *sysTask, void *data) event.baseOwnerNetID = ctx->baseOwnerNetID; event.entering = FALSE; - CommSys_SendDataFixedSize(59, &event); + CommSys_SendDataFixedSize(COMM_CMD_BASE_TRANSITION_EVENT, &event); SecretBases_EndBaseTransitionPromptTaskSuccess(sysTask, ctx); return; } @@ -1202,7 +1203,7 @@ static void SecretBases_EnterBasePromptTask(SysTask *sysTask, void *data) case ENTER_PROMPT_STATE_ENTER_CLOSE_DOOR_AND_END: if (CommServerClient_IsInClosedSecretBase() && CommSys_CurNetId() == 0) { u8 type = BASE_CREATE_REQ_CLOSE_BASE; - CommSys_SendDataFixedSize(86, &type); + CommSys_SendDataFixedSize(COMM_CMD_CREATE_SECRET_BASE_REQUEST, &type); SecretBases_EndBaseTransitionPromptTaskSuccess(sysTask, ctx); @@ -1217,7 +1218,7 @@ static void SecretBases_EnterBasePromptTask(SysTask *sysTask, void *data) event.baseOwnerNetID = ctx->baseOwnerNetID; event.entering = TRUE; - CommSys_SendDataFixedSize(59, &event); + CommSys_SendDataFixedSize(COMM_CMD_BASE_TRANSITION_EVENT, &event); SecretBases_EndBaseTransitionPromptTaskSuccess(sysTask, ctx); secretBasesEnv->moveStatus = MOVE_STATUS_ENTERING; @@ -1265,7 +1266,7 @@ int CommPacketSizeOf_BaseExitEvent(void) return sizeof(BaseExitEvent); } -void SecretBases_ProcessBaseExitEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3) { BaseExitEvent *event = data; @@ -1277,7 +1278,7 @@ void SecretBases_ProcessBaseExitEvent(int unused0, int unused1, void *data, void UndergroundMan_ForceEndCurrentSysTask(); Traps_ForceEndCurrentTrapEffectClient(CommSys_CurNetId(), FALSE); - CommSys_SendMessage(43); + CommSys_SendMessage(COMM_CMD_END_TRAP_EFFECT); secretBasesEnv->currentPlayerInBase = FALSE; sub_02059638(TRUE); @@ -1291,10 +1292,10 @@ void SecretBases_ProcessBaseExitEvent(int unused0, int unused1, void *data, void void SecretBases_RequestClearTransitioningStatus(void) { - CommSys_SendMessage(56); + CommSys_SendMessage(COMM_CMD_CLEAR_TRANSITION_STATUS); } -void SecretBases_ClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_ClearSecretBaseTransitioningStatus(int netID, int unused1, void *unused2, void *unused3) { secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = NETID_NONE; secretBasesEnv->baseEnteringOwnerNetIDs[netID] = NETID_NONE; @@ -1336,7 +1337,7 @@ void SecretBases_SendEnteredBase(int baseOwnerNetID) CommSys_WriteToQueueServer(54, &secretBasesEnv->baseInfo[baseOwnerNetID], sizeof(SecretBaseInfo)); } -void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RecvSecretBaseEnter(int unused0, int unused1, void *data, void *unused3) { SecretBaseInfo *baseInfo = data; @@ -1348,7 +1349,7 @@ void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *un secretBasesEnv->moveStatus = MOVE_STATUS_NONE; CommPlayerMan_ResumeFieldSystem(); - CommSys_SendMessage(56); + CommSys_SendMessage(COMM_CMD_CLEAR_TRANSITION_STATUS); CommPlayer_SendPos(FALSE); ov23_0224DC24(); @@ -1389,7 +1390,7 @@ void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *un } } -void SecretBases_ProcessBaseInfo(int netID, int unused1, void *data, void *unused3) +void CommCmd_SecretBaseInfo(int netID, int unused1, void *data, void *unused3) { u8 *info = data; if (!secretBasesEnv) { @@ -1448,7 +1449,7 @@ static void SecretBases_SendBaseEntrancesBuffer(void) CommSys_WriteToQueueServer(55, &secretBasesEnv->baseEntrancesBuffer, sizeof(secretBasesEnv->baseEntrancesBuffer)); } -void SecretBases_ProcessBaseEntrancesBuffer(int unused0, int unused1, void *data, void *unused3) +void CommCmd_SecretBaseEntranceBuffer(int unused0, int unused1, void *data, void *unused3) { u8 *baseEntrancesBuffer = (u8 *)data; BaseEntrance temp; @@ -1886,7 +1887,7 @@ static void SecretBases_DiggerDrillTask(SysTask *sysTask, void *data) SecretBases_CreateBase(); - CommSys_SendDataFixedSize(86, &type); + CommSys_SendDataFixedSize(COMM_CMD_CREATE_SECRET_BASE_REQUEST, &type); SysTask_Done(sysTask); Heap_Free(ctx); @@ -1916,7 +1917,7 @@ static void SecretBases_DiggerDrillTask(SysTask *sysTask, void *data) void SecretBases_UseDiggerDrill(void) { u8 type = BASE_CREATE_REQ_USE_DIGGER_DRILL; - CommSys_SendDataFixedSize(86, &type); + CommSys_SendDataFixedSize(COMM_CMD_CREATE_SECRET_BASE_REQUEST, &type); } int CommPacketSizeOf_SecretBaseCreateEvent(void) @@ -1924,7 +1925,7 @@ int CommPacketSizeOf_SecretBaseCreateEvent(void) return sizeof(SecretBaseCreateEvent); } -void SecretBases_ProcessBaseCreateRequest(int netID, int unused1, void *data, void *unused3) +void CommCmd_CreateSecretBaseRequest(int netID, int unused1, void *data, void *unused3) { u8 *type = data; int x = CommPlayer_GetXInFrontOfPlayerServer(netID); @@ -1983,7 +1984,7 @@ void SecretBases_ProcessBaseCreateRequest(int netID, int unused1, void *data, vo } } - CommSys_SendDataFixedSizeServer(87, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_CREATE_SECRET_BASE_EVENT, &event); } static void SecretBases_EndDiggerDrillTask(SysTask *sysTask, void *data) @@ -2019,7 +2020,7 @@ static void SecretBases_StartDiggerDrillTask(void) UndergroundMan_SetCurrentSysTask(ctx, ctx->sysTask, SecretBases_EndDiggerDrillTask); } -void SecretBases_ProcessBaseCreateEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_CreateSecretBaseEvent(int unused0, int unused1, void *data, void *unused3) { SecretBaseCreateEvent *event = data; UndergroundRecord *undergroundRecord = SaveData_GetUndergroundRecord(FieldSystem_GetSaveData(secretBasesEnv->fieldSystem)); @@ -2321,7 +2322,7 @@ BOOL SecretBases_CheckForInteractableGood(int netID, CoordinatesU16 *coordinates if (event.bankEntry != 0) { CommPlayerMan_SetMovementEnabled(netID, FALSE); - CommSys_SendDataFixedSizeServer(60, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_SECRET_BASE_GOOD_INTERACTION, &event); return TRUE; } @@ -2330,7 +2331,7 @@ BOOL SecretBases_CheckForInteractableGood(int netID, CoordinatesU16 *coordinates return FALSE; } -void SecretBases_ProcessGoodInteractionEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_SecretBaseGoodInteraction(int unused0, int unused1, void *data, void *unused3) { GoodInteractionEvent *event = data; SecretBase *secretBase = (SecretBase *)secretBasesEnv->currentOccupiedBaseInfo->secretBase; @@ -2424,7 +2425,7 @@ static void SecretBases_FlagRankUpTask(SysTask *sysTask, void *data) } } -void SecretBases_ProcessFlagRankUp(int netID, int unused1, void *data, void *unused3) +void CommCmd_UndergroundFlagRankUp(int netID, int unused1, void *data, void *unused3) { u8 *prevFlagRank = data; @@ -2433,10 +2434,10 @@ void SecretBases_ProcessFlagRankUp(int netID, int unused1, void *data, void *unu .prevFlagRank = *prevFlagRank, }; - CommSys_SendDataFixedSizeServer(97, &event); + CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT, &event); } -void SecretBases_ProcessFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3) +void CommCmd_UndergroundFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3) { FlagRankUpEvent *event = data; diff --git a/src/underground/spheres.c b/src/underground/spheres.c index 3834e5188af..d489de57f38 100644 --- a/src/underground/spheres.c +++ b/src/underground/spheres.c @@ -238,7 +238,7 @@ static BuriedSphere *Spheres_GetBuriedSphereAtCoordinates(int x, int z) return spheresEnv->buriedSpheresByCoordinates[index]; } -void Spheres_ProcessRetrieveBuriedSphereRequest(int unused, int unused2, void *data, void *unused3) +void CommCmd_RetrieveBuriedSpheresRequest(int unused, int unused2, void *data, void *unused3) { u8 *netID = data; int curNetID = CommSys_CurNetId(); diff --git a/src/underground/traps.c b/src/underground/traps.c index 2d1700503fb..97e6442d008 100644 --- a/src/underground/traps.c +++ b/src/underground/traps.c @@ -4,6 +4,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/map_object.h" #include "generated/trainer_score_events.h" #include "generated/traps.h" @@ -1159,7 +1160,7 @@ static BuriedTrap *Traps_AddBuriedTrap(int x, int z, BuriedTrap *dest, enum Trap void Underground_SendPlacedTrap(u8 trapID) { - CommSys_SendDataFixedSize(32, &trapID); + CommSys_SendDataFixedSize(COMM_CMD_TRY_PLACE_TRAP, &trapID); } void Traps_SendTrapRadarResults(void) @@ -1172,7 +1173,7 @@ void Traps_SendPlacedTraps(void) CommSys_WriteToQueue(35, &trapsEnv->playerPlacedTraps[0], sizeof(BuriedTrap) * MAX_PLACED_TRAPS); } -void Traps_TryPlaceTrap(int netID, int unused1, void *data, void *unused3) +void CommCmd_TryPlaceTrap(int netID, int unused1, void *data, void *unused3) { u8 *trapID = (u8 *)data; @@ -1189,31 +1190,31 @@ void Traps_TryPlaceTrap(int netID, int unused1, void *data, void *unused3) if (CommPlayer_GetXServerIfActive(netID) == 0xFFFF && CommPlayer_GetZServerIfActive(netID) == 0xFFFF) { placeResult.result = PLACE_TRAP_FAIL; - CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult)); + CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult)); return; } if (CommPlayerMan_GetLinkNetIDAtLocation(x, z) != NETID_NONE) { placeResult.result = PLACE_TRAP_PERSON_IN_WAY; - CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult)); + CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult)); return; } if (CommPlayer_CheckNPCCollision(x, z)) { placeResult.result = PLACE_TRAP_PERSON_IN_WAY; - CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult)); + CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult)); return; } if (UndergroundMan_AreCoordinatesInSecretBase(x, z)) { placeResult.result = PLACE_TRAP_NOT_IN_SECRET_BASE; - CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult)); + CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult)); return; } if (TerrainCollisionManager_CheckCollision(trapsEnv->fieldSystem, x, z)) { placeResult.result = PLACE_TRAP_WALL_IN_WAY; - CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult)); + CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult)); return; } @@ -1227,7 +1228,7 @@ void Traps_TryPlaceTrap(int netID, int unused1, void *data, void *unused3) } } - CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult)); + CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult)); } int CommPacketSizeOf_PlaceTrapResult(void) @@ -1377,7 +1378,7 @@ static void Traps_RemovePlacedTrapCurrentPlayer(BuriedTrap *trap) trapsEnv->trapTextureManager[MAX_PLACED_TRAPS - 1] = NULL; } -void Traps_ProcessPlaceTrapResult(int unused0, int unused1, void *data, void *unused3) +void CommCmd_PlaceTrapResult(int unused0, int unused1, void *data, void *unused3) { PlaceTrapResult *placeResult = (PlaceTrapResult *)data; @@ -1404,7 +1405,7 @@ void Traps_ProcessPlaceTrapResult(int unused0, int unused1, void *data, void *un } } -void Traps_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3) { u16 *buffer = data; int index = buffer[0]; @@ -1417,7 +1418,7 @@ int CommPacketSizeOf_2Bytes_Unused(void) return 2; } -void Traps_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3) +void CommCmd_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3) { BuriedTrap *trapPtr = &trapsEnv->buriedTraps[netID * MAX_PLACED_TRAPS]; @@ -1446,11 +1447,11 @@ void Traps_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3) result.netID = netID; result.success = TRUE; - CommSys_SendDataServer(36, &result, 2); + CommSys_SendDataServer(COMM_CMD_RECV_LOAD_TRAPS, &result, 2); Traps_SendTriggeredTrapBits(); } -void Traps_ReceiveLoadTrapsResult(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RecvLoadTraps(int unused0, int unused1, void *data, void *unused3) { LoadTrapsResult *result = data; @@ -1512,7 +1513,7 @@ BOOL Traps_TryDisengageTrap(int netID, CoordinatesU16 *unused, u8 flags) } CommPlayerMan_SetMovementEnabled(netID, FALSE); - CommSys_SendDataServer(51, &retrievedTrap, sizeof(TriggeredTrap)); + CommSys_SendDataServer(COMM_CMD_DISENGAGE_TRAP, &retrievedTrap, sizeof(TriggeredTrap)); return TRUE; } @@ -1525,7 +1526,7 @@ int CommPacketSizeOf_TriggeredTrap(void) return sizeof(TriggeredTrap); } -void Traps_ProcessDisengagedTrap(int unused0, int unused1, void *data, void *unused3) +void CommCmd_DisengagedTrap(int unused0, int unused1, void *data, void *unused3) { TriggeredTrap *retrievedTrap = (TriggeredTrap *)data; @@ -1651,7 +1652,7 @@ static BOOL CheckPlayerSteppedOnTrap(int netID) Underground_RemoveSpawnedTrapAtIndex(underground, triggeredTrap.trap.spawnedTrapIndex); } - CommSys_SendDataServer(37, &triggeredTrap, sizeof(TriggeredTrap)); + CommSys_SendDataServer(COMM_CMD_TRIGGER_TRAP, &triggeredTrap, sizeof(TriggeredTrap)); trapsEnv->triggeredTrapIDs[netID] = trap->trapID; Traps_RemoveBuriedTrap(trap); @@ -1675,7 +1676,7 @@ void Traps_HandleTriggeredTool(int victimNetID, int setterNetID, enum Trap trapI trap.trap.z = z; trap.toolInitialDir = victimDir; - CommSys_SendDataServer(37, &trap, sizeof(TriggeredTrap)); + CommSys_SendDataServer(COMM_CMD_TRIGGER_TRAP, &trap, sizeof(TriggeredTrap)); trapsEnv->triggeredTrapIDs[victimNetID] = trapID; } @@ -1695,7 +1696,7 @@ BOOL Traps_HasPlayerTriggeredTool(int netID) return trapsEnv->triggeredTraps[netID].isTool; } -void Traps_HandleTriggeredTrap(int unused0, int unused1, void *data, void *unused3) +void CommCmd_TriggeredTraps(int unused0, int unused1, void *data, void *unused3) { TriggeredTrap *trap = (TriggeredTrap *)data; @@ -1751,7 +1752,7 @@ void Traps_HandleTriggeredTrap(int unused0, int unused1, void *data, void *unuse } } -void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3) +void CommCmd_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3) { u8 *trapID = data; TrapServerFunc trapEffectFunc = sTrapEffectServerSecondFuncs[*trapID]; @@ -1766,7 +1767,7 @@ void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, vo } } -void Traps_StartLinkSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3) +void CommCmd_StartSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3) { u8 *buffer = data; @@ -1786,11 +1787,11 @@ void Traps_SendTriggeredTrapBits(void) } } - CommSys_SendDataFixedSizeServer(45, &bits); + CommSys_SendDataFixedSizeServer(COMM_CMD_TRIGGERD_TRAP_BITS, &bits); } } -void Traps_ProcessTriggeredTrapBits(int unused0, int unused1, void *data, void *unused3) +void CommCmd_TriggeredTrapBits(int unused0, int unused1, void *data, void *unused3) { u8 bits = *(u8 *)data; @@ -2177,7 +2178,7 @@ static void Traps_MoveTrapClientTask(SysTask *sysTask, void *data) if (ctx->timer == 28) { u8 trapID = trapsEnv->triggeredTrapIDClient; - CommSys_SendDataFixedSize(38, &trapID); + CommSys_SendDataFixedSize(COMM_CMD_CALL_SECOND_TRAP_EFFECT, &trapID); } if (ctx->timer > 30) { @@ -2519,7 +2520,7 @@ static void Traps_SmokeTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = SMOKE_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = SMOKE_TRAP_STATE_WAIT_FOR_END; } } @@ -2552,7 +2553,7 @@ static void Traps_SmokeTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (ctx->timer > 8) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = SMOKE_TRAP_STATE_WAIT_FOR_END; } break; @@ -2564,7 +2565,7 @@ int CommPacketSizeOf_EscapedTrap(void) return sizeof(EscapedTrap); } -void Traps_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3) { if (UndergroundPlayer_IsAffectedByTrap(netID)) { UndergroundPlayer_RevertStatusToNormal(netID); @@ -2576,13 +2577,13 @@ void Traps_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3 trap.netID = netID; trap.showOKEmote = TRUE; - CommSys_SendDataFixedSizeServer(42, &trap); + CommSys_SendDataFixedSizeServer(COMM_CMD_ESCAPED_TRAP, &trap); } trapsEnv->triggeredTrapIDs[netID] = TRAP_NONE; } -void Traps_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3) { UndergroundPlayer_RevertStatusToNormal(netID); @@ -2596,7 +2597,7 @@ void Traps_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, voi SecretBases_ClearToolEffectFlag(netID); } -void Traps_ProcessEscapedTrap(int unused0, int unused1, void *data, void *unused3) +void CommCmd_EscapedTrap(int unused0, int unused1, void *data, void *unused3) { EscapedTrap *escapedTrap = data; enum Trap trapID = escapedTrap->trapID; @@ -2636,7 +2637,7 @@ void Traps_ProcessEscapedTrap(int unused0, int unused1, void *data, void *unused } } -void Traps_EscapeHole(int unused0, int unused1, void *data, void *unused3) +void CommCmd_EscapeHole(int unused0, int unused1, void *data, void *unused3) { u8 *netID = data; enum Trap trapID = trapsEnv->triggeredTrapIDClient; @@ -2656,12 +2657,12 @@ void Traps_HelpLink(int netID, int linkNetID) helpData.helperNetID = netID; helpData.trapID = trapsEnv->triggeredTrapIDs[linkNetID]; - CommSys_SendDataFixedSizeServer(44, &helpData); + CommSys_SendDataFixedSizeServer(COMM_CMD_TRAP_HELP, &helpData); trapsEnv->triggeredTrapIDs[linkNetID] = TRAP_NONE; CommPlayerMan_SetMovementEnabled(netID, FALSE); } -void Traps_ProcessTrapHelp(int unused0, int unused1, void *data, void *unused3) +void CommCmd_TrapHelp(int unused0, int unused1, void *data, void *unused3) { TrapHelpData *helpdata = data; UndergroundRecord *undergroundRecord = SaveData_GetUndergroundRecord(FieldSystem_GetSaveData(trapsEnv->fieldSystem)); @@ -2754,7 +2755,7 @@ void TrapRadar_Start(void) TrapRadarContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(TrapRadarContext)); MI_CpuFill8(ctx, 0, sizeof(TrapRadarContext)); - CommSys_SendMessage(46); + CommSys_SendMessage(COMM_CMD_QUEUE_SEND_TRAP_RADAR_RESULTS); trapsEnv->trapRadarContext = ctx; trapsEnv->trapRadarTask = SysTask_Start(TrapRadar_TimerTask, ctx, 100); @@ -2773,7 +2774,7 @@ void TrapRadar_Exit(void) } } -void Traps_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3) +void CommCmd_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3) { trapsEnv->trapRadarIndex[netID] = 1; } @@ -2796,7 +2797,7 @@ static void SendTrapRadarResults(void) radarResult.x = trap->x; radarResult.z = trap->z; radarResult.netID = netID; - CommSys_SendDataFixedSizeServer(47, &radarResult); + CommSys_SendDataFixedSizeServer(COMM_CMD_RECV_TRAP_RADAR_RESULTS, &radarResult); trapsEnv->trapRadarIndex[netID] = index + 2; break; } @@ -2817,7 +2818,7 @@ static void SendTrapRadarResults(void) } } -void Traps_ReceiveTrapRadarResults(int unused0, int unused1, void *data, void *unused3) +void CommCmd_RecvTrapRadarResults(int unused0, int unused1, void *data, void *unused3) { TrapRadarResult *radarResult = data; @@ -3090,7 +3091,7 @@ static void Traps_HoleTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (Traps_CheckPlayerPosRelativeToTrap(ctx->toolInitialDir, PLAYER_TILE_BACK_FROM_TRAP) || ctx->timer > 60) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = HOLE_TRAP_STATE_WAIT_FOR_FORCE_END; } break; @@ -3108,7 +3109,7 @@ static void Traps_HoleTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = HOLE_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = HOLE_TRAP_STATE_END; } } @@ -3264,7 +3265,7 @@ static void Traps_LeafTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = LEAF_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = LEAF_TRAP_STATE_WAIT_FOR_END; } } @@ -3295,7 +3296,7 @@ static void Traps_LeafTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (ctx->timer > 8) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = LEAF_TRAP_STATE_WAIT_FOR_END; } break; @@ -3688,7 +3689,7 @@ static void Traps_BubbleTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = BUBBLE_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = BUBBLE_TRAP_STATE_WAIT_FOR_END; } } @@ -3722,7 +3723,7 @@ static void Traps_BubbleTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (ctx->timer > 8) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = BUBBLE_TRAP_STATE_WAIT_FOR_END; } break; @@ -4303,7 +4304,7 @@ static void Traps_RockTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = ROCK_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = ROCK_TRAP_STATE_WAIT_FOR_END; } } @@ -4333,7 +4334,7 @@ static void Traps_RockTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (ctx->timer > 8) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = ROCK_TRAP_STATE_WAIT_FOR_END; } break; @@ -4606,7 +4607,7 @@ static void Traps_FireTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = FIRE_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = FIRE_TRAP_STATE_WAIT_FOR_END; } } @@ -4636,7 +4637,7 @@ static void Traps_FireTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (ctx->timer > 8) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = FIRE_TRAP_STATE_WAIT_FOR_END; } break; @@ -4732,7 +4733,7 @@ static void Traps_AlertTrapClientTask(SysTask *sysTask, void *data) if (ctx->isTool) { ctx->state = ALERT_TRAP_STATE_TOOL_STEP_BACK; } else { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = ALERT_TRAP_STATE_WAIT_FOR_END; } break; @@ -4754,7 +4755,7 @@ static void Traps_AlertTrapClientTask(SysTask *sysTask, void *data) ctx->timer++; if (ctx->timer > 8) { - CommSys_SendMessage(41); + CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP); ctx->state = ALERT_TRAP_STATE_WAIT_FOR_END; } break; diff --git a/src/unk_020322D8.c b/src/unk_020322D8.c index 3218dd2682e..bbe9fdde1b6 100644 --- a/src/unk_020322D8.c +++ b/src/unk_020322D8.c @@ -8,10 +8,10 @@ #include "struct_defs/struct_02032318.h" #include "struct_defs/struct_0203233C.h" +#include "comm_command.h" #include "comm_ring.h" #include "communication_system.h" #include "heap.h" -#include "unk_02032798.h" static UnkStruct_020322D8 *sub_020322D8(CommQueueMan *param0) { @@ -77,7 +77,7 @@ static BOOL sub_0203233C(UnkStruct_0203233C *param0, u8 param1) static BOOL sub_02032358(UnkStruct_020322D8 *param0, UnkStruct_0203233C *param1) { - int v0 = CommCmd_PacketSizeOf(param0->unk_0E); + int v0 = CommCmdManager_PacketSizeOf(param0->unk_0E); if (v0 == 0xffff) { if (param1->unk_04 < 3) { @@ -108,7 +108,7 @@ static BOOL sub_020323D0(UnkStruct_020322D8 *param0, UnkStruct_0203233C *param1, { int v0; int v1; - int v2 = CommCmd_PacketSizeOf(param0->unk_0E); + int v2 = CommCmdManager_PacketSizeOf(param0->unk_0E); if (v2 == 0xffff) { v1 = 3; @@ -168,7 +168,7 @@ BOOL CommQueue_Write(CommQueueMan *param0, int cmd, u8 *data, int size, BOOL par } GF_ASSERT(size < 65534); - v3 = CommCmd_PacketSizeOf(cmd); + v3 = CommCmdManager_PacketSizeOf(cmd); if (v3 == PACKET_SIZE_VARIABLE) { v3 = size; diff --git a/src/unk_02032798.c b/src/unk_02032798.c deleted file mode 100644 index d590f381993..00000000000 --- a/src/unk_02032798.c +++ /dev/null @@ -1,233 +0,0 @@ -#include "unk_02032798.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "functypes/funcptr_02032868.h" -#include "functypes/funcptr_0203290C.h" -#include "functypes/funcptr_020F8E60.h" - -#include "comm_manager.h" -#include "communication_information.h" -#include "communication_system.h" -#include "heap.h" -#include "unk_020363E8.h" - -typedef struct { - const CommCmdTable *cmdTable; - int unk_04; - void *unk_08; - u8 unk_0C[8]; - u8 unk_14; -} CommCmdManager; - -static void sub_02032958(int param0, int param1, void *param2, void *param3); -static void sub_0203299C(int param0, int param1, void *param2, void *param3); -static void sub_020329C4(int param0, int param1, void *param2, void *param3); -static int sub_02032954(void); - -static const CommCmdTable Unk_020E5D64[] = { - { NULL, CommPacketSizeOf_Nothing, NULL }, - { NULL, CommPacketSizeOf_Nothing, NULL }, - { sub_0203619C, CommPacketSizeOf_Nothing, NULL }, - { CommInfo_RecvPlayerData, CommPlayerInfo_Size, NULL }, - { CommInfo_RecvPlayerDataArray, CommPlayerInfo_Size, NULL }, - { CommunicatitonInformaion_FinishReading, CommPacketSizeOf_Nothing, NULL }, - { CommManager_ValidateConfirmationMessage, CommManager_ConfirmationMessage_sizeof, NULL }, - { CommManager_ValidateConfirmationResponseMessage, CommManager_ConfirmationMessage_sizeof, NULL }, - { NULL, NULL, NULL }, - { NULL, NULL, NULL }, - { sub_02036008, CommPacketSizeOf_NetId, NULL }, - { sub_02036030, CommPacketSizeOf_NetId, NULL }, - { sub_02036058, CommPacketSizeOf_NetId, NULL }, - { sub_02032958, CommPacketSizeOf_Nothing, NULL }, - { sub_0203299C, CommPacketSizeOf_Nothing, NULL }, - { sub_020329C4, CommPacketSizeOf_Nothing, NULL }, - { CommCmd_16, CommPacketSizeOf_NetId, NULL }, - { CommCmd_17, CommPacketSizeOf_NetId, NULL }, - { CommCmd_18, sub_02032954, NULL }, - { sub_02036574, sub_02036590, NULL }, - { sub_02036670, CommTool_TempDataSize, NULL }, - { CommManager_DisconnectWifi, CommPacketSizeOf_Nothing, NULL } -}; - -static CommCmdManager *sCommCmdManager = NULL; - -void CommCmd_Init(const CommCmdTable *cmdTable, int param1, void *param2) -{ - int v0; - - if (!sCommCmdManager) { - sCommCmdManager = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommCmdManager)); - } - - sCommCmdManager->cmdTable = cmdTable; - sCommCmdManager->unk_04 = param1; - sCommCmdManager->unk_08 = param2; - - for (v0 = 0; v0 < (7 + 1); v0++) { - sCommCmdManager->unk_0C[v0] = 0; - } - - sCommCmdManager->unk_14 = 0; -} - -void sub_020327E0(void) -{ - if (sCommCmdManager) { - Heap_Free(sCommCmdManager); - sCommCmdManager = NULL; - } -} - -void CommCmd_Callback(int param0, int cmd, int param2, void *param3) -{ - UnkFuncPtr_020F8E60 v0; - - if (cmd < 22) { - v0 = Unk_020E5D64[cmd].unk_00; - } else { - GF_ASSERT(sCommCmdManager); - - if (cmd > (sCommCmdManager->unk_04 + 22)) { - sub_020363BC(); - return; - } - - v0 = sCommCmdManager->cmdTable[cmd - 22].unk_00; - } - - if (v0 != NULL) { - if (sCommCmdManager) { - v0(param0, param2, param3, sCommCmdManager->unk_08); - } else { - v0(param0, param2, param3, NULL); - } - } -} - -int CommCmd_PacketSizeOf(int cmd) -{ - int v0 = 0; - UnkFuncPtr_02032868 v1; - - if (cmd < 22) { - v1 = Unk_020E5D64[cmd].unk_04; - } else { - GF_ASSERT(sCommCmdManager); - - if (sCommCmdManager == NULL) { - sub_020363BC(); - return v0; - } - - if (cmd > (sCommCmdManager->unk_04 + 22)) { - GF_ASSERT(FALSE); - sub_020363BC(); - return v0; - } - - v1 = sCommCmdManager->cmdTable[cmd - 22].unk_04; - } - - if (v1 != NULL) { - v0 = v1(); - } - - return v0; -} - -BOOL sub_020328D0(int cmd) -{ - if (cmd < 22) { - return Unk_020E5D64[cmd].unk_08 != NULL; - } - - return sCommCmdManager->cmdTable[cmd - 22].unk_08 != NULL; -} - -void *sub_0203290C(int cmd, int netId, int param2) -{ - UnkFuncPtr_0203290C v0; - - if (cmd < 22) { - v0 = Unk_020E5D64[cmd].unk_08; - return v0(netId, NULL, param2); - } else { - v0 = sCommCmdManager->cmdTable[cmd - 22].unk_08; - return v0(netId, sCommCmdManager->unk_08, param2); - } - - return NULL; -} - -int CommPacketSizeOf_Variable(void) -{ - return PACKET_SIZE_VARIABLE; -} - -int CommPacketSizeOf_Nothing(void) -{ - return 0; -} - -int CommPacketSizeOf_NetId(void) -{ - return 1; -} - -static int sub_02032954(void) -{ - return 2; -} - -static void sub_02032958(int param0, int param1, void *param2, void *param3) -{ - u8 *v0 = param2; - int v1; - - if (CommSys_CurNetId() != 0) { - return; - } - - sCommCmdManager->unk_0C[param0] = 1; - - for (v1 = 0; v1 < (7 + 1); v1++) { - if (!CommSys_IsPlayerConnected(v1)) { - continue; - } - - if (!sCommCmdManager->unk_0C[v1]) { - return; - } - } - - CommSys_SendDataServer(14, NULL, 0); -} - -static void sub_0203299C(int param0, int param1, void *param2, void *param3) -{ - u8 *v0 = param2; - int v1; - - sCommCmdManager->cmdTable = NULL; - sCommCmdManager->unk_04 = 0; - sCommCmdManager->unk_08 = NULL; - sCommCmdManager->unk_14 = 1; - - CommSys_SendDataFixedSize(15, param2); -} - -static void sub_020329C4(int param0, int param1, void *param2, void *param3) -{ - u8 *v0 = param2; - int v1; - - if (CommSys_CurNetId() != 0) { - return; - } - - sCommCmdManager->unk_0C[param0] = 0; -} diff --git a/src/unk_020363E8.c b/src/unk_020363E8.c index 213466c1789..7c678534601 100644 --- a/src/unk_020363E8.c +++ b/src/unk_020363E8.c @@ -3,6 +3,7 @@ #include #include +#include "constants/communication/comm_command.h" #include "constants/heap.h" #include "communication_system.h" @@ -68,7 +69,7 @@ void CommCmd_16(int netId, int param1, void *_buff, void *param3) if (CommSys_CurNetId() == 0) { v2[0] = netId; v2[1] = syncNo; - CommSys_SendDataFixedSizeServer(18, &v2); + CommSys_SendDataFixedSizeServer(COMM_CMD_18, &v2); sCommTool->syncNo[netId] = syncNo; @@ -80,7 +81,7 @@ void CommCmd_16(int netId, int param1, void *_buff, void *param3) } } - CommSys_SendDataFixedSizeServer(17, &syncNo); + CommSys_SendDataFixedSizeServer(COMM_CMD_17, &syncNo); } } @@ -108,7 +109,7 @@ void sub_0203650C(void) { if (sCommTool) { if (sCommTool->sendTiming) { - if (CommSys_SendDataFixedSize(16, &sCommTool->syncNoPersonal)) { + if (CommSys_SendDataFixedSize(COMM_CMD_16, &sCommTool->syncNoPersonal)) { sCommTool->sendTiming = 0; } } @@ -133,7 +134,7 @@ int CommTool_GetSyncNo(int netId) return sCommTool->syncNo[netId]; } -void sub_02036574(int netId, int param1, void *param2, void *param3) +void CommCmd_19(int netId, int param1, void *param2, void *param3) { UnkStruct_02036574 *v0 = param2; @@ -153,7 +154,7 @@ void sub_02036594(u8 param0, u8 param1) v0.unk_00 = param0; v0.unk_01 = param1; - CommSys_SendDataFixedSize(19, &v0); + CommSys_SendDataFixedSize(COMM_CMD_19, &v0); } int CommList_Get(int param0, u8 param1) @@ -189,7 +190,7 @@ BOOL sub_02036614(int param0, const void *param1) { if (sCommTool) { MI_CpuCopy8(param1, sCommTool->unk_18[param0], COMM_TOOL_TEMP_DATA_SIZE); - CommSys_SendDataFixedSize(20, sCommTool->unk_18[param0]); + CommSys_SendDataFixedSize(COMM_CMD_20, sCommTool->unk_18[param0]); return 1; } @@ -205,7 +206,7 @@ const void *sub_0203664C(int netId) return NULL; } -void sub_02036670(int netId, int param1, void *param2, void *param3) +void CommCmd_20(int netId, int param1, void *param2, void *param3) { sCommTool->hasRecievedTempData[netId] = TRUE; MI_CpuCopy8(param2, sCommTool->unk_18[netId], COMM_TOOL_TEMP_DATA_SIZE); diff --git a/src/unk_02039A58.c b/src/unk_02039A58.c deleted file mode 100644 index b4ed3e1a7e6..00000000000 --- a/src/unk_02039A58.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "unk_02039A58.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "unk_0209C390.h" - -static const CommCmdTable Unk_020E5F24[] = { - { sub_0209C3D0, sub_0209C3C8, NULL }, - { sub_0209C3E0, sub_0209C3C4, NULL }, - { sub_0209C3F0, sub_0209C3CC, NULL } -}; - -const CommCmdTable *sub_02039A58(void) -{ - return Unk_020E5F24; -} - -int sub_02039A60(void) -{ - return sizeof(Unk_020E5F24) / sizeof(CommCmdTable); -} diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index a1a45ab5fe2..eb743816f9d 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -5,6 +5,7 @@ #include "constants/battle_tower.h" #include "constants/battle_tower_functions.h" +#include "constants/communication/comm_command.h" #include "generated/battle_tower_modes.h" #include "generated/game_records.h" #include "generated/items.h" @@ -18,6 +19,7 @@ #include "battle_frontier_stats.h" #include "bg_window.h" +#include "comm_command_frontier.h" #include "communication_system.h" #include "field_script_context.h" #include "field_system.h" @@ -31,7 +33,6 @@ #include "unk_02049D08.h" #include "unk_0204AEE8.h" #include "unk_0206B9D8.h" -#include "unk_0209BA80.h" static u16 BattleTower_GetPartnerParam(BattleTower *battleTower, u8 param1); @@ -253,15 +254,15 @@ BOOL ScrCmd_1E1(ScriptContext *ctx) switch (v3) { case 0: - cmd = 62; + cmd = COMM_CMD_F_62; sub_0204B060(ctx->fieldSystem->battleTower, ctx->fieldSystem->saveData); break; case 1: - cmd = 63; + cmd = COMM_CMD_F_63; sub_0204B0BC(ctx->fieldSystem->battleTower); break; case 2: - cmd = 64; + cmd = COMM_CMD_F_64; sub_0204B0D4(ctx->fieldSystem->battleTower, v4); break; } diff --git a/src/unk_0204FA34.c b/src/unk_0204FA34.c index b6e5f5e258d..7feb3bfd8cc 100644 --- a/src/unk_0204FA34.c +++ b/src/unk_0204FA34.c @@ -12,7 +12,7 @@ #include "communication_system.h" #include "savedata.h" -void BattleHall_ProcessSelectedSpeciesMsg(int netID, int unused, void *data, void *context) +void CommCmd_BattleHallSelectedSpeciesMsg(int netID, int unused, void *data, void *context) { BattleHallSameSpeciesCheck *myData = context; const BattleHallSameSpeciesCheck *partnersData = data; diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index c3ebb8f8275..4acd45ce741 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -4,6 +4,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_defs/battle_tower.h" @@ -17,6 +19,7 @@ #include "bag.h" #include "battle_frontier_save.h" #include "battle_frontier_stats.h" +#include "comm_command_field.h" #include "communication_system.h" #include "dexmode_checker.h" #include "field_script_context.h" @@ -32,7 +35,7 @@ #include "unk_0202D778.h" #include "unk_020302D0.h" #include "unk_02049D08.h" -#include "unk_02099500.h" +#include "unk_0205DFC4.h" #include "constdata/const_020F410C.h" @@ -165,7 +168,7 @@ static BOOL sub_0204FD38(FieldTask *param0) switch (v0->unk_00) { case 0: - if (CommSys_SendData(133, v0, sizeof(UnkStruct_0204FCF8)) == 1) { + if (CommSys_SendData(COMM_CMD_FIELD_133, v0, sizeof(UnkStruct_0204FCF8)) == 1) { v0->unk_00++; } break; diff --git a/src/unk_0205001C.c b/src/unk_0205001C.c index bb7fae404ca..1f07db728e9 100644 --- a/src/unk_0205001C.c +++ b/src/unk_0205001C.c @@ -7,9 +7,9 @@ #include "communication_system.h" -void sub_0205001C(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_133(int param0, int param1, void *param2, void *param3); -void sub_0205001C(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_133(int param0, int param1, void *param2, void *param3) { int v0, v1; UnkStruct_0204FCF8 *v2 = param3; diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index 77e96f03b2d..8d935f13610 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -4,6 +4,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" #include "struct_defs/battle_tower.h" @@ -17,6 +19,7 @@ #include "bag.h" #include "battle_frontier_save.h" #include "battle_frontier_stats.h" +#include "comm_command_field.h" #include "communication_system.h" #include "dexmode_checker.h" #include "field_script_context.h" @@ -32,7 +35,7 @@ #include "unk_0202D778.h" #include "unk_02030494.h" #include "unk_02049D08.h" -#include "unk_02099500.h" +#include "unk_0205DFC4.h" #include "constdata/const_020F410C.h" @@ -157,7 +160,7 @@ static BOOL sub_02050264(FieldTask *param0) switch (v0->unk_00) { case 0: - if (CommSys_SendData(134, v0, sizeof(UnkStruct_02050224)) == 1) { + if (CommSys_SendData(COMM_CMD_FIELD_134, v0, sizeof(UnkStruct_02050224)) == 1) { v0->unk_00++; } break; diff --git a/src/unk_02050548.c b/src/unk_02050548.c index abf6c436e72..000dfafacd7 100644 --- a/src/unk_02050548.c +++ b/src/unk_02050548.c @@ -7,9 +7,9 @@ #include "communication_system.h" -void sub_02050548(int param0, int param1, void *param2, void *param3); +void CommCmd_Field_134(int param0, int param1, void *param2, void *param3); -void sub_02050548(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_134(int param0, int param1, void *param2, void *param3) { int v0, v1; UnkStruct_02050224 *v2 = param3; diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 27c28db2f95..d656158900a 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -3,6 +3,8 @@ #include #include +#include "constants/communication/comm_command.h" + #include "applications/party_menu/defs.h" #include "applications/party_menu/main.h" #include "applications/pokemon_summary_screen/main.h" @@ -771,9 +773,9 @@ static BOOL sub_0205ACC8(UnkStruct_0205A0D8 *param0) v2 = sub_0205B0E4(); if (param0->unk_86 == 0) { - v0 = CommSys_SendDataHugeServer(106, v1, v2); + v0 = CommSys_SendDataHugeServer(COMM_CMD_FIELD_106, v1, v2); } else { - v0 = CommSys_SendDataHuge(106, v1, v2); + v0 = CommSys_SendDataHuge(COMM_CMD_FIELD_106, v1, v2); } if (v0) { @@ -804,9 +806,9 @@ static BOOL sub_0205AD34(UnkStruct_0205A0D8 *param0) BOOL v0; if (param0->unk_86 == 0) { - v0 = CommSys_SendDataServer(107, &(param0->unk_84), 1); + v0 = CommSys_SendDataServer(COMM_CMD_FIELD_107, &(param0->unk_84), 1); } else { - v0 = CommSys_SendData(107, &(param0->unk_84), 1); + v0 = CommSys_SendData(COMM_CMD_FIELD_107, &(param0->unk_84), 1); } if (v0) { @@ -963,7 +965,7 @@ static void sub_0205B0B4(UnkStruct_0205A0D8 *param0) Window_EraseStandardFrame(param0->unk_7C, 1); } -void sub_0205B0C0(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_106(int param0, int param1, void *param2, void *param3) { UnkStruct_0205A0D8 *v0 = sub_0205AC74(param3); @@ -988,7 +990,7 @@ u8 *sub_0205B0F4(int param0, void *param1, int param2) } } -void sub_0205B110(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_107(int param0, int param1, void *param2, void *param3) { UnkStruct_0205A0D8 *v0 = sub_0205AC74(param3); diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c index 6fcf9ac9ee8..7871d7a4dcd 100644 --- a/src/unk_0205B33C.c +++ b/src/unk_0205B33C.c @@ -2,6 +2,7 @@ #include +#include "constants/communication/comm_command.h" #include "constants/union_room_message_types.h" #include "constants/versions.h" @@ -12,6 +13,8 @@ #include "field/field_system.h" #include "appearance.h" +#include "comm_command_draw.h" +#include "comm_command_field.h" #include "comm_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -32,8 +35,6 @@ #include "trainer_case.h" #include "trainer_info.h" #include "unk_02033200.h" -#include "unk_02095E98.h" -#include "unk_02099500.h" #include "constdata/const_020ED570.h" #include "res/text/bank/country_names.h" @@ -602,36 +603,36 @@ void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2) case 0: if (param0->unk_44 == 0) { param0->unk_34 = v0; - CommSys_SendData(99, &v0, 1); + CommSys_SendData(COMM_CMD_FIELD_99, &v0, 1); } break; case 1: if (param2 == 0) { u8 v1 = param0->unk_30; - CommSys_SendDataServer(103, &v1, 1); + CommSys_SendDataServer(COMM_CMD_FIELD_103, &v1, 1); param0->unk_3C = param2; } else { u8 v2 = 7; - CommSys_SendDataServer(103, &v2, 1); + CommSys_SendDataServer(COMM_CMD_FIELD_103, &v2, 1); param0->unk_3C = param2; } break; } } -void sub_0205B988(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_98(int param0, int param1, void *param2, void *param3) { return; } -void sub_0205B98C(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_100(int param0, int param1, void *param2, void *param3) { return; } -void sub_0205B990(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_102(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; @@ -641,7 +642,7 @@ void sub_0205B990(int param0, int param1, void *param2, void *param3) static int Unk_021C0858; -void sub_0205B9AC(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_99(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; u8 *v1 = (u8 *)param2; @@ -652,7 +653,7 @@ void sub_0205B9AC(int param0, int param1, void *param2, void *param3) } } -void sub_0205B9C4(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_103(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; u8 *v1 = (u8 *)param2; @@ -665,7 +666,7 @@ void sub_0205B9C4(int param0, int param1, void *param2, void *param3) } } -void sub_0205B9E0(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_104(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; @@ -680,14 +681,14 @@ int sub_0205B9E8(UnkStruct_0205B43C *param0) int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1) { if (param0->unk_30 == 0) { - CommSys_SendData(104, NULL, 0); + CommSys_SendData(COMM_CMD_FIELD_104, NULL, 0); return param1; } return 0; } -void sub_0205BA08(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_105(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; TrainerCase *trainerCase = (TrainerCase *)param2; @@ -717,7 +718,7 @@ u8 *sub_0205BA5C(int param0, void *param1, int param2) return (u8 *)v1->unk_188[param0]; } -void sub_0205BA6C(int param0, int param1, void *param2, void *param3) +void CommCmd_Field_101(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; UnkStruct_0205B43C *v1 = fieldSystem->unk_7C; @@ -744,7 +745,7 @@ u16 sub_0205BA7C(UnkStruct_0205B43C *param0) void sub_0205BAAC(int param0) { u8 v0 = param0; - CommSys_SendData(101, &v0, 1); + CommSys_SendData(COMM_CMD_FIELD_101, &v0, 1); } static const int sMessagesShowingTrainerCase[][2] = { @@ -1376,5 +1377,5 @@ void sub_0205C1F0(UnkStruct_0205B43C *param0) void UnionRoom_SendTrainerCase(UnkStruct_0205B43C *param0) { - CommSys_SendDataHuge(105, param0->unk_184, sizeof(TrainerCase)); + CommSys_SendDataHuge(COMM_CMD_FIELD_105, param0->unk_184, sizeof(TrainerCase)); } diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c deleted file mode 100644 index aa55109e508..00000000000 --- a/src/unk_02095AF0.c +++ /dev/null @@ -1,209 +0,0 @@ -#include "unk_02095AF0.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" -#include "struct_defs/struct_02029C88.h" -#include "struct_defs/struct_02095B28.h" -#include "struct_defs/struct_02095C60.h" - -#include "overlay006/ov6_022489E4.h" -#include "overlay017/ov17_02252CEC.h" -#include "overlay017/struct_ov17_0224EDE0.h" - -#include "communication_system.h" -#include "contest.h" -#include "heap.h" -#include "unk_020298BC.h" -#include "unk_02032798.h" - -static void sub_02095B2C(int param0, int param1, void *param2, void *param3); -static u8 *sub_02095B04(int param0, void *param1, int param2); -static void sub_02095B30(int param0, int param1, void *param2, void *param3); -static void sub_02095B9C(int param0, int param1, void *param2, void *param3); -static void sub_02095C48(int param0, int param1, void *param2, void *param3); -static void sub_02095C98(int param0, int param1, void *param2, void *param3); -static int sub_02095B24(void); -static int sub_02095B28(void); - -static const CommCmdTable Unk_020F58FC[] = { - { NULL, CommPacketSizeOf_Nothing, NULL }, - { sub_02095B2C, CommPacketSizeOf_Nothing, NULL }, - { ov17_02252CEC, CommPacketSizeOf_Variable, sub_02095B04 }, - { ov17_02252D7C, sub_02095B24, NULL }, - { ov6_022489E4, CommPacketSizeOf_Variable, NULL }, - { ov6_02248AC8, CommPacketSizeOf_Variable, NULL }, - { ov6_02248B30, CommPacketSizeOf_Variable, sub_02095B04 }, - { ov6_02248BC0, CommPacketSizeOf_Variable, NULL }, - { ov6_02248C28, CommPacketSizeOf_Variable, NULL }, - { ov6_02248CBC, CommPacketSizeOf_Variable, NULL }, - { sub_02095B30, CommPacketSizeOf_Variable, NULL }, - { sub_02095B9C, CommPacketSizeOf_Variable, sub_02095B04 }, - { sub_02095C48, sub_02095B28, NULL }, - { sub_02095C98, sub_02095B28, NULL }, - { ov6_02248D38, CommPacketSizeOf_Variable, sub_02095B04 }, - { ov6_02248DA0, CommPacketSizeOf_Variable, NULL } -}; - -void sub_02095AF0(void *param0) -{ - int v0 = sizeof(Unk_020F58FC) / sizeof(CommCmdTable); - CommCmd_Init(Unk_020F58FC, v0, param0); -} - -static u8 *sub_02095B04(int param0, void *param1, int param2) -{ - Contest *v0 = param1; - - GF_ASSERT(param2 < 1024); - return v0->unk_969[param0]; -} - -static int sub_02095B24(void) -{ - return sizeof(UnkStruct_ov17_0224EDE0); -} - -static int sub_02095B28(void) -{ - return sizeof(UnkStruct_02095B28); -} - -static void sub_02095B2C(int param0, int param1, void *param2, void *param3) -{ - return; -} - -static void sub_02095B30(int param0, int param1, void *param2, void *param3) -{ - Contest *v0 = param3; - int v1; - int v2; - u8 *v3; - - v1 = sub_02029C64(); - v3 = param2; - v2 = v3[v1]; - - MI_CpuCopy8(param2, v0->unk_00.unk_E8[v2], v1); - - v0->unk_568++; -} - -BOOL sub_02095B5C(Contest *param0, int param1, const UnkStruct_02029C88 *param2) -{ - u8 *v0; - int v1; - int v2; - - v1 = sub_02029C64(); - v0 = Heap_Alloc(HEAP_ID_20, v1 + 1); - MI_CpuCopy8(param2, v0, v1); - v0[v1] = param1; - - if (CommSys_SendData(32, v0, v1 + 1) == 1) { - v2 = 1; - } else { - v2 = 0; - } - - Heap_Free(v0); - return v2; -} - -static void sub_02095B9C(int param0, int param1, void *param2, void *param3) -{ - Contest *v0 = param3; - int v1, v2; - u8 *v3; - int v4; - - v1 = sub_02029C64(); - v2 = v1 * 4; - v3 = param2; - - GF_ASSERT(v2 < 1024); - - for (v4 = 0; v4 < 4; v4++) { - MI_CpuCopy8(&v3[v1 * v4], v0->unk_00.unk_E8[v4], v1); - } - - v0->unk_568++; -} - -BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1) -{ - u8 *v0; - int v1, v2; - int v3; - int v4; - - v1 = sub_02029C64(); - v2 = v1 * 4; - - GF_ASSERT(v2 < 1024); - - v0 = param0->unk_569; - - for (v4 = 0; v4 < 4; v4++) { - MI_CpuCopy8(param1[v4], &v0[v1 * v4], v1); - } - - if (CommSys_SendDataHuge(33, v0, v2) == 1) { - v3 = 1; - } else { - v3 = 0; - } - - return v3; -} - -static void sub_02095C48(int param0, int param1, void *param2, void *param3) -{ - Contest *v0 = param3; - MI_CpuCopy8(param2, &v0->unk_1984.unk_00, param1); -} - -BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1) -{ - if (param0->unk_16 == 0) { - param0->unk_00.unk_00 = param1; - return 1; - } - - if (param0->unk_14 != param0->unk_15) { - return 0; - } - - param0->unk_08.unk_00 = param1; - - if (CommSys_SendData(34, ¶m0->unk_08, sizeof(UnkStruct_02095B28)) == 1) { - return 1; - } - - return 0; -} - -static void sub_02095C98(int param0, int param1, void *param2, void *param3) -{ - Contest *v0 = param3; - UnkStruct_02095B28 *v1 = param2; - v0->unk_1984.unk_10[param0] = v1->unk_04; -} - -BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1) -{ - if (param0->unk_16 == 0) { - param0->unk_10[0] = param1; - return 1; - } - - param0->unk_08.unk_04 = param1; - - if (CommSys_SendData(35, ¶m0->unk_08, sizeof(UnkStruct_02095B28)) == 1) { - return 1; - } - - return 0; -} diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c deleted file mode 100644 index 8805495a4ff..00000000000 --- a/src/unk_02095E98.c +++ /dev/null @@ -1,368 +0,0 @@ -#include "unk_02095E98.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" -#include "struct_defs/struct_02095EAC_sub1.h" -#include "struct_defs/struct_02095EAC_t.h" -#include "struct_defs/struct_02095FE4.h" - -#include "overlay058/ov58_021D0D80.h" -#include "overlay058/struct_ov58_021D2820.h" - -#include "bg_window.h" -#include "comm_manager.h" -#include "communication_system.h" -#include "unk_02032798.h" -#include "unk_02099500.h" -#include "wireless_manager.h" - -typedef struct UnkStruct_02095EAC_t UnkStruct_02095EAC; - -static u8 *sub_020961D0(int param0, void *param1, int param2); -static int sub_020961E0(void); -static int sub_020961E4(void); -static void sub_0209617C(UnkStruct_02095EAC *param0, int param1); -static void sub_02096170(int param0, int param1, void *param2, void *param3); - -static const CommCmdTable Unk_020F5A40[] = { - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, sub_020961E0, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02095EAC, sub_02099538, sub_020961D0 }, - { sub_02095F40, sub_02099540 }, - { sub_02095F68, sub_02099544 }, - { sub_0209610C, CommPacketSizeOf_NetId }, - { sub_02096110, CommPacketSizeOf_NetId }, - { sub_020960D8, CommPacketSizeOf_NetId }, - { sub_02095F9C, CommPacketSizeOf_Nothing }, - { sub_020960D4, CommPacketSizeOf_Nothing }, - { sub_02095FE4, sub_020961E4 }, - { sub_02096114, CommPacketSizeOf_Nothing }, - { sub_0209612C, CommPacketSizeOf_Nothing }, - { sub_02096170, CommPacketSizeOf_Nothing }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL } -}; - -void sub_02095E98(void *param0) -{ - int v0 = sizeof(Unk_020F5A40) / sizeof(CommCmdTable); - CommCmd_Init(Unk_020F5A40, v0, param0); -} - -void sub_02095EAC(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - - if (CommSys_CurNetId() != 0) { - UnkStruct_02095EAC_sub1 *v1 = (UnkStruct_02095EAC_sub1 *)param2; - - if (v1->unk_3EC * 1000 > 30 * 15 * 32) { - MI_CpuCopyFast(v1->unk_00, &v0->unk_4434[v1->unk_3EC * 1000], (30 * 15 * 32) % 1000); - } else { - MI_CpuCopyFast(v1->unk_00, &v0->unk_4434[v1->unk_3EC * 1000], 1000); - } - - MI_CpuCopyFast(v0->unk_4434, v0->unk_32C.pixels, 30 * 15 * 32); - Window_CopyToVRAM(&v0->unk_32C); - } else { - UnkStruct_02095EAC_sub1 *v2 = (UnkStruct_02095EAC_sub1 *)param2; - - if (v0->unk_4430 * 1000 < 30 * 15 * 32) { - v0->unk_4430++; - sub_0209617C(v0, v0->unk_4430); - } else { - CommSys_SendDataServer(124, NULL, 0); - } - } -} - -void sub_02095F40(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2; - - if (param0 != 0) { - v0->unk_9421[param0] = *v1; - } -} - -void sub_02095F68(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2; - - if (v0 == NULL) { - return; - } - - if (param0 == 0) { - int v2; - - for (v2 = 0; v2 < 5; v2++) { - v0->unk_43E6[v2] = v1[v2]; - } - } - - if (v0->unk_43E6[0].unk_09 == 2) { - (void)0; - } -} - -void sub_02095F9C(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - - ov58_021D2434(v0, 3, 0); - MI_CpuClearFast(v0->unk_4434, 30 * 15 * 32); - - if (CommSys_CurNetId() == 0) { - v0->unk_37C = CommSys_ConnectedCount(); - v0->unk_380 = WirelessManager_GetConnectedBitmap(); - v0->unk_9458 = 1; - } -} - -void sub_02095FE4(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - UnkStruct_02095FE4 v1; - UnkStruct_02095FE4 *v2 = param2; - - if (param0 != 0) { - if (CommSys_CurNetId() == 0) { - v1 = *v2; - v1.unk_00 = param0; - v1.unk_01 = v0->unk_37C; - - switch (v2->unk_02) { - case 0: - if ((v0->unk_37C != CommSys_ConnectedCount()) || (v0->unk_37C != ov58_021D2A4C()) || (v0->unk_37C != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) { - v1.unk_03 = 0; - } else { - v0->unk_9418 |= 1 << param0; - v1.unk_03 = 1; - CommManager_SetMaxNumConnections(CommSys_ConnectedCount()); - } - break; - case 1: - break; - } - - CommSys_SendDataServer(126, &v1, sizeof(UnkStruct_02095FE4)); - } - } else { - switch (v2->unk_02) { - case 0: - if (v2->unk_00 == CommSys_CurNetId()) { - if (v2->unk_03 == 0) { - ov58_021D2434(v0, 9, v2->unk_00); - } else { - v0->unk_941C = v2->unk_01; - ov58_021D2434(v0, 8, v2->unk_00); - } - } - break; - case 1: - ov58_021D2434(v0, 21, v2->unk_00); - break; - } - } -} - -void sub_020960D4(int param0, int param1, void *param2, void *param3) -{ - return; -} - -void sub_020960D8(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - u8 v1 = *(u8 *)param2; - - ov58_021D2434(v0, 1, v1); - - if ((CommSys_CurNetId() == 0) && (v0->unk_364 == 1)) { - v0->unk_4430 = 0; - sub_0209617C(v0, v0->unk_4430); - } -} - -void sub_0209610C(int param0, int param1, void *param2, void *param3) -{ - return; -} - -void sub_02096110(int param0, int param1, void *param2, void *param3) -{ - return; -} - -void sub_02096114(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - - if (CommSys_CurNetId() != 0) { - ov58_021D2434(v0, 15, 0); - } -} - -void sub_0209612C(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - u8 v1; - - GF_ASSERT(CommSys_CurNetId() == 0); - - if (CommSys_CurNetId() == 0) { - if (v0->unk_9460 != 0) { - v1 = param0; - CommSys_SendDataServer(123, &v1, 1); - } else { - v0->unk_9460 = 1; - } - } - - CommManager_SetErrorHandling(0, 1); -} - -static void sub_02096170(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; - v0->unk_9458 = 1; -} - -static void sub_0209617C(UnkStruct_02095EAC *param0, int param1) -{ - u8 *v0 = (u8 *)param0->unk_32C.pixels; - - MI_CpuCopyFast(&v0[param1 * 1000], param0->unk_7C74.unk_00, 1000); - - { - int v1; - u32 *v2, v3; - - v2 = (u32 *)param0->unk_7C74.unk_00; - - for (v3 = 0, v1 = 0; v1 < 1000 / 4; v1++) { - v3 ^= v2[v1]; - } - - param0->unk_7C74.unk_3E8 = v3; - } - - param0->unk_7C74.unk_3EC = param1; - - CommSys_SendDataHugeServer(118, ¶m0->unk_7C74, sizeof(UnkStruct_02095EAC_sub1)); -} - -static u8 *sub_020961D0(int param0, void *param1, int param2) -{ - UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param1; - return (u8 *)&v0->unk_8064[param0]; -} - -static int sub_020961E0(void) -{ - return 4; -} - -static int sub_020961E4(void) -{ - return sizeof(UnkStruct_02095FE4); -} diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c deleted file mode 100644 index da54d56dc4a..00000000000 --- a/src/unk_020961E8.c +++ /dev/null @@ -1,326 +0,0 @@ -#include "unk_020961E8.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" -#include "struct_defs/struct_020961E8_t.h" -#include "struct_defs/struct_02096274.h" - -#include "overlay059/ov59_021D0D80.h" -#include "overlay059/struct_ov59_021D30E0.h" - -#include "comm_manager.h" -#include "communication_system.h" -#include "math_util.h" -#include "sound_playback.h" -#include "unk_02032798.h" -#include "unk_02099500.h" -#include "wireless_manager.h" - -typedef struct UnkStruct_020961E8_t UnkStruct_020961E8; - -static int sub_02096400(void); -static int sub_02096404(void); -static u8 *sub_0209640C(int param0, void *param1, int param2); -static int sub_02096408(void); -static void sub_020963C0(UnkStruct_020961E8 *param0, int param1); -void sub_020961FC(int param0, int param1, void *param2, void *param3); -void sub_0209620C(int param0, int param1, void *param2, void *param3); - -static const CommCmdTable Unk_020F5F68[] = { - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02096380, sub_02096404 }, - { sub_02096384, sub_02096404 }, - { sub_02096360, sub_02096404 }, - { sub_02096264, sub_02096400 }, - { sub_02096274, sub_02096408 }, - { sub_02096388, sub_02096400 }, - { sub_020963A0, sub_02096400 }, - { sub_0209621C, sub_02096400 }, - { sub_020961FC, sub_02099530, sub_0209640C }, - { sub_0209620C, sub_02096404 }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL }, - { sub_02099510, sub_02096400, NULL } -}; - -void sub_020961E8(void *param0) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param0; - int v1; - int v2 = sizeof(Unk_020F5F68) / sizeof(CommCmdTable); - - CommCmd_Init(Unk_020F5F68, v2, param0); - - for (v1 = 0; v1 < 5; v1++) { - (void)0; - } -} - -void sub_020961FC(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - v0->unk_4A98++; -} - -void sub_0209620C(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - u8 *v1 = (u8 *)param2; - - if (param0 == 0) { - if (v0->unk_4AA0 != *v1) { - (void)0; - } - - v0->unk_4AA0 = *v1; - } -} - -void sub_0209621C(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - - v0->unk_4A98 = 0; - v0->unk_4AA4 = 1; - - sub_020963C0(v0, CommSys_CurNetId()); - - ov59_021D1D40(v0); - ov59_021D2204(v0, 25, param0); - - CommManager_SetErrorHandling(1, 1); - Sound_PlayEffect(SEQ_SE_DP_F209); -} - -void sub_02096264(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - ov59_021D2204(v0, 2, 0); -} - -void sub_02096274(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - UnkStruct_02096274 v1; - UnkStruct_02096274 *v2 = param2; - - if (param0 != 0) { - if (CommSys_CurNetId() == 0) { - v1 = *v2; - v1.unk_00 = param0; - v1.unk_01 = v0->unk_4AAC; - - switch (v2->unk_02) { - case 0: - if ((v0->unk_4AAC != CommSys_ConnectedCount()) || (v0->unk_4AAC != ov59_021D2544()) || (v0->unk_4AAC != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) { - v1.unk_03 = 0; - } else { - v0->unk_4AB4 |= 1 << param0; - v1.unk_03 = 1; - - CommManager_SetMaxNumConnections(CommSys_ConnectedCount()); - } - break; - case 1: - break; - } - - CommSys_SendData(112, &v1, sizeof(UnkStruct_02096274)); - } - } else { - switch (v2->unk_02) { - case 0: - if (v2->unk_00 == CommSys_CurNetId()) { - if (v2->unk_03 == 0) { - ov59_021D2204(v0, 8, v2->unk_00); - } else { - v0->unk_4AC0 = v2->unk_01; - ov59_021D2204(v0, 7, v2->unk_00); - } - } - break; - case 1: - ov59_021D2204(v0, 19, v2->unk_00); - break; - } - } -} - -void sub_02096360(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - u8 v1 = *(u8 *)param2; - - ov59_021D22EC(v0, 1, v1); - - if (CommSys_CurNetId() == 0) { - v0->unk_414 = 0; - } -} - -void sub_02096380(int param0, int param1, void *param2, void *param3) -{ - return; -} - -void sub_02096384(int param0, int param1, void *param2, void *param3) -{ - return; -} - -void sub_02096388(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; - - if (CommSys_CurNetId() != 0) { - ov59_021D2204(v0, 13, 0); - } -} - -void sub_020963A0(int param0, int param1, void *param2, void *param3) -{ - u8 v0; - - if (CommSys_CurNetId() == 0) { - v0 = param0; - CommSys_SendData(110, &v0, 1); - } -} - -static void sub_020963C0(UnkStruct_020961E8 *param0, int param1) -{ - { - int v0; - u32 *v1, v2; - - v1 = (u32 *)param0->unk_418.unk_00; - - for (v2 = 0, v0 = 0; v0 < 3000 / 4; v0++) { - v2 ^= v1[v0]; - } - - param0->unk_418.unk_BB8 = v2; - } - - param0->unk_418.unk_BBC = LCRNG_Next(); - CommSys_SendDataHuge(116, ¶m0->unk_418, sizeof(UnkStruct_ov59_021D30E0)); -} - -static int sub_02096400(void) -{ - return 0; -} - -static int sub_02096404(void) -{ - return 1; -} - -static int sub_02096408(void) -{ - return sizeof(UnkStruct_02096274); -} - -static u8 *sub_0209640C(int param0, void *param1, int param2) -{ - UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param1; - return (u8 *)&v0->unk_FD8[param0]; -} diff --git a/src/unk_02099500.c b/src/unk_02099500.c deleted file mode 100644 index b1ef1f4c8f4..00000000000 --- a/src/unk_02099500.c +++ /dev/null @@ -1,208 +0,0 @@ -#include "unk_02099500.h" - -#include -#include - -#include "struct_defs/comm_cmd_table.h" - -#include "underground/manager.h" -#include "underground/mining.h" -#include "underground/pc.h" -#include "underground/player.h" -#include "underground/player_talk.h" -#include "underground/records.h" -#include "underground/secret_bases.h" -#include "underground/spheres.h" -#include "underground/traps.h" - -#include "comm_player_manager.h" -#include "field_comm_manager.h" -#include "trainer_case.h" -#include "trainer_info.h" -#include "unk_02032798.h" -#include "unk_0204FA34.h" -#include "unk_0205001C.h" -#include "unk_02050548.h" -#include "unk_0205A0D8.h" -#include "unk_0205B33C.h" - -static int CommPacketSizeOf_TrainerCase(void); -static int sub_02099548(void); -static int sub_0209954C(void); - -static int CommPacketSizeOf_3Bytes_Unused(void) -{ - return 3; -} - -static int sub_02099504(void) -{ - return 24; -} - -static int sub_02099508(void) -{ - return 236 * 6 + 4 * 2; -} - -static const CommCmdTable Unk_020F68A4[] = { - { CommPlayer_RecvLocation, CommPacketSizeOf_RecvLocation, NULL }, - { CommPlayer_RecvLocationAndInit, CommPacketSizeOf_RecvLocationAndInit, NULL }, - { UndergroundMan_ProcessVendorTalkRequest, CommPacketSizeOf_NetId, NULL }, - { UndergroundPlayer_ProcessVendorTalk, CommPacketSizeOf_Nothing, NULL }, // 25 - { UndergroundPlayer_ProcessVendorTalkServer, CommPacketSizeOf_NetId, NULL }, - { UndergroundPlayer_ProcessOpenMenuRequest, CommPacketSizeOf_Nothing, NULL }, - { UndergroundMan_ProcessInteractEvent, CommPacketSizeOf_InteractEvent, NULL }, - { UndergroundPlayer_ProcessOpenMenuEvent, CommPacketSizeOf_Variable, NULL }, - { UndergroundPlayer_ProcessTalkEvent, CommPacketSizeOf_Variable, NULL }, // 30 - { UndergroundMan_ProcessAllDataSentMessage, CommPacketSizeOf_Nothing, NULL }, - { Traps_TryPlaceTrap, CommPacketSizeOf_NetId, NULL }, - { Traps_RemoveBuriedTrapAtIndex_Unused, CommPacketSizeOf_2Bytes_Unused, NULL }, // corresponding cmd never sent - { Traps_ProcessPlaceTrapResult, CommPacketSizeOf_PlaceTrapResult, NULL }, - { Traps_LoadLinkPlacedTraps, CommPacketSizeOf_AllTrapsPlacedPlayer, NULL }, // 35 - { Traps_ReceiveLoadTrapsResult, CommPacketSizeOf_LoadTrapsResult, NULL }, - { Traps_HandleTriggeredTrap, CommPacketSizeOf_TriggeredTrap2, NULL }, - { Traps_CallSecondTrapEffectServerFunc, CommPacketSizeOf_NetId, NULL }, - { Traps_StartLinkSlideAnimation_Unused, CommPacketSizeOf_3Bytes_Unused, NULL }, // corresponding cmd never sent - { Traps_EscapeHole, CommPacketSizeOf_NetId, NULL }, - { Traps_EscapeTrapServer, CommPacketSizeOf_Nothing, NULL }, - { Traps_ProcessEscapedTrap, CommPacketSizeOf_EscapedTrap, NULL }, - { Traps_EndCurrentTrapEffectServer, CommPacketSizeOf_Nothing, NULL }, - { Traps_ProcessTrapHelp, CommPacketSizeOf_TrapHelpData, NULL }, - { Traps_ProcessTriggeredTrapBits, CommPacketSizeOf_NetId, NULL }, - { Traps_QueueSendTrapRadarResults, CommPacketSizeOf_Nothing, NULL }, - { Traps_ReceiveTrapRadarResults, CommPacketSizeOf_TrapRadarResult, NULL }, - { UndergroundMan_ProcessTouchInput, CommPacketSizeOf_CoordinatesU16, NULL }, - { UndergroundMan_ProcessTouchRadarTrapResults, CommPacketSizeOf_Variable, NULL }, - { UndergroundMan_ProcessTouchRadarMiningSpotResults, CommPacketSizeOf_Variable, NULL }, // 50 - { Traps_ProcessDisengagedTrap, CommPacketSizeOf_TriggeredTrap, NULL }, - { CommPlayer_RecvDelete, CommPacketSizeOf_NetId, NULL }, - { SecretBases_ProcessBaseInfo, CommPacketSizeOf_SecretBaseInfo, NULL }, - { SecretBases_ProcessBaseEnter, CommPacketSizeOf_SecretBaseInfo, NULL }, - { SecretBases_ProcessBaseEntrancesBuffer, CommPacketSizeOf_BaseEntrancesBuffer, NULL }, // 55 - { SecretBases_ClearTransitioningStatus, CommPacketSizeOf_Nothing, NULL }, - { SecretBases_ProcessBaseExitEvent, CommPacketSizeOf_BaseExitEvent, NULL }, - { SecretBases_ProcessBaseTransitionPromptEvent, CommPacketSizeOf_BaseTransitionPromptEvent, NULL }, - { SecretBases_ProcessBaseTransitionEvent, CommPacketSizeOf_BaseTransitionEvent, NULL }, - { SecretBases_ProcessGoodInteractionEvent, CommPacketSizeOf_GoodInteractionEvent, NULL }, // 60 - { SecretBases_ProcessFailedBaseEnter, CommPacketSizeOf_NetId, NULL }, - { sub_02058018, CommPacketSizeOf_NetId, NULL }, - { Spheres_ProcessRetrieveBuriedSphereRequest, CommPacketSizeOf_NetId, NULL }, - { Mining_ProcessMiningSpotInteract, CommPacketSizeOf_NetId, NULL }, - { Mining_ProcessConfirmStartMiningResult, CommPacketSizeOf_NetId, NULL }, // 65 - { Mining_ProcessStartMiningConfirm, CommPacketSizeOf_NetId, NULL }, - { Mining_ProcessMiningGameEnd, CommPacketSizeOf_NetId, NULL }, - { Mining_ProcessLinkInput, CommPacketSizeOf_MiningLinkInput, NULL }, - { Mining_ProcessLinkInputServer, CommPacketSizeOf_MiningLinkInputWithNetID, NULL }, - { UndergroundMan_ProcessPlayerState, CommPacketSizeOf_UndergroundPlayerState, NULL }, - { Mining_ProcessTreasureRadarStart, CommPacketSizeOf_Nothing, NULL }, - { Mining_ProcessMiningSpotRadarResult, CommPacketSizeOf_MiningSpotRadarResult, NULL }, - { UndergroundTalk_RequestLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, - { UndergroundTalkResponse_RequestLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, - { UndergroundTalkResponse_HandleLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, // 75 - { UndergroundTalk_HandleLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, - { UndergroundTalk_SendGiftServer, CommPacketSizeOf_Gift, NULL }, - { UndergroundTalkResponse_ReceiveGiftOffer, CommPacketSizeOf_Gift, NULL }, - { UndergroundTalk_SendTalkMessageServer, CommPacketSizeOf_TalkMessage, NULL }, - { UndergroundTalk_ReceiveTalkMessage, CommPacketSizeOf_TalkMessage, NULL }, - { UndergroundRecords_SendRecordServer, CommPacketSizeOf_Variable, NULL }, - { UndergroundRecords_ProcessLinkRecord, CommPacketSizeOf_Variable, NULL }, - { UndergroundPC_ProcessPCInteraction, CommPacketSizeOf_PCInteraction, NULL }, // 83 - { UndergroundPlayer_ProcessFlagEventType, CommPacketSizeOf_NetId, NULL }, - { UndergroundPlayer_ProcessFlagEvent, CommPacketSizeOf_FlagEvent, NULL }, - { SecretBases_ProcessBaseCreateRequest, CommPacketSizeOf_NetId, NULL }, - { SecretBases_ProcessBaseCreateEvent, CommPacketSizeOf_SecretBaseCreateEvent, NULL }, - { FieldCommManager_SetTrainerCaseCopiedFlag, CommPacketSizeOf_TrainerCase, FieldCommManager_GetTrainerCase }, - { UndergroundPC_ProcessTakeFlagAttempt, CommPacketSizeOf_PCInteraction, NULL }, - { UndergroundPC_ProcessTakenFlag, CommPacketSizeOf_PCInteraction, NULL }, // 90 - { UndergroundPlayer_ProcessHeldFlagOwnerInfo, CommPacketSizeOf_TrainerInfo, NULL }, - { UndergroundPlayer_ProcessHeldFlagOwnerInfoServer, CommPacketSizeOf_HeldFlagInfo, UndergroundPlayer_GetHeldFlagInfoBuffer }, - { UndergroundPlayer_ProcessHeldFlagOwnerInfoAck, CommPacketSizeOf_NetId, NULL }, - { sub_02059180, CommPacketSizeOf_NetId, NULL }, - { FieldCommManager_UpdateBattleRoomMovement, CommPacketSizeOf_NetId, NULL }, // 95 - { SecretBases_ProcessFlagRankUp, CommPacketSizeOf_NetId, NULL }, - { SecretBases_ProcessFlagRankUpEvent, CommPacketSizeOf_FlagRankUpEvent, NULL }, - { sub_0205B988, TrainerInfo_Size, NULL }, - { sub_0205B9AC, CommPacketSizeOf_NetId, NULL }, - { sub_0205B98C, CommPacketSizeOf_NetId, NULL }, - { sub_0205BA6C, CommPacketSizeOf_NetId, NULL }, - { sub_0205B990, CommPacketSizeOf_Nothing, NULL }, - { sub_0205B9C4, CommPacketSizeOf_NetId, NULL }, - { sub_0205B9E0, CommPacketSizeOf_Nothing, NULL }, - { sub_0205BA08, CommPacketSizeOf_TrainerCase, sub_0205BA5C }, - { sub_0205B0C0, sub_0205B0E4, sub_0205B0F4 }, - { sub_0205B110, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, sub_02099548, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, sub_02099530, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, sub_02099538, NULL }, - { sub_02099510, sub_02099540, NULL }, - { sub_02099510, sub_02099544, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_NetId, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, sub_0209954C, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, CommPacketSizeOf_Nothing, NULL }, - { sub_02099510, sub_02099504, NULL }, - { sub_02099510, sub_02099508, NULL }, - { BattleHall_ProcessSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL }, - { sub_0205001C, CommPacketSizeOf_Variable, NULL }, - { sub_02050548, CommPacketSizeOf_Variable, NULL } -}; - -void sub_02099510(int param0, int param1, void *param2, void *param3) -{ - return; -} - -void CommFieldCmd_Init(void *param0) -{ - int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable); - CommCmd_Init(Unk_020F68A4, v0, param0); -} - -static int CommPacketSizeOf_TrainerCase(void) -{ - return sizeof(TrainerCase); -} - -int sub_02099530(void) -{ - return 3000 + 8; -} - -int sub_02099538(void) -{ - return 1008; -} - -int sub_02099540(void) -{ - return 10; -} - -int sub_02099544(void) -{ - return 10 * 5; -} - -static int sub_02099548(void) -{ - return 4; -} - -static int sub_0209954C(void) -{ - return 4; -} diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c deleted file mode 100644 index 39a44973e23..00000000000 --- a/src/unk_0209BA80.c +++ /dev/null @@ -1,386 +0,0 @@ -#include "unk_0209BA80.h" - -#include -#include - -#include "constants/battle_tower.h" - -#include "struct_defs/battle_tower.h" -#include "struct_defs/comm_cmd_table.h" -#include "struct_defs/struct_0209BBA4.h" - -#include "applications/frontier/battle_arcade/main.h" -#include "applications/frontier/battle_castle/opponent_app.h" -#include "applications/frontier/battle_castle/self_app.h" -#include "applications/frontier/battle_factory/main.h" -#include "applications/frontier/battle_hall/main.h" -#include "overlay104/ov104_0222ECE8.h" -#include "overlay104/ov104_0223C164.h" - -#include "battle_frontier_save.h" -#include "communication_system.h" -#include "party.h" -#include "pokemon.h" -#include "unk_02032798.h" - -static void sub_0209BA94(int param0, int param1, void *param2, void *param3); -BOOL sub_0209BB08(BattleTower *battleTower); -static void sub_0209BB34(int param0, int param1, void *param2, void *param3); -static void sub_0209BB68(int param0, int param1, void *param2, void *param3); -BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0); -void sub_0209BBEC(int param0, int param1, void *param2, void *param3); -BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1); -void sub_0209BC3C(int param0, int param1, void *param2, void *param3); -BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2); -void sub_0209BD28(int param0, int param1, void *param2, void *param3); -BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1); -void sub_0209BD88(int param0, int param1, void *param2, void *param3); -BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1); -void sub_0209BDD0(int param0, int param1, void *param2, void *param3); - -static const CommCmdTable Unk_020F8BF0[] = { - { ov104_0222EF30, CommPacketSizeOf_Variable, NULL }, - { ov104_0222EF94, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F03C, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F124, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F1C4, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F210, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F31C, CommPacketSizeOf_Variable, NULL }, - { BattleFactoryApp_DummyCommCommand, CommPacketSizeOf_Variable, NULL }, - { BattleFactoryApp_HandleSelectionUpdateCmd, CommPacketSizeOf_Variable, NULL }, - { BattleFactoryApp_DummyCommCommand2, CommPacketSizeOf_Variable, NULL }, - { BattleFactoryApp_HandleTradeResultCmd, CommPacketSizeOf_Variable, NULL }, - { ov104_0222ECE8, CommPacketSizeOf_Variable, NULL }, - { ov104_0222ED2C, CommPacketSizeOf_Variable, NULL }, - { ov104_0222ED74, CommPacketSizeOf_Variable, NULL }, - { ov104_0222EDDC, CommPacketSizeOf_Variable, NULL }, - { ov104_0222EE38, CommPacketSizeOf_Variable, NULL }, - { ov104_0222EEA8, CommPacketSizeOf_Variable, ov104_0222EED8 }, - { BattleHall_DummyCommCommand, CommPacketSizeOf_Variable, NULL }, - { BattleHall_HandleTypeSelectionMsg, CommPacketSizeOf_Variable, NULL }, - { BattleHall_HandlePartnerDecisionCmd, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F418, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F480, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F530, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F650, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F6E8, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F730, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F7BC, CommPacketSizeOf_Variable, ov104_0222F84C }, - { BattleCastleSelfApp_HandlePlayerInfoCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleSelfApp_HandlePurchaseInfoCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleSelfApp_HandleUpdateCursorCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleSelfApp_HandleExitAppCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleOpponentApp_HandlePlayerInfoCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleOpponentApp_HandlePurchaseInfoCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleOpponentApp_HandleUpdateCursorCmd, CommPacketSizeOf_Variable, NULL }, - { BattleCastleOpponentApp_HandleExitAppCmd, CommPacketSizeOf_Variable, NULL }, - { sub_0209BBEC, CommPacketSizeOf_Variable, NULL }, - { sub_0209BC3C, CommPacketSizeOf_Variable, NULL }, - { sub_0209BD28, CommPacketSizeOf_Variable, NULL }, - { sub_0209BD88, CommPacketSizeOf_Variable, NULL }, - { sub_0209BDD0, CommPacketSizeOf_Variable, NULL }, - { sub_0209BA94, CommPacketSizeOf_Variable, NULL }, - { sub_0209BB34, CommPacketSizeOf_Variable, NULL }, - { sub_0209BB68, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F8A0, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F908, CommPacketSizeOf_Variable, NULL }, - { ov104_0222F9C0, CommPacketSizeOf_Variable, NULL }, - { ov104_0222FA5C, CommPacketSizeOf_Variable, NULL }, - { ov104_0222FAA8, CommPacketSizeOf_Variable, NULL }, - { ov104_0222FB34, CommPacketSizeOf_Variable, ov104_0222FBC4 }, - { BattleArcadeApp_HandleInitialLayoutCmd, CommPacketSizeOf_Variable, NULL }, - { BattleArcadeApp_HandleResultCmd, CommPacketSizeOf_Variable, NULL }, - { BattleArcadeApp_HandleUnusedCmd, CommPacketSizeOf_Variable, NULL } -}; - -void sub_0209BA80(void *param0) -{ - int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable); - CommCmd_Init(Unk_020F8BF0, v0, param0); -} - -static void sub_0209BA94(int param0, int param1, void *param2, void *param3) -{ - u16 v0; - int v1; - BattleTower *battleTower = param3; - const u16 *v3 = param2; - - v0 = 0; - v1 = 0; - battleTower->unk_8D4++; - - if (CommSys_CurNetId() == param0) { - return; - } - - battleTower->partnerGender = (u8)v3[0]; - battleTower->unk_16[0] = v3[1]; - battleTower->unk_16[1] = v3[2]; - battleTower->unk_14 = v3[3]; - battleTower->partnerID = BT_PARTNERS_COUNT + battleTower->partnerGender; - - if ((battleTower->unk_2E[0] == battleTower->unk_16[0]) || (battleTower->unk_2E[0] == battleTower->unk_16[1])) { - v0 += 1; - } - - if ((battleTower->unk_2E[1] == battleTower->unk_16[0]) || (battleTower->unk_2E[1] == battleTower->unk_16[1])) { - v0 += 2; - } - - battleTower->unk_8D8 = v0; - return; -} - -BOOL sub_0209BB08(BattleTower *battleTower) -{ - int v0, v1; - - v1 = (14 * 2); - - MI_CpuCopy8(battleTower->trainerIDs, battleTower->unk_83E, v1); - - if (CommSys_SendData(63, battleTower->unk_83E, v1) == 1) { - v0 = 1; - } else { - v0 = 0; - } - - return v0; -} - -static void sub_0209BB34(int param0, int param1, void *param2, void *param3) -{ - int v0; - BattleTower *battleTower = param3; - const u16 *v2 = param2; - - v0 = 0; - battleTower->unk_8D4++; - - if (CommSys_CurNetId() == param0) { - return; - } - - if (CommSys_CurNetId() == 0) { - return; - } - - MI_CpuCopy8(v2, battleTower->trainerIDs, BT_OPPONENTS_COUNT * 2 * sizeof(u16)); - return; -} - -static void sub_0209BB68(int param0, int param1, void *param2, void *param3) -{ - int v0; - BattleTower *battleTower = param3; - const u16 *v2 = param2; - - v0 = 0; - - battleTower->unk_8D8 = 0; - battleTower->unk_8D4++; - - if (CommSys_CurNetId() == param0) { - return; - } - - if (battleTower->unk_10_3 || v2[0]) { - battleTower->unk_8D8 = 1; - } - - return; -} - -BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0) -{ - int v0, v1, v2; - - v1 = 40; - param0->unk_08[0] = param0->unk_A0; - - v2 = ov104_0223C264(param0->unk_A0); - param0->unk_08[1] = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), v2); - - if (CommSys_SendData(57, param0->unk_08, v1) == 1) { - v0 = 1; - } else { - v0 = 0; - } - - return v0; -} - -void sub_0209BBEC(int param0, int param1, void *param2, void *param3) -{ - u16 v0; - UnkStruct_0209BBA4 *v1 = param3; - const u16 *v2 = param2; - - v1->unk_6F++; - - if (CommSys_CurNetId() == param0) { - return; - } - - v1->unk_6E = (u8)v2[0]; - v1->unk_72 = v2[1]; - - return; -} - -BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1) -{ - int v0, v1 = 40; - param0->unk_08[0] = param1; - - if (CommSys_SendData(58, param0->unk_08, v1) == 1) { - v0 = 1; - } else { - v0 = 0; - } - - return v0; -} - -void sub_0209BC3C(int param0, int param1, void *param2, void *param3) -{ - int v0; - UnkStruct_0209BBA4 *v1 = param3; - const u16 *v2 = param2; - - v0 = 0; - v1->unk_6F++; - - if (CommSys_CurNetId() == param0) { - return; - } - - v1->unk_59 = (u8)v2[0]; - return; -} - -BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2) -{ - int v0, v1; - Pokemon *v2; - Party *v3; - - v1 = 40; - v3 = SaveData_GetParty(param0->saveData); - - param0->unk_6A[0] = param1; - param0->unk_6A[1] = param2; - - if (param1 == 0xff) { - param0->unk_76[0] = 0; - param0->unk_7E[0] = 0; - param0->unk_76[1] = 0; - param0->unk_7E[1] = 0; - } else { - v2 = Party_GetPokemonBySlotIndex(v3, param1); - - param0->unk_76[0] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL); - param0->unk_7E[0] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL); - - v2 = Party_GetPokemonBySlotIndex(v3, param2); - - param0->unk_76[1] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL); - param0->unk_7E[1] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL); - } - - param0->unk_08[0] = param0->unk_76[0]; - param0->unk_08[1] = param0->unk_7E[0]; - param0->unk_08[2] = param0->unk_76[1]; - param0->unk_08[3] = param0->unk_7E[1]; - - if (CommSys_SendData(59, param0->unk_08, v1) == 1) { - v0 = 1; - } else { - v0 = 0; - } - - return v0; -} - -void sub_0209BD28(int param0, int param1, void *param2, void *param3) -{ - UnkStruct_0209BBA4 *v0 = param3; - const u16 *v1 = param2; - - v0->unk_6F++; - - if (CommSys_CurNetId() == param0) { - return; - } - - v0->unk_86[0] = v1[0]; - v0->unk_8E[0] = v1[1]; - v0->unk_86[1] = v1[2]; - v0->unk_8E[1] = v1[3]; - - return; -} - -BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1) -{ - int v0, v1 = 40; - - param0->unk_08[0] = param1; - - if (CommSys_SendData(60, param0->unk_08, v1) == 1) { - v0 = 1; - } else { - v0 = 0; - } - - return v0; -} - -void sub_0209BD88(int param0, int param1, void *param2, void *param3) -{ - int v0; - UnkStruct_0209BBA4 *v1 = param3; - const u16 *v2 = param2; - - v0 = 0; - v1->unk_6F++; - - if (CommSys_CurNetId() == param0) { - return; - } - - v1->unk_74 = v2[0]; - return; -} - -BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1) -{ - int v0, v1 = 40; - param0->unk_08[0] = param1; - - if (CommSys_SendData(61, param0->unk_08, v1) == 1) { - v0 = 1; - } else { - v0 = 0; - } - - return v0; -} - -void sub_0209BDD0(int param0, int param1, void *param2, void *param3) -{ - int v0; - UnkStruct_0209BBA4 *v1 = param3; - const u16 *v2 = param2; - - v0 = 0; - v1->unk_6F++; - - if (CommSys_CurNetId() == param0) { - return; - } - - v1->unk_71 = (u8)v2[0]; - return; -} diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 771f1ec693f..e37e740b785 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -12,6 +12,7 @@ #include "overlay109/ov109_021D0D80.h" #include "overlay109/ov109_021D3D50.h" +#include "comm_command_spin_trade.h" #include "comm_manager.h" #include "field_system.h" #include "field_task.h" @@ -21,7 +22,6 @@ #include "journal.h" #include "save_player.h" #include "unk_0203D1B8.h" -#include "unk_0209BDF8.h" FS_EXTERN_OVERLAY(overlay109); diff --git a/src/unk_0209C390.c b/src/unk_0209C390.c index 2013957495c..60e380ee0fa 100644 --- a/src/unk_0209C390.c +++ b/src/unk_0209C390.c @@ -8,17 +8,17 @@ #include "overlay065/struct_ov65_02236744_decl.h" #include "overlay065/struct_ov65_02236760.h" -#include "unk_02032798.h" -#include "unk_02039A58.h" +#include "comm_command.h" +#include "comm_command_waiting_room.h" void sub_0209C390(UnkStruct_ov65_02236744 *param0) { - CommCmd_Init(sub_02039A58(), sub_02039A60(), param0); + CommCmdManager_Init(sub_02039A58(), sub_02039A60(), param0); } void sub_0209C3AC(void) { - CommCmd_Init(sub_02039A58(), sub_02039A60(), NULL); + CommCmdManager_Init(sub_02039A58(), sub_02039A60(), NULL); } int sub_0209C3C4(void) @@ -36,7 +36,7 @@ int sub_0209C3CC(void) return sizeof(UnkStruct_ov65_02236760); } -void sub_0209C3D0(int param0, int param1, void *param2, void *param3) +void CommCmd_WaitingRoom_22(int param0, int param1, void *param2, void *param3) { UnkStruct_ov65_02236744 *v0 = param3; UnkStruct_ov65_022366E4 *v1 = param2; @@ -48,7 +48,7 @@ void sub_0209C3D0(int param0, int param1, void *param2, void *param3) ov65_022366E4(v0, v1); } -void sub_0209C3E0(int param0, int param1, void *param2, void *param3) +void CommCmd_WaitingRoom_23(int param0, int param1, void *param2, void *param3) { UnkStruct_ov65_02236744 *v0 = param3; @@ -59,7 +59,7 @@ void sub_0209C3E0(int param0, int param1, void *param2, void *param3) ov65_02236744(v0); } -void sub_0209C3F0(int param0, int param1, void *param2, void *param3) +void CommCmd_WaitingRoom_24(int param0, int param1, void *param2, void *param3) { UnkStruct_ov65_02236744 *v0 = param3;