diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-03 10:12:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-03 10:12:16 -0400 |
| commit | 0f19a99599ffa77a34535925a683113464095b8e (patch) | |
| tree | b29aad22f1c2416c5ea49268fc7ba06405964d1d /src | |
| parent | 8cf019bb3ac6373ad9b834639f2af47afcc1316f (diff) | |
Remove the FLOAT_Uxx and DOUBLE_Uxx macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_size_record.c | 2 | ||||
| -rw-r--r-- | src/roulette_gfx.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 42de71e14..6a7ee69b3 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -96,7 +96,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) #ifdef UNITS_IMPERIAL //Convert size from centimeters to inches - size = DOUBLE_U32(size * 10) / (CM_PER_INCH * 10); + size = (double)(size * 10) / (CM_PER_INCH * 10); #endif string = ConvertIntToDecimalStringN(string, size / 10, 0, 8); diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index c309a27d3..55662ba39 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -1502,7 +1502,7 @@ void sub_8118F8C(struct Sprite *sprite) const struct StructgUnknown_083F8DF4 *p; eRoulette->var90 = 0.0f; p = gUnknown_083F8DF4; - eRoulette->var8C -= (FLOAT_U8(p[eRoulette->var04_0].var03)) + eRoulette->var8C -= ((float)(p[eRoulette->var04_0].var03)) / ((float)(s16)(p[eRoulette->var04_0].var04 + 1)); sprite->data[1] = 4; #if DEBUG @@ -1532,8 +1532,8 @@ void sub_8119088(struct Sprite *sprite) sub_8118724(sprite); if (!(eRoulette->var94 > 40.f)) { - eRoulette->var98 = - ( 4.0f / FLOAT_U16((u16)eRoulette->var86)); - eRoulette->var90 = - (eRoulette->var8C / FLOAT_U16((u16)eRoulette->var86)); + eRoulette->var98 = - ( 4.0f / (float)((u16)eRoulette->var86)); + eRoulette->var90 = - (eRoulette->var8C / (float)((u16)eRoulette->var86)); sprite->animNum = 2; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; @@ -1548,8 +1548,8 @@ void sub_8119134(struct Sprite *sprite) if (!(eRoulette->var94 > 60.0f)) { m4aSongNumStartOrChange(SE_TAMAKORO_E); - eRoulette->var98 = - ( 20.0f / FLOAT_U16((u16)eRoulette->var84)); - eRoulette->var90 = ((1.0f - eRoulette->var8C) / FLOAT_U16((u16)eRoulette->var84)); + eRoulette->var98 = - ( 20.0f / (float)((u16)eRoulette->var84)); + eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)((u16)eRoulette->var84)); sprite->animNum = 1; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; |