Resolve compile warnings in modern
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "task.h"
|
||||
#include "trig.h"
|
||||
|
||||
#undef abs
|
||||
#define abs(x) ((x) < 0 ? -(x) : (x))
|
||||
|
||||
static void AnimTask_ShakeMonStep(u8 taskId);
|
||||
|
||||
+1
-1
@@ -2045,7 +2045,7 @@ static void Task_FightScene3_Bg0Scroll(u8 taskId)
|
||||
|
||||
static void SpriteCB_LargeStar(struct Sprite * sprite)
|
||||
{
|
||||
u32 v;
|
||||
unsigned v;
|
||||
sprite->data[0] -= sprite->data[2];
|
||||
sprite->data[1] += sprite->data[3];
|
||||
sprite->data[4] += 48;
|
||||
|
||||
+1
-1
@@ -201,7 +201,7 @@ u8 GetTaskCount(void)
|
||||
return count;
|
||||
}
|
||||
|
||||
void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value)
|
||||
void SetWordTaskArg(u8 taskId, u8 dataElem, unsigned long value)
|
||||
{
|
||||
if (dataElem <= 14)
|
||||
{
|
||||
|
||||
+2
-2
@@ -120,13 +120,13 @@ u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *))
|
||||
return sprite;
|
||||
}
|
||||
|
||||
void StoreWordInTwoHalfwords(u16 *h, u32 w)
|
||||
void StoreWordInTwoHalfwords(u16 *h, unsigned w)
|
||||
{
|
||||
h[0] = (u16)(w);
|
||||
h[1] = (u16)(w >> 16);
|
||||
}
|
||||
|
||||
void LoadWordFromTwoHalfwords(u16 *h, u32 *w)
|
||||
void LoadWordFromTwoHalfwords(u16 *h, unsigned *w)
|
||||
{
|
||||
*w = h[0] | (s16)h[1] << 16;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user