diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-17 17:01:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 17:01:38 -0500 |
| commit | 6467ff26999d89252092d727f507f8b4b562c25c (patch) | |
| tree | 8c952a7748119de80a36aee062bd953bd02fbb66 /src/battle/battle_controller_linkopponent.c | |
| parent | 09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (diff) | |
| parent | 2ac92e38ffa627b49ce2c634b35d1a0e1835f0af (diff) | |
Merge pull request #697 from garakmon/battle-scrcmd-labels
Battle scrcmd labels
Diffstat (limited to 'src/battle/battle_controller_linkopponent.c')
| -rw-r--r-- | src/battle/battle_controller_linkopponent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index f9c8fe7d1..117aeb932 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -55,7 +55,7 @@ extern MainCallback gPreBattleCallback1; extern struct MusicPlayerInfo gMPlay_BGM; extern u8 sub_8077F68(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern u8 GetBattlerPosition(u8); extern void BattleLoadOpponentMonSprite(struct Pokemon *, u8); extern void sub_8037A74(void); @@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void) &gUnknown_02024E8C, GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; @@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b) &gUnknown_02024E8C, GetBattlerSpriteCoord(a, 2), sub_8077F68(a), - sub_8079E90(a)); + GetBattlerSubpriority(a)); gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a]; gSprites[gBankSpriteIds[a]].data[0] = a; gSprites[gBankSpriteIds[a]].data[2] = species; @@ -1258,7 +1258,7 @@ void LinkOpponentHandleTrainerThrow(void) gBankSpriteIds[gActiveBattler] = CreateSprite( &gUnknown_02024E8C, 176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag); |