Merge pull request #1506 from GriffinRichards/single-doc

Document some single-remaining symbols
This commit is contained in:
GriffinR
2021-09-29 00:10:09 -04:00
committed by GitHub
35 changed files with 329 additions and 286 deletions
+17 -9
View File
@@ -562,23 +562,31 @@ void UpdateItemMenuSwapLinePos(u8 y)
UpdateSwapLineSpritesPos(&gBagMenu->spriteIds[ITEMMENUSPRITE_SWAP_LINE], ITEMMENU_SWAP_LINE_LENGTH | SWAP_LINE_HAS_MARGIN, 120, (y + 1) * 16);
}
static void sub_80D5018(void *mem0, void *mem1)
static void ArrangeBerryGfx(void *src, void *dest)
{
u8 i, j;
memset(mem1, 0, 0x800);
mem1 += 0x100;
memset(dest, 0, 0x800);
// Create top margin
dest += 0x100;
for (i = 0; i < 6; i++)
{
mem1 += 0x20;
// Create left margin
dest += 0x20;
// Copy one row of berry's icon
for (j = 0; j < 6; j++)
{
memcpy(mem1, mem0, 0x20);
mem1 += 0x20;
mem0 += 0x20;
memcpy(dest, src, 0x20);
dest += 0x20;
src += 0x20;
}
// Create right margin
if (i != 5)
mem1 += 0x20;
dest += 0x20;
}
}
@@ -595,7 +603,7 @@ static void LoadBerryGfx(u8 berryId)
pal.tag = TAG_BERRY_PIC_PAL;
LoadCompressedSpritePalette(&pal);
LZDecompressWram(sBerryPicTable[berryId].tiles, &gDecompressionBuffer[0x1000]);
sub_80D5018(&gDecompressionBuffer[0x1000], &gDecompressionBuffer[0]);
ArrangeBerryGfx(&gDecompressionBuffer[0x1000], &gDecompressionBuffer[0]);
}
u8 CreateBerryTagSprite(u8 id, s16 x, s16 y)