diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/librfu.h | 14 | ||||
| -rw-r--r-- | include/link_rfu.h | 36 |
2 files changed, 35 insertions, 15 deletions
diff --git a/include/librfu.h b/include/librfu.h index 9d131f027..49df42541 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -1,3 +1,6 @@ +#ifndef GUARD_LIBRFU_H +#define GUARD_LIBRFU_H + #include "main.h" enum @@ -81,7 +84,7 @@ struct UnkLinkRfuStruct_02022B14Substruct u8 playerTrainerId[2]; }; -struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 +struct __attribute__((packed, aligned(2))) UnkLinkRfuStruct_02022B14 { struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; @@ -169,13 +172,14 @@ struct RfuUnk3 u32 unk_dc; }; -struct RfuUnk5Sub { +struct RfuUnk5Sub +{ u16 unk_00; u8 unk_02; u16 unk_04; struct UnkLinkRfuStruct_02022B14 unk_06; - u8 fill_13[2]; - u8 unk_15[8]; + u8 fill_13[1]; + u8 playerName[PLAYER_NAME_LENGTH + 1]; }; struct RfuUnk5 @@ -252,3 +256,5 @@ void rfu_UNI_readySendData(u8 a0); void rfu_UNI_clearRecvNewDataFlag(u8 a0); void rfu_REQ_PARENT_resumeRetransmitAndChange(void); void rfu_NI_setSendData(u8, u8, u8 *, u8); + +#endif // GUARD_LIBRFU_H diff --git a/include/link_rfu.h b/include/link_rfu.h index c3ca75604..426565e56 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -1,6 +1,8 @@ #ifndef GUARD_LINK_RFU_H #define GUARD_LINK_RFU_H +#include "librfu.h" + // Exported type declarations struct UnkLinkRfuStruct_02022B2C @@ -32,7 +34,8 @@ struct UnkLinkRfuStruct_02022B44 u8 fill_84[0x58]; }; -struct UnkRfuStruct_1 { +struct UnkRfuStruct_1 +{ /* 0x000 */ u8 unk_00; /* 0x001 */ u8 unk_01; /* 0x002 */ vu8 unk_02; @@ -75,7 +78,8 @@ struct UnkRfuStruct_1 { /* 0xeb4 */ u8 filler_e64[12]; }; -struct UnkRfuStruct_2_Sub_6c { +struct UnkRfuStruct_2_Sub_6c +{ /* 0x00 */ u16 unk_00; /* 0x02 */ u16 unk_02; /* 0x04 */ const u8 *unk_04; @@ -86,7 +90,8 @@ struct UnkRfuStruct_2_Sub_6c { /* 0x12 */ u8 unk_12; }; -struct UnkRfuStruct_2_Sub_124 { +struct UnkRfuStruct_2_Sub_124 +{ /* 0x000 */ u8 unk_00[32][70]; /* 0x8c0 */ vu8 unk_8c0; /* 0x8c1 */ vu8 unk_8c1; @@ -94,7 +99,8 @@ struct UnkRfuStruct_2_Sub_124 { /* 0x8c3 */ vu8 unk_8c3; }; -struct UnkRfuStruct_2_Sub_9e8 { +struct UnkRfuStruct_2_Sub_9e8 +{ /* 0x000 */ u8 unk_00[40][14]; /* 0x230 */ vu8 unk_230; /* 0x231 */ vu8 unk_231; @@ -102,14 +108,16 @@ struct UnkRfuStruct_2_Sub_9e8 { /* 0x233 */ vu8 unk_233; }; -struct UnkRfuStruct_2_Sub_c1c { +struct UnkRfuStruct_2_Sub_c1c +{ /* 0x00 */ u8 unk_00[2][14]; /* 0x1c */ vu8 unk_1c; /* 0x1d */ vu8 unk_1d; /* 0x1e */ vu8 unk_1e; }; -struct UnkRfuStruct_Sub_Unused { +struct UnkRfuStruct_Sub_Unused +{ /* 0x000 */ u8 unk_00[2][256]; /* 0x200 */ vu8 unk_200; /* 0x201 */ vu8 unk_201; @@ -117,7 +125,8 @@ struct UnkRfuStruct_Sub_Unused { /* 0x203 */ vu8 unk_203; }; -struct UnkRfuStruct_2 { +struct UnkRfuStruct_2 +{ /* 0x000 */ void (*unk_00)(void); /* 0x004 */ u16 unk_04; /* 0x006 */ u8 filler_06[4]; @@ -149,7 +158,10 @@ struct UnkRfuStruct_2 { /* 0x0fe */ u16 unk_fe; /* 0x100 */ u16 unk_100; /* 0x102 */ u8 unk_102; - /* 0x103 */ u8 filler_103[0x21]; + /* 0x103 */ u8 filler_103[0x10A - 0x103]; + /* 0x10A */ struct UnkLinkRfuStruct_02022B14 unk_10A; + u8 filler_; + u8 playerName[PLAYER_NAME_LENGTH + 1]; /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124; /* 0x9e8 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8; /* 0xc1c */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; @@ -184,7 +196,8 @@ struct UnkRfuStruct_2 { /* 0xcee */ u8 unk_cee[4]; }; // size = 0xcf4 -struct UnkRfuStruct_8010A14 { +struct UnkRfuStruct_8010A14 +{ char unk_00[15]; u8 unk_0f; u8 unk_10[4]; @@ -252,17 +265,18 @@ void sub_800E3A8(void); void sub_800ED10(void); void sub_800ED28(void); void sub_8011090(u8 a0, u32 a1, u32 a2); -void sub_8011FC8(u8 *a0, u16 a1); +void sub_8011FC8(const u8 *src, u16 trainerId); void sub_8010FA0(bool32 a0, bool32 a1); void sub_8010F60(void); void sub_8010FCC(u32 a0, u32 a1, u32 a2); void sub_8011C84(void); -void sub_8012188(const u8 *a0, struct UnkLinkRfuStruct_02022B14 *arg1, u8 arg2); +void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2); bool32 sub_8011B90(void); void sub_800FE50(u16 *a0); bool32 sub_800E540(u16 id, u8 *name); void sub_8011DE0(u32 arg0); u8 sub_801100C(int a0); void sub_800EF7C(void); +bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); #endif //GUARD_LINK_RFU_H |