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/battle_factory_screen.c | |
| parent | 3181c64c64afa47b3adc04f325ad3798c8c324ec (diff) | |
| parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) | |
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'src/battle_factory_screen.c')
| -rw-r--r-- | src/battle_factory_screen.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 85c0b2808..367c1401f 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -385,10 +385,10 @@ static const struct OamData gUnknown_0861047C = .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 = 3, .paletteNum = 0, @@ -402,10 +402,10 @@ static const struct OamData gUnknown_08610484 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -419,10 +419,10 @@ static const struct OamData gUnknown_0861048C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -436,10 +436,10 @@ static const struct OamData gUnknown_08610494 = .objMode = 1, .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 = 0, |