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/player_pc.c | |
| parent | 4f9aab81ffdfedc84dfeafb88b4248dc6c7c2068 (diff) | |
| parent | 46cf490edd4fd5971d3a3511516beb0910e33c32 (diff) | |
Merge pull request #193 from marijnvdwerf/clean/cleanup-1
Clean up various things
Diffstat (limited to 'src/player_pc.c')
| -rw-r--r-- | src/player_pc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/player_pc.c b/src/player_pc.c index 822e2108e..682e46b61 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -1,14 +1,14 @@ #include "global.h" +#include "asm.h" #include "item.h" -#include "task.h" -#include "menu.h" -#include "sound.h" #include "main.h" -#include "script.h" +#include "menu.h" #include "palette.h" -#include "weather.h" -#include "asm.h" +#include "script.h" +#include "sound.h" #include "string_util.h" +#include "task.h" +#include "weather.h" extern void DisplayItemMessageOnField(u8, u8*, TaskFunc, u16); extern void ItemStorageMenuProcessInput(u8); @@ -74,7 +74,7 @@ void NewGameInitPCItems(void) void BedroomPC(void) { u8 taskId; - + gUnknown_02039314 = gUnknown_084062B8; gUnknown_030007B4 = 4; taskId = CreateTask(TaskDummy, 0); @@ -84,7 +84,7 @@ void BedroomPC(void) void PlayerPC(void) { u8 taskId; - + gUnknown_02039314 = gUnknown_084062BC; gUnknown_030007B4 = 3; taskId = CreateTask(TaskDummy, 0); @@ -216,7 +216,7 @@ void ItemStorageMenuProcessInput(u8 var) sub_8072DEC(); PlaySE(5); gUnknown_084062C0[3].func(var); - } + } } void Task_ItemStorage_Deposit(u8 taskId) @@ -252,7 +252,7 @@ void ItemStorage_Withdraw(u8 taskId) { u8 var; u16 * data = gTasks[taskId].data; - + sub_8072DEC(); MenuZeroFillWindowRect(0, 0, 11, 9); var = CountUsedPCItemSlots(); @@ -276,7 +276,7 @@ void ItemStorage_Toss(u8 taskId) { u8 var; u16 * data = gTasks[taskId].data; - + sub_8072DEC(); MenuZeroFillWindowRect(0, 0, 11, 9); var = CountUsedPCItemSlots(); @@ -322,7 +322,7 @@ void sub_813A240(u8 taskId) void sub_813A280(u8 taskId) { s16 *data = gTasks[taskId].data; - + if(gMain.newAndRepeatedKeys & 0x40) { if(data[0]) @@ -686,7 +686,7 @@ void sub_813A4B4(u8 taskId) sub_80F996C(0); sub_80F996C(1); - + if(data[6]) { if(gSaveBlock1.pcItems[var].itemId == 1) |