dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-playerpc

Browse Source
This commit is contained in:
GriffinR
2021-08-02 14:08:10 -04:00
committed by GitHub
parent 06b909bcd8 d391486247
commit bd5cf07059
1050 changed files with 51407 additions and 50700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/player_pc.c
View File

@@ -174,7 +174,7 @@ static void ItemStorage_DrawItemIcon(u16 itemId);
static void ItemStorage_PrintDescription(s32 id);
static void ItemStorage_EraseMainMenu(u8 taskId);
static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu * thisMenu);
static void ItemStorage_PrintMenuItem(u8 windowId, s32 id, u8 yOffset);
static void ItemStorage_PrintMenuItem(u8 windowId, u32 id, u8 yOffset);
static EWRAM_DATA const u8 *sTopMenuOptionOrder = NULL;
static EWRAM_DATA u8 sTopMenuNumOptions = 0;
@@ -1020,7 +1020,7 @@ static void ItemStorage_MoveCursor(s32 id, bool8 onInit, struct ListMenu *list)
}
}
static void ItemStorage_PrintMenuItem(u8 windowId, s32 id, u8 yOffset)
static void ItemStorage_PrintMenuItem(u8 windowId, u32 id, u8 yOffset)
{
if (id != LIST_CANCEL)
{
@@ -1099,8 +1099,8 @@ static void ItemStorage_DrawItemIcon(u16 itemId)
{
*spriteIdLoc = spriteId;
gSprites[spriteId].oam.priority = 0;
gSprites[spriteId].pos2.x = 24;
gSprites[spriteId].pos2.y = 80;
gSprites[spriteId].x2 = 24;
gSprites[spriteId].y2 = 80;
}
}
}