summaryrefslogtreecommitdiff
path: root/src/berry_blender.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-29 01:47:36 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-29 01:47:36 -0400
commit038abf80ba30a277420e0381312c0cfc2296811e (patch)
treeab951530e74209c0da170bc74ddd8b5a456bab9a /src/berry_blender.c
parentd7ec1d234b260df869213e195055dd75bcbe5cf3 (diff)
Give songs meaningful english names
Diffstat (limited to 'src/berry_blender.c')
-rw-r--r--src/berry_blender.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c
index c86b707b3..7955c1458 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -970,7 +970,7 @@ void sub_804E738(struct Sprite* sprite)
if (++sprite->data[5] > 3)
DestroySprite(sprite);
else
- PlaySE(SE_TB_KARA);
+ PlaySE(SE_BALL_TRAY_EXIT);
}
sprite->pos1.x = sprite->data[1];
sprite->pos1.y = sprite->data[2];
@@ -1451,7 +1451,7 @@ static void sub_804F378(void)
case 13:
gBerryBlenderData->field_0++;
sub_804F238();
- PlaySE(SE_RU_HYUU);
+ PlaySE(SE_FALL);
sub_8051414(&gBerryBlenderData->field_168);
break;
case 14:
@@ -1465,7 +1465,7 @@ static void sub_804F378(void)
gBerryBlenderData->arrowPos = gUnknown_082162F8[gUnknown_08216300[gBerryBlenderData->playersNo - 2]];
REG_BG2CNT = 0x4882;
gBerryBlenderData->framesToWait = 0;
- PlaySE(SE_TRACK_DOOR);;
+ PlaySE(SE_TRUCK_DOOR);;
sub_804F2A8();
}
sub_8051414(&gBerryBlenderData->field_168);
@@ -1508,7 +1508,7 @@ static void sub_804F378(void)
gBerryBlenderData->field_178 = GetCurrentMapMusic();
}
PlayBGM(MUS_CYCLING);
- PlaySE(SE_MOTER);
+ PlaySE(SE_BERRY_BLENDER);
Blender_ControlHitPitch();
break;
}
@@ -1699,17 +1699,17 @@ static void sub_804FC48(u16 a0, u8 a1)
{
StartSpriteAnim(&gSprites[spriteID], 2);
gSprites[spriteID].callback = sub_8051684;
- PlaySE(SE_RU_GASHIN);
+ PlaySE(SE_ICE_STAIRS);
}
else if (a0 == 0x5432)
{
StartSpriteAnim(&gSprites[spriteID], 0);
- PlaySE(SE_SEIKAI);
+ PlaySE(SE_SUCCESS);
}
else if (a0 == 0x2345)
{
StartSpriteAnim(&gSprites[spriteID], 1);
- PlaySE(SE_HAZURE);
+ PlaySE(SE_FAILURE);
}
sub_805156C();
}
@@ -2770,7 +2770,7 @@ static void sub_805181C(struct Sprite* sprite)
{
sprite->data[1] = 88;
sprite->data[0]++;
- PlaySE(SE_KON);
+ PlaySE(SE_BALL_BOUNCE_1);
}
break;
case 1:
@@ -3537,7 +3537,7 @@ static void sub_8052BD0(u8 taskID)
{
if (gTasks[taskID].data[0] == 0)
{
- PlayFanfare(MUS_FANFA1);
+ PlayFanfare(MUS_LEVEL_UP);
gTasks[taskID].data[0]++;
}
if (IsFanfareTaskInactive())