Merge pull request #1146 from GriffinRichards/rename-songs

Give songs meaningful english names

1 files changed, 19 insertions, 19 deletions

diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 6db44d752..7eae8cfd1 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -618,7 +618,7 @@ bool8 FldEff_SecretPowerCave(void)
 
 static void SpriteCB_CaveEntranceInit(struct Sprite *sprite)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
 
     sprite->data[0] = 0;
     sprite->callback = SpriteCB_CaveEntranceOpen;
@@ -691,7 +691,7 @@ bool8 FldEff_SecretPowerTree(void)
 
 static void SpriteCB_TreeEntranceInit(struct Sprite *sprite)
 {
-    PlaySE(SE_W010);
+    PlaySE(SE_M_SCRATCH);
 
     sprite->animNum = gFieldEffectArguments[7];
     sprite->data[0] = 0;
@@ -754,7 +754,7 @@ bool8 FldEff_SecretPowerShrub(void)
 
 static void SpriteCB_ShrubEntranceInit(struct Sprite *sprite)
 {
-    PlaySE(SE_W077);
+    PlaySE(SE_M_POISON_POWDER);
 
     sprite->data[0] = 0;
     sprite->callback = SpriteCB_ShrubEntranceOpen;
@@ -888,16 +888,16 @@ static void DoBalloonSoundEffect(s16 metatileId)
     switch (metatileId)
     {
     case METATILE_SecretBase_RedBalloon:
-        PlaySE(SE_FUUSEN1);
+        PlaySE(SE_BALLOON_RED);
         break;
     case METATILE_SecretBase_BlueBalloon:
-        PlaySE(SE_FUUSEN2);
+        PlaySE(SE_BALLOON_BLUE);
         break;
     case METATILE_SecretBase_YellowBalloon:
-        PlaySE(SE_FUUSEN3);
+        PlaySE(SE_BALLOON_YELLOW);
         break;
     case METATILE_SecretBase_MudBall:
-        PlaySE(SE_TOY_DANGO);
+        PlaySE(SE_MUD_BALL);
         break;
     }
 }
@@ -914,7 +914,7 @@ bool8 FldEff_Nop48(void)
 
 static void DoSecretBaseBreakableDoorEffect(s16 x, s16 y)
 {
-    PlaySE(SE_TOY_KABE);
+    PlaySE(SE_BREAKABLE_DOOR);
     MapGridSetMetatileIdAt(x, y, METATILE_SecretBase_BreakableDoor_BottomOpen);
     MapGridSetMetatileIdAt(x, y - 1, METATILE_SecretBase_BreakableDoor_TopOpen);
     CurrentMapDrawMetatileAt(x, y);
@@ -959,28 +959,28 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId)
         switch (gTasks[taskId].tMetatileID)
         {
         case METATILE_SecretBase_NoteMat_C_Low:
-            PlaySE(SE_TOY_C);
+            PlaySE(SE_NOTE_C);
             break;
         case METATILE_SecretBase_NoteMat_D:
-            PlaySE(SE_TOY_D);
+            PlaySE(SE_NOTE_D);
             break;
         case METATILE_SecretBase_NoteMat_E:
-            PlaySE(SE_TOY_E);
+            PlaySE(SE_NOTE_E);
             break;
         case METATILE_SecretBase_NoteMat_F:
-            PlaySE(SE_TOY_F);
+            PlaySE(SE_NOTE_F);
             break;
         case METATILE_SecretBase_NoteMat_G:
-            PlaySE(SE_TOY_G);
+            PlaySE(SE_NOTE_G);
             break;
         case METATILE_SecretBase_NoteMat_A:
-            PlaySE(SE_TOY_A);
+            PlaySE(SE_NOTE_A);
             break;
         case METATILE_SecretBase_NoteMat_B:
-            PlaySE(SE_TOY_B);
+            PlaySE(SE_NOTE_B);
             break;
         case METATILE_SecretBase_NoteMat_C_High:
-            PlaySE(SE_TOY_C1);
+            PlaySE(SE_NOTE_C_HIGH);
             break;
         }
 
@@ -1006,7 +1006,7 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite)
     sprite->data[0]++;
 
     if (sprite->data[0] == 8)
-        PlaySE(SE_W215);
+        PlaySE(SE_M_HEAL_BELL);
 
     if (sprite->data[0] >= 32)
         DestroySprite(sprite);
@@ -1081,7 +1081,7 @@ bool8 FldEff_SandPillar(void)
 
 static void SpriteCB_SandPillar_BreakTop(struct Sprite *sprite)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
 
     if (MapGridGetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1) == METATILE_SecretBase_SandOrnament_TopWall)
         MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1, METATILE_SecretBase_Wall_TopMid | METATILE_COLLISION_MASK);
@@ -1226,7 +1226,7 @@ static void Task_FieldPoisonEffect(u8 taskId)
 
 void FldEffPoison_Start(void)
 {
-    PlaySE(SE_DOKU);
+    PlaySE(SE_FIELD_POISON);
     CreateTask(Task_FieldPoisonEffect, 80);
 }