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_wally.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_wally.c')
-rw-r--r-- | src/battle/battle_controller_wally.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index a7ce7d27d..fa8b2a63b 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -91,7 +91,7 @@ extern void StoreSpriteCallbackInData(); extern u8 StartSendOutMonAnimation(); extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void sub_80312F0(struct Sprite *); extern bool8 move_anim_start_t3(); @@ -1510,7 +1510,7 @@ void sub_81398BC(u8 bank) &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; |