diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-17 15:59:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 15:59:08 -0600 |
| commit | 26bfd93b3599b76b0d0edad441fe79f261e4d04e (patch) | |
| tree | df73355f94e2f7fb78cc2c4b02c33291df187944 /src/battle_controller_opponent.c | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
| parent | 60484153a5630bfe88c1623b7ec1cf7052d67752 (diff) | |
Merge pull request #451 from shinny456/master
decompile electric.s
Diffstat (limited to 'src/battle_controller_opponent.c')
| -rw-r--r-- | src/battle_controller_opponent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index c057e8575..516e7192a 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1128,7 +1128,7 @@ static void OpponentHandleLoadMonSprite(void) gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), - sub_80A82E4(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler; @@ -1163,7 +1163,7 @@ static void sub_80613DC(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), - sub_80A82E4(battlerId)); + GetBattlerSubpriority(battlerId)); gSprites[gBattlerSpriteIds[battlerId]].data[0] = battlerId; gSprites[gBattlerSpriteIds[battlerId]].data[2] = species; @@ -1293,7 +1293,7 @@ static void OpponentHandleDrawTrainerPic(void) gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, - sub_80A82E4(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2; |