ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix player_pc goto

Browse Source
This commit is contained in:
Kurausukun 2021-05-09 01:17:52 -04:00 committed by huderlem
parent 0c7773ad75
commit 3b7f708eb0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/player_pc.c
View File

@ -1245,7 +1245,6 @@ static void ItemStorage_DoItemSwap(u8 taskId, bool8 a)
{ {
s16 *data; s16 *data;
u16 b; u16 b;
u8 c;
data = gTasks[taskId].data; data = gTasks[taskId].data;
b = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos); b = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos);
@ -1253,21 +1252,17 @@ static void ItemStorage_DoItemSwap(u8 taskId, bool8 a)
DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
if (!a) if (!a)
{ {
c = gUnknown_0203BCC4->unk666; if (gUnknown_0203BCC4->unk666 != b)
if (c != 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(); ItemStorage_RefreshListMenu();
} }
} }
else
goto LABEL_SKIP_CURSOR_DECREMENT;
} }
if (gUnknown_0203BCC4->unk666 < b) if (gUnknown_0203BCC4->unk666 < b)
playerPCItemPageInfo.cursorPos--; playerPCItemPageInfo.cursorPos--;
LABEL_SKIP_CURSOR_DECREMENT:
SetSwapLineSpritesInvisibility(gUnknown_0203BCC4->spriteIds, 7, TRUE); SetSwapLineSpritesInvisibility(gUnknown_0203BCC4->spriteIds, 7, TRUE);
gUnknown_0203BCC4->unk666 = 0xFF; gUnknown_0203BCC4->unk666 = 0xFF;
data[5] = ListMenuInit(&gMultiuseListMenuTemplate, playerPCItemPageInfo.itemsAbove, playerPCItemPageInfo.cursorPos); data[5] = ListMenuInit(&gMultiuseListMenuTemplate, playerPCItemPageInfo.itemsAbove, playerPCItemPageInfo.cursorPos);