diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-30 19:31:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-30 19:31:29 -0400 |
| commit | f300f9e699c6f90c7f8da3a4e130a21f231073a0 (patch) | |
| tree | 200a30a97d4d209314a9794b074b1d5d9330057e /src | |
| parent | 92f17e88120b01ff57f02fe13696556419b4221c (diff) | |
Revert FLOAT_U* and DOUBLE_U* macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_size_record.c | 2 | ||||
| -rw-r--r-- | src/roulette.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index d70f57f47..f63e1ccba 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -97,7 +97,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.c b/src/roulette.c index 5225118d5..662522aae 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -3969,7 +3969,7 @@ static void sub_8144410(struct Sprite *sprite) if (!sub_8143B48(sprite)) { gUnknown_0203AB88->var90 = 0.0f; - gUnknown_0203AB88->var8C -= FLOAT_U8(gUnknown_085B6348[gUnknown_0203AB88->var04_0].var03) + gUnknown_0203AB88->var8C -= (float)(gUnknown_085B6348[gUnknown_0203AB88->var04_0].var03) / (gUnknown_085B6348[gUnknown_0203AB88->var04_0].var04 + 1); sprite->data[1] = 4; sprite->callback = sub_8144264; @@ -3994,8 +3994,8 @@ static void sub_8144514(struct Sprite *sprite) if (gUnknown_0203AB88->var94 > 40.f) return; - gUnknown_0203AB88->var98 = -(4.0f / FLOAT_U16(gUnknown_0203AB88->var86)); - gUnknown_0203AB88->var90 = -(gUnknown_0203AB88->var8C / FLOAT_U16(gUnknown_0203AB88->var86)); + gUnknown_0203AB88->var98 = -(4.0f / (float)(gUnknown_0203AB88->var86)); + gUnknown_0203AB88->var90 = -(gUnknown_0203AB88->var8C / (float)(gUnknown_0203AB88->var86)); sprite->animNum = 2; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; @@ -4010,8 +4010,8 @@ static void sub_81445D8(struct Sprite *sprite) return; m4aSongNumStartOrChange(SE_TAMAKORO_E); - gUnknown_0203AB88->var98 = -(20.0f / FLOAT_U16(gUnknown_0203AB88->var84)); - gUnknown_0203AB88->var90 = ((1.0f - gUnknown_0203AB88->var8C) / FLOAT_U16(gUnknown_0203AB88->var84)); + gUnknown_0203AB88->var98 = -(20.0f / (float)(gUnknown_0203AB88->var84)); + gUnknown_0203AB88->var90 = ((1.0f - gUnknown_0203AB88->var8C) / (float)(gUnknown_0203AB88->var84)); sprite->animNum = 1; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; |