PlaySE renaming after rebase

37 files changed, 195 insertions, 195 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index 8ca66f745..bdb34365f 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -673,7 +673,7 @@ static void ScriptCmd_end(void)
 static void ScriptCmd_playse(void)
 {
     gBattleAnimScriptPtr++;
-    PlaySoundEffect(SCRIPT_READ_16(gBattleAnimScriptPtr));
+    PlaySE(SCRIPT_READ_16(gBattleAnimScriptPtr));
     gBattleAnimScriptPtr += 2;
 }
 
@@ -1715,7 +1715,7 @@ static void ScriptCmd_panse_19(void)
     gBattleAnimScriptPtr++;
     r4 = SCRIPT_READ_16(gBattleAnimScriptPtr);
     r0 = SCRIPT_READ_8(gBattleAnimScriptPtr + 2);
-    PlaySoundEffect12WithPanning(r4, sub_8076F98(r0));
+    PlaySE12WithPanning(r4, sub_8076F98(r0));
     gBattleAnimScriptPtr += 3;
 }
 
@@ -1755,7 +1755,7 @@ static void ScriptCmd_panse_1B(void)
     gTasks[taskId].data[2] = r4;
     gTasks[taskId].data[3] = r7;
     gTasks[taskId].data[4] = panning;
-    PlaySoundEffect12WithPanning(songNum, panning);
+    PlaySE12WithPanning(songNum, panning);
     gAnimSoundTaskCount++;
     gBattleAnimScriptPtr += 6;
 }
@@ -1917,7 +1917,7 @@ static void ScriptCmd_panse_26(void)
     gTasks[taskId].data[2] = r6;
     gTasks[taskId].data[3] = r10;
     gTasks[taskId].data[4] = r4;
-    PlaySoundEffect12WithPanning(r8, r4);
+    PlaySE12WithPanning(r8, r4);
     gAnimSoundTaskCount++;
     gBattleAnimScriptPtr += 6;
 }
@@ -1949,7 +1949,7 @@ static void ScriptCmd_panse_27(void)
     gTasks[taskId].data[2] = r4_2;
     gTasks[taskId].data[3] = r7;
     gTasks[taskId].data[4] = r6;
-    PlaySoundEffect12WithPanning(r9, r6);
+    PlaySE12WithPanning(r9, r6);
     gAnimSoundTaskCount++;
     gBattleAnimScriptPtr += 6;
 }
@@ -1996,7 +1996,7 @@ static void sub_80774FC(u8 taskId)
         r1 = gTasks[taskId].data[1];
         gTasks[taskId].data[3]--;
         r4 = gTasks[taskId].data[3];
-        PlaySoundEffect12WithPanning(r0, r1);
+        PlaySE12WithPanning(r0, r1);
         if (r4 == 0)
         {
             DestroyTask(taskId);
@@ -2034,7 +2034,7 @@ static void sub_80775CC(u8 taskId)
     gTasks[taskId].data[2]--;
     if (r0 <= 0)
     {
-        PlaySoundEffect12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]);
+        PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]);
         DestroyTask(taskId);
         gAnimSoundTaskCount--;
     }
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 827ed4ffc..9938c4b54 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1589,7 +1589,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d)
     for (i = 0; i < 6; i++)
         gTasks[taskId].data[3 + i] = sp[i];
     gTasks[taskId].data[10] = d;
-    PlaySoundEffect12WithPanning(SE_TB_START, 0);
+    PlaySE12WithPanning(SE_TB_START, 0);
     return taskId;
 }
 #else
@@ -2169,7 +2169,7 @@ _08044C62:\n\
     strh r6, [r0, 0x1C]\n\
     movs r0, 0x72\n\
     movs r1, 0\n\
-    bl PlaySoundEffect12WithPanning\n\
+    bl PlaySE12WithPanning\n\
     adds r0, r4, 0\n\
     add sp, 0x28\n\
     pop {r3-r5}\n\
@@ -2356,9 +2356,9 @@ void sub_804507C(struct Sprite *sprite)
         if (r3 != 0)
             pan = -64;
         if (sprite->data7 != 0)
-            PlaySoundEffect2WithPanning(SE_TB_KARA, pan);
+            PlaySE2WithPanning(SE_TB_KARA, pan);
         else
-            PlaySoundEffect1WithPanning(SE_TB_KON, pan);
+            PlaySE1WithPanning(SE_TB_KON, pan);
         sprite->callback = SpriteCallbackDummy;
     }
 }
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 4ee55f0e2..820d16465 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -230,7 +230,7 @@ void SetUpBattlePokemonMenu(u8 a)
             if (gUnknown_02038473 == 3)
             {
                 if (GetMonData(&gPlayerParty[sub_806CA38(a)], MON_DATA_IS_EGG))
-                    PlaySoundEffect(SE_HAZURE);
+                    PlaySE(SE_HAZURE);
                 else
                 {
                     sub_806D5A4();
@@ -239,7 +239,7 @@ void SetUpBattlePokemonMenu(u8 a)
             }
             else
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 GetMonNickname(&gPlayerParty[sub_806CA38(a)], gStringVar1);
                 sub_8095050(a, sub_806CA38(a));
                 SetTaskFuncWithFollowupFunc(a, Task_HandlePopupMenuInput, SetUpBattlePokemonMenu);
@@ -247,10 +247,10 @@ void SetUpBattlePokemonMenu(u8 a)
             break;
         case 2:
             if (gUnknown_02038473 == 1)
-                PlaySoundEffect(SE_HAZURE);
+                PlaySE(SE_HAZURE);
             else
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 if (gUnknown_02038473 == 3)
                 {
                     gUnknown_0202E8F4 = 0;
@@ -336,19 +336,19 @@ static void Task_HandlePopupMenuInput(u8 taskId)
     {
         if (gMain.newAndRepeatedKeys & DPAD_UP)
         {
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             MoveMenuCursor(-1);
             return;
         }
         if (gMain.newAndRepeatedKeys & DPAD_DOWN)
         {
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             MoveMenuCursor(1);
             return;
         }
         if (gMain.newKeys & A_BUTTON)
         {
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4],
                                sBattlePartyPopupMenus,
                                sBattlePartyMenuActions,
@@ -358,7 +358,7 @@ static void Task_HandlePopupMenuInput(u8 taskId)
         }
         if (gMain.newKeys & B_BUTTON)
         {
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             Task_BattlePartyMenuCancel(taskId);
             return;
         }
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 94f9c5941..511b88c5a 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -245,7 +245,7 @@ static void sub_814640C(u8 taskId)
 
 static void sub_8146440(u8 taskId)
 {
-    PlaySoundEffect(SE_SELECT);
+    PlaySE(SE_SELECT);
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gTasks[taskId].func = sub_814640C;
 }
@@ -379,7 +379,7 @@ _08146718:\n\
     bgt _0814678C\n\
 _08146728:\n\
     movs r0, 0x5\n\
-    bl PlaySoundEffect\n\
+    bl PlaySE\n\
     mov r2, r8\n\
     ldrb r3, [r2, 0x1]\n\
     ldrb r4, [r4, 0xC]\n\
diff --git a/src/bike.c b/src/bike.c
index 0c154de9c..d7175b5e0 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -617,7 +617,7 @@ static void AcroBikeTransition_80E5920(u8 direction)
         }
     }
     playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    PlaySoundEffect(SE_JITE_PYOKO);
