diff options
| author | Maide <34639600+Kelebek1@users.noreply.github.com> | 2022-03-29 18:56:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 18:56:20 +0100 |
| commit | 72265fac927658187cbb3c7a3a184677bf5f28fa (patch) | |
| tree | 31f0ceb5b2ce571b5942cc4de2f570eb22ebf600 /include | |
| parent | 6132d950e36f9b8638e1d44b8339ed7d1aa027bc (diff) | |
Obj_Entotu (#745)
* Obj_Entotu
* Time macro
* PR
* Merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/macros.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/macros.h b/include/macros.h index 64f084efe..5e9c062c9 100644 --- a/include/macros.h +++ b/include/macros.h @@ -49,14 +49,13 @@ #define CURRENT_DAY (((void)0, gSaveContext.save.day) % 5) -#define TIME_TO_MINUTES(time) (s32)((time) * ((24 * 60) / 0x10000)) #define CLOCK_TIME(hr, min) (s32)(((hr) * 60 + (min)) * 0x10000 / (24 * 60)) #define CLOCK_TIME_MINUTE (CLOCK_TIME(0, 1)) -#define TIME_TO_MINUTES_F(time) ((time) * ((24.0f * 60.0f) / 0x10000)) +#define TIME_TO_MINUTES_F(time) ((time) * ((24.0f * 60.0f) / 0x10000)) // 0.021972656f #define CLOCK_TIME_F(hr, min) (((hr) * 60.0f + (min)) * (0x10000 / (24.0f * 60.0f))) -#define TIME_TO_MINUTES_ALT_F(time) ((time) / (24.0f * 60.0f / 0x10000)) +#define TIME_TO_MINUTES_ALT_F(time) ((time) / (0x10000 / (24.0f * 60.0f))) #define CLOCK_TIME_ALT_F(hr, min) (((hr) * 60.0f + (min)) / (24.0f * 60.0f / 0x10000)) #define SLOT(item) gItemSlots[item] |