diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:27:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:27:50 -0500 |
| commit | 3f5936239785c8dae923e1f5c4bb91492e67cb5a (patch) | |
| tree | cb0c74dc4a2c09551e1b6699b7c71ed7dc7c85d7 /src/field_effect.c | |
| parent | 763724a98046c81da15dd5a5877ad30adb8129ba (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-pokejump
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 467a0f656..162a530ca 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3703,8 +3703,8 @@ static void DestroyDeoxysRockEffect_RockFragments(s16* data, u8 taskId) { struct Sprite *sprite = &gSprites[gObjectEvents[tObjectEventId].spriteId]; gObjectEvents[tObjectEventId].invisible = TRUE; - BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); - BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); + BlendPalettes(PALETTES_BG, 0x10, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_BG, 0, 0x10, 0, RGB_WHITE); CreateDeoxysRockFragments(sprite); PlaySE(SE_THUNDER); StartEndingDeoxysRockCameraShake(tCameraTaskId); |