+    PlaySE(SE_JITE_PYOKO);
     playerMapObj->mapobj_bit_9 = 1;
     PlayerSetAnimId(sub_80608A4(direction), 2);
 }
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 7c6a22547..220e8420c 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -46,7 +46,7 @@ void DoBrailleDigEffect(void)
     MapGridSetMetatileIdAt(17, 9, 563);
     MapGridSetMetatileIdAt(18, 9, 3636);
     DrawWholeMapView();
-    PlaySoundEffect(SE_BAN);
+    PlaySE(SE_BAN);
     FlagSet(SYS_BRAILLE_DIG);
     ScriptContext2_Disable();
 }
@@ -88,7 +88,7 @@ void DoBrailleStrengthEffect(void)
     MapGridSetMetatileIdAt(15, 27, 563);
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
-    PlaySoundEffect(SE_BAN);
+    PlaySE(SE_BAN);
     FlagSet(SYS_BRAILLE_STRENGTH);
     ScriptContext2_Disable();
 }
@@ -134,7 +134,7 @@ void UseFlyAncientTomb_Finish(void)
     MapGridSetMetatileIdAt(15, 27, 563);
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
-    PlaySoundEffect(SE_BAN);
+    PlaySE(SE_BAN);
     FlagSet(SYS_BRAILLE_FLY);
     ScriptContext2_Disable();
 }
@@ -159,7 +159,7 @@ void Task_BrailleWait(u8 taskId)
             if (BrailleWait_CheckButtonPress() != FALSE)
             {
                 MenuZeroFillScreen();
-                PlaySoundEffect(5);
+                PlaySE(5);
                 data[0] = 2;
             }
             else
diff --git a/src/cable_club.c b/src/cable_club.c
index 1f2c6376a..45fb347f3 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -89,7 +89,7 @@ static void sub_80830E4(u8 taskId) {
 
     if (gMain.heldKeys & A_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         sub_8007F4C();
         gTasks[(u32) taskId].func = sub_8083188;
     }
@@ -153,7 +153,7 @@ _08083158:\n\
     cmp r0, 0\n\
     beq _08083178\n\
     movs r0, 0x5\n\
-    bl PlaySoundEffect\n\
+    bl PlaySE\n\
     bl sub_8007F4C\n\
     ldr r0, _08083180 @ =gTasks\n\
     lsls r1, r6, 2\n\
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 301e169ce..21cd643ef 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -59,13 +59,13 @@ static void Task_ProcessMenuInput(u8 taskId)
     switch (ProcessMenuInputNoWrap_())
     {
     case 0:
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         sub_8071F40(gSystemText_ClearingData);
         gTasks[taskId].func = Task_ClearSaveData;
         break;
     case -1:
     case 1:
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         DestroyTask(taskId);
         SetMainCallback2(CB2_SoftReset);
         break;
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index e51ae24b6..c5f2c08e7 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -214,7 +214,7 @@ int sub_8068024(struct FieldInput *input)
         return TRUE;
     if (input->pressedStartButton)
     {
-        PlaySoundEffect(SE_WIN_OPEN);
+        PlaySE(SE_WIN_OPEN);
         sub_8071310();
         return TRUE;
     }
@@ -261,7 +261,7 @@ static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c)
      && script != gUnknown_0815F36C
      && script != gUnknown_0815F43A
      && script != gUnknown_081A0009)
-        PlaySoundEffect(5);
+        PlaySE(5);
 
     ScriptContext1_SetupScript(script);
     return TRUE;
@@ -828,7 +828,7 @@ int dive_warp(struct MapPosition *position, u16 b)
         {
             walkrun_find_lowest_active_bit_in_bitfield();
             sp13E_warp_to_last_warp();
-            PlaySoundEffect(SE_W291);
+            PlaySE(SE_W291);
             return TRUE;
         }
     }
@@ -838,7 +838,7 @@ int dive_warp(struct MapPosition *position, u16 b)
         {
             walkrun_find_lowest_active_bit_in_bitfield();
             sp13E_warp_to_last_warp();
-            PlaySoundEffect(SE_W291);
+            PlaySE(SE_W291);
             return TRUE;
         }
     }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index c0a71fcf4..6a0fe1dce 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -871,7 +871,7 @@ void PlayerTurnInPlace(u8 direction)
 
 void PlayerJumpLedge(u8 direction)
 {
-    PlaySoundEffect(SE_DANSA);
+    PlaySE(SE_DANSA);
     PlayerSetAnimId(GetJumpLedgeAnimId(direction), 8);
 }
 
@@ -902,31 +902,31 @@ void sub_8059534(u8 a)
 
 void sub_805954C(u8 a)
 {
-    PlaySoundEffect(SE_JITE_PYOKO);
+    PlaySE(SE_JITE_PYOKO);
     PlayerSetAnimId(sub_8060A5C(a), 1);
 }
 
 void sub_8059570(u8 a)
 {
-    PlaySoundEffect(SE_JITE_PYOKO);
+    PlaySE(SE_JITE_PYOKO);
     PlayerSetAnimId(sub_8060A88(a), 2);
 }
 
 void sub_8059594(u8 a)
 {
-    PlaySoundEffect(SE_JITE_PYOKO);
+    PlaySE(SE_JITE_PYOKO);
     PlayerSetAnimId(sub_8060AB4(a), 8);
 }
 
 void sub_80595B8(u8 direction)
 {
-    PlaySoundEffect(SE_JITE_PYOKO);
+    PlaySE(SE_JITE_PYOKO);
     PlayerSetAnimId(sub_8060878(direction), 1);
 }
 
 void sub_80595DC(u8 direction)
 {
-    PlaySoundEffect(SE_WALL_HIT);
+    PlaySE(SE_WALL_HIT);
     PlayerSetAnimId(sub_8060AE0(direction), 2);
 }
 
@@ -959,7 +959,7 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a)
             if (MetatileBehavior_IsWarpDoor(MapGridGetMetatileBehaviorAt(x, y)))
                 return;
         }
-        PlaySoundEffect(SE_WALL_HIT);
+        PlaySE(SE_WALL_HIT);
     }
 }
 
@@ -1292,7 +1292,7 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c)
         gUnknown_0202FF84[2] = c->elevation;
         gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority;
         FieldEffectStart(10);
-        PlaySoundEffect(SE_W070);
+        PlaySE(SE_W070);
         task->data[0]++;
     }
     return 0;
@@ -1334,7 +1334,7 @@ u8 sub_805A000(struct Task *task, struct MapObject *mapObject)
     gPlayerAvatar.unk6 = 1;
     if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
     {
-        PlaySoundEffect(SE_DANSA);
+        PlaySE(SE_DANSA);
         FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->mapobj_unk_18));
         task->data[1]++;
         if (task->data[1] > 1)
@@ -1370,7 +1370,7 @@ u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject)
     task->data[1] = mapObject->placeholder18;
     gPlayerAvatar.unk6 = 1;
     ScriptContext2_Enable();
