diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/librfu.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/librfu.h')
| -rw-r--r-- | include/librfu.h | 14 |
1 files changed, 10 insertions, 4 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 |