diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 5 | ||||
| -rw-r--r-- | include/link_rfu.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/pokemon_jump.h | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index 4523ece21..8b61164f6 100644 --- a/include/global.h +++ b/include/global.h @@ -86,6 +86,11 @@ #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +// Macros for checking the joypad +#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 S16TOPOSFLOAT(val) \ ({ \ s16 v = (val); \ diff --git a/include/link_rfu.h b/include/link_rfu.h index edfd0ed20..dc5b963d1 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -284,6 +284,8 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); +void sub_8010198(void); +void sub_8011AC8(void); void LinkRfu_FatalError(void); bool32 sub_8011A9C(void); void sub_80104B0(void); diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index 9e8a6fade..9dbf194d0 100755..100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -3,9 +3,9 @@ #include "main.h" +void sub_802EB24(u8, u8, u8, u8, u8); +bool32 sub_802EB84(void); void sub_802A9A8(u16 monId, MainCallback callback); bool32 sub_802C908(u16 species); -#endif // GUARD_POKEMON_JUMP_H - - +#endif //GUARD_POKEMON_JUMP_H |