diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:31:04 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:54:27 -0600 |
commit | 2592803460fcaeb2dd804080eb8770c85613773e (patch) | |
tree | ba53079591d9629dcf4672b544f13651f346d425 /src/battle_controller_wally.c | |
parent | cd994f4935b9de81383d8e0a17d790414652a4d6 (diff) | |
parent | b2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff) |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'src/battle_controller_wally.c')
-rw-r--r-- | src/battle_controller_wally.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 2d5eb69fd..c0b496e47 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1464,7 +1464,7 @@ static void sub_816AA80(u8 battlerId) gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), - GetBattlerSubpriority(battlerId)); + GetBattlerSpriteSubpriority(battlerId)); gSprites[gUnknown_03005D7C[battlerId]].data[1] = gBattlerSpriteIds[battlerId]; gSprites[gUnknown_03005D7C[battlerId]].data[2] = battlerId; |