summaryrefslogtreecommitdiff
path: root/src/union_room.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-28 16:14:21 -0400
committerGitHub <noreply@github.com>2020-08-28 16:14:21 -0400
commit09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (patch)
treed90353c1a06b199c585fdc258c049583392dc09f /src/union_room.c
parenteb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff)
parentee72696b5340b5578941aeb5d03bca6099e26538 (diff)
Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/union_room.c')
-rw-r--r--src/union_room.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/union_room.c b/src/union_room.c
index 639420d71..f79dd9cc4 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1018,13 +1018,13 @@ static void Task_TryJoinLinkGroup(u8 taskId)
// Trading is allowed, or not trading at all
AskToJoinRfuGroup(data, id);
data->state = LG_STATE_ASK_JOIN_GROUP;
- PlaySE(SE_PN_ON);
+ PlaySE(SE_POKENAV_ON);
}
else
{
StringCopy(gStringVar4, sCantTransmitToTrainerTexts[readyStatus - 1]);
data->state = LG_STATE_TRADE_NOT_READY;
- PlaySE(SE_PN_ON);
+ PlaySE(SE_POKENAV_ON);
}
}
else
@@ -2118,7 +2118,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
RedrawListMenu(data->listTaskId);
IntlConvPartnerUname7(gStringVar1, &data->field_0->arr[data->leaderId]);
CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.playerName, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId));
- PlaySE(SE_PN_ON);
+ PlaySE(SE_POKENAV_ON);
data->state = 4;
}
else
@@ -2279,7 +2279,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
CreateTask_RfuReconnectWithParent(data->field_0->arr[0].gname_uname.playerName, ReadAsU16(data->field_0->arr[0].gname_uname.gname.unk_00.playerTrainerId));
- PlaySE(SE_PN_ON);
+ PlaySE(SE_POKENAV_ON);
data->state = 4;
}
else
@@ -2846,7 +2846,7 @@ static void Task_RunUnionRoom(u8 taskId)
uroom->state = UR_STATE_START_ACTIVITY_FREE_UROOM;
break;
case UR_STATE_PLAYER_CONTACTED_YOU:
- PlaySE(SE_PINPON);
+ PlaySE(SE_DING_DONG);
sub_800EF7C();
uroom->state = UR_STATE_RECV_CONTACT_DATA;
uroom->recvActivityRequest[0] = 0;