-    PlaySoundEffect(SE_TK_WARPIN);
+    PlaySE(SE_TK_WARPIN);
     return 1;
 }
 
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 6282ea813..59280b743 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -157,7 +157,7 @@ void Task_HandleTruckSequence(u8 taskId)
            data[1] = 0; // reset the timer.
            data[2] = CreateTask(Task_Truck1, 0xA);
            data[0] = 1; // run the next case.
-           PlaySoundEffect(SE_TRACK_MOVE);
+           PlaySE(SE_TRACK_MOVE);
        }
        break;
    case 1:
@@ -177,7 +177,7 @@ void Task_HandleTruckSequence(u8 taskId)
            DestroyTask(data[2]);
            data[3] = CreateTask(Task_Truck2, 0xA);
            data[0] = 3;
-           PlaySoundEffect(SE_TRACK_STOP);
+           PlaySE(SE_TRACK_STOP);
        }
        break;
    case 3:
@@ -192,7 +192,7 @@ void Task_HandleTruckSequence(u8 taskId)
        data[1]++;
        if (data[1] == 90)
        {
-           PlaySoundEffect(SE_TRACK_HAIK);
+           PlaySE(SE_TRACK_HAIK);
            data[1] = 0;
            data[0] = 5;
        }
@@ -205,7 +205,7 @@ void Task_HandleTruckSequence(u8 taskId)
             MapGridSetMetatileIdAt(11, 9, 528);
             MapGridSetMetatileIdAt(11, 10, 536);
             DrawWholeMapView();
-            PlaySoundEffect(SE_TRACK_DOOR);
+            PlaySE(SE_TRACK_DOOR);
             DestroyTask(taskId);
             ScriptContext2_Disable();
        }
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 39e438620..77c8752d1 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -122,7 +122,7 @@ bool8 FldEff_CutGrass(void)
     u8 tileBehavior;
     u8 i, j; // not in for loop?
 
-    for(i = 0, PlaySoundEffect(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++)
+    for(i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++)
     {
         y = i - 1 + gUnknown_0203923C.y;
         for(j = 0; j < 3; j++)
@@ -294,7 +294,7 @@ void sub_80A2AB8(void)
 
 void sub_80A2B00(void)
 {
-    PlaySoundEffect(0x80);
+    PlaySE(0x80);
     FieldEffectActiveListRemove(2);
     EnableBothScriptContexts();
 }
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index f5372b53b..d0ee712af 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -122,7 +122,7 @@ static void sub_8133D50(u8 taskId) {
         return;
     }
 
-    PlaySoundEffect(SE_KAIFUKU);
+    PlaySE(SE_KAIFUKU);
 
     EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0;
 
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 8d23a41cb..4e8214b07 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -49,7 +49,7 @@ static void sub_812C01C(void)
 {
     u8 taskId;
 
-    PlaySoundEffect(0xEC);
+    PlaySE(0xEC);
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F);
     taskId = CreateTask(sub_812C084, 0);
     gTasks[taskId].data[0] = 0;
diff --git a/src/intro.c b/src/intro.c
index 00c9894cf..ea6edba3d 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1419,7 +1419,7 @@ static void Task_IntroPokemonBattle(u8 taskId)
         gSprites[spriteId].invisible = 1;
     }
     if (gIntroFrameCounter == 800)
-        PlaySoundEffect(SE_OP_BASYU);
+        PlaySE(SE_OP_BASYU);
     if (gIntroFrameCounter == 850)
         BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0xFFFF);
     if (gIntroFrameCounter == 946)
diff --git a/src/item_use.c b/src/item_use.c
index 5d0282844..4047ade5c 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -362,7 +362,7 @@ void RunItemfinderResults(u8 taskId)
             }
             return;
         }
-        PlaySoundEffect(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder.
+        PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder.
         data[4]++;
     }
     data[3] = (data[3] + 1) & 0x1F;
@@ -943,7 +943,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 
 void sub_80C9EE4(u8 taskId)
 {
-    PlaySoundEffect(2);
+    PlaySE(2);
     gTasks[taskId].func = sub_80C9F10;
 }
 
@@ -1002,7 +1002,7 @@ void sub_80CA098(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySoundEffect(0x75);
+        PlaySE(0x75);
         DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1);
     }
 }
@@ -1095,7 +1095,7 @@ void sub_80CA2BC(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySoundEffect(1);
+        PlaySE(1);
         RemoveBagItem(gScriptItemId, 1);
         DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1);
     }
diff --git a/src/link.c b/src/link.c
index d06e71c03..224c0ae1c 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1262,10 +1262,10 @@ static void CB2_PrintErrorMessage(void)
         break;
     case 30:
     case 60:
-        PlaySoundEffect(SE_BOO);
+        PlaySE(SE_BOO);
         break;
     case 90:
-        PlaySoundEffect(SE_BOO);
+        PlaySE(SE_BOO);
         break;
     }
 
diff --git a/src/main_menu.c b/src/main_menu.c
index c1e43e1a8..50fefc471 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -446,13 +446,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000);
         gTasks[taskId].func = Task_MainMenuPressedA;
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF);
         REG_WIN0H = WIN_RANGE(0, 240);
         REG_WIN0V = WIN_RANGE(0, 160);
@@ -966,14 +966,14 @@ static void Task_NewGameSpeech16(u8 taskId)
     {
     case MALE:
         sub_8072DEC();
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         gSaveBlock2.playerGender = MALE;
         MenuZeroFillWindowRect(2, 4, 8, 9);
         gTasks[taskId].func = Task_NewGameSpeech19;
         break;
     case FEMALE:
         sub_8072DEC();
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         gSaveBlock2.playerGender = FEMALE;
         MenuZeroFillWindowRect(2, 4, 8, 9);
         gTasks[taskId].func = Task_NewGameSpeech19;
@@ -1069,19 +1069,19 @@ static void Task_NewGameSpeech21(u8 taskId)
     case 3:
     case 4:
         sub_8072DEC();
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 22, 12);
         SetPresetPlayerName(selection);
         gTasks[taskId].func = Task_NewGameSpeech23;
         break;
     case 0:     //NEW NAME
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
         gTasks[taskId].func = Task_NewGameSpeech22;
         break;
     case -1:    //B button
         sub_8072DEC();
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 22, 12);
         gTasks[taskId].func = Task_NewGameSpeech14;     //Go back to gender menu
         break;
@@ -1122,7 +1122,7 @@ static void Task_NewGameSpeech25(u8 taskId)
     switch (ProcessMenuInputNoWrap_())
     {
     case 0:     //YES
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 8, 7);
         gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 2);
@@ -1131,7 +1131,7 @@ static void Task_NewGameSpeech25(u8 taskId)
         break;
     case -1:    //B button
     case 1:     //NO
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 8, 7);
         gTasks[taskId].func = Task_NewGameSpeech14;     //Go back to gender menu
         break;
