diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:17 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:33 -0500 |
| commit | b93101bbebaae9be44b9b4ada81766264135cca9 (patch) | |
| tree | 73373641b7f1eed21c4c5d9423cd5668ab8c4a27 /src/rock.c | |
| parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
| parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/rock.c')
| -rw-r--r-- | src/rock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rock.c b/src/rock.c index 7bba6f603..28566f1b7 100644 --- a/src/rock.c +++ b/src/rock.c @@ -136,8 +136,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8596BA0 = const struct Subsprite gUnknown_08596BB8[] = { - {.x = -16, .y = 0, .shape = ST_OAM_H_RECTANGLE, .size = 2, .tileOffset = 0, .priority = 1}, - {.x = 16, .y = 0, .shape = ST_OAM_H_RECTANGLE, .size = 2, .tileOffset = 8, .priority = 1}, + {.x = -16, .y = 0, .shape = SPRITE_SHAPE(32x16), .size = SPRITE_SIZE(32x16), .tileOffset = 0, .priority = 1}, + {.x = 16, .y = 0, .shape = SPRITE_SHAPE(32x16), .size = SPRITE_SIZE(32x16), .tileOffset = 8, .priority = 1}, }; const struct SubspriteTable gUnknown_08596BC0[] = |