CommCmdTable

This commit is contained in:
Adrienn Tindall 2024-05-04 05:52:14 -04:00
parent ddc4ae8bf0
commit 0fc7dcfd0e
42 changed files with 158 additions and 160 deletions

View File

@ -45,7 +45,7 @@ void sub_02036008(int param0, int param1, void * param2, void * param3);
void sub_02036030(int param0, int param1, void * param2, void * param3);
void sub_02036058(int param0, int param1, void * param2, void * param3);
u16 CommSys_CurNetId(void);
BOOL sub_020360D0(int param0, const void * param1);
BOOL CommSys_SendDataFixedSize(int param0, const void * param1);
BOOL Link_Message(int param0);
BOOL sub_020360E8(void);
BOOL CommSys_CheckError(void);

View File

@ -3,7 +3,7 @@
#include "struct_defs/struct_02039A58.h"
const UnkStruct_02039A58 * ov83_0223D144(void);
const CommCmdTable * ov83_0223D144(void);
int ov83_0223D14C(void);
#endif // POKEPLATINUM_OV83_0223D144_H

View File

@ -4,7 +4,7 @@
#include "struct_defs/struct_02039A58.h"
#include "overlay083/struct_ov83_0223D4CC_decl.h"
UnkStruct_ov83_0223D4CC * ov83_0223D4CC(const UnkStruct_02039A58 * param0, int param1, void * param2, int param3, int param4);
UnkStruct_ov83_0223D4CC * ov83_0223D4CC(const CommCmdTable * param0, int param1, void * param2, int param3, int param4);
BOOL ov83_0223D508(int param0, const void * param1, int param2, UnkStruct_ov83_0223D4CC * param3);
void ov83_0223D558(UnkStruct_ov83_0223D4CC * param0);
int ov83_0223D570(UnkStruct_ov83_0223D4CC * param0);

View File

@ -3,7 +3,7 @@
#include "struct_defs/struct_02039A58.h"
const UnkStruct_02039A58 * ov114_02260038(void);
const CommCmdTable * ov114_02260038(void);
int ov114_02260040(void);
#endif // POKEPLATINUM_OV114_02260038_H

View File

@ -3,7 +3,7 @@
#include "struct_defs/struct_02039A58.h"
const UnkStruct_02039A58 * ov115_02265A18(void);
const CommCmdTable * ov115_02265A18(void);
int ov115_02265A20(void);
#endif // POKEPLATINUM_OV115_02265A18_H

View File

@ -4,7 +4,7 @@
#include "struct_defs/struct_02039A58.h"
#include "overlay116/struct_ov116_0226139C.h"
const UnkStruct_02039A58 * ov116_0226049C(void);
const CommCmdTable * ov116_0226049C(void);
int ov116_022604A4(void);
void ov116_022604A8(UnkStruct_ov116_0226139C * param0);

View File

@ -9,6 +9,6 @@ typedef struct {
UnkFuncPtr_020F8E60 unk_00;
UnkFuncPtr_02032868 unk_04;
UnkFuncPtr_0203290C unk_08;
} UnkStruct_02039A58;
} CommCmdTable;
#endif // POKEPLATINUM_STRUCT_02039A58_H

View File

@ -3,10 +3,10 @@
#include "struct_defs/struct_02039A58.h"
void CommCmd_Init(const UnkStruct_02039A58 * param0, int param1, void * param2);
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 sub_02032868(int param0);
int CommCmd_PacketSizeOf(int param0);
BOOL sub_020328D0(int param0);
void * sub_0203290C(int param0, int param1, int param2);
int sub_02032944(void);

View File

@ -3,7 +3,7 @@
#include "struct_defs/struct_02039A58.h"
const UnkStruct_02039A58 * sub_02039A58(void);
const CommCmdTable * sub_02039A58(void);
int sub_02039A60(void);
#endif // POKEPLATINUM_UNK_02039A58_H

View File

