diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
| commit | cd069446e06c277222be0aaa05fb43b090259234 (patch) | |
| tree | a740e2042ff6af3465cfdaa15fc29c35269cfa70 /src/item_icon.c | |
| parent | 3181c64c64afa47b3adc04f325ad3798c8c324ec (diff) | |
| parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) | |
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'src/item_icon.c')
| -rw-r--r-- | src/item_icon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/item_icon.c b/src/item_icon.c index e9379dbba..91c32951a 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -20,10 +20,10 @@ static const struct OamData sOamData_ItemIcon = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 2, @@ -122,7 +122,7 @@ u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId) } } -u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId) +u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId) { if (!AllocItemIconTemporaryBuffers()) { |