diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 23:50:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 23:50:49 -0600 |
| commit | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (patch) | |
| tree | 8e3e5ab774b89399bf91e9ca110f270fa9bfffde /src/battle/anim/heated_rock.c | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
| parent | c21bde059812ed521952512e4d800038e0e1deb7 (diff) | |
Merge pull request #502 from huderlem/misc_ports
Misc ports from pokeemerald
Diffstat (limited to 'src/battle/anim/heated_rock.c')
| -rw-r--r-- | src/battle/anim/heated_rock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c index 1d59669cf..51cfbd007 100644 --- a/src/battle/anim/heated_rock.c +++ b/src/battle/anim/heated_rock.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; void sub_80D59B0(struct Sprite *); @@ -28,7 +28,7 @@ u16 sub_80D5940(u8 spriteId) { u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { var1 = ((var1 << 16) + 0x4A0000) >> 16; } @@ -198,7 +198,7 @@ static void sub_80D5A74(struct Sprite *sprite) if (++sprite->data[3] > 16) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } |