diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-10 20:11:37 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-10 20:11:37 -0400 |
commit | 6a1f6122b5422deebf218372cbd9b5684505d4ec (patch) | |
tree | c760610bdce7badc8b18c26d965853256fd8858c /arm9/lib/include/OS_tick.h | |
parent | 9ef47bdd27acdbede94a72d431a931cf0b3f01f9 (diff) | |
parent | 688b3bcd67b47a4ddf593dc0244409b2c5aa10c7 (diff) |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include/OS_tick.h')
-rw-r--r-- | arm9/lib/include/OS_tick.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arm9/lib/include/OS_tick.h b/arm9/lib/include/OS_tick.h index fb4ce7e6..f1c7145d 100644 --- a/arm9/lib/include/OS_tick.h +++ b/arm9/lib/include/OS_tick.h @@ -1,8 +1,12 @@ #ifndef POKEDIAMOND_OS_TICK_H #define POKEDIAMOND_OS_TICK_H -#include "nitro/types.h" +#include "consts.h" typedef u64 OSTick; +#define OS_SYSTEM_CLOCK HW_SYSTEM_CLOCK + +#define OS_MilliSecondsToTicks(msec) ((OSTick)(((OS_SYSTEM_CLOCK/1000) * (u64)(msec)) / 64)) + #endif //POKEDIAMOND_OS_TICK_H |