diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-17 08:11:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 08:11:32 -0800 |
| commit | 90c7299e519783fe1e22d9ec8d3351d08bda65f6 (patch) | |
| tree | b24d8bdcd6809c5465c6aa18f6d3109af2aad915 /src/item_use.c | |
| parent | 4f9aab81ffdfedc84dfeafb88b4248dc6c7c2068 (diff) | |
| parent | 46cf490edd4fd5971d3a3511516beb0910e33c32 (diff) | |
Merge pull request #193 from marijnvdwerf/clean/cleanup-1
Clean up various things
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/item_use.c b/src/item_use.c index 557705460..bed1736bc 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -1,21 +1,21 @@ #include "global.h" -#include "task.h" -#include "item.h" -#include "palette.h" -#include "weather.h" -#include "string_util.h" -#include "menu.h" -#include "mail.h" #include "asm.h" -#include "rom4.h" -#include "metatile_behavior.h" -#include "field_player_avatar.h" #include "event_data.h" +#include "field_player_avatar.h" +#include "field_player_avatar.h" +#include "item.h" +#include "mail.h" #include "map_obj_lock.h" +#include "menu.h" +#include "metatile_behavior.h" +#include "palette.h" +#include "rom4.h" #include "script.h" -#include "field_player_avatar.h" -#include "sound.h" #include "songs.h" +#include "sound.h" +#include "string_util.h" +#include "task.h" +#include "weather.h" extern void (* const gExitToOverworldFuncList[])(); extern void (* gUnknown_03005D00)(u8); @@ -91,7 +91,7 @@ void SetUpItemUseOnFieldCallback(u8 taskId) void HandleDeniedItemUseMessage(u8 var1, u8 playerMenuStatus, const u8 *var3) { StringExpandPlaceholders(gStringVar4, var3); - + switch(playerMenuStatus) { case 0: // Item Menu @@ -146,10 +146,10 @@ void ItemUseOutOfBattle_Bike(u8 taskId) { s16 x, y; u8 tileBehavior; - + PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - + if(FlagGet(SYS_CYCLING_ROAD) == TRUE // on cycling road? || MetatileBehavior_IsVerticalRail(tileBehavior) == TRUE || MetatileBehavior_IsHorizontalRail(tileBehavior) == TRUE @@ -176,7 +176,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) GetOnOffBike(2); if(ItemId_GetSecondaryId(gScriptItemId) == 1) GetOnOffBike(4); - + sub_8064E2C(); ScriptContext2_Disable(); DestroyTask(taskId); |