Merge pull request #799 from GriffinRichards/rename-songs

Give songs meaningful english names

7 files changed, 10 insertions, 10 deletions

diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index e807002b4..d45d6cd16 100644
--- a/src/battle/anim/cube.c
+++ b/src/battle/anim/cube.c
@@ -72,7 +72,7 @@ static void sub_80CE000(struct Sprite* sprite)
         {
             sprite->data[4]++;
             if (!(sprite->data[4] & 1))
-                PlaySE12WithPanning(SE_W207B, sprite->data[5]);
+                PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]);
         }
 
         sprite->data[0] = 0;
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 165bded09..12da95fa8 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -1045,7 +1045,7 @@ static bool8 sub_80D7470(struct Task *task, u8 taskId)
     if (task->data[4] == 0 && task->data[5] > 0)
     {
         task->data[14] += task->data[15];
-        PlaySE12WithPanning(SE_W085, task->data[14]);
+        PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]);
     }
 
     if ((task->data[5] < 0 && task->data[7] <= task->data[8])
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index 4dea1ed1d..eddf4aac0 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -257,7 +257,7 @@ static void sub_80DDBD8(struct Sprite *sprite)
         return;
     if (r0 <= 0)
         return;
-    PlaySE12WithPanning(SE_W109, gUnknown_0202F7D2);
+    PlaySE12WithPanning(SE_M_CONFUSE_RAY, gUnknown_0202F7D2);
 }
 
 static void sub_80DDC4C(struct Sprite *sprite)
@@ -276,7 +276,7 @@ static void sub_80DDC4C(struct Sprite *sprite)
     if (r2 == 0 || r2 > 196)
     {
         if (r0 > 0)
-            PlaySE(SE_W109);
+            PlaySE(SE_M_CONFUSE_RAY);
     }
     
     if (sprite->data[6] == 0)
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index ef7f50f00..40aaba4b8 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -1426,9 +1426,9 @@ static void sub_80E3338(u8 taskId)
     gTasks[taskId].func = sub_80E3704;
 
     if (taskData[0] == 0)
-        PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
+        PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
     else
-        PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
+        PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
 }
 
 static void sub_80E3704(u8 taskId)
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index c76e522f4..714f93030 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -1129,7 +1129,7 @@ void sub_80DC700(struct Sprite *sprite)
     case 1:
         if (sprite->affineAnimEnded)
         {
-            PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
+            PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
             ChangeSpriteAffineAnim(sprite, 1);
             sprite->data[0]++;
         }
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index d97076e89..6f0ed4616 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -653,7 +653,7 @@ static void sub_80DD604(u8 taskId)
             task->data[0]++;
         }
 
-        PlaySE12WithPanning(SE_W029, task->data[13]);
+        PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]);
         break;
     case 1:
         if (--task->data[11] == 0)
@@ -683,7 +683,7 @@ static void sub_80DD604(u8 taskId)
             task->data[9] = 0;
             sub_80DD774(task);
             task->data[13] += task->data[14];
-            PlaySE12WithPanning(SE_W091, task->data[13]);
+            PlaySE12WithPanning(SE_M_DIG, task->data[13]);
         }
 
         if (--task->data[8] == 0)
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index d1f25c09d..1c430d923 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -142,7 +142,7 @@ static void sub_80D5C5C(struct Sprite *sprite)
 
         if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0)
         {
-            PlaySE12WithPanning(SE_W172, gUnknown_0202F7D2);
+            PlaySE12WithPanning(SE_M_FLAME_WHEEL, gUnknown_0202F7D2);
         }
     }
     else