@ -286,7 +286,7 @@ void CommPlayer_SendXZPos (BOOL param0, int x, int z)
data[4] = data[4] | 0x80;
}
sub_020360D0(22, data);
CommSys_SendDataFixedSize(22, data);
sCommPlayerManager->unk_2BB = TRUE;
}
@ -567,7 +567,7 @@ void sub_02057FC4 (BOOL param0)
sCommPlayerManager->unk_2BC = param0;
}
sub_020360D0(62, &sCommPlayerManager->unk_2BC);
CommSys_SendDataFixedSize(62, &sCommPlayerManager->unk_2BC);
}
}
@ -576,7 +576,7 @@ static void sub_02057FF0 (BOOL param0)
if (sCommPlayerManager != NULL) {
if (sCommPlayerManager->unk_2BC != param0) {
sCommPlayerManager->unk_2BC = param0;
sub_020360D0(62, &sCommPlayerManager->unk_2BC);
CommSys_SendDataFixedSize(62, &sCommPlayerManager->unk_2BC);
}
}
}
@ -1713,7 +1713,7 @@ void sub_0205948C (int param0)
if (sCommPlayerManager->unk_00 == 0x10) {
u8 data = 1;
sub_020360D0(62, &data);
CommSys_SendDataFixedSize(62, &data);
}
if (sCommPlayerManager->unk_00 == 0) {

View File

@ -89,7 +89,7 @@ typedef struct {
u8 unk_68F[8];
u8 unk_697[8];
u8 unk_69F[4];
u8 unk_6A3;
u8 transmissionState;
u8 unk_6A4;
u8 transmissionType;
u8 unk_6A6;
@ -128,7 +128,7 @@ static BOOL sub_020357F0(u8 * param0);
static void sub_020358C0(u8 * param0);
static BOOL sub_020356A0(u8 * param0, int param1);
static BOOL sub_02035730(u8 * param0);
static void sub_02035F84(void);
static void CommSys_Transmission(void);
static BOOL sub_0203594C(void);
static u32 Unk_021C07C8 = 0;
@ -387,7 +387,7 @@ static void CommSys_UpdateTransitionType (void)
sub_02034670();
}
sub_02035F84();
CommSys_Transmission();
}
static void CommSys_SwitchTransitionType (int type)
@ -1470,7 +1470,7 @@ static void CommSys_RecvDataSingle (CommRing * ring, int netId, u8 * param2, Com
if (param3->unk_08 != 0xffff) {
size = param3->unk_08;
} else {
size = sub_02032868(cmd);
size = CommCmd_PacketSizeOf(cmd);
if (sCommunicationSystem->unk_6B1) {
return;
@ -1700,7 +1700,7 @@ BOOL sub_02035F58 (int param0, const void * param1, int param2)
return sub_02032498(&sCommunicationSystem->unk_580, param0, (u8 *)param1, param2, 0, 0);
}
static void sub_02035F84 (void)
static void CommSys_Transmission (void)
{
BOOL v0 = 0;
@ -1708,22 +1708,22 @@ static void sub_02035F84 (void)
return;
}
switch (sCommunicationSystem->unk_6A3) {
switch (sCommunicationSystem->transmissionState) {
case 1:
if (CommSys_TransmissionType() == 1) {
v0 = sub_020360D0(11, &sCommunicationSystem->unk_6A4);
v0 = CommSys_SendDataFixedSize(11, &sCommunicationSystem->unk_6A4);
} else {
v0 = CommSys_SendDataServer(11, &sCommunicationSystem->unk_6A4, 1);
}
if (v0) {
sCommunicationSystem->unk_6A3 = 2;
sCommunicationSystem->transmissionState = 2;
}
break;
case 3:
if (sub_020360D0(12, &sCommunicationSystem->unk_6A4)) {
if (CommSys_SendDataFixedSize(12, &sCommunicationSystem->unk_6A4)) {
CommSys_SwitchTransitionType(sCommunicationSystem->unk_6A4);
sCommunicationSystem->unk_6A3 = 0;
sCommunicationSystem->transmissionState = 0;
}
break;
}
@ -1738,7 +1738,7 @@ void sub_02036008 (int param0, int param1, void * param2, void * param3)
return;
}
sCommunicationSystem->unk_6A3 = 1;
sCommunicationSystem->transmissionState = 1;
sCommunicationSystem->unk_6A4 = v0[0];
}
@ -1752,7 +1752,7 @@ void sub_02036030 (int param0, int param1, void * param2, void * param3)
}
sCommunicationSystem->unk_6A4 = v0[0];
sCommunicationSystem->unk_6A3 = 3;
sCommunicationSystem->transmissionState = 3;
}
void sub_02036058 (int param0, int param1, void * param2, void * param3)
@ -1764,9 +1764,9 @@ void sub_02036058 (int param0, int param1, void * param2, void * param3)
return;
}
if (sCommunicationSystem->unk_6A3 == 2) {
if (sCommunicationSystem->transmissionState == 2) {
CommSys_SwitchTransitionType(v0[0]);
sCommunicationSystem->unk_6A3 = 0;
sCommunicationSystem->transmissionState = 0;
}
}
@ -1789,7 +1789,7 @@ u16 CommSys_CurNetId (void)
return 0;
}
BOOL sub_020360D0 (int param0, const void * param1)
BOOL CommSys_SendDataFixedSize (int param0, const void * param1)
{
return CommSys_SendData(param0, param1, 0);
}

View File

@ -384,7 +384,7 @@ static void sub_02059B10 (void)
{
u8 v0 = 1;
sub_020360D0(94, &v0);
CommSys_SendDataFixedSize(94, &v0);
}
sub_0200F174(0, 1, 1, 0x0, 6, 1, 4);
@ -425,7 +425,7 @@ static void sub_02059BF4 (void)
{
u8 v0 = 1;
sub_020360D0(94, &v0);
CommSys_SendDataFixedSize(94, &v0);
}
FieldCommMan_SetTask(sub_02059CD8, 0);
@ -446,7 +446,7 @@ static void sub_02059C2C (BOOL param0, const Party * party)
} else {
{
u8 v0 = 3;
sub_020360D0(94, &v0);
CommSys_SendDataFixedSize(94, &v0);
}
FieldCommMan_SetTask(sub_02059BF4, 0);
@ -481,7 +481,7 @@ static void sub_02059CD8 (void)
{
u8 v0 = 0;
sub_020360D0(94, &v0);
CommSys_SendDataFixedSize(94, &v0);
}
}

View File