diff --git a/src/menu.c b/src/menu.c
index 84093b9b7..ba98ff057 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -52,7 +52,7 @@ const struct MenuAction gMenuYesNoItems[] =
 
 void CloseMenu(void)
 {
-    PlaySoundEffect(SE_SELECT);
+    PlaySE(SE_SELECT);
     MenuZeroFillScreen();
     sub_8064E2C();
     ScriptContext2_Disable();
@@ -270,7 +270,7 @@ s8 ProcessMenuInput(void)
 {
     if (gMain.newKeys & A_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         if (gMenu.menu_field_7)
             sub_8072DEC();
         return gMenu.cursorPos;
@@ -285,13 +285,13 @@ s8 ProcessMenuInput(void)
 
     if (gMain.newKeys & DPAD_UP)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MoveMenuCursor(-1);
         return -2;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MoveMenuCursor(1);
         return -2;
     }
@@ -305,7 +305,7 @@ s8 ProcessMenuInputNoWrap(void)
 
     if (gMain.newKeys & A_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         if (gMenu.menu_field_7)
             sub_8072DEC();
         return gMenu.cursorPos;
@@ -321,13 +321,13 @@ s8 ProcessMenuInputNoWrap(void)
     if (gMain.newKeys & DPAD_UP)
     {
         if (cursorPos != MoveMenuCursorNoWrap(-1))
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         return -2;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
         if (cursorPos != MoveMenuCursorNoWrap(1))
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         return -2;
     }
 
@@ -520,7 +520,7 @@ s8 sub_80727CC(void)
     {
         if (gMenu.menu_field_7)
             sub_8072DEC();
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         return GetMenuCursorPos();
     }
 
@@ -533,25 +533,25 @@ s8 sub_80727CC(void)
 
     if (gMain.newKeys & DPAD_UP)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MoveMenuCursor4(-gMenu.width);
         return -2;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MoveMenuCursor4(gMenu.width);
         return -2;
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MoveMenuCursor4(-1);
         return -2;
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         MoveMenuCursor4(1);
         return -2;
     }
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index c257e7573..97deb348c 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -113,13 +113,13 @@ static void CB2_MysteryEventMenu(void)
         case 3:
             if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4)
             {
-                PlaySoundEffect(SE_PIN);
+                PlaySE(SE_PIN);
                 sub_8072044(gSystemText_LoadEventPressA);
                 gMain.state++;
             }
             if (gMain.newKeys & B_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 CloseLink();
                 gMain.state = 15;
             }
@@ -139,7 +139,7 @@ static void CB2_MysteryEventMenu(void)
             }
             if (gMain.newKeys & A_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 sub_8007F4C();
                 MenuDrawTextWindow(6, 5, 23, 8);
                 MenuPrint(gSystemText_LoadingEvent, 7, 6);
@@ -147,7 +147,7 @@ static void CB2_MysteryEventMenu(void)
             }
             else if (gMain.newKeys & B_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 CloseLink();
                 gMain.state = 15;
             }
@@ -185,7 +185,7 @@ static void CB2_MysteryEventMenu(void)
             }
             if (gMain.newKeys & B_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 CloseLink();
                 gMain.state = 15;
                 break;
@@ -199,7 +199,7 @@ static void CB2_MysteryEventMenu(void)
             }
             if (gMain.newKeys & A_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 sub_8007F4C();
                 MenuDrawTextWindow(6, 5, 23, 8);
                 MenuPrint(gSystemText_LoadingEvent, 7, 6);
@@ -207,7 +207,7 @@ static void CB2_MysteryEventMenu(void)
             }
             else if (gMain.newKeys & B_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 CloseLink();
                 gMain.state = 15;
             }
@@ -264,7 +264,7 @@ static void CB2_MysteryEventMenu(void)
             }
             if (gMain.newKeys & B_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 CloseLink();
                 gMain.state = 15;
                 break;
@@ -313,7 +313,7 @@ static void CB2_MysteryEventMenu(void)
         case 14:
             if (gMain.newKeys & A_BUTTON)
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
                 gMain.state++;
             }
             break;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 531d12bdd..b14c690e2 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -453,7 +453,7 @@ static bool8 MainState_StartPageSwap(struct Task *task)
     StartPageSwapAnim();
     sub_80B6888(1);
     sub_80B6460(0, 0, 1);
-    PlaySoundEffect(SE_WIN_OPEN);
+    PlaySE(SE_WIN_OPEN);
     namingScreenData.state = MAIN_STATE_WAIT_PAGE_SWAP;
     return FALSE;
 }
@@ -607,7 +607,7 @@ static bool8 KeyboardKeyHandler_OK(u8 event)
     sub_80B6460(2, 1, 0);
     if (event == KBEVENT_PRESSED_A)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         namingScreenData.state = MAIN_STATE_6;
         return TRUE;
     }
@@ -1370,7 +1370,7 @@ static void DeleteTextCharacter(void)
     var2 = GetKeyRoleAtCursorPos();
     if (var2 == 0 || var2 == 2)
         sub_80B6460(1, 0, 1);
-    PlaySoundEffect(SE_BOWA);
+    PlaySE(SE_BOWA);
 }
 
 static bool8 sub_80B7004(void)
@@ -1391,7 +1391,7 @@ static bool8 sub_80B7004(void)
     else
         AddTextCharacter(ch);
     sub_80B7960();
-    PlaySoundEffect(SE_SELECT);
+    PlaySE(SE_SELECT);
     if (r4)
     {
         if (GetPreviousTextCaretPosition() == namingScreenData.template->maxChars - 1)
@@ -1422,7 +1422,7 @@ static void sub_80B7090(void) // DoInput?
             sub_80B72A4(r4, r5);
     }
     sub_80B7960();
-    PlaySoundEffect(SE_SELECT);
+    PlaySE(SE_SELECT);
 }
 
 static bool8 sub_80B7104(void)
diff --git a/src/party_menu.c b/src/party_menu.c
index aebfd3307..d473eae6d 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -109,7 +109,7 @@ void sub_8070088(u8 taskId)
 
     gUnknown_0202E8F4 = 1;
     MenuZeroFillWindowRect(3, 14, 26, 19);
-    PlaySoundEffect(SE_KAIFUKU);
+    PlaySE(SE_KAIFUKU);
     PartyMenuUpdateLevelOrStatus(unk_201C000.pokemon, unk_201C000.var05);
 
     task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle()][unk_201C000.var05], 9);
@@ -214,7 +214,7 @@ _08070134:\n\
     movs r3, 0x13\n\
     bl MenuZeroFillWindowRect\n\
     movs r0, 0x1\n\
-    bl PlaySoundEffect\n\
+    bl PlaySE\n\
     ldr r0, [r4]\n\
     ldrb r1, [r4, 0x5]\n\
     bl PartyMenuUpdateLevelOrStatus\n\
diff --git a/src/player_pc.c b/src/player_pc.c
index a31ce0803..f0f0709b1 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -129,24 +129,24 @@ void PlayerPCProcessMenuInput(u8 taskId)
 {
     if (gMain.newAndRepeatedKeys & 0x40)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         MoveMenuCursor(-1);
     }
     else if (gMain.newAndRepeatedKeys & 0x80)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         MoveMenuCursor(1);
     }
     else if (gMain.newKeys & 0x1)
     {
         sub_8072DEC();
-        PlaySoundEffect(5);
+        PlaySE(5);
         gUnknown_08406298[gUnknown_02039314[GetMenuCursorPos()]].func(taskId);
     }
     else if (gMain.newKeys & 0x2)
     {
         sub_8072DEC();
-        PlaySoundEffect(5);
+        PlaySE(5);
         gUnknown_08406298[gUnknown_030007B4[gUnknown_02039314 - 1]].func(taskId);
     }
 }
