summaryrefslogtreecommitdiff
path: root/src/trade.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/trade.c
parentd7ec1d234b260df869213e195055dd75bcbe5cf3 (diff)
Give songs meaningful english names
Diffstat (limited to 'src/trade.c')
-rw-r--r--src/trade.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/trade.c b/src/trade.c
index 8d57cd60b..41c63e929 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1194,7 +1194,7 @@ static void sub_8047EC0(void)
sub_8048C70();
gMain.state ++;
nullsub_5(7, 0);
- PlayBGM(MUS_P_SCHOOL);
+ PlayBGM(MUS_SCHOOL);
break;
case 14:
sub_804ACF4(1);
@@ -3379,7 +3379,7 @@ static void sub_804B058(struct Sprite *sprite)
{
if (++ sprite->data[0] == 10)
{
- PlaySE(SE_BOWA);
+ PlaySE(SE_BALL);
sprite->data[0] = 0;
}
}
@@ -3414,7 +3414,7 @@ static void sub_804B104(struct Sprite *sprite)
{
if (++ sprite->data[0] == 15)
{
- PlaySE(SE_W107);
+ PlaySE(SE_M_MINIMIZE);
sprite->data[0] = 0;
}
}
@@ -4356,7 +4356,7 @@ static bool8 sub_804C29C(void)
gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset;
gUnknown_03004828->unk_00c4 ++;
gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
- PlayBGM(MUS_SHINKA);
+ PlayBGM(MUS_EVOLUTION);
break;
case 1:
if (gUnknown_03004828->bg2hofs > 0)
@@ -4509,7 +4509,7 @@ static bool8 sub_804C29C(void)
case 32:
if (!gPaletteFade.active)
{
- PlaySE(SE_TK_WARPOUT);
+ PlaySE(SE_WARP_OUT);
gUnknown_03004828->unk_00c4 ++;
}
gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3;
@@ -4563,7 +4563,7 @@ static bool8 sub_804C29C(void)
gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y += 3;
if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y >= -0xa3)
{
- PlaySE(SE_TK_WARPIN);
+ PlaySE(SE_WARP_IN);
}
if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde)
{
@@ -4659,7 +4659,7 @@ static bool8 sub_804C29C(void)
DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
sub_804BBE8(6);
gUnknown_03004828->unk_00c4 ++;
- PlaySE(SE_W028);
+ PlaySE(SE_M_SAND_ATTACK);
}
break;
case 51:
@@ -4739,7 +4739,7 @@ static bool8 sub_804C29C(void)
case 68:
if (++ gUnknown_03004828->unk_00c0 == 4)
{
- PlayFanfare(MUS_FANFA5);
+ PlayFanfare(MUS_EVOLVED);
}
if (gUnknown_03004828->unk_00c0 == 0xf0)
{
@@ -4872,10 +4872,10 @@ static void sub_804D738(struct Sprite *sprite)
{
sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]];
if (sprite->data[0] == 22)
- PlaySE(SE_KON);
+ PlaySE(SE_BALL_BOUNCE_1);
if (++ sprite->data[0] == 44)
{
- PlaySE(SE_W025);
+ PlaySE(SE_M_MEGA_KICK);
sprite->callback = sub_804D7AC;
sprite->data[0] = 0;
BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, FADE_COLOR_WHITE);
@@ -4905,17 +4905,17 @@ static void sub_804D80C(struct Sprite *sprite)
{
sprite->data[2] ++;
sprite->data[0] = 0x16;
- PlaySE(SE_KON);
+ PlaySE(SE_BALL_BOUNCE_1);
}
}
else
{
if (sprite->data[0] == 0x42)
- PlaySE(SE_KON2);
+ PlaySE(SE_BALL_BOUNCE_2);
if (sprite->data[0] == 0x5c)
- PlaySE(SE_KON3);
+ PlaySE(SE_BALL_BOUNCE_3);
if (sprite->data[0] == 0x6b)
- PlaySE(SE_KON4);
+ PlaySE(SE_BALL_BOUNCE_4);
sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]];
if (++sprite->data[0] == 0x6c)
sprite->callback = SpriteCallbackDummy;