diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /src/pokeball.c | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/pokeball.c')
| -rw-r--r-- | src/pokeball.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pokeball.c b/src/pokeball.c index 4b908ddea..69bab3e90 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -421,7 +421,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) @@ -477,7 +477,7 @@ static void sub_804AD00(struct Sprite *sprite) { sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded) { @@ -528,16 +528,16 @@ static void sub_804ADEC(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; } } @@ -579,7 +579,7 @@ static void sub_804AEE4(struct Sprite *sprite) sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_804AF24; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -649,7 +649,7 @@ static void sub_804AF24(struct Sprite *sprite) else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -880,7 +880,7 @@ static void sub_804B5C8(struct Sprite *sprite) { gDoingBattleAnim = FALSE; m4aMPlayAllStop(); - PlaySE(MUS_FAN6); + PlaySE(MUS_CAUGHT_INTRO); } else if (sprite->data[4] == 315) { @@ -1139,7 +1139,7 @@ static void sub_804BCF8(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) |