@ -563,7 +563,7 @@ static void ov17_0224D6CC (SysTask * param0, void * param1)
ov17_0224B20C(v0->unk_04, &v0->unk_08);
v0->unk_12 = 0;
} else {
if (sub_020360D0(25, &v0->unk_08) == 1) {
if (CommSys_SendDataFixedSize(25, &v0->unk_08) == 1) {
v0->unk_12 = 0;
}
}

View File

@ -1048,7 +1048,7 @@ static void ov23_0223EA38 (SysTask * param0, void * param1)
sub_02059514();
}
sub_020360D0(65, &v0);
CommSys_SendDataFixedSize(65, &v0);
Unk_ov23_02257740->unk_848 = NULL;
ov23_02254044(ov23_0224219C());
@ -1608,7 +1608,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
ov23_0224B460();
ov23_022417E0();
sub_020360D0(67, &v0->unk_50);
CommSys_SendDataFixedSize(67, &v0->unk_50);
sub_02059514();
Unk_ov23_02257740->unk_8CC = NULL;
@ -2714,7 +2714,7 @@ static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0)
v1 = 8;
}
sub_020360D0(68, v0);
CommSys_SendDataFixedSize(68, v0);
if (Unk_ov23_02257740->unk_A2B > v1) {
Unk_ov23_02257740->unk_A2B -= v1;

View File

@ -600,7 +600,7 @@ void ov23_02242830 (u8 param0)
v1.unk_00 = v0;
v1.unk_01 = (v2 & 0xf) * 16 + (v3 & 0xf);
sub_020360D0(28, &v1);
CommSys_SendDataFixedSize(28, &v1);
sub_0203572C();
Unk_ov23_02257748->unk_146 = 8;
@ -1241,7 +1241,7 @@ void ov23_02243360 (void)
v0.unk_04 = ov23_0224DB84();
v0.unk_05 = ov23_02241670();
sub_020360D0(70, &v0);
CommSys_SendDataFixedSize(70, &v0);
}
void ov23_02243390 (int param0, int param1, void * param2, void * param3)

View File

@ -987,7 +987,7 @@ static UnkStruct_ov23_02243DA8 * ov23_02243A80 (int param0, int param1, UnkStruc
void ov23_02243AD4 (u8 param0)
{
sub_020360D0(32, &param0);
CommSys_SendDataFixedSize(32, &param0);
}
void ov23_02243AE8 (void)
@ -2053,7 +2053,7 @@ static void ov23_02244C70 (SysTask * param0, void * param1)
if (v0->unk_14 == 28) {
u8 v2 = Unk_ov23_02257764->unk_B9F;
sub_020360D0(38, &v2);
CommSys_SendDataFixedSize(38, &v2);
}
if (v0->unk_14 > 30) {

View File

@ -489,7 +489,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
if (v6 == sub_0202958C(v5)) {
ov23_02253F40(ov23_022421AC(), 7, 1, ov23_0224A300);
} else {
sub_020360D0(96, &v6);
CommSys_SendDataFixedSize(96, &v6);
}
sub_0200502C(4, 1060, 60, 0, 0xff, NULL);
@ -529,7 +529,7 @@ void ov23_0224AAB0 (void)
v0->unk_2B9 = 0;
if (v0->unk_290[CommSys_CurNetId()]) {
sub_020360D0(91, v0->unk_290[CommSys_CurNetId()]);
CommSys_SendDataFixedSize(91, v0->unk_290[CommSys_CurNetId()]);
} else {
TrainerInfo * v0 = TrainerInfo_New(15);
Strbuf* v1 = Strbuf_Init(20, 15);
@ -538,7 +538,7 @@ void ov23_0224AAB0 (void)
GF_ASSERT(v1);
TrainerInfo_SetNameFromStrbuf(v0, v1);
sub_020360D0(91, v0);
CommSys_SendDataFixedSize(91, v0);
Strbuf_Free(v1);
Heap_FreeToHeap(v0);
}

View File

@ -831,7 +831,7 @@ static void ov23_0224BA6C (SysTask * param0, void * param1)
v1.unk_00 = v0->unk_2C;
v1.unk_02 = 0;
sub_020360D0(59, &v1);
CommSys_SendDataFixedSize(59, &v1);
SysTask_Done(param0);
Heap_FreeToHeap(v0);
@ -918,7 +918,7 @@ static void ov23_0224BAAC (SysTask * param0, void * param1)
v8.unk_00 = v0->unk_2C;
v8.unk_02 = 0;
sub_020360D0(59, &v8);
CommSys_SendDataFixedSize(59, &v8);
ov23_0224BA48(param0, v0);
return;
}
@ -1136,7 +1136,7 @@ static void ov23_0224BE28 (SysTask * param0, void * param1)
if (sub_02033DFC() && (CommSys_CurNetId() == 0)) {
u8 v9 = 1;
sub_020360D0(86, &v9);
CommSys_SendDataFixedSize(86, &v9);
ov23_0224BA48(param0, v0);
return;
@ -1149,7 +1149,7 @@ static void ov23_0224BE28 (SysTask * param0, void * param1)
v8.unk_00 = v0->unk_2C;
v8.unk_02 = 1;
sub_020360D0(59, &v8);
CommSys_SendDataFixedSize(59, &v8);
ov23_0224BA48(param0, v0);
Unk_ov23_022577AC->unk_12D4 = 1;
@ -1848,7 +1848,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1)
ov23_0224D238();
sub_020360D0(86, &v10);
CommSys_SendDataFixedSize(86, &v10);
SysTask_Done(param0);
Heap_FreeToHeap(v0);
@ -1880,7 +1880,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1)
void ov23_0224CD68 (void)
{
u8 v0 = 0;
sub_020360D0(86, &v0);
CommSys_SendDataFixedSize(86, &v0);
}
int ov23_0224CD7C (void)

View File

