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/field_effect_helpers.c | |
parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) |
Merge master into ObjEvent rename
Diffstat (limited to 'src/field_effect_helpers.c')
-rwxr-xr-x | src/field_effect_helpers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 9c38b61f5..52c30ab0f 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -129,7 +129,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->oam.paletteNum = gReflectionEffectPaletteMap[mainSprite->oam.paletteNum]; reflectionSprite->oam.shape = mainSprite->oam.shape; reflectionSprite->oam.size = mainSprite->oam.size; - reflectionSprite->oam.matrixNum = mainSprite->oam.matrixNum | 0x10; + reflectionSprite->oam.matrixNum = mainSprite->oam.matrixNum | ST_OAM_VFLIP; reflectionSprite->oam.tileNum = mainSprite->oam.tileNum; reflectionSprite->subspriteTables = mainSprite->subspriteTables; reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum; @@ -153,7 +153,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) // matrix based on whether or not the main sprite is horizontally flipped. // If the sprite is facing to the east, then it is flipped, and its matrixNum is 8. reflectionSprite->oam.matrixNum = 0; - if (mainSprite->oam.matrixNum & 0x8) + if (mainSprite->oam.matrixNum & ST_OAM_HFLIP) reflectionSprite->oam.matrixNum = 1; } } |