@@ -222,25 +222,25 @@ void ItemStorageMenuProcessInput(u8 var)
 {
     if (gMain.newAndRepeatedKeys & 0x40)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         MoveMenuCursor(-1);
         ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]);
     }
     else if (gMain.newAndRepeatedKeys & 0x80)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         MoveMenuCursor(1);
         ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]);
     }
     else if (gMain.newKeys & 0x1)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         gUnknown_084062C0[GetMenuCursorPos()].func(var);
     }
     else if (gMain.newKeys & 0x2)
     {
         sub_8072DEC();
-        PlaySoundEffect(5);
+        PlaySE(5);
         gUnknown_084062C0[3].func(var);
     }
 }
@@ -353,7 +353,7 @@ void sub_813A280(u8 taskId)
     {
         if(data[0])
         {
-            PlaySoundEffect(5);
+            PlaySE(5);
             data[0] = MoveMenuCursor(-1);
             var = data[1] + data[0];
             if (!data[9])
@@ -372,7 +372,7 @@ void sub_813A280(u8 taskId)
         {
             if (!data[1])
                 return;
-            PlaySoundEffect(5);
+            PlaySE(5);
             data[1]--;
             sub_813AE0C(taskId);
             // probably further down
@@ -384,7 +384,7 @@ void sub_813A280(u8 taskId)
     {
         if(data[0] != data[4] - 1)
         {
-            PlaySoundEffect(5);
+            PlaySE(5);
             data[0] = MoveMenuCursor(1);
             var = data[1] + data[0];
 
@@ -398,7 +398,7 @@ void sub_813A280(u8 taskId)
         }
         else if(data[1] + data[0] != data[2])
         {
-            PlaySoundEffect(5);
+            PlaySE(5);
             data[1]++;
             sub_813AE0C(taskId);
 
@@ -412,7 +412,7 @@ void sub_813A280(u8 taskId)
         {
             if (data[0] + data[1] != data[2])
             {
-                PlaySoundEffect(5);
+                PlaySE(5);
                 data[9] = 1;
                 data[8] = data[1] + data[0];
                 sub_813AD58(0xFFF7);
@@ -422,14 +422,14 @@ void sub_813A280(u8 taskId)
         }
         else // _0813A3E8
         {
-            PlaySoundEffect(5); // merging?
+            PlaySE(5); // merging?
             sub_813AA30(taskId, 0);
             sub_813AE0C(taskId);
         }
     }
     else if(gMain.newKeys & A_BUTTON)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         if(!data[9])
         {
             if(data[1] + data[0] != data[2])
@@ -449,7 +449,7 @@ void sub_813A280(u8 taskId)
     }
     else if(gMain.newKeys & B_BUTTON)
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         if(!data[9])
         {
             sub_8072DEC();
@@ -554,7 +554,7 @@ void HandleQuantityRolling(u8 taskId)
     }
     else if(gMain.newKeys & A_BUTTON) // confirm quantity.
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         MenuZeroFillWindowRect(6, 6, 0xD, 0xB);
 
         if(!data[6])
@@ -564,7 +564,7 @@ void HandleQuantityRolling(u8 taskId)
     }
     else if(gMain.newKeys & B_BUTTON) // cancel quantity.
     {
-        PlaySoundEffect(5);
+        PlaySE(5);
         MenuZeroFillWindowRect(6, 6, 0xD, 0xB);
         sub_80F98DC(0);
         sub_80F98DC(1);
diff --git a/src/pokedex.c b/src/pokedex.c
index 688cae9e9..5ea1f9938 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -361,7 +361,7 @@ void Task_PokedexMainScreen(u8 taskId)
               0, 0, 0x10, 0);
             gSprites[gPokedexView->unk626].callback = sub_808EDB8;
             gTasks[taskId].func = sub_808CA64;
-            PlaySoundEffect(SE_PIN);
+            PlaySE(SE_PIN);
         }
         else if (gMain.newKeys & START_BUTTON)
         {
@@ -370,11 +370,11 @@ void Task_PokedexMainScreen(u8 taskId)
             gPokedexView->menuIsOpen = 1;
             gPokedexView->menuCursorPos = 0;
             gTasks[taskId].func = Task_PokedexMainScreenMenu;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
         else if (gMain.newKeys & SELECT_BUTTON)
         {
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
             gTasks[taskId].data[0] = sub_8091E3C();
             gPokedexView->unk64F = 0;
@@ -383,13 +383,13 @@ void Task_PokedexMainScreen(u8 taskId)
             gPokedexView->unk614 = gPokedexView->dexMode;
             gPokedexView->unk618 = gPokedexView->dexOrder;
             gTasks[taskId].func = sub_808CB8C;
-            PlaySoundEffect(SE_PC_LOGON);
+            PlaySE(SE_PC_LOGON);
         }
         else if (gMain.newKeys & B_BUTTON)
         {
             BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
             gTasks[taskId].func = Task_ClosePokedex;
-            PlaySoundEffect(SE_PC_OFF);
+            PlaySE(SE_PC_OFF);
         }
         else
         {
@@ -444,7 +444,7 @@ void Task_PokedexMainScreenMenu(u8 taskId)
                 case 3: //CLOSE POKEDEX
                     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
                     gTasks[taskId].func = Task_ClosePokedex;
-                    PlaySoundEffect(SE_PC_OFF);
+                    PlaySE(SE_PC_OFF);
                     break;
             }
         }
@@ -454,17 +454,17 @@ void Task_PokedexMainScreenMenu(u8 taskId)
         {
             gPokedexView->menuIsOpen = 0;
             gTasks[taskId].func = Task_PokedexMainScreen;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
         else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos != 0)
         {
             gPokedexView->menuCursorPos--;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
         else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 2)
         {
             gPokedexView->menuCursorPos++;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
     }
 }
@@ -562,7 +562,7 @@ void Task_PokedexResultsScreen(u8 taskId)
             gSprites[gPokedexView->unk626].callback = sub_808EDB8;
             BeginNormalPaletteFade(~a, 0, 0, 0x10, 0);
             gTasks[taskId].func = sub_808D118;
-            PlaySoundEffect(SE_PIN);
+            PlaySE(SE_PIN);
         }
         else if (gMain.newKeys & START_BUTTON)
         {
@@ -570,7 +570,7 @@ void Task_PokedexResultsScreen(u8 taskId)
             gPokedexView->menuIsOpen = 1;
             gPokedexView->menuCursorPos = 0;
             gTasks[taskId].func = Task_PokedexResultsScreenMenu;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
         else if (gMain.newKeys & SELECT_BUTTON)
         {
@@ -578,13 +578,13 @@ void Task_PokedexResultsScreen(u8 taskId)
             gTasks[taskId].data[0] = sub_8091E3C();
             gPokedexView->unk64F = 0;
             gTasks[taskId].func = sub_808CB8C;
-            PlaySoundEffect(SE_PC_LOGON);
+            PlaySE(SE_PC_LOGON);
         }
         else if (gMain.newKeys & B_BUTTON)
         {
             BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
             gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
-            PlaySoundEffect(SE_PC_OFF);
+            PlaySE(SE_PC_OFF);
         }
         else
         {
@@ -635,12 +635,12 @@ void Task_PokedexResultsScreenMenu(u8 taskId)
                 case 3: //BACK TO POKEDEX
                     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
                     gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
-                    PlaySoundEffect(SE_TRACK_DOOR);
+                    PlaySE(SE_TRACK_DOOR);
                     break;
                 case 4: //CLOSE POKEDEX
                     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
                     gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex;
-                    PlaySoundEffect(SE_PC_OFF);
+                    PlaySE(SE_PC_OFF);
                     break;
             }
         }
@@ -650,17 +650,17 @@ void Task_PokedexResultsScreenMenu(u8 taskId)
         {
             gPokedexView->menuIsOpen = 0;
             gTasks[taskId].func = Task_PokedexResultsScreen;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
         else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos)
         {
             gPokedexView->menuCursorPos--;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
         else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 3)
         {
             gPokedexView->menuCursorPos++;
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
         }
     }
 }
