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_player.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_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index de8b1579b..5d7a8955c 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -121,7 +121,7 @@ extern u8 GetBattlerPosition(u8); extern void LoadPlayerTrainerBankSprite(); extern void sub_80313A0(struct Sprite *); extern void sub_802D204(void); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void sub_802DEAC(void); extern void sub_80312F0(struct Sprite *); extern u8 GetBattlerSpriteCoord(); @@ -2515,7 +2515,7 @@ void sub_802F934(u8 bank, u8 b) &gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), sub_8077F68(bank), - sub_8079E90(bank)); + GetBattlerSubpriority(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank]; gSprites[gBankSpriteIds[bank]].data[0] = bank; gSprites[gBankSpriteIds[bank]].data[2] = species; @@ -2582,7 +2582,7 @@ void PlayerHandleTrainerThrow(void) &gUnknown_02024E8C, r7 + 80, (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80, - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2; |