diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/battle/anim/dragon.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
Diffstat (limited to 'src/battle/anim/dragon.c')
| -rw-r--r-- | src/battle/anim/dragon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index b59e8aff4..6ac0746a3 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -8,11 +8,11 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u8 gBankAttacker; +extern u8 gBattlerAttacker; extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; extern u16 gUnknown_03000730[]; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; void sub_80DF5A0(struct Sprite *sprite); void sub_80DF760(struct Sprite *sprite); @@ -286,8 +286,8 @@ void sub_80DF78C(struct Sprite *sprite) sprite->data[4] = 0; sprite->data[5] = 1; sprite->data[6] = gBattleAnimArgs[0]; - r5 = GetBattlerSpriteCoordAttr(gBankAttacker, 0); - r0 = GetBattlerSpriteCoordAttr(gBankAttacker, 1); + r5 = GetBattlerSpriteCoordAttr(gBattlerAttacker, 0); + r0 = GetBattlerSpriteCoordAttr(gBattlerAttacker, 1); if (r5 > r0) sprite->data[7] = r5 / 2; else |