diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-14 13:15:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 13:15:31 -0500 |
| commit | 0979ea91fb247b642cf7aa9e0bea5265917923d8 (patch) | |
| tree | aa80ec77fadae2ccc81bd2dd655bd45a9532894f /src | |
| parent | d40e737d52f39a0b5516b97a90c985825a892b63 (diff) | |
| parent | c3113db931ad406154c3bfd60dc26458e0d5fe3f (diff) | |
Merge pull request #357 from DizzyEggg/move_heap
Move HEAP_SIZE to malloc and use void instead of empty argument list
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_anim_80A5C6C.c | 2 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 4 | ||||
| -rw-r--r-- | src/fldeff_sweetscent.c | 2 | ||||
| -rwxr-xr-x | src/item_use.c | 4 | ||||
| -rw-r--r-- | src/task.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index a461d3d1d..ebe1718b7 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -860,7 +860,7 @@ bool8 IsBattlerSpritePresent(u8 battlerId) return FALSE; } -bool8 IsDoubleBattle() +bool8 IsDoubleBattle(void) { return IS_DOUBLE_BATTLE(); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index fd315dd98..b9cf7d102 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -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()](); } diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 14da87eb3..f592ed532 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -35,7 +35,7 @@ void hm2_sweet_scent(void) gFieldEffectArguments[0] = GetCursorSelectionMonId(); } -bool8 FldEff_SweetScent() +bool8 FldEff_SweetScent(void) { u8 taskId; diff --git a/src/item_use.c b/src/item_use.c index 67bdabd87..633d975a8 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -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; diff --git a/src/task.c b/src/task.c index fafa7c70d..f067e21b4 100644 --- a/src/task.c +++ b/src/task.c @@ -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; |