diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-04 22:26:43 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-12-06 19:05:44 -0600 |
| commit | c26e8b8ddb946b8865d5157922f0d4cb274e4fbf (patch) | |
| tree | 901ea62ee2ac72d9296b93c24af2af6745d5877f /src | |
| parent | 27567719586859201cab665f9406ef8f39a39748 (diff) | |
More SPRITE macro usage
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_factory_screen.c | 16 | ||||
| -rwxr-xr-x | src/pokemon_jump.c | 4 | ||||
| -rw-r--r-- | src/trainer_pokemon_sprites.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 8c2f088d4..0d1dbb077 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -636,10 +636,10 @@ static const struct OamData gUnknown_086106D8 = .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -653,10 +653,10 @@ static const struct OamData gUnknown_086106E0 = .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -670,10 +670,10 @@ static const struct OamData gUnknown_086106E8 = .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -687,10 +687,10 @@ static const struct OamData gUnknown_086106F0 = .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 25968d974..b876fdb68 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3557,8 +3557,8 @@ static void sub_802DD08(void) struct UnkStruct3 unkStruct; struct UnkStruct3 *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why. - ptr->shape = 0; - ptr->size = 0; + ptr->shape = SPRITE_SHAPE(8x8); + ptr->size = SPRITE_SIZE(8x8); ptr->field_0_0 = 0; ptr->priority = 1; ptr->field_1 = 5; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index f360ec84c..99a3fd4c5 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -41,7 +41,7 @@ static const struct OamData gUnknown_0860B064 = static const struct OamData gUnknown_0860B06C = { - .affineMode = 1, + .affineMode = ST_OAM_AFFINE_NORMAL, .shape = SPRITE_SHAPE(64x64), .size = SPRITE_SIZE(64x64) }; |