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/rotating_gate.c | |
parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) |
Merge master into ObjEvent rename
Diffstat (limited to 'src/rotating_gate.c')
-rw-r--r-- | src/rotating_gate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 44d291dc4..340fc58dd 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -233,7 +233,7 @@ static const struct OamData sOamData_RotatingGateLarge = { .y = 0, .affineMode = ST_OAM_AFFINE_NORMAL, - .objMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), @@ -250,7 +250,7 @@ static const struct OamData sOamData_RotatingGateRegular = { .y = 0, .affineMode = ST_OAM_AFFINE_NORMAL, - .objMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), |