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/tile.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/tile.c')
| -rw-r--r-- | src/battle/anim/tile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index 34695ecf4..2775eba97 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern u8 gBattlersCount; -extern u8 gHealthboxIDs[]; +extern u8 gHealthboxSpriteIds[]; void sub_80CE09C(struct Sprite* sprite); void sub_80CE17C(struct Sprite* sprite); @@ -198,10 +198,10 @@ void unref_sub_80CE260(u8 taskId) for (i = 0; i < gBattlersCount; i++) { if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == 0) - sub_8043DB0(gHealthboxIDs[i]); + sub_8043DB0(gHealthboxSpriteIds[i]); if (gBattleAnimArgs[1] == 1 && GetBattlerSide(i) == 1) - sub_8043DB0(gHealthboxIDs[i]); + sub_8043DB0(gHealthboxSpriteIds[i]); } DestroyAnimVisualTask(taskId); @@ -212,7 +212,7 @@ void unref_sub_80CE2D4(u8 taskId) u8 i; for (i = 0; i < gBattlersCount; i++) { - sub_8043DFC(gHealthboxIDs[i]); + sub_8043DFC(gHealthboxSpriteIds[i]); } DestroyAnimVisualTask(taskId); |