diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-15 20:16:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:16:17 -0500 |
| commit | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (patch) | |
| tree | 813eca906ee23e6ff80dd6ddfb204f6c726afa49 /include/global.h | |
| parent | 98a79fd72fe681c9d9d227bdc52e63db301a56d9 (diff) | |
| parent | b3167d579b903badfd0be67c02d30bdd71fd9ef6 (diff) | |
Merge pull request #253 from PikalaxALT/add_arm_agbcc
librfu_intr
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/include/global.h b/include/global.h index a0027f9dc..8644fe364 100644 --- a/include/global.h +++ b/include/global.h @@ -74,8 +74,8 @@ // GameFreak never ceases to amaze. // TODO: Propagate use of this macro #define TEST_BUTTON(field, button) ({(field) & (button);}) -#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) -#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) +#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) +#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) #define JOY_REPT(button) TEST_BUTTON(gMain.newAndRepeatedKeys, button) extern u8 gStringVar1[]; @@ -658,8 +658,8 @@ struct FameCheckerSaveData struct MEWonderNewsData { - u16 unk_00; - u8 unk_02; + u16 newsId; + u8 shareState; u8 unk_03; u8 unk_04[40]; u8 unk_2C[10][40]; @@ -673,13 +673,13 @@ struct MEWonderNewsStruct struct MEWonderCardData { - u16 unk_00; + u16 cardId; u16 unk_02; u32 unk_04; u8 unk_08_0:2; u8 unk_08_2:4; - u8 unk_08_6:2; - u8 unk_09; + u8 shareState:2; + u8 recvMonCapacity; u8 unk_0A[40]; u8 unk_32[40]; u8 unk_5A[4][40]; @@ -695,11 +695,12 @@ struct MEWonderCardStruct struct MEventBuffer_3430_Sub { - u16 unk_00; - u16 unk_02; - u16 unk_04; + u16 linkWins; + u16 linkLosses; + u16 linkTrades; u16 unk_06; - u16 unk_08[2][7]; + u16 distributedMons[2][7]; // [0][x] = species + // [1][x] = ??? }; struct MEventBuffer_3430 |