@@ -1371,7 +1371,7 @@ u16 sub_808E48C(u16 a, u16 b)
             gPokedexView->unk62C += (a - r6) * 16;
             sub_808E82C();
             sub_808E0CC(a, 0xE);
-            PlaySoundEffect(SE_Z_PAGE);
+            PlaySE(SE_Z_PAGE);
             goto _0808E5A2;
         }
         //_0808E53C
@@ -1387,7 +1387,7 @@ u16 sub_808E48C(u16 a, u16 b)
         gPokedexView->unk62C += (a - r6) * 16;
         sub_808E82C();
         sub_808E0CC(a, 0xE);
-        PlaySoundEffect(SE_Z_PAGE);
+        PlaySE(SE_Z_PAGE);
         goto _0808E5A2;
 
        _0808E5A2:
@@ -1402,7 +1402,7 @@ u16 sub_808E48C(u16 a, u16 b)
         sub_808E398(2, a);
         //goto _0808E60E
         sub_808DBE8(2, a, b);
-        PlaySoundEffect(SE_Z_SCROLL);
+        PlaySE(SE_Z_SCROLL);
     }
     //_0808E5E4
     else
@@ -1412,7 +1412,7 @@ u16 sub_808E48C(u16 a, u16 b)
         sub_808E398(1, a);
         //_0808E60E
         sub_808DBE8(1, a, b);
-        PlaySoundEffect(SE_Z_SCROLL);
+        PlaySE(SE_Z_SCROLL);
     }
     //_0808E60E
     goto _0808E5A2;
@@ -1511,7 +1511,7 @@ _0808E4E0:\n\
     movs r1, 0xE\n\
     bl sub_808E0CC\n\
     movs r0, 0x6D\n\
-    bl PlaySoundEffect\n\
+    bl PlaySE\n\
     b _0808E5A2\n\
     .align 2, 0\n\
 _0808E52C: .4byte gMain\n\
@@ -1566,7 +1566,7 @@ _0808E55A:\n\
     movs r1, 0xE\n\
     bl sub_808E0CC\n\
     movs r0, 0x6D\n\
-    bl PlaySoundEffect\n\
+    bl PlaySE\n\
 _0808E5A2:\n\
     mov r0, r10\n\
     cmp r0, 0\n\
@@ -1623,7 +1623,7 @@ _0808E60E:\n\
     adds r2, r4, 0\n\
     bl sub_808DBE8\n\
     movs r0, 0x6C\n\
-    bl PlaySoundEffect\n\
+    bl PlaySE\n\
     b _0808E5A2\n\
     .align 2, 0\n\
 _0808E620: .4byte gPokedexView\n\
@@ -2335,13 +2335,13 @@ void Task_PageScreenProcessInput(u8 taskId)
     {
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         gTasks[taskId].func = sub_808F888;
-        PlaySoundEffect(SE_Z_SCROLL);
+        PlaySE(SE_Z_SCROLL);
     }
     else if (gMain.newKeys & B_BUTTON)
     {
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         gTasks[taskId].func = Task_ClosePageScreen;
-        PlaySoundEffect(SE_PC_OFF);
+        PlaySE(SE_PC_OFF);
     }
     else if (gMain.newKeys & A_BUTTON)
     {
@@ -2353,21 +2353,21 @@ void Task_PageScreenProcessInput(u8 taskId)
         case AREA_SCREEN:
             BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
             gTasks[taskId].func = Task_InitAreaScreenMultistep;
-            PlaySoundEffect(SE_PIN);
+            PlaySE(SE_PIN);
             break;
         case CRY_SCREEN:
             BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
             gTasks[taskId].func = Task_InitCryScreenMultistep;
-            PlaySoundEffect(SE_PIN);
+            PlaySE(SE_PIN);
             break;
         case SIZE_SCREEN:
             if (!gUnknown_0202FFBC->owned)
-                PlaySoundEffect(SE_HAZURE);
+                PlaySE(SE_HAZURE);
             else
             {
                 BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
                 gTasks[taskId].func = Task_InitSizeScreenMultistep;
-                PlaySoundEffect(SE_PIN);
+                PlaySE(SE_PIN);
             }
             break;
         }
@@ -2378,7 +2378,7 @@ void Task_PageScreenProcessInput(u8 taskId)
     {
         gPokedexView->selectedScreen--;
         sub_8090584(gPokedexView->selectedScreen, 0xD);
-        PlaySoundEffect(SE_Z_PAGE);
+        PlaySE(SE_Z_PAGE);
     }
     else if (((gMain.newKeys & DPAD_RIGHT)
      || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
@@ -2386,7 +2386,7 @@ void Task_PageScreenProcessInput(u8 taskId)
     {
         gPokedexView->selectedScreen++;
         sub_8090584(gPokedexView->selectedScreen, 0xD);
-        PlaySoundEffect(SE_Z_PAGE);
+        PlaySE(SE_Z_PAGE);
     }
 }
 
@@ -2581,7 +2581,7 @@ void Task_CryScreenProcessInput(u8 taskId)
             m4aMPlayContinue(&gMPlay_BGM);
             gPokedexView->unk64F = 1;
             gTasks[taskId].func = sub_808FFBC;
-            PlaySoundEffect(SE_PC_OFF);
+            PlaySE(SE_PC_OFF);
         }
         else if ((gMain.newKeys & DPAD_LEFT)
          || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
@@ -2590,20 +2590,20 @@ void Task_CryScreenProcessInput(u8 taskId)
             m4aMPlayContinue(&gMPlay_BGM);
             gPokedexView->unk64F = 2;
             gTasks[taskId].func = sub_808FFBC;
-            PlaySoundEffect(SE_Z_PAGE);
+            PlaySE(SE_Z_PAGE);
         }
         else if ((gMain.newKeys & DPAD_RIGHT)
          || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
         {
             if (!gUnknown_0202FFBC->owned)
-                PlaySoundEffect(SE_HAZURE);
+                PlaySE(SE_HAZURE);
             else
             {
                 BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
                 m4aMPlayContinue(&gMPlay_BGM);
                 gPokedexView->unk64F = 3;
                 gTasks[taskId].func = sub_808FFBC;
-                PlaySoundEffect(SE_Z_PAGE);
+                PlaySE(SE_Z_PAGE);
             }
         }
     }
