diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
tree | 393b23af98581a7dec2e0731732a23ece4b23007 /src/battle_interface.c | |
parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) |
Merge branch 'master' into doc-blender
Diffstat (limited to 'src/battle_interface.c')
-rw-r--r-- | src/battle_interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index 12273addb..719af6a06 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1649,7 +1649,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gBattleSpritesDataPtr->animationData->field_9_x1C++; } - PlaySE12WithPanning(SE_TB_START, 0); + PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0); return taskId; } @@ -1852,9 +1852,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite) pan = SOUND_PAN_ATTACKER; if (sprite->data[7] != 0) - PlaySE2WithPanning(SE_TB_KARA, pan); + PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan); else - PlaySE1WithPanning(SE_TB_KON, pan); + PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan); sprite->callback = SpriteCallbackDummy; } |