diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
| commit | bbe876153c2a0903a30b37734874bf63ca6d8a10 (patch) | |
| tree | 7efa03650e784e7ff6ac7d479b5315194a4081fb /src/battle/battle_controller_opponent.c | |
| parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
| parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) | |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'src/battle/battle_controller_opponent.c')
| -rw-r--r-- | src/battle/battle_controller_opponent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index ee313c098..a7e99900b 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -74,7 +74,7 @@ extern u8 GetBattlerPosition(u8); extern void sub_8032984(u8, u16); extern void sub_80333D4(void); extern void sub_80312F0(struct Sprite *); -extern u8 sub_8046400(); +extern u8 StartSendOutMonAnimation(); extern void sub_8032A08(); extern void sub_8043DB0(); extern void sub_8033160(void); @@ -1168,7 +1168,7 @@ void sub_803495C(u8 a, u8 b) StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]); gSprites[gBankSpriteIds[a]].invisible = TRUE; gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE); + gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFE); } void OpponentHandleReturnPokeToBall(void) |