@@ -2737,7 +2737,7 @@ void Task_SizeScreenProcessInput(u8 taskId)
         BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
         gPokedexView->unk64F = 1;
         gTasks[taskId].func = sub_8090498;
-        PlaySoundEffect(SE_PC_OFF);
+        PlaySE(SE_PC_OFF);
     }
     //_08090430
     else if ((gMain.newKeys & DPAD_LEFT)
@@ -2746,7 +2746,7 @@ void Task_SizeScreenProcessInput(u8 taskId)
         BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
         gPokedexView->unk64F = 2;
         gTasks[taskId].func = sub_8090498;
-        PlaySoundEffect(SE_Z_PAGE);
+        PlaySE(SE_Z_PAGE);
     }
 }
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index f8c684161..58722010f 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -94,7 +94,7 @@ void Task_RecordMixing_SoundEffect(u8 taskId)
     gTasks[taskId].data[0]++;
     if (gTasks[taskId].data[0] == 50)
     {
-        PlaySoundEffect(SE_W213);
+        PlaySE(SE_W213);
         gTasks[taskId].data[0] = 0;
     }
 }
@@ -128,7 +128,7 @@ void Task_RecordMixing_Main(u8 taskId)
     case 2:
         taskData[10] = CreateTask(sub_80BA00C, 10);
         taskData[TD_STATE] = 3;
-        PlaySoundEffect(SE_W226);
+        PlaySE(SE_W226);
         break;
     case 3:        // wait for sub_80BA00C
         if (!gTasks[taskData[10]].isActive)
@@ -187,14 +187,14 @@ void sub_80B95F0(u8 taskId)
         {
             if (players == sub_800820C())
             {
-                PlaySoundEffect(0x15);
+                PlaySE(0x15);
                 task->data[TD_STATE] = 201;
                 task->data[12] = 0;
             }
         }
         else
         {
-            PlaySoundEffect(0x16);
+            PlaySE(0x16);
             task->data[TD_STATE] = 301;
         }
         break;
diff --git a/src/rom4.c b/src/rom4.c
index 9ed08aa7f..79ac6d769 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -2203,28 +2203,28 @@ void sub_80557E8(void)
 
 void sub_80557F4(void)
 {
-    PlaySoundEffect(SE_WIN_OPEN);
+    PlaySE(SE_WIN_OPEN);
     sub_8071310();
     ScriptContext2_Enable();
 }
 
 void sub_8055808(u8 *script)
 {
-    PlaySoundEffect(SE_SELECT);
+    PlaySE(SE_SELECT);
     ScriptContext1_SetupScript(script);
     ScriptContext2_Enable();
 }
 
 void sub_8055824(void)
 {
-    PlaySoundEffect(SE_WIN_OPEN);
+    PlaySE(SE_WIN_OPEN);
     ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink);
     ScriptContext2_Enable();
 }
 
 void sub_8055840(u8 *script)
 {
-    PlaySoundEffect(SE_SELECT);
+    PlaySE(SE_SELECT);
     ScriptContext1_SetupScript(script);
     ScriptContext2_Enable();
 }
diff --git a/src/rom6.c b/src/rom6.c
index a8c489e70..a2b52c9aa 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -150,7 +150,7 @@ int FldEff_RockSmash(void)
 
 static void sub_810B58C(void)
 {
-    PlaySoundEffect(SE_W088);
+    PlaySE(SE_W088);
     FieldEffectActiveListRemove(0x25);
     EnableBothScriptContexts();
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index fa3467d22..136181bd3 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -807,7 +807,7 @@ bool8 ScrCmd_countpokemon(struct ScriptContext *ctx)
 
 bool8 ScrCmd_playsfx(struct ScriptContext *ctx)
 {
-    PlaySoundEffect(ScriptReadHalfword(ctx));
+    PlaySE(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
@@ -1787,7 +1787,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
     x += 7;
     y += 7;
-    PlaySoundEffect(sub_8058790(x, y));
+    PlaySE(sub_8058790(x, y));
     FieldAnimateDoorOpen(x, y);
     return FALSE;
 }
diff --git a/src/script_menu.c b/src/script_menu.c
index 38f7f0af5..eba438397 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -672,7 +672,7 @@ void sub_80B52B4(u8 taskId)
             {
                 if (!gTasks[taskId].data[4])
                 {
-                    PlaySoundEffect(5);
+                    PlaySE(5);
                     gScriptResult = 127;
                 }
                 else
@@ -770,7 +770,7 @@ void task_yes_no_maybe(u8 taskId)
         return;
     case -1:
     case 1:
-        PlaySoundEffect(5);
+        PlaySE(5);
         gScriptResult = 0;
         break;
     case 0:
@@ -835,7 +835,7 @@ void sub_80B5684(u8 taskId)
         {
             if (!gTasks[taskId].data[4])
             {
-                PlaySoundEffect(5);
+                PlaySE(5);
                 gScriptResult = 127;
             }
             else
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 2efc0e2c6..ce62f2abb 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -169,13 +169,13 @@ void sub_80F9C6C(u8 var)
         switch(sub_806BD80(var))
         {
             case 1:
-                PlaySoundEffect(5);
+                PlaySE(5);
                 gUnknown_02038694 = sub_806CA38(var);
                 gSpecialVar_0x8004 = gUnknown_02038694;
                 sub_8123138(var);
                 break;
             case 2:
-                PlaySoundEffect(5);
+                PlaySE(5);
                 gUnknown_02038694 = 0xFF;
                 gSpecialVar_0x8004 = 0xFF;
                 sub_8123138(var);
@@ -268,13 +268,13 @@ void sub_80F9E64(u8 var)
         switch(sub_806BD80(var))
         {
             case 1:
-                PlaySoundEffect(5);
+                PlaySE(5);
                 gSpecialVar_0x8004 = sub_806CA38(var);
                 gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]);
                 sub_8123138(var);
                 break;
             case 2:
-                PlaySoundEffect(5);
+                PlaySE(5);
                 gSpecialVar_0x8004 = 0xFF;
                 sub_8123138(var);
         }
diff --git a/src/shop.c b/src/shop.c
index 27aa5b335..780dff02a 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -106,7 +106,7 @@ void sub_80B2E38(u8 var)
     {
         if(gUnknown_03000708.unk9)
         {
-            PlaySoundEffect(0x5);
+            PlaySE(0x5);
             gUnknown_03000708.unk9 = MoveMenuCursor(-1);
         }
     }
@@ -114,13 +114,13 @@ void sub_80B2E38(u8 var)
     {
         if(gUnknown_03000708.unk9 != gUnknown_03000708.unkA)
         {
-            PlaySoundEffect(0x5);
+            PlaySE(0x5);
             gUnknown_03000708.unk9 = MoveMenuCursor(1);
         }
     }
     else if (gMain.newKeys & 1)
     {
-        PlaySoundEffect(0x5);
+        PlaySE(0x5);
         if(!gUnknown_03000708.unkC)
         {
             gUnknown_083CC6D0[gUnknown_083CC6E8[gUnknown_03000708.unk9]].func(local);
@@ -132,7 +132,7 @@ void sub_80B2E38(u8 var)
     }
     else if(gMain.newKeys & 2)
     {
-        PlaySoundEffect(0x5);
+        PlaySE(0x5);
         HandleShopMenuQuit(local);
     }
 }
diff --git a/src/sound.c b/src/sound.c
index 897b13ddf..ed69ca01d 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -521,12 +521,12 @@ void PlayBGM(u16 songNum)
     m4aSongNumStart(songNum);
 }
 
-void PlaySoundEffect(u16 songNum)
+void PlaySE(u16 songNum)
 {
     m4aSongNumStart(songNum);
 }
 
-void PlaySoundEffect12WithPanning(u16 songNum, s8 pan)
+void PlaySE12WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
     m4aMPlayImmInit(&gMPlay_SE1);
@@ -535,14 +535,14 @@ void PlaySoundEffect12WithPanning(u16 songNum, s8 pan)
     m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
 }
 
-void PlaySoundEffect1WithPanning(u16 songNum, s8 pan)
+void PlaySE1WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
     m4aMPlayImmInit(&gMPlay_SE1);
     m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
 }
 
