Change signedness and add casts to avoid implicit conversion warnings
This commit is contained in:
@@ -327,7 +327,7 @@ void PlayerPC(void)
|
||||
|
||||
static void InitPlayerPCMenu(u8 taskId)
|
||||
{
|
||||
u16 *data;
|
||||
s16 *data;
|
||||
struct WindowTemplate windowTemplate;
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
@@ -346,7 +346,7 @@ static void InitPlayerPCMenu(u8 taskId)
|
||||
|
||||
static void PlayerPCProcessMenuInput(u8 taskId)
|
||||
{
|
||||
u16 *data;
|
||||
s16 *data;
|
||||
s8 inputOptionId;
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
@@ -435,7 +435,7 @@ static void PlayerPC_TurnOff(u8 taskId)
|
||||
|
||||
static void InitItemStorageMenu(u8 taskId, u8 var)
|
||||
{
|
||||
u16 *data;
|
||||
s16 *data;
|
||||
struct WindowTemplate windowTemplate;
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
@@ -548,7 +548,7 @@ static void ItemStorage_Toss(u8 taskId)
|
||||
|
||||
static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss)
|
||||
{
|
||||
u16 *data = gTasks[taskId].data;
|
||||
s16 *data = gTasks[taskId].data;
|
||||
|
||||
data[3] = toss;
|
||||
sub_816B4DC(taskId);
|
||||
@@ -581,9 +581,9 @@ static void ItemStorage_SetItemAndMailCount(u8 taskId)
|
||||
|
||||
static void sub_816B4DC(u8 taskId)
|
||||
{
|
||||
u16 *data = gTasks[taskId].data;
|
||||
u16 *data = (u16 *)gTasks[taskId].data;
|
||||
|
||||
ClearStdWindowAndFrameToTransparent(data[4], FALSE);
|
||||
ClearStdWindowAndFrameToTransparent((u8)data[4], FALSE);
|
||||
ClearWindowTilemap(data[4]);
|
||||
RemoveWindow(data[4]);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
@@ -1380,7 +1380,7 @@ static void ItemStorage_DoItemToss(u8 taskId)
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
|
||||
if (!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId))
|
||||
if (ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId) == 0)
|
||||
{
|
||||
CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
|
||||
ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3);
|
||||
|
||||
Reference in New Issue
Block a user