diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-18 12:20:35 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-10-18 12:54:29 -0400 |
| commit | b31bddddca327bd15cc022717d19ace43b435ac2 (patch) | |
| tree | 458aad0ac09d04c69f50f3f9993bb286feb47fab /src/field_effect_helpers.c | |
| parent | 7590bacec1362cd3d339aa422ced50bb57f6cca0 (diff) | |
Clean up metatile_behavior
Diffstat (limited to 'src/field_effect_helpers.c')
| -rwxr-xr-x | src/field_effect_helpers.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 0a0e465a8..0acb15863 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -71,9 +71,15 @@ static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent) static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *reflectionSprite) { u8 bridgeType; - u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; + u16 bridgeReflectionVerticalOffsets[] = { + [BRIDGE_TYPE_POND_LOW - 1] = 12, + [BRIDGE_TYPE_POND_MED - 1] = 28, + [BRIDGE_TYPE_POND_HIGH - 1] = 44 + }; reflectionSprite->sReflectionVerticalOffset = 0; - if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) + if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad + && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) + || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) { reflectionSprite->sReflectionVerticalOffset = bridgeReflectionVerticalOffsets[bridgeType - 1]; LoadObjectHighBridgeReflectionPalette(objectEvent, reflectionSprite->oam.paletteNum); |