diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 12:09:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-16 12:09:13 -0500 |
commit | 6bee17b4cecf000724d46bcc0116498a82acaae4 (patch) | |
tree | 6faf5928270f409cc866f82d2d195f36debd45dc /include/librfu.h | |
parent | 01de877fc86e8fe369314b7bda490b610342af6f (diff) | |
parent | 3b40ec23c7200a72b49c0cf0ede06e886a702aec (diff) |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'include/librfu.h')
-rw-r--r-- | include/librfu.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/librfu.h b/include/librfu.h index 50dd1c3db..3c9d776f1 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -4,6 +4,8 @@ #include "global.h" #include "main.h" +#define LIBRFU_VERSION 1024 + /* TODOs: * - documentation * - check if any field needs to be volatile @@ -307,7 +309,11 @@ struct STWIStatus u8 ackActiveCommand; u8 timerSelect; u8 unk_b; - u32 timerState; // this field is s32 in emerald +#if LIBRFU_VERSION >= 1026 + s32 timerState; +#else + u32 timerState; +#endif vu8 timerActive; u8 unk_11; vu16 error; @@ -472,7 +478,7 @@ extern struct RfuFixed *gRfuFixed; extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX]; extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX]; -// librfu_s32id +// librfu_sio32id s32 AgbRFU_checkID(u8 maxTries); // Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation. |