diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-15 00:40:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 00:40:47 -0400 |
| commit | e129d04b931a4fc0e6584b4340dc57b9162264d5 (patch) | |
| tree | a6ae1eb111f652b1cfffdd9a4bccba4a65a0de35 /src/pokeball.c | |
| parent | ebb6c4ee661758874972956a94eb06d38eaa18a8 (diff) | |
| parent | 3c356a1d7af543d84c06f28f670b6ddc4b27fdd6 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/pokeball.c')
| -rw-r--r-- | src/pokeball.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokeball.c b/src/pokeball.c index d473f9ba0..1a0561c33 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -798,9 +798,9 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], 1); if (GetBattlerSide(sprite->sBattler) == B_SIDE_OPPONENT) - gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = sub_8039B58; + gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCb_OpponentMonFromBall; else - gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = sub_8039E44; + gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCb_PlayerMonFromBall; AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]); gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] = 0x1000; |