summaryrefslogtreecommitdiff
path: root/src/pokeball.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokeball.c')
-rw-r--r--src/pokeball.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pokeball.c b/src/pokeball.c
index a065be3f0..b176677bd 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -406,7 +406,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
gSprites[ballSpriteId].oam.affineParam = taskId;
gTasks[taskId].tOpponentBattler = gBattlerTarget;
gTasks[taskId].func = TaskDummy;
- PlaySE(SE_NAGERU);
+ PlaySE(SE_BALL_THROW);
}
static void SpriteCB_TestBallThrow(struct Sprite *sprite)
@@ -464,7 +464,7 @@ static void sub_807574C(struct Sprite *sprite)
{
sprite->data[5]++;
if (sprite->data[5] == 11)
- PlaySE(SE_SUIKOMU);
+ PlaySE(SE_BALL_TRADE);
if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded)
{
StartSpriteAnim(sprite, 2);
@@ -514,16 +514,16 @@ static void sub_8075838(struct Sprite *sprite)
switch (sprite->data[3] >> 8)
{
case 1:
- PlaySE(SE_KON);
+ PlaySE(SE_BALL_BOUNCE_1);
break;
case 2:
- PlaySE(SE_KON2);
+ PlaySE(SE_BALL_BOUNCE_2);
break;
case 3:
- PlaySE(SE_KON3);
+ PlaySE(SE_BALL_BOUNCE_3);
break;
default:
- PlaySE(SE_KON4);
+ PlaySE(SE_BALL_BOUNCE_4);
break;
}
}
@@ -565,7 +565,7 @@ static void sub_8075930(struct Sprite *sprite)
sprite->affineAnimPaused = TRUE;
StartSpriteAffineAnim(sprite, 1);
sprite->callback = sub_8075970;
- PlaySE(SE_BOWA);
+ PlaySE(SE_BALL);
}
}
@@ -634,7 +634,7 @@ static void sub_8075970(struct Sprite *sprite)
StartSpriteAffineAnim(sprite, 2);
else
StartSpriteAffineAnim(sprite, 1);
- PlaySE(SE_BOWA);
+ PlaySE(SE_BALL);
}
break;
}
@@ -881,7 +881,7 @@ static void sub_80760F8(struct Sprite *sprite)
{
gDoingBattleAnim = FALSE;
m4aMPlayAllStop();
- PlaySE(MUS_FANFA5);
+ PlaySE(MUS_EVOLVED);
}
else if (sprite->data[4] == 315)
{
@@ -1150,7 +1150,7 @@ static void sub_807687C(struct Sprite *sprite)
sprite->data[5]++;
if (sprite->data[5] == 11)
- PlaySE(SE_SUIKOMU);
+ PlaySE(SE_BALL_TRADE);
r1 = sprite->data[0];
if (gSprites[r1].affineAnimEnded)
{