diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-30 13:42:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-30 13:42:55 -0700 |
commit | 74f9ec9464e5346ae277c9c929ef4b965276fc02 (patch) | |
tree | 6e12c5e3f456ad444d37853f0bb8e0a03bd85003 /src/battle/anim/note_rain.c | |
parent | e437b10eee6f843e1898ce9b0302afb17f8b81e9 (diff) | |
parent | d68e8b09eecd136fc0dcc32c1e08b946b8981adc (diff) |
Merge pull request #608 from huderlem/anim_rodata
Move battle anim .rodata
Diffstat (limited to 'src/battle/anim/note_rain.c')
-rw-r--r-- | src/battle/anim/note_rain.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c index 4e12c7e1a..26ae96c3a 100644 --- a/src/battle/anim/note_rain.c +++ b/src/battle/anim/note_rain.c @@ -8,30 +8,5 @@ extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; -extern u16 gUnknown_083D7A5C[5]; - // note_rain (notes rain from a source point, usually a bell.) // Used in Heal Bell. - -void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b) -{ - u8 tile; - tile = (b & 1); - tile = ((-tile | tile) >> 31) & 32; - sprite->oam.tileNum += tile + (a << 2); - sprite->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_083D7A5C[b >> 1]); -} - -void sub_80D1C08(struct Sprite* sprite) -{ - InitAnimSpritePos(sprite, 0); - if (GetBattlerSide(gAnimBankAttacker) != 0) - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - - sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; - StoreSpriteCallbackInData(sprite, DestroyAnimSprite); - sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); -} |