@ -168,7 +168,7 @@ static void ov23_0224DC40 (UnkStruct_ov23_022577B0 * param0, int param1)
v0.unk_00 = param0->unk_2C;
v0.unk_01 = param1;
sub_020360D0(74, &v0);
CommSys_SendDataFixedSize(74, &v0);
}
static void ov23_0224DC54 (UnkStruct_ov23_0224E280 * param0, int param1)
@ -178,7 +178,7 @@ static void ov23_0224DC54 (UnkStruct_ov23_0224E280 * param0, int param1)
v0.unk_00 = param0->unk_30;
v0.unk_01 = param1;
sub_020360D0(73, &v0);
CommSys_SendDataFixedSize(73, &v0);
}
static void ov23_0224DC68 (UnkStruct_ov23_0224E280 * param0, int param1)
@ -372,7 +372,7 @@ static BOOL ov23_0224DF1C (SysTask * param0, void * param1)
v3.unk_01 = v0->unk_30;
v3.unk_02 = 0;
sub_020360D0(79, &v3);
CommSys_SendDataFixedSize(79, &v3);
v0->unk_32 = v1;
v0->unk_37 = 30;
@ -444,7 +444,7 @@ static BOOL ov23_0224E05C (SysTask * param0, void * param1)
v2.unk_00 = (v1 + v0->unk_32 * 4);
v2.unk_01 = v0->unk_30;
v2.unk_02 = 2;
sub_020360D0(79, &v2);
CommSys_SendDataFixedSize(79, &v2);
ov23_022540C8(ov23_0224219C(), v2.unk_00);
ov23_022540E0(ov23_0224219C(), 6, v0->unk_33);
@ -491,7 +491,7 @@ static void ov23_0224E19C (SysTask * param0, UnkStruct_ov23_0224E280 * param1)
if (v0 == 0) {
param1->unk_28.unk_00 = param1->unk_30;
sub_020360D0(77, &param1->unk_28);
CommSys_SendDataFixedSize(77, &param1->unk_28);
param1->unk_37 = 21;
} else {
ov23_0224DC68(param1, 11);
@ -1062,7 +1062,7 @@ static BOOL ov23_0224EB74 (SysTask * param0, void * param1)
v2.unk_01 = v0->unk_2C;
v2.unk_02 = 1;
sub_020360D0(79, &v2);
CommSys_SendDataFixedSize(79, &v2);
ov23_0224DC40(v0, 32);
break;
}

View File

@ -1528,7 +1528,7 @@ static void ov23_02250B9C (SysTask * param0, void * param1)
{
u8 v1 = 0;
sub_020360D0(84, &v1);
CommSys_SendDataFixedSize(84, &v1);
}
return;
case 4:

View File

