diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:22:47 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:22:47 -0400 |
| commit | 37c7441a158f1c7046034a32eab8e1cbd79c69b9 (patch) | |
| tree | abb77f18cf12ba633407e20bbcadf65773a21c74 /src/item_menu_icons.c | |
| parent | 23ac2cc94e2914a427e97467103c0160af6f1be0 (diff) | |
| parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) | |
Merge branch 'master' into contest-data
Diffstat (limited to 'src/item_menu_icons.c')
| -rw-r--r-- | src/item_menu_icons.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 669195b33..83ed3abfe 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -36,10 +36,10 @@ static const struct OamData sOamData_857FAA4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -146,10 +146,10 @@ static const struct OamData sOamData_857FB64 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 4, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -217,10 +217,10 @@ static const struct OamData sOamData_857FBC8 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 7, @@ -234,10 +234,10 @@ static const struct OamData sOamData_857FBD0 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 7, @@ -374,10 +374,10 @@ static const struct OamData sOamData_857FDFC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, |