Merge pull request #357 from DizzyEggg/move_heap

Move HEAP_SIZE to malloc and use void instead of empty argument list
This commit is contained in:
Diegoisawesome
2018-10-14 13:15:31 -05:00
committed by GitHub
11 changed files with 14 additions and 15 deletions

View File

@@ -860,7 +860,7 @@ bool8 IsBattlerSpritePresent(u8 battlerId)
return FALSE;
}
bool8 IsDoubleBattle()
bool8 IsDoubleBattle(void)
{
return IS_DOUBLE_BATTLE();
}

View File

@@ -285,7 +285,7 @@ void MovementType_Player(struct Sprite *sprite)
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2);
}
static u8 EventObjectCB2_NoMovement2()
static u8 EventObjectCB2_NoMovement2(void)
{
return 0;
}
@@ -375,7 +375,7 @@ static void PlayerAllowForcedMovementIfMovingSameDirection(void)
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_5;
}
static bool8 TryDoMetatileBehaviorForcedMovement()
static bool8 TryDoMetatileBehaviorForcedMovement(void)
{
return gUnknown_08497444[GetForcedMovementByMetatileBehavior()]();
}

View File

@@ -35,7 +35,7 @@ void hm2_sweet_scent(void)
gFieldEffectArguments[0] = GetCursorSelectionMonId();
}
bool8 FldEff_SweetScent()
bool8 FldEff_SweetScent(void)
{
u8 taskId;

View File

@@ -203,7 +203,7 @@ u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
return 0;
}
void sub_80FD254()
void sub_80FD254(void)
{
struct MailStruct mail;
mail.itemId = gSpecialVar_ItemId;
@@ -249,7 +249,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId)
DestroyTask(taskId);
}
bool32 CanFish()
bool32 CanFish(void)
{
s16 x, y;
u16 tileBehavior;

View File

@@ -7,7 +7,7 @@
struct Task gTasks[NUM_TASKS];
static void InsertTask(u8 newTaskId);
static u8 FindFirstActiveTask();
static u8 FindFirstActiveTask(void);
void ResetTasks(void)
{
@@ -124,7 +124,7 @@ void RunTasks(void)
}
}
static u8 FindFirstActiveTask()
static u8 FindFirstActiveTask(void)
{
u8 taskId;