-void PlaySoundEffect2WithPanning(u16 songNum, s8 pan)
+void PlaySE2WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
     m4aMPlayImmInit(&gMPlay_SE2);
diff --git a/src/start_menu.c b/src/start_menu.c
index 4c3a0b6e1..37d361c0b 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -315,17 +315,17 @@ static u8 StartMenu_InputProcessCallback(void)
 {
     if (gMain.newKeys & DPAD_UP)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         sStartMenuCursorPos = MoveMenuCursor(-1);
     }
     if (gMain.newKeys & DPAD_DOWN)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         sStartMenuCursorPos = MoveMenuCursor(1);
     }
     if (gMain.newKeys & A_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback)
         {
             if (GetNationalPokedexCount(0) == 0)
@@ -566,7 +566,7 @@ static bool8 SaveDialogCheckForTimeoutOrKeypress(void)
     saveDialogTimer--;
     if (gMain.heldKeys & A_BUTTON)
     {
-        PlaySoundEffect(SE_SELECT);
+        PlaySE(SE_SELECT);
         return TRUE;
     }
     else if (saveDialogTimer == 0)
@@ -702,7 +702,7 @@ static u8 SaveDialogCB_SaveSuccess(void)
 {
     if (MenuUpdateWindowText())
     {
-        PlaySoundEffect(SE_SAVE);
+        PlaySE(SE_SAVE);
         saveDialogCallback = SaveDialogCB_ReturnSuccess;
     }
     return SAVE_IN_PROGRESS;
@@ -723,7 +723,7 @@ static u8 SaveDialogCB_SaveError(void)
 {
     if (MenuUpdateWindowText())
     {
-        PlaySoundEffect(SE_BOO);
+        PlaySE(SE_BOO);
         saveDialogCallback = SaveDialogCB_ReturnError;
     }
     return SAVE_IN_PROGRESS;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index e133c6212..6ef410d21 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -455,7 +455,7 @@ static void Task_StarterChoose5(u8 taskId)
             break;
         case 1:  // NO
         case -1: // B button
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             MenuZeroFillWindowRect(21, 7, 27, 12);
 
             spriteId = gTasks[taskId].tPkmnSpriteId;
diff --git a/src/text.c b/src/text.c
index ee5089c4d..7be72833a 100644
--- a/src/text.c
+++ b/src/text.c
@@ -136,7 +136,7 @@ static u8 ExtCtrlCode_Escape(struct Window *);
 static u8 ExtCtrlCode_Nop2(struct Window *);
 static u8 ExtCtrlCode_SetCursorY(struct Window *);
 static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *);
-static u8 ExtCtrlCode_PlaySoundEffect(struct Window *);
+static u8 ExtCtrlCode_PlaySE(struct Window *);
 static u8 ExtCtrlCode_Skip(struct Window *);
 static u8 ExtCtrlCode_SetCursorX(struct Window *);
 static u8 ExtCtrlCode_SkipTo(struct Window *);
@@ -380,7 +380,7 @@ static const ExtCtrlCodeFunc sExtCtrlCodeFuncs[] =
     ExtCtrlCode_Nop2,
     ExtCtrlCode_SetCursorY,
     ExtCtrlCode_ClearWindowTextLines,
-    ExtCtrlCode_PlaySoundEffect,
+    ExtCtrlCode_PlaySE,
     ExtCtrlCode_Skip,
     ExtCtrlCode_SetCursorX,
     ExtCtrlCode_SkipTo,
@@ -2197,11 +2197,11 @@ static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *win)
     return 2;
 }
 
-static u8 ExtCtrlCode_PlaySoundEffect(struct Window *win)
+static u8 ExtCtrlCode_PlaySE(struct Window *win)
 {
     u16 loByte = win->text[win->textIndex++];
     u16 hiByte = win->text[win->textIndex++] << 8;
-    PlaySoundEffect(loByte | hiByte);
+    PlaySE(loByte | hiByte);
     return 2;
 }
 
@@ -2377,7 +2377,7 @@ static u8 UpdateWindowText(struct Window *win)
         {
             if (gMain.newKeys & (A_BUTTON | B_BUTTON))
             {
-                PlaySoundEffect(SE_SELECT);
+                PlaySE(SE_SELECT);
             }
             else
             {
@@ -3187,7 +3187,7 @@ static u8 WaitWithDownArrow(struct Window *win)
     {
         if (gMain.newKeys & (A_BUTTON | B_BUTTON))
         {
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             TryEraseDownArrow(win);
         }
         else
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 945d469e3..e6ed79c15 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -662,7 +662,7 @@ bool8 sub_80938CC(struct Task *task)
 bool8 sub_8093918(struct Task *task)
 {
     sub_8093A28();
-    PlaySoundEffect(SE_CARD);
+    PlaySE(SE_CARD);
 
     ewram0.var_0 += 1;
 
diff --git a/src/wallclock.c b/src/wallclock.c
index f8c3fdeea..0f3665c65 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -429,13 +429,13 @@ static void Task_SetClock4(u8 taskId)
     switch (ProcessMenuInputNoWrap_())
     {
         case 0:     //YES
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             gTasks[taskId].func = Task_SetClock5;   //Move on
             return;
         case -1:    //B button
         case 1:     //NO
             sub_8072DEC();
-            PlaySoundEffect(SE_SELECT);
+            PlaySE(SE_SELECT);
             MenuZeroFillWindowRect(23, 8, 29, 13);
             MenuZeroFillWindowRect(2, 16, 27, 19);
             gTasks[taskId].func = Task_SetClock2;   //Go back and let player adjust clock