summaryrefslogtreecommitdiff
path: root/src/field_specials.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-31 13:42:52 -0400
committerGitHub <noreply@github.com>2020-08-31 13:42:52 -0400
commit69ce45f71f49c859ca7adc07902842503c07d405 (patch)
tree06f27893dcbc5a32d898325df733bf33d1aabae6 /src/field_specials.c
parentd7ec1d234b260df869213e195055dd75bcbe5cf3 (diff)
parented714f1d4910e6107f684a0f27566a0fe7c6ec6f (diff)
Merge pull request #799 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/field_specials.c')
-rw-r--r--src/field_specials.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_specials.c b/src/field_specials.c
index 38a0bd50b..4a2ddb180 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -218,7 +218,7 @@ void UpdateCyclingRoadState(void) {
if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3)
{
VarSet(VAR_CYCLING_CHALLENGE_STATE, 0);
- Overworld_SetSavedMusic(SE_STOP);
+ Overworld_SetSavedMusic(MUS_DUMMY);
}
}
@@ -571,7 +571,7 @@ void PetalburgGymSlideOpenDoors(void)
{
gUnknown_02039258 = 0;
gPetalburgGymSlidingDoorIndex = 0;
- PlaySE(SE_KI_GASYAN);
+ PlaySE(SE_UNLOCK);
CreateTask(Task_SlideOpenPetalburgGymDoors, 8);
}
@@ -1228,7 +1228,7 @@ void ShakeScreenInElevator(void)
gTasks[taskId].data[5] = 3;
SetCameraPanningCallback(NULL);
sub_810ECFC();
- PlaySE(SE_ELEBETA);
+ PlaySE(SE_ELEVATOR);
}
void sub_810EC34(u8 taskId)
@@ -1245,7 +1245,7 @@ void sub_810EC34(u8 taskId)
SetCameraPanning(0, task->data[4]);
if (task->data[2] == 23)
{
- PlaySE(SE_PINPON);
+ PlaySE(SE_DING_DONG);
sub_810EC9C(taskId);
InstallCameraPanAheadCallback();
}
@@ -1801,7 +1801,7 @@ void ShakeCamera(void)
gTasks[taskId].data[4] = gSpecialVar_0x8004;
gTasks[taskId].data[5] = 5;
SetCameraPanningCallback(NULL);
- PlaySE(SE_W070);
+ PlaySE(SE_M_STRENGTH);
}
static void sub_810F7A8(u8 taskId)