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/ring.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/ring.c')
| -rw-r--r-- | src/battle/anim/ring.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index 398671249..69e903921 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -10,7 +10,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; void sub_80D0FD8(struct Sprite* sprite); void sub_80D10B8(struct Sprite* sprite); @@ -284,23 +284,23 @@ void sub_80D10B8(struct Sprite* sprite) { r9 = GetBattlerSpriteCoord(bankr7, r10) + gBattleAnimArgs[0]; if (IsAnimBankSpriteVisible(bankr8 ^ 2)) - sprite->subpriority = gSprites[gBankSpriteIds[bankr8 ^ 2]].subpriority - 1; + sprite->subpriority = gSprites[gBattlerSpriteIds[bankr8 ^ 2]].subpriority - 1; else - sprite->subpriority = gSprites[gBankSpriteIds[bankr8]].subpriority - 1; + sprite->subpriority = gSprites[gBattlerSpriteIds[bankr8]].subpriority - 1; } else { r9 = GetBattlerSpriteCoord(bankr7, r10) - gBattleAnimArgs[0]; if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2)) { - if (gSprites[gBankSpriteIds[bankr7]].pos1.x < gSprites[gBankSpriteIds[bankr7 ^ 2]].pos1.x) - sprite->subpriority = gSprites[gBankSpriteIds[bankr7 ^ 2]].subpriority + 1; + if (gSprites[gBattlerSpriteIds[bankr7]].pos1.x < gSprites[gBattlerSpriteIds[bankr7 ^ 2]].pos1.x) + sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7 ^ 2]].subpriority + 1; else - sprite->subpriority = gSprites[gBankSpriteIds[bankr7]].subpriority - 1; + sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7]].subpriority - 1; } else { - sprite->subpriority = gSprites[gBankSpriteIds[bankr7]].subpriority - 1; + sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7]].subpriority - 1; } } |