diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
commit | 9e4bf55716fb5a27bc2f6eee4a489e48327eac3f (patch) | |
tree | 8b31e761c5b2b03e2b5200baec6755f6a3273fe5 /src/battle/anim/glow.c | |
parent | f150a5cd9f15c368a3e520168b56acd3628d6852 (diff) | |
parent | ed5847cb41c48357d83b92823e08393a1ca54bdd (diff) |
Merge remote-tracking branch 'upstream/master' into nakamura
Diffstat (limited to 'src/battle/anim/glow.c')
-rw-r--r-- | src/battle/anim/glow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c index 63466c0ff..174655080 100644 --- a/src/battle/anim/glow.c +++ b/src/battle/anim/glow.c @@ -13,7 +13,7 @@ extern u8 gAnimBankTarget; extern u16 gUnknown_083D7A5C[5]; -extern struct INCBIN_U8 gBattleAnimSpritePalette_206; +extern const u8 gBattleAnimSpritePalette_206[]; // glow (a whitening effect where the Pokemon glows white in a cycle.) // Used in Heal Bell. |