@ -887,7 +887,7 @@ static void ov23_02252038 (SysTask * param0, void * param1)
if (v1 == 0xffffffff) {
return;
} else if (v1 == 0) {
sub_020360D0(89, &v0->unk_0C);
CommSys_SendDataFixedSize(89, &v0->unk_0C);
} else {
sub_0205948C(0x40);
ov23_02254044(ov23_0224219C());

View File

@ -7,7 +7,7 @@
#include "overlay083/ov83_0223D144.h"
#include "overlay083/ov83_0223D150.h"
static const UnkStruct_02039A58 Unk_ov83_02240390[] = {
static const CommCmdTable Unk_ov83_02240390[] = {
{ov83_0223D204, ov83_0223D4AC, NULL},
{ov83_0223D210, ov83_0223D4AC, NULL},
{ov83_0223D21C, ov83_0223D4B4, NULL},
@ -21,12 +21,12 @@ static const UnkStruct_02039A58 Unk_ov83_02240390[] = {
{ov83_0223D3A8, ov83_0223D4C8, NULL}
};
const UnkStruct_02039A58 * ov83_0223D144 (void)
const CommCmdTable * ov83_0223D144 (void)
{
return Unk_ov83_02240390;
}
int ov83_0223D14C (void)
{
return sizeof(Unk_ov83_02240390) / sizeof(UnkStruct_02039A58);
return sizeof(Unk_ov83_02240390) / sizeof(CommCmdTable);
}

View File

@ -22,7 +22,7 @@ typedef struct {
typedef struct {
UnkStruct_ov83_0223D5CC unk_00[8];
const UnkStruct_02039A58 * unk_190;
const CommCmdTable * unk_190;
int unk_194;
void * unk_198;
SysTask * unk_19C;
@ -33,12 +33,12 @@ typedef struct UnkStruct_ov83_0223D4CC_t {
void * unk_04;
} UnkStruct_ov83_0223D4CC;
static UnkStruct_ov83_0223D584 * ov83_0223D584(const UnkStruct_02039A58 * param0, int param1, void * param2, int param3);
static UnkStruct_ov83_0223D584 * ov83_0223D584(const CommCmdTable * param0, int param1, void * param2, int param3);
static void ov83_0223D5CC(SysTask * param0, void * param1);
static void ov83_0223D620(UnkStruct_ov83_0223D584 * param0);
static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 * param0, int param1, const void * param2, int param3);
UnkStruct_ov83_0223D4CC * ov83_0223D4CC (const UnkStruct_02039A58 * param0, int param1, void * param2, int param3, int param4)
UnkStruct_ov83_0223D4CC * ov83_0223D4CC (const CommCmdTable * param0, int param1, void * param2, int param3, int param4)
{
UnkStruct_ov83_0223D4CC * v0;
@ -98,7 +98,7 @@ int ov83_0223D570 (UnkStruct_ov83_0223D4CC * param0)
}
}
static UnkStruct_ov83_0223D584 * ov83_0223D584 (const UnkStruct_02039A58 * param0, int param1, void * param2, int param3)
static UnkStruct_ov83_0223D584 * ov83_0223D584 (const CommCmdTable * param0, int param1, void * param2, int param3)
{
UnkStruct_ov83_0223D584 * v0;

View File

@ -7,13 +7,13 @@
#include "overlay097/ov97_0222D04C.h"
#include "overlay097/ov97_0222D2F8.h"
static const UnkStruct_02039A58 Unk_ov97_0223D704[] = {
static const CommCmdTable Unk_ov97_0223D704[] = {
{ov97_0222D284, ov97_0222D2B0, ov97_0222D2B8},
{ov97_0222D2C4, sub_0203294C, NULL}
};
void ov97_0222D2F8 (void * param0)
{
int v0 = sizeof(Unk_ov97_0223D704) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_ov97_0223D704) / sizeof(CommCmdTable);
CommCmd_Init(Unk_ov97_0223D704, v0, param0);
}

View File

@ -6,7 +6,7 @@
#include "overlay114/ov114_02260038.h"
#include "overlay114/ov114_02260044.h"
static const UnkStruct_02039A58 Unk_ov114_022603E4[] = {
static const CommCmdTable Unk_ov114_022603E4[] = {
{ov114_02260090, ov114_0226007C, NULL},
{ov114_022600A0, ov114_0226007C, NULL},
{ov114_022600B0, ov114_0226007C, NULL},
@ -14,12 +14,12 @@ static const UnkStruct_02039A58 Unk_ov114_022603E4[] = {
{ov114_02260084, ov114_02260080, NULL},
};
const UnkStruct_02039A58 * ov114_02260038 (void)
const CommCmdTable * ov114_02260038 (void)
{
return Unk_ov114_022603E4;
}
int ov114_02260040 (void)
{
return sizeof(Unk_ov114_022603E4) / sizeof(UnkStruct_02039A58);
return sizeof(Unk_ov114_022603E4) / sizeof(CommCmdTable);
}

View File

@ -6,7 +6,7 @@
#include "overlay115/ov115_02265A18.h"
#include "overlay115/ov115_02265A24.h"
static const UnkStruct_02039A58 Unk_ov115_0226664C[] = {
static const CommCmdTable Unk_ov115_0226664C[] = {
{ov115_02265A44, ov115_02265A40, NULL},
{ov115_02265A50, ov115_02265A40, NULL},
{ov115_02265A5C, ov115_02265AD0, NULL},
@ -17,12 +17,12 @@ static const UnkStruct_02039A58 Unk_ov115_0226664C[] = {
{ov115_02265AB4, ov115_02265A40, NULL},
};
const UnkStruct_02039A58 * ov115_02265A18 (void)
const CommCmdTable * ov115_02265A18 (void)
{
return Unk_ov115_0226664C;
}
int ov115_02265A20 (void)
{
return sizeof(Unk_ov115_0226664C) / sizeof(UnkStruct_02039A58);
return sizeof(Unk_ov115_0226664C) / sizeof(CommCmdTable);
}

View File

@ -24,7 +24,7 @@ static int ov116_02260490(void);
static int ov116_02260494(void);
static int ov116_02260498(void);
static const UnkStruct_02039A58 Unk_ov116_02267740[] = {
static const CommCmdTable Unk_ov116_02267740[] = {
{ov116_02260440, ov116_0226048C, NULL},
{ov116_02260458, ov116_02260488, NULL},
{ov116_02260464, ov116_02260490, NULL},
@ -96,14 +96,14 @@ static int ov116_02260498 (void)
return sizeof(UnkStruct_ov116_02260498);
}
const UnkStruct_02039A58 * ov116_0226049C (void)
const CommCmdTable * ov116_0226049C (void)
{
return Unk_ov116_02267740;
}
int ov116_022604A4 (void)
{
return sizeof(Unk_ov116_02267740) / sizeof(UnkStruct_02039A58);
return sizeof(Unk_ov116_02267740) / sizeof(CommCmdTable);
}
void ov116_022604A8 (UnkStruct_ov116_0226139C * param0)

View File

@ -16,7 +16,7 @@ static void ov117_02266660(int param0, int param1, void * param2, void * param3)
static int ov117_02266610(void);
static int ov117_02266614(void);
static const UnkStruct_02039A58 Unk_ov117_02266FE4[] = {
static const CommCmdTable Unk_ov117_02266FE4[] = {
{NULL, sub_0203294C, NULL},
{ov117_02266660, ov117_02266614, NULL},
{ov117_02266618, ov117_02266610, NULL},
@ -25,7 +25,7 @@ static const UnkStruct_02039A58 Unk_ov117_02266FE4[] = {
void ov117_022665FC (void * param0)
{
int v0 = sizeof(Unk_ov117_02266FE4) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_ov117_02266FE4) / sizeof(CommCmdTable);
CommCmd_Init(Unk_ov117_02266FE4, v0, param0);
GF_ASSERT(sizeof(UnkStruct_ov117_022621D4) < 256);

View File

@ -75,7 +75,7 @@ static BOOL sub_0203233C (UnkStruct_0203233C * param0, u8 param1)
static BOOL sub_02032358 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * param1)
{
int v0 = sub_02032868(param0->unk_0E);
int v0 = CommCmd_PacketSizeOf(param0->unk_0E);
if (v0 == 0xffff) {
if (param1->unk_04 < 3) {
@ -106,7 +106,7 @@ static BOOL sub_020323D0 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * para
{
int v0;
int v1;
int v2 = sub_02032868(param0->unk_0E);
int v2 = CommCmd_PacketSizeOf(param0->unk_0E);
if (v2 == 0xffff) {
v1 = 3;
@ -152,7 +152,7 @@ static BOOL sub_020323D0 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * para
return 1;
}
BOOL sub_02032498 (UnkStruct_020322F8 * param0, int param1, u8 * param2, int param3, BOOL param4, BOOL param5)
BOOL sub_02032498 (UnkStruct_020322F8 * param0, int cmd, u8 * param2, int param3, BOOL param4, BOOL param5)
{
UnkStruct_020322D8 * v0;
UnkStruct_020322D8 * v1 = sub_020322D8(param0);
@ -166,7 +166,7 @@ BOOL sub_02032498 (UnkStruct_020322F8 * param0, int param1, u8 * param2, int par
}
GF_ASSERT(param3 < 65534);
v3 = sub_02032868(param1);
v3 = CommCmd_PacketSizeOf(cmd);
if (0xffff == v3) {
v3 = param3;
@ -186,7 +186,7 @@ BOOL sub_02032498 (UnkStruct_020322F8 * param0, int param1, u8 * param2, int par
}
v1->unk_0C = v3;
v1->unk_0E = param1;
v1->unk_0E = cmd;
v1->unk_00 = param2;
if (param4 == 1) {

View File

@ -14,19 +14,19 @@
#include "unk_020366A0.h"
typedef struct {
const UnkStruct_02039A58 * unk_00;
const CommCmdTable * cmdTable;
int unk_04;
void * unk_08;
u8 unk_0C[8];
u8 unk_14;
} CommCmdTable;
} 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 UnkStruct_02039A58 Unk_020E5D64[] = {
static const CommCmdTable Unk_020E5D64[] = {
{NULL, sub_0203294C, NULL},
{NULL, sub_0203294C, NULL},
{sub_0203619C, sub_0203294C, NULL},
@ -51,83 +51,83 @@ static const UnkStruct_02039A58 Unk_020E5D64[] = {
{sub_02038240, sub_0203294C, NULL}
};
static CommCmdTable * Unk_021C07B0 = NULL;
static CommCmdManager * sCommCmdManager = NULL;
void CommCmd_Init (const UnkStruct_02039A58 * param0, int param1, void * param2)
void CommCmd_Init (const CommCmdTable * cmdTable, int param1, void * param2)
{
int v0;
if (!Unk_021C07B0) {
Unk_021C07B0 = Heap_AllocFromHeap(15, sizeof(CommCmdTable));
if (!sCommCmdManager) {
sCommCmdManager = Heap_AllocFromHeap(15, sizeof(CommCmdManager));
}
Unk_021C07B0->unk_00 = param0;
Unk_021C07B0->unk_04 = param1;
Unk_021C07B0->unk_08 = param2;
sCommCmdManager->cmdTable = cmdTable;
sCommCmdManager->unk_04 = param1;
sCommCmdManager->unk_08 = param2;
for (v0 = 0; v0 < (7 + 1); v0++) {
Unk_021C07B0->unk_0C[v0] = 0;
sCommCmdManager->unk_0C[v0] = 0;
}
Unk_021C07B0->unk_14 = 0;
sCommCmdManager->unk_14 = 0;
}
void sub_020327E0 (void)
{
if (Unk_021C07B0) {
Heap_FreeToHeap(Unk_021C07B0);
Unk_021C07B0 = NULL;
if (sCommCmdManager) {
Heap_FreeToHeap(sCommCmdManager);
sCommCmdManager = NULL;
}
}
void CommCmd_Callback (int param0, int param1, int param2, void * param3)
void CommCmd_Callback (int param0, int cmd, int param2, void * param3)
{
UnkFuncPtr_020F8E60 v0;
if (param1 < 22) {
v0 = Unk_020E5D64[param1].unk_00;
if (cmd < 22) {
v0 = Unk_020E5D64[cmd].unk_00;
} else {
GF_ASSERT(Unk_021C07B0);
GF_ASSERT(sCommCmdManager);
if (param1 > (Unk_021C07B0->unk_04 + 22)) {
if (cmd > (sCommCmdManager->unk_04 + 22)) {
sub_020363BC();
return;
}
v0 = Unk_021C07B0->unk_00[param1 - 22].unk_00;
v0 = sCommCmdManager->cmdTable[cmd - 22].unk_00;
}
if (v0 != NULL) {
if (Unk_021C07B0) {
v0(param0, param2, param3, Unk_021C07B0->unk_08);
if (sCommCmdManager) {
v0(param0, param2, param3, sCommCmdManager->unk_08);
} else {
v0(param0, param2, param3, NULL);
}
}
}
int sub_02032868 (int param0)
int CommCmd_PacketSizeOf (int cmd)
{
int v0 = 0;
UnkFuncPtr_02032868 v1;
if (param0 < 22) {
v1 = Unk_020E5D64[param0].unk_04;
if (cmd < 22) {
v1 = Unk_020E5D64[cmd].unk_04;
} else {
GF_ASSERT(Unk_021C07B0);
GF_ASSERT(sCommCmdManager);
if (Unk_021C07B0 == NULL) {
if (sCommCmdManager == NULL) {
sub_020363BC();
return v0;
}
if (param0 > (Unk_021C07B0->unk_04 + 22)) {
if (cmd > (sCommCmdManager->unk_04 + 22)) {
GF_ASSERT(0);
sub_020363BC();
return v0;
}
v1 = Unk_021C07B0->unk_00[param0 - 22].unk_04;
v1 = sCommCmdManager->cmdTable[cmd - 22].unk_04;
}
if (v1 != NULL) {
@ -137,25 +137,25 @@ int sub_02032868 (int param0)
return v0;
}
BOOL sub_020328D0 (int param0)
BOOL sub_020328D0 (int cmd)
{
if (param0 < 22) {
return Unk_020E5D64[param0].unk_08 != NULL;
if (cmd < 22) {
return Unk_020E5D64[cmd].unk_08 != NULL;
}
return Unk_021C07B0->unk_00[param0 - 22].unk_08 != NULL;
return sCommCmdManager->cmdTable[cmd - 22].unk_08 != NULL;
}
void * sub_0203290C (int param0, int param1, int param2)
void * sub_0203290C (int cmd, int netId, int param2)
{
UnkFuncPtr_0203290C v0;
if (param0 < 22) {
v0 = Unk_020E5D64[param0].unk_08;
return v0(param1, NULL, param2);
if (cmd < 22) {
v0 = Unk_020E5D64[cmd].unk_08;
return v0(netId, NULL, param2);
} else {
v0 = Unk_021C07B0->unk_00[param0 - 22].unk_08;
return v0(param1, Unk_021C07B0->unk_08, param2);
v0 = sCommCmdManager->cmdTable[cmd - 22].unk_08;
return v0(netId, sCommCmdManager->unk_08, param2);
}
return NULL;
@ -190,14 +190,14 @@ static void sub_02032958 (int param0, int param1, void * param2, void * param3)
return;
}
Unk_021C07B0->unk_0C[param0] = 1;
sCommCmdManager->unk_0C[param0] = 1;
for (v1 = 0; v1 < (7 + 1); v1++) {
if (!CommSys_IsPlayerConnected(v1)) {
continue;
}
if (!Unk_021C07B0->unk_0C[v1]) {
if (!sCommCmdManager->unk_0C[v1]) {
return;
}
}
@ -210,12 +210,12 @@ static void sub_0203299C (int param0, int param1, void * param2, void * param3)
u8 * v0 = param2;
int v1;
Unk_021C07B0->unk_00 = NULL;
Unk_021C07B0->unk_04 = 0;
Unk_021C07B0->unk_08 = NULL;
Unk_021C07B0->unk_14 = 1;
sCommCmdManager->cmdTable = NULL;
sCommCmdManager->unk_04 = 0;
sCommCmdManager->unk_08 = NULL;
sCommCmdManager->unk_14 = 1;
sub_020360D0(15, param2);
CommSys_SendDataFixedSize(15, param2);
}
static void sub_020329C4 (int param0, int param1, void * param2, void * param3)
@ -227,5 +227,5 @@ static void sub_020329C4 (int param0, int param1, void * param2, void * param3)
return;
}
Unk_021C07B0->unk_0C[param0] = 0;
sCommCmdManager->unk_0C[param0] = 0;
}

View File

@ -105,7 +105,7 @@ void sub_0203650C (void)
{
if (sCommTool) {
if (sCommTool->sendTiming) {
if (sub_020360D0(16, &sCommTool->syncNo)) {
if (CommSys_SendDataFixedSize(16, &sCommTool->syncNo)) {
sCommTool->sendTiming = 0;
}
}
@ -150,7 +150,7 @@ void sub_02036594 (u8 param0, u8 param1)
v0.unk_00 = param0;
v0.unk_01 = param1;
sub_020360D0(19, &v0);
CommSys_SendDataFixedSize(19, &v0);
}
int sub_020365A8 (int param0, u8 param1)
@ -188,7 +188,7 @@ BOOL sub_02036614 (int param0, const void * param1)
{
if (sCommTool) {
MI_CpuCopy8(param1, sCommTool->unk_18[param0], COMM_TOOL_TEMP_DATA_SIZE);
sub_020360D0(20, sCommTool->unk_18[param0]);
CommSys_SendDataFixedSize(20, sCommTool->unk_18[param0]);
return 1;
}

View File

@ -1209,7 +1209,7 @@ static void sub_020376A8 (void)
}
if (Unk_021C07D4->unk_40 > (120 - 10)) {
sub_020360D0(6, Unk_02100A20);
CommSys_SendDataFixedSize(6, Unk_02100A20);
}
if (Unk_021C07D4->unk_40 != 0) {
@ -1291,10 +1291,10 @@ void sub_0203781C (void)
if (CommSys_CurNetId() == 0) {
u8 v0 = 0;
sub_020360D0(10, &v0);
CommSys_SendDataFixedSize(10, &v0);
} else {
u8 v0 = 0;
sub_020360D0(10, &v0);
CommSys_SendDataFixedSize(10, &v0);
}
}
@ -2041,7 +2041,7 @@ void sub_020383D4 (void)
{
u8 v0 = CommSys_CurNetId();
sub_020360D0(21, &v0);
CommSys_SendDataFixedSize(21, &v0);
}
BOOL sub_020383E8 (void)

View File

@ -6,18 +6,18 @@
#include "unk_02039A58.h"
#include "unk_0209C390.h"
static const UnkStruct_02039A58 Unk_020E5F24[] = {
static const CommCmdTable Unk_020E5F24[] = {
{sub_0209C3D0, sub_0209C3C8, NULL},
{sub_0209C3E0, sub_0209C3C4, NULL},
{sub_0209C3F0, sub_0209C3CC, NULL}
};
const UnkStruct_02039A58 * sub_02039A58 (void)
const CommCmdTable * sub_02039A58 (void)
{
return Unk_020E5F24;
}
int sub_02039A60 (void)
{
return sizeof(Unk_020E5F24) / sizeof(UnkStruct_02039A58);
return sizeof(Unk_020E5F24) / sizeof(CommCmdTable);
}

View File

@ -167,8 +167,6 @@ void sub_02050224 (TaskManager * param0, u16 param1, u16 param2, u16 * param3)
CommFieldCmd_Init(v0);
sub_02050944(param0, sub_02050264, v0);
return;
}
static BOOL sub_02050264 (TaskManager * param0)

View File

@ -78,7 +78,7 @@ static void sub_0207AD40(SysTask * param0, void * param1);
static void sub_0207AE34(int param0, int param1, void * param2, void * param3);
static void sub_0207ADD4(TrainerInfo * param0, UnkStruct_02027F8C * param1, UnkStruct_02027F8C * param2);
static const UnkStruct_02039A58 Unk_020F099C[] = {
static const CommCmdTable Unk_020F099C[] = {
{sub_0207ADB4, sub_02032944, NULL},
{sub_0207A8A8, sub_02032944, NULL},
{sub_0207A934, sub_0207A758, NULL},
@ -95,7 +95,7 @@ static const UnkStruct_02039A58 Unk_020F099C[] = {
void sub_0207A6DC (void * param0)
{
int v0 = sizeof(Unk_020F099C) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F099C) / sizeof(CommCmdTable);
BattleSystem * v1;
UnkStruct_0207ACB4 * v2;
UnkStruct_0207AD40 * v3;
@ -125,7 +125,7 @@ void sub_0207A6DC (void * param0)
void sub_0207A744 (void * param0)
{
int v0 = sizeof(Unk_020F099C) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F099C) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F099C, v0, param0);
}

View File

@ -26,7 +26,7 @@ static void sub_02095C98(int param0, int param1, void * param2, void * param3);
static int sub_02095B24(void);
static int sub_02095B28(void);
static const UnkStruct_02039A58 Unk_020F58FC[] = {
static const CommCmdTable Unk_020F58FC[] = {
{NULL, sub_0203294C, NULL},
{sub_02095B2C, sub_0203294C, NULL},
{ov17_02252CEC, sub_02032944, sub_02095B04},
@ -47,7 +47,7 @@ static const UnkStruct_02039A58 Unk_020F58FC[] = {
void sub_02095AF0 (void * param0)
{
int v0 = sizeof(Unk_020F58FC) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F58FC) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F58FC, v0, param0);
}

View File

@ -27,7 +27,7 @@ static u8 * sub_02095E80(int param0, void * param1, int param2);
static int sub_02095E68(void);
static int sub_02095E70(void);
static const UnkStruct_02039A58 Unk_020F59BC[] = {
static const CommCmdTable Unk_020F59BC[] = {
{sub_02095CFC, sub_02095E78, sub_02095E80},
{sub_02095D74, sub_02032950},
{sub_02095D94, sub_02032950},
@ -43,7 +43,7 @@ static const UnkStruct_02039A58 Unk_020F59BC[] = {
void sub_02095CD4 (void * param0)
{
int v0 = sizeof(Unk_020F59BC) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F59BC) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F59BC, v0, param0);
}

View File

@ -24,7 +24,7 @@ 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 UnkStruct_02039A58 Unk_020F5A40[] = {
static const CommCmdTable Unk_020F5A40[] = {
{sub_02099510, sub_02032950, NULL},
{sub_02099510, sub_02032950, NULL},
{sub_02099510, sub_02032950, NULL},
@ -139,7 +139,7 @@ static const UnkStruct_02039A58 Unk_020F5A40[] = {
void sub_02095E98 (void * param0)
{
int v0 = sizeof(Unk_020F5A40) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F5A40) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F5A40, v0, param0);
}

View File

@ -26,7 +26,7 @@ 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 UnkStruct_02039A58 Unk_020F5F68[] = {
static const CommCmdTable Unk_020F5F68[] = {
{sub_02099510, sub_02096400, NULL},
{sub_02099510, sub_02096400, NULL},
{sub_02099510, sub_02096400, NULL},
@ -143,7 +143,7 @@ void sub_020961E8 (void * param0)
{
UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param0;
int v1;
int v2 = sizeof(Unk_020F5F68) / sizeof(UnkStruct_02039A58);
int v2 = sizeof(Unk_020F5F68) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F5F68, v2, param0);

View File

@ -43,7 +43,7 @@ static int sub_02099508 (void)
return 236 * 6 + 4 * 2;
}
static const UnkStruct_02039A58 Unk_020F68A4[] = {
static const CommCmdTable Unk_020F68A4[] = {
{CommPlayer_RecvLocation, sub_020585A4, NULL},
{CommPlayer_RecvLocationAndInit, sub_02058C3C, NULL},
{ov23_022431C4, sub_02032950, NULL},
@ -166,7 +166,7 @@ void sub_02099510 (int param0, int param1, void * param2, void * param3)
void CommFieldCmd_Init (void * param0)
{
int v0 = sizeof(Unk_020F68A4) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F68A4, v0, param0);
}

View File

@ -38,7 +38,7 @@ 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 UnkStruct_02039A58 Unk_020F8BF0[] = {
static const CommCmdTable Unk_020F8BF0[] = {
{ov104_0222EF30, sub_02032944, NULL},
{ov104_0222EF94, sub_02032944, NULL},
{ov104_0222F03C, sub_02032944, NULL},
@ -95,7 +95,7 @@ static const UnkStruct_02039A58 Unk_020F8BF0[] = {
void sub_0209BA80 (void * param0)
{
int v0 = sizeof(Unk_020F8BF0) / sizeof(UnkStruct_02039A58);
int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable);
CommCmd_Init(Unk_020F8BF0, v0, param0);
}

View File

@ -30,7 +30,7 @@ typedef struct {
static BOOL sub_0209BE84(UnkStruct_0209BDF8 * param0, u32 param1, const void * param2, u32 param3);
static const UnkStruct_02039A58 Unk_020F8EA8[135];
static const CommCmdTable Unk_020F8EA8[135];
static const UnkFuncPtr_020F8E60 Unk_020F8E60[18];
UnkStruct_0209BDF8 * sub_0209BDF8 (UnkStruct_0209C194 * param0, u32 param1)
@ -361,7 +361,7 @@ void * sub_0209C188 (UnkStruct_0209BDF8 * param0, int param1)
return (void *)v0;
}
static const UnkStruct_02039A58 Unk_020F8EA8[135] = {
static const CommCmdTable Unk_020F8EA8[135] = {
{sub_02099510, sub_0203294C, NULL},
{sub_02099510, sub_0203294C, NULL},
{sub_02099510, sub_0203294C, NULL},