diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-18 16:46:28 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-18 16:46:28 -0400 |
| commit | 5e2d0ed91734dd995d82487acc8f1e7afa92f513 (patch) | |
| tree | e85d0c05893eb0e01ae4ec37600bcdeae3193907 /arm9/lib/include/fx.h | |
| parent | 47973aaf0be67cb890759bf6dbc6dac62c3535cd (diff) | |
| parent | 7adff5d7193d5c77de4e8b348123f1e19ff7fb2c (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include/fx.h')
| -rw-r--r-- | arm9/lib/include/fx.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arm9/lib/include/fx.h b/arm9/lib/include/fx.h index c09b24ae..4a844872 100644 --- a/arm9/lib/include/fx.h +++ b/arm9/lib/include/fx.h @@ -59,8 +59,11 @@ typedef s64 fx64c; #define FX_F32_TO_FX16(x) ((fx16)(((x) > 0) ? \ (fx16)((x) * (1 << FX16_INT_SHIFT) + 0.5f ) : \ (fx16)((x) * (1 << FX16_INT_SHIFT) - 0.5f ))) - +#define FX_F32_TO_FX32(x) ((fx32)(((x) > 0) ? \ + (fx32)((x) * (1 << FX32_INT_SHIFT) + 0.5f ) : \ + (fx32)((x) * (1 << FX32_INT_SHIFT) - 0.5f ))) #define FX16_CONST(x) FX_F32_TO_FX16(x) +#define FX32_CONST(x) FX_F32_TO_FX32(x) struct Vecx32 { |