summaryrefslogtreecommitdiff
path: root/src/player_pc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/player_pc.c')
-rw-r--r--src/player_pc.c84
1 files changed, 39 insertions, 45 deletions
diff --git a/src/player_pc.c b/src/player_pc.c
index 928aac706..a040ba5b6 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -112,7 +112,7 @@ static void CopyItemName_PlayerPC(u8 *string, u16 itemId);
static void sub_816BC14(void);
static void sub_816BFE0(u8 y, u8, u8 speed);
static void sub_816BCC4(u8);
-static void sub_816C690(u8);
+static void UpdateSwapLinePos(u8);
static void sub_816C4FC(u8 taskId);
static void sub_816C0C8(void);
static void sub_816C060(u16 itemId);
@@ -398,7 +398,7 @@ static void PlayerPC_Mailbox(u8 taskId)
{
playerPCItemPageInfo.cursorPos = 0;
playerPCItemPageInfo.itemsAbove = 0;
- playerPCItemPageInfo.scrollIndicatorId = 0xFF;
+ playerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
Mailbox_UpdateMailList();
ItemStorage_SetItemAndMailCount(taskId);
if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE)
@@ -443,7 +443,7 @@ static void InitItemStorageMenu(u8 taskId, u8 var)
windowTemplate.width = GetMaxWidthInMenuTable(gPCText_ItemPCOptionsText, 4);
data[4] = AddWindow(&windowTemplate);
SetStandardWindowBorderStyle(data[4], 0);
- PrintMenuTable(data[4], 4, gPCText_ItemPCOptionsText);
+ PrintMenuTable(data[4], ARRAY_COUNT(gPCText_ItemPCOptionsText), gPCText_ItemPCOptionsText);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[4], 4, var);
ScheduleBgCopyTilemapToVram(0);
ItemStorageMenuPrint(gPCText_OptionDescList[var]);
@@ -554,12 +554,12 @@ static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss)
sub_816B4DC(taskId);
playerPCItemPageInfo.cursorPos = 0;
playerPCItemPageInfo.itemsAbove = 0;
- playerPCItemPageInfo.scrollIndicatorId = 0xFF;
+ playerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
ItemStorage_SetItemAndMailCount(taskId);
sub_816BC14();
FreeAndReserveObjectSpritePalettes();
- LoadListMenuArrowsGfx();
- sub_8122344(gUnknown_0203BCC4->spriteIds, 7);
+ LoadListMenuSwapLineGfx();
+ CreateSwapLineSprites(gUnknown_0203BCC4->spriteIds, 7);
ClearDialogWindowAndFrame(0,0);
gTasks[taskId].func = ItemStorage_ProcessWithdrawTossInput;
}
@@ -593,8 +593,8 @@ static u8 GetMailboxMailCount(void)
{
u8 i, j;
- for(i = 0, j = 6; j < 16; j++)
- if (gSaveBlock1Ptr->mail[j].itemId != 0)
+ for(i = 0, j = PARTY_SIZE; j < MAIL_COUNT; j++)
+ if (gSaveBlock1Ptr->mail[j].itemId != ITEM_NONE)
i++;
return i;
@@ -605,9 +605,9 @@ static void Mailbox_UpdateMailList(void)
struct MailStruct mailBuffer;
u8 i, j;
- for (i=6; i<15; i++)
+ for (i = PARTY_SIZE; i < MAIL_COUNT - 1; i++)
{
- for (j=i+1; j<16; j++)
+ for (j = i + 1; j < MAIL_COUNT; j++)
{
if (gSaveBlock1Ptr->mail[i].itemId == 0)
{
@@ -647,7 +647,7 @@ static void Mailbox_ProcessInput(u8 taskId)
break;
case LIST_CANCEL:
PlaySE(SE_SELECT);
- RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId);
+ RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorTaskId);
Mailbox_ReturnToPlayerPC(taskId);
break;
default:
@@ -656,7 +656,7 @@ static void Mailbox_ProcessInput(u8 taskId)
sub_81D1D04(1);
DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
ScheduleBgCopyTilemapToVram(0);
- RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId);
+ RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorTaskId);
gTasks[taskId].func = Mailbox_PrintWhatToDoWithPlayerMailText;
break;
}
@@ -665,8 +665,8 @@ static void Mailbox_ProcessInput(u8 taskId)
static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId)
{
- StringCopy(gStringVar1, gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos].playerName);
- sub_81DB554(gStringVar1, 0);
+ StringCopy(gStringVar1, gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos].playerName);
+ ConvertInternationalPlayerNameStripChar(gStringVar1, CHAR_SPACE);
StringExpandPlaceholders(gStringVar4, gText_WhatToDoWithVar1sMail);
DisplayItemMessageOnField(taskId, gStringVar4, Mailbox_PrintMailOptions);
}
@@ -686,7 +686,7 @@ static void Mailbox_ReturnToPlayerPC(u8 taskId)
static void Mailbox_PrintMailOptions(u8 taskId)
{
u8 r4 = sub_81D1C84(2);
- PrintMenuTable(r4, 4, gMailboxMailOptions);
+ PrintMenuTable(r4, ARRAY_COUNT(gMailboxMailOptions), gMailboxMailOptions);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(r4, 4, 0);
ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Mailbox_MailOptionsProcessInput;
@@ -724,7 +724,7 @@ static void Mailbox_FadeAndReadMail(u8 taskId)
{
sub_81D1EC0();
CleanupOverworldWindowsAndTilemaps();
- ReadMail(&(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos]), Mailbox_ReturnToFieldFromReadMail, TRUE);
+ ReadMail(&(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos]), Mailbox_ReturnToFieldFromReadMail, TRUE);
DestroyTask(taskId);
}
}
@@ -785,7 +785,7 @@ static void Mailbox_MoveToBagYesNoPrompt(u8 taskId)
static void Mailbox_DoMailMoveToBag(u8 taskId)
{
- struct MailStruct *mailStruct = &(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos]);
+ struct MailStruct *mailStruct = &(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos]);
if (!AddBagItem(mailStruct->itemId, 1))
{
DisplayItemMessageOnField(taskId, gText_BagIsFull, Mailbox_Cancel);
@@ -874,7 +874,7 @@ static void sub_816BC14(void)
gUnknown_0203BCC4 = AllocZeroed(sizeof(struct Struct203BCC4));
memset(gUnknown_0203BCC4->windowIds, 0xFF, 0x6);
gUnknown_0203BCC4->unk666 = 0xFF;
- gUnknown_0203BCC4->spriteId = 0xFF;
+ gUnknown_0203BCC4->spriteId = SPRITE_NONE;
}
static void sub_816BC58(void)
@@ -889,7 +889,7 @@ static void sub_816BC58(void)
static u8 sub_816BC7C(u8 a)
{
u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]);
- if (*windowIdLoc == 0xFF)
+ if (*windowIdLoc == WINDOW_NONE)
{
*windowIdLoc = AddWindow(&gUnknown_085DFF5C[a]);
DrawStdFrameWithCustomTileAndPalette(*windowIdLoc, FALSE, 0x214, 0xE);
@@ -901,13 +901,13 @@ static u8 sub_816BC7C(u8 a)
static void sub_816BCC4(u8 a)
{
u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]);
- if (*windowIdLoc != 0xFF)
+ if (*windowIdLoc != WINDOW_NONE)
{
ClearStdWindowAndFrameToTransparent(*windowIdLoc, FALSE);
ClearWindowTilemap(*windowIdLoc);
ScheduleBgCopyTilemapToVram(0);
RemoveWindow(*windowIdLoc);
- *windowIdLoc = 0xFF;
+ *windowIdLoc = WINDOW_NONE;
}
}
@@ -983,16 +983,16 @@ static void sub_816BEF0(s32 id)
static void ItemStorage_StartScrollIndicator(void)
{
- if (playerPCItemPageInfo.scrollIndicatorId == 0xFF)
- playerPCItemPageInfo.scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove));
+ if (playerPCItemPageInfo.scrollIndicatorTaskId == TASK_NONE)
+ playerPCItemPageInfo.scrollIndicatorTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove));
}
static void ItemStorage_RemoveScrollIndicator(void)
{
- if (playerPCItemPageInfo.scrollIndicatorId != 0xFF)
+ if (playerPCItemPageInfo.scrollIndicatorTaskId != TASK_NONE)
{
- RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId);
- playerPCItemPageInfo.scrollIndicatorId = 0xFF;
+ RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorTaskId);
+ playerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
}
}
@@ -1015,7 +1015,7 @@ static void sub_816C060(u16 itemId)
u8 spriteId;
u8* spriteIdLoc = &(gUnknown_0203BCC4->spriteId);
- if (*spriteIdLoc == 0xFF)
+ if (*spriteIdLoc == SPRITE_NONE)
{
FreeSpriteTilesByTag(0x13F6);
FreeSpritePaletteByTag(0x13F6);
@@ -1033,12 +1033,12 @@ static void sub_816C060(u16 itemId)
static void sub_816C0C8(void)
{
u8* spriteIdLoc = &(gUnknown_0203BCC4->spriteId);
- if (*spriteIdLoc != 0xFF)
+ if (*spriteIdLoc != SPRITE_NONE)
{
FreeSpriteTilesByTag(0x13F6);
FreeSpritePaletteByTag(0x13F6);
DestroySprite(&(gSprites[*spriteIdLoc]));
- *spriteIdLoc = 0xFF;
+ *spriteIdLoc = SPRITE_NONE;
}
}
@@ -1058,7 +1058,6 @@ static void ItemStorage_ProcessWithdrawTossInput(u8 taskId)
s16 *data;
bool32 toss;
u32 i, x;
- u8 windowId;
const u8* text;
data = gTasks[taskId].data;
@@ -1187,7 +1186,7 @@ static void ItemStorage_GoBackToPlayerPCMenu(u8 taskId)
sub_816C0C8();
ItemStorage_RemoveScrollIndicator();
DestroyListMenuTask(data[5], NULL, NULL);
- sub_81223B0(gUnknown_0203BCC4->spriteIds, 7);
+ DestroySwapLineSprites(gUnknown_0203BCC4->spriteIds, 7);
sub_816BC58();
gTasks[taskId].func = ItemStorage_GoBackToPlayerPCMenu_InitStorage;
}
@@ -1200,7 +1199,7 @@ static void ItemStorage_ItemSwapChoosePrompt(u8 taskId)
ListMenuSetUnkIndicatorsStructField(data[5], 16, 1);
gUnknown_0203BCC4->unk666 = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos);
sub_816BFB8(data[5], 0, 0);
- sub_816C690(gUnknown_0203BCC4->unk666);
+ UpdateSwapLinePos(gUnknown_0203BCC4->unk666);
CopyItemName(gSaveBlock1Ptr->pcItems[gUnknown_0203BCC4->unk666].itemId, gStringVar1);
ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_SWITCH_WHICH_ITEM));
gTasks[taskId].func = sub_816C4FC;
@@ -1220,8 +1219,8 @@ static void sub_816C4FC(u8 taskId)
}
id = ListMenu_ProcessInput(data[5]);
ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
- sub_81223FC(gUnknown_0203BCC4->spriteIds, 7, 0);
- sub_816C690(playerPCItemPageInfo.cursorPos);
+ SetSwapLineSpritesInvisibility(gUnknown_0203BCC4->spriteIds, 7, FALSE);
+ UpdateSwapLinePos(playerPCItemPageInfo.cursorPos);
switch(id)
{
case LIST_NOTHING_CHOSEN:
@@ -1246,7 +1245,6 @@ static void ItemStorage_DoItemSwap(u8 taskId, bool8 a)
{
s16 *data;
u16 b;
- u8 c;
data = gTasks[taskId].data;
b = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos);
@@ -1254,31 +1252,27 @@ static void ItemStorage_DoItemSwap(u8 taskId, bool8 a)
DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
if (!a)
{
- c = gUnknown_0203BCC4->unk666;
- if (c != b)
+ if (gUnknown_0203BCC4->unk666 != b)
{
- if (c != b - 1)
+ if (gUnknown_0203BCC4->unk666 != b - 1)
{
- MoveItemSlotInList(gSaveBlock1Ptr->pcItems, c, b);
+ MoveItemSlotInList(gSaveBlock1Ptr->pcItems, gUnknown_0203BCC4->unk666, b);
ItemStorage_RefreshListMenu();
}
}
- else
- goto LABEL_SKIP_CURSOR_DECREMENT;
}
if (gUnknown_0203BCC4->unk666 < b)
playerPCItemPageInfo.cursorPos--;
- LABEL_SKIP_CURSOR_DECREMENT:
- sub_81223FC(gUnknown_0203BCC4->spriteIds, 7, 1);
+ SetSwapLineSpritesInvisibility(gUnknown_0203BCC4->spriteIds, 7, TRUE);
gUnknown_0203BCC4->unk666 = 0xFF;
data[5] = ListMenuInit(&gMultiuseListMenuTemplate, playerPCItemPageInfo.itemsAbove, playerPCItemPageInfo.cursorPos);
ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = ItemStorage_ProcessInput;
}
-static void sub_816C690(u8 a)
+static void UpdateSwapLinePos(u8 y)
{
- sub_8122448(gUnknown_0203BCC4->spriteIds, 7, 128, ((a+1) * 16));
+ UpdateSwapLineSpritesPos(gUnknown_0203BCC4->spriteIds, 7, 128, ((y+1) * 16));
}
static void sub_816C6BC(u8 windowId, u16 value, u32 mode, u8 x, u8 y, u8 n)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 23:28:43 +0000