diff --git a/include/functions.h b/include/functions.h
index fce407e2f2..022bafdc87 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -227,9 +227,9 @@ f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by);
 f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
 void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
 
-s32 func_801499EC(s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
-s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
-s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
+s32 sfx_adjust_env_sound_pos(s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
+s32 sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
+s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
 s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2);
 
 s32 basic_window_update(void);
diff --git a/include/map.h b/include/map.h
index f0d6b7b0c3..100cecb208 100644
--- a/include/map.h
+++ b/include/map.h
@@ -43,7 +43,7 @@ typedef struct Map {
     /* 0x14 */ char* bgName;
     /* 0x18 */ MapInit init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
     /* 0x1C */ s16 unk_1C; // Unused?
-    /* 0x1E */ s8 songVariation; ///< 0 or 1. @see get_song_variation_override_for_cur_map
+    /* 0x1E */ s8 songVariation; ///< 0 or 1. @see bgm_get_map_default_variation
     /* 0x1F */ s8 flags;
 } Map; // size = 0x20
 
@@ -266,7 +266,7 @@ s32 func_800490B4(s32 arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4);
 Area gAreas[29];
 
 /// Lists the songs that are forced to use the variation determined by `map.songVariation & 1`.
-/// @see get_song_variation_override_for_cur_map
+/// @see bgm_get_map_default_variation
 extern SongID gSongsUsingVariationFlag[6];
 extern s16 D_8014F738;
 
diff --git a/include/variables.h b/include/variables.h
index de15bb074f..e56ac10352 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -236,7 +236,7 @@ extern s32 D_801083D8;
 extern s32 D_80108068;
 extern s32 D_80104BEC;
 extern Temp8010EBB0 D_8010EBB0; // something with partners
-extern Temp8010F250 D_8010F250; // play_sound state struct?
+extern Temp8010F250 D_8010F250; // sfx_play_sound state struct?
 
 // Effects
 extern EffectTableEntry gEffectTable[135];
diff --git a/src/audio.h b/src/audio.h
index 33cf8ed547..93e735290d 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -3,7 +3,7 @@
 
 #include "common.h"
 
-struct UnkAlA9C;
+struct BGMPlayer;
 struct UnkAl19E0;
 
 typedef void (*UnkFuncAl)();
@@ -34,14 +34,14 @@ typedef struct UnkAl1 {
     /* 0x1A */ s16 unk_1A;
 } UnkAl1; // size unknown (currently 0x1C)
 
-typedef struct UnkAl4 { // maybe same as UnkAlC?
+typedef struct InstrumentCFG { // maybe same as UnkAlC?
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ u8 unk_02;
     /* 0x03 */ s8 unk_03;
     /* 0x04 */ s8 unk_04;
     /* 0x05 */ s8 unk_05;
     /* 0x06 */ s8 unk_06;
-} UnkAl4;
+} InstrumentCFG;
 
 typedef struct UnkLen18 {
     /* 0x00 */ u16 unk_00;
@@ -94,22 +94,23 @@ typedef struct UnkAl0 {
     /* 0x28 */ s32* unk_28;
 } UnkAl0;
 
-typedef struct UnkAlA {
-    /* 0x0 */ s16 unk_00;
-    /* 0x2 */ s16 unk_02;
-    /* 0x4 */ s16 unk_04;
-    /* 0x6 */ s16 unk_06;
-    /* 0x8 */ s8 unk_08;
-} UnkAlA; // size = 0xA
+typedef struct SoundSFXEntry {
+    /* 0x0 */ s16 soundID;
+    /* 0x2 */ s16 upperSoundID;
+    /* 0x4 */ s16 volume;
+    /* 0x6 */ s16 pitchShift;
+    /* 0x8 */ s8 pan;
+    /* 0x9 */ char unk_9[0x1];
+} SoundSFXEntry; // size = 0xA
 
-typedef struct UnkAlAC {
-    /* 0x00 */ s32 unk_00;
+typedef struct SoundPlayer {
+    /* 0x00 */ s32 counter;
     /* 0x04 */ char unk_04[0x58];
     /* 0x5C */ u16 unk_5C;
     /* 0x5E */ char unk_5E[0x1A];
-    /* 0x78 */ u8 unk_78;
-    /* 0x79 */ u8 unk_79;
-    /* 0x7A */ u8 unk_7A;
+    /* 0x78 */ u8 locatorB;
+    /* 0x79 */ u8 locatorC;
+    /* 0x7A */ u8 locatorD;
     /* 0x7B */ u8 unk_7B;
     /* 0x7C */ u8 unk_7C;
     /* 0x7D */ u8 unk_7D;
@@ -129,17 +130,24 @@ typedef struct UnkAlAC {
     /* 0x9E */ u8 unk_9E;
     /* 0x9F */ u8 unk_9F;
     /* 0xA0 */ char unk_A0[0xC];
-} UnkAlAC; // size = 0xAC
+} SoundPlayer; // size = 0xAC
 
-typedef struct UnkAl6CC {
-    /* 0x000 */ struct UnkAl19E0* unk_00;
+typedef struct SoundSefHeader {
+    /* 0x00 */ char unk_00[0x10];
+    /* 0x10 */ s16 groupOffsets[8];
+    /* 0x20 */ char unk_20[0x2];
+} SoundSefHeader; // size = 0x22
+
+typedef struct SoundManager {
+    /* 0x000 */ struct UnkAl19E0* soundData;
     /* 0x004 */ char unk_04[0x4];
-    /* 0x008 */ s32* unk_08;
-    /* 0x00C */ char unk_0C[0x24];
-    /* 0x030 */ s32 unk_30;
-    /* 0x034 */ s32 unk_34;
-    /* 0x038 */ s32 unk_38;
-    /* 0x03C */ s32 unk_3C;
+    /* 0x008 */ s32* sefData;
+    /* 0x00C */ s32* normalSounds[8];
+    /* 0x02C */ s32* soundsWithBit2000;
+    /* 0x030 */ s32 playCounter; //?
+    /* 0x034 */ s32 unkCounterStep;
+    /* 0x038 */ s32 unkCounterMax;
+    /* 0x03C */ s32 unkCounter;
     /* 0x040 */ UnkAl1 unk_40;
     /* 0x05C */ s32 unk_5C;
     /* 0x060 */ s32 unk_60;
@@ -153,20 +161,20 @@ typedef struct UnkAl6CC {
     /* 0x0B8 */ u16 unk_B8;
     /* 0x0BA */ s16 unk_BA;
     /* 0x0BC */ u8 unk_BC;
-    /* 0x0BD */ u8 unk_BD;
+    /* 0x0BD */ u8 sfxPlayerSelector;
     /* 0x0BE */ u8 unk_BE;
     /* 0x0BF */ char unk_BF[0x1];
     /* 0x0C0 */ s8 unk_C0;
     /* 0x0C1 */ char unk_C1[0x1];
-    /* 0x0C2 */ UnkAlA unk_C2[16];
+    /* 0x0C2 */ SoundSFXEntry unk_C2[16];
     /* 0x162 */ s8 unk_162;
-    /* 0x163 */ s8 unk_163;
-    /* 0x164 */ s8 unk_164;
+    /* 0x163 */ u8 sfxQueuePosOffset;
+    /* 0x164 */ u8 sfxQueueNextPos;
     /* 0x165 */ s8 unk_165;
     /* 0x166 */ char unk_166[0x2];
     /* 0x168 */ s32 unk_168;
-    /* 0x16C */ UnkAlAC unk_16C[8];
-} UnkAl6CC;
+    /* 0x16C */ SoundPlayer unk_16C[8];
+} SoundManager;
 
 typedef struct UnkAlC {
     /* 0x0 */ s16 unk_00;
@@ -180,18 +188,18 @@ typedef struct UnkAlC {
     /* 0xA */ s8 unk_0A;
 } UnkAlC;
 
-typedef struct UnkAl30 {
-    /* 0x00 */ s32* unk_00;
-    /* 0x04 */ s32 unk_04;
-    /* 0x08 */ s32 unk_08;
-    /* 0x0C */ s32 unk_0C;
-    /* 0x10 */ s32 unk_10;
-    /* 0x14 */ s32 unk_14;
-    /* 0x18 */ s32* unk_18;
+typedef struct Instrument {
+    /* 0x00 */ s32 wavOffset;
+    /* 0x04 */ s32 wavLength;
+    /* 0x08 */ s32 loopPredictorOffset;
+    /* 0x0C */ s32 loopStart;
+    /* 0x10 */ s32 loopEnd;
+    /* 0x14 */ s32 loopCount;
+    /* 0x18 */ s32 predictorOffset;
     /* 0x1C */ s16 unk_1C;
     /* 0x1E */ s16 unk_1E;
-    /* 0x20 */ f32 unk_20;
-    /* 0x24 */ s8 unk_24;
+    /* 0x20 */ f32 sampleRate;
+    /* 0x24 */ s8 skipLoopPredictor;
     /* 0x25 */ s8 unk_25;
     /* 0x26 */ s8 unk_26;
     /* 0x27 */ s8 unk_27;
@@ -199,8 +207,10 @@ typedef struct UnkAl30 {
     /* 0x29 */ s8 unk_29;
     /* 0x2A */ s8 unk_2A;
     /* 0x2B */ s8 unk_2B;
-    /* 0x2C */ s32* unk_2C;
-} UnkAl30;
+    /* 0x2C */ s32 unkOffset;
+} Instrument;
+
+typedef Instrument* Instruments[16];
 
 typedef struct UnkAl48 { // Track?
     /* 0x00 */ s32 unk_00; // pointer to something
@@ -236,10 +246,17 @@ typedef struct UnkAl48 { // Track?
     /* 0x46 */ char unk_46[2];
 } UnkAl48; // size = 0x48
 
-typedef struct UnkTemp2 {
-    /* 0x00 */ s32 unk_00;
-    /* 0x08 */ s32 unk_04;
-} UnkTemp2;
+typedef struct SBNFileEntry {
+    /* 0x0 */ s32 offset;
+    /* 0x4 */ s8 fmt;
+    /* 0x5 */ char unk_05;
+    /* 0x6 */ s16 length;
+} SBNFileEntry; // size = 0x8
+
+typedef struct InitSongEntry {
+    /* 0x0 */ s16 bgmFileIndex; // required BGM file
+    /* 0x2 */ s16 bkFileIndex[3]; // optional BK files for this track
+} InitSongEntry; // size = 0x8
 
 typedef struct UnkAl19E0Sub {
     /* 0x0 */ u16 unk_0;
@@ -254,111 +271,108 @@ typedef struct UnkAl19E0Sub2 {
 } UnkAl19E0Sub2;
 
 typedef struct UnkAl19E0Sub3 {
-    /* 0x00 */ struct UnkAlA9C* unk_0;
+    /* 0x00 */ struct BGMPlayer* unk_0;
     /* 0x04 */ s8 unk_4;
     /* 0x05 */ s8 unk_5;
 } UnkAl19E0Sub3;
 
+typedef struct SoundBank {
+    /* 0x000 */ char unk_00[0xE];
+    /* 0x00E */ u8 swizzled;
+    /* 0x010 */ char unk_0F[0x831];
+} SoundBank; // size = 0x840
+
 typedef struct UnkAl19E0 {
-    /* 0x0000 */ f32 unk_00;
-    /* 0x0004 */ UnkAl30* unk_04;
+    /* 0x0000 */ f32 actualFrequency;
+    /* 0x0004 */ Instrument* defaultInstrument;
     /* 0x0008 */ UnkAlC unk_08;
-    /* 0x0014 */ UnkAl4 unk_14;
-    /* 0x001C */ s32 unk_1C;
-    /* 0x0020 */ UnkTemp2* unk_20;
-    /* 0x0024 */ s32 unk_24;
+    /* 0x0014 */ InstrumentCFG defaultPRGEntry;
+    /* 0x001C */ s32 baseRomOffset;
+    /* 0x0020 */ SBNFileEntry* sbnFileList;
+    /* 0x0024 */ s32 fileListLength;
     /* 0x0028 */ char unk_28[0x4];
-    /* 0x002C */ s32* unk_2C;
-    /* 0x0030 */ char unk_30[0x4];
-    /* 0x0034 */ s32 unk_34;
-    /* 0x0038 */ s32 unk_38;
-    /* 0x003C */ UnkAl19E0Sub* unk_3C;
+    /* 0x002C */ InitSongEntry* songList;
+    /* 0x0030 */ s32 songListLength;
+    /* 0x0034 */ s32 bkFileListOffset;
+    /* 0x0038 */ s32 bkListLength;
+    /* 0x003C */ UnkAl19E0Sub* mseqFileList;
     /* 0x0040 */ UnkAl19E0Sub2 unk_40[4];
     /* 0x0050 */ u8 unk_50;
     /* 0x0051 */ u8 unk_51;
     /* 0x0052 */ u8 unk_52;
     /* 0x0053 */ u8 unk_53;
-    /* 0x0054 */ s32* unk_54;
-    /* 0x0058 */ s32* unk_58;
+    /* 0x0054 */ s32* dataPER;
+    /* 0x0058 */ s32* dataPRG;
     /* 0x005C */ s32* unk_5C;
     /* 0x0060 */ s32* unk_60;
     /* 0x0064 */ s32* unk_64;
     /* 0x0068 */ s32* unk_68;
     /* 0x006C */ UnkAl19E0Sub3 unk_6C[1];
-    /* 0x0074 */ char unk_74[0xC];
+    /* 0x0074 */ char unk_74[0x8];
+    /* 0x007C */ s32 unkSongName;
     /* 0x0080 */ s32 unk_80;
-    /* 0x0084 */ char unk_84[0x10];
+    /* 0x0084 */ s32 unkFadeTime;
+    /* 0x0088 */ s32 unkFadeStart;
+    /* 0x008C */ s32 unkFadeEnd;
+    /* 0x0090 */ s32* unk_90;
     /* 0x0094 */ s32* unk_94;
     /* 0x0098 */ s32* unk_98;
     /* 0x009C */ s32 unk_9C;
-    /* 0x00A0 */ s32* unk_A0;
+    /* 0x00A0 */ s32* dataSEF;
     /* 0x00A4 */ UnkFuncAl unk_A4[2];
-    /* 0x00AC */ s32* unk_AC;
-    /* 0x00B0 */ char unk_B0[0x3C];
-    /* 0x00EC */ s32* unk_EC;
-    /* 0x00F0 */ char unk_F0[0x3FC];
-    /* 0x04EC */ s32* unk_4EC;
-    /* 0x04F0 */ char unk_4F0[0xFC];
-    /* 0x05EC */ s32* unk_5EC;
-    /* 0x05F0 */ char unk_5F0[0x3FC];
-    /* 0x09EC */ s32* unk_9EC;
-    /* 0x09F0 */ char unk_9F0[0x3FC];
-    /* 0x0DEC */ s32* unk_DEC;
-    /* 0x0DF0 */ char unk_DF0[0x3FC];
-    /* 0x11EC */ s32* unk_11EC;
-    /* 0x11F0 */ char unk_11F0[0xFC];
-    /* 0x12EC */ s32* unk_12EC;
-    /* 0x12F0 */ s32* unk_12F0;
-    /* 0x12F4 */ s32* unk_12F4;
-    /* 0x12F8 */ s32* unk_12F8;
-    /* 0x12FC */ s32* unk_12FC;
-    /* 0x1300 */ s32* unk_1300;
-    /* 0x1304 */ s32* unk_1304;
-    /* 0x1308 */ s32* unk_1308;
+    /* 0x00AC */ Instruments instrumentGroupX[1];
+    /* 0x00EC */ Instruments instrumentGroup3[16];
+    /* 0x04EC */ Instruments instrumentGroup1[4];
+    /* 0x05EC */ Instruments instrumentGroup2[16];
+    /* 0x09EC */ Instruments instrumentGroup4[16];
+    /* 0x0DEC */ Instruments instrumentGroup5[16];
+    /* 0x11EC */ Instruments instrumentGroup6[4];
+    /* 0x12EC */ Instruments* instrumentGroups[8];
     /* 0x130C */ u8 unk_130C;
     /* 0x130D */ char unk_130D[3];
-    /* 0x1310 */ s32* unk_1310[3];
+    /* 0x1310 */ s32* banks[3];
     /* 0x131C */ char unk_131C[4];
     /* 0x1320 */ UnkAl48 unk_1320[24];
 } UnkAl19E0; // size = 0x19E0
 
-typedef struct UnkAl60 {
-    /* 0x00 */ u32 unk_00;
+typedef struct BGMPlayerTrack {
+    /* 0x00 */ u32 bgmReadPos;
     /* 0x04 */ u32 unk_04;
     /* 0x08 */ char unk_08[0x4];
     /* 0x0C */ s32 unk_0C;
     /* 0x10 */ s32 unk_10;
     /* 0x14 */ char unk_14[0x4];
-    /* 0x18 */ s32 unk_18;
-    /* 0x1C */ s32 unk_1C;
-    /* 0x20 */ s32 unk_20;
-    /* 0x24 */ s32 unk_24[2];
+    /* 0x18 */ s32 subTrackVolume;
+    /* 0x1C */ s32 subTrackVolumeFadeDelta;
+    /* 0x20 */ s32 subTrackVolumeFadeVolume;
+    /* 0x24 */ s32 subTrackVolumeFadeTime;
+    /* 0x28 */ s32 unk_28;
     /* 0x2C */ char unk_2C[0xC];
-    /* 0x38 */ u16 unk_38;
-    /* 0x3A */ s16 unk_3A;
+    /* 0x38 */ u16 segTrackTune;
+    /* 0x3A */ s16 trackTremoloAmount;
     /* 0x3C */ char unk_3C[0x2];
     /* 0x3E */ s16 unk_3E;
-    /* 0x40 */ s8 unk_40;
-    /* 0x41 */ s8 unk_41;
-    /* 0x42 */ s8 unk_42;
-    /* 0x43 */ s8 unk_43;
+    /* 0x40 */ s8 tuneChanged;
+    /* 0x41 */ s8 volumeChanged;
+    /* 0x42 */ s8 panChanged;
+    /* 0x43 */ s8 reverbChanged;
     /* 0x44 */ u16 unk_44;
-    /* 0x46 */ u16 unk_46;
-    /* 0x48 */ u8 unk_48;
-    /* 0x49 */ u8 unk_49;
-    /* 0x4A */ u8 unk_4A;
-    /* 0x4B */ u8 unk_4B;
+    /* 0x46 */ u16 subTrackCoarseTune;
+    /* 0x48 */ u8 subTrackFineTune;
+    /* 0x49 */ u8 segTrackVolume;
+    /* 0x4A */ u8 subTrackPan;
+    /* 0x4B */ u8 subTrackReverb;
     /* 0x4C */ u8 unk_4C;
     /* 0x4D */ char unk_4D[0x8];
-    /* 0x55 */ s8 unk_55;
-    /* 0x56 */ s8 unk_56;
+    /* 0x55 */ s8 trackTremoloSpeed;
+    /* 0x56 */ s8 trackTremoloTime;
     /* 0x57 */ s8 unk_57;
     /* 0x58 */ u8 unk_58;
     /* 0x59 */ char unk_59[0x2];
-    /* 0x5B */ s8 unk_5B;
+    /* 0x5B */ s8 subtrackReverbType;
     /* 0x5C */ u8 unk_5C;
     /* 0x5D */ char unk_5D[0x3];
-} UnkAl60; // size = 0x60;
+} BGMPlayerTrack; // size = 0x60;
 
 typedef struct UnkAl24 {
     /* 0x00 */ char unk_00[0x8];
@@ -371,18 +385,30 @@ typedef struct UnkAl24 {
     /* 0x17 */ u8 unk_17;
 } UnkAl24; // size = 0x18;
 
-typedef struct UnkAlA9C {
-    /* 0x000 */ UnkAl19E0* unk_00;
-    /* 0x004 */ UnkAl6CC* unk_04;
-    /* 0x008 */ s32 unk_08;
+typedef struct Fade {
+    /* 0x0 */ UnkField currentVolume;
+    /* 0x4 */ s32 fadeStep;
+    /* 0x8 */ s16 endVolume;
+    /* 0xA */ s16 fadeTime;
+    /* 0xC */ UnkFuncAl fpFadeCallback;
+} Fade; // size = 0x10
+
+typedef struct BGMPlayer {
+    /* 0x000 */ UnkAl19E0* data;
+    /* 0x004 */ SoundManager* soundManager;
+    /* 0x008 */ s32 unkFrequency; //?
     /* 0x00C */ s32 unk_0C;
     /* 0x010 */ s32 unk_10;
     /* 0x014 */ s32 unk_14;
     /* 0x018 */ s32 unk_18;
-    /* 0x01C */ s32 unk_1C;
-    /* 0x020 */ s32 unk_20;
-    /* 0x024 */ char unk_24[0x8];
-    /* 0x02C */ UnkAl1 unk_2C;
+    /* 0x01C */ s32 songName;
+    /* 0x020 */ s32 fadeSongName;
+    /* 0x024 */ s32 bgmFileIndex;
+    /* 0x028 */ s32 songID;
+    /* 0x02C */ Fade fadeInfo;
+    /* 0x03C */ u16 unk_3C;
+    /* 0x03E */ char unk_3E[0x8];
+    /* 0x046 */ s16 unk_46;
     /* 0x048 */ s32 unk_48;
     /* 0x04C */ u8 unk_4C[0x1]; // not sure how long this is
     /* 0x04D */ char unk_4D[0xB];
@@ -441,9 +467,9 @@ typedef struct UnkAlA9C {
     /* 0x259 */ s8 unk_259;
     /* 0x25A */ s8 unk_25A;
     /* 0x25B */ s8 unk_25B;
-    /* 0x25C */ UnkAl60 unk_25C[16];
+    /* 0x25C */ BGMPlayerTrack unk_25C[16];
     /* 0x85C */ UnkAl24 unk_85C[24];
-} UnkAlA9C; // size = 0xA9C
+} BGMPlayer; // size = 0xA9C
 
 typedef union Q32 {
     u8 u8[4];
@@ -501,12 +527,12 @@ extern s8 D_80078E5C;
 extern s32* D_8007F1F8; // points to 80078290
 
 extern UnkAl19E0* D_8009A5C0;
-extern UnkAlA9C* D_8009A5CC;
-extern UnkAlA9C* D_8009A5FC;
+extern BGMPlayer* D_8009A5CC;
+extern BGMPlayer* D_8009A5FC;
 extern UnkFuncAl D_8009A5E8;
 extern UnkAl834* D_8009A628;
-extern UnkAl6CC* D_8009A640;
-extern UnkAlA9C* D_8009A664;
+extern SoundManager* D_8009A640;
+extern BGMPlayer* D_8009A664;
 
 extern u16 D_800A0F50;
 
@@ -517,55 +543,55 @@ extern s8 D_800A3FEC;
 extern s16 D_800A3FEE;
 extern s32 D_800A3FF0;
 
-void al_LoadBKHeaders(UnkAl19E0* arg0, ALHeap* arg1);
+void snd_load_BK_headers(UnkAl19E0* arg0, ALHeap* arg1);
 
-void func_8004B440(UnkAl6CC*, u8, u8, UnkAl19E0*, u8);
-void func_8004B62C(UnkAl6CC*);
-void func_8004B698(UnkAl6CC*);
-void func_8004B6D8(UnkAl6CC*, s32, s16, s16, u8);
-void func_8004B748(UnkAl6CC*);
-s32 func_8004B9E4(UnkAl6CC*, s32);
-void func_8004BA54(UnkAl6CC*, s32);
-s16 func_8004C444(UnkAl6CC*);
+void func_8004B440(SoundManager*, u8, u8, UnkAl19E0*, u8);
+void snd_load_sfx_groups_from_SEF(SoundManager*);
+void snd_clear_sfx_queue(SoundManager*);
+void snd_enqueue_sfx_event(SoundManager*, s32, s16, s16, u8);
+void func_8004B748(SoundManager*);
+s32 func_8004B9E4(SoundManager*, s32);
+void func_8004BA54(SoundManager*, s32);
+s16 func_8004C444(SoundManager*);
 
-void func_8004D510(UnkAlA9C*);
-UnkAlA9C* func_8004D794(s32);
+void func_8004D510(BGMPlayer*);
+BGMPlayer* snd_get_player_with_song_name(s32);
 s32 func_8004DA0C(UNK_TYPE);
-void func_8004DAA8(UnkAlA9C*);
+void func_8004DAA8(BGMPlayer*);
 void func_8004DFD4(UnkAl19E0*);
-void func_8004E158(UnkAlA9C*, s32, s32, UnkAl19E0*);
-void func_8004E3A4(UnkAlA9C*);
-void func_8004E444(UnkAlA9C*);
-s16 func_8004E4B8(UnkAlA9C*);
-void func_8004FBBC(UnkAlA9C*, UnkAl60*);
-s32 func_8004FC08(UnkAlA9C*, u32);
-void func_8004FCB4(UnkAlA9C*, UnkAl60*);
-void func_8004FCE4(UnkAlA9C*, UnkAl60*);
-void func_8004FD04(UnkAlA9C*, UnkAl60*);
-void func_8004FD38(UnkAlA9C*, UnkAl60*);
-void func_8004FD94(UnkAlA9C*, UnkAl60*);
-void func_8004FE10(UnkAlA9C*, UnkAl60*);
-void func_8004FE6C(UnkAlA9C*, UnkAl60*);
-void func_8004FEB0(UnkAlA9C*, UnkAl60*);
-void func_8004FED0(UnkAlA9C*, UnkAl60*);
-void func_8004FF3C(UnkAlA9C*, UnkAl60*);
-void func_8004FF58(UnkAlA9C*, UnkAl60*);
-void func_8004FF70(UnkAlA9C*, UnkAl60*);
-void func_8004FF88(UnkAlA9C*, UnkAl60*);
-void func_8004FFA8(UnkAlA9C*, UnkAl60*);
-void func_8004FFB4(UnkAlA9C*, UnkAl60*);
-void func_8004FFC8(UnkAlA9C*, UnkAl60*);
-void func_8004FFE4(UnkAlA9C*, UnkAl60*);
-void func_8004FFF0(UnkAlA9C*, UnkAl60*);
-void func_8004FFFC(UnkAlA9C*, UnkAl60*);
-void func_80050004(UnkAlA9C*, UnkAl60*);
-void func_80050020(UnkAlA9C*, UnkAl60*);
-void func_80050128(UnkAlA9C*, UnkAl60*);
-void func_8005015C(UnkAlA9C*, UnkAl60*);
-void func_80050184(UnkAlA9C*, UnkAl60*);
-void func_800501A8(UnkAlA9C*, UnkAl60*);
-void func_800502F0(UnkAlA9C*, UnkAl60*);
-void func_80050560(UnkAlA9C*, UnkAl60*);
+void func_8004E158(BGMPlayer*, s32, s32, UnkAl19E0*);
+void snd_update_bgm_fade(BGMPlayer*);
+void func_8004E444(BGMPlayer*);
+s16 func_8004E4B8(BGMPlayer*);
+void snd_BGMCmd_E0_MasterTempo(BGMPlayer*, BGMPlayerTrack*);
+s32 snd_bpm_to_tempo(BGMPlayer*, u32);
+void snd_BGMCmd_E1_MasterVolume(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E2_MasterTranspose(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E3(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E6_MasterEffect(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E4_MasterTempoFade(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E5_MasterVolumeFade(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E8_TrackOverridePatch(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_E9_SubTrackVolume(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F6_TrackVolumeFade(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_EA_SubTrackPan(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_EB_SubTrackReverb(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_EC_SegTrackVolume(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_ED_SubTrackCoarseTune(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_EE_SubTrackFineTune(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_EF_SegTrackTune(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F0_TrackTremolo(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F1_TrackTremoloSpeed(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F2_TrackTremoloTime(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F3_TrackTremoloStop(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F4(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F5_TrackVoice(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_F7_SubTrackReverbType(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_FD(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_FE(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_FC_Jump(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_FF(BGMPlayer*, BGMPlayerTrack*);
+void snd_BGMCmd_NOP(BGMPlayer*, BGMPlayerTrack*);
 s32 func_80056068(s32, u8);
 s32 func_800506C8(s32, s32);
 s32 func_80050C30(u32);
@@ -583,11 +609,11 @@ void func_80052660(UnkAl19E0*);
 void func_80052B44(UnkAl48*);
 void func_80052BF8(UnkAl48*, s32*);
 
-void func_800532F4(UnkAl30*);
+void snd_reset_instrument(Instrument*);
 void func_80053370(UnkAlC*);
-void func_800533A8(UnkAl4*);
+void func_800533A8(InstrumentCFG*);
 void func_80053654(UnkAl19E0*);
-void func_80053974(UnkAl1*, s32, s32, s16);
+//void snd_initialize_fade(Fade*, s32, s32, s16);
 void func_80053A18(UnkAl1*);
 void func_80053A28(UnkAl1*);
 void func_80053A98(u8, u16, s32);
@@ -597,7 +623,7 @@ s32 func_80053BE8(UnkAl19E0*, s32, s32, s32*);
 void func_80054CE0(s32, s32);
 void func_8005610C(void);
 
-void func_80055110(UnkAlA9C*);
+void func_80055110(BGMPlayer*);
 s32 func_80055FF0(s32, s32);
 s32 func_8005600C(s32, s32);
 s32 func_80056028(s32, u8);
@@ -622,7 +648,7 @@ void func_80056DCC(u8, u8);
 void func_80056EC0(u8, s8);
 void func_80056EE8(u8);
 void func_80056FA4(u8, u8, s32, f32, s16, u8, u8, s32);
-void func_80057224(u8, UnkAl30*);
+void func_80057224(u8, Instrument*);
 void func_80057344(u8, f32);
 void func_8005736C(u8, s16, s32, u8, u8);
 void func_80057548(u8, u8, u8);
@@ -633,11 +659,11 @@ void func_80057E5C(u8);
 void func_80057EB0(void);
 void func_80057ED0(s16);
 
-void al_LoadINIT(UnkAl19E0*, s32, ALHeap*);
-s32 al_CopyFileTableEntry(u16, s32, s32*);
-void al_LoadPER(UnkAl19E0*, s32*);
-void al_LoadPRG(UnkAl19E0*, s32*);
-void al_DmaCopy(s32, s32*, s32);
+void snd_load_INIT(UnkAl19E0*, s32, ALHeap*);
+s32 snd_fetch_SBN_file(u16, s32, s32*);
+void snd_load_PER(UnkAl19E0*, s32*);
+void snd_load_PRG(UnkAl19E0*, s32*);
+void snd_read_rom(s32, s32*, s32);
 
 #undef alHeapAlloc
 void* alHeapAlloc(ALHeap *heap, s32 arg1, s32 size);
diff --git a/src/battle/item/dizzy_dial/lib.c b/src/battle/item/dizzy_dial/lib.c
index 1783f470e2..239c8b5a32 100644
--- a/src/battle/item/dizzy_dial/lib.c
+++ b/src/battle/item/dizzy_dial/lib.c
@@ -71,7 +71,7 @@ ApiStatus N(func_802A1270_727B80)(ScriptInstance* script, s32 isInitialCall) {
         case 0:
             script->functionTemp[1].s = 0;
             script->functionTemp[2].s = 0;
-            play_sound(0x2033);
+            sfx_play_sound(0x2033);
             camera->unk_1C = 0;
             D_802A1CD0 = bind_dynamic_entity_7(NULL, func_802A123C_727B4C);
             script->functionTemp[0].s = 1;
diff --git a/src/battle/item/insecticide_herb/lib.c b/src/battle/item/insecticide_herb/lib.c
index 4544049af8..c1a1abab05 100644
--- a/src/battle/item/insecticide_herb/lib.c
+++ b/src/battle/item/insecticide_herb/lib.c
@@ -68,7 +68,7 @@ ApiStatus N(func_802A1280_72A9D0)(ScriptInstance* script, s32 isInitialCall) {
     Actor* enemy = get_actor(script->owner1.enemyID);
     Actor* target;
 
-    play_sound_at_position(0x231, 0, enemy->walk.goalPos.x, enemy->walk.goalPos.y, enemy->walk.goalPos.z);
+    sfx_play_sound_at_position(0x231, 0, enemy->walk.goalPos.x, enemy->walk.goalPos.y, enemy->walk.goalPos.z);
     target = get_actor(enemy->targetActorID);
     dispatch_event_actor(target, 0x39);
 
diff --git a/src/battle/item/thunder_bolt/lib.c b/src/battle/item/thunder_bolt/lib.c
index 81adf38e22..c8dd5e5a84 100644
--- a/src/battle/item/thunder_bolt/lib.c
+++ b/src/battle/item/thunder_bolt/lib.c
@@ -61,7 +61,7 @@ ApiStatus N(func_802A123C_722D7C)(ScriptInstance* script, s32 isInitialCall) {
     s32 scaleX, scaleY;
 
     if (actor != NULL) {
-        play_sound(0x366);
+        sfx_play_sound(0x366);
 
         posX = actor->currentPos.x;
         posY = actor->currentPos.y + (actor->size.y / 10);
diff --git a/src/battle/item/thunder_rage/lib.c b/src/battle/item/thunder_rage/lib.c
index ef6a1ccc27..e26a4f2aa5 100644
--- a/src/battle/item/thunder_rage/lib.c
+++ b/src/battle/item/thunder_rage/lib.c
@@ -79,7 +79,7 @@ ApiStatus N(func_802A1354_71B4F4)(ScriptInstance* script, s32 isInitialCall) {
     s32 scaleX, scaleY;
 
     if (actor != NULL) {
-        play_sound(0x366);
+        sfx_play_sound(0x366);
 
         posX = actor->currentPos.x;
         posY = actor->currentPos.y + (actor->size.y / 10);
diff --git a/src/battle/partner/bombette_6FAD10.c b/src/battle/partner/bombette_6FAD10.c
index ac0d66b426..15dbab519c 100644
--- a/src/battle/partner/bombette_6FAD10.c
+++ b/src/battle/partner/bombette_6FAD10.c
@@ -20,7 +20,7 @@ ApiStatus func_80238000_6FAD10(ScriptInstance* script, s32 isInitialCall) {
             } else {
                 func_800701F0(0, x, y + 20, z);
             }
-            play_sound(8214);
+            sfx_play_sound(8214);
             break;
         case 147:
             if (script->varTable[10] > 0) {
@@ -28,7 +28,7 @@ ApiStatus func_80238000_6FAD10(ScriptInstance* script, s32 isInitialCall) {
             } else {
                 func_800701F0(0, x, y + 20, z);
             }
-            play_sound(8215);
+            sfx_play_sound(8215);
             break;
         case 148:
             if (script->varTable[10] > 0) {
@@ -36,11 +36,11 @@ ApiStatus func_80238000_6FAD10(ScriptInstance* script, s32 isInitialCall) {
             } else {
                 func_800701F0(1, x, y + 20, z);
             }
-            play_sound(8215);
+            sfx_play_sound(8215);
             break;
         default:
             func_800701F0(0, x, y + 20, z);
-            play_sound(8214);
+            sfx_play_sound(8214);
             break;
     }
 
diff --git a/src/battle/partner/goombario_6F10E0.c b/src/battle/partner/goombario_6F10E0.c
index 89f6f8f176..e845d8ebef 100644
--- a/src/battle/partner/goombario_6F10E0.c
+++ b/src/battle/partner/goombario_6F10E0.c
@@ -75,7 +75,7 @@ ApiStatus func_80238A20_6F1B00(ScriptInstance* script, s32 isInitialCall) {
 
         play_movement_dust_effects(2, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z,
                                    partnerActor->yaw);
-        play_sound(0x148);
+        sfx_play_sound(0x148);
 
         return ApiStatus_DONE1;
     }
diff --git a/src/code_102610_len_2330.c b/src/code_102610_len_2330.c
index 4b704b1cc2..b2ca988661 100644
--- a/src/code_102610_len_2330.c
+++ b/src/code_102610_len_2330.c
@@ -80,7 +80,7 @@ void func_802E1298(void) {
 
 void func_802E12F8(void) {
     load_message_to_printer(0x1D0005, D_802EB39C);
-    play_sound(0x10);
+    sfx_play_sound(0x10);
 }
 
 void func_802E1328(Entity* entity) {
diff --git a/src/code_10400_len_d30.c b/src/code_10400_len_d30.c
index f7a43105af..03af63d092 100644
--- a/src/code_10400_len_d30.c
+++ b/src/code_10400_len_d30.c
@@ -78,7 +78,7 @@ void func_80035660(void) {
     } else {
         set_map_transition_effect(8);
         OVERRIDE_FLAG_UNSET(0x0010000);
-        set_music_track(0, -1, 0, 1000, 8);
+        bgm_set_song(0, -1, 0, 1000, 8);
     }
     OVERRIDE_FLAG_UNSET(0x40);
 }
diff --git a/src/code_104730.c b/src/code_104730.c
index d82b401348..762ce42baa 100644
--- a/src/code_104730.c
+++ b/src/code_104730.c
@@ -263,7 +263,7 @@ void func_802E2EB0(Entity* entity) {
             a2 = &D_0A001218;
             break;
         case 13:
-            play_sound_at_position(0x158, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(0x158, 0, entity->position.x, entity->position.y, entity->position.z);
             a1 = &D_0A003F70;
             a2 = &D_0A002318;
             break;
diff --git a/src/code_104940_len_dc0.c b/src/code_104940_len_dc0.c
index d351a6082d..b2892c28e5 100644
--- a/src/code_104940_len_dc0.c
+++ b/src/code_104940_len_dc0.c
@@ -266,7 +266,7 @@ s32 func_802E3BA4(Entity* entity) {
                 return 1;
             }
             set_entity_updatecmd(entity, &D_802E9E80);
-            play_sound_at_position(0x14f, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(0x14f, 0, entity->position.x, entity->position.y, entity->position.z);
             break;
         case 0x16:
         case 0x19:
@@ -281,7 +281,7 @@ s32 func_802E3BA4(Entity* entity) {
                 return 1;
             }
             set_entity_updatecmd(entity, &D_802E9E80);
-            play_sound_at_position(0x150, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(0x150, 0, entity->position.x, entity->position.y, entity->position.z);
             break;
         case 0x17:
         case 0x1a:
@@ -289,7 +289,7 @@ s32 func_802E3BA4(Entity* entity) {
                 return 1;
             }
             set_entity_updatecmd(entity, &D_802E9E80);
-            play_sound_at_position(0x151, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(0x151, 0, entity->position.x, entity->position.y, entity->position.z);
             break;
         case 0x1b:
         case 0x1c:
diff --git a/src/code_109660_len_1270.c b/src/code_109660_len_1270.c
index 83ae8b118f..189453efaa 100644
--- a/src/code_109660_len_1270.c
+++ b/src/code_109660_len_1270.c
@@ -64,7 +64,7 @@ s32 func_802E8858(Entity* entity) {
         func_80110BCC(entity, &D_802EAE7C);
         func_80110678(entity);
         exec_entity_updatecmd(entity);
-        play_sound(0x20AE);
+        sfx_play_sound(0x20AE);
     }
 }
 
diff --git a/src/code_10A230.c b/src/code_10A230.c
index f9fc0740b1..551aee9dcd 100644
--- a/src/code_10A230.c
+++ b/src/code_10A230.c
@@ -119,7 +119,7 @@ void player_enter_blue_pipe(Entity* bluePipe) {
     playerStatus->renderMode = 0xD;
 
     func_802DDFF8(0x10002, 5, 2, 1, 1, 0, 0);
-    play_sound(0x163);
+    sfx_play_sound(0x163);
     disable_player_shadow();
 }
 
diff --git a/src/code_111f0_len_860.c b/src/code_111f0_len_860.c
index 7e652e99bc..46861b2c70 100644
--- a/src/code_111f0_len_860.c
+++ b/src/code_111f0_len_860.c
@@ -46,8 +46,6 @@ void func_800360FC(void) {
 }
 
 void func_80036130(void) {
-    //GameStatus* gameStatus = gGameStatusPtr;
-
     gMapTransitionAlpha = 0x00;
     D_800A0942 = 0x14;
     D_800A0944 = 0x00;
diff --git a/src/code_17FEB0.c b/src/code_17FEB0.c
index 4bf49755c8..29801416d2 100644
--- a/src/code_17FEB0.c
+++ b/src/code_17FEB0.c
@@ -23,11 +23,11 @@ HitResult calc_item_check_hit(void) {
                 return HitResult_MISS;
             }
             if (actor->stoneStatus == 0xC) {
-                play_sound_at_position(0x10C, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z);
+                sfx_play_sound_at_position(0x10C, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z);
                 return HitResult_IMMUNE;
             }
             if ((battleStatus->currentAttackElement & 0x80) && (actorPart->eventFlags & 0x10)) {
-                play_sound_at_position(0xE9, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z);
+                sfx_play_sound_at_position(0xE9, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z);
                 return HitResult_LANDED_ON_SPIKE;
             }
         } else {
diff --git a/src/code_181810.c b/src/code_181810.c
index d444e2409d..982e7f0a23 100644
--- a/src/code_181810.c
+++ b/src/code_181810.c
@@ -220,7 +220,7 @@ ApiStatus PlaySoundAtActor(ScriptInstance* script, s32 isInitialCall) {
     }
 
     actor = get_actor(actorID);
-    play_sound_at_position(soundID, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
+    sfx_play_sound_at_position(soundID, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
 
     return ApiStatus_DONE2;
 }
@@ -237,7 +237,7 @@ ApiStatus PlaySoundAtPart(ScriptInstance* script, s32 isInitialCall) {
     }
 
     part = get_actor_part(get_actor(actorID), partIndex);
-    play_sound_at_position(soundID, 0, part->currentPos.x, part->currentPos.y, part->currentPos.z);
+    sfx_play_sound_at_position(soundID, 0, part->currentPos.x, part->currentPos.y, part->currentPos.z);
 
     return ApiStatus_DONE2;
 }
@@ -255,7 +255,7 @@ ApiStatus PlayLoopingSoundAtActor(ScriptInstance* script, s32 isInitialCall) {
 
     actor = get_actor(actorID);
     actor->x[idx] = soundID;
-    play_sound_at_position(soundID, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
+    sfx_play_sound_at_position(soundID, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
 
     return ApiStatus_DONE2;
 }
@@ -276,7 +276,7 @@ ApiStatus StopLoopingSoundAtActor(ScriptInstance* script, s32 isInitialCall) {
         return ApiStatus_DONE2;
     }
 
-    stop_sound(actor->x[idx]);
+    sfx_stop_sound(actor->x[idx]);
     actor->x[idx] = 0;
     return ApiStatus_DONE2;
 }
diff --git a/src/code_190B20.c b/src/code_190B20.c
index 18d2d136ee..2ac598728d 100644
--- a/src/code_190B20.c
+++ b/src/code_190B20.c
@@ -1174,7 +1174,7 @@ s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) {
     if (statusTypeKey == Debuff_DAZE) {
         if (statusTypeKey != target->koStatus) {
             inflict_status(target, Debuff_DAZE, duration);
-            play_sound(0x2107);
+            sfx_play_sound(0x2107);
         } else {
             target->koDuration += duration;
             if (target->koDuration > 9) {
@@ -1448,7 +1448,7 @@ void remove_player_buffs(PlayerBuff buffs) {
         func_80071C30(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
 
         battleStatus->unk_A0 = NULL;
-        play_sound(0x299);
+        sfx_play_sound(0x299);
     }
     if ((buffs & 0x100) && (battleStatus->turboChargeTurnsLeft != 0)) {
         battleStatus->turboChargeTurnsLeft = 0;
diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c
index 284269216d..379d089b74 100644
--- a/src/code_1a1f0_len_5390.c
+++ b/src/code_1a1f0_len_5390.c
@@ -79,7 +79,7 @@ ApiStatus FadeInMerlee(ScriptInstance* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(-0xA);
 
     if (isInitialCall) {
-        play_sound(0x24B);
+        sfx_play_sound(0x24B);
         npc->unk_AC = 0;
     }
 
@@ -165,7 +165,7 @@ ApiStatus OnDefeatEnemy(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (script->functionTemp[1].s == 15) {
-        play_sound(SoundId_DEATH);
+        sfx_play_sound(SoundId_DEATH);
         func_80070190(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10);
     }
 
diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c
index 218e1485f6..558e31c9e4 100644
--- a/src/code_1b40_len_20b0.c
+++ b/src/code_1b40_len_20b0.c
@@ -80,9 +80,9 @@ void step_game_loop(void) {
     step_current_game_mode();
     update_entities();
     func_80138198();
-    func_8014A548();
+    bgm_update_music_settings();
     update_ambient_sounds();
-    func_80149734();
+    sfx_update_looping_sound_params();
     update_windows();
     update_curtains();
 
@@ -109,7 +109,7 @@ void step_game_loop(void) {
                 temp8009A690 = &D_8009A690;
                 (*temp8009A690)--;
                 if (*temp8009A690 == 0) {
-                    func_80149838();
+                    sfx_stop_env_sounds();
                     set_game_mode(0);
                     OVERRIDE_FLAG_UNSET(0x20);
                 }
@@ -223,9 +223,9 @@ void load_engine_data(void) {
     clear_effect_data();
     clear_saved_variables();
     clear_item_entity_data();
-    func_8014A498();
+    bgm_reset_sequence_players();
     reset_ambient_sounds();
-    func_80149618();
+    sfx_clear_sounds();
     clear_windows();
     initialize_curtains();
     poll_rumble();
diff --git a/src/code_23680.c b/src/code_23680.c
index 7b9a0d4c85..c29a981847 100644
--- a/src/code_23680.c
+++ b/src/code_23680.c
@@ -148,7 +148,7 @@ void func_800494C0(Npc* npc, s32 arg1, s32 arg2) {
         value2 |= 0x20000;
     }
 
-    play_sound_at_position(arg1, value2, npc->pos.x, npc->pos.y, npc->pos.z);
+    sfx_play_sound_at_position(arg1, value2, npc->pos.x, npc->pos.y, npc->pos.z);
 }
 
 void func_80049550(ScriptInstance* script, s32 arg1) {
diff --git a/src/code_26840_len_20d0.c b/src/code_26840_len_20d0.c
index 8b8181fa4b..ebae62280d 100644
--- a/src/code_26840_len_20d0.c
+++ b/src/code_26840_len_20d0.c
@@ -1,31 +1,31 @@
 #include "common.h"
 #include "audio.h"
 
-void func_8004B440(UnkAl6CC* arg0, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 arg4) {
+void func_8004B440(SoundManager* manager, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 arg4) {
     u32 i;
     s32 c = 0x6A25E;
 
-    arg0->unk_00 = arg3;
-    arg0->unk_34 = 0x4C4B4;
-    arg0->unk_38 = arg0->unk_3C = c;
-    arg0->unk_BC = arg1;
-    arg0->unk_BE = arg2;
+    manager->soundData = arg3;
+    manager->unkCounterStep = 312500;
+    manager->unkCounterMax = manager->unkCounter = c;
+    manager->unk_BC = arg1;
+    manager->unk_BE = arg2;
 
     if (arg4 > 0x10) {
-        arg0->unk_BD = 0x10;
+        manager->sfxPlayerSelector = 0x10;
     } else {
-        arg0->unk_BD = arg4;
+        manager->sfxPlayerSelector = arg4;
     }
 
-    arg0->unk_5C = 0x8000;
-    arg0->unk_B8 = 0x8000;
-    arg0->unk_30 = 0;
-    arg0->unk_60 = 0;
+    manager->unk_5C = 0x8000;
+    manager->unk_B8 = 0x8000;
+    manager->playCounter = 0;
+    manager->unk_60 = 0;
 
-    for (i = 0; i < ARRAY_COUNT(arg0->unk_16C); i++) {
-        UnkAlAC* sub = &arg0->unk_16C[i];
+    for (i = 0; i < ARRAY_COUNT(manager->unk_16C); i++) {
+        SoundPlayer* sub = &manager->unk_16C[i];
 
-        sub->unk_00 = 0;
+        sub->counter = 0;
         sub->unk_5C = 0;
         sub->unk_8E = 0;
         sub->unk_90 = 0;
@@ -37,9 +37,9 @@ void func_8004B440(UnkAl6CC* arg0, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 arg4) {
         sub->unk_9E = 0;
         sub->unk_9F = 0;
         sub->unk_99 = 0;
-        sub->unk_78 = 0;
-        sub->unk_79 = 0;
-        sub->unk_7A = 0;
+        sub->locatorB = 0;
+        sub->locatorC = 0;
+        sub->locatorD = 0;
         sub->unk_7B = 0x40;
         sub->unk_7C = 0;
         sub->unk_7D = 0xB0;
@@ -48,114 +48,113 @@ void func_8004B440(UnkAl6CC* arg0, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 arg4) {
     }
 
     for (i = 0; i < 4; i++) {
-        arg0->unk_90[i] = 0;
+        manager->unk_90[i] = 0;
     }
 
     for (i = 0; i < 4; i++) {
-        arg0->unk_A0[i].x = 0;
+        manager->unk_A0[i].x = 0;
     }
 
-    arg0->unk_168 = 0;
-    func_8004BA54(arg0, 0);
-    func_8004B698(arg0);
-    func_80053974(&arg0->unk_40, 0, 0x7FFF, 0x7FFF);
-    func_80053A98(arg0->unk_BE, arg0->unk_40.unk_00.u16, arg0->unk_5C);
-    arg0->unk_8C = 0xFF;
+    manager->unk_168 = 0;
+    func_8004BA54(manager, 0);
+    snd_clear_sfx_queue(manager);
+    snd_initialize_fade(&manager->unk_40, 0, 0x7FFF, 0x7FFF);
+    func_80053A98(manager->unk_BE, manager->unk_40.unk_00.u16, manager->unk_5C);
+    manager->unk_8C = 0xFF;
 
-    arg0->unk_64[0] = &D_80078290;
-    arg0->unk_64[1] = &D_800782F8;
-    arg0->unk_64[2] = &D_80078320;
-    arg0->unk_64[3] = &D_80078348;
-    arg0->unk_64[4] = &D_80078348;
-    arg0->unk_64[5] = &D_80078348;
-    arg0->unk_64[6] = &D_80078348;
-    arg0->unk_64[7] = &D_80078348;
+    manager->unk_64[0] = &D_80078290;
+    manager->unk_64[1] = &D_800782F8;
+    manager->unk_64[2] = &D_80078320;
+    manager->unk_64[3] = &D_80078348;
+    manager->unk_64[4] = &D_80078348;
+    manager->unk_64[5] = &D_80078348;
+    manager->unk_64[6] = &D_80078348;
+    manager->unk_64[7] = &D_80078348;
 
-    arg0->unk_84[0] = 0x10;
-    arg0->unk_84[1] = 0x20;
-    arg0->unk_84[2] = 0x20;
-    arg0->unk_84[3] = 0x20;
-    arg0->unk_84[4] = 0x20;
-    arg0->unk_84[5] = 0x30;
-    arg0->unk_84[6] = 0x40;
-    arg0->unk_84[7] = 0x50;
+    manager->unk_84[0] = 0x10;
+    manager->unk_84[1] = 0x20;
+    manager->unk_84[2] = 0x20;
+    manager->unk_84[3] = 0x20;
+    manager->unk_84[4] = 0x20;
+    manager->unk_84[5] = 0x30;
+    manager->unk_84[6] = 0x40;
+    manager->unk_84[7] = 0x50;
 
-    func_8004B9E4(arg0, 0);
+    func_8004B9E4(manager, 0);
 }
 
-INCLUDE_ASM(void, "code_26840_len_20d0", func_8004B62C, UnkAl6CC* arg0);
+INCLUDE_ASM(void, "code_26840_len_20d0", snd_load_sfx_groups_from_SEF, SoundManager* manager);
 
-void func_8004B698(UnkAl6CC* arg0) {
+void snd_clear_sfx_queue(SoundManager* manager) {
     s32 i;
 
-    for (i = 0; i < ARRAY_COUNT(arg0->unk_C2); i++) {
-        arg0->unk_C2[i].unk_00 = 0;
-        arg0->unk_C2[i].unk_02 = 0;
-        arg0->unk_C2[i].unk_04 = 0;
-        arg0->unk_C2[i].unk_06 = 0;
-        arg0->unk_C2[i].unk_08 = 0;
+    for (i = 0; i < ARRAY_COUNT(manager->unk_C2); i++) {
+        manager->unk_C2[i].soundID = 0;
+        manager->unk_C2[i].upperSoundID = 0;
+        manager->unk_C2[i].volume = 0;
+        manager->unk_C2[i].pitchShift = 0;
+        manager->unk_C2[i].pan = 0;
     }
 
-    arg0->unk_165 = 0;
-    arg0->unk_164 = 0;
-    arg0->unk_163 = 0;
-    arg0->unk_162 = 0;
+    manager->unk_165 = 0;
+    manager->sfxQueueNextPos = 0;
+    manager->sfxQueuePosOffset = 0;
+    manager->unk_162 = 0;
 }
 
-void func_8004B6D8(UnkAl6CC* arg0, s32 arg1, s16 arg2, s16 arg3, u8 arg4) {
-    u8 temp_v1 = arg0->unk_164;
-    s32 temp_v0 = temp_v1 - (u8) arg0->unk_163;
-    u32 temp_t0;
+void snd_enqueue_sfx_event(SoundManager* manager, s32 soundID, s16 volume, s16 pitchShift, u8 pan) {
+    u32 queuePos = manager->sfxQueueNextPos;
+    s32 queueAmt = manager->sfxQueueNextPos - manager->sfxQueuePosOffset;
 
-    if (temp_v0 < 0) {
-        temp_v0 += 0x10;
+    if (queueAmt < 0) {
+        queueAmt += 16;
     }
 
-    if (temp_v0 < 0x10) {
-        temp_t0 = temp_v1;
+    if (queueAmt < 16) {
+        u32 queueNextPos = queuePos;
 
-        arg0->unk_C2[temp_v1].unk_00 = arg1 & 0xBFFF;
-        arg0->unk_C2[temp_v1].unk_02 = (((u32) arg1 >> 0x10) & 0x3FF);
-        arg0->unk_C2[temp_v1].unk_04 = arg2;
-        arg0->unk_C2[temp_v1].unk_06 = arg3;
-        arg0->unk_C2[temp_v1].unk_08 = arg4;
+        manager->unk_C2[queueNextPos].soundID = soundID & 0xBFFF;
+        manager->unk_C2[queueNextPos].upperSoundID = (((u32) soundID >> 0x10) & 0x3FF);
+        manager->unk_C2[queueNextPos].volume = volume;
+        manager->unk_C2[queueNextPos].pitchShift = pitchShift;
+        manager->unk_C2[queueNextPos].pan = pan;
 
-        temp_t0++;
-        if (temp_t0 >= 0x10) {
-            temp_t0 = 0;
+        queueNextPos++;
+        if (queueNextPos >= 16) {
+            queueNextPos = 0;
         }
 
-        arg0->unk_164 = temp_t0;
+        manager->sfxQueueNextPos = queueNextPos;
     }
 }
 
-INCLUDE_ASM(void, "code_26840_len_20d0", func_8004B748, UnkAl6CC* arg0);
+INCLUDE_ASM(void, "code_26840_len_20d0", func_8004B748, SoundManager* manager);
 
-s32 func_8004B9E4(UnkAl6CC* arg0, s32 arg1) {
+s32 func_8004B9E4(SoundManager* manager, s32 arg1) {
     s32 a1 = (u8) arg1;
 
     if (a1 != 0xF0) {
         if (a1 < 8) {
-            if (arg0->unk_8C != a1) {
-                arg0->unk_8C = a1;
-                arg0->unk_00->unk_40[1].unk_00 = 6;
-                arg0->unk_00->unk_40[1].unk_01 = 1;
-                D_8007F1F8 = arg0->unk_64[a1];
+            if (manager->unk_8C != a1) {
+                manager->unk_8C = a1;
+                manager->soundData->unk_40[1].unk_00 = 6;
+                manager->soundData->unk_40[1].unk_01 = 1;
+                D_8007F1F8 = manager->unk_64[a1];
             }
-            arg0->unk_8D = arg0->unk_84[a1];
+            manager->unk_8D = manager->unk_84[a1];
         } else {
-            arg0->unk_8C = 0xFF;
-            arg0->unk_8D = 0;
+            manager->unk_8C = 0xFF;
+            manager->unk_8D = 0;
         }
     }
-    return arg0->unk_8C;
+    return manager->unk_8C;
 }
 
-void func_8004BA54(UnkAl6CC* arg0, s32 arg1) {
+void func_8004BA54(SoundManager* manager, s32 arg1) {
     if (arg1 == 0) {
-        arg0->unk_C0 = 0;
+        manager->unk_C0 = 0;
     } else if (arg1 == 1) {
-        arg0->unk_C0 = 1;
+        manager->unk_C0 = 1;
     }
 }
 
@@ -169,11 +168,11 @@ INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C2A4);
 
 INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C300);
 
-INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C358);
+INCLUDE_ASM(void, "code_26840_len_20d0", snd_set_modifiers, SoundManager* manager, SoundSFXEntry* sfxEntry);
 
-INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C3D4);
+INCLUDE_ASM(void, "code_26840_len_20d0", snd_set_player_modifiers, SoundManager* manager, SoundSFXEntry* sfxEntry);
 
-INCLUDE_ASM(s16, "code_26840_len_20d0", func_8004C444, UnkAl6CC* arg0);
+INCLUDE_ASM(s16, "code_26840_len_20d0", func_8004C444, SoundManager* manager);
 
 INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C578);
 
diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c
index ad4bbd0e54..61c9a6c5cd 100644
--- a/src/code_28910_len_5090.c
+++ b/src/code_28910_len_5090.c
@@ -1,23 +1,23 @@
 #include "audio.h"
 
-INCLUDE_ASM(void, "code_28910_len_5090", func_8004D510, UnkAlA9C* arg0);
+INCLUDE_ASM(void, "code_28910_len_5090", func_8004D510, BGMPlayer* arg0);
 
 // Return values are being pushed into v0 in the wrong place
 // May depend on data decomp
 #ifdef NON_MATCHING
-UnkAlA9C* func_8004D794(s32 arg0) {
+UnkAlA9C* snd_get_player_with_song_name(s32 songString) {
     UnkAl19E0* temp_v1 = D_8009A664->unk_00;
 
-    if (arg0 == temp_v1->unk_5C[2]) {
+    if (songString == temp_v1->unk_5C[2]) {
         return D_8009A664;
     }
-    if (arg0 == temp_v1->unk_60[2]) {
+    if (songString == temp_v1->unk_60[2]) {
         return D_8009A5FC;
     }
     return NULL;
 }
 #else
-INCLUDE_ASM(UnkAlA9C*, "code_28910_len_5090", func_8004D794, s32 arg0);
+INCLUDE_ASM(BGMPlayer*, "code_28910_len_5090", snd_get_player_with_song_name, s32 songString);
 #endif
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D7E0);
@@ -26,16 +26,16 @@ s32 func_8004DA0C(UNK_TYPE arg0) {
     s32 ret = 0;
 
     if (arg0 != 0) {
-        UnkAlA9C* unknown;
+        BGMPlayer* unknown;
 
         do {
-            unknown = func_8004D794(arg0);
+            unknown = snd_get_player_with_song_name(arg0);
         } while (0);
 
         do {
             if (unknown == NULL) {
                 ret = 2;
-            } else if (arg0 == unknown->unk_1C) {
+            } else if (arg0 == unknown->songName) {
                 func_8004DAA8(unknown);
                 ret = 0;
             }
@@ -49,12 +49,12 @@ s32 func_8004DA0C(UNK_TYPE arg0) {
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74);
 
-void func_8004DAA8(UnkAlA9C* arg0) {
+void func_8004DAA8(BGMPlayer* arg0) {
     if (arg0->unk_221 != 0) {
         arg0->unk_221 = 4;
         arg0->unk_10 = 1;
-        arg0->unk_08 = 1;
-        func_80053A18(&arg0->unk_2C);
+        arg0->unkFrequency = 1;
+        func_80053A18(&arg0->fadeInfo);
     }
 }
 
@@ -74,10 +74,10 @@ INCLUDE_ASM(void, "code_28910_len_5090", func_8004DFD4, UnkAl19E0* arg0);
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E0F4);
 
-void func_8004E158(UnkAlA9C* arg0, s32 arg1, s32 arg2, UnkAl19E0* arg3) {
+void func_8004E158(BGMPlayer* arg0, s32 arg1, s32 arg2, UnkAl19E0* arg3) {
     s16 i;
 
-    arg0->unk_00 = arg3;
+    arg0->data = arg3;
     func_8004E880(arg0, 0x2625A, 0x30);
     arg0->unk_48 = 0x8000;
     arg0->unk_B0 = 0x3CF0;
@@ -85,8 +85,8 @@ void func_8004E158(UnkAlA9C* arg0, s32 arg1, s32 arg2, UnkAl19E0* arg3) {
     arg0->unk_22B = 1;
     arg0->unk_14 = 0;
     arg0->unk_18 = 0;
-    arg0->unk_1C = 0;
-    arg0->unk_20 = 0;
+    arg0->songName = 0;
+    arg0->fadeSongName = 0;
     arg0->unk_58 = 0;
     arg0->unk_5A = 0;
     arg0->unk_68 = 0;
@@ -119,17 +119,17 @@ void func_8004E158(UnkAlA9C* arg0, s32 arg1, s32 arg2, UnkAl19E0* arg3) {
     arg0->unk_231 = 4;
 
     for (i = 0; i < ARRAY_COUNT(arg0->unk_25C); i++) {
-        UnkAl60* temp = &arg0->unk_25C[i];
+        BGMPlayerTrack* temp = &arg0->unk_25C[i];
 
-        temp->unk_18 = 0;
-        temp->unk_24[1] = 0;
-        temp->unk_46 = 0;
-        temp->unk_48 = 0;
-        temp->unk_4A = 0;
-        temp->unk_4B = 0;
+        temp->subTrackVolume = 0;
+        temp->unk_28 = 0;
+        temp->subTrackCoarseTune = 0;
+        temp->subTrackFineTune = 0;
+        temp->subTrackPan = 0;
+        temp->subTrackReverb = 0;
         temp->unk_44 = 0;
         temp->unk_58 = 0;
-        temp->unk_49 = 0x7F;
+        temp->segTrackVolume = 0x7F;
         temp->unk_4C = 0;
 
         if (i < ARRAY_COUNT(arg0->unk_238)) {
@@ -148,36 +148,36 @@ void func_8004E158(UnkAlA9C* arg0, s32 arg1, s32 arg2, UnkAl19E0* arg3) {
         temp->unk_17 = 0;
     }
 
-    func_80053AEC(&arg0->unk_2C, 0x7FFF);
+    func_80053AEC(&arg0->fadeInfo, 0x7FFF);
     func_80055110(arg0);
 }
 
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E344);
 
-void func_8004E3A4(UnkAlA9C* arg0) {
-    arg0->unk_2C.unk_0A--;
+void snd_update_bgm_fade(BGMPlayer* player) {
+    player->fadeInfo.fadeTime--;
 
-    if (arg0->unk_2C.unk_0A != 0) {
-        arg0->unk_2C.unk_00.s32 += arg0->unk_2C.unk_04;
+    if (player->fadeInfo.fadeTime != 0) {
+        player->fadeInfo.currentVolume.s32 += player->fadeInfo.fadeStep;
     } else {
-        arg0->unk_2C.unk_00.s32 = arg0->unk_2C.unk_08 << 16;
+        player->fadeInfo.currentVolume.s32 = player->fadeInfo.endVolume << 16;
 
-        if (arg0->unk_2C.unk_0C != NULL) {
-            arg0->unk_2C.unk_0C();
+        if (player->fadeInfo.fpFadeCallback != NULL) {
+            player->fadeInfo.fpFadeCallback();
         }
 
-        if (arg0->unk_20 != 0) {
-            func_8004DC80(arg0->unk_20);
-        } else if (arg0->unk_2C.unk_00.s32 == 0) {
-            func_8004DAA8(arg0);
+        if (player->fadeSongName != 0) {
+            func_8004DC80(player->fadeSongName);
+        } else if (player->fadeInfo.currentVolume.s32 == 0) {
+            func_8004DAA8(player);
         }
     }
-    func_8004E444(arg0);
+    func_8004E444(player);
 }
 
-void func_8004E444(UnkAlA9C* arg0) {
-    u16 mult = (arg0->unk_2C.unk_00.u16 * arg0->unk_2C.unk_10.u16) >> 15;
+void func_8004E444(BGMPlayer *arg0) {
+    u16 mult = (arg0->fadeInfo.currentVolume.u16 * arg0->unk_3C) >> 15;
     s32 i;
 
     for (i = 0; i < 4; i++) {
@@ -190,9 +190,9 @@ void func_8004E444(UnkAlA9C* arg0) {
     }
 }
 
-INCLUDE_ASM(s16, "code_28910_len_5090", func_8004E4B8, UnkAlA9C* arg0);
+INCLUDE_ASM(s16, "code_28910_len_5090", func_8004E4B8, BGMPlayer* player);
 
-INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E5D8);
+INCLUDE_ASM(s32, "code_28910_len_5090", snd_initialize_bgm_player, BGMPlayer* player);
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E844);
 
@@ -208,24 +208,24 @@ INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC04);
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC68);
 
-void func_8004FBBC(UnkAlA9C* arg0, UnkAl60* arg1) {
-    u32 unk_D4 = arg0->unk_D4.u16;
+void snd_BGMCmd_E0_MasterTempo(BGMPlayer* player, BGMPlayerTrack* track) {
+    u32 unk_D4 = player->unk_D4.u16;
     s32 temp_v0;
 
-    arg0->unk_208 = unk_D4;
-    temp_v0 = func_8004FC08(arg0, unk_D4);
-    arg0->unk_B0 = temp_v0;
-    arg0->unk_08 = temp_v0 * 10;
-    arg0->unk_BC = 0;
-    arg0->unk_B8 = 0;
-    arg0->unk_B4 = 0;
+    player->unk_208 = unk_D4;
+    temp_v0 = snd_bpm_to_tempo(player, unk_D4);
+    player->unk_B0 = temp_v0;
+    player->unkFrequency = temp_v0 * 10;
+    player->unk_BC = 0;
+    player->unk_B8 = 0;
+    player->unk_B4 = 0;
 }
 
-s32 func_8004FC08(UnkAlA9C* arg0, u32 arg1) {
-    u32 unk_20A = arg0->unk_20A;
-    u32 ret = arg1;
+s32 snd_bpm_to_tempo(BGMPlayer* player, u32 tempo) {
+    u32 unk_20A = player->unk_20A;
+    u32 ret = tempo;
 
-    ret *= arg0->unk_D0;
+    ret *= player->unk_D0;
 
     if (unk_20A < ret) {
         ret = unk_20A;
@@ -236,64 +236,64 @@ s32 func_8004FC08(UnkAlA9C* arg0, u32 arg1) {
     return ret * 100;
 }
 
-void func_8004FCB4(UnkAlA9C* arg0, UnkAl60* arg1) {
-    s32 unk_D4 = arg0->unk_D4.u8[0] & 0x7F;
+void snd_BGMCmd_E1_MasterVolume(BGMPlayer* player, BGMPlayerTrack* track) {
+    s32 unk_D4 = player->unk_D4.u8[0] & 0x7F;
 
     if (unk_D4 != 0) {
         unk_D4 = unk_D4 << 0x18;
     }
 
-    arg0->unk_C0 = unk_D4;
-    arg0->unk_CC = 0;
-    arg0->unk_C8 = 0;
-    arg0->unk_C4 = 0;
-    arg0->unk_21A = 1;
-    arg1->unk_41 = 1;
+    player->unk_C0 = unk_D4;
+    player->unk_CC = 0;
+    player->unk_C8 = 0;
+    player->unk_C4 = 0;
+    player->unk_21A = 1;
+    track->volumeChanged = 1;
 }
 
-void func_8004FCE4(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg0->unk_20C = (s8)arg0->unk_D4.u8[0] * 100;
+void snd_BGMCmd_E2_MasterTranspose(BGMPlayer* player, BGMPlayerTrack* track) {
+    player->unk_20C = (s8)player->unk_D4.u8[0] * 100;
 }
 
-void func_8004FD04(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg0->unk_00->unk_40[arg0->unk_235].unk_00 = arg0->unk_D4.u8[0];
-    arg0->unk_00->unk_40[arg0->unk_235].unk_01 = 1;
+void snd_BGMCmd_E3(BGMPlayer* player, BGMPlayerTrack* track) {
+    player->data->unk_40[player->unk_235].unk_00 = player->unk_D4.u8[0];
+    player->data->unk_40[player->unk_235].unk_01 = 1;
 }
 
-void func_8004FD38(UnkAlA9C* arg0, UnkAl60* arg1) {
-    u8 unk_D4 = arg0->unk_D4.u8[0];
-    u32 temp_v1 = arg0->unk_4C[unk_D4];
+void snd_BGMCmd_E6_MasterEffect(BGMPlayer* player, BGMPlayerTrack* track) {
+    u8 unk_D4 = player->unk_D4.u8[0];
+    u32 temp_v1 = player->unk_4C[unk_D4];
 
     if ((unk_D4 < 4) && (temp_v1 < 0x80)) {
-        if (arg0->unk_00->unk_40[temp_v1].unk_00 != arg0->unk_D4.u8[1]) {
-            arg0->unk_00->unk_40[temp_v1].unk_00 = arg0->unk_D4.u8[1];
-            arg0->unk_00->unk_40[temp_v1].unk_01 = 1;
+        if (player->data->unk_40[temp_v1].unk_00 != player->unk_D4.u8[1]) {
+            player->data->unk_40[temp_v1].unk_00 = player->unk_D4.u8[1];
+            player->data->unk_40[temp_v1].unk_01 = 1;
         }
-        arg0->unk_224[unk_D4] = arg0->unk_D4.u8[1];
+        player->unk_224[unk_D4] = player->unk_D4.u8[1];
     }
 }
 
-void func_8004FD94(UnkAlA9C* arg0, UnkAl60* arg1) {
-    s32 unk_D4 = arg0->unk_D4.u16;
-    s32 temp_a0 = func_8004FC08(arg0, arg0->unk_D6.u16);
+void snd_BGMCmd_E4_MasterTempoFade(BGMPlayer* player, BGMPlayerTrack* track) {
+    s32 unk_D4 = player->unk_D4.u16;
+    s32 temp_a0 = snd_bpm_to_tempo(player, player->unk_D6.u16);
     s32 temp_v0;
 
     if (unk_D4 <= 0) {
         unk_D4 = 1;
     }
-    temp_v0 = (temp_a0 - arg0->unk_B0) / unk_D4;
+    temp_v0 = (temp_a0 - player->unk_B0) / unk_D4;
 
-    arg0->unk_BC = unk_D4;
-    arg0->unk_B8 = temp_a0;
-    arg0->unk_B4 = temp_v0;
+    player->unk_BC = unk_D4;
+    player->unk_B8 = temp_a0;
+    player->unk_B4 = temp_v0;
 }
 
-void func_8004FE10(UnkAlA9C* arg0, UnkAl60* arg1) {
+void snd_BGMCmd_E5_MasterVolumeFade(BGMPlayer* player, BGMPlayerTrack* track) {
     s32 temp_a1;
     s32 temp_a2;
 
-    temp_a1 = arg0->unk_D4.u16;
-    temp_a2 = arg0->unk_D6.u8[0] & 0x7F;
+    temp_a1 = player->unk_D4.u16;
+    temp_a2 = player->unk_D6.u8[0] & 0x7F;
 
     if (temp_a2 != 0) {
         temp_a2 = temp_a2 << 0x18;
@@ -303,46 +303,46 @@ void func_8004FE10(UnkAlA9C* arg0, UnkAl60* arg1) {
         temp_a1 = 1;
     }
 
-    arg0->unk_CC = temp_a1;
-    arg0->unk_C8 = temp_a2;
-    arg0->unk_C4 = (temp_a2 - arg0->unk_C0) / temp_a1;
+    player->unk_CC = temp_a1;
+    player->unk_C8 = temp_a2;
+    player->unk_C4 = (temp_a2 - player->unk_C0) / temp_a1;
 }
 
 // Not sure about types
 #ifdef NON_MATCHING
-void func_8004FE6C(UnkAlA9C* arg0, UnkAl60* arg1) {
-    u8 temp_v1 = arg0->unk_D4.u16;
+void snd_BGMCmd_E8_TrackOverridePatch(BGMPlayer* player, UnkAl60* track) {
+    u8 temp_v1 = player->unk_D4.u16;
 
-    arg1->unk_44 = temp_v1;
-    arg1->unk_0C = func_80053BE8(arg0->unk_00, arg0->unk_D4.u8[0], temp_v1, &arg1->unk_10);
+    track->unk_44 = temp_v1;
+    track->unk_0C = func_80053BE8(player->unk_00, player->unk_D4.u8[0], temp_v1, &track->unk_10);
 }
 #else
-INCLUDE_ASM(void, "code_28910_len_5090", func_8004FE6C, UnkAlA9C* arg0, UnkAl60* arg1);
+INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_E8_TrackOverridePatch, BGMPlayer* player, BGMPlayerTrack* track);
 #endif
 
-void func_8004FEB0(UnkAlA9C* arg0, UnkAl60* arg1) {
+void snd_BGMCmd_E9_SubTrackVolume(BGMPlayer* arg0, BGMPlayerTrack* track) {
     u32 unk_D4 = arg0->unk_D4.u8[0] & 0x7F;
 
     if (unk_D4 != 0) {
         unk_D4 = unk_D4 << 0x18;
     }
 
-    arg1->unk_18 = unk_D4;
-    arg1->unk_41 = 1;
+    track->subTrackVolume = unk_D4;
+    track->volumeChanged = 1;
 }
 
 // Type shenanigans
 #ifdef NON_MATCHING
-void func_8004FED0(UnkAlA9C* arg0, UnkAl60* arg1) {
-    s32 temp_a2 = arg0->unk_D4.u16;
-    s32 temp_a0 = arg0->unk_D6.u8[0] & 0x7F;
+void snd_BGMCmd_F6_TrackVolumeFade(BGMPlayer* player, BGMPlayerTrack* track) {
+    s32 temp_a2 = player->unk_D4.u16;
+    s32 temp_a0 = player->unk_D6.u8[0] & 0x7F;
     s32 phi_a2;
 
     if (temp_a0 != 0) {
         temp_a0 = temp_a0 << 0x18;
     }
 
-    if (temp_a0 != arg1->unk_18) {
+    if (temp_a0 != track->unk_18) {
 
 
         if (temp_a2 <= 0) {
@@ -350,102 +350,102 @@ void func_8004FED0(UnkAlA9C* arg0, UnkAl60* arg1) {
         } else {
             phi_a2 = temp_a2;
         }
-        arg1->unk_24[0] = phi_a2;
-        arg1->unk_20 = temp_a0;
-        arg1->unk_1C = (temp_a0 - arg1->unk_18) / phi_a2;
+        track->unk_24[0] = phi_a2;
+        track->unk_20 = temp_a0;
+        track->unk_1C = (temp_a0 - track->unk_18) / phi_a2;
     }
 }
 #else
-INCLUDE_ASM(void, "code_28910_len_5090", func_8004FED0, UnkAlA9C* arg0, UnkAl60* arg1);
+INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_F6_TrackVolumeFade, BGMPlayer* player, BGMPlayerTrack* track);
 #endif
 
-void func_8004FF3C(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_4A = arg0->unk_D4.u8[0] & 0x7F;
-    arg1->unk_57 = 0;
-    arg1->unk_42 = 1;
+void snd_BGMCmd_EA_SubTrackPan(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->subTrackPan = player->unk_D4.u8[0] & 0x7F;
+    track->unk_57 = 0;
+    track->panChanged = 1;
 }
 
-void func_8004FF58(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_4B = arg0->unk_D4.u8[0] & 0x7F;
-    arg1->unk_43 = 1;
+void snd_BGMCmd_EB_SubTrackReverb(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->subTrackReverb = player->unk_D4.u8[0] & 0x7F;
+    track->reverbChanged = 1;
 }
 
-void func_8004FF70(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_49 = arg0->unk_D4.u8[0] & 0x7F;
-    arg1->unk_41 = 1;
+void snd_BGMCmd_EC_SegTrackVolume(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->segTrackVolume = player->unk_D4.u8[0] & 0x7F;
+    track->volumeChanged = 1;
 }
 
-void func_8004FF88(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_46 = (s8)arg0->unk_D4.u8[0] * 100;
+void snd_BGMCmd_ED_SubTrackCoarseTune(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->subTrackCoarseTune = (s8)player->unk_D4.u8[0] * 100;
 }
 
-void func_8004FFA8(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_48 = arg0->unk_D4.u8[0];
+void snd_BGMCmd_EE_SubTrackFineTune(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->subTrackFineTune = player->unk_D4.u8[0];
 }
 
-void func_8004FFB4(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_38 = arg0->unk_D4.u16;
-    arg1->unk_40 = 1;
+void snd_BGMCmd_EF_SegTrackTune(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->segTrackTune = player->unk_D4.u16;
+    track->tuneChanged = 1;
 }
 
-void func_8004FFC8(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_3A = arg0->unk_D4.u8[0];
-    arg1->unk_55 = arg0->unk_D4.u8[1];
-    arg1->unk_56 = arg0->unk_D6.u8[0];
+void snd_BGMCmd_F0_TrackTremolo(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->trackTremoloAmount = player->unk_D4.u8[0];
+    track->trackTremoloSpeed = player->unk_D4.u8[1];
+    track->trackTremoloTime = player->unk_D6.u8[0];
 }
 
-void func_8004FFE4(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_55 = arg0->unk_D4.u8[0];
+void snd_BGMCmd_F1_TrackTremoloSpeed(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->trackTremoloSpeed = player->unk_D4.u8[0];
 }
 
-void func_8004FFF0(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_56 = arg0->unk_D4.u8[0];
+void snd_BGMCmd_F2_TrackTremoloTime(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->trackTremoloTime = player->unk_D4.u8[0];
 }
 
-void func_8004FFFC(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_56 = 0;
+void snd_BGMCmd_F3_TrackTremoloStop(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->trackTremoloTime = 0;
 }
 
-void func_80050004(UnkAlA9C* arg0, UnkAl60* arg1) {
-    arg1->unk_4A = arg0->unk_D4.u8[0] & 0x7F;
-    arg1->unk_57 = arg0->unk_D4.u8[1] & 0x7F;
+void snd_BGMCmd_F4(BGMPlayer* player, BGMPlayerTrack* track) {
+    track->subTrackPan = player->unk_D4.u8[0] & 0x7F;
+    track->unk_57 = player->unk_D4.u8[1] & 0x7F;
 }
 
-INCLUDE_ASM(void, "code_28910_len_5090", func_80050020, UnkAlA9C* arg0, UnkAl60* arg1);
+INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_F5_TrackVoice, BGMPlayer* player, BGMPlayerTrack* track);
 
-void func_80050128(UnkAlA9C* arg0, UnkAl60* arg1) {
-    u8 temp_v0 = arg0->unk_D4.u8[0];
-    u8 temp_v1 = arg0->unk_4C[temp_v0];
+void snd_BGMCmd_F7_SubTrackReverbType(BGMPlayer* player, BGMPlayerTrack* track) {
+    u8 temp_v0 = player->unk_D4.u8[0];
+    u8 temp_v1 = player->unk_4C[temp_v0];
 
     if ((temp_v0 < 4) && ((s8)temp_v1 >= 0)) {
-        arg1->unk_5B = temp_v1;
+        track->subtrackReverbType = temp_v1;
     } else {
-        arg1->unk_5B = arg0->unk_235;
+        track->subtrackReverbType = player->unk_235;
     }
 }
 
 // unk_D4 type shenanigans
 #ifdef NON_MATCHING
-void func_8005015C(UnkAlA9C* arg0, UnkAl60* arg1) {
-    func_800560BC(arg0->unk_234, arg1->unk_5C, arg0->unk_D4.u16 >> 8);
+void snd_BGMCmd_FD(UnkAlA9C* player, UnkAl60* track) {
+    func_800560BC(player->unk_234, track->unk_5C, player->unk_D4.u16 >> 8);
 }
 #else
-INCLUDE_ASM(void, "code_28910_len_5090", func_8005015C, UnkAlA9C* arg0, UnkAl60* arg1);
+INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_FD, BGMPlayer* player, BGMPlayerTrack* track);
 #endif
 
-void func_80050184(UnkAlA9C* arg0, UnkAl60* arg1) {
-    s32 temp = arg0->unk_D4.u16 + arg0->unk_64;
+void snd_BGMCmd_FE(BGMPlayer* player, BGMPlayerTrack* track) {
+    s32 temp = player->unk_D4.u16 + player->unk_64;
 
-    arg1->unk_3E = arg0->unk_D6.u8[0];
-    arg1->unk_04 = arg1->unk_00;
-    arg1->unk_00 = temp;
+    track->unk_3E = player->unk_D6.u8[0];
+    track->unk_04 = track->bgmReadPos;
+    track->bgmReadPos = temp;
 }
 
-INCLUDE_ASM(void, "code_28910_len_5090", func_800501A8, UnkAlA9C* arg0, UnkAl60* arg1);
+INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_FC_Jump, BGMPlayer* player, BGMPlayerTrack* track);
 
-INCLUDE_ASM(void, "code_28910_len_5090", func_800502F0, UnkAlA9C* arg0, UnkAl60* arg1);
+INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_FF, BGMPlayer* player, BGMPlayerTrack* track);
 
-void func_80050560(UnkAlA9C* arg0, UnkAl60* arg1) {
+void snd_BGMCmd_NOP(BGMPlayer* player, BGMPlayerTrack* track) {
 }
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_80050568);
@@ -462,13 +462,13 @@ INCLUDE_ASM(s32, "code_28910_len_5090", func_80050770);
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_80050818);
 
-void func_8005083C(UnkAlA9C* arg0, s32 arg1, s16 arg2, s8 arg3) {
-    UnkAl60* temp_a1 = &arg0->unk_25C[arg1];
+void func_8005083C(BGMPlayer* arg0, s32 arg1, s16 arg2, s8 arg3) {
+    BGMPlayerTrack* temp_a1 = &arg0->unk_25C[arg1];
 
-    if (temp_a1->unk_00 != 0) {
+    if (temp_a1->bgmReadPos != 0) {
         arg0->unk_D4.u16 = arg2;
         arg0->unk_D6.u8[0] = arg3;
-        func_8004FED0(arg0, temp_a1);
+        snd_BGMCmd_F6_TrackVolumeFade(arg0, temp_a1);
     }
 }
 
diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c
index 8f6d2213b3..fc9e7b7781 100644
--- a/src/code_2e230_len_2190.c
+++ b/src/code_2e230_len_2190.c
@@ -7,7 +7,7 @@ void func_80052E30(u8 index) {
     temp->unk_45 = 0;
 }
 
-void func_80052E5C(s32 arg0) {
+void snd_load_audio_data(s32 frequency) {
     UnkAl19E0** temp_s4 = &D_8009A5C0;
     UnkAl19E0* temp4;
     s32* temp_v0_2;
@@ -15,22 +15,22 @@ void func_80052E5C(s32 arg0) {
     u32 i;
     s32 subroutine_arg7[2];
     u8 temp6[4];
-    UnkAlA9C** temp1 = &D_8009A664;
-    UnkAlA9C** temp1_1;
-    UnkAl6CC** temp2 = &D_8009A640;
-    UnkAl6CC** temp2_1;
-    UnkAlA9C** temp3;
+    BGMPlayer** temp1 = &D_8009A664;
+    BGMPlayer** temp1_1;
+    SoundManager** temp2 = &D_8009A640;
+    SoundManager** temp2_1;
+    BGMPlayer** temp3;
     UnkAl48* temp5;
 
     alHeap = D_80078E54->unk_18;
     *temp_s4 = alHeapAlloc(alHeap, 1, 0x19E0);
 
-    (*temp1) = alHeapAlloc(alHeap, 1, 0xA9C);
-    D_8009A5FC = alHeapAlloc(alHeap, 1, 0xA9C);
-    D_8009A5CC = alHeapAlloc(alHeap, 1, 0xA9C);
+    (*temp1) = alHeapAlloc(alHeap, 1, sizeof(BGMPlayer));
+    D_8009A5FC = alHeapAlloc(alHeap, 1, sizeof(BGMPlayer));
+    D_8009A5CC = alHeapAlloc(alHeap, 1, sizeof(BGMPlayer));
     (*temp2) = alHeapAlloc(alHeap, 1, 0x6CC);
     D_8009A628 = alHeapAlloc(alHeap, 1, 0x834);
-    (*temp1)->unk_04 = (*temp2);
+    (*temp1)->soundManager = (*temp2);
     D_8009A628->unk_00 = *(temp_s4);
 
 
@@ -42,18 +42,18 @@ void func_80052E5C(s32 arg0) {
     temp4->unk_68 = &temp_v0_2[0x1400];
 
     for (i = 0; i < 1; i++) {
-        temp4->unk_6C[i].unk_0 = alHeapAlloc(alHeap, 1, 0xA9C);
+        temp4->unk_6C[i].unk_0 = alHeapAlloc(alHeap, 1, sizeof(BGMPlayer));
     }
 
-    temp4->unk_A0 = alHeapAlloc(alHeap, 1, 0x5200);
-    temp4->unk_04 = alHeapAlloc(alHeap, 1, 0x30);
-    temp4->unk_54 = alHeapAlloc(alHeap, 1, 0x360);
-    temp4->unk_58 = alHeapAlloc(alHeap, 1, 0x200);
+    temp4->dataSEF = alHeapAlloc(alHeap, 1, 0x5200);
+    temp4->defaultInstrument = alHeapAlloc(alHeap, 1, 0x30);
+    temp4->dataPER = alHeapAlloc(alHeap, 1, 0x360);
+    temp4->dataPRG = alHeapAlloc(alHeap, 1, 0x200);
     temp4->unk_94 = alHeapAlloc(alHeap, 1, 0x40);
-    temp4->unk_00 = arg0;
-    func_800532F4(temp4->unk_04);
+    temp4->actualFrequency = frequency;
+    snd_reset_instrument(temp4->defaultInstrument);
     func_80053370(&temp4->unk_08);
-    func_800533A8(&temp4->unk_14);
+    func_800533A8(&temp4->defaultPRGEntry);
     func_8005610C();
 
     temp4->unk_A4[0] = NULL;
@@ -71,7 +71,7 @@ void func_80052E5C(s32 arg0) {
 
     for (i = 0; i < 24; i++) {
         func_80056EC0(i, 0);
-        func_80057224(i, temp4->unk_04);
+        func_80057224(i, temp4->defaultInstrument);
         temp5 = &temp4->unk_1320[i];
         temp5->unk_00 = 0;
         temp5->unk_04 = 0;
@@ -85,10 +85,10 @@ void func_80052E5C(s32 arg0) {
         temp5->unk_45 = 0;
     }
 
-    al_LoadINIT(temp4, 0xF00000, alHeap);
+    snd_load_INIT(temp4, 0xF00000, alHeap);
 
     for (i = 0; i < 3; i++) {
-        temp4->unk_1310[i] = alHeapAlloc(alHeap, 1, 0x840);
+        temp4->banks[i] = alHeapAlloc(alHeap, 1, 0x840);
     }
 
     temp2_1 = &D_8009A640;
@@ -110,26 +110,26 @@ void func_80052E5C(s32 arg0) {
     func_8004B440(*temp2_1, 4, 1, temp4, 0x10);
     func_80050B90(D_8009A628, 6, 1, temp4);
     func_80052614(temp4);
-    al_LoadBKHeaders(temp4, alHeap);
-    if (al_CopyFileTableEntry(temp4->unk_3C->unk_0, 0x20, subroutine_arg7) == 0) {
-        al_DmaCopy(subroutine_arg7[0], temp4->unk_A0, subroutine_arg7[1] & 0xFFFFFF);
+    snd_load_BK_headers(temp4, alHeap);
+    if (snd_fetch_SBN_file(temp4->mseqFileList->unk_0, 0x20, subroutine_arg7) == 0) {
+        snd_read_rom(subroutine_arg7[0], temp4->dataSEF, subroutine_arg7[1] & 0xFFFFFF);
     }
-    func_8004B62C((*temp2_1));
-    if (al_CopyFileTableEntry(temp4->unk_3C->unk_2, 0x40, subroutine_arg7) == 0) {
-        al_LoadPER(temp4, subroutine_arg7[0]);
+    snd_load_sfx_groups_from_SEF(*temp2_1);
+    if (snd_fetch_SBN_file(temp4->mseqFileList->unk_2, 0x40, subroutine_arg7) == 0) {
+        snd_load_PER(temp4, subroutine_arg7[0]);
     }
-    if (al_CopyFileTableEntry(temp4->unk_3C->unk_4, 0x40, subroutine_arg7) == 0) {
-        al_LoadPRG(temp4, subroutine_arg7[0]);
+    if (snd_fetch_SBN_file(temp4->mseqFileList->unk_4, 0x40, subroutine_arg7) == 0) {
+        snd_load_PRG(temp4, subroutine_arg7[0]);
     }
 
-    temp4->unk_12EC = &temp4->unk_4EC;
-    temp4->unk_12F0 = &temp4->unk_5EC;
-    temp4->unk_12F4 = &temp4->unk_AC;
-    temp4->unk_12F8 = &temp4->unk_EC;
-    temp4->unk_12FC = &temp4->unk_9EC;
-    temp4->unk_1300 = &temp4->unk_DEC;
-    temp4->unk_1304 = &temp4->unk_11EC;
-    temp4->unk_1308 = &temp4->unk_4EC;
+    temp4->instrumentGroups[0] = temp4->instrumentGroup1;
+    temp4->instrumentGroups[1] = temp4->instrumentGroup2;
+    temp4->instrumentGroups[2] = temp4->instrumentGroupX;
+    temp4->instrumentGroups[3] = temp4->instrumentGroup3;
+    temp4->instrumentGroups[4] = temp4->instrumentGroup4;
+    temp4->instrumentGroups[5] = temp4->instrumentGroup5;
+    temp4->instrumentGroups[6] = temp4->instrumentGroup6;
+    temp4->instrumentGroups[7] = temp4->instrumentGroup1;
     temp4->unk_53 = 0;
     temp4->unk_52 = 0;
     temp4->unk_51 = 0;
@@ -139,26 +139,26 @@ void func_80052E5C(s32 arg0) {
     func_80055050(alHeap);
 }
 
-void func_800532F4(UnkAl30* arg0) {
-    arg0->unk_00 = &D_800781D0;
-    arg0->unk_04 = 190;
-    arg0->unk_18 = &D_80078190;
-    arg0->unk_1C = 64;
-    arg0->unk_1E = 4800;
-    arg0->unk_08 = 0;
-    arg0->unk_0C = 0;
-    arg0->unk_10 = 0;
-    arg0->unk_14 = 0;
-    arg0->unk_24 = 0;
-    arg0->unk_25 = 0;
-    arg0->unk_2C = &D_80078544;
-    arg0->unk_26 = 0;
-    arg0->unk_27 = 0;
-    arg0->unk_28 = 0;
-    arg0->unk_29 = 0;
-    arg0->unk_2A = 0;
-    arg0->unk_2B = 0;
-    arg0->unk_20 = 0.5f;
+void snd_reset_instrument(Instrument* instrument) {
+    instrument->wavOffset = &D_800781D0;
+    instrument->wavLength = 190;
+    instrument->predictorOffset = &D_80078190;
+    instrument->unk_1C = 64;
+    instrument->unk_1E = 4800;
+    instrument->loopPredictorOffset = 0;
+    instrument->loopStart = 0;
+    instrument->loopEnd = 0;
+    instrument->loopCount = 0;
+    instrument->skipLoopPredictor = 0;
+    instrument->unk_25 = 0;
+    instrument->unkOffset = &D_80078544;
+    instrument->unk_26 = 0;
+    instrument->unk_27 = 0;
+    instrument->unk_28 = 0;
+    instrument->unk_29 = 0;
+    instrument->unk_2A = 0;
+    instrument->unk_2B = 0;
+    instrument->sampleRate = 0.5f;
 }
 
 void func_80053370(UnkAlC* arg0) {
@@ -173,7 +173,7 @@ void func_80053370(UnkAlC* arg0) {
     arg0->unk_0A = 0;
 }
 
-void func_800533A8(UnkAl4* arg0) {
+void func_800533A8(InstrumentCFG* arg0) {
     arg0->unk_00 = 8208;
     arg0->unk_02 = ~0x80;
     arg0->unk_03 = 64;
@@ -183,12 +183,12 @@ void func_800533A8(UnkAl4* arg0) {
 }
 
 
-void func_800533D0(void) {
+void snd_update_sequence_players(void) {
     UnkAl19E0* temp_s2 = D_8009A5C0;
-    UnkAl6CC* temp_s1 = D_8009A640;
+    SoundManager* manager = D_8009A640;
     UnkAl834* temp_s0 = D_8009A628;
-    UnkAlA9C* temp_s0_2;
-    UnkAlA9C* temp_s0_3;
+    BGMPlayer* bgmPlayer1;
+    BGMPlayer* bgmPlayer2;
     s32* t1;
 
     func_80053654(temp_s2);
@@ -199,55 +199,55 @@ void func_800533D0(void) {
         func_800511BC(temp_s0);
     }
 
-    if (temp_s1->unk_40.unk_0A != 0) {
-        func_80053A28(&temp_s1->unk_40);
-        func_80053A98(temp_s1->unk_BE, temp_s1->unk_40.unk_00.u16, temp_s1->unk_5C);
+    if (manager->unk_40.unk_0A != 0) {
+        func_80053A28(&manager->unk_40);
+        func_80053A98(manager->unk_BE, manager->unk_40.unk_00.u16, manager->unk_5C);
     }
 
-    temp_s1->unk_3C -= temp_s1->unk_34;
-    if (temp_s1->unk_3C <= 0) {
-        temp_s1->unk_3C += temp_s1->unk_38;
-        temp_s1->unk_BA = func_8004C444(temp_s1);
+    manager->unkCounter -= manager->unkCounterStep;
+    if (manager->unkCounter <= 0) {
+        manager->unkCounter += manager->unkCounterMax;
+        manager->unk_BA = func_8004C444(manager);
     }
 
     t1 = &D_80078DB0;
     if (*t1 == 0) {
-        temp_s0_2 = D_8009A5FC;
-        if (temp_s0_2->unk_2C.unk_0A != 0) {
-            func_8004E3A4(temp_s0_2);
+        bgmPlayer1 = D_8009A5FC;
+        if (bgmPlayer1->fadeInfo.fadeTime != 0) {
+            snd_update_bgm_fade(bgmPlayer1);
         }
-        if (temp_s0_2->unk_1C != 0) {
-            temp_s0_2->unk_18++;
+        if (bgmPlayer1->songName != 0) {
+            bgmPlayer1->unk_18++;
         }
 
-        temp_s0_2->unk_10 -= temp_s0_2->unk_08;
-        if (temp_s0_2->unk_10 <= 0) {
-            temp_s0_2->unk_10 += temp_s0_2->unk_0C;
-            temp_s0_2->unk_5C = func_8004E4B8(temp_s0_2);
+        bgmPlayer1->unk_10 -= bgmPlayer1->unkFrequency;
+        if (bgmPlayer1->unk_10 <= 0) {
+            bgmPlayer1->unk_10 += bgmPlayer1->unk_0C;
+            bgmPlayer1->unk_5C = func_8004E4B8(bgmPlayer1);
         }
         if (*t1 == 0) {
             if (temp_s2->unk_80 != 0) {
                 func_8004DFD4(temp_s2);
             }
-            temp_s0_3 = D_8009A664;
-            if (temp_s0_3->unk_2C.unk_1A != 0) {
-                func_80053BA8(&temp_s0_3->unk_2C);
-                if (temp_s0_3->unk_2C.unk_0A == 0) {
-                    func_8004E444(temp_s0_3);
+            bgmPlayer2 = D_8009A664;
+            if (bgmPlayer2->unk_46 != 0) {
+                func_80053BA8(&bgmPlayer2->fadeInfo);
+                if (bgmPlayer2->fadeInfo.fadeTime == 0) {
+                    func_8004E444(bgmPlayer2);
                 } else {
-                    func_8004E3A4(temp_s0_3);
+                    snd_update_bgm_fade(bgmPlayer2);
                 }
-            } else if (temp_s0_3->unk_2C.unk_0A != 0) {
-                func_8004E3A4(temp_s0_3);
+            } else if (bgmPlayer2->fadeInfo.fadeTime != 0) {
+                snd_update_bgm_fade(bgmPlayer2);
             }
-            if (temp_s0_3->unk_1C != 0) {
-                temp_s0_3->unk_18++;
+            if (bgmPlayer2->songName != 0) {
+                bgmPlayer2->unk_18++;
             }
 
-            temp_s0_3->unk_10 -= temp_s0_3->unk_08;
-            if (temp_s0_3->unk_10 <= 0) {
-                temp_s0_3->unk_10 += temp_s0_3->unk_0C;
-                temp_s0_3->unk_5C = func_8004E4B8(temp_s0_3);
+            bgmPlayer2->unk_10 -= bgmPlayer2->unkFrequency;
+            if (bgmPlayer2->unk_10 <= 0) {
+                bgmPlayer2->unk_10 += bgmPlayer2->unk_0C;
+                bgmPlayer2->unk_5C = func_8004E4B8(bgmPlayer2);
             }
         }
     }
@@ -256,8 +256,8 @@ void func_800533D0(void) {
 
 void func_800535C0(void) {
     UnkAl19E0* temp_s1 = D_8009A5C0;
-    UnkAlA9C* temp = D_8009A664;
-    UnkAl6CC* temp_s2 = D_8009A640;
+    BGMPlayer* player = D_8009A664;
+    SoundManager* manager = D_8009A640;
 
     if (temp_s1->unk_9C != 0) {
         func_8005610C();
@@ -268,10 +268,10 @@ void func_800535C0(void) {
         D_8009A5E8();
     }
 
-    func_8004D510(temp);
-    temp = D_8009A5FC;
-    func_8004D510(temp);
-    func_8004B748(temp_s2);
+    func_8004D510(player);
+    player = D_8009A5FC;
+    func_8004D510(D_8009A5FC);
+    func_8004B748(manager);
 }
 
 void func_80053654(UnkAl19E0* arg0) {
@@ -366,7 +366,20 @@ void func_800538C4(UnkAl48* arg0, s32 arg1) { // type may be wrong but it seems
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_800538F8);
 
-INCLUDE_ASM(void, "code_2e230_len_2190", func_80053974, UnkAl1* arg0, s32 arg1, s32 arg2, s16 arg3);
+void snd_initialize_fade(Fade* fade, s32 time, s32 startValue, s16 endValue) {
+    fade->currentVolume.s32 = startValue * 0x10000;
+    fade->endVolume = endValue;
+
+    if (time != 0) {
+        fade->fadeTime = (time * 1000) / 5750;
+        fade->fadeStep = (endValue * 0x10000 - fade->currentVolume.s32) / fade->fadeTime;
+    } else {
+        fade->fadeTime = 1;
+        fade->fadeStep = 0;
+    }
+
+    fade->fpFadeCallback = NULL;
+}
 
 void func_80053A18(UnkAl1* arg0) {
     arg0->unk_0A = 0;
@@ -438,15 +451,49 @@ void func_80053BA8(UnkAl1* arg0) {
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053BE8, UnkAl19E0* arg0, s32 arg1, s32 arg2, s32* arg3);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053C58);
+void snd_get_sequence_player_and_track(u32 playerIndex, s32** outCurrentTrackData, BGMPlayer** outPlayer) {
+    UnkAl19E0* temp_v1 = D_8009A5C0;
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053CB4);
+    switch (playerIndex) {
+        case 0:
+            *outCurrentTrackData = temp_v1->unk_5C;
+            *outPlayer = D_8009A664;
+            break;
+        case 1:
+            *outCurrentTrackData = temp_v1->unk_60;
+            *outPlayer = D_8009A5FC;
+            break;
+        case 2:
+            *outCurrentTrackData = temp_v1->unk_5C;
+            *outPlayer = D_8009A664;
+            break;
+        default:
+            *outCurrentTrackData = NULL;
+            *outPlayer = NULL;
+    }
+}
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053CF8);
+void snd_get_sequence_player(u32 playerIndex, BGMPlayer** outPlayer) {
+     switch (playerIndex) {
+        case 0:
+            *outPlayer = D_8009A664;
+            break;
+        case 1:
+            *outPlayer = D_8009A5FC;
+            break;
+        case 2:
+            *outPlayer = D_8009A664;
+            break;
+        default:
+            *outPlayer = NULL;
+    }
+}
+
+INCLUDE_ASM(s32, "code_2e230_len_2190", snd_load_song_files);
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053E58);
 
-UnkAlA9C* func_80053F64(s32 arg0) {
+BGMPlayer* func_80053F64(s32 arg0) {
     if (arg0 == 0) {
         return D_8009A5C0->unk_6C[0].unk_0;
     }
@@ -455,7 +502,7 @@ UnkAlA9C* func_80053F64(s32 arg0) {
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053F80);
 
-UnkAlA9C* func_80054248(u8 arg0) {
+BGMPlayer* func_80054248(u8 arg0) {
     switch (arg0) {
         case 1:
             return D_8009A664;
@@ -468,26 +515,93 @@ UnkAlA9C* func_80054248(u8 arg0) {
     }
 }
 
-INCLUDE_ASM(void, "code_2e230_len_2190", al_LoadINIT, UnkAl19E0* arg0, s32 arg1, ALHeap* arg2);
+INCLUDE_ASM(void, "code_2e230_len_2190", snd_load_INIT, UnkAl19E0* arg0, s32 arg1, ALHeap* arg2);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", al_CopyFileTableEntry, u16 arg0, s32 arg1, s32* arg2);
+INCLUDE_ASM(s32, "code_2e230_len_2190", snd_fetch_SBN_file, u16 arg0, s32 arg1, s32* arg2);
 
-INCLUDE_ASM(void, "code_2e230_len_2190", al_LoadPER, UnkAl19E0* arg0, s32* arg1);
+INCLUDE_ASM(void, "code_2e230_len_2190", snd_load_PER, UnkAl19E0* arg0, s32* arg1);
 
-INCLUDE_ASM(void, "code_2e230_len_2190", al_LoadPRG, UnkAl19E0* arg0, s32* arg1);
+INCLUDE_ASM(void, "code_2e230_len_2190", snd_load_PRG, UnkAl19E0* arg0, s32* arg1);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_8005465C);
+INCLUDE_ASM(s32, "code_2e230_len_2190", snd_load_BGM);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054744);
+Instruments* snd_get_BK_instruments(s32 bankGroup, u32 bankIndex) {
+    Instruments* ret = NULL;
+    UnkAl19E0* temp = D_8009A5C0;
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", al_LoadBank);
+    // TODO fake match - this multiplying the bankIndex by 16 and then dividing it right after is dumb
+    bankIndex *= 16;
+
+    switch (bankGroup) {
+        case 1:
+            ret = temp->instrumentGroup1[bankIndex / 16];
+            break;
+        case 2:
+            ret = temp->instrumentGroup2[bankIndex / 16];
+            break;
+        case 4:
+            ret = temp->instrumentGroup4[bankIndex / 16];
+            break;
+        case 5:
+            ret = temp->instrumentGroup5[bankIndex / 16];
+            break;
+        case 6:
+            ret = temp->instrumentGroup6[bankIndex / 16];
+            break;
+        case 3:
+            ret = temp->instrumentGroup3[bankIndex / 16];
+            break;
+    }
+
+    return ret;
+}
+
+INCLUDE_ASM(s32, "code_2e230_len_2190", snd_load_BK_to_bank);
+
+void snd_swizzle_BK_instruments(s32 bkFileOffset, SoundBank* bank, Instruments instruments, s32 instrumentCount, u8 arg4);
+// float weirdness
+#ifdef NON_MATCHING
+void snd_swizzle_BK_instruments(s32 bkFileOffset, SoundBank *bank, Instruments instruments, u32 instrumentCount, u8 arg4) {
+    SoundBank* sb = bank;
+    Instrument* defaultInstrument = D_8009A5C0->defaultInstrument;
+    f32 freq = D_8009A5C0->actualFrequency;
+    s32 i;
+
+    if (sb->swizzled == 0) {
+        for (i = 0; i < instrumentCount; i++) {
+            Instrument* instrument = instruments[i];
+
+            if (instrument != NULL) {
+                if (instrument->wavOffset != 0) {
+                    instrument->wavOffset += bkFileOffset;
+                }
+                if (instrument->loopPredictorOffset != 0) {
+                    instrument->loopPredictorOffset += (s32)bank;
+                }
+                if (instrument->predictorOffset != 0) {
+                    instrument->predictorOffset += (s32)bank;
+                }
+                if (instrument->unkOffset != 0) {
+                    instrument->unkOffset += (s32)bank;
+                }
+                instrument->unk_25 = arg4;
+                instrument->sampleRate = (instrument->sampleRate / freq);
+            } else {
+                instruments[i] = defaultInstrument;
+            }
+        }
+        sb->swizzled = 1;
+    }
+}
+#else
+INCLUDE_ASM(void, "code_2e230_len_2190", snd_swizzle_BK_instruments, s32 bkFileOffset, SoundBank* bank, Instruments instruments, s32 instrumentCount, u8 arg4);
+#endif
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_800549F8);
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054AA0);
 
-s32 func_80054C4C(s32 arg0, s32 arg1) {
-    al_LoadBank(arg0, D_8009A5C0->unk_1310[arg1], arg1, 1);
+s32 snd_load_BK(s32 arg0, s32 arg1) {
+    snd_load_BK_to_bank(arg0, D_8009A5C0->banks[arg1], arg1, 1);
     return 0;
 }
 
@@ -504,13 +618,19 @@ s32 func_80054D74(s32 arg0, s32 arg1) {
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054DA8);
 
-INCLUDE_ASM(void, "code_2e230_len_2190", al_DmaCopy, s32 arg0, s32* arg1, s32 arg2);
+INCLUDE_ASM(void, "code_2e230_len_2190", snd_read_rom, s32 arg0, s32* arg1, s32 arg2);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054E90);
+INCLUDE_ASM(s32, "code_2e230_len_2190", snd_memset);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054F48);
+void snd_bcopy(s8* src, s8 *dest, s32 size) {
+    if (size > 0) {
+        while (size-- != 0) {
+            *dest++ = *src++;
+        }
+    }
+}
 
-void al_CopyWords(s32* src, s32* dst, s32 num) {
+void snd_copy_words(s32* src, s32* dst, s32 num) {
     num /= 4;
 
     if (num > 0) {
diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c
index 7d1831a2b4..fc47ba9ba6 100644
--- a/src/code_303c0_len_3e10.c
+++ b/src/code_303c0_len_3e10.c
@@ -1,4 +1,4 @@
 #include "common.h"
 #include "audio.h"
 
-INCLUDE_ASM(void, "code_303c0_len_3e10", al_LoadBKHeaders, UnkAl19E0* arg0, ALHeap* arg1);
+INCLUDE_ASM(void, "code_303c0_len_3e10", snd_load_BK_headers, UnkAl19E0* arg0, ALHeap* arg1);
diff --git a/src/code_30450.c b/src/code_30450.c
index baa5ef2105..231ad8ca6d 100644
--- a/src/code_30450.c
+++ b/src/code_30450.c
@@ -22,7 +22,7 @@ void func_80055050(void) {
 
 INCLUDE_ASM(void, "code_30450", func_80055068, u32 arg0);
 
-void func_80055110(UnkAlA9C* arg0) {
+void func_80055110(BGMPlayer* arg0) {
     s32 i;
 
     for (i = 0; i < 8; i++) {
@@ -37,88 +37,88 @@ void func_80055110(UnkAlA9C* arg0) {
 
 INCLUDE_ASM(s32, "code_30450", func_8005513C);
 
-void func_800551E0(s32 arg0, u8 arg1, s8 arg2) {
-    UnkAl6CC* sym = D_8009A640;
-    s16 a1temp = arg1 * 256;
+void snd_start_sound(s32 soundID, u8 volume, s8 pan) {
+    SoundManager* sym = D_8009A640;
+    s16 a1temp = volume * 256;
 
     if (a1temp != 0) {
         a1temp |= 0xFF;
     }
 
-    if (arg2 < 0) {
-        arg2 = 0x7F;
+    if (pan < 0) {
+        pan = 0x7F;
     }
 
-    func_8004B6D8(sym, arg0, a1temp, 0, arg2);
+    snd_enqueue_sfx_event(sym, soundID, a1temp, 0, pan);
 }
 
-void func_80055240(s32 arg0, u8 arg1, s8 arg2, s16 arg3) {
-    UnkAl6CC* sym = D_8009A640;
-    s16 a1temp = arg1 * 256;
+void snd_start_sound_with_shift(s32 soundID, u8 volume, s8 pan, s16 pitchShift) {
+    SoundManager* sym = D_8009A640;
+    s16 a1temp = volume * 256;
 
     if (a1temp != 0) {
         a1temp |= 0xFF;
     }
 
-    if (arg2 < 0) {
-        arg2 = 0x7F;
+    if (pan < 0) {
+        pan = 0x7F;
     }
 
-    if (arg3 > 0x960) {
-        arg3 = 0x960;
-    } else if (arg3 < -0x960) {
-        arg3 = -0x960;
+    if (pitchShift > 0x960) {
+        pitchShift = 0x960;
+    } else if (pitchShift < -0x960) {
+        pitchShift = -0x960;
     }
 
-    func_8004B6D8(sym, arg0, a1temp, arg3, arg2);
+    snd_enqueue_sfx_event(sym, soundID, a1temp, pitchShift, pan);
 }
 
-void func_800552D0(s32 arg0, u8 arg1, s8 arg2) {
-    UnkAl6CC* sym = D_8009A640;
-    s16 a1temp = arg1 * 256;
+void snd_adjust_sound(s32 soundID, u8 volume, s8 pan) {
+    SoundManager* sym = D_8009A640;
+    s16 a1temp = volume * 256;
 
     if (a1temp != 0) {
         a1temp |= 0xFF;
     }
 
-    if (arg2 < 0) {
-        arg2 = 0x7F;
+    if (pan < 0) {
+        pan = 0x7F;
     }
 
-    func_8004B6D8(sym, arg0 | 0x1000, a1temp, 0, arg2);
+    snd_enqueue_sfx_event(sym, soundID | 0x1000, a1temp, 0, pan);
 }
 
-void func_80055330(s32 arg0, u8 arg1, s8 arg2, s16 arg3) {
-    UnkAl6CC* sym = D_8009A640;
-    s16 a1temp = arg1 * 256;
+void snd_adjust_sound_with_shift(s32 soundID, u8 volume, s8 pan, s16 pitchShift) {
+    SoundManager* sym = D_8009A640;
+    s16 a1temp = volume * 256;
 
     if (a1temp != 0) {
         a1temp |= 0xFF;
     }
 
-    if (arg2 < 0) {
-        arg2 = 0x7F;
+    if (pan < 0) {
+        pan = 0x7F;
     }
 
-    if (arg3 > 0x960) {
-        arg3 = 0x960;
-    } else if (arg3 < -0x960) {
-        arg3 = -0x960;
+    if (pitchShift > 0x960) {
+        pitchShift = 0x960;
+    } else if (pitchShift < -0x960) {
+        pitchShift = -0x960;
     }
 
-    func_8004B6D8(sym, arg0 | 0x1000, a1temp, arg3, arg2);
+    snd_enqueue_sfx_event(sym, soundID | 0x1000, a1temp, pitchShift, pan);
 }
 
-void func_800553C0(s32 arg0) {
-    func_8004B6D8(D_8009A640, arg0 | 0x8000, 0, 0, 0);
+void snd_stop_sound(s32 soundID) {
+    snd_enqueue_sfx_event(D_8009A640, soundID | 0x8000, 0, 0, 0);
 }
 
 void func_800553F4(void) {
     D_8009A640->unk_168 = 1;
 }
 
-void func_80055408(s32 arg0, s16 arg1, s16 arg2, s32 arg3) {
-    func_8004B6D8(D_8009A640, arg0, arg1, arg2, arg3);
+void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan) {
+    snd_enqueue_sfx_event(D_8009A640, soundID, volume, pitchShift, pan);
 }
 
 s32 func_80055448(s32 arg0) {
@@ -278,7 +278,7 @@ s32 func_80055848(s32 arg0) {
     return phi_v1;
 }
 
-INCLUDE_ASM(s32, "code_30450", func_800558D4);
+INCLUDE_ASM(s32, "code_30450", snd_load_song);
 
 INCLUDE_ASM(s32, "code_30450", func_8005591C);
 
diff --git a/src/code_31650.c b/src/code_31650.c
index ff0e850b32..2384fc0245 100644
--- a/src/code_31650.c
+++ b/src/code_31650.c
@@ -85,7 +85,7 @@ void func_80056F78(u8 arg0) {
 INCLUDE_ASM(void, "code_31650", func_80056FA4, u8 arg0, u8 arg1, s32 arg2, f32 arg3, s16 arg4, u8 arg5, u8 arg6,
             s32 arg7);
 
-INCLUDE_ASM(void, "code_31650", func_80057224, u8 arg0, UnkAl30* arg1);
+INCLUDE_ASM(void, "code_31650", func_80057224, u8 arg0, Instrument* arg1);
 
 void func_80057344(u8 arg0, f32 arg1) {
     UnkAl7C* al7C = &D_80078E54->unk_1C[arg0];
@@ -222,7 +222,7 @@ void* alHeapAlloc(ALHeap* heap, s32 arg1, s32 size) {
     return ret;
 }
 
-void func_80057FD8(u8* src, u8* dst, s32 size) {
+void alCopy(void* src, void* dst, s32 size) {
     s32 i;
     u8* srcIt = src;
     u8* dstIt = dst;
diff --git a/src/code_415D90.c b/src/code_415D90.c
index 728f7ca8cf..e9d4f434ca 100644
--- a/src/code_415D90.c
+++ b/src/code_415D90.c
@@ -1,16 +1,178 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "code_415D90", func_802A1000);
+extern s32 D_80104A28;
+extern s32 D_80107D48;
+extern s32 D_80107D98;
+extern s32 D_80107CA8;
+extern s32 D_80107CD0;
+extern s32 D_80107CF8;
+extern s32 D_80107D20;
+extern s32 D_80107D70;
+extern s32 D_80107DC0;
+extern s32 D_80107DE8;
+extern s32 D_80107E10;
+extern s32 D_80107E38;
+extern s32 D_80107E60;
+extern s32 D_80107E88;
+extern s32 D_80107EB0;
+extern s32 D_80107ED8;
+extern s32 D_80107F00;
+extern s32 D_80107F28;
+extern s32 D_80107F50;
+extern s32 D_80107FC8;
+extern s32 D_80107FF0;
+extern s32 D_80108974;
 
-INCLUDE_ASM(s32, "code_415D90", func_802A1030);
+extern u8 D_802AD000;
+extern u8 D_802AD001;
+extern s16 D_802AD006;
+extern s16 D_802AD008;
+extern s32* D_802AD010;
+extern s32* D_802AD028;
+extern s32 D_802AD040;
+extern s32 D_802AD044;
+extern s32 D_802AD048;
+extern s32 D_802AD04C;
+extern s32 D_802AD05C;
+extern s32 D_802AD050;
+extern s32 D_802AD054;
+extern s32 D_802AD058;
+extern s8 D_802AD068;
+extern s32 main_menu_numOptions;
+extern s8 D_802AD10F;
+extern u8 battle_menu_moveState;
+extern s16 battle_menu_moveTextColor;
+extern s16 battle_menu_moveTextOpacity;
+extern s32 battle_menu_moveCursorIcon;
+extern s32 battle_menu_moveUpArrowIcon;
+extern s32 battle_menu_moveDownArrowIcon;
+extern s32* battle_menu_moveOptionIconIDs;
+extern s32 battle_menu_moveTitleIcon;
+extern s32* battle_menu_moveOptionCostUnitIconIDs;
+extern s32 D_802AD258;
+extern s32 battle_menu_hasSpiritsMenu;
+extern s32 battle_menu_moveOptionCount;
+extern s8 D_802AD604;
+extern s8 D_802AD605;
+extern s8 D_802AD60B;
+extern s32 D_802AD610;
+extern s8 D_802AD614;
+extern s32 D_802AD618;
+extern s32 D_802AD61C;
+extern s32 D_802AD620;
+extern s32 D_802AD624;
+extern s32 D_802AD628;
+extern s32 D_802AD66C;
+extern s32* D_802AD6C0[];
 
-INCLUDE_ASM(s32, "code_415D90", func_802A1050);
+s16 D_802AB340[] = { 0x001C, 0x0028 };
 
-INCLUDE_ASM(s32, "code_415D90", func_802A1078);
+s16 D_802AB344[] = { 0, -2 };
 
-INCLUDE_ASM(s32, "code_415D90", func_802A1098);
+s32 battle_menu_iconScripts[] = { 0x8010876C, 0x8010876C, 0x80108744, 0x8010876C, 0x80108794, 0x801087BC, 0x801087E4, 0x8010880C };
 
-INCLUDE_ASM(s32, "code_415D90", func_802A10B8);
+s32 D_802AB368[] = { 0x8010885C, 0x8010885C, 0x80108834, 0x8010885C, 0x80108884, 0x801088AC, 0x801088D4, 0x801088FC };
+
+s32 D_802AB388[] = { 0x80108924, 0x8010894C };
+
+s32 D_802AB390[] = { &D_80108974, 0x8010899C };
+
+s32 D_802AB398[] = { &D_80108974, 0x8010899C, 0x80107990, 0x801079BC, 0x801079E8, 0x80107A14, 0x80107A40, 0x80107A6C, 0x80107A98, 0x80107AC4, 0x80107AF0, 0x80107B1C, 0x80107B48, 0x80107B74, 0x80107BA0, 0x80107BCC, 0x80107BF8, 0x80107C24, 0x80107C50, 0x80107C7C, &D_80108974, 0x8010899C, &D_80108974, 0x8010899C };
+
+s32 D_802AB3F8[] = { &D_80107CA8, &D_80107CF8, &D_80107D48, &D_80107D98, &D_80107DE8, &D_80107CA8, &D_80107E88, &D_80107ED8, &D_80107F28, &D_80107E38, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8 };
+
+s32 D_802AB438[] = { &D_80107CD0, &D_80107D20, &D_80107D70, &D_80107DC0, &D_80107E10, &D_80107CD0, &D_80107EB0, &D_80107F00, &D_80107F50, &D_80107E60, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0 };
+
+s32 D_802AB478[] = { 0x80292200 };
+
+s32 D_802AB47C[] = { 0x80292228 };
+
+s32 D_802AB480[] = { 0x802922A0, 0x802922C8 };
+
+s32 D_802AB488[] = { 0x80292160, 0x80292188 };
+
+s32 battle_menu_leftJustfiedMessages[] = { 0x001D0039, 0x001D0038, 0x001D003F, 0x001D003B, 0x001D0044 };
+
+s32 D_802AB4A4[] = { 0x001D003E, 0x001D0045, 0x001D0043, 0x001D003A };
+
+s32 D_802AB4B4[] = { 0x001D003C, 0x001D0046, 0x001D0048 };
+
+s32 battle_menu_centeredMessages[] = { 0x001D004B, 0x001D004A };
+
+s32 D_802AB4C8[] = { 0x001D0050, 0x001D004D, 0x001D0052, 0x001D004F, 0x001D0053 };
+
+s32 D_802AB4DC[] = { 0x001D0051 };
+
+s32 D_802AB4E0[] = { 0x001D004C, 0x001D004E, 0x001D0056, 0x001D0055 };
+
+s8 D_802AB4F0[] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x37, };
+
+// s8 D_802AB513
+
+s32 D_802AB520[] = { 0x00000000, 0x00090012, 0x000A001A, 0x000B001C, 0x000C0017, 0x009D0001, 0x000E000B, 0x000F0012, 0x00100003, 0x000D0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
+
+s32 D_802AB558[] = { 0x00000000, 0x00090002, 0x000A0005, 0x000B0006, 0x000C0002, 0x009D0002, 0x000E0002, 0x000F0002, 0x00100002, 0x000D0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
+
+s32 D_802AB590[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, &D_80107CF8, &D_80107D20, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107D48, &D_80107D70, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107D98, &D_80107DC0, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107DE8, &D_80107E10, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107CA8, &D_80107CD0, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107E88, &D_80107EB0, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107ED8, &D_80107F00, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107F28, &D_80107F50, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107E38, &D_80107E60, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450 };
+
+s32 D_802AB720[] = { &D_80108974, 0x8010899C };
+
+s32 D_802AB728[] = { 0x001D0055 };
+
+s32 D_802AB72C[] = { &D_80108974, 0x8010899C };
+
+s32 D_802AB734[] = { 0x001D0057 };
+
+s32 D_802AB738[] = { 0x00000000, 0x001D0007, 0x001D0008, 0x001D0009, 0x001D000A, 0x001D000B, 0x001D000C, 0x001D000D, 0x001D000E, 0x001D000F, 0x001D0010, 0x001D0011, 0x001D0012, 0x00000000 };
+
+void func_802A1000(void) {
+    D_802AD006 = 255;
+    D_802AD008 = 255;
+    D_802AD000 = 0;
+    D_802AD068 = -1;
+}
+
+void func_802A1030(void) {
+    D_802AD001 = 3;
+    D_802AD000 = 10;
+}
+
+void func_802A1050(void) {
+    D_802AD000 = 2;
+    D_802AD006 = 255;
+    D_802AD008 = 255;
+}
+
+void func_802A1078(void) {
+    D_802AD008 = 255;
+    D_802AD000 = 20;
+}
+
+void func_802A1098(void) {
+    D_802AD008 = 100;
+    D_802AD000 = 30;
+}
+
+void func_802A10B8(void) {
+    s32 i;
+
+    for (i = 0; i < main_menu_numOptions; i++) {
+        s32* icons1 = &D_802AD010;
+        s32* icons2 = &D_802AD028;
+
+        free_icon(icons1[i]);
+        free_icon(icons2[i]);
+    }
+
+    free_icon(D_802AD040);
+    free_icon(D_802AD044);
+    free_icon(D_802AD048);
+    free_icon(D_802AD04C);
+    free_icon(D_802AD05C);
+    free_icon(D_802AD050);
+    free_icon(D_802AD054);
+    free_icon(D_802AD058);
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A11B0);
 
@@ -18,53 +180,300 @@ INCLUDE_ASM(s32, "code_415D90", draw_battle_wheel);
 
 INCLUDE_ASM(s32, "code_415D90", func_802A2684);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A27D0);
+void func_802A27D0(void) {
+    battle_menu_moveState = 10;
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A27E4);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A2910);
+void func_802A2910(void) {
+    s32* moveOptionIconIDs;
+    s32* moveOptionCostUnitIconIDs;
+    s32 i;
 
-INCLUDE_ASM(s32, "code_415D90", func_802A2AB8);
+    moveOptionIconIDs = &battle_menu_moveOptionIconIDs;
 
-INCLUDE_ASM(s32, "code_415D90", func_802A2C58);
+    for (i = 0; i < battle_menu_moveOptionCount; i++) {
+        icon_set_tint(moveOptionIconIDs[i], 255, 255, 255);
+    }
+
+    icon_set_tint(battle_menu_moveCursorIcon, 255, 255, 255);
+    icon_set_tint(battle_menu_moveUpArrowIcon, 255, 255, 255);
+    icon_set_tint(battle_menu_moveDownArrowIcon, 255, 255, 255);
+    icon_set_tint(battle_menu_moveTitleIcon, 255, 255, 255);
+
+    moveOptionCostUnitIconIDs = &battle_menu_moveOptionCostUnitIconIDs;
+
+    for (i = 0; i < battle_menu_moveOptionCount; i++) {
+        icon_set_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255);
+    }
+
+    set_menu_icon_script(battle_menu_moveCursorIcon, &D_80104A28);
+    set_window_update(1, 5);
+
+    if (!battle_menu_hasSpiritsMenu) {
+        set_window_update(2, 5);
+        set_window_update(3, 5);
+    } else {
+        set_window_update(4, 5);
+        set_window_update(5, 5);
+    }
+
+    set_window_update(8, 1);
+    battle_menu_moveTextColor = 10;
+    D_802AD10F = 1;
+    battle_menu_moveTextOpacity = 255;
+    battle_menu_moveState = 1;
+}
+
+void func_802A2AB8(void) {
+    s32* moveOptionIconIDs;
+    s32* moveOptionCostUnitIconIDs;
+    s32 i;
+
+    set_window_update(1, 5);
+
+    if (!battle_menu_hasSpiritsMenu) {
+        set_window_update(2, 5);
+        set_window_update(3, 5);
+    } else {
+        set_window_update(4, 5);
+        set_window_update(5, 5);
+    }
+    set_window_update(8, 1);
+
+    moveOptionIconIDs = &battle_menu_moveOptionIconIDs;
+
+    for (i = 0; i < battle_menu_moveOptionCount; i++) {
+        icon_set_tint(moveOptionIconIDs[i], 255, 255, 255);
+    }
+
+    icon_set_tint(battle_menu_moveCursorIcon, 255, 255, 255);
+    icon_set_tint(battle_menu_moveUpArrowIcon, 255, 255, 255);
+    icon_set_tint(battle_menu_moveDownArrowIcon, 255, 255, 255);
+    icon_set_tint(battle_menu_moveTitleIcon, 255, 255, 255);
+
+    moveOptionCostUnitIconIDs = &battle_menu_moveOptionCostUnitIconIDs;
+
+    for (i = 0; i < battle_menu_moveOptionCount; i++) {
+        icon_set_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255);
+    }
+
+    set_menu_icon_script(battle_menu_moveCursorIcon, &D_80104A28);
+    battle_menu_moveTextColor = 10;
+    D_802AD10F = 1;
+    battle_menu_moveState = 20;
+}
+
+void func_802A2C58(void) {
+    set_window_update(8, 1);
+    battle_menu_moveState = 30;
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A2C84);
 
 INCLUDE_ASM(s32, "code_415D90", func_802A3C98);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A43DC);
+void func_802A43DC(s32 arg0, s32 arg1, s32 arg2) {
+    s32 phi_a0;
+    s32 phi_a1;
+    s32 phi_a2;
+    s32 phi_a3;
+    s32 phi_v0;
 
-INCLUDE_ASM(s32, "code_415D90", func_802A4448);
+    if (!battle_menu_hasSpiritsMenu) {
+        phi_a0 = 0x1D0045;
+        phi_a1 = arg1 + 0x10;
+        phi_a2 = arg2 + 2;
+        phi_a3 = battle_menu_moveTextOpacity;
+        phi_v0 = 0x30;
+    } else {
+        phi_a0 = 0x1D003A;
+        phi_a1 = arg1 + 6;
+        phi_a2 = arg2 + 2;
+        phi_a3 = battle_menu_moveTextOpacity;
+        phi_v0 = 0x31;
+    }
+    draw_msg(phi_a0, phi_a1, phi_a2, phi_a3, phi_v0, 1);
+}
+
+void func_802A4448(s32 arg0, s32 arg1, s32 arg2) {
+    s32 icon = battle_menu_moveTitleIcon;
+
+    set_icon_render_pos(icon, arg1 + 0x10, arg2 + 0xF);
+    icon_set_opacity(icon, battle_menu_moveTextOpacity);
+    draw_icon_0(icon);
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A4494);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A4534);
+void func_802A4534(s32 arg0, s32 arg1, s32 arg2) {
+    s32 temp2 = arg2;
+    s32 temp1;
+    s32 phi_s0;
+
+    temp2 += 6;
+    temp1 = arg1 + 11;
+
+    if (D_802AD258 != 0) {
+        phi_s0 = 0x1D00C3;
+    } else if (battle_menu_hasSpiritsMenu == 0) {
+        phi_s0 = 0x1D009F;
+    } else {
+        phi_s0 = 0x1D00A0;
+    }
+    draw_msg(phi_s0, temp1, temp2 + D_802AB344[get_msg_lines(phi_s0) - 1], 255, 0xF, 0);
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A45D8);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A4718);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A472C);
+void func_802A4718(void) {
+    D_802AD604 = 10;
+}
+
+//INCLUDE_ASM(s32, "code_415D90", func_802A472C);
+void func_802A472C(void) {
+    s32* temp = &D_802AD628;
+    s32 i;
+
+    set_window_update(6, 2);
+    set_window_update(7, 2);
+    set_window_update(8, 2);
+
+    for (i = 0; i < D_802AD66C; i++) {
+        free_icon(temp[i]);
+    }
+
+    free_icon(D_802AD618);
+    free_icon(D_802AD61C);
+    free_icon(D_802AD620);
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A47E0);
 
 INCLUDE_ASM(s32, "code_415D90", func_802A48FC);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A4A10);
+void func_802A4A10(void) {
+    set_window_update(6, 5);
+    set_window_update(7, 5);
+    set_window_update(8, 1);
+    D_802AD604 = 30;
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A4A54);
 
 INCLUDE_ASM(s32, "code_415D90", func_802A5290);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A56F8);
+void func_802A56F8(s32 arg0, s32 arg1, s32 arg2) {
+    draw_msg(0x1D0043, arg1 + 0xF, arg2 + 2, D_802AD624, 0x33, 1);
+}
 
+#ifdef NON_MATCHING
+void func_802A5738(s32 arg0, s32 arg1, s32 arg2) {
+    s32 id;
+
+    switch (D_802AD604) {
+        case -1:
+        case 1:
+        case 10:
+        case 20:
+        case 30:
+            if (D_802AD60B != 0) {
+                draw_msg(D_802AD6C0[D_802AD605], arg1 + 8, arg2, D_802AD624, D_802AD614, 0);
+            }
+            break;
+    }
+}
+#else
 INCLUDE_ASM(s32, "code_415D90", func_802A5738);
+#endif
 
 INCLUDE_ASM(s32, "code_415D90", func_802A57C8);
 
-INCLUDE_ASM(s32, "code_415D90", can_switch_to_player);
+s32 can_switch_to_player(void) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* player = battleStatus->playerActor;
 
-INCLUDE_ASM(s32, "code_415D90", func_802A58D0);
+    if (battleStatus->flags2 & 2) {
+        return FALSE;
+    } else {
+        s8 debuff = player->debuff;
+        s32 ret = player->koStatus == 0xD;
+
+        if (debuff == 9) {
+           ret = FALSE;
+        }
+        if (debuff == 10) {
+           ret = FALSE;
+        }
+        if (debuff == 6) {
+           ret = TRUE;
+        }
+        if (debuff == 3) {
+           ret = TRUE;
+        }
+        if (debuff == 4) {
+           ret = TRUE;
+        }
+        if (debuff == 5) {
+           ret = TRUE;
+        }
+        if (debuff == 7) {
+           ret = TRUE;
+        }
+        if (debuff == 8) {
+           ret = TRUE;
+        }
+        if (player->stoneStatus == 0xC) {
+           ret = TRUE;
+        }
+        if (battleStatus->outtaSightActive) {
+           ret = TRUE;
+        }
+        return !ret;
+    }
+}
+
+s32 func_802A58D0(void) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* partner = battleStatus->partnerActor;
+    s8 partnerDebuff;
+    s32 ret;
+
+    if (battleStatus->flags2 & 4 || partner == PartnerID_NONE || partner->flags & 0x200000) {
+        return FALSE;
+    }
+
+    partnerDebuff = partner->debuff;
+    ret = partner->koStatus == 0xD;
+
+    if (partnerDebuff == 9) {
+        ret = FALSE;
+    }
+    if (partnerDebuff == 10) {
+        ret = FALSE;
+    }
+    if (partnerDebuff == 6) {
+        ret = TRUE;
+    }
+    if (partnerDebuff == 3) {
+        ret = TRUE;
+    }
+    if (partnerDebuff == 5) {
+        ret = TRUE;
+    }
+    if (partnerDebuff == 7) {
+        ret = TRUE;
+    }
+    if (partnerDebuff == 8) {
+        ret = TRUE;
+    }
+    if (partner->stoneStatus == 0xC) {
+        ret = TRUE;
+    }
+    return !ret;
+}
 
 INCLUDE_ASM(s32, "code_415D90", update_player_menu);
 
@@ -74,17 +483,68 @@ INCLUDE_ASM(s32, "code_415D90", update_partner_menu);
 
 INCLUDE_ASM(s32, "code_415D90", func_802A9AE8);
 
-INCLUDE_ASM(s32, "code_415D90", func_802A9B30);
+s32 func_802A9B30(void) {
+    return (gBattleStatus.flags2 & 4) <= 0;
+}
 
 INCLUDE_ASM(s32, "code_415D90", func_802A9B44);
 
 INCLUDE_ASM(s32, "code_415D90", func_802AA05C);
+// void func_802AA05C(void) {
+//     switch (gBattleStatus.battleState) {
+//         case 1:
+//             draw_battle_wheel();
+//             break;
+//         case 2:
+//             draw_battle_wheel();
+//             break;
+//         case 3:
+//             draw_battle_wheel();
+//             break;
+//         case 4:
+//             draw_battle_wheel();
+//             break;
+//         case 5:
+//             draw_battle_wheel();
+//             break;
+//         case 6:
+//         case 7:
+//         case 8:
+//         case 9:
+//             break;
+//     }
+// }
 
-INCLUDE_ASM(s32, "code_415D90", func_802AA0A4);
+s32 func_802AA0A4(void) {
+    return (gBattleStatus.flags2 & 2) <= 0;
+}
 
-INCLUDE_ASM(s32, "code_415D90", func_802AA0B8);
+INCLUDE_ASM(s32, "code_415D90", func_802AA0B8); // look into m2c bug
 
-INCLUDE_ASM(s32, "code_415D90", func_802AA640);
+void func_802AA640(void) {
+    switch (gBattleStatus.battleState) {
+        case 1:
+            draw_battle_wheel();
+            break;
+        case 2:
+            draw_battle_wheel();
+            break;
+        case 3:
+            draw_battle_wheel();
+            break;
+        case 4:
+            draw_battle_wheel();
+            break;
+        case 5:
+            draw_battle_wheel();
+            break;
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+            break;
+    }
+}
 
 INCLUDE_ASM(s32, "code_415D90", update_targeting_enemies);
 
diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c
index e562cb8a22..9a40f4f316 100644
--- a/src/code_7bb60_len_41b0.c
+++ b/src/code_7bb60_len_41b0.c
@@ -150,7 +150,7 @@ s32 collision_check_player_intersecting_world(s32 arg0, s32 arg1, f32 arg2) {
         f32 y = (*playerStatus)->position.y + arg1;
         f32 z = (*playerStatus)->position.z;
         s32 hitID = do_lateral_collision(arg0, *playerStatus, &x, &y, &z, 0, angle);
-        
+
         if (hitID >= 0) {
             ret = hitID;
         }
@@ -296,7 +296,7 @@ void func_800E5098(s32 arg0) {
             soundID = soundID2;
         }
 
-        play_sound_at_player(soundID, 0);
+        sfx_play_sound_at_player(soundID, 0);
         *temp_800F7B80 ^= 1;
     }
 }
@@ -412,7 +412,7 @@ void set_action_state(s32 actionState) {
     playerStatus->animFlags &= ~0x10000;
 
     if (unknownStruct[0xC]) {
-        stop_sound(unknownStruct[0xC]);
+        sfx_stop_sound(unknownStruct[0xC]);
     }
 
     if (playerStatus->unk_D8) {
diff --git a/src/code_7fd10_len_b40.c b/src/code_7fd10_len_b40.c
index b4c52bd82f..579e54fc11 100644
--- a/src/code_7fd10_len_b40.c
+++ b/src/code_7fd10_len_b40.c
@@ -35,7 +35,7 @@ s32 func_800E6904(void) {
                 }
             } else if (temp_8010EBB0->unk_03 == 8) {
                 if (actionState != ActionState_RIDE) {
-                    play_sound(0x21D);
+                    sfx_play_sound(0x21D);
                 } else {
                     return 1;
                 }
@@ -77,14 +77,14 @@ void check_input_status_menu(void) {
                 open_status_menu_long();
 
                 if (!is_picking_up_item()) {
-                    play_sound(3);
+                    sfx_play_sound(3);
                 }
             }
         } else if (!(playerStatus->currentButtons & Z_TRIG + R_TRIG) && (pressedButtons & 8) && func_800E9860()) {
             close_status_menu();
 
             if (!is_picking_up_item()) {
-                play_sound(4);
+                sfx_play_sound(4);
             }
         }
     }
diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c
index 0292e0598a..67d44847db 100644
--- a/src/code_80850_len_3060.c
+++ b/src/code_80850_len_3060.c
@@ -395,7 +395,7 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
     s32 iconIndex;
 
     if ((gPlayerData.coins != uiStatus->displayCoins) && ((gGameStatusPtr->frameCounter % 3) == 0)) {
-        play_sound(0x211);
+        sfx_play_sound(0x211);
     }
 
     iconIndex = uiStatus->iconIndex10;
diff --git a/src/code_DF950.c b/src/code_DF950.c
index 1874e20f49..faebf98c99 100644
--- a/src/code_DF950.c
+++ b/src/code_DF950.c
@@ -68,18 +68,18 @@ s32 D_8014F6B4[] = { 0x000001C1, 0x000001C2, 0x000001C3, 0x000001C4, 0x000001C5,
 
 extern s32 D_80159AD4;
 
-INCLUDE_ASM(s32, "code_DF950", func_80149250);
+INCLUDE_ASM(void, "code_DF950", sfx_compute_spatialized_sound_params_2, f32 posX, f32 posY, f32 posZ, s16* volume, s16* pan, u32 sourceFlags);
 
-void use_default_door_sounds(void) {
+void sfx_reset_door_sounds(void) {
     gCurrentDoorSoundsSet = 0;
     D_80151308 = 0;
 }
 
-INCLUDE_ASM(s32, "code_DF950", func_80149618);
+INCLUDE_ASM(void, "code_DF950", sfx_clear_sounds);
 
 INCLUDE_ASM(s32, "code_DF950", func_80149670);
 
-INCLUDE_ASM(s32, "code_DF950", func_80149734);
+INCLUDE_ASM(void, "code_DF950", sfx_update_looping_sound_params);
 
 void func_801497FC(s32 arg0) {
     func_800561E4();
@@ -90,47 +90,47 @@ s32 func_80149828(void) {
     return D_80159AD4;
 }
 
-INCLUDE_ASM(s32, "code_DF950", func_80149838);
+INCLUDE_ASM(s32, "code_DF950", sfx_stop_env_sounds);
 
-INCLUDE_ASM(s32, "code_DF950", func_801498C4);
+INCLUDE_ASM(s32, "code_DF950", sfx_get_env_sound_instance);
 
-INCLUDE_ASM(s32, "code_DF950", func_80149908);
+INCLUDE_ASM(s32, "code_DF950", sfx_play_sound_looping);
 
-INCLUDE_ASM(s32, "code_DF950", func_80149974);
+INCLUDE_ASM(s32, "code_DF950", sfx_register_looping_sound_at_position);
 
-INCLUDE_ASM(s32, "code_DF950", func_801499EC, s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
+INCLUDE_ASM(s32, "code_DF950", sfx_adjust_env_sound_pos, s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
 
 INCLUDE_ASM(s32, "code_DF950", func_80149A6C);
 
-INCLUDE_ASM(s32, "code_DF950", _play_sound);
+INCLUDE_ASM(s32, "code_DF950", sfx_play_sound_with_params);
 
-INCLUDE_ASM(s32, "code_DF950", func_80149BE4);
+INCLUDE_ASM(s32, "code_DF950", sfx_adjust_env_sound_params);
 
-INCLUDE_ASM(s32, "code_DF950", stop_sound);
+INCLUDE_ASM(s32, "code_DF950", sfx_stop_sound);
 
-void play_sound(s32 soundID) {
-    _play_sound(soundID, 0, 0, 0);
+void sfx_play_sound(s32 soundID) {
+    sfx_play_sound_with_params(soundID, 0, 0, 0);
 }
 
-void play_sound_at_player(s32 soundID, s32 arg1) {
+void sfx_play_sound_at_player(s32 soundID, s32 arg1) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    play_sound_at_position(soundID, arg1, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z);
+    sfx_play_sound_at_position(soundID, arg1, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z);
 }
 
-void play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) {
+void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) {
     Npc* npc = get_npc_safe(npcID);
 
     if (npc != NULL) {
-        play_sound_at_position(soundID, arg1, npc->pos.x, npc->pos.y, npc->pos.z);
+        sfx_play_sound_at_position(soundID, arg1, npc->pos.x, npc->pos.y, npc->pos.z);
     }
 }
 
-INCLUDE_ASM(s32, "code_DF950", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY,
+INCLUDE_ASM(s32, "code_DF950", sfx_play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY,
             f32 posZ);
 
-INCLUDE_ASM(s32, "code_DF950", func_80149E04);
+INCLUDE_ASM(s32, "code_DF950", sfx_get_spatialized_sound_params);
 
-INCLUDE_ASM(s32, "code_DF950", func_80149F58);
+INCLUDE_ASM(s32, "code_DF950", sfx_compute_spatialized_sound_params_0);
 
-INCLUDE_ASM(s32, "code_DF950", func_8014A1B4);
+INCLUDE_ASM(s32, "code_DF950", sfx_compute_spatialized_sound_params_1);
diff --git a/src/code_ED510.c b/src/code_ED510.c
index 639b9d11b5..dd84b313d3 100644
--- a/src/code_ED510.c
+++ b/src/code_ED510.c
@@ -406,7 +406,7 @@ ApiStatus PlaySoundAtModel(ScriptInstance* script, s32 isInitialCall) {
     f32 n1, n2, n3;
 
     get_model_center_and_size((u16)modelID, &x, &y, &z, &n1, &n2, &n3);
-    play_sound_at_position(soundID, var3, x, y, z);
+    sfx_play_sound_at_position(soundID, var3, x, y, z);
 
     return ApiStatus_DONE2;
 }
@@ -419,7 +419,7 @@ ApiStatus PlaySoundAtCollider(ScriptInstance* script, s32 isInitialCall) {
     f32 x, y, z;
 
     get_collider_center(colliderID, &x, &y, &z);
-    play_sound_at_position(soundID, var3, x, y, z);
+    sfx_play_sound_at_position(soundID, var3, x, y, z);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/code_F5750.c b/src/code_F5750.c
index dda9b49011..d0a3229b58 100644
--- a/src/code_F5750.c
+++ b/src/code_F5750.c
@@ -446,7 +446,7 @@ ApiStatus PlaySoundAtPlayer(ScriptInstance* script, s32 isInitialCall) {
     s32 var = get_variable(script, *args++);
     s32 var2 = get_variable(script, *args++);
 
-    play_sound_at_player(var, var2);
+    sfx_play_sound_at_player(var, var2);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/code_FBE10.c b/src/code_FBE10.c
index b7349b8a94..46695cc154 100644
--- a/src/code_FBE10.c
+++ b/src/code_FBE10.c
@@ -11,7 +11,7 @@ ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall) {
     f32 z = get_float_variable(script, *args++);
 
     func_802D7460(x, y, z, get_variable(script, *args++));
-    play_sound_at_position(0x2055, 0, x, y, z);
+    sfx_play_sound_at_position(0x2055, 0, x, y, z);
     return ApiStatus_DONE2;
 }
 
@@ -22,7 +22,7 @@ ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall) {
     f32 z = get_float_variable(script, *args++);
 
     func_802D74C0(x, y, z, get_variable(script, *args++));
-    play_sound_at_position(0x378, 0, x, y, z);
+    sfx_play_sound_at_position(0x378, 0, x, y, z);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index c84e7aea6b..6910b9ca9a 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -23,14 +23,14 @@ SongID gSongsUsingVariationFlag[] = { Song_SPECIAL_BATTLE, Song_TUBBA_BLUBBA_BAT
 
 s16 D_8014F738 = 0;
 
-void transition_music_volume_to(s16 volume);
+void bgm_set_target_volume(s16 volume);
 
 /// If the given song ID is present in gSongsUsingVariationFlag, returns the current
 /// map's `songVariation & 1` value. Otherwise, returns -1.
 ///
 /// @see gSongsUsingVariationFlag
 /// @returns -1: no override; 0: override to variation 0; 1 override to variation 1
-s32 get_song_variation_override_for_cur_map(SongID songID) {
+s32 bgm_get_map_default_variation(SongID songID) {
     u32 i = 0;
     Area* areas = gAreas;
     GameStatus** gameStatus = &gGameStatusPtr;
@@ -47,7 +47,7 @@ s32 get_song_variation_override_for_cur_map(SongID songID) {
     return -1;
 }
 
-void func_8014A498(void) {
+void bgm_reset_sequence_players(void) {
     MusicPlayer* src; // TODO: remove this temp when .data section for this file (incl. D_8014F6F0) is set up
     s32 i;
 
@@ -62,14 +62,14 @@ void func_8014A498(void) {
     func_800561A4(8);
 }
 
-void func_8014A52C(void) {
+void bgm_reset_volume(void) {
     gMusicTargetVolume = 8;
     gMusicUnkVolume2 = 8;
 }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
+INCLUDE_ASM(s32, "code_e0b30_len_b80", bgm_update_music_settings);
 
-s32 _set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
+s32 _bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
     if (gGameStatusPtr->demoState != 0) {
         return 1;
     } else {
@@ -83,13 +83,13 @@ s32 _set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutT
 
             return 1;
         } else {
-            s32 override = get_song_variation_override_for_cur_map(songID);
+            s32 override = bgm_get_map_default_variation(songID);
             if (override >= 0) {
                 variation = override;
             }
 
             if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
-                transition_music_volume_to(volume);
+                bgm_set_target_volume(volume);
 
                 if (musicPlayer->flags & 4) {
                     func_80055B80(musicPlayer->unk_18);
@@ -111,12 +111,12 @@ s32 _set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutT
     }
 }
 
-s32 set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
+s32 bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
     MusicPlayer* musicPlayers = gMusicPlayers;
 
     musicPlayers[playerIndex].flags &= ~8;
 
-    return _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
+    return _bgm_set_song(playerIndex, songID, variation, fadeOutTime, volume);
 }
 
 s32 func_8014A964(s32 playerIndex, SongID songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) {
@@ -132,7 +132,7 @@ s32 func_8014A964(s32 playerIndex, SongID songID, s32 variation, s32 fadeInTime,
 
             return 1;
         } else {
-            s32 defaultVariation = get_song_variation_override_for_cur_map(songID);
+            s32 defaultVariation = bgm_get_map_default_variation(songID);
             if (defaultVariation >= 0) {
                 variation = defaultVariation;
             }
@@ -211,28 +211,28 @@ s32 func_8014ABB4(s32 playerIndex, s16 arg1) {
     return func_80055CC4(musicPlayer->unk_18, arg1);
 }
 
-s32 func_8014AC08(void) {
-    set_music_track(0, -1, 0, 250, 8);
-    set_music_track(1, -1, 0, 250, 8);
+s32 bgm_init_music_players(void) {
+    bgm_set_song(0, -1, 0, 250, 8);
+    bgm_set_song(1, -1, 0, 250, 8);
 
     return 1;
 }
 
-void func_8014AC5C(void) {
+void bgm_quiet_max_volume(void) {
     gMusicUnkVolume2 = 4;
 }
 
-void func_8014AC70(void) {
+void bgm_reset_max_volume(void) {
     gMusicUnkVolume2 = 8;
 }
 
-void transition_music_volume_to(s16 volume) {
+void bgm_set_target_volume(s16 volume) {
     gMusicTargetVolume = volume;
 }
 
 //Data loading shenanigans
 #ifdef NON_MATCHING
-void func_8014AC94(void) {
+void bgm_update_volume(void) {
     s16* currentVolume;
     s16 compareVolume;
     s16 toVolume;
@@ -259,21 +259,21 @@ void func_8014AC94(void) {
     }
 }
 #else
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94);
+INCLUDE_ASM(s32, "code_e0b30_len_b80", bgm_update_volume);
 #endif
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AD40);
 
-void func_8014ADA4(void) {
+void bgm_pop_song(void) {
     MusicPlayer* musicPlayer = &gMusicPlayers[0];
 
     if (gGameStatusPtr->demoState == 0) {
         musicPlayer->flags |= 8;
-        _set_music_track(0, musicPlayer->unk_24, musicPlayer->unk_28, 0, 8);
+        _bgm_set_song(0, musicPlayer->unk_24, musicPlayer->unk_28, 0, 8);
     }
 }
 
-void func_8014ADF8(SongID songID, s32 variation) {
+void bgm_push_song(SongID songID, s32 variation) {
     MusicPlayer* musicPlayer = &gMusicPlayers[0];
 
     if (gGameStatusPtr->demoState == 0) {
@@ -281,11 +281,11 @@ void func_8014ADF8(SongID songID, s32 variation) {
         musicPlayer->unk_28 = musicPlayer->variation;
         musicPlayer->unk_2C = musicPlayer->unk_18;
         musicPlayer->flags |= 4;
-        set_music_track(0, songID, variation, 500, 8);
+        bgm_set_song(0, songID, variation, 500, 8);
     }
 }
 
-void func_8014AE6C(void) {
+void bgm_pop_battle_song(void) {
     MusicPlayer* musicPlayer = &gMusicPlayers[0];
 
     if (gGameStatusPtr->demoState == 0) {
@@ -293,13 +293,13 @@ void func_8014AE6C(void) {
             OVERRIDE_FLAG_UNSET(0x20000);
         } else {
             musicPlayer->flags |= 8;
-            _set_music_track(0, musicPlayer->unk_24, musicPlayer->unk_28, 0, 8);
+            _bgm_set_song(0, musicPlayer->unk_24, musicPlayer->unk_28, 0, 8);
             func_80055590(0, 250);
         }
     }
 }
 
-void func_8014AEF8(void) {
+void bgm_push_battle_song(void) {
     MusicPlayer* musicPlayer = &gMusicPlayers[0];
 
     if (gGameStatusPtr->demoState == 0 && !OVERRIDE_FLAG_CHECK(0x20000)) {
@@ -308,11 +308,11 @@ void func_8014AEF8(void) {
         musicPlayer->unk_28 = musicPlayer->variation;
         musicPlayer->unk_2C = musicPlayer->unk_18;
         musicPlayer->flags |= 4;
-        set_music_track(0, musicPlayer->unk_1C, musicPlayer->unk_20, 500, 8);
+        bgm_set_song(0, musicPlayer->unk_1C, musicPlayer->unk_20, 500, 8);
     }
 }
 
-void func_8014AF8C(s32 arg0, s32 arg1) {
+void bgm_set_battle_song(s32 arg0, s32 arg1) {
     MusicPlayer* musicPlayer = &gMusicPlayers[0];
 
     musicPlayer->unk_1C = arg0;
diff --git a/src/code_e940_len_290.c b/src/code_e940_len_290.c
index f5ae60ef9b..f110456ec2 100644
--- a/src/code_e940_len_290.c
+++ b/src/code_e940_len_290.c
@@ -55,11 +55,11 @@ void step_init_state(void) {
     clear_item_entity_data();
     clear_saved_variables();
     initialize_collision();
-    func_8014AC08();
+    bgm_init_music_players();
     clear_windows();
     partner_initialize_data();
-    func_80149618();
-    func_8014A52C();
+    sfx_clear_sounds();
+    bgm_reset_volume();
     initialize_curtains();
 
     for (i = 0; i < 4; i++) {
diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c
index 4160d7b9f5..7842719b37 100644
--- a/src/code_ebd0_len_6a0.c
+++ b/src/code_ebd0_len_6a0.c
@@ -79,7 +79,7 @@ void step_battle(void) {
             *temp800A0900 = -1;
             nuGfxSetCfb(&D_800778A0, 2);
             nuContRmbForceStopEnd();
-            func_80149838();
+            sfx_stop_env_sounds();
             func_8003B1A8();
             gGameStatusPtr->isBattle = TRUE;
             allocate_hit_tables();
diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c
index 9086237607..698de8c823 100644
--- a/src/code_f2470_len_27f0.c
+++ b/src/code_f2470_len_27f0.c
@@ -566,7 +566,7 @@ ApiStatus PlaySoundAtNpc(ScriptInstance* script, s32 isInitialCall) {
         return ApiStatus_DONE2;
     }
 
-    play_sound_at_position(soundID, value2, npc->pos.x, npc->pos.y, npc->pos.z);
+    sfx_play_sound_at_position(soundID, value2, npc->pos.x, npc->pos.y, npc->pos.z);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c
index ed4283c3d1..ad398c425a 100644
--- a/src/code_fa4c0_len_3bf0.c
+++ b/src/code_fa4c0_len_3bf0.c
@@ -9,7 +9,7 @@ ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) {
     s32 itemID = get_variable(script, *args++);
     s32* ptrNextPos = args++;
 
-    return (set_music_track(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * ApiStatus_DONE2;
+    return (bgm_set_song(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * ApiStatus_DONE2;
 }
 
 ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) {
@@ -19,7 +19,7 @@ ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) {
     s32 variation = get_variable(script, *args++);
     s16 volume = get_variable(script, *args++);
 
-    return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * ApiStatus_DONE2;
+    return (bgm_set_song(musicPlayer, songID, variation, 0x1F4, volume) != 0) * ApiStatus_DONE2;
 }
 
 ApiStatus FadeInMusic(ScriptInstance* script, s32 isInitialCall) {
@@ -55,31 +55,31 @@ ApiStatus func_802D5FA4(ScriptInstance* script, s32 isInitialCall) {
 }
 
 ApiStatus func_802D5FD8(ScriptInstance* script, s32 isInitialCall) {
-    func_8014ADA4();
+    bgm_pop_song();
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_802D5FF8(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    func_8014ADF8(get_variable(script, *args++), get_variable(script, *args++));
+    bgm_push_song(get_variable(script, *args++), get_variable(script, *args++));
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_802D6050(ScriptInstance* script, s32 isInitialCall) {
-    func_8014AE6C();
+    bgm_pop_battle_song();
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_802D6070(ScriptInstance* script, s32 isInitialCall) {
-    func_8014AEF8();
+    bgm_push_battle_song();
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_802D6090(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    func_8014AF8C(get_variable(script, *args++), get_variable(script, *args++));
+    bgm_set_battle_song(get_variable(script, *args++), get_variable(script, *args++));
     return ApiStatus_DONE2;
 }
 
@@ -101,7 +101,7 @@ ApiStatus PlaySound(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 soundID = get_variable(script, *args++);
 
-    play_sound(soundID);
+    sfx_play_sound(soundID);
     return ApiStatus_DONE2;
 }
 
@@ -110,7 +110,7 @@ ApiStatus func_802D617C(ScriptInstance* script, s32 initialCall) {
     s32 soundID = get_variable(script, *args++);
     s32 value2 = get_variable(script, *args++);
 
-    _play_sound(soundID, value2 & 0xFF, 0, 0);
+    sfx_play_sound_with_params(soundID, value2 & 0xFF, 0, 0);
     return ApiStatus_DONE2;
 }
 
@@ -122,14 +122,14 @@ ApiStatus PlaySoundAt(ScriptInstance* script, s32 isInitialCall) {
     s32 y = get_variable(script, *args++);
     s32 z = get_variable(script, *args++);
 
-    play_sound_at_position(soundID, value2, x, y, z);
+    sfx_play_sound_at_position(soundID, value2, x, y, z);
     return ApiStatus_DONE2;
 }
 
 ApiStatus StopSound(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    stop_sound(get_variable(script, *args++));
+    sfx_stop_sound(get_variable(script, *args++));
     return ApiStatus_DONE2;
 }
 
@@ -162,7 +162,7 @@ ApiStatus PlaySoundAtF(ScriptInstance* script, s32 isInitialCall) {
     f32 y = get_float_variable(script, *args++);
     f32 z = get_float_variable(script, *args++);
 
-    play_sound_at_position(soundID, value2, x, y, z);
+    sfx_play_sound_at_position(soundID, value2, x, y, z);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c
index d54066c5c2..29af92ac0b 100644
--- a/src/world/area_dgb/dgb_00/BFA100.c
+++ b/src/world/area_dgb/dgb_00/BFA100.c
@@ -3,6 +3,6 @@
 ApiStatus func_80240060_BFA100(ScriptInstance* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(get_enemy(6)->npcID);
 
-    func_801499EC(0x32E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
+    sfx_adjust_env_sound_pos(0x32E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c
index 5ca2ded1f5..ae2c6a8841 100644
--- a/src/world/area_kmr/kmr_00/8ABF90.c
+++ b/src/world/area_kmr/kmr_00/8ABF90.c
@@ -54,7 +54,7 @@ ApiStatus func_80240BD8_8ACB68(ScriptInstance* script, s32 isInitialCall) {
     if (isInitialCall) {
         script->functionTemp[1].s = get_variable(script, *args);
         npc = get_npc_unsafe(script->functionTemp[1].s);
-        play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
+        sfx_play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
         func_8006FEF0(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f);
         script->functionTemp[0].s = 3;
     }
diff --git a/src/world/partners.c b/src/world/partners.c
index d25415bf26..287f22e2e1 100644
--- a/src/world/partners.c
+++ b/src/world/partners.c
@@ -405,7 +405,7 @@ s32 partner_use_ability(void) {
         wPartner != NULL &&
         (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc))) {
         if ((gGameStatusPtr->unk_81 != 0) && (temp8010EBB0->unk_08 & 0x4000)) {
-            play_sound(0x21D);
+            sfx_play_sound(0x21D);
         } else if (D_8010CFD8 != 0) {
             D_8010CFE0 = 1;
             D_8010CFE8 = 8;
diff --git a/tools/update_symbol_addrs.py b/tools/update_symbol_addrs.py
index d85cf47706..39dbaf0258 100755
--- a/tools/update_symbol_addrs.py
+++ b/tools/update_symbol_addrs.py
@@ -190,6 +190,37 @@ def write_new_symbol_addrs():
 read_ignores()
 scan_map()
 read_symbol_addrs()
+
+# chicken scratch cod to print out new / renamed symbols
+# with open("tools/new_syms.txt") as f:
+#     new_syms = f.readlines()
+
+# new_sym_dict = {}
+# for sym_line in new_syms:
+#     sym_line = sym_line.strip()
+#     if sym_line:
+#         name, rest = sym_line.split(" = ")
+#         vram = int(rest.split(";")[0], 0)
+#         new_sym_dict[vram] = name
+
+# renames = []
+# adds = []
+# for addr in new_sym_dict:
+#     found = False
+#     for thing in symbol_addrs:
+#         if thing[1] == addr and not thing[0].startswith("func_") and not thing[0].startswith("D_"):
+#             if new_sym_dict[addr] != thing[0]:
+#                 renames.append(f"{thing[0]} -> {new_sym_dict[addr]}")
+#             found = True
+#             break
+#     if not found:
+#         adds.append(f"{new_sym_dict[addr]} = {addr:X}")
+
+# for r in renames:
+#     print(r)
+# for a in adds:
+#     print(a)
+
 read_elf()
 reconcile_symbols()
 write_new_symbol_addrs()
diff --git a/ver/us/asm/data/code_26840_len_20d0.data.s b/ver/us/asm/data/code_26840_len_20d0.data.s
index dcfd45e764..b9be68725b 100644
--- a/ver/us/asm/data/code_26840_len_20d0.data.s
+++ b/ver/us/asm/data/code_26840_len_20d0.data.s
@@ -36,7 +36,7 @@ glabel D_80078464
 .word 0x00000000, 0x00000000, 0x00000000
 
 glabel D_80078470
-.word func_8004FBBC, func_8004FCB4, func_8004FCE4, func_8004FD04, func_8004FD94, func_8004FE10, func_8004FD38, func_80050560, func_8004FE6C, func_8004FEB0, func_8004FF3C, func_8004FF58, func_8004FF70, func_8004FF88, func_8004FFA8, func_8004FFB4, func_8004FFC8, func_8004FFE4, func_8004FFF0, func_8004FFFC, func_80050004, func_80050020, func_8004FED0, func_80050128, func_80050560, func_80050560, func_80050560, func_80050560, func_800501A8, func_8005015C, func_80050184, func_800502F0, 0x02010101, 0x04030200, 0x02010101, 0x01010102, 0x03010100, 0x02010301, 0x00000000, 0x03030303
+.word snd_BGMCmd_E0_MasterTempo, snd_BGMCmd_E1_MasterVolume, snd_BGMCmd_E2_MasterTranspose, snd_BGMCmd_E3, snd_BGMCmd_E4_MasterTempoFade, snd_BGMCmd_E5_MasterVolumeFade, snd_BGMCmd_E6_MasterEffect, snd_BGMCmd_NOP, snd_BGMCmd_E8_TrackOverridePatch, snd_BGMCmd_E9_SubTrackVolume, snd_BGMCmd_EA_SubTrackPan, snd_BGMCmd_EB_SubTrackReverb, snd_BGMCmd_EC_SegTrackVolume, snd_BGMCmd_ED_SubTrackCoarseTune, snd_BGMCmd_EE_SubTrackFineTune, snd_BGMCmd_EF_SegTrackTune, snd_BGMCmd_F0_TrackTremolo, snd_BGMCmd_F1_TrackTremoloSpeed, snd_BGMCmd_F2_TrackTremoloTime, snd_BGMCmd_F3_TrackTremoloStop, snd_BGMCmd_F4, snd_BGMCmd_F5_TrackVoice, snd_BGMCmd_F6_TrackVolumeFade, snd_BGMCmd_F7_SubTrackReverbType, snd_BGMCmd_NOP, snd_BGMCmd_NOP, snd_BGMCmd_NOP, snd_BGMCmd_NOP, snd_BGMCmd_FC_Jump, snd_BGMCmd_FD, snd_BGMCmd_FE, snd_BGMCmd_FF, 0x02010101, 0x04030200, 0x02010101, 0x01010102, 0x03010100, 0x02010301, 0x00000000, 0x03030303
 
 glabel D_80078510
 .byte 0x30, 0x18, 0x20, 0x28, 0x30, 0x38, 0x40, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s b/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s
index b045b6c8d1..87c4e0e3dc 100644
--- a/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s
+++ b/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s
@@ -56,7 +56,7 @@ glabel func_80218020_47F0D0
 /* 47F198 802180E8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 47F19C 802180EC 8E260144 */  lw        $a2, 0x144($s1)
 /* 47F1A0 802180F0 8E270148 */  lw        $a3, 0x148($s1)
-/* 47F1A4 802180F4 0C052757 */  jal       play_sound_at_position
+/* 47F1A4 802180F4 0C052757 */  jal       sfx_play_sound_at_position
 /* 47F1A8 802180F8 0000282D */   daddu    $a1, $zero, $zero
 .L802180FC:
 /* 47F1AC 802180FC 8E420070 */  lw        $v0, 0x70($s2)
@@ -69,7 +69,7 @@ glabel func_80218020_47F0D0
 /* 47F1C8 80218118 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 47F1CC 8021811C 8E260144 */  lw        $a2, 0x144($s1)
 /* 47F1D0 80218120 8E270148 */  lw        $a3, 0x148($s1)
-/* 47F1D4 80218124 0C052757 */  jal       play_sound_at_position
+/* 47F1D4 80218124 0C052757 */  jal       sfx_play_sound_at_position
 /* 47F1D8 80218128 0000282D */   daddu    $a1, $zero, $zero
 /* 47F1DC 8021812C 0808604E */  j         .L80218138
 /* 47F1E0 80218130 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s b/ver/us/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s
index 2b63a6f99b..283d81e9f1 100644
--- a/ver/us/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s
+++ b/ver/us/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s
@@ -95,7 +95,7 @@ glabel func_802184CC_4E2C0C
 /* 4E2D5C 8021861C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 4E2D60 80218620 8E260144 */  lw        $a2, 0x144($s1)
 /* 4E2D64 80218624 8E270148 */  lw        $a3, 0x148($s1)
-/* 4E2D68 80218628 0C052757 */  jal       play_sound_at_position
+/* 4E2D68 80218628 0C052757 */  jal       sfx_play_sound_at_position
 /* 4E2D6C 8021862C 0000282D */   daddu    $a1, $zero, $zero
 .L80218630:
 /* 4E2D70 80218630 C6000000 */  lwc1      $f0, ($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s b/ver/us/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s
index 95fd72979a..2126f3fd18 100644
--- a/ver/us/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s
+++ b/ver/us/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s
@@ -101,7 +101,7 @@ glabel func_8021825C_4EF6FC
 /* 4EF868 802183C8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 4EF86C 802183CC 8E260144 */  lw        $a2, 0x144($s1)
 /* 4EF870 802183D0 8E270148 */  lw        $a3, 0x148($s1)
-/* 4EF874 802183D4 0C052757 */  jal       play_sound_at_position
+/* 4EF874 802183D4 0C052757 */  jal       sfx_play_sound_at_position
 /* 4EF878 802183D8 0000282D */   daddu    $a1, $zero, $zero
 .L802183DC:
 /* 4EF87C 802183DC C6000000 */  lwc1      $f0, ($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa/685130/func_80218700_685130.s b/ver/us/asm/nonmatchings/battle/area_kpa/685130/func_80218700_685130.s
index 284ce6b74e..4c84a1483f 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa/685130/func_80218700_685130.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa/685130/func_80218700_685130.s
@@ -56,7 +56,7 @@ glabel func_80218700_685130
 /* 6851F8 802187C8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 6851FC 802187CC 8E260144 */  lw        $a2, 0x144($s1)
 /* 685200 802187D0 8E270148 */  lw        $a3, 0x148($s1)
-/* 685204 802187D4 0C052757 */  jal       play_sound_at_position
+/* 685204 802187D4 0C052757 */  jal       sfx_play_sound_at_position
 /* 685208 802187D8 0000282D */   daddu    $a1, $zero, $zero
 .L802187DC:
 /* 68520C 802187DC 8E420070 */  lw        $v0, 0x70($s2)
@@ -69,7 +69,7 @@ glabel func_80218700_685130
 /* 685228 802187F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 68522C 802187FC 8E260144 */  lw        $a2, 0x144($s1)
 /* 685230 80218800 8E270148 */  lw        $a3, 0x148($s1)
-/* 685234 80218804 0C052757 */  jal       play_sound_at_position
+/* 685234 80218804 0C052757 */  jal       sfx_play_sound_at_position
 /* 685238 80218808 0000282D */   daddu    $a1, $zero, $zero
 /* 68523C 8021880C 08086206 */  j         .L80218818
 /* 685240 80218810 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s
index 7198a01348..4ffd999d07 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s
@@ -293,7 +293,7 @@ glabel func_802180D0_6BBC60
 /* 6BC0B4 80218524 8E260058 */  lw        $a2, 0x58($s1)
 /* 6BC0B8 80218528 0C098F3F */  jal       set_animation
 /* 6BC0BC 8021852C 24050001 */   addiu    $a1, $zero, 1
-/* 6BC0C0 80218530 0C05272D */  jal       play_sound
+/* 6BC0C0 80218530 0C05272D */  jal       sfx_play_sound
 /* 6BC0C4 80218534 24042081 */   addiu    $a0, $zero, 0x2081
 /* 6BC0C8 80218538 24020001 */  addiu     $v0, $zero, 1
 /* 6BC0CC 8021853C AE820070 */  sw        $v0, 0x70($s4)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s
index bc3f6a20f3..55e5692ce5 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s
@@ -81,7 +81,7 @@ glabel func_80218960_6BC4F0
 /* 6BC60C 80218A7C 8E27014C */  lw        $a3, 0x14c($s1)
 /* 6BC610 80218A80 0C0990BC */  jal       play_movement_dust_effects
 /* 6BC614 80218A84 24040002 */   addiu    $a0, $zero, 2
-/* 6BC618 80218A88 0C05272D */  jal       play_sound
+/* 6BC618 80218A88 0C05272D */  jal       sfx_play_sound
 /* 6BC61C 80218A8C 24040148 */   addiu    $a0, $zero, 0x148
 /* 6BC620 80218A90 24020001 */  addiu     $v0, $zero, 1
 .L80218A94:
diff --git a/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s b/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s
index 107c98a874..eb1ad10c0b 100644
--- a/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s
+++ b/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s
@@ -56,7 +56,7 @@ glabel func_80218000_58C2F0
 /* 58C3B8 802180C8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 58C3BC 802180CC 8E260144 */  lw        $a2, 0x144($s1)
 /* 58C3C0 802180D0 8E270148 */  lw        $a3, 0x148($s1)
-/* 58C3C4 802180D4 0C052757 */  jal       play_sound_at_position
+/* 58C3C4 802180D4 0C052757 */  jal       sfx_play_sound_at_position
 /* 58C3C8 802180D8 0000282D */   daddu    $a1, $zero, $zero
 .L802180DC:
 /* 58C3CC 802180DC 8E420070 */  lw        $v0, 0x70($s2)
@@ -69,7 +69,7 @@ glabel func_80218000_58C2F0
 /* 58C3E8 802180F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 58C3EC 802180FC 8E260144 */  lw        $a2, 0x144($s1)
 /* 58C3F0 80218100 8E270148 */  lw        $a3, 0x148($s1)
-/* 58C3F4 80218104 0C052757 */  jal       play_sound_at_position
+/* 58C3F4 80218104 0C052757 */  jal       sfx_play_sound_at_position
 /* 58C3F8 80218108 0000282D */   daddu    $a1, $zero, $zero
 /* 58C3FC 8021810C 08086046 */  j         .L80218118
 /* 58C400 80218110 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s
index b4a2dc37a6..96bb284b47 100644
--- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s
+++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s
@@ -10,14 +10,14 @@ glabel func_80218A98_59F178
 /* 59F18C 80218AAC 24440001 */  addiu     $a0, $v0, 1
 /* 59F190 80218AB0 10A0000C */  beqz      $a1, .L80218AE4
 /* 59F194 80218AB4 AC640000 */   sw       $a0, ($v1)
-/* 59F198 80218AB8 0C05272D */  jal       play_sound
+/* 59F198 80218AB8 0C05272D */  jal       sfx_play_sound
 /* 59F19C 80218ABC 240400D4 */   addiu    $a0, $zero, 0xd4
 /* 59F1A0 80218AC0 24020008 */  addiu     $v0, $zero, 8
 /* 59F1A4 80218AC4 AFA20010 */  sw        $v0, 0x10($sp)
 /* 59F1A8 80218AC8 0000202D */  daddu     $a0, $zero, $zero
 /* 59F1AC 80218ACC 2405008B */  addiu     $a1, $zero, 0x8b
 /* 59F1B0 80218AD0 0080302D */  daddu     $a2, $a0, $zero
-/* 59F1B4 80218AD4 0C052A46 */  jal       set_music_track
+/* 59F1B4 80218AD4 0C052A46 */  jal       bgm_set_song
 /* 59F1B8 80218AD8 240701F4 */   addiu    $a3, $zero, 0x1f4
 /* 59F1BC 80218ADC 080862CB */  j         .L80218B2C
 /* 59F1C0 80218AE0 0000102D */   daddu    $v0, $zero, $zero
@@ -30,7 +30,7 @@ glabel func_80218A98_59F178
 /* 59F1D8 80218AF8 080862CB */  j         .L80218B2C
 /* 59F1DC 80218AFC 0000102D */   daddu    $v0, $zero, $zero
 .L80218B00:
-/* 59F1E0 80218B00 0C052B02 */  jal       func_8014AC08
+/* 59F1E0 80218B00 0C052B02 */  jal       bgm_init_music_players
 /* 59F1E4 80218B04 00000000 */   nop
 /* 59F1E8 80218B08 080862CB */  j         .L80218B2C
 /* 59F1EC 80218B0C 0000102D */   daddu    $v0, $zero, $zero
@@ -39,7 +39,7 @@ glabel func_80218A98_59F178
 /* 59F1F4 80218B14 0000202D */  daddu     $a0, $zero, $zero
 /* 59F1F8 80218B18 2405000D */  addiu     $a1, $zero, 0xd
 /* 59F1FC 80218B1C 24060001 */  addiu     $a2, $zero, 1
-/* 59F200 80218B20 0C052A46 */  jal       set_music_track
+/* 59F200 80218B20 0C052A46 */  jal       bgm_set_song
 /* 59F204 80218B24 240701F4 */   addiu    $a3, $zero, 0x1f4
 /* 59F208 80218B28 24020002 */  addiu     $v0, $zero, 2
 .L80218B2C:
diff --git a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s
index 3f74bfc745..78f31cc0e4 100644
--- a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s
+++ b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s
@@ -293,7 +293,7 @@ glabel func_80218300_464790
 /* 464BE4 80218754 8E260058 */  lw        $a2, 0x58($s1)
 /* 464BE8 80218758 0C098F3F */  jal       set_animation
 /* 464BEC 8021875C 24050001 */   addiu    $a1, $zero, 1
-/* 464BF0 80218760 0C05272D */  jal       play_sound
+/* 464BF0 80218760 0C05272D */  jal       sfx_play_sound
 /* 464BF4 80218764 24042081 */   addiu    $a0, $zero, 0x2081
 /* 464BF8 80218768 24020001 */  addiu     $v0, $zero, 1
 /* 464BFC 8021876C AE820070 */  sw        $v0, 0x70($s4)
diff --git a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s
index fa6d4d95da..ddb3e7c98c 100644
--- a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s
+++ b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s
@@ -81,7 +81,7 @@ glabel func_80218B90_465020
 /* 46513C 80218CAC 8E27014C */  lw        $a3, 0x14c($s1)
 /* 465140 80218CB0 0C0990BC */  jal       play_movement_dust_effects
 /* 465144 80218CB4 24040002 */   addiu    $a0, $zero, 2
-/* 465148 80218CB8 0C05272D */  jal       play_sound
+/* 465148 80218CB8 0C05272D */  jal       sfx_play_sound
 /* 46514C 80218CBC 24040148 */   addiu    $a0, $zero, 0x148
 /* 465150 80218CC0 24020001 */  addiu     $v0, $zero, 1
 .L80218CC4:
diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s
index 796d7f9a6d..6b65520779 100644
--- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s
+++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s
@@ -293,7 +293,7 @@ glabel func_80218000_669D80
 /* 66A1D4 80218454 8E260058 */  lw        $a2, 0x58($s1)
 /* 66A1D8 80218458 0C098F3F */  jal       set_animation
 /* 66A1DC 8021845C 24050001 */   addiu    $a1, $zero, 1
-/* 66A1E0 80218460 0C05272D */  jal       play_sound
+/* 66A1E0 80218460 0C05272D */  jal       sfx_play_sound
 /* 66A1E4 80218464 24042081 */   addiu    $a0, $zero, 0x2081
 /* 66A1E8 80218468 24020001 */  addiu     $v0, $zero, 1
 /* 66A1EC 8021846C AE820070 */  sw        $v0, 0x70($s4)
diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s
index e1502b45b5..71c0832ee0 100644
--- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s
+++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s
@@ -81,7 +81,7 @@ glabel func_80218890_66A610
 /* 66A72C 802189AC 8E27014C */  lw        $a3, 0x14c($s1)
 /* 66A730 802189B0 0C0990BC */  jal       play_movement_dust_effects
 /* 66A734 802189B4 24040002 */   addiu    $a0, $zero, 2
-/* 66A738 802189B8 0C05272D */  jal       play_sound
+/* 66A738 802189B8 0C05272D */  jal       sfx_play_sound
 /* 66A73C 802189BC 24040148 */   addiu    $a0, $zero, 0x148
 /* 66A740 802189C0 24020001 */  addiu     $v0, $zero, 1
 .L802189C4:
diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s
index a44cecfe61..3cb46a8594 100644
--- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s
+++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s
@@ -293,7 +293,7 @@ glabel func_80218000_623BA0
 /* 623FF4 80218454 8E260058 */  lw        $a2, 0x58($s1)
 /* 623FF8 80218458 0C098F3F */  jal       set_animation
 /* 623FFC 8021845C 24050001 */   addiu    $a1, $zero, 1
-/* 624000 80218460 0C05272D */  jal       play_sound
+/* 624000 80218460 0C05272D */  jal       sfx_play_sound
 /* 624004 80218464 24042081 */   addiu    $a0, $zero, 0x2081
 /* 624008 80218468 24020001 */  addiu     $v0, $zero, 1
 /* 62400C 8021846C AE820070 */  sw        $v0, 0x70($s4)
diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s
index 2c2b7ecaab..f72cb4f28f 100644
--- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s
+++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s
@@ -81,7 +81,7 @@ glabel func_80218890_624430
 /* 62454C 802189AC 8E27014C */  lw        $a3, 0x14c($s1)
 /* 624550 802189B0 0C0990BC */  jal       play_movement_dust_effects
 /* 624554 802189B4 24040002 */   addiu    $a0, $zero, 2
-/* 624558 802189B8 0C05272D */  jal       play_sound
+/* 624558 802189B8 0C05272D */  jal       sfx_play_sound
 /* 62455C 802189BC 24040148 */   addiu    $a0, $zero, 0x148
 /* 624560 802189C0 24020001 */  addiu     $v0, $zero, 1
 .L802189C4:
diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s
index 57261e2ecf..085b34c01e 100644
--- a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s
+++ b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s
@@ -5,9 +5,9 @@ glabel func_80218350_4B1540
 /* 4B1540 80218350 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 4B1544 80218354 24040008 */  addiu     $a0, $zero, 8
 /* 4B1548 80218358 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 4B154C 8021835C 0C052BE3 */  jal       func_8014AF8C
+/* 4B154C 8021835C 0C052BE3 */  jal       bgm_set_battle_song
 /* 4B1550 80218360 0000282D */   daddu    $a1, $zero, $zero
-/* 4B1554 80218364 0C052BBE */  jal       func_8014AEF8
+/* 4B1554 80218364 0C052BBE */  jal       bgm_push_battle_song
 /* 4B1558 80218368 00000000 */   nop
 /* 4B155C 8021836C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 4B1560 80218370 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023803C_70BD4C.s b/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023803C_70BD4C.s
index edcc7086aa..07555977f9 100644
--- a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023803C_70BD4C.s
+++ b/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023803C_70BD4C.s
@@ -243,7 +243,7 @@ glabel func_8023803C_70BD4C
 /* 70C0E4 802383D4 44060000 */  mfc1      $a2, $f0
 /* 70C0E8 802383D8 0000282D */  daddu     $a1, $zero, $zero
 /* 70C0EC 802383DC 00C0382D */  daddu     $a3, $a2, $zero
-/* 70C0F0 802383E0 0C052757 */  jal       play_sound_at_position
+/* 70C0F0 802383E0 0C052757 */  jal       sfx_play_sound_at_position
 /* 70C0F4 802383E4 AFA60010 */   sw       $a2, 0x10($sp)
 /* 70C0F8 802383E8 8FA80068 */  lw        $t0, 0x68($sp)
 /* 70C0FC 802383EC 24020002 */  addiu     $v0, $zero, 2
@@ -553,7 +553,7 @@ glabel func_8023803C_70BD4C
 /* 70C568 80238858 00000000 */   nop
 /* 70C56C 8023885C 0C093EB1 */  jal       set_popup_duration
 /* 70C570 80238860 0000202D */   daddu    $a0, $zero, $zero
-/* 70C574 80238864 0C05271B */  jal       stop_sound
+/* 70C574 80238864 0C05271B */  jal       sfx_stop_sound
 /* 70C578 80238868 24040312 */   addiu    $a0, $zero, 0x312
 /* 70C57C 8023886C 0808E28D */  j         .L80238A34
 /* 70C580 80238870 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239140_70CE50.s b/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239140_70CE50.s
index 867071ee30..3edfa5d73c 100644
--- a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239140_70CE50.s
+++ b/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239140_70CE50.s
@@ -331,7 +331,7 @@ glabel func_80239140_70CE50
 /* 70D334 80239624 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 70D338 80239628 8E460144 */  lw        $a2, 0x144($s2)
 /* 70D33C 8023962C 8E470148 */  lw        $a3, 0x148($s2)
-/* 70D340 80239630 0C052757 */  jal       play_sound_at_position
+/* 70D340 80239630 0C052757 */  jal       sfx_play_sound_at_position
 /* 70D344 80239634 0000282D */   daddu    $a1, $zero, $zero
 .L80239638:
 /* 70D348 80239638 24040100 */  addiu     $a0, $zero, 0x100
@@ -387,7 +387,7 @@ glabel func_80239140_70CE50
 /* 70D408 802396F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 70D40C 802396FC 8E460144 */  lw        $a2, 0x144($s2)
 /* 70D410 80239700 8E470148 */  lw        $a3, 0x148($s2)
-/* 70D414 80239704 0C052757 */  jal       play_sound_at_position
+/* 70D414 80239704 0C052757 */  jal       sfx_play_sound_at_position
 /* 70D418 80239708 0000282D */   daddu    $a1, $zero, $zero
 /* 70D41C 8023970C AE700078 */  sw        $s0, 0x78($s3)
 .L80239710:
diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238000_6FFD80.s b/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238000_6FFD80.s
index 4a17825fae..af8a05ba8a 100644
--- a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238000_6FFD80.s
+++ b/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238000_6FFD80.s
@@ -476,7 +476,7 @@ glabel func_80238000_6FFD80
 /* 7004B0 80238730 C680001C */  lwc1      $f0, 0x1c($s4)
 /* 7004B4 80238734 E6800048 */  swc1      $f0, 0x48($s4)
 .L80238738:
-/* 7004B8 80238738 0C05272D */  jal       play_sound
+/* 7004B8 80238738 0C05272D */  jal       sfx_play_sound
 /* 7004BC 8023873C 24040311 */   addiu    $a0, $zero, 0x311
 /* 7004C0 80238740 2402003C */  addiu     $v0, $zero, 0x3c
 /* 7004C4 80238744 3C018024 */  lui       $at, %hi(D_8023BDBC)
diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238E24_700BA4.s b/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238E24_700BA4.s
index 1b605bd3aa..008cf7f584 100644
--- a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238E24_700BA4.s
+++ b/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238E24_700BA4.s
@@ -127,7 +127,7 @@ glabel func_80238E24_700BA4
 /* 700D80 80239000 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 700D84 80239004 8E06000C */  lw        $a2, 0xc($s0)
 /* 700D88 80239008 8E070010 */  lw        $a3, 0x10($s0)
-/* 700D8C 8023900C 0C052757 */  jal       play_sound_at_position
+/* 700D8C 8023900C 0C052757 */  jal       sfx_play_sound_at_position
 /* 700D90 80239010 0000282D */   daddu    $a1, $zero, $zero
 .L80239014:
 /* 700D94 80239014 C602000C */  lwc1      $f2, 0xc($s0)
diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_802390B4_700E34.s b/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_802390B4_700E34.s
index 433d154654..38c1ddc96e 100644
--- a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_802390B4_700E34.s
+++ b/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_802390B4_700E34.s
@@ -165,7 +165,7 @@ glabel func_802390B4_700E34
 .L8023931C:
 /* 70109C 8023931C 8E060000 */  lw        $a2, ($s0)
 /* 7010A0 80239320 8E070004 */  lw        $a3, 4($s0)
-/* 7010A4 80239324 0C052757 */  jal       play_sound_at_position
+/* 7010A4 80239324 0C052757 */  jal       sfx_play_sound_at_position
 /* 7010A8 80239328 0000282D */   daddu    $a1, $zero, $zero
 /* 7010AC 8023932C 8E43007C */  lw        $v1, 0x7c($s2)
 /* 7010B0 80239330 24020001 */  addiu     $v0, $zero, 1
@@ -249,7 +249,7 @@ glabel func_802390B4_700E34
 .L80239450:
 /* 7011D0 80239450 8E060000 */  lw        $a2, ($s0)
 /* 7011D4 80239454 8E070004 */  lw        $a3, 4($s0)
-/* 7011D8 80239458 0C052757 */  jal       play_sound_at_position
+/* 7011D8 80239458 0C052757 */  jal       sfx_play_sound_at_position
 /* 7011DC 8023945C 0000282D */   daddu    $a1, $zero, $zero
 /* 7011E0 80239460 8E43007C */  lw        $v1, 0x7c($s2)
 /* 7011E4 80239464 24020001 */  addiu     $v0, $zero, 1
@@ -329,7 +329,7 @@ glabel func_802390B4_700E34
 .L80239574:
 /* 7012F4 80239574 8E060000 */  lw        $a2, ($s0)
 /* 7012F8 80239578 8E070004 */  lw        $a3, 4($s0)
-/* 7012FC 8023957C 0C052757 */  jal       play_sound_at_position
+/* 7012FC 8023957C 0C052757 */  jal       sfx_play_sound_at_position
 /* 701300 80239580 0000282D */   daddu    $a1, $zero, $zero
 /* 701304 80239584 8E43007C */  lw        $v1, 0x7c($s2)
 /* 701308 80239588 24020001 */  addiu     $v0, $zero, 1
@@ -413,7 +413,7 @@ glabel func_802390B4_700E34
 .L802396A4:
 /* 701424 802396A4 8E060000 */  lw        $a2, ($s0)
 /* 701428 802396A8 8E070004 */  lw        $a3, 4($s0)
-/* 70142C 802396AC 0C052757 */  jal       play_sound_at_position
+/* 70142C 802396AC 0C052757 */  jal       sfx_play_sound_at_position
 /* 701430 802396B0 0000282D */   daddu    $a1, $zero, $zero
 /* 701434 802396B4 8E43007C */  lw        $v1, 0x7c($s2)
 /* 701438 802396B8 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238540_7081E0.s b/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238540_7081E0.s
index 9fa0aa0197..cc65e7ac38 100644
--- a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238540_7081E0.s
+++ b/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238540_7081E0.s
@@ -232,7 +232,7 @@ glabel func_80238540_7081E0
 .L802388A0:
 /* 708540 802388A0 8E060000 */  lw        $a2, ($s0)
 /* 708544 802388A4 8E070004 */  lw        $a3, 4($s0)
-/* 708548 802388A8 0C052757 */  jal       play_sound_at_position
+/* 708548 802388A8 0C052757 */  jal       sfx_play_sound_at_position
 /* 70854C 802388AC 0000282D */   daddu    $a1, $zero, $zero
 /* 708550 802388B0 8E430078 */  lw        $v1, 0x78($s2)
 /* 708554 802388B4 24020001 */  addiu     $v0, $zero, 1
@@ -319,7 +319,7 @@ glabel func_80238540_7081E0
 .L802389DC:
 /* 70867C 802389DC 8E060000 */  lw        $a2, ($s0)
 /* 708680 802389E0 8E070004 */  lw        $a3, 4($s0)
-/* 708684 802389E4 0C052757 */  jal       play_sound_at_position
+/* 708684 802389E4 0C052757 */  jal       sfx_play_sound_at_position
 /* 708688 802389E8 0000282D */   daddu    $a1, $zero, $zero
 /* 70868C 802389EC 8E430078 */  lw        $v1, 0x78($s2)
 /* 708690 802389F0 24020001 */  addiu     $v0, $zero, 1
@@ -413,7 +413,7 @@ glabel func_80238540_7081E0
 .L80238B30:
 /* 7087D0 80238B30 8E060000 */  lw        $a2, ($s0)
 /* 7087D4 80238B34 8E070004 */  lw        $a3, 4($s0)
-/* 7087D8 80238B38 0C052757 */  jal       play_sound_at_position
+/* 7087D8 80238B38 0C052757 */  jal       sfx_play_sound_at_position
 /* 7087DC 80238B3C 0000282D */   daddu    $a1, $zero, $zero
 /* 7087E0 80238B40 8E430078 */  lw        $v1, 0x78($s2)
 /* 7087E4 80238B44 24020001 */  addiu     $v0, $zero, 1
@@ -513,7 +513,7 @@ glabel func_80238540_7081E0
 /* 708954 80238CB4 4406A000 */  mfc1      $a2, $f20
 /* 708958 80238CB8 4407A000 */  mfc1      $a3, $f20
 /* 70895C 80238CBC 0000282D */  daddu     $a1, $zero, $zero
-/* 708960 80238CC0 0C052757 */  jal       play_sound_at_position
+/* 708960 80238CC0 0C052757 */  jal       sfx_play_sound_at_position
 /* 708964 80238CC4 E7B40010 */   swc1     $f20, 0x10($sp)
 /* 708968 80238CC8 0000202D */  daddu     $a0, $zero, $zero
 /* 70896C 80238CCC 3C05C248 */  lui       $a1, 0xc248
diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A16F4_7907C4.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A16F4_7907C4.s
index eef24f0e29..5d5be69229 100644
--- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A16F4_7907C4.s
+++ b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A16F4_7907C4.s
@@ -121,7 +121,7 @@ glabel func_802A16F4_7907C4
 /* 790984 802A18B4 AFA20014 */  sw        $v0, 0x14($sp)
 /* 790988 802A18B8 0C01C634 */  jal       func_800718D0
 /* 79098C 802A18BC E7A40010 */   swc1     $f4, 0x10($sp)
-/* 790990 802A18C0 0C05272D */  jal       play_sound
+/* 790990 802A18C0 0C05272D */  jal       sfx_play_sound
 /* 790994 802A18C4 24042106 */   addiu    $a0, $zero, 0x2106
 /* 790998 802A18C8 24020002 */  addiu     $v0, $zero, 2
 /* 79099C 802A18CC 24030001 */  addiu     $v1, $zero, 1
diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s
index dd440f6594..da566b5fba 100644
--- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s
+++ b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s
@@ -342,7 +342,7 @@ glabel L802A18B0_79A060
 /* 79A194 802A19E4 3C048000 */  lui       $a0, 0x8000
 /* 79A198 802A19E8 34840069 */  ori       $a0, $a0, 0x69
 .L802A19EC:
-/* 79A19C 802A19EC 0C05272D */  jal       play_sound
+/* 79A19C 802A19EC 0C05272D */  jal       sfx_play_sound
 /* 79A1A0 802A19F0 00000000 */   nop
 /* 79A1A4 802A19F4 24020001 */  addiu     $v0, $zero, 1
 /* 79A1A8 802A19F8 080A8907 */  j         L802A241C_79ABCC
@@ -432,7 +432,7 @@ glabel L802A1AB8_79A268
 /* 79A2E8 802A1B38 24040649 */   addiu    $a0, $zero, 0x649
 /* 79A2EC 802A1B3C 24040648 */  addiu     $a0, $zero, 0x648
 .L802A1B40:
-/* 79A2F0 802A1B40 0C05272D */  jal       play_sound
+/* 79A2F0 802A1B40 0C05272D */  jal       sfx_play_sound
 /* 79A2F4 802A1B44 00000000 */   nop
 /* 79A2F8 802A1B48 24020004 */  addiu     $v0, $zero, 4
 /* 79A2FC 802A1B4C 080A8907 */  j         L802A241C_79ABCC
@@ -681,7 +681,7 @@ glabel L802A1E34_79A5E4
 /* 79A694 802A1EE4 E448008C */  swc1      $f8, 0x8c($v0)
 /* 79A698 802A1EE8 8FC30078 */  lw        $v1, 0x78($fp)
 /* 79A69C 802A1EEC AC4300AC */  sw        $v1, 0xac($v0)
-/* 79A6A0 802A1EF0 0C05272D */  jal       play_sound
+/* 79A6A0 802A1EF0 0C05272D */  jal       sfx_play_sound
 /* 79A6A4 802A1EF4 2404024A */   addiu    $a0, $zero, 0x24a
 /* 79A6A8 802A1EF8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 79A6AC 802A1EFC AFC20074 */  sw        $v0, 0x74($fp)
@@ -810,7 +810,7 @@ glabel L802A2080_79A830
 /* 79A868 802A20B8 24050001 */   addiu    $a1, $zero, 1
 /* 79A86C 802A20BC 24040649 */  addiu     $a0, $zero, 0x649
 .L802A20C0:
-/* 79A870 802A20C0 0C05272D */  jal       play_sound
+/* 79A870 802A20C0 0C05272D */  jal       sfx_play_sound
 /* 79A874 802A20C4 00000000 */   nop
 .L802A20C8:
 /* 79A878 802A20C8 0000B82D */  daddu     $s7, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s
index 1dc25d934e..09ab5c5392 100644
--- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s
+++ b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s
@@ -342,7 +342,7 @@ glabel L802A18B0_797870
 /* 7979A4 802A19E4 3C048000 */  lui       $a0, 0x8000
 /* 7979A8 802A19E8 34840069 */  ori       $a0, $a0, 0x69
 .L802A19EC:
-/* 7979AC 802A19EC 0C05272D */  jal       play_sound
+/* 7979AC 802A19EC 0C05272D */  jal       sfx_play_sound
 /* 7979B0 802A19F0 00000000 */   nop
 /* 7979B4 802A19F4 24020001 */  addiu     $v0, $zero, 1
 /* 7979B8 802A19F8 080A8907 */  j         L802A241C_7983DC
@@ -432,7 +432,7 @@ glabel L802A1AB8_797A78
 /* 797AF8 802A1B38 24040649 */   addiu    $a0, $zero, 0x649
 /* 797AFC 802A1B3C 24040648 */  addiu     $a0, $zero, 0x648
 .L802A1B40:
-/* 797B00 802A1B40 0C05272D */  jal       play_sound
+/* 797B00 802A1B40 0C05272D */  jal       sfx_play_sound
 /* 797B04 802A1B44 00000000 */   nop
 /* 797B08 802A1B48 24020004 */  addiu     $v0, $zero, 4
 /* 797B0C 802A1B4C 080A8907 */  j         L802A241C_7983DC
@@ -681,7 +681,7 @@ glabel L802A1E34_797DF4
 /* 797EA4 802A1EE4 E448008C */  swc1      $f8, 0x8c($v0)
 /* 797EA8 802A1EE8 8FC30078 */  lw        $v1, 0x78($fp)
 /* 797EAC 802A1EEC AC4300AC */  sw        $v1, 0xac($v0)
-/* 797EB0 802A1EF0 0C05272D */  jal       play_sound
+/* 797EB0 802A1EF0 0C05272D */  jal       sfx_play_sound
 /* 797EB4 802A1EF4 2404024A */   addiu    $a0, $zero, 0x24a
 /* 797EB8 802A1EF8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 797EBC 802A1EFC AFC20074 */  sw        $v0, 0x74($fp)
@@ -810,7 +810,7 @@ glabel L802A2080_798040
 /* 798078 802A20B8 24050001 */   addiu    $a1, $zero, 1
 /* 79807C 802A20BC 24040649 */  addiu     $a0, $zero, 0x649
 .L802A20C0:
-/* 798080 802A20C0 0C05272D */  jal       play_sound
+/* 798080 802A20C0 0C05272D */  jal       sfx_play_sound
 /* 798084 802A20C4 00000000 */   nop
 .L802A20C8:
 /* 798088 802A20C8 0000B82D */  daddu     $s7, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s b/ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s
index b1cd259ccd..81617d2696 100644
--- a/ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s
+++ b/ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s
@@ -126,7 +126,7 @@ glabel state_step_language_select
 /* 1078C 8003538C 00021600 */  sll       $v0, $v0, 0x18
 /* 10790 80035390 1440003B */  bnez      $v0, .L80035480
 /* 10794 80035394 2402FFFF */   addiu    $v0, $zero, -1
-/* 10798 80035398 0C05260E */  jal       func_80149838
+/* 10798 80035398 0C05260E */  jal       sfx_stop_env_sounds
 /* 1079C 8003539C A2020000 */   sb       $v0, ($s0)
 /* 107A0 800353A0 0C00EC6A */  jal       func_8003B1A8
 /* 107A4 800353A4 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s
index 75e5e459d2..89b9ce8e47 100644
--- a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s
+++ b/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s
@@ -161,7 +161,7 @@ glabel L802E3D84_105604
 /* 105630 802E3DB0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 105634 802E3DB4 8E260048 */  lw        $a2, 0x48($s1)
 /* 105638 802E3DB8 8E27004C */  lw        $a3, 0x4c($s1)
-/* 10563C 802E3DBC 0C052757 */  jal       play_sound_at_position
+/* 10563C 802E3DBC 0C052757 */  jal       sfx_play_sound_at_position
 /* 105640 802E3DC0 0000282D */   daddu    $a1, $zero, $zero
 /* 105644 802E3DC4 080B8F7A */  j         .L802E3DE8
 /* 105648 802E3DC8 24020001 */   addiu    $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s b/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s
index d5be07cd4c..754af58b56 100644
--- a/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s
+++ b/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s
@@ -145,7 +145,7 @@ glabel L802E4F1C_10679C
 /* 10687C 802E4FFC E6000004 */   swc1     $f0, 4($s0)
 /* 106880 802E5000 0C03A899 */  jal       recover_fp
 /* 106884 802E5004 2404FFFF */   addiu    $a0, $zero, -1
-/* 106888 802E5008 0C05272D */  jal       play_sound
+/* 106888 802E5008 0C05272D */  jal       sfx_play_sound
 /* 10688C 802E500C 24040131 */   addiu    $a0, $zero, 0x131
 /* 106890 802E5010 080B949D */  j         .L802E5274
 /* 106894 802E5014 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s
index 5ae6252234..8952caa141 100644
--- a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s
+++ b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s
@@ -42,7 +42,7 @@ glabel func_802E5FB0
 /* 1078C0 802E6040 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1078C4 802E6044 8E060048 */  lw        $a2, 0x48($s0)
 /* 1078C8 802E6048 8E07004C */  lw        $a3, 0x4c($s0)
-/* 1078CC 802E604C 0C052757 */  jal       play_sound_at_position
+/* 1078CC 802E604C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1078D0 802E6050 0000282D */   daddu    $a1, $zero, $zero
 .L802E6054:
 /* 1078D4 802E6054 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6064.s b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6064.s
index e78849c305..090cd13d2c 100644
--- a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6064.s
+++ b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6064.s
@@ -38,7 +38,7 @@ glabel func_802E6064
 /* 107964 802E60E4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 107968 802E60E8 8E060048 */  lw        $a2, 0x48($s0)
 /* 10796C 802E60EC 8E07004C */  lw        $a3, 0x4c($s0)
-/* 107970 802E60F0 0C052757 */  jal       play_sound_at_position
+/* 107970 802E60F0 0C052757 */  jal       sfx_play_sound_at_position
 /* 107974 802E60F4 0000282D */   daddu    $a1, $zero, $zero
 /* 107978 802E60F8 0C03805E */  jal       disable_player_input
 /* 10797C 802E60FC 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s
index 8ab74c13b0..2088008e41 100644
--- a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s
+++ b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s
@@ -63,7 +63,7 @@ glabel func_802E6574
 /* 107EB4 802E6634 00400008 */  jr        $v0
 /* 107EB8 802E6638 00000000 */   nop
 glabel L802E663C_107EBC
-/* 107EBC 802E663C 0C05272D */  jal       play_sound
+/* 107EBC 802E663C 0C05272D */  jal       sfx_play_sound
 /* 107EC0 802E6640 240420AB */   addiu    $a0, $zero, 0x20ab
 /* 107EC4 802E6644 24040001 */  addiu     $a0, $zero, 1
 /* 107EC8 802E6648 3C0142B4 */  lui       $at, 0x42b4
@@ -278,7 +278,7 @@ glabel L802E685C_1080DC
 /* 1081E0 802E6960 E6340068 */  swc1      $f20, 0x68($s1)
 /* 1081E4 802E6964 0C0B2D72 */  jal       exec_ShakeCamX
 /* 1081E8 802E6968 A2020001 */   sb       $v0, 1($s0)
-/* 1081EC 802E696C 0C05272D */  jal       play_sound
+/* 1081EC 802E696C 0C05272D */  jal       sfx_play_sound
 /* 1081F0 802E6970 240420AC */   addiu    $a0, $zero, 0x20ac
 /* 1081F4 802E6974 080B9AB5 */  j         L802E6AD4_108354
 /* 1081F8 802E6978 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E71F8.s b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E71F8.s
index 4a3862f9ae..82d09904c5 100644
--- a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E71F8.s
+++ b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E71F8.s
@@ -11,7 +11,7 @@ glabel func_802E71F8
 /* 108A90 802E7210 24030028 */  addiu     $v1, $zero, 0x28
 /* 108A94 802E7214 AC400008 */  sw        $zero, 8($v0)
 /* 108A98 802E7218 A0400005 */  sb        $zero, 5($v0)
-/* 108A9C 802E721C 0C05272D */  jal       play_sound
+/* 108A9C 802E721C 0C05272D */  jal       sfx_play_sound
 /* 108AA0 802E7220 A4430002 */   sh       $v1, 2($v0)
 /* 108AA4 802E7224 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 108AA8 802E7228 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
index d2fee83099..6a98ec1e38 100644
--- a/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
+++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
@@ -177,7 +177,7 @@ glabel begin_state_title_screen
 /* 12478 80037078 0080302D */  daddu     $a2, $a0, $zero
 /* 1247C 8003707C 240701F4 */  addiu     $a3, $zero, 0x1f4
 /* 12480 80037080 24020008 */  addiu     $v0, $zero, 8
-/* 12484 80037084 0C052A46 */  jal       set_music_track
+/* 12484 80037084 0C052A46 */  jal       bgm_set_song
 /* 12488 80037088 AFA20010 */   sw       $v0, 0x10($sp)
 /* 1248C 8003708C 8FBF002C */  lw        $ra, 0x2c($sp)
 /* 12490 80037090 8FB20028 */  lw        $s2, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s
index 68be6bf5a5..546bddc7b1 100644
--- a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s
+++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s
@@ -111,7 +111,7 @@ glabel L80037204_12604
 /* 12628 80037228 0000202D */  daddu     $a0, $zero, $zero
 /* 1262C 8003722C 2405FFFF */  addiu     $a1, $zero, -1
 /* 12630 80037230 0080302D */  daddu     $a2, $a0, $zero
-/* 12634 80037234 0C052A46 */  jal       set_music_track
+/* 12634 80037234 0C052A46 */  jal       bgm_set_song
 /* 12638 80037238 24070F3C */   addiu    $a3, $zero, 0xf3c
 .L8003723C:
 /* 1263C 8003723C 3C02800A */  lui       $v0, %hi(D_800A0988)
@@ -145,14 +145,14 @@ glabel L80037204_12604
 /* 126A4 800372A4 24020005 */  addiu     $v0, $zero, 5
 /* 126A8 800372A8 3C018007 */  lui       $at, %hi(D_800779C0)
 /* 126AC 800372AC A42279C0 */  sh        $v0, %lo(D_800779C0)($at)
-/* 126B0 800372B0 0C05272D */  jal       play_sound
+/* 126B0 800372B0 0C05272D */  jal       sfx_play_sound
 /* 126B4 800372B4 240400D5 */   addiu    $a0, $zero, 0xd5
 /* 126B8 800372B8 0000202D */  daddu     $a0, $zero, $zero
 /* 126BC 800372BC 24050069 */  addiu     $a1, $zero, 0x69
 /* 126C0 800372C0 0080302D */  daddu     $a2, $a0, $zero
 /* 126C4 800372C4 240701F4 */  addiu     $a3, $zero, 0x1f4
 /* 126C8 800372C8 24020008 */  addiu     $v0, $zero, 8
-/* 126CC 800372CC 0C052A46 */  jal       set_music_track
+/* 126CC 800372CC 0C052A46 */  jal       bgm_set_song
 /* 126D0 800372D0 AFA20010 */   sw       $v0, 0x10($sp)
 /* 126D4 800372D4 0800DD64 */  j         .L80037590
 /* 126D8 800372D8 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_handle_input.s b/ver/us/asm/nonmatchings/code_135EE0/pause_handle_input.s
index 10f3d9458b..22b0ea6d98 100644
--- a/ver/us/asm/nonmatchings/code_135EE0/pause_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_135EE0/pause_handle_input.s
@@ -71,7 +71,7 @@ glabel pause_handle_input
 .L80244520:
 /* 137860 80244520 0C039E1B */  jal       enforce_hpfp_limits
 /* 137864 80244524 00000000 */   nop
-/* 137868 80244528 0C05272D */  jal       play_sound
+/* 137868 80244528 0C05272D */  jal       sfx_play_sound
 /* 13786C 8024452C 240400C6 */   addiu    $a0, $zero, 0xc6
 /* 137870 80244530 0C00CD3C */  jal       set_game_mode
 /* 137874 80244534 2404000B */   addiu    $a0, $zero, 0xb
diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_init.s b/ver/us/asm/nonmatchings/code_135EE0/pause_init.s
index 7273d8fc0b..b991d17b34 100644
--- a/ver/us/asm/nonmatchings/code_135EE0/pause_init.s
+++ b/ver/us/asm/nonmatchings/code_135EE0/pause_init.s
@@ -140,7 +140,7 @@ glabel pause_init
 /* 13759C 8024425C 24040018 */  addiu     $a0, $zero, 0x18
 /* 1375A0 80244260 0C051F9F */  jal       set_window_update
 /* 1375A4 80244264 24050001 */   addiu    $a1, $zero, 1
-/* 1375A8 80244268 0C05272D */  jal       play_sound
+/* 1375A8 80244268 0C05272D */  jal       sfx_play_sound
 /* 1375AC 8024426C 24040009 */   addiu    $a0, $zero, 9
 .L80244270:
 /* 1375B0 80244270 2404002C */  addiu     $a0, $zero, 0x2c
diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_input.s b/ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_input.s
index 6ef706edaf..cd538d0382 100644
--- a/ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_input.s
+++ b/ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_input.s
@@ -40,7 +40,7 @@ glabel pause_tutorial_input
 /* 137668 80244328 00000000 */   nop
 /* 13766C 8024432C 16000003 */  bnez      $s0, .L8024433C
 /* 137670 80244330 00000000 */   nop
-/* 137674 80244334 0C05272D */  jal       play_sound
+/* 137674 80244334 0C05272D */  jal       sfx_play_sound
 /* 137678 80244338 2404021D */   addiu    $a0, $zero, 0x21d
 .L8024433C:
 /* 13767C 8024433C 3C028025 */  lui       $v0, %hi(D_8024F018)
diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s b/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s
index 4f3dd4577b..b74a2122ac 100644
--- a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s
@@ -119,7 +119,7 @@ glabel pause_tabs_handle_input
 /* 138844 80245504 A483024C */  sh        $v1, 0x24c($a0)
 /* 138848 80245508 82020001 */  lb        $v0, 1($s0)
 /* 13884C 8024550C 240400C8 */  addiu     $a0, $zero, 0xc8
-/* 138850 80245510 0C05272D */  jal       play_sound
+/* 138850 80245510 0C05272D */  jal       sfx_play_sound
 /* 138854 80245514 AE220000 */   sw       $v0, ($s1)
 .L80245518:
 /* 138858 80245518 3C028027 */  lui       $v0, %hi(gPauseMenuPressedButtons)
@@ -141,7 +141,7 @@ glabel pause_tabs_handle_input
 /* 138898 80245558 24020001 */  addiu     $v0, $zero, 1
 /* 13889C 8024555C 14620008 */  bne       $v1, $v0, .L80245580
 /* 1388A0 80245560 00000000 */   nop
-/* 1388A4 80245564 0C05272D */  jal       play_sound
+/* 1388A4 80245564 0C05272D */  jal       sfx_play_sound
 /* 1388A8 80245568 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 1388AC 8024556C 82020001 */  lb        $v0, 1($s0)
 /* 1388B0 80245570 00511021 */  addu      $v0, $v0, $s1
diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s b/ver/us/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s
index b03c3172af..7fc8119645 100644
--- a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s
@@ -54,13 +54,13 @@ glabel pause_badges_handle_input
 /* 13C4A0 80249160 24027FFE */  addiu     $v0, $zero, 0x7ffe
 /* 13C4A4 80249164 14620005 */  bne       $v1, $v0, .L8024917C
 /* 13C4A8 80249168 24020001 */   addiu    $v0, $zero, 1
-/* 13C4AC 8024916C 0C05272D */  jal       play_sound
+/* 13C4AC 8024916C 0C05272D */  jal       sfx_play_sound
 /* 13C4B0 80249170 2404021D */   addiu    $a0, $zero, 0x21d
 /* 13C4B4 80249174 08092581 */  j         .L80249604
 /* 13C4B8 80249178 00000000 */   nop
 .L8024917C:
 /* 13C4BC 8024917C AC820000 */  sw        $v0, ($a0)
-/* 13C4C0 80249180 0C05272D */  jal       play_sound
+/* 13C4C0 80249180 0C05272D */  jal       sfx_play_sound
 /* 13C4C4 80249184 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 13C4C8 80249188 08092581 */  j         .L80249604
 /* 13C4CC 8024918C 00000000 */   nop
@@ -88,19 +88,19 @@ glabel pause_badges_handle_input
 /* 13C51C 802491DC 08092581 */  j         .L80249604
 /* 13C520 802491E0 00000000 */   nop
 .L802491E4:
-/* 13C524 802491E4 0C05272D */  jal       play_sound
+/* 13C524 802491E4 0C05272D */  jal       sfx_play_sound
 /* 13C528 802491E8 24040006 */   addiu    $a0, $zero, 6
 /* 13C52C 802491EC 0C091CAC */  jal       pause_badges_try_remove
 /* 13C530 802491F0 0220202D */   daddu    $a0, $s1, $zero
 /* 13C534 802491F4 08092581 */  j         .L80249604
 /* 13C538 802491F8 00000000 */   nop
 .L802491FC:
-/* 13C53C 802491FC 0C05272D */  jal       play_sound
+/* 13C53C 802491FC 0C05272D */  jal       sfx_play_sound
 /* 13C540 80249200 2404021D */   addiu    $a0, $zero, 0x21d
 /* 13C544 80249204 08092581 */  j         .L80249604
 /* 13C548 80249208 AE500000 */   sw       $s0, ($s2)
 .L8024920C:
-/* 13C54C 8024920C 0C05272D */  jal       play_sound
+/* 13C54C 8024920C 0C05272D */  jal       sfx_play_sound
 /* 13C550 80249210 24040005 */   addiu    $a0, $zero, 5
 /* 13C554 80249214 08092581 */  j         .L80249604
 /* 13C558 80249218 00000000 */   nop
@@ -137,7 +137,7 @@ glabel pause_badges_handle_input
 /* 13C5C4 80249284 8E020000 */  lw        $v0, ($s0)
 /* 13C5C8 80249288 106200A0 */  beq       $v1, $v0, .L8024950C
 /* 13C5CC 8024928C 00000000 */   nop
-/* 13C5D0 80249290 0C05272D */  jal       play_sound
+/* 13C5D0 80249290 0C05272D */  jal       sfx_play_sound
 /* 13C5D4 80249294 240400C8 */   addiu    $a0, $zero, 0xc8
 /* 13C5D8 80249298 8E040000 */  lw        $a0, ($s0)
 /* 13C5DC 8024929C 0C092363 */  jal       pause_badges_load_badges
@@ -298,7 +298,7 @@ glabel pause_badges_handle_input
 /* 13C81C 802494DC 010A1021 */  addu      $v0, $t0, $t2
 /* 13C820 802494E0 10490003 */  beq       $v0, $t1, .L802494F0
 /* 13C824 802494E4 AE020000 */   sw       $v0, ($s0)
-/* 13C828 802494E8 0C05272D */  jal       play_sound
+/* 13C828 802494E8 0C05272D */  jal       sfx_play_sound
 /* 13C82C 802494EC 240400C7 */   addiu    $a0, $zero, 0xc7
 .L802494F0:
 /* 13C830 802494F0 8E020000 */  lw        $v0, ($s0)
@@ -359,14 +359,14 @@ glabel pause_badges_handle_input
 /* 13C8F4 802495B4 8E020000 */  lw        $v0, ($s0)
 /* 13C8F8 802495B8 14400007 */  bnez      $v0, .L802495D8
 /* 13C8FC 802495BC 00000000 */   nop
-/* 13C900 802495C0 0C05272D */  jal       play_sound
+/* 13C900 802495C0 0C05272D */  jal       sfx_play_sound
 /* 13C904 802495C4 240400CA */   addiu    $a0, $zero, 0xca
 /* 13C908 802495C8 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
 /* 13C90C 802495CC A02000D4 */  sb        $zero, %lo(gPauseMenuCurrentTab)($at)
 /* 13C910 802495D0 08092581 */  j         .L80249604
 /* 13C914 802495D4 00000000 */   nop
 .L802495D8:
-/* 13C918 802495D8 0C05272D */  jal       play_sound
+/* 13C918 802495D8 0C05272D */  jal       sfx_play_sound
 /* 13C91C 802495DC 240400CA */   addiu    $a0, $zero, 0xca
 /* 13C920 802495E0 0C039E1B */  jal       enforce_hpfp_limits
 /* 13C924 802495E4 AE000000 */   sw       $zero, ($s0)
diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s b/ver/us/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s
index 4e9a4f3100..cab20cc6d2 100644
--- a/ver/us/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s
@@ -177,7 +177,7 @@ glabel pause_stats_handle_input
 /* 13A144 80246E04 304200FF */  andi      $v0, $v0, 0xff
 /* 13A148 80246E08 10470003 */  beq       $v0, $a3, .L80246E18
 /* 13A14C 80246E0C 00000000 */   nop
-/* 13A150 80246E10 0C05272D */  jal       play_sound
+/* 13A150 80246E10 0C05272D */  jal       sfx_play_sound
 /* 13A154 80246E14 240400C7 */   addiu    $a0, $zero, 0xc7
 .L80246E18:
 /* 13A158 80246E18 3C028011 */  lui       $v0, %hi(gPlayerData)
@@ -277,7 +277,7 @@ glabel pause_stats_handle_input
 /* 13A2A4 80246F64 30634000 */  andi      $v1, $v1, 0x4000
 /* 13A2A8 80246F68 10600005 */  beqz      $v1, .L80246F80
 /* 13A2AC 80246F6C 00000000 */   nop
-/* 13A2B0 80246F70 0C05272D */  jal       play_sound
+/* 13A2B0 80246F70 0C05272D */  jal       sfx_play_sound
 /* 13A2B4 80246F74 240400CA */   addiu    $a0, $zero, 0xca
 /* 13A2B8 80246F78 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
 /* 13A2BC 80246F7C A02000D4 */  sb        $zero, %lo(gPauseMenuCurrentTab)($at)
diff --git a/ver/us/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s b/ver/us/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s
index 465ea10270..d59bc5eb4b 100644
--- a/ver/us/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s
@@ -44,13 +44,13 @@ glabel pause_items_handle_input
 /* 13DBAC 8024A86C 24027FFE */  addiu     $v0, $zero, 0x7ffe
 /* 13DBB0 8024A870 14620005 */  bne       $v1, $v0, .L8024A888
 /* 13DBB4 8024A874 24020001 */   addiu    $v0, $zero, 1
-/* 13DBB8 8024A878 0C05272D */  jal       play_sound
+/* 13DBB8 8024A878 0C05272D */  jal       sfx_play_sound
 /* 13DBBC 8024A87C 2404021D */   addiu    $a0, $zero, 0x21d
 /* 13DBC0 8024A880 08092B11 */  j         .L8024AC44
 /* 13DBC4 8024A884 00000000 */   nop
 .L8024A888:
 /* 13DBC8 8024A888 AC820000 */  sw        $v0, ($a0)
-/* 13DBCC 8024A88C 0C05272D */  jal       play_sound
+/* 13DBCC 8024A88C 0C05272D */  jal       sfx_play_sound
 /* 13DBD0 8024A890 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 13DBD4 8024A894 08092B11 */  j         .L8024AC44
 /* 13DBD8 8024A898 00000000 */   nop
@@ -77,7 +77,7 @@ glabel pause_items_handle_input
 /* 13DC24 8024A8E4 8E020000 */  lw        $v0, ($s0)
 /* 13DC28 8024A8E8 106200A0 */  beq       $v1, $v0, .L8024AB6C
 /* 13DC2C 8024A8EC 00000000 */   nop
-/* 13DC30 8024A8F0 0C05272D */  jal       play_sound
+/* 13DC30 8024A8F0 0C05272D */  jal       sfx_play_sound
 /* 13DC34 8024A8F4 240400C8 */   addiu    $a0, $zero, 0xc8
 /* 13DC38 8024A8F8 8E040000 */  lw        $a0, ($s0)
 /* 13DC3C 8024A8FC 0C092937 */  jal       pause_items_load_items
@@ -238,7 +238,7 @@ glabel pause_items_handle_input
 /* 13DE7C 8024AB3C 010A1021 */  addu      $v0, $t0, $t2
 /* 13DE80 8024AB40 10490003 */  beq       $v0, $t1, .L8024AB50
 /* 13DE84 8024AB44 AE020000 */   sw       $v0, ($s0)
-/* 13DE88 8024AB48 0C05272D */  jal       play_sound
+/* 13DE88 8024AB48 0C05272D */  jal       sfx_play_sound
 /* 13DE8C 8024AB4C 240400C7 */   addiu    $a0, $zero, 0xc7
 .L8024AB50:
 /* 13DE90 8024AB50 8E020000 */  lw        $v0, ($s0)
@@ -299,14 +299,14 @@ glabel pause_items_handle_input
 /* 13DF54 8024AC14 8E020000 */  lw        $v0, ($s0)
 /* 13DF58 8024AC18 14400007 */  bnez      $v0, .L8024AC38
 /* 13DF5C 8024AC1C 00000000 */   nop
-/* 13DF60 8024AC20 0C05272D */  jal       play_sound
+/* 13DF60 8024AC20 0C05272D */  jal       sfx_play_sound
 /* 13DF64 8024AC24 240400CA */   addiu    $a0, $zero, 0xca
 /* 13DF68 8024AC28 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
 /* 13DF6C 8024AC2C A02000D4 */  sb        $zero, %lo(gPauseMenuCurrentTab)($at)
 /* 13DF70 8024AC30 08092B11 */  j         .L8024AC44
 /* 13DF74 8024AC34 00000000 */   nop
 .L8024AC38:
-/* 13DF78 8024AC38 0C05272D */  jal       play_sound
+/* 13DF78 8024AC38 0C05272D */  jal       sfx_play_sound
 /* 13DF7C 8024AC3C 240400CA */   addiu    $a0, $zero, 0xca
 /* 13DF80 8024AC40 AE000000 */  sw        $zero, ($s0)
 .L8024AC44:
diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_handle_input.s b/ver/us/asm/nonmatchings/code_13E120/pause_partners_handle_input.s
index 10847ccc7e..fc770987a1 100644
--- a/ver/us/asm/nonmatchings/code_13E120/pause_partners_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_13E120/pause_partners_handle_input.s
@@ -45,7 +45,7 @@ glabel pause_partners_handle_input
 .L8024C3C8:
 /* 13F708 8024C3C8 1200002B */  beqz      $s0, .L8024C478
 /* 13F70C 8024C3CC 00000000 */   nop
-/* 13F710 8024C3D0 0C05272D */  jal       play_sound
+/* 13F710 8024C3D0 0C05272D */  jal       sfx_play_sound
 /* 13F714 8024C3D4 240400C7 */   addiu    $a0, $zero, 0xc7
 /* 13F718 8024C3D8 3C048027 */  lui       $a0, %hi(D_802706A0)
 /* 13F71C 8024C3DC 248406A0 */  addiu     $a0, $a0, %lo(D_802706A0)
@@ -202,7 +202,7 @@ glabel pause_partners_handle_input
 /* 13F944 8024C604 8C4206A4 */  lw        $v0, %lo(D_802706A4)($v0)
 /* 13F948 8024C608 10510003 */  beq       $v0, $s1, .L8024C618
 /* 13F94C 8024C60C 00000000 */   nop
-/* 13F950 8024C610 0C05272D */  jal       play_sound
+/* 13F950 8024C610 0C05272D */  jal       sfx_play_sound
 /* 13F954 8024C614 240400C7 */   addiu    $a0, $zero, 0xc7
 .L8024C618:
 /* 13F958 8024C618 3C028027 */  lui       $v0, %hi(gPauseMenuPressedButtons)
@@ -216,7 +216,7 @@ glabel pause_partners_handle_input
 /* 13F978 8024C638 14400009 */  bnez      $v0, .L8024C660
 /* 13F97C 8024C63C 24020001 */   addiu    $v0, $zero, 1
 /* 13F980 8024C640 AC620000 */  sw        $v0, ($v1)
-/* 13F984 8024C644 0C05272D */  jal       play_sound
+/* 13F984 8024C644 0C05272D */  jal       sfx_play_sound
 /* 13F988 8024C648 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 13F98C 8024C64C 24040024 */  addiu     $a0, $zero, 0x24
 /* 13F990 8024C650 0C051F9F */  jal       set_window_update
@@ -236,12 +236,12 @@ glabel pause_partners_handle_input
 /* 13F9C4 8024C684 AC600000 */   sw       $zero, ($v1)
 /* 13F9C8 8024C688 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
 /* 13F9CC 8024C68C A02000D4 */  sb        $zero, %lo(gPauseMenuCurrentTab)($at)
-/* 13F9D0 8024C690 0C05272D */  jal       play_sound
+/* 13F9D0 8024C690 0C05272D */  jal       sfx_play_sound
 /* 13F9D4 8024C694 240400CA */   addiu    $a0, $zero, 0xca
 /* 13F9D8 8024C698 080931E4 */  j         .L8024C790
 /* 13F9DC 8024C69C 00000000 */   nop
 .L8024C6A0:
-/* 13F9E0 8024C6A0 0C05272D */  jal       play_sound
+/* 13F9E0 8024C6A0 0C05272D */  jal       sfx_play_sound
 /* 13F9E4 8024C6A4 240400CA */   addiu    $a0, $zero, 0xca
 /* 13F9E8 8024C6A8 24040024 */  addiu     $a0, $zero, 0x24
 /* 13F9EC 8024C6AC 0C051F9F */  jal       set_window_update
diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s b/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s
index 6d6f1f6fc1..44ddde40d0 100644
--- a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s
@@ -216,7 +216,7 @@ glabel pause_spirits_handle_input
 /* 140A9C 8024D75C 92020003 */  lbu       $v0, 3($s0)
 /* 140AA0 8024D760 10470003 */  beq       $v0, $a3, .L8024D770
 /* 140AA4 8024D764 00000000 */   nop
-/* 140AA8 8024D768 0C05272D */  jal       play_sound
+/* 140AA8 8024D768 0C05272D */  jal       sfx_play_sound
 /* 140AAC 8024D76C 240400C7 */   addiu    $a0, $zero, 0xc7
 .L8024D770:
 /* 140AB0 8024D770 3C028027 */  lui       $v0, %hi(gPauseMenuPressedButtons)
@@ -226,7 +226,7 @@ glabel pause_spirits_handle_input
 /* 140AC0 8024D780 00000000 */   nop
 /* 140AC4 8024D784 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
 /* 140AC8 8024D788 A02000D4 */  sb        $zero, %lo(gPauseMenuCurrentTab)($at)
-/* 140ACC 8024D78C 0C05272D */  jal       play_sound
+/* 140ACC 8024D78C 0C05272D */  jal       sfx_play_sound
 /* 140AD0 8024D790 240400CA */   addiu    $a0, $zero, 0xca
 /* 140AD4 8024D794 080935FC */  j         .L8024D7F0
 /* 140AD8 8024D798 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_handle_input.s b/ver/us/asm/nonmatchings/code_140C70/pause_map_handle_input.s
index 6fbe09c487..ce9901e3c9 100644
--- a/ver/us/asm/nonmatchings/code_140C70/pause_map_handle_input.s
+++ b/ver/us/asm/nonmatchings/code_140C70/pause_map_handle_input.s
@@ -239,7 +239,7 @@ glabel pause_map_handle_input
 /* 141F2C 8024EBEC 30424000 */  andi      $v0, $v0, 0x4000
 /* 141F30 8024EBF0 10400007 */  beqz      $v0, .L8024EC10
 /* 141F34 8024EBF4 2402FFFF */   addiu    $v0, $zero, -1
-/* 141F38 8024EBF8 0C05272D */  jal       play_sound
+/* 141F38 8024EBF8 0C05272D */  jal       sfx_play_sound
 /* 141F3C 8024EBFC 240400CA */   addiu    $a0, $zero, 0xca
 /* 141F40 8024EC00 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
 /* 141F44 8024EC04 A02000D4 */  sb        $zero, %lo(gPauseMenuCurrentTab)($at)
diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245A40.s b/ver/us/asm/nonmatchings/code_165490/func_80245A40.s
index c419b86e39..3bc27f238f 100644
--- a/ver/us/asm/nonmatchings/code_165490/func_80245A40.s
+++ b/ver/us/asm/nonmatchings/code_165490/func_80245A40.s
@@ -174,7 +174,7 @@ glabel L80245C38_166498
 /* 166518 80245CB8 304200FF */  andi      $v0, $v0, 0xff
 /* 16651C 80245CBC 10E20003 */  beq       $a3, $v0, .L80245CCC
 /* 166520 80245CC0 00000000 */   nop
-/* 166524 80245CC4 0C05272D */  jal       play_sound
+/* 166524 80245CC4 0C05272D */  jal       sfx_play_sound
 /* 166528 80245CC8 24042101 */   addiu    $a0, $zero, 0x2101
 .L80245CCC:
 /* 16652C 80245CCC 82620004 */  lb        $v0, 4($s3)
@@ -203,7 +203,7 @@ glabel L80245C38_166498
 /* 166580 80245D20 904200AB */  lbu       $v0, 0xab($v0)
 /* 166584 80245D24 1082000D */  beq       $a0, $v0, .L80245D5C
 /* 166588 80245D28 00000000 */   nop
-/* 16658C 80245D2C 0C05272D */  jal       play_sound
+/* 16658C 80245D2C 0C05272D */  jal       sfx_play_sound
 /* 166590 80245D30 240400C8 */   addiu    $a0, $zero, 0xc8
 /* 166594 80245D34 8E020000 */  lw        $v0, ($s0)
 /* 166598 80245D38 904200AB */  lbu       $v0, 0xab($v0)
@@ -314,7 +314,7 @@ glabel L80245DD0_166630
 /* 166724 80245EC4 2404003B */  addiu     $a0, $zero, 0x3b
 /* 166728 80245EC8 0C051F9F */  jal       set_window_update
 /* 16672C 80245ECC 0200282D */   daddu    $a1, $s0, $zero
-/* 166730 80245ED0 0C05272D */  jal       play_sound
+/* 166730 80245ED0 0C05272D */  jal       sfx_play_sound
 /* 166734 80245ED4 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166738 80245ED8 0000282D */  daddu     $a1, $zero, $zero
 /* 16673C 80245EDC 00A0302D */  daddu     $a2, $a1, $zero
@@ -367,7 +367,7 @@ glabel L80245DD0_166630
 /* 1667F4 80245F94 24A53754 */  addiu     $a1, $a1, %lo(func_80243754)
 /* 1667F8 80245F98 0C051F9F */  jal       set_window_update
 /* 1667FC 80245F9C 2404002D */   addiu    $a0, $zero, 0x2d
-/* 166800 80245FA0 0C05272D */  jal       play_sound
+/* 166800 80245FA0 0C05272D */  jal       sfx_play_sound
 /* 166804 80245FA4 240400D6 */   addiu    $a0, $zero, 0xd6
 /* 166808 80245FA8 0C00CD3C */  jal       set_game_mode
 /* 16680C 80245FAC 2404000F */   addiu    $a0, $zero, 0xf
@@ -376,14 +376,14 @@ glabel L80245DD0_166630
 .L80245FB8:
 /* 166818 80245FB8 14620005 */  bne       $v1, $v0, .L80245FD0
 /* 16681C 80245FBC 24020005 */   addiu    $v0, $zero, 5
-/* 166820 80245FC0 0C05272D */  jal       play_sound
+/* 166820 80245FC0 0C05272D */  jal       sfx_play_sound
 /* 166824 80245FC4 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166828 80245FC8 080917F9 */  j         .L80245FE4
 /* 16682C 80245FCC 24020001 */   addiu    $v0, $zero, 1
 .L80245FD0:
 /* 166830 80245FD0 1462001B */  bne       $v1, $v0, .L80246040
 /* 166834 80245FD4 2C620004 */   sltiu    $v0, $v1, 4
-/* 166838 80245FD8 0C05272D */  jal       play_sound
+/* 166838 80245FD8 0C05272D */  jal       sfx_play_sound
 /* 16683C 80245FDC 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166840 80245FE0 24020003 */  addiu     $v0, $zero, 3
 .L80245FE4:
@@ -413,7 +413,7 @@ glabel L80245DD0_166630
 .L80246040:
 /* 1668A0 80246040 10400229 */  beqz      $v0, .L802468E8
 /* 1668A4 80246044 00000000 */   nop
-/* 1668A8 80246048 0C05272D */  jal       play_sound
+/* 1668A8 80246048 0C05272D */  jal       sfx_play_sound
 /* 1668AC 8024604C 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 1668B0 80246050 2404002D */  addiu     $a0, $zero, 0x2d
 /* 1668B4 80246054 3C108024 */  lui       $s0, %hi(func_80243898)
@@ -455,7 +455,7 @@ glabel L80245DD0_166630
 /* 166944 802460E4 24A53908 */  addiu     $a1, $a1, %lo(func_80243908)
 /* 166948 802460E8 0C051F9F */  jal       set_window_update
 /* 16694C 802460EC 24840038 */   addiu    $a0, $a0, 0x38
-/* 166950 802460F0 0C05272D */  jal       play_sound
+/* 166950 802460F0 0C05272D */  jal       sfx_play_sound
 /* 166954 802460F4 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166958 802460F8 24040032 */  addiu     $a0, $zero, 0x32
 /* 16695C 802460FC 0C051F9F */  jal       set_window_update
@@ -526,7 +526,7 @@ glabel L802461E8_166A48
 /* 166A4C 802461EC 24020006 */  addiu     $v0, $zero, 6
 /* 166A50 802461F0 14620018 */  bne       $v1, $v0, .L80246254
 /* 166A54 802461F4 2C620004 */   sltiu    $v0, $v1, 4
-/* 166A58 802461F8 0C05272D */  jal       play_sound
+/* 166A58 802461F8 0C05272D */  jal       sfx_play_sound
 /* 166A5C 802461FC 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166A60 80246200 A2600004 */  sb        $zero, 4($s3)
 /* 166A64 80246204 3C058024 */  lui       $a1, %hi(func_802433F4)
@@ -558,7 +558,7 @@ glabel L802461E8_166A48
 /* 166AC8 80246268 90227A24 */  lbu       $v0, %lo(D_80077A24)($at)
 /* 166ACC 8024626C 1040007F */  beqz      $v0, .L8024646C
 /* 166AD0 80246270 00000000 */   nop
-/* 166AD4 80246274 0C05272D */  jal       play_sound
+/* 166AD4 80246274 0C05272D */  jal       sfx_play_sound
 /* 166AD8 80246278 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166ADC 8024627C 3C058024 */  lui       $a1, %hi(func_80243CCC)
 /* 166AE0 80246280 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
@@ -630,7 +630,7 @@ glabel L80246370_166BD0
 /* 166BD4 80246374 24020006 */  addiu     $v0, $zero, 6
 /* 166BD8 80246378 14620018 */  bne       $v1, $v0, .L802463DC
 /* 166BDC 8024637C 2C620004 */   sltiu    $v0, $v1, 4
-/* 166BE0 80246380 0C05272D */  jal       play_sound
+/* 166BE0 80246380 0C05272D */  jal       sfx_play_sound
 /* 166BE4 80246384 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166BE8 80246388 A2600004 */  sb        $zero, 4($s3)
 /* 166BEC 8024638C 3C058024 */  lui       $a1, %hi(func_802433F4)
@@ -662,7 +662,7 @@ glabel L80246370_166BD0
 /* 166C50 802463F0 90227A24 */  lbu       $v0, %lo(D_80077A24)($at)
 /* 166C54 802463F4 1040001D */  beqz      $v0, .L8024646C
 /* 166C58 802463F8 00000000 */   nop
-/* 166C5C 802463FC 0C05272D */  jal       play_sound
+/* 166C5C 802463FC 0C05272D */  jal       sfx_play_sound
 /* 166C60 80246400 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166C64 80246404 92630003 */  lbu       $v1, 3($s3)
 /* 166C68 80246408 24020004 */  addiu     $v0, $zero, 4
@@ -676,7 +676,7 @@ glabel L80246420_166C80
 /* 166C84 80246424 24020006 */  addiu     $v0, $zero, 6
 /* 166C88 80246428 14620009 */  bne       $v1, $v0, .L80246450
 /* 166C8C 8024642C 2C620004 */   sltiu    $v0, $v1, 4
-/* 166C90 80246430 0C05272D */  jal       play_sound
+/* 166C90 80246430 0C05272D */  jal       sfx_play_sound
 /* 166C94 80246434 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166C98 80246438 24020003 */  addiu     $v0, $zero, 3
 /* 166C9C 8024643C A2620004 */  sb        $v0, 4($s3)
@@ -693,7 +693,7 @@ glabel L80246420_166C80
 /* 166CC4 80246464 14430005 */  bne       $v0, $v1, .L8024647C
 /* 166CC8 80246468 00000000 */   nop
 .L8024646C:
-/* 166CCC 8024646C 0C05272D */  jal       play_sound
+/* 166CCC 8024646C 0C05272D */  jal       sfx_play_sound
 /* 166CD0 80246470 2404021D */   addiu    $a0, $zero, 0x21d
 /* 166CD4 80246474 08091A3A */  j         .L802468E8
 /* 166CD8 80246478 00000000 */   nop
@@ -706,7 +706,7 @@ glabel L80246420_166C80
 /* 166CF0 80246490 90227A24 */  lbu       $v0, %lo(D_80077A24)($at)
 /* 166CF4 80246494 14400066 */  bnez      $v0, .L80246630
 /* 166CF8 80246498 00000000 */   nop
-/* 166CFC 8024649C 0C05272D */  jal       play_sound
+/* 166CFC 8024649C 0C05272D */  jal       sfx_play_sound
 /* 166D00 802464A0 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166D04 802464A4 24020002 */  addiu     $v0, $zero, 2
 /* 166D08 802464A8 3C018025 */  lui       $at, %hi(D_8024C098)
@@ -812,7 +812,7 @@ glabel L80246420_166C80
 /* 166E88 80246628 08091A3A */  j         .L802468E8
 /* 166E8C 8024662C 00000000 */   nop
 .L80246630:
-/* 166E90 80246630 0C05272D */  jal       play_sound
+/* 166E90 80246630 0C05272D */  jal       sfx_play_sound
 /* 166E94 80246634 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166E98 80246638 3C058024 */  lui       $a1, %hi(func_80243CCC)
 /* 166E9C 8024663C 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
@@ -884,7 +884,7 @@ glabel L8024672C_166F8C
 /* 166F90 80246730 24020006 */  addiu     $v0, $zero, 6
 /* 166F94 80246734 14620007 */  bne       $v1, $v0, .L80246754
 /* 166F98 80246738 2C620004 */   sltiu    $v0, $v1, 4
-/* 166F9C 8024673C 0C05272D */  jal       play_sound
+/* 166F9C 8024673C 0C05272D */  jal       sfx_play_sound
 /* 166FA0 80246740 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166FA4 80246744 0C00CD3C */  jal       set_game_mode
 /* 166FA8 80246748 2404000D */   addiu    $a0, $zero, 0xd
@@ -901,7 +901,7 @@ glabel L8024672C_166F8C
 /* 166FD0 80246770 26317A24 */  addiu     $s1, $s1, %lo(D_80077A24)
 /* 166FD4 80246774 1440001B */  bnez      $v0, .L802467E4
 /* 166FD8 80246778 00000000 */   nop
-/* 166FDC 8024677C 0C05272D */  jal       play_sound
+/* 166FDC 8024677C 0C05272D */  jal       sfx_play_sound
 /* 166FE0 80246780 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166FE4 80246784 2404002C */  addiu     $a0, $zero, 0x2c
 /* 166FE8 80246788 3C058014 */  lui       $a1, %hi(main_menu_window_update)
@@ -928,7 +928,7 @@ glabel L8024672C_166F8C
 /* 16703C 802467DC 08091A3A */  j         .L802468E8
 /* 167040 802467E0 A0500000 */   sb       $s0, ($v0)
 .L802467E4:
-/* 167044 802467E4 0C05272D */  jal       play_sound
+/* 167044 802467E4 0C05272D */  jal       sfx_play_sound
 /* 167048 802467E8 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 16704C 802467EC 3C058024 */  lui       $a1, %hi(func_80243CCC)
 /* 167050 802467F0 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
@@ -1072,7 +1072,7 @@ glabel L80246960_1671C0
 /* 167248 802469E8 24A53754 */  addiu     $a1, $a1, %lo(func_80243754)
 /* 16724C 802469EC 0C051F9F */  jal       set_window_update
 /* 167250 802469F0 2404002D */   addiu    $a0, $zero, 0x2d
-/* 167254 802469F4 0C05272D */  jal       play_sound
+/* 167254 802469F4 0C05272D */  jal       sfx_play_sound
 /* 167258 802469F8 240400D6 */   addiu    $a0, $zero, 0xd6
 /* 16725C 802469FC 08091AC2 */  j         .L80246B08
 /* 167260 80246A00 2404000F */   addiu    $a0, $zero, 0xf
@@ -1138,12 +1138,12 @@ glabel L80246ABC_16731C
 /* 167344 80246AE4 0C090B65 */  jal       func_80242D94
 /* 167348 80246AE8 00052840 */   sll      $a1, $a1, 1
 .L80246AEC:
-/* 16734C 80246AEC 0C05272D */  jal       play_sound
+/* 16734C 80246AEC 0C05272D */  jal       sfx_play_sound
 /* 167350 80246AF0 240400CA */   addiu    $a0, $zero, 0xca
 /* 167354 80246AF4 08091AC4 */  j         .L80246B10
 /* 167358 80246AF8 00000000 */   nop
 glabel L80246AFC_16735C
-/* 16735C 80246AFC 0C05272D */  jal       play_sound
+/* 16735C 80246AFC 0C05272D */  jal       sfx_play_sound
 /* 167360 80246B00 240400CA */   addiu    $a0, $zero, 0xca
 /* 167364 80246B04 2404000D */  addiu     $a0, $zero, 0xd
 .L80246B08:
diff --git a/ver/us/asm/nonmatchings/code_167570/func_802471EC.s b/ver/us/asm/nonmatchings/code_167570/func_802471EC.s
index ff96816f5a..6c25856355 100644
--- a/ver/us/asm/nonmatchings/code_167570/func_802471EC.s
+++ b/ver/us/asm/nonmatchings/code_167570/func_802471EC.s
@@ -62,7 +62,7 @@ glabel func_802471EC
 /* 167B28 802472C8 304200FF */  andi      $v0, $v0, 0xff
 /* 167B2C 802472CC 10A20003 */  beq       $a1, $v0, .L802472DC
 /* 167B30 802472D0 00000000 */   nop
-/* 167B34 802472D4 0C05272D */  jal       play_sound
+/* 167B34 802472D4 0C05272D */  jal       sfx_play_sound
 /* 167B38 802472D8 240400C7 */   addiu    $a0, $zero, 0xc7
 .L802472DC:
 /* 167B3C 802472DC 3C108025 */  lui       $s0, %hi(D_8024C084)
@@ -85,7 +85,7 @@ glabel func_802471EC
 /* 167B7C 8024731C 30428000 */  andi      $v0, $v0, 0x8000
 /* 167B80 80247320 10400225 */  beqz      $v0, .L80247BB8
 /* 167B84 80247324 00000000 */   nop
-/* 167B88 80247328 0C05272D */  jal       play_sound
+/* 167B88 80247328 0C05272D */  jal       sfx_play_sound
 /* 167B8C 8024732C 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 167B90 80247330 92430003 */  lbu       $v1, 3($s2)
 /* 167B94 80247334 10600005 */  beqz      $v1, .L8024734C
@@ -671,7 +671,7 @@ glabel L80247AF8_168358
 /* 168420 80247BC0 30424000 */  andi      $v0, $v0, 0x4000
 /* 168424 80247BC4 1040004D */  beqz      $v0, .L80247CFC
 /* 168428 80247BC8 00000000 */   nop
-/* 16842C 80247BCC 0C05272D */  jal       play_sound
+/* 16842C 80247BCC 0C05272D */  jal       sfx_play_sound
 /* 168430 80247BD0 240400CA */   addiu    $a0, $zero, 0xca
 /* 168434 80247BD4 0240202D */  daddu     $a0, $s2, $zero
 /* 168438 80247BD8 0000282D */  daddu     $a1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s b/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s
index cc39dbf127..289defaf28 100644
--- a/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s
+++ b/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s
@@ -139,7 +139,7 @@ glabel func_80248BF4
 /* 169644 80248DE4 304200FF */  andi      $v0, $v0, 0xff
 /* 169648 80248DE8 10A20003 */  beq       $a1, $v0, .L80248DF8
 /* 16964C 80248DEC 00000000 */   nop
-/* 169650 80248DF0 0C05272D */  jal       play_sound
+/* 169650 80248DF0 0C05272D */  jal       sfx_play_sound
 /* 169654 80248DF4 24042102 */   addiu    $a0, $zero, 0x2102
 .L80248DF8:
 /* 169658 80248DF8 3C028025 */  lui       $v0, %hi(D_8024C084)
@@ -158,7 +158,7 @@ glabel func_80248BF4
 /* 16968C 80248E2C 00400008 */  jr        $v0
 /* 169690 80248E30 00000000 */   nop
 glabel L80248E34_169694
-/* 169694 80248E34 0C05272D */  jal       play_sound
+/* 169694 80248E34 0C05272D */  jal       sfx_play_sound
 /* 169698 80248E38 24042103 */   addiu    $a0, $zero, 0x2103
 /* 16969C 80248E3C 3C048025 */  lui       $a0, %hi(D_8024C090)
 /* 1696A0 80248E40 2484C090 */  addiu     $a0, $a0, %lo(D_8024C090)
@@ -176,7 +176,7 @@ glabel L80248E64_1696C4
 /* 1696C8 80248E68 24110001 */  addiu     $s1, $zero, 1
 /* 1696CC 80248E6C 10510071 */  beq       $v0, $s1, L80249034_169894
 /* 1696D0 80248E70 00000000 */   nop
-/* 1696D4 80248E74 0C05272D */  jal       play_sound
+/* 1696D4 80248E74 0C05272D */  jal       sfx_play_sound
 /* 1696D8 80248E78 24042105 */   addiu    $a0, $zero, 0x2105
 /* 1696DC 80248E7C 82050001 */  lb        $a1, 1($s0)
 /* 1696E0 80248E80 82060002 */  lb        $a2, 2($s0)
@@ -187,7 +187,7 @@ glabel L80248E90_1696F0
 /* 1696F0 80248E90 82020004 */  lb        $v0, 4($s0)
 /* 1696F4 80248E94 10400067 */  beqz      $v0, L80249034_169894
 /* 1696F8 80248E98 00000000 */   nop
-/* 1696FC 80248E9C 0C05272D */  jal       play_sound
+/* 1696FC 80248E9C 0C05272D */  jal       sfx_play_sound
 /* 169700 80248EA0 24042105 */   addiu    $a0, $zero, 0x2105
 /* 169704 80248EA4 82050001 */  lb        $a1, 1($s0)
 /* 169708 80248EA8 82060002 */  lb        $a2, 2($s0)
@@ -220,12 +220,12 @@ glabel L80248ED4_169734
 .L80248F08:
 /* 169768 80248F08 14620005 */  bne       $v1, $v0, .L80248F20
 /* 16976C 80248F0C 00000000 */   nop
-/* 169770 80248F10 0C05272D */  jal       play_sound
+/* 169770 80248F10 0C05272D */  jal       sfx_play_sound
 /* 169774 80248F14 2404021D */   addiu    $a0, $zero, 0x21d
 /* 169778 80248F18 0809240D */  j         L80249034_169894
 /* 16977C 80248F1C 00000000 */   nop
 .L80248F20:
-/* 169780 80248F20 0C05272D */  jal       play_sound
+/* 169780 80248F20 0C05272D */  jal       sfx_play_sound
 /* 169784 80248F24 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 169788 80248F28 3C058024 */  lui       $a1, %hi(func_80243CCC)
 /* 16978C 80248F2C 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
@@ -272,7 +272,7 @@ glabel L80248ED4_169734
 /* 169828 80248FC8 080924B9 */  j         .L802492E4
 /* 16982C 80248FCC 2403004E */   addiu    $v1, $zero, 0x4e
 .L80248FD0:
-/* 169830 80248FD0 0C05272D */  jal       play_sound
+/* 169830 80248FD0 0C05272D */  jal       sfx_play_sound
 /* 169834 80248FD4 24042103 */   addiu    $a0, $zero, 0x2103
 /* 169838 80248FD8 3C048025 */  lui       $a0, %hi(D_8024C090)
 /* 16983C 80248FDC 2484C090 */  addiu     $a0, $a0, %lo(D_8024C090)
@@ -327,7 +327,7 @@ glabel L80249034_169894
 /* 1698F0 80249090 14620048 */  bne       $v1, $v0, .L802491B4
 /* 1698F4 80249094 00000000 */   nop
 .L80249098:
-/* 1698F8 80249098 0C05272D */  jal       play_sound
+/* 1698F8 80249098 0C05272D */  jal       sfx_play_sound
 /* 1698FC 8024909C 24042104 */   addiu    $a0, $zero, 0x2104
 /* 169900 802490A0 3C038025 */  lui       $v1, %hi(D_8024C090)
 /* 169904 802490A4 2463C090 */  addiu     $v1, $v1, %lo(D_8024C090)
@@ -422,12 +422,12 @@ glabel L80249034_169894
 .L802491F8:
 /* 169A58 802491F8 14620005 */  bne       $v1, $v0, .L80249210
 /* 169A5C 802491FC 00000000 */   nop
-/* 169A60 80249200 0C05272D */  jal       play_sound
+/* 169A60 80249200 0C05272D */  jal       sfx_play_sound
 /* 169A64 80249204 2404021D */   addiu    $a0, $zero, 0x21d
 /* 169A68 80249208 080924C4 */  j         .L80249310
 /* 169A6C 8024920C 00000000 */   nop
 .L80249210:
-/* 169A70 80249210 0C05272D */  jal       play_sound
+/* 169A70 80249210 0C05272D */  jal       sfx_play_sound
 /* 169A74 80249214 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 169A78 80249218 3C058024 */  lui       $a1, %hi(func_80243CCC)
 /* 169A7C 8024921C 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80244008.s b/ver/us/asm/nonmatchings/code_16F740/func_80244008.s
index f68bcd5e15..77d2c979c2 100644
--- a/ver/us/asm/nonmatchings/code_16F740/func_80244008.s
+++ b/ver/us/asm/nonmatchings/code_16F740/func_80244008.s
@@ -464,7 +464,7 @@ glabel func_80244008
 /* 172F8C 802446AC 0000202D */  daddu     $a0, $zero, $zero
 /* 172F90 802446B0 2405FFFF */  addiu     $a1, $zero, -1
 /* 172F94 802446B4 0080302D */  daddu     $a2, $a0, $zero
-/* 172F98 802446B8 0C052A46 */  jal       set_music_track
+/* 172F98 802446B8 0C052A46 */  jal       bgm_set_song
 /* 172F9C 802446BC 240705DC */   addiu    $a3, $zero, 0x5dc
 /* 172FA0 802446C0 080911B3 */  j         .L802446CC
 /* 172FA4 802446C4 24040020 */   addiu    $a0, $zero, 0x20
diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80244710.s b/ver/us/asm/nonmatchings/code_16F740/func_80244710.s
index 952378ec1c..12db6af04d 100644
--- a/ver/us/asm/nonmatchings/code_16F740/func_80244710.s
+++ b/ver/us/asm/nonmatchings/code_16F740/func_80244710.s
@@ -211,7 +211,7 @@ glabel func_80244710
 /* 1732E8 80244A08 0000202D */  daddu     $a0, $zero, $zero
 /* 1732EC 80244A0C 2405FFFF */  addiu     $a1, $zero, -1
 /* 1732F0 80244A10 0080302D */  daddu     $a2, $a0, $zero
-/* 1732F4 80244A14 0C052A46 */  jal       set_music_track
+/* 1732F4 80244A14 0C052A46 */  jal       bgm_set_song
 /* 1732F8 80244A18 240705DC */   addiu    $a3, $zero, 0x5dc
 .L80244A1C:
 /* 1732FC 80244A1C 0C090464 */  jal       func_80241190
diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80245440.s b/ver/us/asm/nonmatchings/code_16F740/func_80245440.s
index cb945e63d7..6bee64a2d9 100644
--- a/ver/us/asm/nonmatchings/code_16F740/func_80245440.s
+++ b/ver/us/asm/nonmatchings/code_16F740/func_80245440.s
@@ -48,7 +48,7 @@ glabel func_80245440
 /* 173DC4 802454E4 24020007 */   addiu    $v0, $zero, 7
 /* 173DC8 802454E8 14620008 */  bne       $v1, $v0, .L8024550C
 /* 173DCC 802454EC 00000000 */   nop
-/* 173DD0 802454F0 0C05272D */  jal       play_sound
+/* 173DD0 802454F0 0C05272D */  jal       sfx_play_sound
 /* 173DD4 802454F4 240400E7 */   addiu    $a0, $zero, 0xe7
 /* 173DD8 802454F8 8E030228 */  lw        $v1, 0x228($s0)
 /* 173DDC 802454FC 8C620000 */  lw        $v0, ($v1)
@@ -156,7 +156,7 @@ glabel func_80245440
 /* 173F58 80245678 0000202D */  daddu     $a0, $zero, $zero
 /* 173F5C 8024567C 2405FFFF */  addiu     $a1, $zero, -1
 /* 173F60 80245680 0080302D */  daddu     $a2, $a0, $zero
-/* 173F64 80245684 0C052A46 */  jal       set_music_track
+/* 173F64 80245684 0C052A46 */  jal       bgm_set_song
 /* 173F68 80245688 240705DC */   addiu    $a3, $zero, 0x5dc
 .L8024568C:
 /* 173F6C 8024568C 0C090464 */  jal       func_80241190
diff --git a/ver/us/asm/nonmatchings/code_16F740/update_heroes_start_turn.s b/ver/us/asm/nonmatchings/code_16F740/update_heroes_start_turn.s
index 7e2e35dc38..23a6283668 100644
--- a/ver/us/asm/nonmatchings/code_16F740/update_heroes_start_turn.s
+++ b/ver/us/asm/nonmatchings/code_16F740/update_heroes_start_turn.s
@@ -206,7 +206,7 @@ glabel update_heroes_start_turn
 /* 170C14 80242334 0C01C70C */  jal       func_80071C30
 /* 170C18 80242338 AFB00014 */   sw       $s0, 0x14($sp)
 /* 170C1C 8024233C 24040299 */  addiu     $a0, $zero, 0x299
-/* 170C20 80242340 0C05272D */  jal       play_sound
+/* 170C20 80242340 0C05272D */  jal       sfx_play_sound
 /* 170C24 80242344 AE6000A0 */   sw       $zero, 0xa0($s3)
 /* 170C28 80242348 24040027 */  addiu     $a0, $zero, 0x27
 /* 170C2C 8024234C 0C093E58 */  jal       show_battle_message
@@ -519,7 +519,7 @@ glabel update_heroes_start_turn
 /* 171078 80242798 82230210 */  lb        $v1, 0x210($s1)
 /* 17107C 8024279C 14620009 */  bne       $v1, $v0, .L802427C4
 /* 171080 802427A0 24040031 */   addiu    $a0, $zero, 0x31
-/* 171084 802427A4 0C05272D */  jal       play_sound
+/* 171084 802427A4 0C05272D */  jal       sfx_play_sound
 /* 171088 802427A8 240400E7 */   addiu    $a0, $zero, 0xe7
 /* 17108C 802427AC 8E230228 */  lw        $v1, 0x228($s1)
 /* 171090 802427B0 8C620000 */  lw        $v0, ($v1)
diff --git a/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s b/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s
index d98f44e0f2..96cb38eacd 100644
--- a/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s
+++ b/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s
@@ -430,7 +430,7 @@ glabel L802470F4_1759D4
 /* 1759E4 80247104 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
 /* 1759E8 80247108 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
 .L8024710C:
-/* 1759EC 8024710C 0C05272D */  jal       play_sound
+/* 1759EC 8024710C 0C05272D */  jal       sfx_play_sound
 /* 1759F0 80247110 24042107 */   addiu    $a0, $zero, 0x2107
 /* 1759F4 80247114 0200202D */  daddu     $a0, $s0, $zero
 /* 1759F8 80247118 0C093E58 */  jal       show_battle_message
diff --git a/ver/us/asm/nonmatchings/code_16F740/update_player_action.s b/ver/us/asm/nonmatchings/code_16F740/update_player_action.s
index 02c3a68141..8306e9d4d6 100644
--- a/ver/us/asm/nonmatchings/code_16F740/update_player_action.s
+++ b/ver/us/asm/nonmatchings/code_16F740/update_player_action.s
@@ -516,7 +516,7 @@ glabel L802461CC_174AAC
 /* 174ABC 802461DC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
 /* 174AC0 802461E0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
 .L802461E4:
-/* 174AC4 802461E4 0C05272D */  jal       play_sound
+/* 174AC4 802461E4 0C05272D */  jal       sfx_play_sound
 /* 174AC8 802461E8 24042107 */   addiu    $a0, $zero, 0x2107
 /* 174ACC 802461EC 0200202D */  daddu     $a0, $s0, $zero
 /* 174AD0 802461F0 0C093E58 */  jal       show_battle_message
diff --git a/ver/us/asm/nonmatchings/code_16F740/update_run_away.s b/ver/us/asm/nonmatchings/code_16F740/update_run_away.s
index 534331536c..10543b5001 100644
--- a/ver/us/asm/nonmatchings/code_16F740/update_run_away.s
+++ b/ver/us/asm/nonmatchings/code_16F740/update_run_away.s
@@ -215,7 +215,7 @@ glabel update_run_away
 /* 173AF4 80245214 00828023 */  subu      $s0, $a0, $v0
 /* 173AF8 80245218 1A000003 */  blez      $s0, .L80245228
 /* 173AFC 8024521C A2230078 */   sb       $v1, 0x78($s1)
-/* 173B00 80245220 0C05272D */  jal       play_sound
+/* 173B00 80245220 0C05272D */  jal       sfx_play_sound
 /* 173B04 80245224 24040211 */   addiu    $a0, $zero, 0x211
 .L80245228:
 /* 173B08 80245228 92A20010 */  lbu       $v0, 0x10($s5)
@@ -279,7 +279,7 @@ glabel update_run_away
 /* 173BDC 802452FC 0000202D */  daddu     $a0, $zero, $zero
 /* 173BE0 80245300 2405FFFF */  addiu     $a1, $zero, -1
 /* 173BE4 80245304 0080302D */  daddu     $a2, $a0, $zero
-/* 173BE8 80245308 0C052A46 */  jal       set_music_track
+/* 173BE8 80245308 0C052A46 */  jal       bgm_set_song
 /* 173BEC 8024530C 240705DC */   addiu    $a3, $zero, 0x5dc
 .L80245310:
 /* 173BF0 80245310 0C090464 */  jal       func_80241190
diff --git a/ver/us/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s b/ver/us/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s
index 3dacbfccfe..fc56c95a77 100644
--- a/ver/us/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s
+++ b/ver/us/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s
@@ -154,7 +154,7 @@ glabel calc_item_damage_enemy
 /* 1801F0 80251910 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1801F4 80251914 8E26000C */  lw        $a2, 0xc($s1)
 /* 1801F8 80251918 8E270010 */  lw        $a3, 0x10($s1)
-/* 1801FC 8025191C 0C052757 */  jal       play_sound_at_position
+/* 1801FC 8025191C 0C052757 */  jal       sfx_play_sound_at_position
 /* 180200 80251920 0000282D */   daddu    $a1, $zero, $zero
 /* 180204 80251924 24020001 */  addiu     $v0, $zero, 1
 /* 180208 80251928 AFA20010 */  sw        $v0, 0x10($sp)
@@ -225,7 +225,7 @@ glabel calc_item_damage_enemy
 /* 1802F8 80251A18 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1802FC 80251A1C 8E26000C */  lw        $a2, 0xc($s1)
 /* 180300 80251A20 8E270010 */  lw        $a3, 0x10($s1)
-/* 180304 80251A24 0C052757 */  jal       play_sound_at_position
+/* 180304 80251A24 0C052757 */  jal       sfx_play_sound_at_position
 /* 180308 80251A28 0000282D */   daddu    $a1, $zero, $zero
 /* 18030C 80251A2C 080946B0 */  j         .L80251AC0
 /* 180310 80251A30 A6800180 */   sh       $zero, 0x180($s4)
@@ -288,7 +288,7 @@ glabel calc_item_damage_enemy
 /* 1803E4 80251B04 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1803E8 80251B08 8E26000C */  lw        $a2, 0xc($s1)
 /* 1803EC 80251B0C 8E270010 */  lw        $a3, 0x10($s1)
-/* 1803F0 80251B10 0C052757 */  jal       play_sound_at_position
+/* 1803F0 80251B10 0C052757 */  jal       sfx_play_sound_at_position
 /* 1803F4 80251B14 0000282D */   daddu    $a1, $zero, $zero
 /* 1803F8 80251B18 080949BE */  j         .L802526F8
 /* 1803FC 80251B1C 24020002 */   addiu    $v0, $zero, 2
@@ -682,7 +682,7 @@ glabel calc_item_damage_enemy
 /* 180970 80252090 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180974 80252094 8E26000C */  lw        $a2, 0xc($s1)
 /* 180978 80252098 8E270010 */  lw        $a3, 0x10($s1)
-/* 18097C 8025209C 0C052757 */  jal       play_sound_at_position
+/* 18097C 8025209C 0C052757 */  jal       sfx_play_sound_at_position
 /* 180980 802520A0 03C0282D */   daddu    $a1, $fp, $zero
 /* 180984 802520A4 8EC20000 */  lw        $v0, ($s6)
 /* 180988 802520A8 24150001 */  addiu     $s5, $zero, 1
@@ -719,7 +719,7 @@ glabel calc_item_damage_enemy
 /* 1809F0 80252110 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1809F4 80252114 8E26000C */  lw        $a2, 0xc($s1)
 /* 1809F8 80252118 8E270010 */  lw        $a3, 0x10($s1)
-/* 1809FC 8025211C 0C052757 */  jal       play_sound_at_position
+/* 1809FC 8025211C 0C052757 */  jal       sfx_play_sound_at_position
 /* 180A00 80252120 0000282D */   daddu    $a1, $zero, $zero
 /* 180A04 80252124 86820180 */  lh        $v0, 0x180($s4)
 /* 180A08 80252128 1C400009 */  bgtz      $v0, .L80252150
@@ -869,7 +869,7 @@ glabel calc_item_damage_enemy
 .L80252330:
 /* 180C10 80252330 8E26000C */  lw        $a2, 0xc($s1)
 /* 180C14 80252334 8E270010 */  lw        $a3, 0x10($s1)
-/* 180C18 80252338 0C052757 */  jal       play_sound_at_position
+/* 180C18 80252338 0C052757 */  jal       sfx_play_sound_at_position
 /* 180C1C 8025233C 0000282D */   daddu    $a1, $zero, $zero
 /* 180C20 80252340 86820180 */  lh        $v0, 0x180($s4)
 .L80252344:
@@ -889,7 +889,7 @@ glabel calc_item_damage_enemy
 /* 180C4C 8025236C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180C50 80252370 8E26000C */  lw        $a2, 0xc($s1)
 /* 180C54 80252374 8E270010 */  lw        $a3, 0x10($s1)
-/* 180C58 80252378 0C052757 */  jal       play_sound_at_position
+/* 180C58 80252378 0C052757 */  jal       sfx_play_sound_at_position
 /* 180C5C 8025237C 0000282D */   daddu    $a1, $zero, $zero
 .L80252380:
 /* 180C60 80252380 8E820190 */  lw        $v0, 0x190($s4)
@@ -917,7 +917,7 @@ glabel calc_item_damage_enemy
 /* 180CB8 802523D8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180CBC 802523DC 8E26000C */  lw        $a2, 0xc($s1)
 /* 180CC0 802523E0 8E270010 */  lw        $a3, 0x10($s1)
-/* 180CC4 802523E4 0C052757 */  jal       play_sound_at_position
+/* 180CC4 802523E4 0C052757 */  jal       sfx_play_sound_at_position
 /* 180CC8 802523E8 0000282D */   daddu    $a1, $zero, $zero
 .L802523EC:
 /* 180CCC 802523EC 8E820190 */  lw        $v0, 0x190($s4)
@@ -946,7 +946,7 @@ glabel calc_item_damage_enemy
 /* 180D28 80252448 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180D2C 8025244C 8E26000C */  lw        $a2, 0xc($s1)
 /* 180D30 80252450 8E270010 */  lw        $a3, 0x10($s1)
-/* 180D34 80252454 0C052757 */  jal       play_sound_at_position
+/* 180D34 80252454 0C052757 */  jal       sfx_play_sound_at_position
 /* 180D38 80252458 0000282D */   daddu    $a1, $zero, $zero
 .L8025245C:
 /* 180D3C 8025245C 8E820190 */  lw        $v0, 0x190($s4)
@@ -975,7 +975,7 @@ glabel calc_item_damage_enemy
 /* 180D98 802524B8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180D9C 802524BC 8E26000C */  lw        $a2, 0xc($s1)
 /* 180DA0 802524C0 8E270010 */  lw        $a3, 0x10($s1)
-/* 180DA4 802524C4 0C052757 */  jal       play_sound_at_position
+/* 180DA4 802524C4 0C052757 */  jal       sfx_play_sound_at_position
 /* 180DA8 802524C8 0000282D */   daddu    $a1, $zero, $zero
 .L802524CC:
 /* 180DAC 802524CC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1004,7 +1004,7 @@ glabel calc_item_damage_enemy
 /* 180E08 80252528 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180E0C 8025252C 8E26000C */  lw        $a2, 0xc($s1)
 /* 180E10 80252530 8E270010 */  lw        $a3, 0x10($s1)
-/* 180E14 80252534 0C052757 */  jal       play_sound_at_position
+/* 180E14 80252534 0C052757 */  jal       sfx_play_sound_at_position
 /* 180E18 80252538 0000282D */   daddu    $a1, $zero, $zero
 .L8025253C:
 /* 180E1C 8025253C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1033,7 +1033,7 @@ glabel calc_item_damage_enemy
 /* 180E78 80252598 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180E7C 8025259C 8E26000C */  lw        $a2, 0xc($s1)
 /* 180E80 802525A0 8E270010 */  lw        $a3, 0x10($s1)
-/* 180E84 802525A4 0C052757 */  jal       play_sound_at_position
+/* 180E84 802525A4 0C052757 */  jal       sfx_play_sound_at_position
 /* 180E88 802525A8 0000282D */   daddu    $a1, $zero, $zero
 .L802525AC:
 /* 180E8C 802525AC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1062,7 +1062,7 @@ glabel calc_item_damage_enemy
 /* 180EE8 80252608 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180EEC 8025260C 8E26000C */  lw        $a2, 0xc($s1)
 /* 180EF0 80252610 8E270010 */  lw        $a3, 0x10($s1)
-/* 180EF4 80252614 0C052757 */  jal       play_sound_at_position
+/* 180EF4 80252614 0C052757 */  jal       sfx_play_sound_at_position
 /* 180EF8 80252618 0000282D */   daddu    $a1, $zero, $zero
 .L8025261C:
 /* 180EFC 8025261C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1092,7 +1092,7 @@ glabel calc_item_damage_enemy
 /* 180F5C 8025267C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180F60 80252680 8E26000C */  lw        $a2, 0xc($s1)
 /* 180F64 80252684 8E270010 */  lw        $a3, 0x10($s1)
-/* 180F68 80252688 0C052757 */  jal       play_sound_at_position
+/* 180F68 80252688 0C052757 */  jal       sfx_play_sound_at_position
 /* 180F6C 8025268C 0000282D */   daddu    $a1, $zero, $zero
 .L80252690:
 /* 180F70 80252690 8E820188 */  lw        $v0, 0x188($s4)
@@ -1106,7 +1106,7 @@ glabel calc_item_damage_enemy
 /* 180F90 802526B0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 180F94 802526B4 8E26000C */  lw        $a2, 0xc($s1)
 /* 180F98 802526B8 8E270010 */  lw        $a3, 0x10($s1)
-/* 180F9C 802526BC 0C052757 */  jal       play_sound_at_position
+/* 180F9C 802526BC 0C052757 */  jal       sfx_play_sound_at_position
 /* 180FA0 802526C0 0000282D */   daddu    $a1, $zero, $zero
 .L802526C4:
 /* 180FA4 802526C4 0C099AB7 */  jal       func_80266ADC
diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s b/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s
index 7cb7af1480..398e1cce29 100644
--- a/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s
+++ b/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s
@@ -62,7 +62,7 @@ glabel L8025E1FC_18CADC
 /* 18CB34 8025E254 00021080 */  sll       $v0, $v0, 2
 /* 18CB38 8025E258 3C01802A */  lui       $at, %hi(D_8029FB6C)
 /* 18CB3C 8025E25C AC22FB6C */  sw        $v0, %lo(D_8029FB6C)($at)
-/* 18CB40 8025E260 0C05272D */  jal       play_sound
+/* 18CB40 8025E260 0C05272D */  jal       sfx_play_sound
 /* 18CB44 8025E264 240400D4 */   addiu    $a0, $zero, 0xd4
 /* 18CB48 8025E268 82A30010 */  lb        $v1, 0x10($s5)
 /* 18CB4C 8025E26C 83C20078 */  lb        $v0, 0x78($fp)
@@ -80,7 +80,7 @@ glabel L8025E1FC_18CADC
 /* 18CB78 8025E298 2405008B */  addiu     $a1, $zero, 0x8b
 .L8025E29C:
 /* 18CB7C 8025E29C 0080302D */  daddu     $a2, $a0, $zero
-/* 18CB80 8025E2A0 0C052A46 */  jal       set_music_track
+/* 18CB80 8025E2A0 0C052A46 */  jal       bgm_set_song
 /* 18CB84 8025E2A4 240700FA */   addiu    $a3, $zero, 0xfa
 /* 18CB88 8025E2A8 3C01802A */  lui       $at, %hi(D_8029FB84)
 /* 18CB8C 8025E2AC AC20FB84 */  sw        $zero, %lo(D_8029FB84)($at)
@@ -187,7 +187,7 @@ glabel L8025E3C8_18CCA8
 /* 18CD0C 8025E42C 00A28023 */  subu      $s0, $a1, $v0
 /* 18CD10 8025E430 1A000003 */  blez      $s0, .L8025E440
 /* 18CD14 8025E434 00000000 */   nop
-/* 18CD18 8025E438 0C05272D */  jal       play_sound
+/* 18CD18 8025E438 0C05272D */  jal       sfx_play_sound
 /* 18CD1C 8025E43C 24040215 */   addiu    $a0, $zero, 0x215
 .L8025E440:
 /* 18CD20 8025E440 92A20010 */  lbu       $v0, 0x10($s5)
@@ -316,7 +316,7 @@ glabel L8025E5C0_18CEA0
 /* 18CEEC 8025E60C 0C00A5CF */  jal       dma_copy
 /* 18CEF0 8025E610 00000000 */   nop
 /* 18CEF4 8025E614 3C048000 */  lui       $a0, 0x8000
-/* 18CEF8 8025E618 0C05272D */  jal       play_sound
+/* 18CEF8 8025E618 0C05272D */  jal       sfx_play_sound
 /* 18CEFC 8025E61C 34840008 */   ori      $a0, $a0, 8
 /* 18CF00 8025E620 24020005 */  addiu     $v0, $zero, 5
 /* 18CF04 8025E624 08097FD0 */  j         .L8025FF40
@@ -1510,14 +1510,14 @@ glabel L8025F824_18E104
 /* 18E124 8025F844 8C22FB60 */  lw        $v0, %lo(D_8029FB60)($at)
 /* 18E128 8025F848 14400007 */  bnez      $v0, .L8025F868
 /* 18E12C 8025F84C 00000000 */   nop
-/* 18E130 8025F850 0C05272D */  jal       play_sound
+/* 18E130 8025F850 0C05272D */  jal       sfx_play_sound
 /* 18E134 8025F854 240400C9 */   addiu    $a0, $zero, 0xc9
-/* 18E138 8025F858 0C05272D */  jal       play_sound
+/* 18E138 8025F858 0C05272D */  jal       sfx_play_sound
 /* 18E13C 8025F85C 24040749 */   addiu    $a0, $zero, 0x749
 /* 18E140 8025F860 08097FD0 */  j         .L8025FF40
 /* 18E144 8025F864 24020009 */   addiu    $v0, $zero, 9
 .L8025F868:
-/* 18E148 8025F868 0C05272D */  jal       play_sound
+/* 18E148 8025F868 0C05272D */  jal       sfx_play_sound
 /* 18E14C 8025F86C 2404021D */   addiu    $a0, $zero, 0x21d
 /* 18E150 8025F870 08097FD0 */  j         .L8025FF40
 /* 18E154 8025F874 2402000F */   addiu    $v0, $zero, 0xf
@@ -1546,7 +1546,7 @@ glabel L8025F824_18E104
 /* 18E19C 8025F8BC 00041603 */  sra       $v0, $a0, 0x18
 /* 18E1A0 8025F8C0 12020004 */  beq       $s0, $v0, .L8025F8D4
 /* 18E1A4 8025F8C4 00000000 */   nop
-/* 18E1A8 8025F8C8 0C05272D */  jal       play_sound
+/* 18E1A8 8025F8C8 0C05272D */  jal       sfx_play_sound
 /* 18E1AC 8025F8CC 240400C7 */   addiu    $a0, $zero, 0xc7
 /* 18E1B0 8025F8D0 A3D00048 */  sb        $s0, 0x48($fp)
 .L8025F8D4:
@@ -1686,7 +1686,7 @@ glabel L8025F924_18E204
 /* 18E398 8025FAB8 0000202D */  daddu     $a0, $zero, $zero
 /* 18E39C 8025FABC 2405FFFF */  addiu     $a1, $zero, -1
 /* 18E3A0 8025FAC0 0080302D */  daddu     $a2, $a0, $zero
-/* 18E3A4 8025FAC4 0C052A46 */  jal       set_music_track
+/* 18E3A4 8025FAC4 0C052A46 */  jal       bgm_set_song
 /* 18E3A8 8025FAC8 240707D0 */   addiu    $a3, $zero, 0x7d0
 .L8025FACC:
 /* 18E3AC 8025FACC 3C018028 */  lui       $at, %hi(D_80284150)
@@ -1905,7 +1905,7 @@ glabel L8025FD7C_18E65C
 /* 18E6A4 8025FDC4 0000202D */  daddu     $a0, $zero, $zero
 /* 18E6A8 8025FDC8 2405FFFF */  addiu     $a1, $zero, -1
 /* 18E6AC 8025FDCC 0080302D */  daddu     $a2, $a0, $zero
-/* 18E6B0 8025FDD0 0C052A46 */  jal       set_music_track
+/* 18E6B0 8025FDD0 0C052A46 */  jal       bgm_set_song
 /* 18E6B4 8025FDD4 240705DC */   addiu    $a3, $zero, 0x5dc
 /* 18E6B8 8025FDD8 24040001 */  addiu     $a0, $zero, 1
 .L8025FDDC:
diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80260B70.s b/ver/us/asm/nonmatchings/code_18F340/func_80260B70.s
index 4c91d58013..41eff556a6 100644
--- a/ver/us/asm/nonmatchings/code_18F340/func_80260B70.s
+++ b/ver/us/asm/nonmatchings/code_18F340/func_80260B70.s
@@ -20,7 +20,7 @@ glabel func_80260B70
 /* 18F48C 80260BAC 44072000 */  mfc1      $a3, $f4
 /* 18F490 80260BB0 0C0999FC */  jal       func_802667F0
 /* 18F494 80260BB4 0200282D */   daddu    $a1, $s0, $zero
-/* 18F498 80260BB8 0C05272D */  jal       play_sound
+/* 18F498 80260BB8 0C05272D */  jal       sfx_play_sound
 /* 18F49C 80260BBC 240403FC */   addiu    $a0, $zero, 0x3fc
 /* 18F4A0 80260BC0 AE200084 */  sw        $zero, 0x84($s1)
 /* 18F4A4 80260BC4 92020210 */  lbu       $v0, 0x210($s0)
diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261648.s b/ver/us/asm/nonmatchings/code_18F340/func_80261648.s
index 99e60b3eef..b64b4c3cec 100644
--- a/ver/us/asm/nonmatchings/code_18F340/func_80261648.s
+++ b/ver/us/asm/nonmatchings/code_18F340/func_80261648.s
@@ -11,7 +11,7 @@ glabel func_80261648
 /* 18FF40 80261660 AFB10014 */   sw       $s1, 0x14($sp)
 /* 18FF44 80261664 12000004 */  beqz      $s0, .L80261678
 /* 18FF48 80261668 0040882D */   daddu    $s1, $v0, $zero
-/* 18FF4C 8026166C 0C05272D */  jal       play_sound
+/* 18FF4C 8026166C 0C05272D */  jal       sfx_play_sound
 /* 18FF50 80261670 2404024B */   addiu    $a0, $zero, 0x24b
 /* 18FF54 80261674 A22000AC */  sb        $zero, 0xac($s1)
 .L80261678:
diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802616F4.s b/ver/us/asm/nonmatchings/code_18F340/func_802616F4.s
index 5581b2753c..5675ad9b58 100644
--- a/ver/us/asm/nonmatchings/code_18F340/func_802616F4.s
+++ b/ver/us/asm/nonmatchings/code_18F340/func_802616F4.s
@@ -53,7 +53,7 @@ glabel func_802616F4
 /* 190078 80261798 A420FBA4 */  sh        $zero, %lo(D_8029FBA4)($at)
 /* 19007C 8026179C 3C01802A */  lui       $at, %hi(D_8029FB90)
 /* 190080 802617A0 AC22FB90 */  sw        $v0, %lo(D_8029FB90)($at)
-/* 190084 802617A4 0C05272D */  jal       play_sound
+/* 190084 802617A4 0C05272D */  jal       sfx_play_sound
 /* 190088 802617A8 24042074 */   addiu    $a0, $zero, 0x2074
 .L802617AC:
 /* 19008C 802617AC 3C0140C9 */  lui       $at, 0x40c9
diff --git a/ver/us/asm/nonmatchings/code_190B20/func_8026777C.s b/ver/us/asm/nonmatchings/code_190B20/func_8026777C.s
index 55d1c99bf0..0885dcdda7 100644
--- a/ver/us/asm/nonmatchings/code_190B20/func_8026777C.s
+++ b/ver/us/asm/nonmatchings/code_190B20/func_8026777C.s
@@ -22,7 +22,7 @@ glabel func_8026777C
 /* 1960A0 802677C0 8C63000C */  lw        $v1, 0xc($v1)
 /* 1960A4 802677C4 14A00003 */  bnez      $a1, .L802677D4
 /* 1960A8 802677C8 AC62003C */   sw       $v0, 0x3c($v1)
-/* 1960AC 802677CC 0C05272D */  jal       play_sound
+/* 1960AC 802677CC 0C05272D */  jal       sfx_play_sound
 /* 1960B0 802677D0 24042107 */   addiu    $a0, $zero, 0x2107
 .L802677D4:
 /* 1960B4 802677D4 12000012 */  beqz      $s0, .L80267820
diff --git a/ver/us/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s b/ver/us/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s
index 331c148628..7d2af9f4fc 100644
--- a/ver/us/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s
+++ b/ver/us/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s
@@ -20,7 +20,7 @@ glabel CloseActionCommandInfo
 /* 197D28 80269448 0000102D */   daddu    $v0, $zero, $zero
 .L8026944C:
 /* 197D2C 8026944C 3C048000 */  lui       $a0, 0x8000
-/* 197D30 80269450 0C05271B */  jal       stop_sound
+/* 197D30 80269450 0C05271B */  jal       sfx_stop_sound
 /* 197D34 80269454 34840041 */   ori      $a0, $a0, 0x41
 /* 197D38 80269458 0C093EC3 */  jal       close_action_command_instruction_popup
 /* 197D3C 8026945C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s b/ver/us/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s
index dd24334abe..eb414c3ba2 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s
@@ -161,7 +161,7 @@ glabel CancelablePlayerRunToGoal
 .L80274150:
 /* 1A2A30 80274150 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A2A34 80274154 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A2A38 80274158 0C052757 */  jal       play_sound_at_position
+/* 1A2A38 80274158 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A2A3C 8027415C 0000282D */   daddu    $a1, $zero, $zero
 .L80274160:
 /* 1A2A40 80274160 8E62007C */  lw        $v0, 0x7c($s3)
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s b/ver/us/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s
index 4364dd2180..e43b039acb 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s
@@ -148,7 +148,7 @@ glabel PlayerFallToGoal
 /* 1A239C 80273ABC E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A23A0 80273AC0 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A23A4 80273AC4 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A23A8 80273AC8 0C052757 */  jal       play_sound_at_position
+/* 1A23A8 80273AC8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A23AC 80273ACC 0000282D */   daddu    $a1, $zero, $zero
 /* 1A23B0 80273AD0 24020001 */  addiu     $v0, $zero, 1
 .L80273AD4:
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerLandJump.s b/ver/us/asm/nonmatchings/code_19FAF0/PlayerLandJump.s
index 37fd99e455..96d71aae79 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/PlayerLandJump.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/PlayerLandJump.s
@@ -87,7 +87,7 @@ glabel PlayerLandJump
 /* 1A2518 80273C38 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A251C 80273C3C 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A2520 80273C40 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A2524 80273C44 0C052757 */  jal       play_sound_at_position
+/* 1A2524 80273C44 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A2528 80273C48 0000282D */   daddu    $a1, $zero, $zero
 /* 1A252C 80273C4C 24020001 */  addiu     $v0, $zero, 1
 .L80273C50:
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s b/ver/us/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s
index 1d944045c5..b45f859291 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s
@@ -154,7 +154,7 @@ glabel PlayerRunToGoal
 .L80273E98:
 /* 1A2778 80273E98 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A277C 80273E9C 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A2780 80273EA0 0C052757 */  jal       play_sound_at_position
+/* 1A2780 80273EA0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A2784 80273EA4 0000282D */   daddu    $a1, $zero, $zero
 .L80273EA8:
 /* 1A2788 80273EA8 96220064 */  lhu       $v0, 0x64($s1)
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s b/ver/us/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s
index 3609da75a9..aae0efbdbf 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s
@@ -105,7 +105,7 @@ glabel calc_player_damage_enemy
 /* 1A037C 80271A9C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0380 80271AA0 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A0384 80271AA4 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A0388 80271AA8 0C052757 */  jal       play_sound_at_position
+/* 1A0388 80271AA8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A038C 80271AAC 0000282D */   daddu    $a1, $zero, $zero
 /* 1A0390 80271AB0 24020001 */  addiu     $v0, $zero, 1
 /* 1A0394 80271AB4 AFA20010 */  sw        $v0, 0x10($sp)
@@ -159,7 +159,7 @@ glabel calc_player_damage_enemy
 /* 1A0448 80271B68 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A044C 80271B6C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A0450 80271B70 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A0454 80271B74 0C052757 */  jal       play_sound_at_position
+/* 1A0454 80271B74 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A0458 80271B78 0000282D */   daddu    $a1, $zero, $zero
 /* 1A045C 80271B7C 24040001 */  addiu     $a0, $zero, 1
 /* 1A0460 80271B80 0C09CCEA */  jal       dispatch_damage_event_player_1
@@ -189,7 +189,7 @@ glabel calc_player_damage_enemy
 /* 1A04BC 80271BDC E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A04C0 80271BE0 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A04C4 80271BE4 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A04C8 80271BE8 0C052757 */  jal       play_sound_at_position
+/* 1A04C8 80271BE8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A04CC 80271BEC 0000282D */   daddu    $a1, $zero, $zero
 /* 1A04D0 80271BF0 24040001 */  addiu     $a0, $zero, 1
 /* 1A04D4 80271BF4 0C09CCEA */  jal       dispatch_damage_event_player_1
@@ -216,7 +216,7 @@ glabel calc_player_damage_enemy
 /* 1A0524 80271C44 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0528 80271C48 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A052C 80271C4C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A0530 80271C50 0C052757 */  jal       play_sound_at_position
+/* 1A0530 80271C50 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A0534 80271C54 0000282D */   daddu    $a1, $zero, $zero
 /* 1A0538 80271C58 0260202D */  daddu     $a0, $s3, $zero
 /* 1A053C 80271C5C 0809C95F */  j         .L8027257C
@@ -246,7 +246,7 @@ glabel calc_player_damage_enemy
 /* 1A0594 80271CB4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0598 80271CB8 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A059C 80271CBC 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A05A0 80271CC0 0C052757 */  jal       play_sound_at_position
+/* 1A05A0 80271CC0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A05A4 80271CC4 0000282D */   daddu    $a1, $zero, $zero
 /* 1A05A8 80271CC8 24040001 */  addiu     $a0, $zero, 1
 /* 1A05AC 80271CCC 0C09CCEA */  jal       dispatch_damage_event_player_1
@@ -378,7 +378,7 @@ glabel L80271E88_1A0768
 /* 1A0770 80271E90 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0774 80271E94 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A0778 80271E98 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A077C 80271E9C 0C052757 */  jal       play_sound_at_position
+/* 1A077C 80271E9C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A0780 80271EA0 0000282D */   daddu    $a1, $zero, $zero
 .L80271EA4:
 /* 1A0784 80271EA4 0C03A752 */  jal       is_ability_active
@@ -706,7 +706,7 @@ glabel L80271E88_1A0768
 /* 1A0C18 80272338 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0C1C 8027233C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A0C20 80272340 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A0C24 80272344 0C052757 */  jal       play_sound_at_position
+/* 1A0C24 80272344 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A0C28 80272348 0000282D */   daddu    $a1, $zero, $zero
 /* 1A0C2C 8027234C 0809C900 */  j         .L80272400
 /* 1A0C30 80272350 A6800180 */   sh       $zero, 0x180($s4)
@@ -803,7 +803,7 @@ glabel L80271E88_1A0768
 /* 1A0D7C 8027249C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0D80 802724A0 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A0D84 802724A4 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A0D88 802724A8 0C052757 */  jal       play_sound_at_position
+/* 1A0D88 802724A8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A0D8C 802724AC 0000282D */   daddu    $a1, $zero, $zero
 /* 1A0D90 802724B0 0260202D */  daddu     $a0, $s3, $zero
 /* 1A0D94 802724B4 0C09DC58 */  jal       dispatch_event_actor
@@ -1324,13 +1324,13 @@ glabel L80271E88_1A0768
 /* 1A14BC 80272BDC 8D0401B0 */  lw        $a0, 0x1b0($t0)
 /* 1A14C0 80272BE0 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A14C4 80272BE4 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A14C8 80272BE8 0C052757 */  jal       play_sound_at_position
+/* 1A14C8 80272BE8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A14CC 80272BEC 0000282D */   daddu    $a1, $zero, $zero
 .L80272BF0:
 /* 1A14D0 80272BF0 86820180 */  lh        $v0, 0x180($s4)
 /* 1A14D4 80272BF4 18400006 */  blez      $v0, .L80272C10
 /* 1A14D8 80272BF8 00000000 */   nop
-/* 1A14DC 80272BFC 0C05272D */  jal       play_sound
+/* 1A14DC 80272BFC 0C05272D */  jal       sfx_play_sound
 /* 1A14E0 80272C00 24040231 */   addiu    $a0, $zero, 0x231
 /* 1A14E4 80272C04 86820180 */  lh        $v0, 0x180($s4)
 /* 1A14E8 80272C08 1C400008 */  bgtz      $v0, .L80272C2C
@@ -1417,7 +1417,7 @@ glabel L80271E88_1A0768
 .L80272D20:
 /* 1A1600 80272D20 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A1604 80272D24 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1608 80272D28 0C052757 */  jal       play_sound_at_position
+/* 1A1608 80272D28 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A160C 80272D2C 0000282D */   daddu    $a1, $zero, $zero
 .L80272D30:
 /* 1A1610 80272D30 86820180 */  lh        $v0, 0x180($s4)
@@ -1440,7 +1440,7 @@ glabel L80271E88_1A0768
 /* 1A1648 80272D68 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A164C 80272D6C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A1650 80272D70 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1654 80272D74 0C052757 */  jal       play_sound_at_position
+/* 1A1654 80272D74 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1658 80272D78 0000282D */   daddu    $a1, $zero, $zero
 .L80272D7C:
 /* 1A165C 80272D7C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1468,7 +1468,7 @@ glabel L80271E88_1A0768
 /* 1A16B4 80272DD4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A16B8 80272DD8 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A16BC 80272DDC 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A16C0 80272DE0 0C052757 */  jal       play_sound_at_position
+/* 1A16C0 80272DE0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A16C4 80272DE4 0000282D */   daddu    $a1, $zero, $zero
 .L80272DE8:
 /* 1A16C8 80272DE8 8E820190 */  lw        $v0, 0x190($s4)
@@ -1497,7 +1497,7 @@ glabel L80271E88_1A0768
 /* 1A1724 80272E44 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1728 80272E48 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A172C 80272E4C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1730 80272E50 0C052757 */  jal       play_sound_at_position
+/* 1A1730 80272E50 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1734 80272E54 0000282D */   daddu    $a1, $zero, $zero
 .L80272E58:
 /* 1A1738 80272E58 8E820190 */  lw        $v0, 0x190($s4)
@@ -1526,7 +1526,7 @@ glabel L80271E88_1A0768
 /* 1A1794 80272EB4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1798 80272EB8 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A179C 80272EBC 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A17A0 80272EC0 0C052757 */  jal       play_sound_at_position
+/* 1A17A0 80272EC0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A17A4 80272EC4 0000282D */   daddu    $a1, $zero, $zero
 .L80272EC8:
 /* 1A17A8 80272EC8 8E820190 */  lw        $v0, 0x190($s4)
@@ -1555,7 +1555,7 @@ glabel L80271E88_1A0768
 /* 1A1804 80272F24 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1808 80272F28 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A180C 80272F2C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1810 80272F30 0C052757 */  jal       play_sound_at_position
+/* 1A1810 80272F30 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1814 80272F34 0000282D */   daddu    $a1, $zero, $zero
 .L80272F38:
 /* 1A1818 80272F38 8E820190 */  lw        $v0, 0x190($s4)
@@ -1584,7 +1584,7 @@ glabel L80271E88_1A0768
 /* 1A1874 80272F94 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1878 80272F98 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A187C 80272F9C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1880 80272FA0 0C052757 */  jal       play_sound_at_position
+/* 1A1880 80272FA0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1884 80272FA4 0000282D */   daddu    $a1, $zero, $zero
 .L80272FA8:
 /* 1A1888 80272FA8 8E820190 */  lw        $v0, 0x190($s4)
@@ -1613,7 +1613,7 @@ glabel L80271E88_1A0768
 /* 1A18E4 80273004 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A18E8 80273008 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A18EC 8027300C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A18F0 80273010 0C052757 */  jal       play_sound_at_position
+/* 1A18F0 80273010 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A18F4 80273014 0000282D */   daddu    $a1, $zero, $zero
 .L80273018:
 /* 1A18F8 80273018 8E820190 */  lw        $v0, 0x190($s4)
@@ -1643,7 +1643,7 @@ glabel L80271E88_1A0768
 /* 1A1958 80273078 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A195C 8027307C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A1960 80273080 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1964 80273084 0C052757 */  jal       play_sound_at_position
+/* 1A1964 80273084 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1968 80273088 0000282D */   daddu    $a1, $zero, $zero
 .L8027308C:
 /* 1A196C 8027308C 8E820188 */  lw        $v0, 0x188($s4)
@@ -1657,7 +1657,7 @@ glabel L80271E88_1A0768
 /* 1A198C 802730AC E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1990 802730B0 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A1994 802730B4 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1998 802730B8 0C052757 */  jal       play_sound_at_position
+/* 1A1998 802730B8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A199C 802730BC 0000282D */   daddu    $a1, $zero, $zero
 .L802730C0:
 /* 1A19A0 802730C0 0C099AB7 */  jal       func_80266ADC
@@ -1706,7 +1706,7 @@ glabel L80271E88_1A0768
 /* 1A1A3C 8027315C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1A40 80273160 8E46000C */  lw        $a2, 0xc($s2)
 /* 1A1A44 80273164 8E470010 */  lw        $a3, 0x10($s2)
-/* 1A1A48 80273168 0C052757 */  jal       play_sound_at_position
+/* 1A1A48 80273168 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1A4C 8027316C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A1A50 80273170 8FA40018 */  lw        $a0, 0x18($sp)
 /* 1A1A54 80273174 0C09451D */  jal       func_80251474
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s b/ver/us/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s
index f626ab0278..7eec83124c 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s
@@ -58,7 +58,7 @@ glabel calc_player_test_enemy
 /* 1A00F8 80271818 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A00FC 8027181C 8E06000C */  lw        $a2, 0xc($s0)
 /* 1A0100 80271820 8E070010 */  lw        $a3, 0x10($s0)
-/* 1A0104 80271824 0C052757 */  jal       play_sound_at_position
+/* 1A0104 80271824 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A0108 80271828 0000282D */   daddu    $a1, $zero, $zero
 /* 1A010C 8027182C 0809C649 */  j         .L80271924
 /* 1A0110 80271830 24020008 */   addiu    $v0, $zero, 8
@@ -80,7 +80,7 @@ glabel calc_player_test_enemy
 /* 1A014C 8027186C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A0150 80271870 8E06000C */  lw        $a2, 0xc($s0)
 /* 1A0154 80271874 8E070010 */  lw        $a3, 0x10($s0)
-/* 1A0158 80271878 0C052757 */  jal       play_sound_at_position
+/* 1A0158 80271878 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A015C 8027187C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A0160 80271880 0809C649 */  j         .L80271924
 /* 1A0164 80271884 24020004 */   addiu    $v0, $zero, 4
@@ -106,7 +106,7 @@ glabel calc_player_test_enemy
 /* 1A01B0 802718D0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A01B4 802718D4 8E06000C */  lw        $a2, 0xc($s0)
 /* 1A01B8 802718D8 8E070010 */  lw        $a3, 0x10($s0)
-/* 1A01BC 802718DC 0C052757 */  jal       play_sound_at_position
+/* 1A01BC 802718DC 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A01C0 802718E0 0000282D */   daddu    $a1, $zero, $zero
 /* 1A01C4 802718E4 24040001 */  addiu     $a0, $zero, 1
 /* 1A01C8 802718E8 0C09CCEA */  jal       dispatch_damage_event_player_1
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s b/ver/us/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s
index 42324e437f..0056a8288b 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s
@@ -85,7 +85,7 @@ glabel dispatch_damage_event_player
 /* 1A1BC4 802732E4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1BC8 802732E8 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A1BCC 802732EC 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A1BD0 802732F0 0C052757 */  jal       play_sound_at_position
+/* 1A1BD0 802732F0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1BD4 802732F4 0000282D */   daddu    $a1, $zero, $zero
 /* 1A1BD8 802732F8 24020001 */  addiu     $v0, $zero, 1
 .L802732FC:
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80273444.s b/ver/us/asm/nonmatchings/code_19FAF0/func_80273444.s
index a9ee21fcab..b0e2243b98 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/func_80273444.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/func_80273444.s
@@ -160,7 +160,7 @@ glabel func_80273444
 /* 1A1F60 80273680 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A1F64 80273684 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A1F68 80273688 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A1F6C 8027368C 0C052757 */  jal       play_sound_at_position
+/* 1A1F6C 8027368C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A1F70 80273690 0000282D */   daddu    $a1, $zero, $zero
 .L80273694:
 /* 1A1F74 80273694 24020001 */  addiu     $v0, $zero, 1
@@ -282,7 +282,7 @@ glabel func_80273444
 /* 1A2128 80273848 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A212C 8027384C 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A2130 80273850 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A2134 80273854 0C052757 */  jal       play_sound_at_position
+/* 1A2134 80273854 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A2138 80273858 0000282D */   daddu    $a1, $zero, $zero
 .L8027385C:
 /* 1A213C 8027385C 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80274A18.s b/ver/us/asm/nonmatchings/code_19FAF0/func_80274A18.s
index cbdeb72f9e..95956608f3 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/func_80274A18.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/func_80274A18.s
@@ -327,7 +327,7 @@ glabel func_80274A18
 /* 1A3758 80274E78 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A375C 80274E7C 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A3760 80274E80 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A3764 80274E84 0C052757 */  jal       play_sound_at_position
+/* 1A3764 80274E84 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A3768 80274E88 0000282D */   daddu    $a1, $zero, $zero
 /* 1A376C 80274E8C 24020001 */  addiu     $v0, $zero, 1
 /* 1A3770 80274E90 AE620070 */  sw        $v0, 0x70($s3)
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_802752AC.s b/ver/us/asm/nonmatchings/code_19FAF0/func_802752AC.s
index ccd87d3ea8..4c322a7597 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/func_802752AC.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/func_802752AC.s
@@ -198,7 +198,7 @@ glabel func_802752AC
 /* 1A3DEC 8027550C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A3DF0 80275510 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A3DF4 80275514 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A3DF8 80275518 0C052757 */  jal       play_sound_at_position
+/* 1A3DF8 80275518 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A3DFC 8027551C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A3E00 80275520 86030064 */  lh        $v1, 0x64($s0)
 /* 1A3E04 80275524 24020168 */  addiu     $v0, $zero, 0x168
@@ -644,7 +644,7 @@ glabel func_802752AC
 /* 1A4488 80275BA8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A448C 80275BAC 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A4490 80275BB0 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A4494 80275BB4 0C052757 */  jal       play_sound_at_position
+/* 1A4494 80275BB4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A4498 80275BB8 0000282D */   daddu    $a1, $zero, $zero
 /* 1A449C 80275BBC 0000202D */  daddu     $a0, $zero, $zero
 /* 1A44A0 80275BC0 8E06005C */  lw        $a2, 0x5c($s0)
diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80275F00.s b/ver/us/asm/nonmatchings/code_19FAF0/func_80275F00.s
index 0428995f00..02eabbb752 100644
--- a/ver/us/asm/nonmatchings/code_19FAF0/func_80275F00.s
+++ b/ver/us/asm/nonmatchings/code_19FAF0/func_80275F00.s
@@ -206,14 +206,14 @@ glabel func_80275F00
 /* 1A4A5C 8027617C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A4A60 80276180 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A4A64 80276184 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A4A68 80276188 0C052757 */  jal       play_sound_at_position
+/* 1A4A68 80276188 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A4A6C 8027618C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A4A70 80276190 C640014C */  lwc1      $f0, 0x14c($s2)
 /* 1A4A74 80276194 24040147 */  addiu     $a0, $zero, 0x147
 /* 1A4A78 80276198 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A4A7C 8027619C 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A4A80 802761A0 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A4A84 802761A4 0C052757 */  jal       play_sound_at_position
+/* 1A4A84 802761A4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A4A88 802761A8 0000282D */   daddu    $a1, $zero, $zero
 /* 1A4A8C 802761AC 86020064 */  lh        $v0, 0x64($s0)
 /* 1A4A90 802761B0 24030168 */  addiu     $v1, $zero, 0x168
@@ -386,14 +386,14 @@ glabel func_80275F00
 /* 1A4D18 80276438 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A4D1C 8027643C 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A4D20 80276440 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A4D24 80276444 0C052757 */  jal       play_sound_at_position
+/* 1A4D24 80276444 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A4D28 80276448 0000282D */   daddu    $a1, $zero, $zero
 /* 1A4D2C 8027644C C640014C */  lwc1      $f0, 0x14c($s2)
 /* 1A4D30 80276450 24040147 */  addiu     $a0, $zero, 0x147
 /* 1A4D34 80276454 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A4D38 80276458 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A4D3C 8027645C 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A4D40 80276460 0C052757 */  jal       play_sound_at_position
+/* 1A4D40 80276460 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A4D44 80276464 0000282D */   daddu    $a1, $zero, $zero
 /* 1A4D48 80276468 86020064 */  lh        $v0, 0x64($s0)
 /* 1A4D4C 8027646C 24030168 */  addiu     $v1, $zero, 0x168
@@ -617,7 +617,7 @@ glabel func_80275F00
 /* 1A5094 802767B4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A5098 802767B8 8E460144 */  lw        $a2, 0x144($s2)
 /* 1A509C 802767BC 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A50A0 802767C0 0C052757 */  jal       play_sound_at_position
+/* 1A50A0 802767C0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A50A4 802767C4 0000282D */   daddu    $a1, $zero, $zero
 /* 1A50A8 802767C8 86030064 */  lh        $v1, 0x64($s0)
 /* 1A50AC 802767CC 24020168 */  addiu     $v0, $zero, 0x168
diff --git a/ver/us/asm/nonmatchings/code_1A5830/FallPartTo.s b/ver/us/asm/nonmatchings/code_1A5830/FallPartTo.s
index 49ac0ef5e5..e7a3971b5d 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/FallPartTo.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/FallPartTo.s
@@ -144,7 +144,7 @@ glabel FallPartTo
 /* 1A9350 8027AA70 8E2400B4 */  lw        $a0, 0xb4($s1)
 /* 1A9354 8027AA74 8E26002C */  lw        $a2, 0x2c($s1)
 /* 1A9358 8027AA78 8E270030 */  lw        $a3, 0x30($s1)
-/* 1A935C 8027AA7C 0C052757 */  jal       play_sound_at_position
+/* 1A935C 8027AA7C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A9360 8027AA80 0000282D */   daddu    $a1, $zero, $zero
 /* 1A9364 8027AA84 24020001 */  addiu     $v0, $zero, 1
 .L8027AA88:
diff --git a/ver/us/asm/nonmatchings/code_1A5830/FallToGoal.s b/ver/us/asm/nonmatchings/code_1A5830/FallToGoal.s
index fb98ec67ce..c44ed873c3 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/FallToGoal.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/FallToGoal.s
@@ -109,7 +109,7 @@ glabel FallToGoal
 /* 1A865C 80279D7C 8E0401AC */  lw        $a0, 0x1ac($s0)
 /* 1A8660 80279D80 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A8664 80279D84 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A8668 80279D88 0C052757 */  jal       play_sound_at_position
+/* 1A8668 80279D88 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A866C 80279D8C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A8670 80279D90 24020001 */  addiu     $v0, $zero, 1
 .L80279D94:
diff --git a/ver/us/asm/nonmatchings/code_1A5830/FlyPartTo.s b/ver/us/asm/nonmatchings/code_1A5830/FlyPartTo.s
index d5796bb119..747bc69ce6 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/FlyPartTo.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/FlyPartTo.s
@@ -147,7 +147,7 @@ glabel FlyPartTo
 /* 1AAA1C 8027C13C 8E4400AC */  lw        $a0, 0xac($s2)
 /* 1AAA20 8027C140 8E46002C */  lw        $a2, 0x2c($s2)
 /* 1AAA24 8027C144 8E470030 */  lw        $a3, 0x30($s2)
-/* 1AAA28 8027C148 0C052757 */  jal       play_sound_at_position
+/* 1AAA28 8027C148 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AAA2C 8027C14C 0000282D */   daddu    $a1, $zero, $zero
 /* 1AAA30 8027C150 AE00003C */  sw        $zero, 0x3c($s0)
 .L8027C154:
@@ -211,7 +211,7 @@ glabel FlyPartTo
 /* 1AAB0C 8027C22C 8E4200B0 */  lw        $v0, 0xb0($s2)
 /* 1AAB10 8027C230 144000A2 */  bnez      $v0, .L8027C4BC
 /* 1AAB14 8027C234 24020002 */   addiu    $v0, $zero, 2
-/* 1AAB18 8027C238 0C0154F0 */  jal       func_800553C0
+/* 1AAB18 8027C238 0C0154F0 */  jal       snd_stop_sound
 /* 1AAB1C 8027C23C 00000000 */   nop
 /* 1AAB20 8027C240 0809F12F */  j         .L8027C4BC
 /* 1AAB24 8027C244 24020002 */   addiu    $v0, $zero, 2
@@ -293,7 +293,7 @@ glabel FlyPartTo
 .L8027C368:
 /* 1AAC48 8027C368 8E46002C */  lw        $a2, 0x2c($s2)
 /* 1AAC4C 8027C36C 8E470030 */  lw        $a3, 0x30($s2)
-/* 1AAC50 8027C370 0C052757 */  jal       play_sound_at_position
+/* 1AAC50 8027C370 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AAC54 8027C374 0000282D */   daddu    $a1, $zero, $zero
 .L8027C378:
 /* 1AAC58 8027C378 C602000C */  lwc1      $f2, 0xc($s0)
diff --git a/ver/us/asm/nonmatchings/code_1A5830/FlyToGoal.s b/ver/us/asm/nonmatchings/code_1A5830/FlyToGoal.s
index 2cfe7e2129..b0219cd19b 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/FlyToGoal.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/FlyToGoal.s
@@ -131,7 +131,7 @@ glabel FlyToGoal
 /* 1AA0C0 8027B7E0 8E0401A4 */  lw        $a0, 0x1a4($s0)
 /* 1AA0C4 8027B7E4 8E060144 */  lw        $a2, 0x144($s0)
 /* 1AA0C8 8027B7E8 8E070148 */  lw        $a3, 0x148($s0)
-/* 1AA0CC 8027B7EC 0C052757 */  jal       play_sound_at_position
+/* 1AA0CC 8027B7EC 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AA0D0 8027B7F0 0000282D */   daddu    $a1, $zero, $zero
 .L8027B7F4:
 /* 1AA0D4 8027B7F4 8E500074 */  lw        $s0, 0x74($s2)
@@ -211,7 +211,7 @@ glabel FlyToGoal
 /* 1AA1F8 8027B918 8E0201A8 */  lw        $v0, 0x1a8($s0)
 /* 1AA1FC 8027B91C 1440009F */  bnez      $v0, .L8027BB9C
 /* 1AA200 8027B920 24020002 */   addiu    $v0, $zero, 2
-/* 1AA204 8027B924 0C0154F0 */  jal       func_800553C0
+/* 1AA204 8027B924 0C0154F0 */  jal       snd_stop_sound
 /* 1AA208 8027B928 00000000 */   nop
 /* 1AA20C 8027B92C 0809EEE7 */  j         .L8027BB9C
 /* 1AA210 8027B930 24020002 */   addiu    $v0, $zero, 2
@@ -290,7 +290,7 @@ glabel FlyToGoal
 .L8027BA48:
 /* 1AA328 8027BA48 8E060144 */  lw        $a2, 0x144($s0)
 /* 1AA32C 8027BA4C 8E070148 */  lw        $a3, 0x148($s0)
-/* 1AA330 8027BA50 0C052757 */  jal       play_sound_at_position
+/* 1AA330 8027BA50 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AA334 8027BA54 0000282D */   daddu    $a1, $zero, $zero
 .L8027BA58:
 /* 1AA338 8027BA58 C622000C */  lwc1      $f2, 0xc($s1)
diff --git a/ver/us/asm/nonmatchings/code_1A5830/IdleRunToGoal.s b/ver/us/asm/nonmatchings/code_1A5830/IdleRunToGoal.s
index 54acb364d8..4d31ad91c2 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/IdleRunToGoal.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/IdleRunToGoal.s
@@ -158,7 +158,7 @@ glabel IdleRunToGoal
 /* 1A8D84 8027A4A4 8E0201A0 */  lw        $v0, 0x1a0($s0)
 /* 1A8D88 8027A4A8 14400004 */  bnez      $v0, .L8027A4BC
 /* 1A8D8C 8027A4AC 24020001 */   addiu    $v0, $zero, 1
-/* 1A8D90 8027A4B0 0C0154F0 */  jal       func_800553C0
+/* 1A8D90 8027A4B0 0C0154F0 */  jal       snd_stop_sound
 /* 1A8D94 8027A4B4 00000000 */   nop
 .L8027A4B8:
 /* 1A8D98 8027A4B8 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpPartTo.s b/ver/us/asm/nonmatchings/code_1A5830/JumpPartTo.s
index c5a3adc243..816bc9f5a8 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/JumpPartTo.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/JumpPartTo.s
@@ -167,7 +167,7 @@ glabel JumpPartTo
 /* 1A903C 8027A75C 8E2400B4 */  lw        $a0, 0xb4($s1)
 /* 1A9040 8027A760 8E26002C */  lw        $a2, 0x2c($s1)
 /* 1A9044 8027A764 8E270030 */  lw        $a3, 0x30($s1)
-/* 1A9048 8027A768 0C052757 */  jal       play_sound_at_position
+/* 1A9048 8027A768 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A904C 8027A76C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A9050 8027A770 24020001 */  addiu     $v0, $zero, 1
 .L8027A774:
diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpToGoal.s b/ver/us/asm/nonmatchings/code_1A5830/JumpToGoal.s
index dc31dc073a..fca1445382 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/JumpToGoal.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/JumpToGoal.s
@@ -174,7 +174,7 @@ glabel JumpToGoal
 /* 1A786C 80278F8C 8E0401AC */  lw        $a0, 0x1ac($s0)
 /* 1A7870 80278F90 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A7874 80278F94 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A7878 80278F98 0C052757 */  jal       play_sound_at_position
+/* 1A7878 80278F98 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A787C 80278F9C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A7880 80278FA0 24020001 */  addiu     $v0, $zero, 1
 .L80278FA4:
diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s b/ver/us/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s
index dc36174fe8..707da22cfd 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s
@@ -135,7 +135,7 @@ glabel JumpToGoalSimple2
 /* 1A7EF4 80279614 8E0401AC */  lw        $a0, 0x1ac($s0)
 /* 1A7EF8 80279618 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A7EFC 8027961C 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A7F00 80279620 0C052757 */  jal       play_sound_at_position
+/* 1A7F00 80279620 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A7F04 80279624 0000282D */   daddu    $a1, $zero, $zero
 /* 1A7F08 80279628 24020001 */  addiu     $v0, $zero, 1
 .L8027962C:
diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpWithBounce.s b/ver/us/asm/nonmatchings/code_1A5830/JumpWithBounce.s
index 861a252147..891418e856 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/JumpWithBounce.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/JumpWithBounce.s
@@ -140,7 +140,7 @@ glabel JumpWithBounce
 /* 1A8210 80279930 8E0401AC */  lw        $a0, 0x1ac($s0)
 /* 1A8214 80279934 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A8218 80279938 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A821C 8027993C 0C052757 */  jal       play_sound_at_position
+/* 1A821C 8027993C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A8220 80279940 0000282D */   daddu    $a1, $zero, $zero
 /* 1A8224 80279944 24020001 */  addiu     $v0, $zero, 1
 .L80279948:
diff --git a/ver/us/asm/nonmatchings/code_1A5830/RunPartTo.s b/ver/us/asm/nonmatchings/code_1A5830/RunPartTo.s
index e20d56b1b9..bbdd6ff5bf 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/RunPartTo.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/RunPartTo.s
@@ -131,7 +131,7 @@ glabel RunPartTo
 /* 1A9770 8027AE90 8E4400A4 */  lw        $a0, 0xa4($s2)
 /* 1A9774 8027AE94 8E46002C */  lw        $a2, 0x2c($s2)
 /* 1A9778 8027AE98 8E470030 */  lw        $a3, 0x30($s2)
-/* 1A977C 8027AE9C 0C052757 */  jal       play_sound_at_position
+/* 1A977C 8027AE9C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A9780 8027AEA0 0000282D */   daddu    $a1, $zero, $zero
 /* 1A9784 8027AEA4 24020001 */  addiu     $v0, $zero, 1
 .L8027AEA8:
@@ -250,7 +250,7 @@ glabel RunPartTo
 .L8027B054:
 /* 1A9934 8027B054 8E46002C */  lw        $a2, 0x2c($s2)
 /* 1A9938 8027B058 8E470030 */  lw        $a3, 0x30($s2)
-/* 1A993C 8027B05C 0C052757 */  jal       play_sound_at_position
+/* 1A993C 8027B05C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A9940 8027B060 0000282D */   daddu    $a1, $zero, $zero
 .L8027B064:
 /* 1A9944 8027B064 96020038 */  lhu       $v0, 0x38($s0)
@@ -268,7 +268,7 @@ glabel RunPartTo
 /* 1A9974 8027B094 8E4200A8 */  lw        $v0, 0xa8($s2)
 /* 1A9978 8027B098 14400004 */  bnez      $v0, .L8027B0AC
 /* 1A997C 8027B09C 24020001 */   addiu    $v0, $zero, 1
-/* 1A9980 8027B0A0 0C0154F0 */  jal       func_800553C0
+/* 1A9980 8027B0A0 0C0154F0 */  jal       snd_stop_sound
 /* 1A9984 8027B0A4 00000000 */   nop
 .L8027B0A8:
 /* 1A9988 8027B0A8 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_1A5830/RunToGoal.s b/ver/us/asm/nonmatchings/code_1A5830/RunToGoal.s
index b6aa78effc..65373c33a0 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/RunToGoal.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/RunToGoal.s
@@ -122,7 +122,7 @@ glabel RunToGoal
 /* 1A8900 8027A020 8E04019C */  lw        $a0, 0x19c($s0)
 /* 1A8904 8027A024 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A8908 8027A028 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A890C 8027A02C 0C052757 */  jal       play_sound_at_position
+/* 1A890C 8027A02C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A8910 8027A030 0000282D */   daddu    $a1, $zero, $zero
 /* 1A8914 8027A034 24020001 */  addiu     $v0, $zero, 1
 .L8027A038:
@@ -242,7 +242,7 @@ glabel RunToGoal
 .L8027A1E4:
 /* 1A8AC4 8027A1E4 8E060144 */  lw        $a2, 0x144($s0)
 /* 1A8AC8 8027A1E8 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A8ACC 8027A1EC 0C052757 */  jal       play_sound_at_position
+/* 1A8ACC 8027A1EC 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A8AD0 8027A1F0 0000282D */   daddu    $a1, $zero, $zero
 .L8027A1F4:
 /* 1A8AD4 8027A1F4 96220064 */  lhu       $v0, 0x64($s1)
@@ -260,7 +260,7 @@ glabel RunToGoal
 /* 1A8B04 8027A224 8E0201A0 */  lw        $v0, 0x1a0($s0)
 /* 1A8B08 8027A228 14400004 */  bnez      $v0, .L8027A23C
 /* 1A8B0C 8027A22C 24020001 */   addiu    $v0, $zero, 1
-/* 1A8B10 8027A230 0C0154F0 */  jal       func_800553C0
+/* 1A8B10 8027A230 0C0154F0 */  jal       snd_stop_sound
 /* 1A8B14 8027A234 00000000 */   nop
 .L8027A238:
 /* 1A8B18 8027A238 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/ver/us/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s
index c5a8467df5..634bc8f672 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s
@@ -422,7 +422,7 @@ glabel calc_enemy_damage_target
 /* 1A630C 80277A2C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6310 80277A30 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6314 80277A34 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6318 80277A38 0C052757 */  jal       play_sound_at_position
+/* 1A6318 80277A38 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A631C 80277A3C 0000282D */   daddu    $a1, $zero, $zero
 /* 1A6320 80277A40 C6200014 */  lwc1      $f0, 0x14($s1)
 /* 1A6324 80277A44 0000202D */  daddu     $a0, $zero, $zero
@@ -985,7 +985,7 @@ glabel calc_enemy_damage_target
 /* 1A6AE8 80278208 8D0401B0 */  lw        $a0, 0x1b0($t0)
 /* 1A6AEC 8027820C 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6AF0 80278210 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6AF4 80278214 0C052757 */  jal       play_sound_at_position
+/* 1A6AF4 80278214 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6AF8 80278218 0000282D */   daddu    $a1, $zero, $zero
 .L8027821C:
 /* 1A6AFC 8027821C 8FA80020 */  lw        $t0, 0x20($sp)
@@ -1023,7 +1023,7 @@ glabel calc_enemy_damage_target
 /* 1A6B6C 8027828C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6B70 80278290 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6B74 80278294 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6B78 80278298 0C052757 */  jal       play_sound_at_position
+/* 1A6B78 80278298 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6B7C 8027829C 0000282D */   daddu    $a1, $zero, $zero
 .L802782A0:
 /* 1A6B80 802782A0 8E820190 */  lw        $v0, 0x190($s4)
@@ -1051,7 +1051,7 @@ glabel calc_enemy_damage_target
 /* 1A6BD8 802782F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6BDC 802782FC 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6BE0 80278300 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6BE4 80278304 0C052757 */  jal       play_sound_at_position
+/* 1A6BE4 80278304 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6BE8 80278308 0000282D */   daddu    $a1, $zero, $zero
 .L8027830C:
 /* 1A6BEC 8027830C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1080,7 +1080,7 @@ glabel calc_enemy_damage_target
 /* 1A6C48 80278368 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6C4C 8027836C 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6C50 80278370 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6C54 80278374 0C052757 */  jal       play_sound_at_position
+/* 1A6C54 80278374 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6C58 80278378 0000282D */   daddu    $a1, $zero, $zero
 .L8027837C:
 /* 1A6C5C 8027837C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1109,7 +1109,7 @@ glabel calc_enemy_damage_target
 /* 1A6CB8 802783D8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6CBC 802783DC 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6CC0 802783E0 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6CC4 802783E4 0C052757 */  jal       play_sound_at_position
+/* 1A6CC4 802783E4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6CC8 802783E8 0000282D */   daddu    $a1, $zero, $zero
 .L802783EC:
 /* 1A6CCC 802783EC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1138,7 +1138,7 @@ glabel calc_enemy_damage_target
 /* 1A6D28 80278448 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6D2C 8027844C 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6D30 80278450 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6D34 80278454 0C052757 */  jal       play_sound_at_position
+/* 1A6D34 80278454 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6D38 80278458 0000282D */   daddu    $a1, $zero, $zero
 .L8027845C:
 /* 1A6D3C 8027845C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1167,7 +1167,7 @@ glabel calc_enemy_damage_target
 /* 1A6D98 802784B8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6D9C 802784BC 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6DA0 802784C0 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6DA4 802784C4 0C052757 */  jal       play_sound_at_position
+/* 1A6DA4 802784C4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6DA8 802784C8 0000282D */   daddu    $a1, $zero, $zero
 .L802784CC:
 /* 1A6DAC 802784CC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1196,7 +1196,7 @@ glabel calc_enemy_damage_target
 /* 1A6E08 80278528 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6E0C 8027852C 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6E10 80278530 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6E14 80278534 0C052757 */  jal       play_sound_at_position
+/* 1A6E14 80278534 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6E18 80278538 0000282D */   daddu    $a1, $zero, $zero
 .L8027853C:
 /* 1A6E1C 8027853C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1226,7 +1226,7 @@ glabel calc_enemy_damage_target
 /* 1A6E7C 8027859C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6E80 802785A0 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6E84 802785A4 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6E88 802785A8 0C052757 */  jal       play_sound_at_position
+/* 1A6E88 802785A8 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6E8C 802785AC 0000282D */   daddu    $a1, $zero, $zero
 .L802785B0:
 /* 1A6E90 802785B0 8E820188 */  lw        $v0, 0x188($s4)
@@ -1240,7 +1240,7 @@ glabel calc_enemy_damage_target
 /* 1A6EB0 802785D0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6EB4 802785D4 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6EB8 802785D8 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6EBC 802785DC 0C052757 */  jal       play_sound_at_position
+/* 1A6EBC 802785DC 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6EC0 802785E0 0000282D */   daddu    $a1, $zero, $zero
 .L802785E4:
 /* 1A6EC4 802785E4 0C099AB7 */  jal       func_80266ADC
@@ -1280,7 +1280,7 @@ glabel calc_enemy_damage_target
 /* 1A6F48 80278668 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1A6F4C 8027866C 8E26000C */  lw        $a2, 0xc($s1)
 /* 1A6F50 80278670 8E270010 */  lw        $a3, 0x10($s1)
-/* 1A6F54 80278674 0C052757 */  jal       play_sound_at_position
+/* 1A6F54 80278674 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A6F58 80278678 0000282D */   daddu    $a1, $zero, $zero
 /* 1A6F5C 8027867C 8FA40058 */  lw        $a0, 0x58($sp)
 /* 1A6F60 80278680 0C09451D */  jal       func_80251474
diff --git a/ver/us/asm/nonmatchings/code_1A5830/play_hit_sound.s b/ver/us/asm/nonmatchings/code_1A5830/play_hit_sound.s
index accaa8eb0d..7454bf4055 100644
--- a/ver/us/asm/nonmatchings/code_1A5830/play_hit_sound.s
+++ b/ver/us/asm/nonmatchings/code_1A5830/play_hit_sound.s
@@ -106,7 +106,7 @@ glabel L80277108_1A59E8
 /* 1A5A20 80277140 44060000 */  mfc1      $a2, $f0
 /* 1A5A24 80277144 44071000 */  mfc1      $a3, $f2
 /* 1A5A28 80277148 0000282D */  daddu     $a1, $zero, $zero
-/* 1A5A2C 8027714C 0C052757 */  jal       play_sound_at_position
+/* 1A5A2C 8027714C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1A5A30 80277150 E7A40010 */   swc1     $f4, 0x10($sp)
 .L80277154:
 /* 1A5A34 80277154 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s b/ver/us/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s
index 3fc55697c7..7075df5a5e 100644
--- a/ver/us/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s
+++ b/ver/us/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s
@@ -64,7 +64,7 @@ glabel calc_partner_damage_enemy
 /* 1ACCE4 8027E404 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACCE8 8027E408 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ACCEC 8027E40C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ACCF0 8027E410 0C052757 */  jal       play_sound_at_position
+/* 1ACCF0 8027E410 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACCF4 8027E414 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACCF8 8027E418 0809FB1B */  j         .L8027EC6C
 /* 1ACCFC 8027E41C 00000000 */   nop
@@ -95,7 +95,7 @@ glabel calc_partner_damage_enemy
 /* 1ACD54 8027E474 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACD58 8027E478 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ACD5C 8027E47C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ACD60 8027E480 0C052757 */  jal       play_sound_at_position
+/* 1ACD60 8027E480 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACD64 8027E484 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACD68 8027E488 24020001 */  addiu     $v0, $zero, 1
 /* 1ACD6C 8027E48C AFA20010 */  sw        $v0, 0x10($sp)
@@ -150,7 +150,7 @@ glabel calc_partner_damage_enemy
 /* 1ACE24 8027E544 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACE28 8027E548 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ACE2C 8027E54C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ACE30 8027E550 0C052757 */  jal       play_sound_at_position
+/* 1ACE30 8027E550 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACE34 8027E554 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACE38 8027E558 24040001 */  addiu     $a0, $zero, 1
 /* 1ACE3C 8027E55C 0809FE62 */  j         .L8027F988
@@ -160,7 +160,7 @@ glabel calc_partner_damage_enemy
 /* 1ACE48 8027E568 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACE4C 8027E56C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ACE50 8027E570 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ACE54 8027E574 0C052757 */  jal       play_sound_at_position
+/* 1ACE54 8027E574 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACE58 8027E578 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACE5C 8027E57C 3C02800E */  lui       $v0, %hi(gBattleStatus)
 /* 1ACE60 8027E580 8C42C070 */  lw        $v0, %lo(gBattleStatus)($v0)
@@ -184,7 +184,7 @@ glabel calc_partner_damage_enemy
 /* 1ACEA4 8027E5C4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACEA8 8027E5C8 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ACEAC 8027E5CC 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ACEB0 8027E5D0 0C052757 */  jal       play_sound_at_position
+/* 1ACEB0 8027E5D0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACEB4 8027E5D4 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACEB8 8027E5D8 24040001 */  addiu     $a0, $zero, 1
 /* 1ACEBC 8027E5DC 0C09FEE7 */  jal       dispatch_damage_event_partner_1
@@ -225,7 +225,7 @@ glabel calc_partner_damage_enemy
 /* 1ACF40 8027E660 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACF44 8027E664 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ACF48 8027E668 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ACF4C 8027E66C 0C052757 */  jal       play_sound_at_position
+/* 1ACF4C 8027E66C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACF50 8027E670 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACF54 8027E674 0260202D */  daddu     $a0, $s3, $zero
 /* 1ACF58 8027E678 0C09DC58 */  jal       dispatch_event_actor
@@ -274,7 +274,7 @@ glabel calc_partner_damage_enemy
 /* 1ACFF8 8027E718 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACFFC 8027E71C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AD000 8027E720 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AD004 8027E724 0C052757 */  jal       play_sound_at_position
+/* 1AD004 8027E724 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AD008 8027E728 0000282D */   daddu    $a1, $zero, $zero
 /* 1AD00C 8027E72C 24040001 */  addiu     $a0, $zero, 1
 /* 1AD010 8027E730 0C09FEE7 */  jal       dispatch_damage_event_partner_1
@@ -305,7 +305,7 @@ glabel calc_partner_damage_enemy
 /* 1AD06C 8027E78C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AD070 8027E790 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AD074 8027E794 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AD078 8027E798 0C052757 */  jal       play_sound_at_position
+/* 1AD078 8027E798 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AD07C 8027E79C 0000282D */   daddu    $a1, $zero, $zero
 /* 1AD080 8027E7A0 0260202D */  daddu     $a0, $s3, $zero
 /* 1AD084 8027E7A4 0C09DC58 */  jal       dispatch_event_actor
@@ -530,7 +530,7 @@ glabel calc_partner_damage_enemy
 /* 1AD3A4 8027EAC4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AD3A8 8027EAC8 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AD3AC 8027EACC 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AD3B0 8027EAD0 0C052757 */  jal       play_sound_at_position
+/* 1AD3B0 8027EAD0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AD3B4 8027EAD4 0000282D */   daddu    $a1, $zero, $zero
 /* 1AD3B8 8027EAD8 0809FAE5 */  j         .L8027EB94
 /* 1AD3BC 8027EADC A6800180 */   sh       $zero, 0x180($s4)
@@ -623,7 +623,7 @@ glabel calc_partner_damage_enemy
 /* 1AD4F8 8027EC18 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AD4FC 8027EC1C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AD500 8027EC20 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AD504 8027EC24 0C052757 */  jal       play_sound_at_position
+/* 1AD504 8027EC24 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AD508 8027EC28 0000282D */   daddu    $a1, $zero, $zero
 /* 1AD50C 8027EC2C 0260202D */  daddu     $a0, $s3, $zero
 /* 1AD510 8027EC30 0C09DC58 */  jal       dispatch_event_actor
@@ -1027,7 +1027,7 @@ glabel calc_partner_damage_enemy
 /* 1ADA98 8027F1B8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADA9C 8027F1BC 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADAA0 8027F1C0 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADAA4 8027F1C4 0C052757 */  jal       play_sound_at_position
+/* 1ADAA4 8027F1C4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADAA8 8027F1C8 0000282D */   daddu    $a1, $zero, $zero
 /* 1ADAAC 8027F1CC 0809FC77 */  j         .L8027F1DC
 /* 1ADAB0 8027F1D0 00000000 */   nop
@@ -1092,7 +1092,7 @@ glabel calc_partner_damage_enemy
 /* 1ADB88 8027F2A8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADB8C 8027F2AC 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADB90 8027F2B0 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADB94 8027F2B4 0C052757 */  jal       play_sound_at_position
+/* 1ADB94 8027F2B4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADB98 8027F2B8 0000282D */   daddu    $a1, $zero, $zero
 /* 1ADB9C 8027F2BC 0809FCB4 */  j         .L8027F2D0
 /* 1ADBA0 8027F2C0 0260202D */   daddu    $a0, $s3, $zero
@@ -1185,7 +1185,7 @@ glabel calc_partner_damage_enemy
 /* 1ADCD0 8027F3F0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADCD4 8027F3F4 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADCD8 8027F3F8 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADCDC 8027F3FC 0C052757 */  jal       play_sound_at_position
+/* 1ADCDC 8027F3FC 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADCE0 8027F400 0000282D */   daddu    $a1, $zero, $zero
 /* 1ADCE4 8027F404 86820180 */  lh        $v0, 0x180($s4)
 /* 1ADCE8 8027F408 1C400008 */  bgtz      $v0, .L8027F42C
@@ -1240,7 +1240,7 @@ glabel calc_partner_damage_enemy
 /* 1ADD94 8027F4B4 8D0401B0 */  lw        $a0, 0x1b0($t0)
 /* 1ADD98 8027F4B8 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADD9C 8027F4BC 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADDA0 8027F4C0 0C052757 */  jal       play_sound_at_position
+/* 1ADDA0 8027F4C0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADDA4 8027F4C4 0000282D */   daddu    $a1, $zero, $zero
 /* 1ADDA8 8027F4C8 0260202D */  daddu     $a0, $s3, $zero
 .L8027F4CC:
@@ -1273,7 +1273,7 @@ glabel calc_partner_damage_enemy
 .L8027F528:
 /* 1ADE08 8027F528 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADE0C 8027F52C 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADE10 8027F530 0C052757 */  jal       play_sound_at_position
+/* 1ADE10 8027F530 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADE14 8027F534 0000282D */   daddu    $a1, $zero, $zero
 /* 1ADE18 8027F538 86820180 */  lh        $v0, 0x180($s4)
 .L8027F53C:
@@ -1295,7 +1295,7 @@ glabel calc_partner_damage_enemy
 /* 1ADE4C 8027F56C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADE50 8027F570 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADE54 8027F574 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADE58 8027F578 0C052757 */  jal       play_sound_at_position
+/* 1ADE58 8027F578 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADE5C 8027F57C 0000282D */   daddu    $a1, $zero, $zero
 .L8027F580:
 /* 1ADE60 8027F580 8E820190 */  lw        $v0, 0x190($s4)
@@ -1323,7 +1323,7 @@ glabel calc_partner_damage_enemy
 /* 1ADEB8 8027F5D8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADEBC 8027F5DC 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADEC0 8027F5E0 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADEC4 8027F5E4 0C052757 */  jal       play_sound_at_position
+/* 1ADEC4 8027F5E4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADEC8 8027F5E8 0000282D */   daddu    $a1, $zero, $zero
 .L8027F5EC:
 /* 1ADECC 8027F5EC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1352,7 +1352,7 @@ glabel calc_partner_damage_enemy
 /* 1ADF28 8027F648 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADF2C 8027F64C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADF30 8027F650 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADF34 8027F654 0C052757 */  jal       play_sound_at_position
+/* 1ADF34 8027F654 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADF38 8027F658 0000282D */   daddu    $a1, $zero, $zero
 .L8027F65C:
 /* 1ADF3C 8027F65C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1381,7 +1381,7 @@ glabel calc_partner_damage_enemy
 /* 1ADF98 8027F6B8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ADF9C 8027F6BC 8E46000C */  lw        $a2, 0xc($s2)
 /* 1ADFA0 8027F6C0 8E470010 */  lw        $a3, 0x10($s2)
-/* 1ADFA4 8027F6C4 0C052757 */  jal       play_sound_at_position
+/* 1ADFA4 8027F6C4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ADFA8 8027F6C8 0000282D */   daddu    $a1, $zero, $zero
 .L8027F6CC:
 /* 1ADFAC 8027F6CC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1410,7 +1410,7 @@ glabel calc_partner_damage_enemy
 /* 1AE008 8027F728 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AE00C 8027F72C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AE010 8027F730 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AE014 8027F734 0C052757 */  jal       play_sound_at_position
+/* 1AE014 8027F734 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AE018 8027F738 0000282D */   daddu    $a1, $zero, $zero
 .L8027F73C:
 /* 1AE01C 8027F73C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1439,7 +1439,7 @@ glabel calc_partner_damage_enemy
 /* 1AE078 8027F798 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AE07C 8027F79C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AE080 8027F7A0 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AE084 8027F7A4 0C052757 */  jal       play_sound_at_position
+/* 1AE084 8027F7A4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AE088 8027F7A8 0000282D */   daddu    $a1, $zero, $zero
 .L8027F7AC:
 /* 1AE08C 8027F7AC 8E820190 */  lw        $v0, 0x190($s4)
@@ -1468,7 +1468,7 @@ glabel calc_partner_damage_enemy
 /* 1AE0E8 8027F808 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AE0EC 8027F80C 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AE0F0 8027F810 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AE0F4 8027F814 0C052757 */  jal       play_sound_at_position
+/* 1AE0F4 8027F814 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AE0F8 8027F818 0000282D */   daddu    $a1, $zero, $zero
 .L8027F81C:
 /* 1AE0FC 8027F81C 8E820190 */  lw        $v0, 0x190($s4)
@@ -1498,7 +1498,7 @@ glabel calc_partner_damage_enemy
 /* 1AE15C 8027F87C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AE160 8027F880 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AE164 8027F884 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AE168 8027F888 0C052757 */  jal       play_sound_at_position
+/* 1AE168 8027F888 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AE16C 8027F88C 0000282D */   daddu    $a1, $zero, $zero
 .L8027F890:
 /* 1AE170 8027F890 8E820188 */  lw        $v0, 0x188($s4)
@@ -1512,7 +1512,7 @@ glabel calc_partner_damage_enemy
 /* 1AE190 8027F8B0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AE194 8027F8B4 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AE198 8027F8B8 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AE19C 8027F8BC 0C052757 */  jal       play_sound_at_position
+/* 1AE19C 8027F8BC 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AE1A0 8027F8C0 0000282D */   daddu    $a1, $zero, $zero
 .L8027F8C4:
 /* 1AE1A4 8027F8C4 0C099AB7 */  jal       func_80266ADC
@@ -1561,7 +1561,7 @@ glabel calc_partner_damage_enemy
 /* 1AE240 8027F960 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AE244 8027F964 8E46000C */  lw        $a2, 0xc($s2)
 /* 1AE248 8027F968 8E470010 */  lw        $a3, 0x10($s2)
-/* 1AE24C 8027F96C 0C052757 */  jal       play_sound_at_position
+/* 1AE24C 8027F96C 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AE250 8027F970 0000282D */   daddu    $a1, $zero, $zero
 /* 1AE254 8027F974 8FA40018 */  lw        $a0, 0x18($sp)
 /* 1AE258 8027F978 0C09451D */  jal       func_80251474
diff --git a/ver/us/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s b/ver/us/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s
index ddfbf6908d..0763468072 100644
--- a/ver/us/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s
+++ b/ver/us/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s
@@ -57,7 +57,7 @@ glabel calc_partner_test_enemy
 /* 1AC924 8027E044 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AC928 8027E048 8E06000C */  lw        $a2, 0xc($s0)
 /* 1AC92C 8027E04C 8E070010 */  lw        $a3, 0x10($s0)
-/* 1AC930 8027E050 0C052757 */  jal       play_sound_at_position
+/* 1AC930 8027E050 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AC934 8027E054 0000282D */   daddu    $a1, $zero, $zero
 /* 1AC938 8027E058 0809F8C2 */  j         .L8027E308
 /* 1AC93C 8027E05C 24020004 */   addiu    $v0, $zero, 4
@@ -87,7 +87,7 @@ glabel calc_partner_test_enemy
 /* 1AC994 8027E0B4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1AC998 8027E0B8 8E06000C */  lw        $a2, 0xc($s0)
 /* 1AC99C 8027E0BC 8E070010 */  lw        $a3, 0x10($s0)
-/* 1AC9A0 8027E0C0 0C052757 */  jal       play_sound_at_position
+/* 1AC9A0 8027E0C0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AC9A4 8027E0C4 0000282D */   daddu    $a1, $zero, $zero
 /* 1AC9A8 8027E0C8 24040001 */  addiu     $a0, $zero, 1
 /* 1AC9AC 8027E0CC 0C09FEE7 */  jal       dispatch_damage_event_partner_1
@@ -133,7 +133,7 @@ glabel calc_partner_test_enemy
 /* 1ACA44 8027E164 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACA48 8027E168 8E06000C */  lw        $a2, 0xc($s0)
 /* 1ACA4C 8027E16C 8E070010 */  lw        $a3, 0x10($s0)
-/* 1ACA50 8027E170 0C052757 */  jal       play_sound_at_position
+/* 1ACA50 8027E170 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACA54 8027E174 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACA58 8027E178 24040001 */  addiu     $a0, $zero, 1
 /* 1ACA5C 8027E17C 0C09FEE7 */  jal       dispatch_damage_event_partner_1
@@ -163,7 +163,7 @@ glabel calc_partner_test_enemy
 /* 1ACAB8 8027E1D8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACABC 8027E1DC 8E06000C */  lw        $a2, 0xc($s0)
 /* 1ACAC0 8027E1E0 8E070010 */  lw        $a3, 0x10($s0)
-/* 1ACAC4 8027E1E4 0C052757 */  jal       play_sound_at_position
+/* 1ACAC4 8027E1E4 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACAC8 8027E1E8 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACACC 8027E1EC 24040001 */  addiu     $a0, $zero, 1
 /* 1ACAD0 8027E1F0 0C09FEE7 */  jal       dispatch_damage_event_partner_1
@@ -197,7 +197,7 @@ glabel calc_partner_test_enemy
 /* 1ACB38 8027E258 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACB3C 8027E25C 8E06000C */  lw        $a2, 0xc($s0)
 /* 1ACB40 8027E260 8E070010 */  lw        $a3, 0x10($s0)
-/* 1ACB44 8027E264 0C052757 */  jal       play_sound_at_position
+/* 1ACB44 8027E264 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACB48 8027E268 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACB4C 8027E26C 0C09451D */  jal       func_80251474
 /* 1ACB50 8027E270 0280202D */   daddu    $a0, $s4, $zero
@@ -226,7 +226,7 @@ glabel calc_partner_test_enemy
 /* 1ACBA4 8027E2C4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1ACBA8 8027E2C8 8E06000C */  lw        $a2, 0xc($s0)
 /* 1ACBAC 8027E2CC 8E070010 */  lw        $a3, 0x10($s0)
-/* 1ACBB0 8027E2D0 0C052757 */  jal       play_sound_at_position
+/* 1ACBB0 8027E2D0 0C052757 */  jal       sfx_play_sound_at_position
 /* 1ACBB4 8027E2D4 0000282D */   daddu    $a1, $zero, $zero
 /* 1ACBB8 8027E2D8 24040001 */  addiu     $a0, $zero, 1
 /* 1ACBBC 8027E2DC 0C09FEE7 */  jal       dispatch_damage_event_partner_1
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s
index 1daa8d4390..0fb97dbfb3 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s
@@ -53,7 +53,7 @@ glabel MerleeUpdateFX
 /* 1A568 8003F168 A4200BB8 */  sh        $zero, %lo(D_800A0BB8)($at)
 /* 1A56C 8003F16C 3C01800A */  lui       $at, %hi(D_800A0BA0)
 /* 1A570 8003F170 AC220BA0 */  sw        $v0, %lo(D_800A0BA0)($at)
-/* 1A574 8003F174 0C05272D */  jal       play_sound
+/* 1A574 8003F174 0C05272D */  jal       sfx_play_sound
 /* 1A578 8003F178 24042074 */   addiu    $a0, $zero, 0x2074
 .L8003F17C:
 /* 1A57C 8003F17C 3C0140C9 */  lui       $at, 0x40c9
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s
index 90e044451b..46d46252a2 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s
@@ -132,7 +132,7 @@ glabel update_encounters_neutral
 /* 1AD74 8003F974 8E87002C */  lw        $a3, 0x2c($s4)
 /* 1AD78 8003F978 C6800030 */  lwc1      $f0, 0x30($s4)
 /* 1AD7C 8003F97C 0000282D */  daddu     $a1, $zero, $zero
-/* 1AD80 8003F980 0C052757 */  jal       play_sound_at_position
+/* 1AD80 8003F980 0C052757 */  jal       sfx_play_sound_at_position
 /* 1AD84 8003F984 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 1AD88 8003F988 C6480038 */  lwc1      $f8, 0x38($s2)
 /* 1AD8C 8003F98C C68C0028 */  lwc1      $f12, 0x28($s4)
@@ -774,7 +774,7 @@ glabel L8003FFA0_1B3A0
 /* 1B6F4 800402F4 8E87002C */  lw        $a3, 0x2c($s4)
 /* 1B6F8 800402F8 C6800030 */  lwc1      $f0, 0x30($s4)
 /* 1B6FC 800402FC 0000282D */  daddu     $a1, $zero, $zero
-/* 1B700 80040300 0C052757 */  jal       play_sound_at_position
+/* 1B700 80040300 0C052757 */  jal       sfx_play_sound_at_position
 /* 1B704 80040304 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 1B708 80040308 3C038011 */  lui       $v1, %hi(gPlayerData+0x1)
 /* 1B70C 8004030C 9063F291 */  lbu       $v1, %lo(gPlayerData+0x1)($v1)
@@ -939,7 +939,7 @@ glabel L8004055C_1B95C
 /* 1B964 80040564 8E87002C */  lw        $a3, 0x2c($s4)
 /* 1B968 80040568 C6800030 */  lwc1      $f0, 0x30($s4)
 /* 1B96C 8004056C 0000282D */  daddu     $a1, $zero, $zero
-/* 1B970 80040570 0C052757 */  jal       play_sound_at_position
+/* 1B970 80040570 0C052757 */  jal       sfx_play_sound_at_position
 /* 1B974 80040574 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 1B978 80040578 24020002 */  addiu     $v0, $zero, 2
 .L8004057C:
@@ -1291,7 +1291,7 @@ glabel L80040918_1BD18
 /* 1BE88 80040A88 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 1BE8C 80040A8C 8E460038 */  lw        $a2, 0x38($s2)
 /* 1BE90 80040A90 8E47003C */  lw        $a3, 0x3c($s2)
-/* 1BE94 80040A94 0C052757 */  jal       play_sound_at_position
+/* 1BE94 80040A94 0C052757 */  jal       sfx_play_sound_at_position
 /* 1BE98 80040A98 0000282D */   daddu    $a1, $zero, $zero
 /* 1BE9C 80040A9C 24020003 */  addiu     $v0, $zero, 3
 .L80040AA0:
@@ -1868,7 +1868,7 @@ glabel L8004115C_1C55C
 /* 1C6E4 800412E4 00431025 */  or        $v0, $v0, $v1
 /* 1C6E8 800412E8 AE820000 */  sw        $v0, ($s4)
 .L800412EC:
-/* 1C6EC 800412EC 0C05272D */  jal       play_sound
+/* 1C6EC 800412EC 0C05272D */  jal       sfx_play_sound
 /* 1C6F0 800412F0 00000000 */   nop
 /* 1C6F4 800412F4 24020003 */  addiu     $v0, $zero, 3
 .L800412F8:
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s
index 052b2ef3ce..4c183b2b01 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s
@@ -124,7 +124,7 @@ glabel update_encounters_post_battle
 /* 1D4B4 800420B4 A6C000AA */  sh        $zero, 0xaa($s6)
 /* 1D4B8 800420B8 14510003 */  bne       $v0, $s1, .L800420C8
 /* 1D4BC 800420BC A6C000AE */   sh       $zero, 0xae($s6)
-/* 1D4C0 800420C0 0C052B9B */  jal       func_8014AE6C
+/* 1D4C0 800420C0 0C052B9B */  jal       bgm_pop_battle_song
 /* 1D4C4 800420C4 00000000 */   nop
 .L800420C8:
 /* 1D4C8 800420C8 3C03FFFB */  lui       $v1, 0xfffb
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s
index 2a50b09c0b..98c748f7bc 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s
@@ -235,10 +235,10 @@ glabel update_encounters_pre_battle
 /* 1CAB4 800416B4 0080282D */   daddu    $a1, $a0, $zero
 /* 1CAB8 800416B8 0000282D */  daddu     $a1, $zero, $zero
 .L800416BC:
-/* 1CABC 800416BC 0C052BE3 */  jal       func_8014AF8C
+/* 1CABC 800416BC 0C052BE3 */  jal       bgm_set_battle_song
 /* 1CAC0 800416C0 00000000 */   nop
 .L800416C4:
-/* 1CAC4 800416C4 0C052BBE */  jal       func_8014AEF8
+/* 1CAC4 800416C4 0C052BBE */  jal       bgm_push_battle_song
 /* 1CAC8 800416C8 00000000 */   nop
 /* 1CACC 800416CC 24020001 */  addiu     $v0, $zero, 1
 /* 1CAD0 800416D0 3C01800A */  lui       $at, %hi(D_8009A654)
@@ -307,13 +307,13 @@ glabel update_encounters_pre_battle
 /* 1CBB8 800417B8 A2A200A0 */  sb        $v0, 0xa0($s5)
 /* 1CBBC 800417BC A6A300A2 */  sh        $v1, 0xa2($s5)
 .L800417C0:
-/* 1CBC0 800417C0 0C05271B */  jal       stop_sound
+/* 1CBC0 800417C0 0C05271B */  jal       sfx_stop_sound
 /* 1CBC4 800417C4 24042111 */   addiu    $a0, $zero, 0x2111
-/* 1CBC8 800417C8 0C05271B */  jal       stop_sound
+/* 1CBC8 800417C8 0C05271B */  jal       sfx_stop_sound
 /* 1CBCC 800417CC 24042112 */   addiu    $a0, $zero, 0x2112
-/* 1CBD0 800417D0 0C05271B */  jal       stop_sound
+/* 1CBD0 800417D0 0C05271B */  jal       sfx_stop_sound
 /* 1CBD4 800417D4 24042113 */   addiu    $a0, $zero, 0x2113
-/* 1CBD8 800417D8 0C05271B */  jal       stop_sound
+/* 1CBD8 800417D8 0C05271B */  jal       sfx_stop_sound
 /* 1CBDC 800417DC 24042114 */   addiu    $a0, $zero, 0x2114
 /* 1CBE0 800417E0 0C01CB37 */  jal       func_80072CDC
 /* 1CBE4 800417E4 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s b/ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s
index 02e26ec53c..64053e72a4 100644
--- a/ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s
+++ b/ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s
@@ -163,7 +163,7 @@ glabel create_audio_system
 /* 26168 8004AD68 0C015894 */  jal       func_80056250
 /* 2616C 8004AD6C 27A50018 */   addiu    $a1, $sp, 0x18
 /* 26170 8004AD70 8FA40020 */  lw        $a0, 0x20($sp)
-/* 26174 8004AD74 0C014B97 */  jal       func_80052E5C
+/* 26174 8004AD74 0C014B97 */  jal       snd_load_audio_data
 /* 26178 8004AD78 00000000 */   nop
 /* 2617C 8004AD7C 3C10800A */  lui       $s0, %hi(D_800A0F58)
 /* 26180 8004AD80 26100F58 */  addiu     $s0, $s0, %lo(D_800A0F58)
diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s b/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s
index 4bdc637a26..2f2c4ab4e6 100644
--- a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s
+++ b/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s
@@ -161,7 +161,7 @@ glabel func_8004B748
 /* 26D78 8004B978 30421000 */  andi      $v0, $v0, 0x1000
 /* 26D7C 8004B97C 10400003 */  beqz      $v0, .L8004B98C
 /* 26D80 8004B980 0280202D */   daddu    $a0, $s4, $zero
-/* 26D84 8004B984 0C0130D6 */  jal       func_8004C358
+/* 26D84 8004B984 0C0130D6 */  jal       snd_set_modifiers
 /* 26D88 8004B988 0200282D */   daddu    $a1, $s0, $zero
 .L8004B98C:
 /* 26D8C 8004B98C A6000000 */  sh        $zero, ($s0)
diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s b/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s
index 3def1bab14..9dcdaadfb7 100644
--- a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s
+++ b/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s
@@ -99,7 +99,7 @@ glabel func_8004C0E4
 .L8004C250:
 /* 27650 8004C250 00A0202D */  daddu     $a0, $a1, $zero
 .L8004C254:
-/* 27654 8004C254 0C0130F5 */  jal       func_8004C3D4
+/* 27654 8004C254 0C0130F5 */  jal       snd_set_player_modifiers
 /* 27658 8004C258 00E0282D */   daddu    $a1, $a3, $zero
 .L8004C25C:
 /* 2765C 8004C25C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s b/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_load_sfx_groups_from_SEF.s
similarity index 97%
rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s
rename to ver/us/asm/nonmatchings/code_26840_len_20d0/snd_load_sfx_groups_from_SEF.s
index 5acaab96dc..6df0089ba9 100644
--- a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s
+++ b/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_load_sfx_groups_from_SEF.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004B62C
+glabel snd_load_sfx_groups_from_SEF
 /* 26A2C 8004B62C 24080008 */  addiu     $t0, $zero, 8
 /* 26A30 8004B630 8C820000 */  lw        $v0, ($a0)
 /* 26A34 8004B634 0000382D */  daddu     $a3, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s b/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_modifiers.s
similarity index 95%
rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s
rename to ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_modifiers.s
index 24159083cf..8b114d439b 100644
--- a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s
+++ b/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_modifiers.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004C358
+glabel snd_set_modifiers
 /* 27758 8004C358 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 2775C 8004C35C AFB40020 */  sw        $s4, 0x20($sp)
 /* 27760 8004C360 0080A02D */  daddu     $s4, $a0, $zero
@@ -20,7 +20,7 @@ glabel func_8004C358
 /* 27790 8004C390 94820096 */  lhu       $v0, 0x96($a0)
 /* 27794 8004C394 54530004 */  bnel      $v0, $s3, .L8004C3A8
 /* 27798 8004C398 26310001 */   addiu    $s1, $s1, 1
-/* 2779C 8004C39C 0C0130F5 */  jal       func_8004C3D4
+/* 2779C 8004C39C 0C0130F5 */  jal       snd_set_player_modifiers
 /* 277A0 8004C3A0 0240282D */   daddu    $a1, $s2, $zero
 /* 277A4 8004C3A4 26310001 */  addiu     $s1, $s1, 1
 .L8004C3A8:
diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s b/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_player_modifiers.s
similarity index 98%
rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s
rename to ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_player_modifiers.s
index 89fb9f6bf5..ce2ce96cba 100644
--- a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s
+++ b/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_player_modifiers.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004C3D4
+glabel snd_set_player_modifiers
 /* 277D4 8004C3D4 9082009A */  lbu       $v0, 0x9a($a0)
 /* 277D8 8004C3D8 30420004 */  andi      $v0, $v0, 4
 /* 277DC 8004C3DC 10400003 */  beqz      $v0, .L8004C3EC
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s
index 9633a2cecc..3c4f5c0959 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s
@@ -15,7 +15,7 @@ glabel func_8004D7E0
 /* 28C08 8004D808 8E530010 */  lw        $s3, 0x10($s2)
 /* 28C0C 8004D80C 12800074 */  beqz      $s4, .L8004D9E0
 /* 28C10 8004D810 0000A82D */   daddu    $s5, $zero, $zero
-/* 28C14 8004D814 0C0135E5 */  jal       func_8004D794
+/* 28C14 8004D814 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 28C18 8004D818 0280202D */   daddu    $a0, $s4, $zero
 /* 28C1C 8004D81C 0040802D */  daddu     $s0, $v0, $zero
 /* 28C20 8004D820 52000070 */  beql      $s0, $zero, .L8004D9E4
@@ -54,7 +54,7 @@ glabel func_8004D7E0
 .L8004D890:
 /* 28C90 8004D890 24077FFF */  addiu     $a3, $zero, 0x7fff
 .L8004D894:
-/* 28C94 8004D894 0C014E5D */  jal       func_80053974
+/* 28C94 8004D894 0C014E5D */  jal       snd_initialize_fade
 /* 28C98 8004D898 2604002C */   addiu    $a0, $s0, 0x2c
 /* 28C9C 8004D89C 0200202D */  daddu     $a0, $s0, $zero
 /* 28CA0 8004D8A0 24027FFF */  addiu     $v0, $zero, 0x7fff
@@ -142,7 +142,7 @@ glabel func_8004D7E0
 /* 28DC8 8004D9C8 A200021D */  sb        $zero, 0x21d($s0)
 .L8004D9CC:
 /* 28DCC 8004D9CC AE14001C */  sw        $s4, 0x1c($s0)
-/* 28DD0 8004D9D0 0C013976 */  jal       func_8004E5D8
+/* 28DD0 8004D9D0 0C013976 */  jal       snd_initialize_bgm_player
 /* 28DD4 8004D9D4 0200202D */   daddu    $a0, $s0, $zero
 /* 28DD8 8004D9D8 0801367A */  j         .L8004D9E8
 /* 28DDC 8004D9DC 02A0102D */   daddu    $v0, $s5, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s
index c3f949966f..435316df78 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s
@@ -7,7 +7,7 @@ glabel func_8004DAE0
 /* 28EE8 8004DAE8 0080802D */  daddu     $s0, $a0, $zero
 /* 28EEC 8004DAEC 12000009 */  beqz      $s0, .L8004DB14
 /* 28EF0 8004DAF0 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 28EF4 8004DAF4 0C0135E5 */  jal       func_8004D794
+/* 28EF4 8004DAF4 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 28EF8 8004DAF8 00000000 */   nop
 /* 28EFC 8004DAFC 50400006 */  beql      $v0, $zero, .L8004DB18
 /* 28F00 8004DB00 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s
index 2dc20d33f7..38f1a9b27e 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s
@@ -19,7 +19,7 @@ glabel func_8004DB4C
 /* 28F84 8004DB84 2C422617 */  sltiu     $v0, $v0, 0x2617
 /* 28F88 8004DB88 50400034 */  beql      $v0, $zero, .L8004DC5C
 /* 28F8C 8004DB8C 24120004 */   addiu    $s2, $zero, 4
-/* 28F90 8004DB90 0C0135E5 */  jal       func_8004D794
+/* 28F90 8004DB90 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 28F94 8004DB94 0200202D */   daddu    $a0, $s0, $zero
 /* 28F98 8004DB98 0040282D */  daddu     $a1, $v0, $zero
 /* 28F9C 8004DB9C 50A0002F */  beql      $a1, $zero, .L8004DC5C
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s
index 73e2981f69..48bceb13d0 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s
@@ -16,7 +16,7 @@ glabel func_8004DCB8
 /* 290E4 8004DCE4 8E540010 */  lw        $s4, 0x10($s2)
 /* 290E8 8004DCE8 12200045 */  beqz      $s1, .L8004DE00
 /* 290EC 8004DCEC 0000982D */   daddu    $s3, $zero, $zero
-/* 290F0 8004DCF0 0C0135E5 */  jal       func_8004D794
+/* 290F0 8004DCF0 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 290F4 8004DCF4 0220202D */   daddu    $a0, $s1, $zero
 /* 290F8 8004DCF8 0040802D */  daddu     $s0, $v0, $zero
 /* 290FC 8004DCFC 52000041 */  beql      $s0, $zero, .L8004DE04
@@ -69,7 +69,7 @@ glabel func_8004DCB8
 /* 291A8 8004DDA8 00451021 */  addu      $v0, $v0, $a1
 /* 291AC 8004DDAC 0100282D */  daddu     $a1, $t0, $zero
 /* 291B0 8004DDB0 A0430070 */  sb        $v1, 0x70($v0)
-/* 291B4 8004DDB4 0C0153DD */  jal       al_CopyWords
+/* 291B4 8004DDB4 0C0153DD */  jal       snd_copy_words
 /* 291B8 8004DDB8 AE000020 */   sw       $zero, 0x20($s0)
 /* 291BC 8004DDBC 16A00012 */  bnez      $s5, .L8004DE08
 /* 291C0 8004DDC0 0260102D */   daddu    $v0, $s3, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s
index c6a6a95d15..4ab49f4b6d 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s
@@ -94,7 +94,7 @@ glabel func_8004DE2C
 /* 29370 8004DF70 080137EC */  j         .L8004DFB0
 /* 29374 8004DF74 24120004 */   addiu    $s2, $zero, 4
 .L8004DF78:
-/* 29378 8004DF78 0C0135E5 */  jal       func_8004D794
+/* 29378 8004DF78 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 2937C 8004DF7C 0280202D */   daddu    $a0, $s4, $zero
 /* 29380 8004DF80 0040802D */  daddu     $s0, $v0, $zero
 /* 29384 8004DF84 1200000B */  beqz      $s0, .L8004DFB4
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s
index e05e2db252..7a82ea51ed 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s
@@ -13,7 +13,7 @@ glabel func_8004DFD4
 /* 293F4 8004DFF4 AFB00010 */  sw        $s0, 0x10($sp)
 /* 293F8 8004DFF8 8E710074 */  lw        $s1, 0x74($s3)
 /* 293FC 8004DFFC 8E640078 */  lw        $a0, 0x78($s3)
-/* 29400 8004E000 0C0153DD */  jal       al_CopyWords
+/* 29400 8004E000 0C0153DD */  jal       snd_copy_words
 /* 29404 8004E004 0220282D */   daddu    $a1, $s1, $zero
 /* 29408 8004E008 8E63007C */  lw        $v1, 0x7c($s3)
 /* 2940C 8004E00C 8E22001C */  lw        $v0, 0x1c($s1)
@@ -59,7 +59,7 @@ glabel func_8004DFD4
 /* 29498 8004E098 A22200D4 */  sb        $v0, 0xd4($s1)
 /* 2949C 8004E09C 90620224 */  lbu       $v0, 0x224($v1)
 /* 294A0 8004E0A0 0240282D */  daddu     $a1, $s2, $zero
-/* 294A4 8004E0A4 0C013F4E */  jal       func_8004FD38
+/* 294A4 8004E0A4 0C013F4E */  jal       snd_BGMCmd_E6_MasterEffect
 /* 294A8 8004E0A8 A22200D5 */   sb       $v0, 0xd5($s1)
 /* 294AC 8004E0AC 26100001 */  addiu     $s0, $s0, 1
 .L8004E0B0:
@@ -69,7 +69,7 @@ glabel func_8004DFD4
 /* 294BC 8004E0BC 8E650084 */  lw        $a1, 0x84($s3)
 /* 294C0 8004E0C0 8E660088 */  lw        $a2, 0x88($s3)
 /* 294C4 8004E0C4 8E67008C */  lw        $a3, 0x8c($s3)
-/* 294C8 8004E0C8 0C014E5D */  jal       func_80053974
+/* 294C8 8004E0C8 0C014E5D */  jal       snd_initialize_fade
 /* 294CC 8004E0CC 2624002C */   addiu    $a0, $s1, 0x2c
 /* 294D0 8004E0D0 AE600080 */  sw        $zero, 0x80($s3)
 .L8004E0D4:
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s
index ec055b6db0..593dc3e3a0 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s
@@ -10,7 +10,7 @@ glabel func_8004E0F4
 /* 29508 8004E108 8E240000 */  lw        $a0, ($s1)
 /* 2950C 8004E10C 1080000B */  beqz      $a0, .L8004E13C
 /* 29510 8004E110 0000802D */   daddu    $s0, $zero, $zero
-/* 29514 8004E114 0C0135E5 */  jal       func_8004D794
+/* 29514 8004E114 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 29518 8004E118 00000000 */   nop
 /* 2951C 8004E11C 50400008 */  beql      $v0, $zero, .L8004E140
 /* 29520 8004E120 24100002 */   addiu    $s0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s
index 8c3b709f57..cff3be401f 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s
@@ -61,7 +61,7 @@ glabel func_8004E4B8
 /* 29978 8004E578 0200202D */   daddu    $a0, $s0, $zero
 /* 2997C 8004E57C 0801396C */  j         .L8004E5B0
 /* 29980 8004E580 3222FFFF */   andi     $v0, $s1, 0xffff
-/* 29984 8004E584 0C013976 */  jal       func_8004E5D8
+/* 29984 8004E584 0C013976 */  jal       snd_initialize_bgm_player
 /* 29988 8004E588 0200202D */   daddu    $a0, $s0, $zero
 /* 2998C 8004E58C 0801396B */  j         .L8004E5AC
 /* 29990 8004E590 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s
index e18e9eb0f5..8ed4b02c7b 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s
@@ -83,7 +83,7 @@ glabel func_8004EC68
 /* 2A184 8004ED84 10400005 */  beqz      $v0, .L8004ED9C
 /* 2A188 8004ED88 0220102D */   daddu    $v0, $s1, $zero
 /* 2A18C 8004ED8C 0280202D */  daddu     $a0, $s4, $zero
-/* 2A190 8004ED90 0C013FB4 */  jal       func_8004FED0
+/* 2A190 8004ED90 0C013FB4 */  jal       snd_BGMCmd_F6_TrackVolumeFade
 /* 2A194 8004ED94 0200282D */   daddu    $a1, $s0, $zero
 /* 2A198 8004ED98 0220102D */  daddu     $v0, $s1, $zero
 .L8004ED9C:
@@ -113,7 +113,7 @@ glabel func_8004EC68
 /* 2A1F0 8004EDF0 10400005 */  beqz      $v0, .L8004EE08
 /* 2A1F4 8004EDF4 0220102D */   daddu    $v0, $s1, $zero
 /* 2A1F8 8004EDF8 0280202D */  daddu     $a0, $s4, $zero
-/* 2A1FC 8004EDFC 0C013FB4 */  jal       func_8004FED0
+/* 2A1FC 8004EDFC 0C013FB4 */  jal       snd_BGMCmd_F6_TrackVolumeFade
 /* 2A200 8004EE00 0200282D */   daddu    $a1, $s0, $zero
 /* 2A204 8004EE04 0220102D */  daddu     $v0, $s1, $zero
 .L8004EE08:
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800506C8.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_800506C8.s
index c3e11c54d2..20f14d2c23 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800506C8.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_800506C8.s
@@ -11,7 +11,7 @@ glabel func_800506C8
 /* 2BAE0 800506E0 0200902D */  daddu     $s2, $s0, $zero
 /* 2BAE4 800506E4 1080001C */  beqz      $a0, .L80050758
 /* 2BAE8 800506E8 AFBF001C */   sw       $ra, 0x1c($sp)
-/* 2BAEC 800506EC 0C0135E5 */  jal       func_8004D794
+/* 2BAEC 800506EC 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 2BAF0 800506F0 00000000 */   nop
 /* 2BAF4 800506F4 0040282D */  daddu     $a1, $v0, $zero
 /* 2BAF8 800506F8 10A00017 */  beqz      $a1, .L80050758
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050770.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050770.s
index ecaa7902b4..9599368bb9 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050770.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050770.s
@@ -32,7 +32,7 @@ glabel func_80050770
 .L800507D8:
 /* 2BBD8 800507D8 96050208 */  lhu       $a1, 0x208($s0)
 /* 2BBDC 800507DC 0200202D */  daddu     $a0, $s0, $zero
-/* 2BBE0 800507E0 0C013F02 */  jal       func_8004FC08
+/* 2BBE0 800507E0 0C013F02 */  jal       snd_bpm_to_tempo
 /* 2BBE4 800507E4 E60400D0 */   swc1     $f4, 0xd0($s0)
 /* 2BBE8 800507E8 00021880 */  sll       $v1, $v0, 2
 /* 2BBEC 800507EC 00621821 */  addu      $v1, $v1, $v0
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050970.s b/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050970.s
index 7c89165e7a..670eda1769 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050970.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050970.s
@@ -18,7 +18,7 @@ glabel func_80050970
 /* 2BDA4 800509A4 0000B82D */  daddu     $s7, $zero, $zero
 /* 2BDA8 800509A8 1040006A */  beqz      $v0, .L80050B54
 /* 2BDAC 800509AC AFA40010 */   sw       $a0, 0x10($sp)
-/* 2BDB0 800509B0 0C0135E5 */  jal       func_8004D794
+/* 2BDB0 800509B0 0C0135E5 */  jal       snd_get_player_with_song_name
 /* 2BDB4 800509B4 0040202D */   daddu    $a0, $v0, $zero
 /* 2BDB8 800509B8 0040882D */  daddu     $s1, $v0, $zero
 /* 2BDBC 800509BC 12200063 */  beqz      $s1, .L80050B4C
@@ -75,7 +75,7 @@ glabel func_80050970
 .L80050A7C:
 /* 2BE7C 80050A7C 0220202D */  daddu     $a0, $s1, $zero
 /* 2BE80 80050A80 82500018 */  lb        $s0, 0x18($s2)
-/* 2BE84 80050A84 0C013FAC */  jal       func_8004FEB0
+/* 2BE84 80050A84 0C013FAC */  jal       snd_BGMCmd_E9_SubTrackVolume
 /* 2BE88 80050A88 0240282D */   daddu    $a1, $s2, $zero
 /* 2BE8C 80050A8C 0220202D */  daddu     $a0, $s1, $zero
 /* 2BE90 80050A90 080142C8 */  j         .L80050B20
@@ -114,7 +114,7 @@ glabel func_80050970
 .L80050B08:
 /* 2BF08 80050B08 0220202D */  daddu     $a0, $s1, $zero
 /* 2BF0C 80050B0C 82700018 */  lb        $s0, 0x18($s3)
-/* 2BF10 80050B10 0C013FAC */  jal       func_8004FEB0
+/* 2BF10 80050B10 0C013FAC */  jal       snd_BGMCmd_E9_SubTrackVolume
 /* 2BF14 80050B14 0260282D */   daddu    $a1, $s3, $zero
 /* 2BF18 80050B18 0220202D */  daddu     $a0, $s1, $zero
 /* 2BF1C 80050B1C 0260282D */  daddu     $a1, $s3, $zero
@@ -122,7 +122,7 @@ glabel func_80050970
 /* 2BF20 80050B20 24020060 */  addiu     $v0, $zero, 0x60
 /* 2BF24 80050B24 A22000D4 */  sb        $zero, 0xd4($s1)
 /* 2BF28 80050B28 A62200D4 */  sh        $v0, 0xd4($s1)
-/* 2BF2C 80050B2C 0C013FB4 */  jal       func_8004FED0
+/* 2BF2C 80050B2C 0C013FB4 */  jal       snd_BGMCmd_F6_TrackVolumeFade
 /* 2BF30 80050B30 A23000D6 */   sb       $s0, 0xd6($s1)
 .L80050B34:
 /* 2BF34 80050B34 26B50001 */  addiu     $s5, $s5, 1
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004FE6C.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_E8_TrackOverridePatch.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004FE6C.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_E8_TrackOverridePatch.s
index 46f7d611f1..b34e8053fb 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004FE6C.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_E8_TrackOverridePatch.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004FE6C
+glabel snd_BGMCmd_E8_TrackOverridePatch
 /* 2B26C 8004FE6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 2B270 8004FE70 0080102D */  daddu     $v0, $a0, $zero
 /* 2B274 8004FE74 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050020.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F5_TrackVoice.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_80050020.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F5_TrackVoice.s
index 9af20eb5fc..6060b41490 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050020.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F5_TrackVoice.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80050020
+glabel snd_BGMCmd_F5_TrackVoice
 /* 2B420 80050020 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 2B424 80050024 AFB20018 */  sw        $s2, 0x18($sp)
 /* 2B428 80050028 00A0902D */  daddu     $s2, $a1, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F6_TrackVolumeFade.s
similarity index 90%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F6_TrackVolumeFade.s
index 93c3694601..16f44e1ddf 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F6_TrackVolumeFade.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004FED0
+glabel snd_BGMCmd_F6_TrackVolumeFade
 /* 2B2D0 8004FED0 908200D6 */  lbu       $v0, 0xd6($a0)
 /* 2B2D4 8004FED4 948600D4 */  lhu       $a2, 0xd4($a0)
 /* 2B2D8 8004FED8 3044007F */  andi      $a0, $v0, 0x7f
@@ -10,7 +10,7 @@ glabel func_8004FED0
 .L8004FEE4:
 /* 2B2E4 8004FEE4 8CA20018 */  lw        $v0, 0x18($a1)
 /* 2B2E8 8004FEE8 10820012 */  beq       $a0, $v0, .L8004FF34
-/* 2B2EC 8004FEEC 00000000 */   nop      
+/* 2B2EC 8004FEEC 00000000 */   nop
 /* 2B2F0 8004FEF0 58C00002 */  blezl     $a2, .L8004FEFC
 /* 2B2F4 8004FEF4 24060001 */   addiu    $a2, $zero, 1
 /* 2B2F8 8004FEF8 8CA20018 */  lw        $v0, 0x18($a1)
@@ -24,7 +24,7 @@ glabel func_8004FED0
 /* 2B310 8004FF10 14C10004 */  bne       $a2, $at, .L8004FF24
 /* 2B314 8004FF14 3C018000 */   lui      $at, 0x8000
 /* 2B318 8004FF18 14410002 */  bne       $v0, $at, .L8004FF24
-/* 2B31C 8004FF1C 00000000 */   nop      
+/* 2B31C 8004FF1C 00000000 */   nop
 /* 2B320 8004FF20 0006000D */  break     6
 .L8004FF24:
 /* 2B324 8004FF24 00001012 */   mflo     $v0
@@ -33,4 +33,4 @@ glabel func_8004FED0
 /* 2B330 8004FF30 ACA2001C */  sw        $v0, 0x1c($a1)
 .L8004FF34:
 /* 2B334 8004FF34 03E00008 */  jr        $ra
-/* 2B338 8004FF38 00000000 */   nop      
+/* 2B338 8004FF38 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800501A8.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FC_Jump.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_800501A8.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FC_Jump.s
index 24711c48f9..39df987e6c 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800501A8.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FC_Jump.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_800501A8
+glabel snd_BGMCmd_FC_Jump
 /* 2B5A8 800501A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 2B5AC 800501AC AFB3001C */  sw        $s3, 0x1c($sp)
 /* 2B5B0 800501B0 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8005015C.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FD.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8005015C.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FD.s
index 04d5099076..4910c415cb 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8005015C.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FD.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8005015C
+glabel snd_BGMCmd_FD
 /* 2B55C 8005015C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 2B560 80050160 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 2B564 80050164 8C8600D4 */  lw        $a2, 0xd4($a0)
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800502F0.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FF.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_800502F0.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FF.s
index 67cac92bad..e39609d7af 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800502F0.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FF.s
@@ -8,7 +8,7 @@ glabel jtbl_800988D8
 
 .section .text
 
-glabel func_800502F0
+glabel snd_BGMCmd_FF
 /* 2B6F0 800502F0 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 2B6F4 800502F4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 2B6F8 800502F8 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D794.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_get_player_with_song_name.s
similarity index 87%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D794.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_get_player_with_song_name.s
index 9ac813a525..296720e98a 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D794.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_get_player_with_song_name.s
@@ -1,22 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004D794
+glabel snd_get_player_with_song_name
 /* 28B94 8004D794 3C05800A */  lui       $a1, %hi(D_8009A664)
 /* 28B98 8004D798 8CA5A664 */  lw        $a1, %lo(D_8009A664)($a1)
 /* 28B9C 8004D79C 8CA30000 */  lw        $v1, ($a1)
 /* 28BA0 8004D7A0 8C62005C */  lw        $v0, 0x5c($v1)
 /* 28BA4 8004D7A4 8C420008 */  lw        $v0, 8($v0)
 /* 28BA8 8004D7A8 10820009 */  beq       $a0, $v0, .L8004D7D0
-/* 28BAC 8004D7AC 00000000 */   nop      
+/* 28BAC 8004D7AC 00000000 */   nop
 /* 28BB0 8004D7B0 8C620060 */  lw        $v0, 0x60($v1)
 /* 28BB4 8004D7B4 8C420008 */  lw        $v0, 8($v0)
 /* 28BB8 8004D7B8 14820007 */  bne       $a0, $v0, .L8004D7D8
-/* 28BBC 8004D7BC 00000000 */   nop      
+/* 28BBC 8004D7BC 00000000 */   nop
 /* 28BC0 8004D7C0 3C02800A */  lui       $v0, %hi(D_8009A5FC)
 /* 28BC4 8004D7C4 8C42A5FC */  lw        $v0, %lo(D_8009A5FC)($v0)
 /* 28BC8 8004D7C8 03E00008 */  jr        $ra
-/* 28BCC 8004D7CC 00000000 */   nop      
+/* 28BCC 8004D7CC 00000000 */   nop
 .L8004D7D0:
 /* 28BD0 8004D7D0 03E00008 */  jr        $ra
 /* 28BD4 8004D7D4 00A0102D */   daddu    $v0, $a1, $zero
diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_initialize_bgm_player.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s
rename to ver/us/asm/nonmatchings/code_28910_len_5090/snd_initialize_bgm_player.s
index 1cc450295f..4732e82428 100644
--- a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s
+++ b/ver/us/asm/nonmatchings/code_28910_len_5090/snd_initialize_bgm_player.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8004E5D8
+glabel snd_initialize_bgm_player
 /* 299D8 8004E5D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 299DC 8004E5DC AFB10014 */  sw        $s1, 0x14($sp)
 /* 299E0 8004E5E0 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050B90.s b/ver/us/asm/nonmatchings/code_2BF90/func_80050B90.s
index b9413f94a3..e1f5ded4d4 100644
--- a/ver/us/asm/nonmatchings/code_2BF90/func_80050B90.s
+++ b/ver/us/asm/nonmatchings/code_2BF90/func_80050B90.s
@@ -13,7 +13,7 @@ glabel func_80050B90
 /* 2BFB0 80050BB0 00C0902D */  daddu     $s2, $a2, $zero
 /* 2BFB4 80050BB4 24050834 */  addiu     $a1, $zero, 0x834
 /* 2BFB8 80050BB8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 2BFBC 80050BBC 0C0153A4 */  jal       func_80054E90
+/* 2BFBC 80050BBC 0C0153A4 */  jal       snd_memset
 /* 2BFC0 80050BC0 0000302D */   daddu    $a2, $zero, $zero
 /* 2BFC4 80050BC4 0000182D */  daddu     $v1, $zero, $zero
 /* 2BFC8 80050BC8 24060001 */  addiu     $a2, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_800510A4.s b/ver/us/asm/nonmatchings/code_2BF90/func_800510A4.s
index e35710649e..6c4dddc86a 100644
--- a/ver/us/asm/nonmatchings/code_2BF90/func_800510A4.s
+++ b/ver/us/asm/nonmatchings/code_2BF90/func_800510A4.s
@@ -20,7 +20,7 @@ glabel func_800510A4
 /* 2C4E0 800510E0 0240202D */  daddu     $a0, $s2, $zero
 /* 2C4E4 800510E4 240501E4 */  addiu     $a1, $zero, 0x1e4
 /* 2C4E8 800510E8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 2C4EC 800510EC 0C0153A4 */  jal       func_80054E90
+/* 2C4EC 800510EC 0C0153A4 */  jal       snd_memset
 /* 2C4F0 800510F0 0000302D */   daddu    $a2, $zero, $zero
 /* 2C4F4 800510F4 AE500000 */  sw        $s0, ($s2)
 /* 2C4F8 800510F8 96030010 */  lhu       $v1, 0x10($s0)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053974.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053974.s
deleted file mode 100644
index 6e66e54c35..0000000000
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053974.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80053974
-/* 2ED74 80053974 0080402D */  daddu     $t0, $a0, $zero
-/* 2ED78 80053978 00063400 */  sll       $a2, $a2, 0x10
-/* 2ED7C 8005397C AD060000 */  sw        $a2, ($t0)
-/* 2ED80 80053980 10A00020 */  beqz      $a1, .L80053A04
-/* 2ED84 80053984 A5070008 */   sh       $a3, 8($t0)
-/* 2ED88 80053988 3C03B65C */  lui       $v1, 0xb65c
-/* 2ED8C 8005398C 34636D59 */  ori       $v1, $v1, 0x6d59
-/* 2ED90 80053990 00051140 */  sll       $v0, $a1, 5
-/* 2ED94 80053994 00451023 */  subu      $v0, $v0, $a1
-/* 2ED98 80053998 00021080 */  sll       $v0, $v0, 2
-/* 2ED9C 8005399C 00451021 */  addu      $v0, $v0, $a1
-/* 2EDA0 800539A0 000210C0 */  sll       $v0, $v0, 3
-/* 2EDA4 800539A4 00430018 */  mult      $v0, $v1
-/* 2EDA8 800539A8 00001810 */  mfhi      $v1
-/* 2EDAC 800539AC 00622021 */  addu      $a0, $v1, $v0
-/* 2EDB0 800539B0 00042303 */  sra       $a0, $a0, 0xc
-/* 2EDB4 800539B4 000217C3 */  sra       $v0, $v0, 0x1f
-/* 2EDB8 800539B8 00822023 */  subu      $a0, $a0, $v0
-/* 2EDBC 800539BC 00C0102D */  daddu     $v0, $a2, $zero
-/* 2EDC0 800539C0 00071C00 */  sll       $v1, $a3, 0x10
-/* 2EDC4 800539C4 00621823 */  subu      $v1, $v1, $v0
-/* 2EDC8 800539C8 00041400 */  sll       $v0, $a0, 0x10
-/* 2EDCC 800539CC 00021403 */  sra       $v0, $v0, 0x10
-/* 2EDD0 800539D0 14400002 */  bnez      $v0, .L800539DC
-/* 2EDD4 800539D4 0062001A */   div      $zero, $v1, $v0
-/* 2EDD8 800539D8 0007000D */  break     7
-.L800539DC:
-/* 2EDDC 800539DC 2401FFFF */   addiu    $at, $zero, -1
-/* 2EDE0 800539E0 14410004 */  bne       $v0, $at, .L800539F4
-/* 2EDE4 800539E4 3C018000 */   lui      $at, 0x8000
-/* 2EDE8 800539E8 14610002 */  bne       $v1, $at, .L800539F4
-/* 2EDEC 800539EC 00000000 */   nop
-/* 2EDF0 800539F0 0006000D */  break     6
-.L800539F4:
-/* 2EDF4 800539F4 00001812 */   mflo     $v1
-/* 2EDF8 800539F8 A504000A */  sh        $a0, 0xa($t0)
-/* 2EDFC 800539FC 08014E84 */  j         .L80053A10
-/* 2EE00 80053A00 AD030004 */   sw       $v1, 4($t0)
-.L80053A04:
-/* 2EE04 80053A04 24020001 */  addiu     $v0, $zero, 1
-/* 2EE08 80053A08 A502000A */  sh        $v0, 0xa($t0)
-/* 2EE0C 80053A0C AD000004 */  sw        $zero, 4($t0)
-.L80053A10:
-/* 2EE10 80053A10 03E00008 */  jr        $ra
-/* 2EE14 80053A14 AD00000C */   sw       $zero, 0xc($t0)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s
deleted file mode 100644
index dd89b4351d..0000000000
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80053C58
-/* 2F058 80053C58 3C03800A */  lui       $v1, %hi(D_8009A5C0)
-/* 2F05C 80053C5C 8C63A5C0 */  lw        $v1, %lo(D_8009A5C0)($v1)
-/* 2F060 80053C60 24020001 */  addiu     $v0, $zero, 1
-/* 2F064 80053C64 1082000B */  beq       $a0, $v0, .L80053C94
-/* 2F068 80053C68 00000000 */   nop
-/* 2F06C 80053C6C 10800003 */  beqz      $a0, .L80053C7C
-/* 2F070 80053C70 24020002 */   addiu    $v0, $zero, 2
-/* 2F074 80053C74 5482000D */  bnel      $a0, $v0, .L80053CAC
-/* 2F078 80053C78 ACA00000 */   sw       $zero, ($a1)
-.L80053C7C:
-/* 2F07C 80053C7C 8C62005C */  lw        $v0, 0x5c($v1)
-/* 2F080 80053C80 ACA20000 */  sw        $v0, ($a1)
-/* 2F084 80053C84 3C02800A */  lui       $v0, %hi(D_8009A664)
-/* 2F088 80053C88 8C42A664 */  lw        $v0, %lo(D_8009A664)($v0)
-/* 2F08C 80053C8C 03E00008 */  jr        $ra
-/* 2F090 80053C90 ACC20000 */   sw       $v0, ($a2)
-.L80053C94:
-/* 2F094 80053C94 8C620060 */  lw        $v0, 0x60($v1)
-/* 2F098 80053C98 ACA20000 */  sw        $v0, ($a1)
-/* 2F09C 80053C9C 3C02800A */  lui       $v0, %hi(D_8009A5FC)
-/* 2F0A0 80053CA0 8C42A5FC */  lw        $v0, %lo(D_8009A5FC)($v0)
-/* 2F0A4 80053CA4 03E00008 */  jr        $ra
-/* 2F0A8 80053CA8 ACC20000 */   sw       $v0, ($a2)
-.L80053CAC:
-/* 2F0AC 80053CAC 03E00008 */  jr        $ra
-/* 2F0B0 80053CB0 ACC00000 */   sw       $zero, ($a2)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053CB4.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053CB4.s
deleted file mode 100644
index ac58a5e082..0000000000
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053CB4.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80053CB4
-/* 2F0B4 80053CB4 24020001 */  addiu     $v0, $zero, 1
-/* 2F0B8 80053CB8 10820009 */  beq       $a0, $v0, .L80053CE0
-/* 2F0BC 80053CBC 00000000 */   nop
-/* 2F0C0 80053CC0 10800003 */  beqz      $a0, .L80053CD0
-/* 2F0C4 80053CC4 24020002 */   addiu    $v0, $zero, 2
-/* 2F0C8 80053CC8 14820009 */  bne       $a0, $v0, .L80053CF0
-/* 2F0CC 80053CCC 00000000 */   nop
-.L80053CD0:
-/* 2F0D0 80053CD0 3C02800A */  lui       $v0, %hi(D_8009A664)
-/* 2F0D4 80053CD4 8C42A664 */  lw        $v0, %lo(D_8009A664)($v0)
-/* 2F0D8 80053CD8 03E00008 */  jr        $ra
-/* 2F0DC 80053CDC ACA20000 */   sw       $v0, ($a1)
-.L80053CE0:
-/* 2F0E0 80053CE0 3C02800A */  lui       $v0, %hi(D_8009A5FC)
-/* 2F0E4 80053CE4 8C42A5FC */  lw        $v0, %lo(D_8009A5FC)($v0)
-/* 2F0E8 80053CE8 03E00008 */  jr        $ra
-/* 2F0EC 80053CEC ACA20000 */   sw       $v0, ($a1)
-.L80053CF0:
-/* 2F0F0 80053CF0 03E00008 */  jr        $ra
-/* 2F0F4 80053CF4 ACA00000 */   sw       $zero, ($a1)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s
index e0f3613166..5620421855 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s
@@ -18,7 +18,7 @@ glabel func_80053E58
 /* 2F28C 80053E8C 000420C0 */  sll       $a0, $a0, 3
 /* 2F290 80053E90 00448821 */  addu      $s1, $v0, $a0
 /* 2F294 80053E94 96240000 */  lhu       $a0, ($s1)
-/* 2F298 80053E98 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F298 80053E98 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F29C 80053E9C 27A60018 */   addiu    $a2, $sp, 0x18
 /* 2F2A0 80053EA0 0040982D */  daddu     $s3, $v0, $zero
 /* 2F2A4 80053EA4 16600026 */  bnez      $s3, .L80053F40
@@ -32,7 +32,7 @@ glabel func_80053E58
 /* 2F2C4 80053EC4 24150030 */  addiu     $s5, $zero, 0x30
 /* 2F2C8 80053EC8 8FA6001C */  lw        $a2, 0x1c($sp)
 /* 2F2CC 80053ECC 8FA40018 */  lw        $a0, 0x18($sp)
-/* 2F2D0 80053ED0 0C015380 */  jal       al_DmaCopy
+/* 2F2D0 80053ED0 0C015380 */  jal       snd_read_rom
 /* 2F2D4 80053ED4 00C23024 */   and      $a2, $a2, $v0
 .L80053ED8:
 /* 2F2D8 80053ED8 96220002 */  lhu       $v0, 2($s1)
@@ -52,7 +52,7 @@ glabel func_80053E58
 /* 2F310 80053F10 54550006 */  bnel      $v0, $s5, .L80053F2C
 /* 2F314 80053F14 24130066 */   addiu    $s3, $zero, 0x66
 /* 2F318 80053F18 0060202D */  daddu     $a0, $v1, $zero
-/* 2F31C 80053F1C 0C015313 */  jal       func_80054C4C
+/* 2F31C 80053F1C 0C015313 */  jal       snd_load_BK
 /* 2F320 80053F20 0200282D */   daddu    $a1, $s0, $zero
 /* 2F324 80053F24 08014FCC */  j         .L80053F30
 /* 2F328 80053F28 26310002 */   addiu    $s1, $s1, 2
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s
index 651859300f..74ef958a3d 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s
@@ -28,7 +28,7 @@ glabel func_80053F80
 /* 2F3DC 80053FDC 00021040 */  sll       $v0, $v0, 1
 /* 2F3E0 80053FE0 00431021 */  addu      $v0, $v0, $v1
 /* 2F3E4 80053FE4 94440000 */  lhu       $a0, ($v0)
-/* 2F3E8 80053FE8 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F3E8 80053FE8 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F3EC 80053FEC 27A60010 */   addiu    $a2, $sp, 0x10
 /* 2F3F0 80053FF0 1440008B */  bnez      $v0, .L80054220
 /* 2F3F4 80053FF4 3C0200FF */   lui      $v0, 0xff
@@ -36,7 +36,7 @@ glabel func_80053F80
 /* 2F3FC 80053FFC 8FA40010 */  lw        $a0, 0x10($sp)
 /* 2F400 80054000 8FA60014 */  lw        $a2, 0x14($sp)
 /* 2F404 80054004 8E650064 */  lw        $a1, 0x64($s3)
-/* 2F408 80054008 0C015380 */  jal       al_DmaCopy
+/* 2F408 80054008 0C015380 */  jal       snd_read_rom
 /* 2F40C 8005400C 00C23024 */   and      $a2, $a2, $v0
 /* 2F410 80054010 24030001 */  addiu     $v1, $zero, 1
 /* 2F414 80054014 8E620064 */  lw        $v0, 0x64($s3)
@@ -83,7 +83,7 @@ glabel func_80053F80
 /* 2F4AC 800540AC 00021040 */  sll       $v0, $v0, 1
 /* 2F4B0 800540B0 00431021 */  addu      $v0, $v0, $v1
 /* 2F4B4 800540B4 94440000 */  lhu       $a0, ($v0)
-/* 2F4B8 800540B8 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F4B8 800540B8 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F4BC 800540BC 27A60010 */   addiu    $a2, $sp, 0x10
 /* 2F4C0 800540C0 14400057 */  bnez      $v0, .L80054220
 /* 2F4C4 800540C4 3C1100FF */   lui      $s1, 0xff
@@ -91,7 +91,7 @@ glabel func_80053F80
 /* 2F4CC 800540CC 0200282D */  daddu     $a1, $s0, $zero
 /* 2F4D0 800540D0 8FA60014 */  lw        $a2, 0x14($sp)
 /* 2F4D4 800540D4 8FA40010 */  lw        $a0, 0x10($sp)
-/* 2F4D8 800540D8 0C015380 */  jal       al_DmaCopy
+/* 2F4D8 800540D8 0C015380 */  jal       snd_read_rom
 /* 2F4DC 800540DC 00D13024 */   and      $a2, $a2, $s1
 /* 2F4E0 800540E0 24050040 */  addiu     $a1, $zero, 0x40
 /* 2F4E4 800540E4 27A60010 */  addiu     $a2, $sp, 0x10
@@ -105,14 +105,14 @@ glabel func_80053F80
 /* 2F504 80054104 94640000 */  lhu       $a0, ($v1)
 /* 2F508 80054108 00451021 */  addu      $v0, $v0, $a1
 /* 2F50C 8005410C 00511024 */  and       $v0, $v0, $s1
-/* 2F510 80054110 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F510 80054110 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F514 80054114 02028021 */   addu     $s0, $s0, $v0
 /* 2F518 80054118 14400041 */  bnez      $v0, .L80054220
 /* 2F51C 8005411C 00000000 */   nop
 /* 2F520 80054120 0200282D */  daddu     $a1, $s0, $zero
 /* 2F524 80054124 8FA60014 */  lw        $a2, 0x14($sp)
 /* 2F528 80054128 8FA40010 */  lw        $a0, 0x10($sp)
-/* 2F52C 8005412C 0C015380 */  jal       al_DmaCopy
+/* 2F52C 8005412C 0C015380 */  jal       snd_read_rom
 /* 2F530 80054130 00D13024 */   and      $a2, $a2, $s1
 /* 2F534 80054134 24050040 */  addiu     $a1, $zero, 0x40
 /* 2F538 80054138 27A60010 */  addiu     $a2, $sp, 0x10
@@ -126,14 +126,14 @@ glabel func_80053F80
 /* 2F558 80054158 94640000 */  lhu       $a0, ($v1)
 /* 2F55C 8005415C 00451021 */  addu      $v0, $v0, $a1
 /* 2F560 80054160 00511024 */  and       $v0, $v0, $s1
-/* 2F564 80054164 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F564 80054164 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F568 80054168 02028021 */   addu     $s0, $s0, $v0
 /* 2F56C 8005416C 1440002C */  bnez      $v0, .L80054220
 /* 2F570 80054170 00000000 */   nop
 /* 2F574 80054174 0200282D */  daddu     $a1, $s0, $zero
 /* 2F578 80054178 8FA60014 */  lw        $a2, 0x14($sp)
 /* 2F57C 8005417C 8FA40010 */  lw        $a0, 0x10($sp)
-/* 2F580 80054180 0C015380 */  jal       al_DmaCopy
+/* 2F580 80054180 0C015380 */  jal       snd_read_rom
 /* 2F584 80054184 00D13024 */   and      $a2, $a2, $s1
 /* 2F588 80054188 24050040 */  addiu     $a1, $zero, 0x40
 /* 2F58C 8005418C 27A60010 */  addiu     $a2, $sp, 0x10
@@ -147,14 +147,14 @@ glabel func_80053F80
 /* 2F5AC 800541AC 94640000 */  lhu       $a0, ($v1)
 /* 2F5B0 800541B0 00451021 */  addu      $v0, $v0, $a1
 /* 2F5B4 800541B4 00511024 */  and       $v0, $v0, $s1
-/* 2F5B8 800541B8 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F5B8 800541B8 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F5BC 800541BC 02028021 */   addu     $s0, $s0, $v0
 /* 2F5C0 800541C0 14400017 */  bnez      $v0, .L80054220
 /* 2F5C4 800541C4 00000000 */   nop
 /* 2F5C8 800541C8 0200282D */  daddu     $a1, $s0, $zero
 /* 2F5CC 800541CC 8FA60014 */  lw        $a2, 0x14($sp)
 /* 2F5D0 800541D0 8FA40010 */  lw        $a0, 0x10($sp)
-/* 2F5D4 800541D4 0C015380 */  jal       al_DmaCopy
+/* 2F5D4 800541D4 0C015380 */  jal       snd_read_rom
 /* 2F5D8 800541D8 00D13024 */   and      $a2, $a2, $s1
 /* 2F5DC 800541DC 24050030 */  addiu     $a1, $zero, 0x30
 /* 2F5E0 800541E0 24020004 */  addiu     $v0, $zero, 4
@@ -166,12 +166,12 @@ glabel func_80053F80
 /* 2F5F8 800541F8 00021040 */  sll       $v0, $v0, 1
 /* 2F5FC 800541FC 00431021 */  addu      $v0, $v0, $v1
 /* 2F600 80054200 94440000 */  lhu       $a0, ($v0)
-/* 2F604 80054204 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F604 80054204 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F608 80054208 27A60010 */   addiu    $a2, $sp, 0x10
 /* 2F60C 8005420C 14400004 */  bnez      $v0, .L80054220
 /* 2F610 80054210 00000000 */   nop
 /* 2F614 80054214 8FA40010 */  lw        $a0, 0x10($sp)
-/* 2F618 80054218 0C015313 */  jal       func_80054C4C
+/* 2F618 80054218 0C015313 */  jal       snd_load_BK
 /* 2F61C 8005421C 24050002 */   addiu    $a1, $zero, 2
 .L80054220:
 /* 2F620 80054220 8FBF0030 */  lw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054744.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054744.s
deleted file mode 100644
index fcc375772a..0000000000
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054744.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel jtbl_800988F0
-.word L80054778_2FB78, L80054784_2FB84, L800547B4_2FBB4, L80054790_2FB90, L8005479C_2FB9C, L800547A8_2FBA8
-
-.section .text
-
-glabel func_80054744
-/* 2FB44 80054744 0000182D */  daddu     $v1, $zero, $zero
-/* 2FB48 80054748 3C06800A */  lui       $a2, %hi(D_8009A5C0)
-/* 2FB4C 8005474C 8CC6A5C0 */  lw        $a2, %lo(D_8009A5C0)($a2)
-/* 2FB50 80054750 2484FFFF */  addiu     $a0, $a0, -1
-/* 2FB54 80054754 2C820006 */  sltiu     $v0, $a0, 6
-/* 2FB58 80054758 10400019 */  beqz      $v0, .L800547C0
-/* 2FB5C 8005475C 00052900 */   sll      $a1, $a1, 4
-/* 2FB60 80054760 00041080 */  sll       $v0, $a0, 2
-/* 2FB64 80054764 3C01800A */  lui       $at, %hi(jtbl_800988F0)
-/* 2FB68 80054768 00220821 */  addu      $at, $at, $v0
-/* 2FB6C 8005476C 8C2288F0 */  lw        $v0, %lo(jtbl_800988F0)($at)
-/* 2FB70 80054770 00400008 */  jr        $v0
-/* 2FB74 80054774 00000000 */   nop
-glabel L80054778_2FB78
-/* 2FB78 80054778 00051080 */  sll       $v0, $a1, 2
-/* 2FB7C 8005477C 080151EF */  j         .L800547BC
-/* 2FB80 80054780 244204EC */   addiu    $v0, $v0, 0x4ec
-glabel L80054784_2FB84
-/* 2FB84 80054784 00051080 */  sll       $v0, $a1, 2
-/* 2FB88 80054788 080151EF */  j         .L800547BC
-/* 2FB8C 8005478C 244205EC */   addiu    $v0, $v0, 0x5ec
-glabel L80054790_2FB90
-/* 2FB90 80054790 00051080 */  sll       $v0, $a1, 2
-/* 2FB94 80054794 080151EF */  j         .L800547BC
-/* 2FB98 80054798 244209EC */   addiu    $v0, $v0, 0x9ec
-glabel L8005479C_2FB9C
-/* 2FB9C 8005479C 00051080 */  sll       $v0, $a1, 2
-/* 2FBA0 800547A0 080151EF */  j         .L800547BC
-/* 2FBA4 800547A4 24420DEC */   addiu    $v0, $v0, 0xdec
-glabel L800547A8_2FBA8
-/* 2FBA8 800547A8 00051080 */  sll       $v0, $a1, 2
-/* 2FBAC 800547AC 080151EF */  j         .L800547BC
-/* 2FBB0 800547B0 244211EC */   addiu    $v0, $v0, 0x11ec
-glabel L800547B4_2FBB4
-/* 2FBB4 800547B4 00051080 */  sll       $v0, $a1, 2
-/* 2FBB8 800547B8 244200EC */  addiu     $v0, $v0, 0xec
-.L800547BC:
-/* 2FBBC 800547BC 00C21821 */  addu      $v1, $a2, $v0
-.L800547C0:
-/* 2FBC0 800547C0 03E00008 */  jr        $ra
-/* 2FBC4 800547C4 0060102D */   daddu    $v0, $v1, $zero
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054AA0.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054AA0.s
index 295fba96fa..b9dbcf1739 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054AA0.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054AA0.s
@@ -40,7 +40,7 @@ glabel func_80054AA0
 .L80054B28:
 /* 2FF28 80054B28 27A50018 */  addiu     $a1, $sp, 0x18
 /* 2FF2C 80054B2C 8EC40000 */  lw        $a0, ($s6)
-/* 2FF30 80054B30 0C015380 */  jal       al_DmaCopy
+/* 2FF30 80054B30 0C015380 */  jal       snd_read_rom
 /* 2FF34 80054B34 24060040 */   addiu    $a2, $zero, 0x40
 /* 2FF38 80054B38 96830000 */  lhu       $v1, ($s4)
 /* 2FF3C 80054B3C 2402424B */  addiu     $v0, $zero, 0x424b
@@ -64,11 +64,11 @@ glabel func_80054AA0
 .L80054B80:
 /* 2FF80 80054B80 8EC40000 */  lw        $a0, ($s6)
 /* 2FF84 80054B84 8E860004 */  lw        $a2, 4($s4)
-/* 2FF88 80054B88 0C015380 */  jal       al_DmaCopy
+/* 2FF88 80054B88 0C015380 */  jal       snd_read_rom
 /* 2FF8C 80054B8C 0260282D */   daddu    $a1, $s3, $zero
 /* 2FF90 80054B90 8FA4008C */  lw        $a0, 0x8c($sp)
 /* 2FF94 80054B94 8FA50088 */  lw        $a1, 0x88($sp)
-/* 2FF98 80054B98 0C0151D1 */  jal       func_80054744
+/* 2FF98 80054B98 0C0151D1 */  jal       snd_get_BK_instruments
 /* 2FF9C 80054B9C 0000802D */   daddu    $s0, $zero, $zero
 /* 2FFA0 80054BA0 0040A82D */  daddu     $s5, $v0, $zero
 /* 2FFA4 80054BA4 02A0182D */  daddu     $v1, $s5, $zero
@@ -97,7 +97,7 @@ glabel func_80054AA0
 /* 2FFF0 80054BF0 0260202D */  daddu     $a0, $s3, $zero
 /* 2FFF4 80054BF4 0260282D */  daddu     $a1, $s3, $zero
 /* 2FFF8 80054BF8 02A0302D */  daddu     $a2, $s5, $zero
-/* 2FFFC 80054BFC 0C01527E */  jal       func_800549F8
+/* 2FFFC 80054BFC 0C01527E */  jal       snd_swizzle_BK_instruments
 /* 30000 80054C00 24070010 */   addiu    $a3, $zero, 0x10
 /* 30004 80054C04 08015304 */  j         .L80054C10
 /* 30008 80054C08 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s
index 7548fbb391..894553b34b 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s
@@ -10,7 +10,7 @@ glabel func_80054C84
 /* 30098 80054C98 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3009C 80054C9C AFB00010 */  sw        $s0, 0x10($sp)
 /* 300A0 80054CA0 8C500004 */  lw        $s0, 4($v0)
-/* 300A4 80054CA4 0C0151D1 */  jal       func_80054744
+/* 300A4 80054CA4 0C0151D1 */  jal       snd_get_BK_instruments
 /* 300A8 80054CA8 0060282D */   daddu    $a1, $v1, $zero
 /* 300AC 80054CAC 0040182D */  daddu     $v1, $v0, $zero
 /* 300B0 80054CB0 10600007 */  beqz      $v1, .L80054CD0
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s
deleted file mode 100644
index 524874fc4e..0000000000
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80054F48
-/* 30348 80054F48 18C00008 */  blez      $a2, .L80054F6C
-/* 3034C 80054F4C 24C6FFFF */   addiu    $a2, $a2, -1
-.L80054F50:
-/* 30350 80054F50 90820000 */  lbu       $v0, ($a0)
-/* 30354 80054F54 24840001 */  addiu     $a0, $a0, 1
-/* 30358 80054F58 00C0182D */  daddu     $v1, $a2, $zero
-/* 3035C 80054F5C 24C6FFFF */  addiu     $a2, $a2, -1
-/* 30360 80054F60 A0A20000 */  sb        $v0, ($a1)
-/* 30364 80054F64 1460FFFA */  bnez      $v1, .L80054F50
-/* 30368 80054F68 24A50001 */   addiu    $a1, $a1, 1
-.L80054F6C:
-/* 3036C 80054F6C 03E00008 */  jr        $ra
-/* 30370 80054F70 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_fetch_SBN_file.s
similarity index 98%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_fetch_SBN_file.s
index 92ab3258bf..070fb6351c 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_fetch_SBN_file.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel al_CopyFileTableEntry
+glabel snd_fetch_SBN_file
 /* 2F87C 8005447C 27BDFFF8 */  addiu     $sp, $sp, -8
 /* 2F880 80054480 3C07800A */  lui       $a3, %hi(D_8009A5C0)
 /* 2F884 80054484 8CE7A5C0 */  lw        $a3, %lo(D_8009A5C0)($a3)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_8005465C.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BGM.s
similarity index 97%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_8005465C.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BGM.s
index d5b2f3f6f9..07364e7a0b 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_8005465C.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BGM.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8005465C
+glabel snd_load_BGM
 /* 2FA5C 8005465C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 2FA60 80054660 AFB30024 */  sw        $s3, 0x24($sp)
 /* 2FA64 80054664 0000982D */  daddu     $s3, $zero, $zero
@@ -44,7 +44,7 @@ glabel func_8005465C
 /* 2FAF0 800546F0 54550006 */  bnel      $v0, $s5, .L8005470C
 /* 2FAF4 800546F4 24130066 */   addiu    $s3, $zero, 0x66
 /* 2FAF8 800546F8 0060202D */  daddu     $a0, $v1, $zero
-/* 2FAFC 800546FC 0C015313 */  jal       func_80054C4C
+/* 2FAFC 800546FC 0C015313 */  jal       snd_load_BK
 /* 2FB00 80054700 0200282D */   daddu    $a1, $s0, $zero
 /* 2FB04 80054704 080151C4 */  j         .L80054710
 /* 2FB08 80054708 26310002 */   addiu    $s1, $s1, 2
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BK_to_bank.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BK_to_bank.s
index 203175f69d..2991348acd 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BK_to_bank.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel al_LoadBank
+glabel snd_load_BK_to_bank
 /* 2FBC8 800547C8 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 2FBCC 800547CC AFB5006C */  sw        $s5, 0x6c($sp)
 /* 2FBD0 800547D0 0080A82D */  daddu     $s5, $a0, $zero
@@ -24,7 +24,7 @@ glabel al_LoadBank
 /* 2FC14 80054814 AFB60070 */  sw        $s6, 0x70($sp)
 /* 2FC18 80054818 AFB00058 */  sw        $s0, 0x58($sp)
 /* 2FC1C 8005481C 8C560018 */  lw        $s6, 0x18($v0)
-/* 2FC20 80054820 0C015380 */  jal       al_DmaCopy
+/* 2FC20 80054820 0C015380 */  jal       snd_read_rom
 /* 2FC24 80054824 24120001 */   addiu    $s2, $zero, 1
 /* 2FC28 80054828 3263FFFF */  andi      $v1, $s3, 0xffff
 .L8005482C:
@@ -97,10 +97,10 @@ glabel al_LoadBank
 .L80054920:
 /* 2FD20 80054920 02A0202D */  daddu     $a0, $s5, $zero
 /* 2FD24 80054924 0280282D */  daddu     $a1, $s4, $zero
-/* 2FD28 80054928 0C015380 */  jal       al_DmaCopy
+/* 2FD28 80054928 0C015380 */  jal       snd_read_rom
 /* 2FD2C 8005492C 0200302D */   daddu    $a2, $s0, $zero
 /* 2FD30 80054930 03C0202D */  daddu     $a0, $fp, $zero
-/* 2FD34 80054934 0C0151D1 */  jal       func_80054744
+/* 2FD34 80054934 0C0151D1 */  jal       snd_get_BK_instruments
 /* 2FD38 80054938 02E0282D */   daddu    $a1, $s7, $zero
 /* 2FD3C 8005493C 0040802D */  daddu     $s0, $v0, $zero
 /* 2FD40 80054940 0200182D */  daddu     $v1, $s0, $zero
@@ -132,7 +132,7 @@ glabel al_LoadBank
 /* 2FD98 80054998 02A0202D */  daddu     $a0, $s5, $zero
 /* 2FD9C 8005499C 0280282D */  daddu     $a1, $s4, $zero
 /* 2FDA0 800549A0 0200302D */  daddu     $a2, $s0, $zero
-/* 2FDA4 800549A4 0C01527E */  jal       func_800549F8
+/* 2FDA4 800549A4 0C01527E */  jal       snd_swizzle_BK_instruments
 /* 2FDA8 800549A8 24070010 */   addiu    $a3, $zero, 0x10
 /* 2FDAC 800549AC 0801526E */  j         .L800549B8
 /* 2FDB0 800549B0 0000982D */   daddu    $s3, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_INIT.s
similarity index 95%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_INIT.s
index 1ea7123229..ab4347c1b6 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_INIT.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel al_LoadINIT
+glabel snd_load_INIT
 /* 2F6BC 800542BC 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 2F6C0 800542C0 AFB3007C */  sw        $s3, 0x7c($sp)
 /* 2F6C4 800542C4 0080982D */  daddu     $s3, $a0, $zero
@@ -16,7 +16,7 @@ glabel al_LoadINIT
 /* 2F6E8 800542E8 2675001C */  addiu     $s5, $s3, 0x1c
 /* 2F6EC 800542EC AFBF0088 */  sw        $ra, 0x88($sp)
 /* 2F6F0 800542F0 AFB20078 */  sw        $s2, 0x78($sp)
-/* 2F6F4 800542F4 0C015380 */  jal       al_DmaCopy
+/* 2F6F4 800542F4 0C015380 */  jal       snd_read_rom
 /* 2F6F8 800542F8 AFB00070 */   sw       $s0, 0x70($sp)
 /* 2F6FC 800542FC 0280202D */  daddu     $a0, $s4, $zero
 /* 2F700 80054300 8FB00024 */  lw        $s0, 0x24($sp)
@@ -32,7 +32,7 @@ glabel al_LoadINIT
 /* 2F728 80054328 AE650020 */  sw        $a1, 0x20($s3)
 /* 2F72C 8005432C 8FA40020 */  lw        $a0, 0x20($sp)
 /* 2F730 80054330 0200302D */  daddu     $a2, $s0, $zero
-/* 2F734 80054334 0C015380 */  jal       al_DmaCopy
+/* 2F734 80054334 0C015380 */  jal       snd_read_rom
 /* 2F738 80054338 00442021 */   addu     $a0, $v0, $a0
 /* 2F73C 8005433C 8FA20024 */  lw        $v0, 0x24($sp)
 /* 2F740 80054340 8E650020 */  lw        $a1, 0x20($s3)
@@ -66,7 +66,7 @@ glabel al_LoadINIT
 /* 2F7A8 800543A8 8EB10000 */  lw        $s1, ($s5)
 /* 2F7AC 800543AC 24060020 */  addiu     $a2, $zero, 0x20
 /* 2F7B0 800543B0 02228821 */  addu      $s1, $s1, $v0
-/* 2F7B4 800543B4 0C015380 */  jal       al_DmaCopy
+/* 2F7B4 800543B4 0C015380 */  jal       snd_read_rom
 /* 2F7B8 800543B8 0220202D */   daddu    $a0, $s1, $zero
 /* 2F7BC 800543BC 0280202D */  daddu     $a0, $s4, $zero
 /* 2F7C0 800543C0 24050001 */  addiu     $a1, $zero, 1
@@ -80,7 +80,7 @@ glabel al_LoadINIT
 /* 2F7E0 800543E0 0200202D */  daddu     $a0, $s0, $zero
 /* 2F7E4 800543E4 0040282D */  daddu     $a1, $v0, $zero
 /* 2F7E8 800543E8 0240302D */  daddu     $a2, $s2, $zero
-/* 2F7EC 800543EC 0C015380 */  jal       al_DmaCopy
+/* 2F7EC 800543EC 0C015380 */  jal       snd_read_rom
 /* 2F7F0 800543F0 AE65002C */   sw       $a1, 0x2c($s3)
 /* 2F7F4 800543F4 0280202D */  daddu     $a0, $s4, $zero
 /* 2F7F8 800543F8 24050001 */  addiu     $a1, $zero, 1
@@ -94,7 +94,7 @@ glabel al_LoadINIT
 /* 2F818 80054418 0200202D */  daddu     $a0, $s0, $zero
 /* 2F81C 8005441C 0040282D */  daddu     $a1, $v0, $zero
 /* 2F820 80054420 0240302D */  daddu     $a2, $s2, $zero
-/* 2F824 80054424 0C015380 */  jal       al_DmaCopy
+/* 2F824 80054424 0C015380 */  jal       snd_read_rom
 /* 2F828 80054428 AE65003C */   sw       $a1, 0x3c($s3)
 /* 2F82C 8005442C 97A20058 */  lhu       $v0, 0x58($sp)
 /* 2F830 80054430 02228821 */  addu      $s1, $s1, $v0
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PER.s
similarity index 91%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PER.s
index b65a5361ad..07cfbb3512 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PER.s
@@ -11,13 +11,13 @@ glabel al_LoadPER
 /* 2F910 80054510 27A50010 */  addiu     $a1, $sp, 0x10
 /* 2F914 80054514 24060010 */  addiu     $a2, $zero, 0x10
 /* 2F918 80054518 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 2F91C 8005451C 0C015380 */  jal       al_DmaCopy
+/* 2F91C 8005451C 0C015380 */  jal       snd_read_rom
 /* 2F920 80054520 AFB10024 */   sw       $s1, 0x24($sp)
 /* 2F924 80054524 26040010 */  addiu     $a0, $s0, 0x10
 /* 2F928 80054528 8FB00014 */  lw        $s0, 0x14($sp)
 /* 2F92C 8005452C 8E450054 */  lw        $a1, 0x54($s2)
 /* 2F930 80054530 2610FFF0 */  addiu     $s0, $s0, -0x10
-/* 2F934 80054534 0C015380 */  jal       al_DmaCopy
+/* 2F934 80054534 0C015380 */  jal       snd_read_rom
 /* 2F938 80054538 0200302D */   daddu    $a2, $s0, $zero
 /* 2F93C 8005453C 3C0238E3 */  lui       $v0, 0x38e3
 /* 2F940 80054540 34428E39 */  ori       $v0, $v0, 0x8e39
@@ -34,14 +34,14 @@ glabel al_LoadPER
 /* 2F96C 8005456C 8E500054 */  lw        $s0, 0x54($s2)
 /* 2F970 80054570 00021100 */  sll       $v0, $v0, 4
 /* 2F974 80054574 02028021 */  addu      $s0, $s0, $v0
-/* 2F978 80054578 0C0153DD */  jal       al_CopyWords
+/* 2F978 80054578 0C0153DD */  jal       snd_copy_words
 /* 2F97C 8005457C 0200282D */   daddu    $a1, $s0, $zero
 /* 2F980 80054580 0200202D */  daddu     $a0, $s0, $zero
 /* 2F984 80054584 2485000C */  addiu     $a1, $a0, 0xc
 /* 2F988 80054588 001130C0 */  sll       $a2, $s1, 3
 /* 2F98C 8005458C 00D13021 */  addu      $a2, $a2, $s1
 /* 2F990 80054590 00063100 */  sll       $a2, $a2, 4
-/* 2F994 80054594 0C0153DD */  jal       al_CopyWords
+/* 2F994 80054594 0C0153DD */  jal       snd_copy_words
 /* 2F998 80054598 24C6FFF4 */   addiu    $a2, $a2, -0xc
 .L8005459C:
 /* 2F99C 8005459C 8FBF002C */  lw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PRG.s
similarity index 90%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PRG.s
index dcd53240c7..a2efaa5d73 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PRG.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel al_LoadPRG
+glabel snd_load_PRG
 /* 2F9B4 800545B4 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 2F9B8 800545B8 AFB20028 */  sw        $s2, 0x28($sp)
 /* 2F9BC 800545BC 0080902D */  daddu     $s2, $a0, $zero
@@ -11,7 +11,7 @@ glabel al_LoadPRG
 /* 2F9CC 800545CC 27A50010 */  addiu     $a1, $sp, 0x10
 /* 2F9D0 800545D0 24060010 */  addiu     $a2, $zero, 0x10
 /* 2F9D4 800545D4 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 2F9D8 800545D8 0C015380 */  jal       al_DmaCopy
+/* 2F9D8 800545D8 0C015380 */  jal       snd_read_rom
 /* 2F9DC 800545DC AFB10024 */   sw       $s1, 0x24($sp)
 /* 2F9E0 800545E0 8FA20014 */  lw        $v0, 0x14($sp)
 /* 2F9E4 800545E4 2451FFF0 */  addiu     $s1, $v0, -0x10
@@ -21,7 +21,7 @@ glabel al_LoadPRG
 /* 2F9F4 800545F4 24110200 */  addiu     $s1, $zero, 0x200
 .L800545F8:
 /* 2F9F8 800545F8 8E450058 */  lw        $a1, 0x58($s2)
-/* 2F9FC 800545FC 0C015380 */  jal       al_DmaCopy
+/* 2F9FC 800545FC 0C015380 */  jal       snd_read_rom
 /* 2FA00 80054600 0220302D */   daddu    $a2, $s1, $zero
 /* 2FA04 80054604 001118C2 */  srl       $v1, $s1, 3
 /* 2FA08 80054608 24020040 */  addiu     $v0, $zero, 0x40
@@ -32,12 +32,12 @@ glabel al_LoadPRG
 /* 2FA1C 8005461C 8E500058 */  lw        $s0, 0x58($s2)
 /* 2FA20 80054620 000310C0 */  sll       $v0, $v1, 3
 /* 2FA24 80054624 02028021 */  addu      $s0, $s0, $v0
-/* 2FA28 80054628 0C0153DD */  jal       al_CopyWords
+/* 2FA28 80054628 0C0153DD */  jal       snd_copy_words
 /* 2FA2C 8005462C 0200282D */   daddu    $a1, $s0, $zero
 /* 2FA30 80054630 0200202D */  daddu     $a0, $s0, $zero
 /* 2FA34 80054634 24850008 */  addiu     $a1, $a0, 8
 /* 2FA38 80054638 001130C0 */  sll       $a2, $s1, 3
-/* 2FA3C 8005463C 0C0153DD */  jal       al_CopyWords
+/* 2FA3C 8005463C 0C0153DD */  jal       snd_copy_words
 /* 2FA40 80054640 24C6FFF8 */   addiu    $a2, $a2, -8
 .L80054644:
 /* 2FA44 80054644 8FBF002C */  lw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_song_files.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_song_files.s
index 166dcc3ed2..597f4f888e 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_song_files.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80053CF8
+glabel snd_load_song_files
 /* 2F0F8 80053CF8 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 2F0FC 80053CFC AFB20028 */  sw        $s2, 0x28($sp)
 /* 2F100 80053D00 3C12800A */  lui       $s2, %hi(D_8009A5C0)
@@ -27,7 +27,7 @@ glabel func_80053CF8
 /* 2F150 80053D50 001610C0 */  sll       $v0, $s6, 3
 /* 2F154 80053D54 0062A021 */  addu      $s4, $v1, $v0
 /* 2F158 80053D58 96840000 */  lhu       $a0, ($s4)
-/* 2F15C 80053D5C 0C01511F */  jal       al_CopyFileTableEntry
+/* 2F15C 80053D5C 0C01511F */  jal       snd_fetch_SBN_file
 /* 2F160 80053D60 03A53021 */   addu     $a2, $sp, $a1
 /* 2F164 80053D64 14400030 */  bnez      $v0, .L80053E28
 /* 2F168 80053D68 00000000 */   nop
@@ -45,7 +45,7 @@ glabel func_80053CF8
 /* 2F198 80053D98 0280882D */  daddu     $s1, $s4, $zero
 /* 2F19C 80053D9C 8FA60014 */  lw        $a2, 0x14($sp)
 /* 2F1A0 80053DA0 8FA40010 */  lw        $a0, 0x10($sp)
-/* 2F1A4 80053DA4 0C015380 */  jal       al_DmaCopy
+/* 2F1A4 80053DA4 0C015380 */  jal       snd_read_rom
 /* 2F1A8 80053DA8 00C23024 */   and      $a2, $a2, $v0
 .L80053DAC:
 /* 2F1AC 80053DAC 96220002 */  lhu       $v0, 2($s1)
@@ -65,7 +65,7 @@ glabel func_80053CF8
 /* 2F1E4 80053DE4 545E0005 */  bnel      $v0, $fp, .L80053DFC
 /* 2F1E8 80053DE8 26100001 */   addiu    $s0, $s0, 1
 /* 2F1EC 80053DEC 0060202D */  daddu     $a0, $v1, $zero
-/* 2F1F0 80053DF0 0C015313 */  jal       func_80054C4C
+/* 2F1F0 80053DF0 0C015313 */  jal       snd_load_BK
 /* 2F1F4 80053DF4 0200282D */   daddu    $a1, $s0, $zero
 /* 2F1F8 80053DF8 26100001 */  addiu     $s0, $s0, 1
 .L80053DFC:
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_memset.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_memset.s
index 19cc0bcff3..3c2c41c8b9 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_memset.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80054E90
+glabel snd_memset
 /* 30290 80054E90 10A0000A */  beqz      $a1, .L80054EBC
 /* 30294 80054E94 28A20400 */   slti     $v0, $a1, 0x400
 /* 30298 80054E98 1040000A */  beqz      $v0, .L80054EC4
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_read_rom.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_read_rom.s
index 050f105609..2126b882c0 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_read_rom.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel al_DmaCopy
+glabel snd_read_rom
 /* 30200 80054E00 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 30204 80054E04 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 30208 80054E08 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_swizzle_BK_instruments.s
similarity index 98%
rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s
rename to ver/us/asm/nonmatchings/code_2e230_len_2190/snd_swizzle_BK_instruments.s
index 8e088d41f3..dfe36579ee 100644
--- a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s
+++ b/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_swizzle_BK_instruments.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_800549F8
+glabel snd_swizzle_BK_instruments
 /* 2FDF8 800549F8 00A0582D */  daddu     $t3, $a1, $zero
 /* 2FDFC 800549FC 3C03800A */  lui       $v1, %hi(D_8009A5C0)
 /* 2FE00 80054A00 8C63A5C0 */  lw        $v1, %lo(D_8009A5C0)($v1)
diff --git a/ver/us/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s b/ver/us/asm/nonmatchings/code_303c0_len_3e10/snd_load_BK_headers.s
similarity index 90%
rename from ver/us/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s
rename to ver/us/asm/nonmatchings/code_303c0_len_3e10/snd_load_BK_headers.s
index a90f3fe8e8..26a78aea1e 100644
--- a/ver/us/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s
+++ b/ver/us/asm/nonmatchings/code_303c0_len_3e10/snd_load_BK_headers.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel al_LoadBKHeaders
+glabel snd_load_BK_headers
 /* 303C0 80054FC0 27BDFE98 */  addiu     $sp, $sp, -0x168
 /* 303C4 80054FC4 0080102D */  daddu     $v0, $a0, $zero
 /* 303C8 80054FC8 27A50018 */  addiu     $a1, $sp, 0x18
@@ -13,7 +13,7 @@ glabel al_LoadBKHeaders
 /* 303E0 80054FE0 AFB00158 */  sw        $s0, 0x158($sp)
 /* 303E4 80054FE4 8C440034 */  lw        $a0, 0x34($v0)
 /* 303E8 80054FE8 8C460038 */  lw        $a2, 0x38($v0)
-/* 303EC 80054FEC 0C015380 */  jal       al_DmaCopy
+/* 303EC 80054FEC 0C015380 */  jal       snd_read_rom
 /* 303F0 80054FF0 00A0802D */   daddu    $s0, $a1, $zero
 .L80054FF4:
 /* 303F4 80054FF4 96020000 */  lhu       $v0, ($s0)
@@ -21,13 +21,13 @@ glabel al_LoadBKHeaders
 /* 303FC 80054FFC 24050030 */   addiu    $a1, $zero, 0x30
 /* 30400 80055000 27A60010 */  addiu     $a2, $sp, 0x10
 /* 30404 80055004 0040202D */  daddu     $a0, $v0, $zero
-/* 30408 80055008 0C01511F */  jal       al_CopyFileTableEntry
+/* 30408 80055008 0C01511F */  jal       snd_fetch_SBN_file
 /* 3040C 8005500C 26310001 */   addiu    $s1, $s1, 1
 /* 30410 80055010 0000282D */  daddu     $a1, $zero, $zero
 /* 30414 80055014 8FA40010 */  lw        $a0, 0x10($sp)
 /* 30418 80055018 92060002 */  lbu       $a2, 2($s0)
 /* 3041C 8005501C 92070003 */  lbu       $a3, 3($s0)
-/* 30420 80055020 0C0151F2 */  jal       al_LoadBank
+/* 30420 80055020 0C0151F2 */  jal       snd_load_BK_to_bank
 /* 30424 80055024 26100004 */   addiu    $s0, $s0, 4
 /* 30428 80055028 2A220050 */  slti      $v0, $s1, 0x50
 /* 3042C 8005502C 1440FFF1 */  bnez      $v0, .L80054FF4
diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055068.s b/ver/us/asm/nonmatchings/code_30450/func_80055068.s
index 94e47cda7c..e013b2b56f 100644
--- a/ver/us/asm/nonmatchings/code_30450/func_80055068.s
+++ b/ver/us/asm/nonmatchings/code_30450/func_80055068.s
@@ -26,13 +26,13 @@ glabel func_80055068
 /* 304B8 800550B8 00502006 */   srlv     $a0, $s0, $v0
 /* 304BC 800550BC 0000282D */  daddu     $a1, $zero, $zero
 /* 304C0 800550C0 00A0302D */  daddu     $a2, $a1, $zero
-/* 304C4 800550C4 0C015490 */  jal       func_80055240
+/* 304C4 800550C4 0C015490 */  jal       snd_start_sound_with_shift
 /* 304C8 800550C8 00A0382D */   daddu    $a3, $a1, $zero
 /* 304CC 800550CC 08015440 */  j         .L80055100
 /* 304D0 800550D0 00000000 */   nop
 .L800550D4:
 /* 304D4 800550D4 308400FF */  andi      $a0, $a0, 0xff
-/* 304D8 800550D8 0C015635 */  jal       func_800558D4
+/* 304D8 800550D8 0C015635 */  jal       snd_load_song
 /* 304DC 800550DC 0000282D */   daddu    $a1, $zero, $zero
 /* 304E0 800550E0 3C033020 */  lui       $v1, 0x3020
 /* 304E4 800550E4 34632000 */  ori       $v1, $v1, 0x2000
diff --git a/ver/us/asm/nonmatchings/code_30450/func_800558D4.s b/ver/us/asm/nonmatchings/code_30450/snd_load_song.s
similarity index 86%
rename from ver/us/asm/nonmatchings/code_30450/func_800558D4.s
rename to ver/us/asm/nonmatchings/code_30450/snd_load_song.s
index aad940d030..3fbb9b6e70 100644
--- a/ver/us/asm/nonmatchings/code_30450/func_800558D4.s
+++ b/ver/us/asm/nonmatchings/code_30450/snd_load_song.s
@@ -1,20 +1,20 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_800558D4
+glabel snd_load_song
 /* 30CD4 800558D4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 30CD8 800558D8 AFB00018 */  sw        $s0, 0x18($sp)
 /* 30CDC 800558DC 0080802D */  daddu     $s0, $a0, $zero
 /* 30CE0 800558E0 00A0202D */  daddu     $a0, $a1, $zero
 /* 30CE4 800558E4 27A50010 */  addiu     $a1, $sp, 0x10
 /* 30CE8 800558E8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 30CEC 800558EC 0C014F16 */  jal       func_80053C58
+/* 30CEC 800558EC 0C014F16 */  jal       snd_get_sequence_player_and_track
 /* 30CF0 800558F0 27A60014 */   addiu    $a2, $sp, 0x14
 /* 30CF4 800558F4 8FA50010 */  lw        $a1, 0x10($sp)
 /* 30CF8 800558F8 10A00004 */  beqz      $a1, .L8005590C
 /* 30CFC 800558FC 24020003 */   addiu    $v0, $zero, 3
 /* 30D00 80055900 8FA60014 */  lw        $a2, 0x14($sp)
-/* 30D04 80055904 0C014F3E */  jal       func_80053CF8
+/* 30D04 80055904 0C014F3E */  jal       snd_load_song_files
 /* 30D08 80055908 0200202D */   daddu    $a0, $s0, $zero
 .L8005590C:
 /* 30D0C 8005590C 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/code_31650/alAudioFrame.s b/ver/us/asm/nonmatchings/code_31650/alAudioFrame.s
index b7f81272b1..ba229034d4 100644
--- a/ver/us/asm/nonmatchings/code_31650/alAudioFrame.s
+++ b/ver/us/asm/nonmatchings/code_31650/alAudioFrame.s
@@ -66,7 +66,7 @@ glabel alAudioFrame
 /* 31AA0 800566A0 3C1E800A */  lui       $fp, %hi(D_800A3FE8)
 /* 31AA4 800566A4 27DE3FE8 */  addiu     $fp, $fp, %lo(D_800A3FE8)
 .L800566A8:
-/* 31AA8 800566A8 0C014CF4 */  jal       func_800533D0
+/* 31AA8 800566A8 0C014CF4 */  jal       snd_update_sequence_players
 /* 31AAC 800566AC 0000A82D */   daddu    $s5, $zero, $zero
 /* 31AB0 800566B0 3C038008 */  lui       $v1, %hi(D_80078E54)
 /* 31AB4 800566B4 8C638E54 */  lw        $v1, %lo(D_80078E54)($v1)
diff --git a/ver/us/asm/nonmatchings/code_31650/func_80056FA4.s b/ver/us/asm/nonmatchings/code_31650/func_80056FA4.s
index 477051f52b..e2de29b215 100644
--- a/ver/us/asm/nonmatchings/code_31650/func_80056FA4.s
+++ b/ver/us/asm/nonmatchings/code_31650/func_80056FA4.s
@@ -67,7 +67,7 @@ glabel func_80056FA4
 /* 32498 80057098 8C820014 */  lw        $v0, 0x14($a0)
 /* 3249C 8005709C 8CE50008 */  lw        $a1, 8($a3)
 /* 324A0 800570A0 8C440008 */  lw        $a0, 8($v0)
-/* 324A4 800570A4 0C015FF6 */  jal       func_80057FD8
+/* 324A4 800570A4 0C015FF6 */  jal       alCopy
 /* 324A8 800570A8 24060020 */   addiu    $a2, $zero, 0x20
 /* 324AC 800570AC 08015C3C */  j         .L800570F0
 /* 324B0 800570B0 24050001 */   addiu    $a1, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_31650/func_80057224.s b/ver/us/asm/nonmatchings/code_31650/func_80057224.s
index 948223cb3b..b39e74c583 100644
--- a/ver/us/asm/nonmatchings/code_31650/func_80057224.s
+++ b/ver/us/asm/nonmatchings/code_31650/func_80057224.s
@@ -54,7 +54,7 @@ glabel func_80057224
 /* 326E4 800572E4 8CA20014 */  lw        $v0, 0x14($a1)
 /* 326E8 800572E8 8CC50008 */  lw        $a1, 8($a2)
 /* 326EC 800572EC 8C440008 */  lw        $a0, 8($v0)
-/* 326F0 800572F0 0C015FF6 */  jal       func_80057FD8
+/* 326F0 800572F0 0C015FF6 */  jal       alCopy
 /* 326F4 800572F4 24060020 */   addiu    $a2, $zero, 0x20
 /* 326F8 800572F8 08015CCE */  j         .L80057338
 /* 326FC 800572FC 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/can_switch_to_player.s b/ver/us/asm/nonmatchings/code_415D90/can_switch_to_player.s
deleted file mode 100644
index c19f8a7c8c..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/can_switch_to_player.s
+++ /dev/null
@@ -1,61 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel can_switch_to_player
-/* 41A5A8 802A5818 3C06800E */  lui       $a2, %hi(gBattleStatus)
-/* 41A5AC 802A581C 24C6C070 */  addiu     $a2, $a2, %lo(gBattleStatus)
-/* 41A5B0 802A5820 8CC20004 */  lw        $v0, 4($a2)
-/* 41A5B4 802A5824 8CC500D8 */  lw        $a1, 0xd8($a2)
-/* 41A5B8 802A5828 30420002 */  andi      $v0, $v0, 2
-/* 41A5BC 802A582C 14400026 */  bnez      $v0, .L802A58C8
-/* 41A5C0 802A5830 0000102D */   daddu    $v0, $zero, $zero
-/* 41A5C4 802A5834 80A20216 */  lb        $v0, 0x216($a1)
-/* 41A5C8 802A5838 80A30210 */  lb        $v1, 0x210($a1)
-/* 41A5CC 802A583C 3842000D */  xori      $v0, $v0, 0xd
-/* 41A5D0 802A5840 2C440001 */  sltiu     $a0, $v0, 1
-/* 41A5D4 802A5844 24020009 */  addiu     $v0, $zero, 9
-/* 41A5D8 802A5848 50620001 */  beql      $v1, $v0, .L802A5850
-/* 41A5DC 802A584C 0000202D */   daddu    $a0, $zero, $zero
-.L802A5850:
-/* 41A5E0 802A5850 2402000A */  addiu     $v0, $zero, 0xa
-/* 41A5E4 802A5854 50620001 */  beql      $v1, $v0, .L802A585C
-/* 41A5E8 802A5858 0000202D */   daddu    $a0, $zero, $zero
-.L802A585C:
-/* 41A5EC 802A585C 24020006 */  addiu     $v0, $zero, 6
-/* 41A5F0 802A5860 50620001 */  beql      $v1, $v0, .L802A5868
-/* 41A5F4 802A5864 24040001 */   addiu    $a0, $zero, 1
-.L802A5868:
-/* 41A5F8 802A5868 24020003 */  addiu     $v0, $zero, 3
-/* 41A5FC 802A586C 50620001 */  beql      $v1, $v0, .L802A5874
-/* 41A600 802A5870 24040001 */   addiu    $a0, $zero, 1
-.L802A5874:
-/* 41A604 802A5874 24020004 */  addiu     $v0, $zero, 4
-/* 41A608 802A5878 50620001 */  beql      $v1, $v0, .L802A5880
-/* 41A60C 802A587C 24040001 */   addiu    $a0, $zero, 1
-.L802A5880:
-/* 41A610 802A5880 24020005 */  addiu     $v0, $zero, 5
-/* 41A614 802A5884 50620001 */  beql      $v1, $v0, .L802A588C
-/* 41A618 802A5888 24040001 */   addiu    $a0, $zero, 1
-.L802A588C:
-/* 41A61C 802A588C 24020007 */  addiu     $v0, $zero, 7
-/* 41A620 802A5890 50620001 */  beql      $v1, $v0, .L802A5898
-/* 41A624 802A5894 24040001 */   addiu    $a0, $zero, 1
-.L802A5898:
-/* 41A628 802A5898 24020008 */  addiu     $v0, $zero, 8
-/* 41A62C 802A589C 50620001 */  beql      $v1, $v0, .L802A58A4
-/* 41A630 802A58A0 24040001 */   addiu    $a0, $zero, 1
-.L802A58A4:
-/* 41A634 802A58A4 80A30214 */  lb        $v1, 0x214($a1)
-/* 41A638 802A58A8 2402000C */  addiu     $v0, $zero, 0xc
-/* 41A63C 802A58AC 50620001 */  beql      $v1, $v0, .L802A58B4
-/* 41A640 802A58B0 24040001 */   addiu    $a0, $zero, 1
-.L802A58B4:
-/* 41A644 802A58B4 80C2009A */  lb        $v0, 0x9a($a2)
-/* 41A648 802A58B8 54400001 */  bnel      $v0, $zero, .L802A58C0
-/* 41A64C 802A58BC 24040001 */   addiu    $a0, $zero, 1
-.L802A58C0:
-/* 41A650 802A58C0 03E00008 */  jr        $ra
-/* 41A654 802A58C4 38820001 */   xori     $v0, $a0, 1
-.L802A58C8:
-/* 41A658 802A58C8 03E00008 */  jr        $ra
-/* 41A65C 802A58CC 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s b/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s
index 57f5c7d1ae..0cba8e4c3f 100644
--- a/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s
+++ b/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802AB770
+.word L802A1DB4_416B44, L802A2644_4173D4, L802A1CC4_416A54, L802A1DB4_416B44, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A1DB4_416B44, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A1DB4_416B44, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A2644_4173D4, L802A1DB4_416B44
+
+glabel D_802AB7F0
+.double 1.6071428571428572
+
+glabel D_802AB7F8
+.double 22.5
+
+glabel D_802AB800
+.double 0.01
+
+.section .text
+
 glabel draw_battle_wheel
 /* 4169E4 802A1C54 3C02802B */  lui       $v0, %hi(D_802AD000)
 /* 4169E8 802A1C58 9042D000 */  lbu       $v0, %lo(D_802AD000)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A1000.s b/ver/us/asm/nonmatchings/code_415D90/func_802A1000.s
deleted file mode 100644
index e741d95908..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A1000.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A1000
-/* 415D90 802A1000 240200FF */  addiu     $v0, $zero, 0xff
-/* 415D94 802A1004 3C01802B */  lui       $at, %hi(D_802AD006)
-/* 415D98 802A1008 A422D006 */  sh        $v0, %lo(D_802AD006)($at)
-/* 415D9C 802A100C 3C01802B */  lui       $at, %hi(D_802AD008)
-/* 415DA0 802A1010 A422D008 */  sh        $v0, %lo(D_802AD008)($at)
-/* 415DA4 802A1014 2402FFFF */  addiu     $v0, $zero, -1
-/* 415DA8 802A1018 3C01802B */  lui       $at, %hi(D_802AD000)
-/* 415DAC 802A101C A020D000 */  sb        $zero, %lo(D_802AD000)($at)
-/* 415DB0 802A1020 3C01802B */  lui       $at, %hi(D_802AD068)
-/* 415DB4 802A1024 A022D068 */  sb        $v0, %lo(D_802AD068)($at)
-/* 415DB8 802A1028 03E00008 */  jr        $ra
-/* 415DBC 802A102C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A1030.s b/ver/us/asm/nonmatchings/code_415D90/func_802A1030.s
deleted file mode 100644
index eb8a503d27..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A1030.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A1030
-/* 415DC0 802A1030 24020003 */  addiu     $v0, $zero, 3
-/* 415DC4 802A1034 3C01802B */  lui       $at, %hi(D_802AD001)
-/* 415DC8 802A1038 A022D001 */  sb        $v0, %lo(D_802AD001)($at)
-/* 415DCC 802A103C 2402000A */  addiu     $v0, $zero, 0xa
-/* 415DD0 802A1040 3C01802B */  lui       $at, %hi(D_802AD000)
-/* 415DD4 802A1044 A022D000 */  sb        $v0, %lo(D_802AD000)($at)
-/* 415DD8 802A1048 03E00008 */  jr        $ra
-/* 415DDC 802A104C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A1050.s b/ver/us/asm/nonmatchings/code_415D90/func_802A1050.s
deleted file mode 100644
index d530e05364..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A1050.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A1050
-/* 415DE0 802A1050 24020002 */  addiu     $v0, $zero, 2
-/* 415DE4 802A1054 3C01802B */  lui       $at, %hi(D_802AD000)
-/* 415DE8 802A1058 A022D000 */  sb        $v0, %lo(D_802AD000)($at)
-/* 415DEC 802A105C 240200FF */  addiu     $v0, $zero, 0xff
-/* 415DF0 802A1060 3C01802B */  lui       $at, %hi(D_802AD006)
-/* 415DF4 802A1064 A422D006 */  sh        $v0, %lo(D_802AD006)($at)
-/* 415DF8 802A1068 3C01802B */  lui       $at, %hi(D_802AD008)
-/* 415DFC 802A106C A422D008 */  sh        $v0, %lo(D_802AD008)($at)
-/* 415E00 802A1070 03E00008 */  jr        $ra
-/* 415E04 802A1074 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A1078.s b/ver/us/asm/nonmatchings/code_415D90/func_802A1078.s
deleted file mode 100644
index 50d6ed2afb..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A1078.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A1078
-/* 415E08 802A1078 240200FF */  addiu     $v0, $zero, 0xff
-/* 415E0C 802A107C 3C01802B */  lui       $at, %hi(D_802AD008)
-/* 415E10 802A1080 A422D008 */  sh        $v0, %lo(D_802AD008)($at)
-/* 415E14 802A1084 24020014 */  addiu     $v0, $zero, 0x14
-/* 415E18 802A1088 3C01802B */  lui       $at, %hi(D_802AD000)
-/* 415E1C 802A108C A022D000 */  sb        $v0, %lo(D_802AD000)($at)
-/* 415E20 802A1090 03E00008 */  jr        $ra
-/* 415E24 802A1094 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A1098.s b/ver/us/asm/nonmatchings/code_415D90/func_802A1098.s
deleted file mode 100644
index 7d0e38bf81..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A1098.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A1098
-/* 415E28 802A1098 24020064 */  addiu     $v0, $zero, 0x64
-/* 415E2C 802A109C 3C01802B */  lui       $at, %hi(D_802AD008)
-/* 415E30 802A10A0 A422D008 */  sh        $v0, %lo(D_802AD008)($at)
-/* 415E34 802A10A4 2402001E */  addiu     $v0, $zero, 0x1e
-/* 415E38 802A10A8 3C01802B */  lui       $at, %hi(D_802AD000)
-/* 415E3C 802A10AC A022D000 */  sb        $v0, %lo(D_802AD000)($at)
-/* 415E40 802A10B0 03E00008 */  jr        $ra
-/* 415E44 802A10B4 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A10B8.s b/ver/us/asm/nonmatchings/code_415D90/func_802A10B8.s
deleted file mode 100644
index 29f37fd466..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A10B8.s
+++ /dev/null
@@ -1,68 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A10B8
-/* 415E48 802A10B8 3C02802B */  lui       $v0, %hi(main_menu_numOptions)
-/* 415E4C 802A10BC 8C42D0AC */  lw        $v0, %lo(main_menu_numOptions)($v0)
-/* 415E50 802A10C0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 415E54 802A10C4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 415E58 802A10C8 0000802D */  daddu     $s0, $zero, $zero
-/* 415E5C 802A10CC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 415E60 802A10D0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 415E64 802A10D4 18400010 */  blez      $v0, .L802A1118
-/* 415E68 802A10D8 AFB10014 */   sw       $s1, 0x14($sp)
-/* 415E6C 802A10DC 3C12802B */  lui       $s2, %hi(D_802AD028)
-/* 415E70 802A10E0 2652D028 */  addiu     $s2, $s2, %lo(D_802AD028)
-/* 415E74 802A10E4 3C11802B */  lui       $s1, %hi(D_802AD010)
-/* 415E78 802A10E8 2631D010 */  addiu     $s1, $s1, %lo(D_802AD010)
-.L802A10EC:
-/* 415E7C 802A10EC 8E240000 */  lw        $a0, ($s1)
-/* 415E80 802A10F0 0C05123D */  jal       free_icon
-/* 415E84 802A10F4 26310004 */   addiu    $s1, $s1, 4
-/* 415E88 802A10F8 8E440000 */  lw        $a0, ($s2)
-/* 415E8C 802A10FC 0C05123D */  jal       free_icon
-/* 415E90 802A1100 26100001 */   addiu    $s0, $s0, 1
-/* 415E94 802A1104 3C02802B */  lui       $v0, %hi(main_menu_numOptions)
-/* 415E98 802A1108 8C42D0AC */  lw        $v0, %lo(main_menu_numOptions)($v0)
-/* 415E9C 802A110C 0202102A */  slt       $v0, $s0, $v0
-/* 415EA0 802A1110 1440FFF6 */  bnez      $v0, .L802A10EC
-/* 415EA4 802A1114 26520004 */   addiu    $s2, $s2, 4
-.L802A1118:
-/* 415EA8 802A1118 3C04802B */  lui       $a0, %hi(D_802AD040)
-/* 415EAC 802A111C 8C84D040 */  lw        $a0, %lo(D_802AD040)($a0)
-/* 415EB0 802A1120 0C05123D */  jal       free_icon
-/* 415EB4 802A1124 00000000 */   nop
-/* 415EB8 802A1128 3C04802B */  lui       $a0, %hi(D_802AD044)
-/* 415EBC 802A112C 8C84D044 */  lw        $a0, %lo(D_802AD044)($a0)
-/* 415EC0 802A1130 0C05123D */  jal       free_icon
-/* 415EC4 802A1134 00000000 */   nop
-/* 415EC8 802A1138 3C04802B */  lui       $a0, %hi(D_802AD048)
-/* 415ECC 802A113C 8C84D048 */  lw        $a0, %lo(D_802AD048)($a0)
-/* 415ED0 802A1140 0C05123D */  jal       free_icon
-/* 415ED4 802A1144 00000000 */   nop
-/* 415ED8 802A1148 3C04802B */  lui       $a0, %hi(D_802AD04C)
-/* 415EDC 802A114C 8C84D04C */  lw        $a0, %lo(D_802AD04C)($a0)
-/* 415EE0 802A1150 0C05123D */  jal       free_icon
-/* 415EE4 802A1154 00000000 */   nop
-/* 415EE8 802A1158 3C04802B */  lui       $a0, %hi(D_802AD05C)
-/* 415EEC 802A115C 8C84D05C */  lw        $a0, %lo(D_802AD05C)($a0)
-/* 415EF0 802A1160 0C05123D */  jal       free_icon
-/* 415EF4 802A1164 00000000 */   nop
-/* 415EF8 802A1168 3C04802B */  lui       $a0, %hi(D_802AD050)
-/* 415EFC 802A116C 8C84D050 */  lw        $a0, %lo(D_802AD050)($a0)
-/* 415F00 802A1170 0C05123D */  jal       free_icon
-/* 415F04 802A1174 00000000 */   nop
-/* 415F08 802A1178 3C04802B */  lui       $a0, %hi(D_802AD054)
-/* 415F0C 802A117C 8C84D054 */  lw        $a0, %lo(D_802AD054)($a0)
-/* 415F10 802A1180 0C05123D */  jal       free_icon
-/* 415F14 802A1184 00000000 */   nop
-/* 415F18 802A1188 3C04802B */  lui       $a0, %hi(D_802AD058)
-/* 415F1C 802A118C 8C84D058 */  lw        $a0, %lo(D_802AD058)($a0)
-/* 415F20 802A1190 0C05123D */  jal       free_icon
-/* 415F24 802A1194 00000000 */   nop
-/* 415F28 802A1198 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 415F2C 802A119C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 415F30 802A11A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 415F34 802A11A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 415F38 802A11A8 03E00008 */  jr        $ra
-/* 415F3C 802A11AC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A11B0.s b/ver/us/asm/nonmatchings/code_415D90/func_802A11B0.s
index bb1e65b751..4fc7106573 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A11B0.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A11B0.s
@@ -556,12 +556,12 @@ glabel func_802A11B0
 /* 4167AC 802A1A1C 8C22D0D0 */  lw        $v0, %lo(battle_menu_isEnabled)($at)
 /* 4167B0 802A1A20 14450005 */  bne       $v0, $a1, .L802A1A38
 /* 4167B4 802A1A24 00000000 */   nop
-/* 4167B8 802A1A28 0C05272D */  jal       play_sound
+/* 4167B8 802A1A28 0C05272D */  jal       sfx_play_sound
 /* 4167BC 802A1A2C 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 4167C0 802A1A30 080A8708 */  j         .L802A1C20
 /* 4167C4 802A1A34 2402FFFF */   addiu    $v0, $zero, -1
 .L802A1A38:
-/* 4167C8 802A1A38 0C05272D */  jal       play_sound
+/* 4167C8 802A1A38 0C05272D */  jal       sfx_play_sound
 /* 4167CC 802A1A3C 2404021D */   addiu    $a0, $zero, 0x21d
 /* 4167D0 802A1A40 82220000 */  lb        $v0, ($s1)
 /* 4167D4 802A1A44 82430000 */  lb        $v1, ($s2)
@@ -622,7 +622,7 @@ glabel func_802A11B0
 /* 4168A4 802A1B14 24020001 */   addiu    $v0, $zero, 1
 /* 4168A8 802A1B18 3C01802B */  lui       $at, %hi(D_802AD004)
 /* 4168AC 802A1B1C A022D004 */  sb        $v0, %lo(D_802AD004)($at)
-/* 4168B0 802A1B20 0C05272D */  jal       play_sound
+/* 4168B0 802A1B20 0C05272D */  jal       sfx_play_sound
 /* 4168B4 802A1B24 240400C8 */   addiu    $a0, $zero, 0xc8
 /* 4168B8 802A1B28 080A870A */  j         .L802A1C28
 /* 4168BC 802A1B2C 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A27D0.s b/ver/us/asm/nonmatchings/code_415D90/func_802A27D0.s
deleted file mode 100644
index 7ad063ace3..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A27D0.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A27D0
-/* 417560 802A27D0 2402000A */  addiu     $v0, $zero, 0xa
-/* 417564 802A27D4 3C01802B */  lui       $at, %hi(battle_menu_moveState)
-/* 417568 802A27D8 A022D108 */  sb        $v0, %lo(battle_menu_moveState)($at)
-/* 41756C 802A27DC 03E00008 */  jr        $ra
-/* 417570 802A27E0 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2910.s b/ver/us/asm/nonmatchings/code_415D90/func_802A2910.s
deleted file mode 100644
index 2b17d60821..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A2910.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A2910
-/* 4176A0 802A2910 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 4176A4 802A2914 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 4176A8 802A2918 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 4176AC 802A291C AFB00010 */  sw        $s0, 0x10($sp)
-/* 4176B0 802A2920 0000802D */  daddu     $s0, $zero, $zero
-/* 4176B4 802A2924 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 4176B8 802A2928 1840000F */  blez      $v0, .L802A2968
-/* 4176BC 802A292C AFB10014 */   sw       $s1, 0x14($sp)
-/* 4176C0 802A2930 3C11802B */  lui       $s1, %hi(battle_menu_moveOptionIconIDs)
-/* 4176C4 802A2934 2631D128 */  addiu     $s1, $s1, %lo(battle_menu_moveOptionIconIDs)
-/* 4176C8 802A2938 240500FF */  addiu     $a1, $zero, 0xff
-.L802A293C:
-/* 4176CC 802A293C 00A0302D */  daddu     $a2, $a1, $zero
-/* 4176D0 802A2940 00A0382D */  daddu     $a3, $a1, $zero
-/* 4176D4 802A2944 8E240000 */  lw        $a0, ($s1)
-/* 4176D8 802A2948 0C0513BF */  jal       icon_set_tint
-/* 4176DC 802A294C 26310004 */   addiu    $s1, $s1, 4
-/* 4176E0 802A2950 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 4176E4 802A2954 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 4176E8 802A2958 26100001 */  addiu     $s0, $s0, 1
-/* 4176EC 802A295C 0202102A */  slt       $v0, $s0, $v0
-/* 4176F0 802A2960 1440FFF6 */  bnez      $v0, .L802A293C
-/* 4176F4 802A2964 240500FF */   addiu    $a1, $zero, 0xff
-.L802A2968:
-/* 4176F8 802A2968 240500FF */  addiu     $a1, $zero, 0xff
-/* 4176FC 802A296C 00A0302D */  daddu     $a2, $a1, $zero
-/* 417700 802A2970 3C04802B */  lui       $a0, %hi(battle_menu_moveCursorIcon)
-/* 417704 802A2974 8C84D118 */  lw        $a0, %lo(battle_menu_moveCursorIcon)($a0)
-/* 417708 802A2978 0C0513BF */  jal       icon_set_tint
-/* 41770C 802A297C 00A0382D */   daddu    $a3, $a1, $zero
-/* 417710 802A2980 240500FF */  addiu     $a1, $zero, 0xff
-/* 417714 802A2984 00A0302D */  daddu     $a2, $a1, $zero
-/* 417718 802A2988 3C04802B */  lui       $a0, %hi(battle_menu_moveUpArrowIcon)
-/* 41771C 802A298C 8C84D11C */  lw        $a0, %lo(battle_menu_moveUpArrowIcon)($a0)
-/* 417720 802A2990 0C0513BF */  jal       icon_set_tint
-/* 417724 802A2994 00A0382D */   daddu    $a3, $a1, $zero
-/* 417728 802A2998 240500FF */  addiu     $a1, $zero, 0xff
-/* 41772C 802A299C 00A0302D */  daddu     $a2, $a1, $zero
-/* 417730 802A29A0 3C04802B */  lui       $a0, %hi(battle_menu_moveDownArrowIcon)
-/* 417734 802A29A4 8C84D120 */  lw        $a0, %lo(battle_menu_moveDownArrowIcon)($a0)
-/* 417738 802A29A8 0C0513BF */  jal       icon_set_tint
-/* 41773C 802A29AC 00A0382D */   daddu    $a3, $a1, $zero
-/* 417740 802A29B0 240500FF */  addiu     $a1, $zero, 0xff
-/* 417744 802A29B4 00A0302D */  daddu     $a2, $a1, $zero
-/* 417748 802A29B8 3C04802B */  lui       $a0, %hi(battle_menu_moveTitleIcon)
-/* 41774C 802A29BC 8C84D188 */  lw        $a0, %lo(battle_menu_moveTitleIcon)($a0)
-/* 417750 802A29C0 0C0513BF */  jal       icon_set_tint
-/* 417754 802A29C4 00A0382D */   daddu    $a3, $a1, $zero
-/* 417758 802A29C8 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 41775C 802A29CC 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 417760 802A29D0 1840000F */  blez      $v0, .L802A2A10
-/* 417764 802A29D4 0000802D */   daddu    $s0, $zero, $zero
-/* 417768 802A29D8 3C11802B */  lui       $s1, %hi(battle_menu_moveOptionCostUnitIconIDs)
-/* 41776C 802A29DC 2631D190 */  addiu     $s1, $s1, %lo(battle_menu_moveOptionCostUnitIconIDs)
-/* 417770 802A29E0 240500FF */  addiu     $a1, $zero, 0xff
-.L802A29E4:
-/* 417774 802A29E4 00A0302D */  daddu     $a2, $a1, $zero
-/* 417778 802A29E8 00A0382D */  daddu     $a3, $a1, $zero
-/* 41777C 802A29EC 8E240000 */  lw        $a0, ($s1)
-/* 417780 802A29F0 0C0513BF */  jal       icon_set_tint
-/* 417784 802A29F4 26310004 */   addiu    $s1, $s1, 4
-/* 417788 802A29F8 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 41778C 802A29FC 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 417790 802A2A00 26100001 */  addiu     $s0, $s0, 1
-/* 417794 802A2A04 0202102A */  slt       $v0, $s0, $v0
-/* 417798 802A2A08 5440FFF6 */  bnel      $v0, $zero, .L802A29E4
-/* 41779C 802A2A0C 240500FF */   addiu    $a1, $zero, 0xff
-.L802A2A10:
-/* 4177A0 802A2A10 3C04802B */  lui       $a0, %hi(battle_menu_moveCursorIcon)
-/* 4177A4 802A2A14 8C84D118 */  lw        $a0, %lo(battle_menu_moveCursorIcon)($a0)
-/* 4177A8 802A2A18 3C058010 */  lui       $a1, %hi(D_80104A28)
-/* 4177AC 802A2A1C 24A54A28 */  addiu     $a1, $a1, %lo(D_80104A28)
-/* 4177B0 802A2A20 0C0511FF */  jal       set_menu_icon_script
-/* 4177B4 802A2A24 00000000 */   nop
-/* 4177B8 802A2A28 24040001 */  addiu     $a0, $zero, 1
-/* 4177BC 802A2A2C 0C051F9F */  jal       set_window_update
-/* 4177C0 802A2A30 24050005 */   addiu    $a1, $zero, 5
-/* 4177C4 802A2A34 3C02802B */  lui       $v0, %hi(battle_menu_hasSpiritsMenu)
-/* 4177C8 802A2A38 8C42D4A0 */  lw        $v0, %lo(battle_menu_hasSpiritsMenu)($v0)
-/* 4177CC 802A2A3C 54400006 */  bnel      $v0, $zero, .L802A2A58
-/* 4177D0 802A2A40 24040004 */   addiu    $a0, $zero, 4
-/* 4177D4 802A2A44 24040002 */  addiu     $a0, $zero, 2
-/* 4177D8 802A2A48 0C051F9F */  jal       set_window_update
-/* 4177DC 802A2A4C 24050005 */   addiu    $a1, $zero, 5
-/* 4177E0 802A2A50 080A8A99 */  j         .L802A2A64
-/* 4177E4 802A2A54 24040003 */   addiu    $a0, $zero, 3
-.L802A2A58:
-/* 4177E8 802A2A58 0C051F9F */  jal       set_window_update
-/* 4177EC 802A2A5C 24050005 */   addiu    $a1, $zero, 5
-/* 4177F0 802A2A60 24040005 */  addiu     $a0, $zero, 5
-.L802A2A64:
-/* 4177F4 802A2A64 0C051F9F */  jal       set_window_update
-/* 4177F8 802A2A68 24050005 */   addiu    $a1, $zero, 5
-/* 4177FC 802A2A6C 24040008 */  addiu     $a0, $zero, 8
-/* 417800 802A2A70 0C051F9F */  jal       set_window_update
-/* 417804 802A2A74 24050001 */   addiu    $a1, $zero, 1
-/* 417808 802A2A78 2402000A */  addiu     $v0, $zero, 0xa
-/* 41780C 802A2A7C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 417810 802A2A80 8FB10014 */  lw        $s1, 0x14($sp)
-/* 417814 802A2A84 8FB00010 */  lw        $s0, 0x10($sp)
-/* 417818 802A2A88 24030001 */  addiu     $v1, $zero, 1
-/* 41781C 802A2A8C 3C01802B */  lui       $at, %hi(battle_menu_moveTextColor)
-/* 417820 802A2A90 A422D114 */  sh        $v0, %lo(battle_menu_moveTextColor)($at)
-/* 417824 802A2A94 240200FF */  addiu     $v0, $zero, 0xff
-/* 417828 802A2A98 3C01802B */  lui       $at, %hi(D_802AD10F)
-/* 41782C 802A2A9C A023D10F */  sb        $v1, %lo(D_802AD10F)($at)
-/* 417830 802A2AA0 3C01802B */  lui       $at, %hi(battle_menu_moveTextOpacity)
-/* 417834 802A2AA4 A422D116 */  sh        $v0, %lo(battle_menu_moveTextOpacity)($at)
-/* 417838 802A2AA8 3C01802B */  lui       $at, %hi(battle_menu_moveState)
-/* 41783C 802A2AAC A023D108 */  sb        $v1, %lo(battle_menu_moveState)($at)
-/* 417840 802A2AB0 03E00008 */  jr        $ra
-/* 417844 802A2AB4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2AB8.s b/ver/us/asm/nonmatchings/code_415D90/func_802A2AB8.s
deleted file mode 100644
index e008b139bc..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A2AB8.s
+++ /dev/null
@@ -1,114 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A2AB8
-/* 417848 802A2AB8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 41784C 802A2ABC 24040001 */  addiu     $a0, $zero, 1
-/* 417850 802A2AC0 24050005 */  addiu     $a1, $zero, 5
-/* 417854 802A2AC4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 417858 802A2AC8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 41785C 802A2ACC 0C051F9F */  jal       set_window_update
-/* 417860 802A2AD0 AFB00010 */   sw       $s0, 0x10($sp)
-/* 417864 802A2AD4 3C02802B */  lui       $v0, %hi(battle_menu_hasSpiritsMenu)
-/* 417868 802A2AD8 8C42D4A0 */  lw        $v0, %lo(battle_menu_hasSpiritsMenu)($v0)
-/* 41786C 802A2ADC 54400006 */  bnel      $v0, $zero, .L802A2AF8
-/* 417870 802A2AE0 24040004 */   addiu    $a0, $zero, 4
-/* 417874 802A2AE4 24040002 */  addiu     $a0, $zero, 2
-/* 417878 802A2AE8 0C051F9F */  jal       set_window_update
-/* 41787C 802A2AEC 24050005 */   addiu    $a1, $zero, 5
-/* 417880 802A2AF0 080A8AC1 */  j         .L802A2B04
-/* 417884 802A2AF4 24040003 */   addiu    $a0, $zero, 3
-.L802A2AF8:
-/* 417888 802A2AF8 0C051F9F */  jal       set_window_update
-/* 41788C 802A2AFC 24050005 */   addiu    $a1, $zero, 5
-/* 417890 802A2B00 24040005 */  addiu     $a0, $zero, 5
-.L802A2B04:
-/* 417894 802A2B04 0C051F9F */  jal       set_window_update
-/* 417898 802A2B08 24050005 */   addiu    $a1, $zero, 5
-/* 41789C 802A2B0C 24040008 */  addiu     $a0, $zero, 8
-/* 4178A0 802A2B10 0C051F9F */  jal       set_window_update
-/* 4178A4 802A2B14 24050001 */   addiu    $a1, $zero, 1
-/* 4178A8 802A2B18 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 4178AC 802A2B1C 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 4178B0 802A2B20 1840000F */  blez      $v0, .L802A2B60
-/* 4178B4 802A2B24 0000802D */   daddu    $s0, $zero, $zero
-/* 4178B8 802A2B28 3C11802B */  lui       $s1, %hi(battle_menu_moveOptionIconIDs)
-/* 4178BC 802A2B2C 2631D128 */  addiu     $s1, $s1, %lo(battle_menu_moveOptionIconIDs)
-/* 4178C0 802A2B30 240500FF */  addiu     $a1, $zero, 0xff
-.L802A2B34:
-/* 4178C4 802A2B34 00A0302D */  daddu     $a2, $a1, $zero
-/* 4178C8 802A2B38 00A0382D */  daddu     $a3, $a1, $zero
-/* 4178CC 802A2B3C 8E240000 */  lw        $a0, ($s1)
-/* 4178D0 802A2B40 0C0513BF */  jal       icon_set_tint
-/* 4178D4 802A2B44 26310004 */   addiu    $s1, $s1, 4
-/* 4178D8 802A2B48 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 4178DC 802A2B4C 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 4178E0 802A2B50 26100001 */  addiu     $s0, $s0, 1
-/* 4178E4 802A2B54 0202102A */  slt       $v0, $s0, $v0
-/* 4178E8 802A2B58 1440FFF6 */  bnez      $v0, .L802A2B34
-/* 4178EC 802A2B5C 240500FF */   addiu    $a1, $zero, 0xff
-.L802A2B60:
-/* 4178F0 802A2B60 240500FF */  addiu     $a1, $zero, 0xff
-/* 4178F4 802A2B64 00A0302D */  daddu     $a2, $a1, $zero
-/* 4178F8 802A2B68 3C04802B */  lui       $a0, %hi(battle_menu_moveCursorIcon)
-/* 4178FC 802A2B6C 8C84D118 */  lw        $a0, %lo(battle_menu_moveCursorIcon)($a0)
-/* 417900 802A2B70 0C0513BF */  jal       icon_set_tint
-/* 417904 802A2B74 00A0382D */   daddu    $a3, $a1, $zero
-/* 417908 802A2B78 240500FF */  addiu     $a1, $zero, 0xff
-/* 41790C 802A2B7C 00A0302D */  daddu     $a2, $a1, $zero
-/* 417910 802A2B80 3C04802B */  lui       $a0, %hi(battle_menu_moveUpArrowIcon)
-/* 417914 802A2B84 8C84D11C */  lw        $a0, %lo(battle_menu_moveUpArrowIcon)($a0)
-/* 417918 802A2B88 0C0513BF */  jal       icon_set_tint
-/* 41791C 802A2B8C 00A0382D */   daddu    $a3, $a1, $zero
-/* 417920 802A2B90 240500FF */  addiu     $a1, $zero, 0xff
-/* 417924 802A2B94 00A0302D */  daddu     $a2, $a1, $zero
-/* 417928 802A2B98 3C04802B */  lui       $a0, %hi(battle_menu_moveDownArrowIcon)
-/* 41792C 802A2B9C 8C84D120 */  lw        $a0, %lo(battle_menu_moveDownArrowIcon)($a0)
-/* 417930 802A2BA0 0C0513BF */  jal       icon_set_tint
-/* 417934 802A2BA4 00A0382D */   daddu    $a3, $a1, $zero
-/* 417938 802A2BA8 240500FF */  addiu     $a1, $zero, 0xff
-/* 41793C 802A2BAC 00A0302D */  daddu     $a2, $a1, $zero
-/* 417940 802A2BB0 3C04802B */  lui       $a0, %hi(battle_menu_moveTitleIcon)
-/* 417944 802A2BB4 8C84D188 */  lw        $a0, %lo(battle_menu_moveTitleIcon)($a0)
-/* 417948 802A2BB8 0C0513BF */  jal       icon_set_tint
-/* 41794C 802A2BBC 00A0382D */   daddu    $a3, $a1, $zero
-/* 417950 802A2BC0 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 417954 802A2BC4 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 417958 802A2BC8 1840000F */  blez      $v0, .L802A2C08
-/* 41795C 802A2BCC 0000802D */   daddu    $s0, $zero, $zero
-/* 417960 802A2BD0 3C11802B */  lui       $s1, %hi(battle_menu_moveOptionCostUnitIconIDs)
-/* 417964 802A2BD4 2631D190 */  addiu     $s1, $s1, %lo(battle_menu_moveOptionCostUnitIconIDs)
-/* 417968 802A2BD8 240500FF */  addiu     $a1, $zero, 0xff
-.L802A2BDC:
-/* 41796C 802A2BDC 00A0302D */  daddu     $a2, $a1, $zero
-/* 417970 802A2BE0 00A0382D */  daddu     $a3, $a1, $zero
-/* 417974 802A2BE4 8E240000 */  lw        $a0, ($s1)
-/* 417978 802A2BE8 0C0513BF */  jal       icon_set_tint
-/* 41797C 802A2BEC 26310004 */   addiu    $s1, $s1, 4
-/* 417980 802A2BF0 3C02802B */  lui       $v0, %hi(battle_menu_moveOptionCount)
-/* 417984 802A2BF4 8C42D4A4 */  lw        $v0, %lo(battle_menu_moveOptionCount)($v0)
-/* 417988 802A2BF8 26100001 */  addiu     $s0, $s0, 1
-/* 41798C 802A2BFC 0202102A */  slt       $v0, $s0, $v0
-/* 417990 802A2C00 1440FFF6 */  bnez      $v0, .L802A2BDC
-/* 417994 802A2C04 240500FF */   addiu    $a1, $zero, 0xff
-.L802A2C08:
-/* 417998 802A2C08 3C04802B */  lui       $a0, %hi(battle_menu_moveCursorIcon)
-/* 41799C 802A2C0C 8C84D118 */  lw        $a0, %lo(battle_menu_moveCursorIcon)($a0)
-/* 4179A0 802A2C10 3C058010 */  lui       $a1, %hi(D_80104A28)
-/* 4179A4 802A2C14 24A54A28 */  addiu     $a1, $a1, %lo(D_80104A28)
-/* 4179A8 802A2C18 0C0511FF */  jal       set_menu_icon_script
-/* 4179AC 802A2C1C 00000000 */   nop
-/* 4179B0 802A2C20 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 4179B4 802A2C24 8FB10014 */  lw        $s1, 0x14($sp)
-/* 4179B8 802A2C28 8FB00010 */  lw        $s0, 0x10($sp)
-/* 4179BC 802A2C2C 2402000A */  addiu     $v0, $zero, 0xa
-/* 4179C0 802A2C30 3C01802B */  lui       $at, %hi(battle_menu_moveTextColor)
-/* 4179C4 802A2C34 A422D114 */  sh        $v0, %lo(battle_menu_moveTextColor)($at)
-/* 4179C8 802A2C38 24020001 */  addiu     $v0, $zero, 1
-/* 4179CC 802A2C3C 3C01802B */  lui       $at, %hi(D_802AD10F)
-/* 4179D0 802A2C40 A022D10F */  sb        $v0, %lo(D_802AD10F)($at)
-/* 4179D4 802A2C44 24020014 */  addiu     $v0, $zero, 0x14
-/* 4179D8 802A2C48 3C01802B */  lui       $at, %hi(battle_menu_moveState)
-/* 4179DC 802A2C4C A022D108 */  sb        $v0, %lo(battle_menu_moveState)($at)
-/* 4179E0 802A2C50 03E00008 */  jr        $ra
-/* 4179E4 802A2C54 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2C58.s b/ver/us/asm/nonmatchings/code_415D90/func_802A2C58.s
deleted file mode 100644
index a8112632da..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A2C58.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A2C58
-/* 4179E8 802A2C58 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 4179EC 802A2C5C 24040008 */  addiu     $a0, $zero, 8
-/* 4179F0 802A2C60 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 4179F4 802A2C64 0C051F9F */  jal       set_window_update
-/* 4179F8 802A2C68 24050001 */   addiu    $a1, $zero, 1
-/* 4179FC 802A2C6C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 417A00 802A2C70 2402001E */  addiu     $v0, $zero, 0x1e
-/* 417A04 802A2C74 3C01802B */  lui       $at, %hi(battle_menu_moveState)
-/* 417A08 802A2C78 A022D108 */  sb        $v0, %lo(battle_menu_moveState)($at)
-/* 417A0C 802A2C7C 03E00008 */  jr        $ra
-/* 417A10 802A2C80 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s
index a9fed8f70d..f553331af5 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802AB808
+.word L802A38AC_41863C, L802A3718_4184A8, L802A2CE4_417A74, L802A3490_418220, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A38DC_41866C, L802A3974_418704, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A399C_41872C, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3A20_4187B0, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3C6C_4189FC, L802A3A78_418808, L802A3A9C_41882C, L802A3BC0_418950, 0
+
+.section .text
+
 glabel func_802A2C84
 /* 417A14 802A2C84 3C02802B */  lui       $v0, %hi(battle_menu_moveState)
 /* 417A18 802A2C88 9042D108 */  lbu       $v0, %lo(battle_menu_moveState)($v0)
@@ -621,7 +628,7 @@ glabel L802A3490_418220
 /* 41831C 802A358C 3C053EE6 */  lui       $a1, 0x3ee6
 /* 418320 802A3590 0C051308 */  jal       func_80144C20
 /* 418324 802A3594 34A56666 */   ori      $a1, $a1, 0x6666
-/* 418328 802A3598 0C05272D */  jal       play_sound
+/* 418328 802A3598 0C05272D */  jal       sfx_play_sound
 /* 41832C 802A359C 240400C7 */   addiu    $a0, $zero, 0xc7
 .L802A35A0:
 /* 418330 802A35A0 3C04802B */  lui       $a0, %hi(battle_menu_moveScrollLine)
@@ -692,12 +699,12 @@ glabel L802A3490_418220
 /* 41842C 802A369C 24020001 */  addiu     $v0, $zero, 1
 /* 418430 802A36A0 14620005 */  bne       $v1, $v0, .L802A36B8
 /* 418434 802A36A4 00000000 */   nop
-/* 418438 802A36A8 0C05272D */  jal       play_sound
+/* 418438 802A36A8 0C05272D */  jal       sfx_play_sound
 /* 41843C 802A36AC 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 418440 802A36B0 080A8F19 */  j         .L802A3C64
 /* 418444 802A36B4 2402FFFF */   addiu    $v0, $zero, -1
 .L802A36B8:
-/* 418448 802A36B8 0C05272D */  jal       play_sound
+/* 418448 802A36B8 0C05272D */  jal       sfx_play_sound
 /* 41844C 802A36BC 2404021D */   addiu    $a0, $zero, 0x21d
 /* 418450 802A36C0 82220000 */  lb        $v0, ($s1)
 /* 418454 802A36C4 00021080 */  sll       $v0, $v0, 2
@@ -717,7 +724,7 @@ glabel L802A3490_418220
 .L802A36F8:
 /* 418488 802A36F8 1040015D */  beqz      $v0, .L802A3C70
 /* 41848C 802A36FC 0000102D */   daddu    $v0, $zero, $zero
-/* 418490 802A3700 0C05272D */  jal       play_sound
+/* 418490 802A3700 0C05272D */  jal       sfx_play_sound
 /* 418494 802A3704 240400CA */   addiu    $a0, $zero, 0xca
 /* 418498 802A3708 0C0A89F9 */  jal       func_802A27E4
 /* 41849C 802A370C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s
index bdb43c69c8..cc7215b4e0 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802AB8C0
+.word L802A3D00_418A90, L802A43AC_41913C, L802A3D00_418A90, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A3D00_418A90, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A3D00_418A90, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A3D00_418A90, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A43AC_41913C, L802A3D00_418A90, L802A3D00_418A90, 0
+
+.section .text
+
 glabel func_802A3C98
 /* 418A28 802A3C98 3C02802B */  lui       $v0, %hi(battle_menu_moveState)
 /* 418A2C 802A3C9C 9042D108 */  lbu       $v0, %lo(battle_menu_moveState)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A43DC.s b/ver/us/asm/nonmatchings/code_415D90/func_802A43DC.s
deleted file mode 100644
index 84547a32c1..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A43DC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A43DC
-/* 41916C 802A43DC 3C02802B */  lui       $v0, %hi(battle_menu_hasSpiritsMenu)
-/* 419170 802A43E0 8C42D4A0 */  lw        $v0, %lo(battle_menu_hasSpiritsMenu)($v0)
-/* 419174 802A43E4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 419178 802A43E8 14400009 */  bnez      $v0, .L802A4410
-/* 41917C 802A43EC AFBF0018 */   sw       $ra, 0x18($sp)
-/* 419180 802A43F0 3C04001D */  lui       $a0, 0x1d
-/* 419184 802A43F4 34840045 */  ori       $a0, $a0, 0x45
-/* 419188 802A43F8 24A50010 */  addiu     $a1, $a1, 0x10
-/* 41918C 802A43FC 24C60002 */  addiu     $a2, $a2, 2
-/* 419190 802A4400 3C07802B */  lui       $a3, %hi(battle_menu_moveTextOpacity)
-/* 419194 802A4404 84E7D116 */  lh        $a3, %lo(battle_menu_moveTextOpacity)($a3)
-/* 419198 802A4408 080A910B */  j         .L802A442C
-/* 41919C 802A440C 24020030 */   addiu    $v0, $zero, 0x30
-.L802A4410:
-/* 4191A0 802A4410 3C04001D */  lui       $a0, 0x1d
-/* 4191A4 802A4414 3484003A */  ori       $a0, $a0, 0x3a
-/* 4191A8 802A4418 24A50006 */  addiu     $a1, $a1, 6
-/* 4191AC 802A441C 24C60002 */  addiu     $a2, $a2, 2
-/* 4191B0 802A4420 3C07802B */  lui       $a3, %hi(battle_menu_moveTextOpacity)
-/* 4191B4 802A4424 84E7D116 */  lh        $a3, %lo(battle_menu_moveTextOpacity)($a3)
-/* 4191B8 802A4428 24020031 */  addiu     $v0, $zero, 0x31
-.L802A442C:
-/* 4191BC 802A442C AFA20010 */  sw        $v0, 0x10($sp)
-/* 4191C0 802A4430 24020001 */  addiu     $v0, $zero, 1
-/* 4191C4 802A4434 0C04993B */  jal       draw_msg
-/* 4191C8 802A4438 AFA20014 */   sw       $v0, 0x14($sp)
-/* 4191CC 802A443C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 4191D0 802A4440 03E00008 */  jr        $ra
-/* 4191D4 802A4444 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4448.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4448.s
deleted file mode 100644
index da21c81f9f..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A4448.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A4448
-/* 4191D8 802A4448 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 4191DC 802A444C 24A50010 */  addiu     $a1, $a1, 0x10
-/* 4191E0 802A4450 AFB00010 */  sw        $s0, 0x10($sp)
-/* 4191E4 802A4454 3C10802B */  lui       $s0, %hi(battle_menu_moveTitleIcon)
-/* 4191E8 802A4458 8E10D188 */  lw        $s0, %lo(battle_menu_moveTitleIcon)($s0)
-/* 4191EC 802A445C 24C6000F */  addiu     $a2, $a2, 0xf
-/* 4191F0 802A4460 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 4191F4 802A4464 0C051261 */  jal       set_icon_render_pos
-/* 4191F8 802A4468 0200202D */   daddu    $a0, $s0, $zero
-/* 4191FC 802A446C 3C05802B */  lui       $a1, %hi(battle_menu_moveTextOpacity)
-/* 419200 802A4470 84A5D116 */  lh        $a1, %lo(battle_menu_moveTextOpacity)($a1)
-/* 419204 802A4474 0C0513AC */  jal       icon_set_opacity
-/* 419208 802A4478 0200202D */   daddu    $a0, $s0, $zero
-/* 41920C 802A447C 0C0511EA */  jal       draw_icon_0
-/* 419210 802A4480 0200202D */   daddu    $a0, $s0, $zero
-/* 419214 802A4484 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 419218 802A4488 8FB00010 */  lw        $s0, 0x10($sp)
-/* 41921C 802A448C 03E00008 */  jr        $ra
-/* 419220 802A4490 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s
index 3fd5bf5c78..4fb212df8d 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802AB970
+.word L802A44D0_419260, L802A4528_4192B8, L802A44D0_419260, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A44D0_419260, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A44D0_419260, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A4528_4192B8, L802A44D0_419260
+
+.section .text
+
 glabel func_802A4494
 /* 419224 802A4494 3C02802B */  lui       $v0, %hi(battle_menu_moveState)
 /* 419228 802A4498 9042D108 */  lbu       $v0, %lo(battle_menu_moveState)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4534.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4534.s
deleted file mode 100644
index 873543bb48..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A4534.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A4534
-/* 4192C4 802A4534 3C02802B */  lui       $v0, %hi(D_802AD258)
-/* 4192C8 802A4538 8C42D258 */  lw        $v0, %lo(D_802AD258)($v0)
-/* 4192CC 802A453C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 4192D0 802A4540 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 4192D4 802A4544 24D10006 */  addiu     $s1, $a2, 6
-/* 4192D8 802A4548 AFB20020 */  sw        $s2, 0x20($sp)
-/* 4192DC 802A454C 24B2000B */  addiu     $s2, $a1, 0xb
-/* 4192E0 802A4550 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 4192E4 802A4554 10400004 */  beqz      $v0, .L802A4568
-/* 4192E8 802A4558 AFB00018 */   sw       $s0, 0x18($sp)
-/* 4192EC 802A455C 3C10001D */  lui       $s0, 0x1d
-/* 4192F0 802A4560 080A9161 */  j         .L802A4584
-/* 4192F4 802A4564 361000C3 */   ori      $s0, $s0, 0xc3
-.L802A4568:
-/* 4192F8 802A4568 3C10001D */  lui       $s0, 0x1d
-/* 4192FC 802A456C 3C02802B */  lui       $v0, %hi(battle_menu_hasSpiritsMenu)
-/* 419300 802A4570 8C42D4A0 */  lw        $v0, %lo(battle_menu_hasSpiritsMenu)($v0)
-/* 419304 802A4574 14400003 */  bnez      $v0, .L802A4584
-/* 419308 802A4578 361000A0 */   ori      $s0, $s0, 0xa0
-/* 41930C 802A457C 3C10001D */  lui       $s0, 0x1d
-/* 419310 802A4580 3610009F */  ori       $s0, $s0, 0x9f
-.L802A4584:
-/* 419314 802A4584 0C04992C */  jal       get_msg_lines
-/* 419318 802A4588 0200202D */   daddu    $a0, $s0, $zero
-/* 41931C 802A458C 0200202D */  daddu     $a0, $s0, $zero
-/* 419320 802A4590 2442FFFF */  addiu     $v0, $v0, -1
-/* 419324 802A4594 00021040 */  sll       $v0, $v0, 1
-/* 419328 802A4598 3C06802B */  lui       $a2, %hi(D_802AB344)
-/* 41932C 802A459C 00C23021 */  addu      $a2, $a2, $v0
-/* 419330 802A45A0 84C6B344 */  lh        $a2, %lo(D_802AB344)($a2)
-/* 419334 802A45A4 2402000F */  addiu     $v0, $zero, 0xf
-/* 419338 802A45A8 0240282D */  daddu     $a1, $s2, $zero
-/* 41933C 802A45AC 240700FF */  addiu     $a3, $zero, 0xff
-/* 419340 802A45B0 AFA20010 */  sw        $v0, 0x10($sp)
-/* 419344 802A45B4 AFA00014 */  sw        $zero, 0x14($sp)
-/* 419348 802A45B8 0C04993B */  jal       draw_msg
-/* 41934C 802A45BC 02263021 */   addu     $a2, $s1, $a2
-/* 419350 802A45C0 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 419354 802A45C4 8FB20020 */  lw        $s2, 0x20($sp)
-/* 419358 802A45C8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 41935C 802A45CC 8FB00018 */  lw        $s0, 0x18($sp)
-/* 419360 802A45D0 03E00008 */  jr        $ra
-/* 419364 802A45D4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4718.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4718.s
deleted file mode 100644
index 3a4ea4ca7d..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A4718.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A4718
-/* 4194A8 802A4718 2402000A */  addiu     $v0, $zero, 0xa
-/* 4194AC 802A471C 3C01802B */  lui       $at, %hi(D_802AD604)
-/* 4194B0 802A4720 A022D604 */  sb        $v0, %lo(D_802AD604)($at)
-/* 4194B4 802A4724 03E00008 */  jr        $ra
-/* 4194B8 802A4728 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A472C.s b/ver/us/asm/nonmatchings/code_415D90/func_802A472C.s
deleted file mode 100644
index fc80097971..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A472C.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A472C
-/* 4194BC 802A472C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 4194C0 802A4730 24040006 */  addiu     $a0, $zero, 6
-/* 4194C4 802A4734 24050002 */  addiu     $a1, $zero, 2
-/* 4194C8 802A4738 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 4194CC 802A473C AFB10014 */  sw        $s1, 0x14($sp)
-/* 4194D0 802A4740 0C051F9F */  jal       set_window_update
-/* 4194D4 802A4744 AFB00010 */   sw       $s0, 0x10($sp)
-/* 4194D8 802A4748 24040007 */  addiu     $a0, $zero, 7
-/* 4194DC 802A474C 0C051F9F */  jal       set_window_update
-/* 4194E0 802A4750 24050002 */   addiu    $a1, $zero, 2
-/* 4194E4 802A4754 24040008 */  addiu     $a0, $zero, 8
-/* 4194E8 802A4758 0C051F9F */  jal       set_window_update
-/* 4194EC 802A475C 24050002 */   addiu    $a1, $zero, 2
-/* 4194F0 802A4760 3C02802B */  lui       $v0, %hi(D_802AD66C)
-/* 4194F4 802A4764 8C42D66C */  lw        $v0, %lo(D_802AD66C)($v0)
-/* 4194F8 802A4768 1840000C */  blez      $v0, .L802A479C
-/* 4194FC 802A476C 0000802D */   daddu    $s0, $zero, $zero
-/* 419500 802A4770 3C11802B */  lui       $s1, %hi(D_802AD628)
-/* 419504 802A4774 2631D628 */  addiu     $s1, $s1, %lo(D_802AD628)
-.L802A4778:
-/* 419508 802A4778 8E240000 */  lw        $a0, ($s1)
-/* 41950C 802A477C 0C05123D */  jal       free_icon
-/* 419510 802A4780 26310004 */   addiu    $s1, $s1, 4
-/* 419514 802A4784 3C02802B */  lui       $v0, %hi(D_802AD66C)
-/* 419518 802A4788 8C42D66C */  lw        $v0, %lo(D_802AD66C)($v0)
-/* 41951C 802A478C 26100001 */  addiu     $s0, $s0, 1
-/* 419520 802A4790 0202102A */  slt       $v0, $s0, $v0
-/* 419524 802A4794 1440FFF8 */  bnez      $v0, .L802A4778
-/* 419528 802A4798 00000000 */   nop
-.L802A479C:
-/* 41952C 802A479C 3C04802B */  lui       $a0, %hi(D_802AD618)
-/* 419530 802A47A0 8C84D618 */  lw        $a0, %lo(D_802AD618)($a0)
-/* 419534 802A47A4 0C05123D */  jal       free_icon
-/* 419538 802A47A8 00000000 */   nop
-/* 41953C 802A47AC 3C04802B */  lui       $a0, %hi(D_802AD61C)
-/* 419540 802A47B0 8C84D61C */  lw        $a0, %lo(D_802AD61C)($a0)
-/* 419544 802A47B4 0C05123D */  jal       free_icon
-/* 419548 802A47B8 00000000 */   nop
-/* 41954C 802A47BC 3C04802B */  lui       $a0, %hi(D_802AD620)
-/* 419550 802A47C0 8C84D620 */  lw        $a0, %lo(D_802AD620)($a0)
-/* 419554 802A47C4 0C05123D */  jal       free_icon
-/* 419558 802A47C8 00000000 */   nop
-/* 41955C 802A47CC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 419560 802A47D0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 419564 802A47D4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 419568 802A47D8 03E00008 */  jr        $ra
-/* 41956C 802A47DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4A10.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4A10.s
deleted file mode 100644
index 494e3615fd..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A4A10.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A4A10
-/* 4197A0 802A4A10 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 4197A4 802A4A14 24040006 */  addiu     $a0, $zero, 6
-/* 4197A8 802A4A18 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 4197AC 802A4A1C 0C051F9F */  jal       set_window_update
-/* 4197B0 802A4A20 24050005 */   addiu    $a1, $zero, 5
-/* 4197B4 802A4A24 24040007 */  addiu     $a0, $zero, 7
-/* 4197B8 802A4A28 0C051F9F */  jal       set_window_update
-/* 4197BC 802A4A2C 24050005 */   addiu    $a1, $zero, 5
-/* 4197C0 802A4A30 24040008 */  addiu     $a0, $zero, 8
-/* 4197C4 802A4A34 0C051F9F */  jal       set_window_update
-/* 4197C8 802A4A38 24050001 */   addiu    $a1, $zero, 1
-/* 4197CC 802A4A3C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 4197D0 802A4A40 2402001E */  addiu     $v0, $zero, 0x1e
-/* 4197D4 802A4A44 3C01802B */  lui       $at, %hi(D_802AD604)
-/* 4197D8 802A4A48 A022D604 */  sb        $v0, %lo(D_802AD604)($at)
-/* 4197DC 802A4A4C 03E00008 */  jr        $ra
-/* 4197E0 802A4A50 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s
index c391cbceea..793d4d6e94 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802AB9F0
+.word L802A5054_419DE4, L802A4F74_419D04, L802A4AA8_419838, L802A4D4C_419ADC, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A505C_419DEC, L802A5090_419E20, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A50A0_419E30, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A50E0_419E70, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A5270_41A000, L802A510C_419E9C, L802A5130_419EC0, L802A51F0_419F80, 0
+
+.section .text
+
 glabel func_802A4A54
 /* 4197E4 802A4A54 3C02802B */  lui       $v0, %hi(D_802AD604)
 /* 4197E8 802A4A58 9042D604 */  lbu       $v0, %lo(D_802AD604)($v0)
@@ -271,7 +278,7 @@ glabel L802A4D4C_419ADC
 /* 419BE4 802A4E54 3C053EE6 */  lui       $a1, 0x3ee6
 /* 419BE8 802A4E58 0C051308 */  jal       func_80144C20
 /* 419BEC 802A4E5C 34A56666 */   ori      $a1, $a1, 0x6666
-/* 419BF0 802A4E60 0C05272D */  jal       play_sound
+/* 419BF0 802A4E60 0C05272D */  jal       sfx_play_sound
 /* 419BF4 802A4E64 240400C7 */   addiu    $a0, $zero, 0xc7
 .L802A4E68:
 /* 419BF8 802A4E68 3C04802B */  lui       $a0, %hi(D_802AD608)
@@ -317,12 +324,12 @@ glabel L802A4D4C_419ADC
 /* 419C8C 802A4EFC 24020001 */  addiu     $v0, $zero, 1
 /* 419C90 802A4F00 14620005 */  bne       $v1, $v0, .L802A4F18
 /* 419C94 802A4F04 00000000 */   nop
-/* 419C98 802A4F08 0C05272D */  jal       play_sound
+/* 419C98 802A4F08 0C05272D */  jal       sfx_play_sound
 /* 419C9C 802A4F0C 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 419CA0 802A4F10 080A949A */  j         .L802A5268
 /* 419CA4 802A4F14 2402FFFF */   addiu    $v0, $zero, -1
 .L802A4F18:
-/* 419CA8 802A4F18 0C05272D */  jal       play_sound
+/* 419CA8 802A4F18 0C05272D */  jal       sfx_play_sound
 /* 419CAC 802A4F1C 2404021D */   addiu    $a0, $zero, 0x21d
 /* 419CB0 802A4F20 82020000 */  lb        $v0, ($s0)
 /* 419CB4 802A4F24 00021080 */  sll       $v0, $v0, 2
@@ -340,7 +347,7 @@ glabel L802A4D4C_419ADC
 /* 419CE0 802A4F50 30624000 */  andi      $v0, $v1, 0x4000
 /* 419CE4 802A4F54 104000C7 */  beqz      $v0, .L802A5274
 /* 419CE8 802A4F58 0000102D */   daddu    $v0, $zero, $zero
-/* 419CEC 802A4F5C 0C05272D */  jal       play_sound
+/* 419CEC 802A4F5C 0C05272D */  jal       sfx_play_sound
 /* 419CF0 802A4F60 240400CA */   addiu    $a0, $zero, 0xca
 /* 419CF4 802A4F64 0C0A91CB */  jal       func_802A472C
 /* 419CF8 802A4F68 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s b/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s
index ca687b1020..ef059ce804 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802ABAA8
+.word L802A52F8_41A088, L802A56C8_41A458, L802A52F8_41A088, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A52F8_41A088, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A52F8_41A088, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A52F8_41A088, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A56C8_41A458, L802A52F8_41A088, L802A52F8_41A088, 0
+
+.section .text
+
 glabel func_802A5290
 /* 41A020 802A5290 3C02802B */  lui       $v0, %hi(D_802AD604)
 /* 41A024 802A5294 9042D604 */  lbu       $v0, %lo(D_802AD604)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A56F8.s b/ver/us/asm/nonmatchings/code_415D90/func_802A56F8.s
deleted file mode 100644
index a1575051dd..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A56F8.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A56F8
-/* 41A488 802A56F8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 41A48C 802A56FC 3C04001D */  lui       $a0, 0x1d
-/* 41A490 802A5700 34840043 */  ori       $a0, $a0, 0x43
-/* 41A494 802A5704 24020033 */  addiu     $v0, $zero, 0x33
-/* 41A498 802A5708 AFA20010 */  sw        $v0, 0x10($sp)
-/* 41A49C 802A570C 24020001 */  addiu     $v0, $zero, 1
-/* 41A4A0 802A5710 24A5000F */  addiu     $a1, $a1, 0xf
-/* 41A4A4 802A5714 3C07802B */  lui       $a3, %hi(D_802AD624)
-/* 41A4A8 802A5718 8CE7D624 */  lw        $a3, %lo(D_802AD624)($a3)
-/* 41A4AC 802A571C 24C60002 */  addiu     $a2, $a2, 2
-/* 41A4B0 802A5720 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 41A4B4 802A5724 0C04993B */  jal       draw_msg
-/* 41A4B8 802A5728 AFA20014 */   sw       $v0, 0x14($sp)
-/* 41A4BC 802A572C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 41A4C0 802A5730 03E00008 */  jr        $ra
-/* 41A4C4 802A5734 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s b/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s
index 847bb53959..8eddf951e8 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802ABB58
+.word L802A5774_41A504, L802A57BC_41A54C, L802A5774_41A504, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A5774_41A504, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A5774_41A504, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A57BC_41A54C, L802A5774_41A504
+
+.section .text
+
 glabel func_802A5738
 /* 41A4C8 802A5738 3C02802B */  lui       $v0, %hi(D_802AD604)
 /* 41A4CC 802A573C 9042D604 */  lbu       $v0, %lo(D_802AD604)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A58D0.s b/ver/us/asm/nonmatchings/code_415D90/func_802A58D0.s
deleted file mode 100644
index b8742f3f61..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A58D0.s
+++ /dev/null
@@ -1,60 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A58D0
-/* 41A660 802A58D0 3C03800E */  lui       $v1, %hi(gBattleStatus)
-/* 41A664 802A58D4 2463C070 */  addiu     $v1, $v1, %lo(gBattleStatus)
-/* 41A668 802A58D8 8C620004 */  lw        $v0, 4($v1)
-/* 41A66C 802A58DC 8C6500DC */  lw        $a1, 0xdc($v1)
-/* 41A670 802A58E0 30420004 */  andi      $v0, $v0, 4
-/* 41A674 802A58E4 14400007 */  bnez      $v0, .L802A5904
-/* 41A678 802A58E8 00000000 */   nop
-/* 41A67C 802A58EC 10A00005 */  beqz      $a1, .L802A5904
-/* 41A680 802A58F0 3C030020 */   lui      $v1, 0x20
-/* 41A684 802A58F4 8CA20000 */  lw        $v0, ($a1)
-/* 41A688 802A58F8 00431024 */  and       $v0, $v0, $v1
-/* 41A68C 802A58FC 10400003 */  beqz      $v0, .L802A590C
-/* 41A690 802A5900 00000000 */   nop
-.L802A5904:
-/* 41A694 802A5904 03E00008 */  jr        $ra
-/* 41A698 802A5908 0000102D */   daddu    $v0, $zero, $zero
-.L802A590C:
-/* 41A69C 802A590C 80A20216 */  lb        $v0, 0x216($a1)
-/* 41A6A0 802A5910 80A30210 */  lb        $v1, 0x210($a1)
-/* 41A6A4 802A5914 3842000D */  xori      $v0, $v0, 0xd
-/* 41A6A8 802A5918 2C440001 */  sltiu     $a0, $v0, 1
-/* 41A6AC 802A591C 24020009 */  addiu     $v0, $zero, 9
-/* 41A6B0 802A5920 50620001 */  beql      $v1, $v0, .L802A5928
-/* 41A6B4 802A5924 0000202D */   daddu    $a0, $zero, $zero
-.L802A5928:
-/* 41A6B8 802A5928 2402000A */  addiu     $v0, $zero, 0xa
-/* 41A6BC 802A592C 50620001 */  beql      $v1, $v0, .L802A5934
-/* 41A6C0 802A5930 0000202D */   daddu    $a0, $zero, $zero
-.L802A5934:
-/* 41A6C4 802A5934 24020006 */  addiu     $v0, $zero, 6
-/* 41A6C8 802A5938 50620001 */  beql      $v1, $v0, .L802A5940
-/* 41A6CC 802A593C 24040001 */   addiu    $a0, $zero, 1
-.L802A5940:
-/* 41A6D0 802A5940 24020003 */  addiu     $v0, $zero, 3
-/* 41A6D4 802A5944 50620001 */  beql      $v1, $v0, .L802A594C
-/* 41A6D8 802A5948 24040001 */   addiu    $a0, $zero, 1
-.L802A594C:
-/* 41A6DC 802A594C 24020005 */  addiu     $v0, $zero, 5
-/* 41A6E0 802A5950 50620001 */  beql      $v1, $v0, .L802A5958
-/* 41A6E4 802A5954 24040001 */   addiu    $a0, $zero, 1
-.L802A5958:
-/* 41A6E8 802A5958 24020007 */  addiu     $v0, $zero, 7
-/* 41A6EC 802A595C 50620001 */  beql      $v1, $v0, .L802A5964
-/* 41A6F0 802A5960 24040001 */   addiu    $a0, $zero, 1
-.L802A5964:
-/* 41A6F4 802A5964 24020008 */  addiu     $v0, $zero, 8
-/* 41A6F8 802A5968 50620001 */  beql      $v1, $v0, .L802A5970
-/* 41A6FC 802A596C 24040001 */   addiu    $a0, $zero, 1
-.L802A5970:
-/* 41A700 802A5970 80A30214 */  lb        $v1, 0x214($a1)
-/* 41A704 802A5974 2402000C */  addiu     $v0, $zero, 0xc
-/* 41A708 802A5978 50620001 */  beql      $v1, $v0, .L802A5980
-/* 41A70C 802A597C 24040001 */   addiu    $a0, $zero, 1
-.L802A5980:
-/* 41A710 802A5980 03E00008 */  jr        $ra
-/* 41A714 802A5984 38820001 */   xori     $v0, $a0, 1
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A8180.s b/ver/us/asm/nonmatchings/code_415D90/func_802A8180.s
index 3ffb4b1213..043fda03d9 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A8180.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A8180.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_802AC090
+.word 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81BC, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x802A81B4, 0x00000000
+
+.section .text
+
 glabel func_802A8180
 /* 41CF10 802A8180 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
 /* 41CF14 802A8184 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A9AE8.s b/ver/us/asm/nonmatchings/code_415D90/func_802A9AE8.s
index 750ecf0b89..49eb59342a 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A9AE8.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A9AE8.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_802AC880
+.word 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B24, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C, 0x802A9B1C
+
+.section .text
+
 glabel func_802A9AE8
 /* 41E878 802A9AE8 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
 /* 41E87C 802A9AEC 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A9B30.s b/ver/us/asm/nonmatchings/code_415D90/func_802A9B30.s
deleted file mode 100644
index 35aeb7534f..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A9B30.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802A9B30
-/* 41E8C0 802A9B30 3C02800E */  lui       $v0, %hi(gBattleStatus+0x4)
-/* 41E8C4 802A9B34 8C42C074 */  lw        $v0, %lo(gBattleStatus+0x4)($v0)
-/* 41E8C8 802A9B38 30420004 */  andi      $v0, $v0, 4
-/* 41E8CC 802A9B3C 03E00008 */  jr        $ra
-/* 41E8D0 802A9B40 2C420001 */   sltiu    $v0, $v0, 1
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s b/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s
index 54e8e4db1f..6ed2a12f4c 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802ACBB0
+.word L802A9B9C_41E92C, L802A9ED4_41EC64, L802A9F60_41ECF0, L802AA038_41EDC8, L802A9FB0_41ED40, L802A9FDC_41ED6C, L802AA038_41EDC8, L802AA038_41EDC8, L802A9FEC_41ED7C, L802AA010_41EDA0, L802A9C04_41E994, L802A9DAC_41EB3C
+
+.section .text
+
 glabel func_802A9B44
 /* 41E8D4 802A9B44 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
 /* 41E8D8 802A9B48 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA05C.s b/ver/us/asm/nonmatchings/code_415D90/func_802AA05C.s
index a3061da978..4c0b0c4bf0 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802AA05C.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802AA05C.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_802ACBE0
+.word 0x802AA090, 0x802AA090, 0x802AA090, 0x802AA090, 0x802AA090, 0x802AA098, 0x802AA098, 0x802AA098, 0x802AA098, 0x00000000
+
+.section .text
+
 glabel func_802AA05C
 /* 41EDEC 802AA05C 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
 /* 41EDF0 802AA060 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA0A4.s b/ver/us/asm/nonmatchings/code_415D90/func_802AA0A4.s
deleted file mode 100644
index d67c764cbc..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802AA0A4.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802AA0A4
-/* 41EE34 802AA0A4 3C02800E */  lui       $v0, %hi(gBattleStatus+0x4)
-/* 41EE38 802AA0A8 8C42C074 */  lw        $v0, %lo(gBattleStatus+0x4)($v0)
-/* 41EE3C 802AA0AC 30420002 */  andi      $v0, $v0, 2
-/* 41EE40 802AA0B0 03E00008 */  jr        $ra
-/* 41EE44 802AA0B4 2C420001 */   sltiu    $v0, $v0, 1
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s b/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s
index 9f50a227f5..b894264f08 100644
--- a/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s
+++ b/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802ACC08
+.word L802AA110_41EEA0, L802AA4BC_41F24C, L802AA548_41F2D8, L802AA61C_41F3AC, L802AA594_41F324, L802AA5C0_41F350, L802AA61C_41F3AC, L802AA61C_41F3AC, L802AA5D0_41F360, L802AA5F4_41F384, L802AA1F0_41EF80, L802AA394_41F124
+
+.section .text
+
 glabel func_802AA0B8
 /* 41EE48 802AA0B8 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
 /* 41EE4C 802AA0BC 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA640.s b/ver/us/asm/nonmatchings/code_415D90/func_802AA640.s
deleted file mode 100644
index c9893eef74..0000000000
--- a/ver/us/asm/nonmatchings/code_415D90/func_802AA640.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802AA640
-/* 41F3D0 802AA640 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
-/* 41F3D4 802AA644 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
-/* 41F3D8 802AA648 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 41F3DC 802AA64C 2443FFFF */  addiu     $v1, $v0, -1
-/* 41F3E0 802AA650 2C620009 */  sltiu     $v0, $v1, 9
-/* 41F3E4 802AA654 10400009 */  beqz      $v0, .L802AA67C
-/* 41F3E8 802AA658 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 41F3EC 802AA65C 00031080 */  sll       $v0, $v1, 2
-/* 41F3F0 802AA660 3C01802B */  lui       $at, %hi(D_802ACC38)
-/* 41F3F4 802AA664 00220821 */  addu      $at, $at, $v0
-/* 41F3F8 802AA668 8C22CC38 */  lw        $v0, %lo(D_802ACC38)($at)
-/* 41F3FC 802AA66C 00400008 */  jr        $v0
-/* 41F400 802AA670 00000000 */   nop
-/* 41F404 802AA674 0C0A8715 */  jal       draw_battle_wheel
-/* 41F408 802AA678 00000000 */   nop
-.L802AA67C:
-/* 41F40C 802AA67C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 41F410 802AA680 03E00008 */  jr        $ra
-/* 41F414 802AA684 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s b/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s
index 01c5aa3258..9585a20523 100644
--- a/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s
+++ b/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802AC3C8
+.word L802A8754_41D4E4, L802A8780_41D510, L802A88F8_41D688, L802A8950_41D6E0, L802A897C_41D70C, L802A91A8_41DF38, L802A898C_41D71C, L802A89C0_41D750, L802A89F0_41D780, L802A8C1C_41D9AC, L802A8C84_41DA14, L802A8D38_41DAC8, L802A8D58_41DAE8, L802A94C0_41E250, L802A8D70_41DB00, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A97D0_41E560, L802A98D8_41E668, L802A9994_41E724, L802A9A0C_41E79C, L802A9A2C_41E7BC, L802A9A4C_41E7DC, L802A9A64_41E7F4, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A8D8C_41DB1C, L802A8E54_41DBE4, L802A8F00_41DC90, L802A8F54_41DCE4, L802A8F6C_41DCFC, L802A91A0_41DF30, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A8F84_41DD14, L802A908C_41DE1C, L802A913C_41DECC, L802A9170_41DF00, L802A9188_41DF18, L802A91A0_41DF30, L802A91B8_41DF48, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A91D0_41DF60, L802A935C_41E0EC, L802A93C8_41E158, L802A9488_41E218, L802A94A8_41E238, L802A94C0_41E250, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A94D0_41E260, L802A9600_41E390, L802A9684_41E414, L802A9784_41E514, L802A97B8_41E548, L802A9A54_41E7E4, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A9AAC_41E83C, L802A84D0_41D260, 0
+
+.section .text
+
 glabel update_partner_menu
 /* 41CF58 802A81C8 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 41CF5C 802A81CC AFB40020 */  sw        $s4, 0x20($sp)
@@ -416,7 +423,7 @@ glabel L802A8780_41D510
 /* 41D56C 802A87DC 00000000 */   nop
 /* 41D570 802A87E0 10400010 */  beqz      $v0, .L802A8824
 /* 41D574 802A87E4 00000000 */   nop
-/* 41D578 802A87E8 0C05272D */  jal       play_sound
+/* 41D578 802A87E8 0C05272D */  jal       sfx_play_sound
 /* 41D57C 802A87EC 2404000F */   addiu    $a0, $zero, 0xf
 /* 41D580 802A87F0 3C02802B */  lui       $v0, %hi(D_802AD002)
 /* 41D584 802A87F4 8042D002 */  lb        $v0, %lo(D_802AD002)($v0)
@@ -432,7 +439,7 @@ glabel L802A8780_41D510
 /* 41D5AC 802A881C 080AA5DD */  j         .L802A9774
 /* 41D5B0 802A8820 00000000 */   nop
 .L802A8824:
-/* 41D5B4 802A8824 0C05272D */  jal       play_sound
+/* 41D5B4 802A8824 0C05272D */  jal       sfx_play_sound
 /* 41D5B8 802A8828 2404021D */   addiu    $a0, $zero, 0x21d
 /* 41D5BC 802A882C 080AA6A9 */  j         .L802A9AA4
 /* 41D5C0 802A8830 24020008 */   addiu    $v0, $zero, 8
diff --git a/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s b/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s
index e5e09a28cb..8af76a3365 100644
--- a/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s
+++ b/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_802ABBD8
+.word L802A6170_41AF00, L802A69A0_41B730, L802A6A88_41B818, L802A6B98_41B928, L802A6BB8_41B948, L802A762C_41C3BC, L802A6BD0_41B960, L802A6BEC_41B97C, L802A6C34_41B9C4, L802A6C64_41B9F4, L802A6C74_41BA04, L802A6D58_41BAE8, L802A6D84_41BB14, L802A72D4_41C064, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A6D94_41BB24, L802A6F1C_41BCAC, L802A6FD4_41BD64, L802A7038_41BDC8, L802A7058_41BDE8, L802A7080_41BE10, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A7E3C_41CBCC, L802A7F54_41CCE4, L802A8024_41CDB4, L802A80A0_41CE30, L802A80C0_41CE50, L802A80E0_41CE70, L802A80F8_41CE88, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A7090_41BE20, L802A7198_41BF28, L802A7264_41BFF4, L802A729C_41C02C, L802A72B4_41C044, L802A72CC_41C05C, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A72E4_41C074, L802A74A4_41C234, L802A7528_41C2B8, L802A75F4_41C384, L802A7614_41C3A4, L802A762C_41C3BC, L802A763C_41C3CC, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A7658_41C3E8, L802A77F0_41C580, L802A7898_41C628, L802A78BC_41C64C, L802A78E0_41C670, L802A78FC_41C68C, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A790C_41C69C, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A7A24_41C7B4, L802A7BEC_41C97C, L802A7C7C_41CA0C, L802A7DD4_41CB64, L802A7E08_41CB98, L802A80E8_41CE78, L802A8144_41CED4, L802A7E20_41CBB0, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A8144_41CED4, L802A5C50_41A9E0
+
+.section .text
+
 glabel update_player_menu
 /* 41A718 802A5988 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 41A71C 802A598C AFB60028 */  sw        $s6, 0x28($sp)
@@ -587,7 +594,7 @@ glabel L802A6170_41AF00
 /* 41AFA0 802A6210 82C3008B */  lb        $v1, 0x8b($s6)
 /* 41AFA4 802A6214 10620010 */  beq       $v1, $v0, .L802A6258
 /* 41AFA8 802A6218 00000000 */   nop
-/* 41AFAC 802A621C 0C05272D */  jal       play_sound
+/* 41AFAC 802A621C 0C05272D */  jal       sfx_play_sound
 /* 41AFB0 802A6220 2404000F */   addiu    $a0, $zero, 0xf
 /* 41AFB4 802A6224 3C02802B */  lui       $v0, %hi(D_802AD002)
 /* 41AFB8 802A6228 8042D002 */  lb        $v0, %lo(D_802AD002)($v0)
@@ -612,7 +619,7 @@ glabel L802A6170_41AF00
 /* 41B000 802A6270 82C3008B */  lb        $v1, 0x8b($s6)
 /* 41B004 802A6274 106207B3 */  beq       $v1, $v0, L802A8144_41CED4
 /* 41B008 802A6278 00000000 */   nop
-/* 41B00C 802A627C 0C05272D */  jal       play_sound
+/* 41B00C 802A627C 0C05272D */  jal       sfx_play_sound
 /* 41B010 802A6280 2404021D */   addiu    $a0, $zero, 0x21d
 /* 41B014 802A6284 080AA04F */  j         .L802A813C
 /* 41B018 802A6288 24020008 */   addiu    $v0, $zero, 8
@@ -668,8 +675,8 @@ glabel L802A6170_41AF00
 /* 41B0D0 802A6340 269478E0 */  addiu     $s4, $s4, %lo(gItemTable)
 /* 41B0D4 802A6344 24120002 */  addiu     $s2, $zero, 2
 /* 41B0D8 802A6348 02A0882D */  daddu     $s1, $s5, $zero
-/* 41B0DC 802A634C 3C03802B */  lui       $v1, %hi(D_802AB513)
-/* 41B0E0 802A6350 9063B513 */  lbu       $v1, %lo(D_802AB513)($v1)
+/* 41B0DC 802A634C 3C03802B */  lui       $v1, %hi(D_802AB4F0+0x23)
+/* 41B0E0 802A6350 9063B513 */  lbu       $v1, %lo(D_802AB4F0+0x23)($v1)
 /* 41B0E4 802A6354 24020155 */  addiu     $v0, $zero, 0x155
 /* 41B0E8 802A6358 A6C201AE */  sh        $v0, 0x1ae($s6)
 /* 41B0EC 802A635C A2D001F6 */  sb        $s0, 0x1f6($s6)
diff --git a/ver/us/asm/nonmatchings/code_415D90/update_targeting_enemies.s b/ver/us/asm/nonmatchings/code_415D90/update_targeting_enemies.s
index ff67a000ce..d0c88a8725 100644
--- a/ver/us/asm/nonmatchings/code_415D90/update_targeting_enemies.s
+++ b/ver/us/asm/nonmatchings/code_415D90/update_targeting_enemies.s
@@ -192,7 +192,7 @@ glabel update_targeting_enemies
 /* 41F6C4 802AA934 30624000 */  andi      $v0, $v1, 0x4000
 /* 41F6C8 802AA938 10400008 */  beqz      $v0, .L802AA95C
 /* 41F6CC 802AA93C 30628000 */   andi     $v0, $v1, 0x8000
-/* 41F6D0 802AA940 0C05272D */  jal       play_sound
+/* 41F6D0 802AA940 0C05272D */  jal       sfx_play_sound
 /* 41F6D4 802AA944 240400CA */   addiu    $a0, $zero, 0xca
 /* 41F6D8 802AA948 2402000A */  addiu     $v0, $zero, 0xa
 /* 41F6DC 802AA94C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
@@ -202,7 +202,7 @@ glabel update_targeting_enemies
 .L802AA95C:
 /* 41F6EC 802AA95C 1040000E */  beqz      $v0, .L802AA998
 /* 41F6F0 802AA960 00000000 */   nop
-/* 41F6F4 802AA964 0C05272D */  jal       play_sound
+/* 41F6F4 802AA964 0C05272D */  jal       sfx_play_sound
 /* 41F6F8 802AA968 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 41F6FC 802AA96C 24020008 */  addiu     $v0, $zero, 8
 /* 41F700 802AA970 3C01802B */  lui       $at, %hi(D_802ACC60)
@@ -276,7 +276,7 @@ glabel update_targeting_enemies
 .L802AAA64:
 /* 41F7F4 802AAA64 0C0511FF */  jal       set_menu_icon_script
 /* 41F7F8 802AAA68 00000000 */   nop
-/* 41F7FC 802AAA6C 0C05272D */  jal       play_sound
+/* 41F7FC 802AAA6C 0C05272D */  jal       sfx_play_sound
 /* 41F800 802AAA70 240400C7 */   addiu    $a0, $zero, 0xc7
 .L802AAA74:
 /* 41F804 802AAA74 080AAB2D */  j         .L802AACB4
diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s
index 27c1718d93..a9fdd00f94 100644
--- a/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s
+++ b/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s
@@ -286,7 +286,7 @@ glabel L802A9644_422644
 /* 422784 802A9784 82220062 */  lb        $v0, 0x62($s1)
 /* 422788 802A9788 10400004 */  beqz      $v0, .L802A979C
 /* 42278C 802A978C 00101027 */   nor      $v0, $zero, $s0
-/* 422790 802A9790 0C05272D */  jal       play_sound
+/* 422790 802A9790 0C05272D */  jal       sfx_play_sound
 /* 422794 802A9794 24040233 */   addiu    $a0, $zero, 0x233
 .L802A9798:
 /* 422798 802A9798 00101027 */  nor       $v0, $zero, $s0
@@ -309,7 +309,7 @@ glabel L802A9644_422644
 /* 4227D8 802A97D8 82220062 */  lb        $v0, 0x62($s1)
 /* 4227DC 802A97DC 10400003 */  beqz      $v0, .L802A97EC
 /* 4227E0 802A97E0 00000000 */   nop
-/* 4227E4 802A97E4 0C05272D */  jal       play_sound
+/* 4227E4 802A97E4 0C05272D */  jal       sfx_play_sound
 /* 4227E8 802A97E8 24040234 */   addiu    $a0, $zero, 0x234
 .L802A97EC:
 /* 4227EC 802A97EC 8222005E */  lb        $v0, 0x5e($s1)
diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s
index 83921eaefe..7af01364ef 100644
--- a/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s
+++ b/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s
@@ -92,7 +92,7 @@ glabel L802A9388_4264F8
 /* 42653C 802A93CC 96220052 */  lhu       $v0, 0x52($s1)
 /* 426540 802A93D0 00A0382D */  daddu     $a3, $a1, $zero
 /* 426544 802A93D4 A6200044 */  sh        $zero, 0x44($s1)
-/* 426548 802A93D8 0C0526AE */  jal       _play_sound
+/* 426548 802A93D8 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42654C 802A93DC A6220054 */   sh       $v0, 0x54($s1)
 /* 426550 802A93E0 2402000B */  addiu     $v0, $zero, 0xb
 /* 426554 802A93E4 A622004C */  sh        $v0, 0x4c($s1)
@@ -226,7 +226,7 @@ glabel L802A93E8_426558
 /* 42672C 802A95BC 00023840 */  sll       $a3, $v0, 1
 /* 426730 802A95C0 00E23821 */  addu      $a3, $a3, $v0
 /* 426734 802A95C4 00073880 */  sll       $a3, $a3, 2
-/* 426738 802A95C8 0C0526F9 */  jal       func_80149BE4
+/* 426738 802A95C8 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 42673C 802A95CC A2480084 */   sb       $t0, 0x84($s2)
 /* 426740 802A95D0 86220054 */  lh        $v0, 0x54($s1)
 /* 426744 802A95D4 96230054 */  lhu       $v1, 0x54($s1)
@@ -268,7 +268,7 @@ glabel L802A93E8_426558
 /* 4267C4 802A9654 00000000 */   nop
 /* 4267C8 802A9658 3C048000 */  lui       $a0, 0x8000
 .L802A965C:
-/* 4267CC 802A965C 0C05271B */  jal       stop_sound
+/* 4267CC 802A965C 0C05271B */  jal       sfx_stop_sound
 /* 4267D0 802A9660 34840041 */   ori      $a0, $a0, 0x41
 /* 4267D4 802A9664 0C093EB1 */  jal       set_popup_duration
 /* 4267D8 802A9668 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s
index 882d66951a..f7550c3e57 100644
--- a/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s
+++ b/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s
@@ -96,7 +96,7 @@ glabel L802A9398_426D68
 /* 426DB4 802A93E4 A6200044 */  sh        $zero, 0x44($s1)
 /* 426DB8 802A93E8 A2400085 */  sb        $zero, 0x85($s2)
 /* 426DBC 802A93EC A220005C */  sb        $zero, 0x5c($s1)
-/* 426DC0 802A93F0 0C0526AE */  jal       _play_sound
+/* 426DC0 802A93F0 0C0526AE */  jal       sfx_play_sound_with_params
 /* 426DC4 802A93F4 A6220054 */   sh       $v0, 0x54($s1)
 /* 426DC8 802A93F8 2402000B */  addiu     $v0, $zero, 0xb
 /* 426DCC 802A93FC A622004C */  sh        $v0, 0x4c($s1)
@@ -248,7 +248,7 @@ glabel L802A9400_426DD0
 /* 426FF0 802A9620 00023840 */  sll       $a3, $v0, 1
 /* 426FF4 802A9624 00E23821 */  addu      $a3, $a3, $v0
 /* 426FF8 802A9628 00073880 */  sll       $a3, $a3, 2
-/* 426FFC 802A962C 0C0526F9 */  jal       func_80149BE4
+/* 426FFC 802A962C 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 427000 802A9630 A2480084 */   sb       $t0, 0x84($s2)
 /* 427004 802A9634 8E620008 */  lw        $v0, 8($s3)
 /* 427008 802A9638 90430006 */  lbu       $v1, 6($v0)
@@ -364,7 +364,7 @@ glabel L802A9400_426DD0
 /* 42719C 802A97CC 00000000 */   nop
 /* 4271A0 802A97D0 3C048000 */  lui       $a0, 0x8000
 .L802A97D4:
-/* 4271A4 802A97D4 0C05271B */  jal       stop_sound
+/* 4271A4 802A97D4 0C05271B */  jal       sfx_stop_sound
 /* 4271A8 802A97D8 34840041 */   ori      $a0, $a0, 0x41
 /* 4271AC 802A97DC 0C093EB1 */  jal       set_popup_duration
 /* 4271B0 802A97E0 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s b/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s
index d63ae41895..2f1b2f427c 100644
--- a/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s
+++ b/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s
@@ -92,7 +92,7 @@ glabel L802A9388_427DF8
 /* 427E3C 802A93CC 96220052 */  lhu       $v0, 0x52($s1)
 /* 427E40 802A93D0 00A0382D */  daddu     $a3, $a1, $zero
 /* 427E44 802A93D4 A6200044 */  sh        $zero, 0x44($s1)
-/* 427E48 802A93D8 0C0526AE */  jal       _play_sound
+/* 427E48 802A93D8 0C0526AE */  jal       sfx_play_sound_with_params
 /* 427E4C 802A93DC A6220054 */   sh       $v0, 0x54($s1)
 /* 427E50 802A93E0 2402000B */  addiu     $v0, $zero, 0xb
 /* 427E54 802A93E4 A622004C */  sh        $v0, 0x4c($s1)
@@ -242,7 +242,7 @@ glabel L802A93E8_427E58
 /* 428064 802A95F4 00023840 */  sll       $a3, $v0, 1
 /* 428068 802A95F8 00E23821 */  addu      $a3, $a3, $v0
 /* 42806C 802A95FC 00073880 */  sll       $a3, $a3, 2
-/* 428070 802A9600 0C0526F9 */  jal       func_80149BE4
+/* 428070 802A9600 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 428074 802A9604 A2480084 */   sb       $t0, 0x84($s2)
 /* 428078 802A9608 86220054 */  lh        $v0, 0x54($s1)
 /* 42807C 802A960C 96230054 */  lhu       $v1, 0x54($s1)
@@ -282,7 +282,7 @@ glabel L802A93E8_427E58
 /* 4280F8 802A9688 00000000 */   nop
 /* 4280FC 802A968C 3C048000 */  lui       $a0, 0x8000
 .L802A9690:
-/* 428100 802A9690 0C05271B */  jal       stop_sound
+/* 428100 802A9690 0C05271B */  jal       sfx_stop_sound
 /* 428104 802A9694 34840041 */   ori      $a0, $a0, 0x41
 /* 428108 802A9698 0C093EB1 */  jal       set_popup_duration
 /* 42810C 802A969C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s
index 0398bcf56c..f506bf9150 100644
--- a/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s
+++ b/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s
@@ -124,7 +124,7 @@ glabel L802A9444_428724
 /* 42876C 802A948C 00A0382D */  daddu     $a3, $a1, $zero
 /* 428770 802A9490 A6200044 */  sh        $zero, 0x44($s1)
 /* 428774 802A9494 A6200046 */  sh        $zero, 0x46($s1)
-/* 428778 802A9498 0C0526AE */  jal       _play_sound
+/* 428778 802A9498 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42877C 802A949C A6220054 */   sh       $v0, 0x54($s1)
 /* 428780 802A94A0 2402000B */  addiu     $v0, $zero, 0xb
 /* 428784 802A94A4 A622004C */  sh        $v0, 0x4c($s1)
@@ -160,7 +160,7 @@ glabel L802A94A8_428788
 /* 4287F4 802A9514 86220068 */  lh        $v0, 0x68($s1)
 /* 4287F8 802A9518 14400006 */  bnez      $v0, .L802A9534
 /* 4287FC 802A951C 3C0451EB */   lui      $a0, 0x51eb
-/* 428800 802A9520 0C05272D */  jal       play_sound
+/* 428800 802A9520 0C05272D */  jal       sfx_play_sound
 /* 428804 802A9524 24040234 */   addiu    $a0, $zero, 0x234
 /* 428808 802A9528 24020001 */  addiu     $v0, $zero, 1
 /* 42880C 802A952C A6220068 */  sh        $v0, 0x68($s1)
@@ -184,7 +184,7 @@ glabel L802A94A8_428788
 /* 428850 802A9570 00023840 */  sll       $a3, $v0, 1
 /* 428854 802A9574 00E23821 */  addu      $a3, $a3, $v0
 /* 428858 802A9578 00073880 */  sll       $a3, $a3, 2
-/* 42885C 802A957C 0C0526F9 */  jal       func_80149BE4
+/* 42885C 802A957C 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 428860 802A9580 A2080084 */   sb       $t0, 0x84($s0)
 /* 428864 802A9584 86220054 */  lh        $v0, 0x54($s1)
 /* 428868 802A9588 96230054 */  lhu       $v1, 0x54($s1)
@@ -226,7 +226,7 @@ glabel L802A94A8_428788
 /* 4288E8 802A9608 0C093EB1 */  jal       set_popup_duration
 /* 4288EC 802A960C 0000202D */   daddu    $a0, $zero, $zero
 /* 4288F0 802A9610 3C048000 */  lui       $a0, 0x8000
-/* 4288F4 802A9614 0C05271B */  jal       stop_sound
+/* 4288F4 802A9614 0C05271B */  jal       sfx_stop_sound
 /* 4288F8 802A9618 34840041 */   ori      $a0, $a0, 0x41
 /* 4288FC 802A961C 24020005 */  addiu     $v0, $zero, 5
 /* 428900 802A9620 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s
index 632a29a2be..fe2a8f668b 100644
--- a/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s
+++ b/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s
@@ -101,7 +101,7 @@ glabel L802A938C_428DFC
 /* 428E48 802A93D8 24030001 */  addiu     $v1, $zero, 1
 /* 428E4C 802A93DC 3C01802B */  lui       $at, %hi(func_802A98B0_42EC50)
 /* 428E50 802A93E0 AC2398B0 */  sw        $v1, %lo(func_802A98B0_42EC50)($at)
-/* 428E54 802A93E4 0C0526AE */  jal       _play_sound
+/* 428E54 802A93E4 0C0526AE */  jal       sfx_play_sound_with_params
 /* 428E58 802A93E8 A6220054 */   sh       $v0, 0x54($s1)
 /* 428E5C 802A93EC 2402000B */  addiu     $v0, $zero, 0xb
 /* 428E60 802A93F0 A622004C */  sh        $v0, 0x4c($s1)
@@ -244,7 +244,7 @@ glabel L802A93F4_428E64
 /* 429058 802A95E8 00A0302D */  daddu     $a2, $a1, $zero
 /* 42905C 802A95EC 00023840 */  sll       $a3, $v0, 1
 /* 429060 802A95F0 00E23821 */  addu      $a3, $a3, $v0
-/* 429064 802A95F4 0C0526F9 */  jal       func_80149BE4
+/* 429064 802A95F4 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 429068 802A95F8 00073880 */   sll      $a3, $a3, 2
 /* 42906C 802A95FC 86220054 */  lh        $v0, 0x54($s1)
 /* 429070 802A9600 96230054 */  lhu       $v1, 0x54($s1)
@@ -280,7 +280,7 @@ glabel L802A93F4_428E64
 /* 4290D8 802A9668 0C093EB1 */  jal       set_popup_duration
 /* 4290DC 802A966C 0000202D */   daddu    $a0, $zero, $zero
 /* 4290E0 802A9670 3C048000 */  lui       $a0, 0x8000
-/* 4290E4 802A9674 0C05271B */  jal       stop_sound
+/* 4290E4 802A9674 0C05271B */  jal       sfx_stop_sound
 /* 4290E8 802A9678 34840041 */   ori      $a0, $a0, 0x41
 /* 4290EC 802A967C 24020014 */  addiu     $v0, $zero, 0x14
 /* 4290F0 802A9680 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s b/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s
index aae98a602f..99b2f2ffed 100644
--- a/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s
+++ b/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s
@@ -103,7 +103,7 @@ glabel L802A93B0_4296D0
 /* 42971C 802A93FC A6200044 */  sh        $zero, 0x44($s1)
 /* 429720 802A9400 A2400085 */  sb        $zero, 0x85($s2)
 /* 429724 802A9404 A220005C */  sb        $zero, 0x5c($s1)
-/* 429728 802A9408 0C0526AE */  jal       _play_sound
+/* 429728 802A9408 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42972C 802A940C A6220054 */   sh       $v0, 0x54($s1)
 /* 429730 802A9410 2402000B */  addiu     $v0, $zero, 0xb
 /* 429734 802A9414 A622004C */  sh        $v0, 0x4c($s1)
@@ -255,7 +255,7 @@ glabel L802A9418_429738
 /* 429958 802A9638 00023840 */  sll       $a3, $v0, 1
 /* 42995C 802A963C 00E23821 */  addu      $a3, $a3, $v0
 /* 429960 802A9640 00073880 */  sll       $a3, $a3, 2
-/* 429964 802A9644 0C0526F9 */  jal       func_80149BE4
+/* 429964 802A9644 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 429968 802A9648 A2480084 */   sb       $t0, 0x84($s2)
 /* 42996C 802A964C 8E620008 */  lw        $v0, 8($s3)
 /* 429970 802A9650 90430006 */  lbu       $v1, 6($v0)
@@ -373,7 +373,7 @@ glabel L802A9418_429738
 /* 429B08 802A97E8 0C093EB1 */  jal       set_popup_duration
 /* 429B0C 802A97EC 0000202D */   daddu    $a0, $zero, $zero
 /* 429B10 802A97F0 3C048000 */  lui       $a0, 0x8000
-/* 429B14 802A97F4 0C05271B */  jal       stop_sound
+/* 429B14 802A97F4 0C05271B */  jal       sfx_stop_sound
 /* 429B18 802A97F8 34840041 */   ori      $a0, $a0, 0x41
 /* 429B1C 802A97FC 24020005 */  addiu     $v0, $zero, 5
 /* 429B20 802A9800 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s
index 7fdf840421..a80e1f4f16 100644
--- a/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s
+++ b/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s
@@ -94,7 +94,7 @@ glabel L802A9308_42A028
 /* 42A070 802A9350 00A0382D */  daddu     $a3, $a1, $zero
 /* 42A074 802A9354 A6200044 */  sh        $zero, 0x44($s1)
 /* 42A078 802A9358 A220005C */  sb        $zero, 0x5c($s1)
-/* 42A07C 802A935C 0C0526AE */  jal       _play_sound
+/* 42A07C 802A935C 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42A080 802A9360 A6220054 */   sh       $v0, 0x54($s1)
 /* 42A084 802A9364 2402000B */  addiu     $v0, $zero, 0xb
 /* 42A088 802A9368 A622004C */  sh        $v0, 0x4c($s1)
@@ -208,7 +208,7 @@ glabel L802A936C_42A08C
 /* 42A21C 802A94FC 00023840 */  sll       $a3, $v0, 1
 /* 42A220 802A9500 00E23821 */  addu      $a3, $a3, $v0
 /* 42A224 802A9504 00073880 */  sll       $a3, $a3, 2
-/* 42A228 802A9508 0C0526F9 */  jal       func_80149BE4
+/* 42A228 802A9508 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 42A22C 802A950C A2680084 */   sb       $t0, 0x84($s3)
 /* 42A230 802A9510 2A420050 */  slti      $v0, $s2, 0x50
 /* 42A234 802A9514 10400007 */  beqz      $v0, .L802A9534
@@ -267,7 +267,7 @@ glabel L802A936C_42A08C
 /* 42A2F0 802A95D0 0C093EB1 */  jal       set_popup_duration
 /* 42A2F4 802A95D4 0000202D */   daddu    $a0, $zero, $zero
 /* 42A2F8 802A95D8 3C048000 */  lui       $a0, 0x8000
-/* 42A2FC 802A95DC 0C05271B */  jal       stop_sound
+/* 42A2FC 802A95DC 0C05271B */  jal       sfx_stop_sound
 /* 42A300 802A95E0 34840041 */   ori      $a0, $a0, 0x41
 /* 42A304 802A95E4 24020005 */  addiu     $v0, $zero, 5
 /* 42A308 802A95E8 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9720_42A440.s b/ver/us/asm/nonmatchings/code_429D20/func_802A9720_42A440.s
index 4c3534f0da..8f4b6a6e94 100644
--- a/ver/us/asm/nonmatchings/code_429D20/func_802A9720_42A440.s
+++ b/ver/us/asm/nonmatchings/code_429D20/func_802A9720_42A440.s
@@ -6,7 +6,7 @@ glabel func_802A9720_42A440
 /* 42A444 802A9724 3C048000 */  lui       $a0, 0x8000
 /* 42A448 802A9728 34840041 */  ori       $a0, $a0, 0x41
 /* 42A44C 802A972C AFBF0014 */  sw        $ra, 0x14($sp)
-/* 42A450 802A9730 0C05271B */  jal       stop_sound
+/* 42A450 802A9730 0C05271B */  jal       sfx_stop_sound
 /* 42A454 802A9734 AFB00010 */   sw       $s0, 0x10($sp)
 /* 42A458 802A9738 3C10802A */  lui       $s0, %hi(D_8029FBE0)
 /* 42A45C 802A973C 2610FBE0 */  addiu     $s0, $s0, %lo(D_8029FBE0)
diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s
index 1a12414846..4afceeedc3 100644
--- a/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s
+++ b/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s
@@ -250,7 +250,7 @@ glabel L802A97E4_42ACD4
 /* 42ACF4 802A9804 24A528CC */  addiu     $a1, $a1, %lo(D_802928CC)
 /* 42ACF8 802A9808 0C0511FF */  jal       set_menu_icon_script
 /* 42ACFC 802A980C 00000000 */   nop
-/* 42AD00 802A9810 0C05272D */  jal       play_sound
+/* 42AD00 802A9810 0C05272D */  jal       sfx_play_sound
 /* 42AD04 802A9814 24040233 */   addiu    $a0, $zero, 0x233
 /* 42AD08 802A9818 86230054 */  lh        $v1, 0x54($s1)
 /* 42AD0C 802A981C 24020016 */  addiu     $v0, $zero, 0x16
@@ -262,7 +262,7 @@ glabel L802A97E4_42ACD4
 /* 42AD20 802A9830 24A52874 */  addiu     $a1, $a1, %lo(D_80292874)
 /* 42AD24 802A9834 0C0511FF */  jal       set_menu_icon_script
 /* 42AD28 802A9838 00000000 */   nop
-/* 42AD2C 802A983C 0C05272D */  jal       play_sound
+/* 42AD2C 802A983C 0C05272D */  jal       sfx_play_sound
 /* 42AD30 802A9840 24040233 */   addiu    $a0, $zero, 0x233
 .L802A9844:
 /* 42AD34 802A9844 86230054 */  lh        $v1, 0x54($s1)
@@ -279,7 +279,7 @@ glabel L802A97E4_42ACD4
 /* 42AD60 802A9870 24A58B54 */  addiu     $a1, $a1, %lo(D_80108B54)
 /* 42AD64 802A9874 0C0511FF */  jal       set_menu_icon_script
 /* 42AD68 802A9878 00000000 */   nop
-/* 42AD6C 802A987C 0C05272D */  jal       play_sound
+/* 42AD6C 802A987C 0C05272D */  jal       sfx_play_sound
 /* 42AD70 802A9880 24040234 */   addiu    $a0, $zero, 0x234
 .L802A9884:
 /* 42AD74 802A9884 96220054 */  lhu       $v0, 0x54($s1)
@@ -448,7 +448,7 @@ glabel L802A98A8_42AD98
 /* 42AFBC 802A9ACC 24A58B54 */  addiu     $a1, $a1, %lo(D_80108B54)
 /* 42AFC0 802A9AD0 0C0511FF */  jal       set_menu_icon_script
 /* 42AFC4 802A9AD4 00000000 */   nop
-/* 42AFC8 802A9AD8 0C05272D */  jal       play_sound
+/* 42AFC8 802A9AD8 0C05272D */  jal       sfx_play_sound
 /* 42AFCC 802A9ADC 24040234 */   addiu    $a0, $zero, 0x234
 .L802A9AE0:
 /* 42AFD0 802A9AE0 96220054 */  lhu       $v0, 0x54($s1)
@@ -621,7 +621,7 @@ glabel L802A9B04_42AFF4
 /* 42B224 802A9D34 24A58B54 */  addiu     $a1, $a1, %lo(D_80108B54)
 /* 42B228 802A9D38 0C0511FF */  jal       set_menu_icon_script
 /* 42B22C 802A9D3C 00000000 */   nop
-/* 42B230 802A9D40 0C05272D */  jal       play_sound
+/* 42B230 802A9D40 0C05272D */  jal       sfx_play_sound
 /* 42B234 802A9D44 24040234 */   addiu    $a0, $zero, 0x234
 .L802A9D48:
 /* 42B238 802A9D48 96220054 */  lhu       $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s b/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s
index 91062861c9..ae0835f2f7 100644
--- a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s
+++ b/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s
@@ -119,7 +119,7 @@ glabel L802A9354_42CA44
 /* 42CAC0 802A93D0 0200202D */  daddu     $a0, $s0, $zero
 /* 42CAC4 802A93D4 0C05128B */  jal       clear_icon_flags
 /* 42CAC8 802A93D8 24050002 */   addiu    $a1, $zero, 2
-/* 42CACC 802A93DC 0C05272D */  jal       play_sound
+/* 42CACC 802A93DC 0C05272D */  jal       sfx_play_sound
 /* 42CAD0 802A93E0 24040233 */   addiu    $a0, $zero, 0x233
 /* 42CAD4 802A93E4 24020001 */  addiu     $v0, $zero, 1
 /* 42CAD8 802A93E8 A6220070 */  sh        $v0, 0x70($s1)
@@ -236,7 +236,7 @@ glabel L802A93F4_42CAE4
 /* 42CC5C 802A956C 10400005 */  beqz      $v0, .L802A9584
 /* 42CC60 802A9570 2404021D */   addiu    $a0, $zero, 0x21d
 /* 42CC64 802A9574 2402000A */  addiu     $v0, $zero, 0xa
-/* 42CC68 802A9578 0C05272D */  jal       play_sound
+/* 42CC68 802A9578 0C05272D */  jal       sfx_play_sound
 /* 42CC6C 802A957C A6220072 */   sh       $v0, 0x72($s1)
 /* 42CC70 802A9580 A6200070 */  sh        $zero, 0x70($s1)
 .L802A9584:
@@ -292,7 +292,7 @@ glabel L802A93F4_42CAE4
 /* 42CD34 802A9644 2402000B */  addiu     $v0, $zero, 0xb
 /* 42CD38 802A9648 A622004C */  sh        $v0, 0x4c($s1)
 /* 42CD3C 802A964C 24630001 */  addiu     $v1, $v1, 1
-/* 42CD40 802A9650 0C05272D */  jal       play_sound
+/* 42CD40 802A9650 0C05272D */  jal       sfx_play_sound
 /* 42CD44 802A9654 A2E30084 */   sb       $v1, 0x84($s7)
 /* 42CD48 802A9658 080AA5BA */  j         L802A96E8_42CDD8
 /* 42CD4C 802A965C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s
index f8f0325f42..44e24bfe26 100644
--- a/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s
+++ b/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s
@@ -134,7 +134,7 @@ glabel L802A949C_42D3AC
 /* 42D400 802A94F0 A220005C */  sb        $zero, 0x5c($s1)
 /* 42D404 802A94F4 3C01802B */  lui       $at, %hi(D_802A9B00)
 /* 42D408 802A94F8 AC239B00 */  sw        $v1, %lo(D_802A9B00)($at)
-/* 42D40C 802A94FC 0C0526AE */  jal       _play_sound
+/* 42D40C 802A94FC 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42D410 802A9500 A6220054 */   sh       $v0, 0x54($s1)
 /* 42D414 802A9504 2402000B */  addiu     $v0, $zero, 0xb
 /* 42D418 802A9508 A622004C */  sh        $v0, 0x4c($s1)
@@ -274,7 +274,7 @@ glabel L802A950C_42D41C
 /* 42D608 802A96F8 00023840 */  sll       $a3, $v0, 1
 /* 42D60C 802A96FC 00E23821 */  addu      $a3, $a3, $v0
 /* 42D610 802A9700 00073880 */  sll       $a3, $a3, 2
-/* 42D614 802A9704 0C0526F9 */  jal       func_80149BE4
+/* 42D614 802A9704 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 42D618 802A9708 A2480084 */   sb       $t0, 0x84($s2)
 /* 42D61C 802A970C 86220054 */  lh        $v0, 0x54($s1)
 /* 42D620 802A9710 96230054 */  lhu       $v1, 0x54($s1)
@@ -330,7 +330,7 @@ glabel L802A950C_42D41C
 /* 42D6D8 802A97C8 00000000 */   nop
 /* 42D6DC 802A97CC 3C048000 */  lui       $a0, 0x8000
 .L802A97D0:
-/* 42D6E0 802A97D0 0C05271B */  jal       stop_sound
+/* 42D6E0 802A97D0 0C05271B */  jal       sfx_stop_sound
 /* 42D6E4 802A97D4 34840041 */   ori      $a0, $a0, 0x41
 /* 42D6E8 802A97D8 0C093EB1 */  jal       set_popup_duration
 /* 42D6EC 802A97DC 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s b/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s
index b746a755b6..3af63c49bb 100644
--- a/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s
+++ b/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s
@@ -121,7 +121,7 @@ glabel L802A93F0_42DE00
 /* 42DE5C 802A944C 00A0382D */  daddu     $a3, $a1, $zero
 /* 42DE60 802A9450 A6200044 */  sh        $zero, 0x44($s1)
 /* 42DE64 802A9454 A220005C */  sb        $zero, 0x5c($s1)
-/* 42DE68 802A9458 0C0526AE */  jal       _play_sound
+/* 42DE68 802A9458 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42DE6C 802A945C A6220054 */   sh       $v0, 0x54($s1)
 /* 42DE70 802A9460 2402000B */  addiu     $v0, $zero, 0xb
 /* 42DE74 802A9464 A622004C */  sh        $v0, 0x4c($s1)
@@ -296,7 +296,7 @@ glabel L802A9468_42DE78
 /* 42E0D4 802A96C4 00023840 */  sll       $a3, $v0, 1
 /* 42E0D8 802A96C8 00E23821 */  addu      $a3, $a3, $v0
 /* 42E0DC 802A96CC 00073880 */  sll       $a3, $a3, 2
-/* 42E0E0 802A96D0 0C0526F9 */  jal       func_80149BE4
+/* 42E0E0 802A96D0 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 42E0E4 802A96D4 A2480084 */   sb       $t0, 0x84($s2)
 /* 42E0E8 802A96D8 86220054 */  lh        $v0, 0x54($s1)
 /* 42E0EC 802A96DC 96230054 */  lhu       $v1, 0x54($s1)
@@ -343,7 +343,7 @@ glabel L802A9468_42DE78
 /* 42E180 802A9770 00000000 */   nop
 /* 42E184 802A9774 3C048000 */  lui       $a0, 0x8000
 .L802A9778:
-/* 42E188 802A9778 0C05271B */  jal       stop_sound
+/* 42E188 802A9778 0C05271B */  jal       sfx_stop_sound
 /* 42E18C 802A977C 34840041 */   ori      $a0, $a0, 0x41
 /* 42E190 802A9780 0C093EB1 */  jal       set_popup_duration
 /* 42E194 802A9784 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s b/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s
index afdd2f045d..25f3bc2be0 100644
--- a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s
+++ b/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s
@@ -103,7 +103,7 @@ glabel L802A93B4_42E754
 /* 42E7A0 802A9400 A6200044 */  sh        $zero, 0x44($s1)
 /* 42E7A4 802A9404 A2400085 */  sb        $zero, 0x85($s2)
 /* 42E7A8 802A9408 A220005C */  sb        $zero, 0x5c($s1)
-/* 42E7AC 802A940C 0C0526AE */  jal       _play_sound
+/* 42E7AC 802A940C 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42E7B0 802A9410 A6220054 */   sh       $v0, 0x54($s1)
 /* 42E7B4 802A9414 2402000B */  addiu     $v0, $zero, 0xb
 /* 42E7B8 802A9418 A622004C */  sh        $v0, 0x4c($s1)
@@ -264,7 +264,7 @@ glabel L802A941C_42E7BC
 /* 42E9F8 802A9658 00023840 */  sll       $a3, $v0, 1
 /* 42E9FC 802A965C 00E23821 */  addu      $a3, $a3, $v0
 /* 42EA00 802A9660 00073880 */  sll       $a3, $a3, 2
-/* 42EA04 802A9664 0C0526F9 */  jal       func_80149BE4
+/* 42EA04 802A9664 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 42EA08 802A9668 A2480084 */   sb       $t0, 0x84($s2)
 /* 42EA0C 802A966C 8E620008 */  lw        $v0, 8($s3)
 /* 42EA10 802A9670 90430006 */  lbu       $v1, 6($v0)
@@ -400,7 +400,7 @@ glabel L802A941C_42E7BC
 /* 42EBEC 802A984C 0C093EB1 */  jal       set_popup_duration
 /* 42EBF0 802A9850 0000202D */   daddu    $a0, $zero, $zero
 /* 42EBF4 802A9854 3C048000 */  lui       $a0, 0x8000
-/* 42EBF8 802A9858 0C05271B */  jal       stop_sound
+/* 42EBF8 802A9858 0C05271B */  jal       sfx_stop_sound
 /* 42EBFC 802A985C 34840041 */   ori      $a0, $a0, 0x41
 /* 42EC00 802A9860 24020005 */  addiu     $v0, $zero, 5
 /* 42EC04 802A9864 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s
index b661954e39..bab2611d58 100644
--- a/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s
+++ b/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s
@@ -101,7 +101,7 @@ glabel L802A9368_42F188
 /* 42F1D4 802A93B4 A220005C */  sb        $zero, 0x5c($s1)
 /* 42F1D8 802A93B8 3C01802B */  lui       $at, %hi(D_802A98C0)
 /* 42F1DC 802A93BC AC2098C0 */  sw        $zero, %lo(D_802A98C0)($at)
-/* 42F1E0 802A93C0 0C0526AE */  jal       _play_sound
+/* 42F1E0 802A93C0 0C0526AE */  jal       sfx_play_sound_with_params
 /* 42F1E4 802A93C4 A6220054 */   sh       $v0, 0x54($s1)
 /* 42F1E8 802A93C8 2402000B */  addiu     $v0, $zero, 0xb
 /* 42F1EC 802A93CC A622004C */  sh        $v0, 0x4c($s1)
@@ -276,7 +276,7 @@ glabel L802A93D0_42F1F0
 /* 42F464 802A9644 A2470084 */  sb        $a3, 0x84($s2)
 /* 42F468 802A9648 00023840 */  sll       $a3, $v0, 1
 /* 42F46C 802A964C 00E23821 */  addu      $a3, $a3, $v0
-/* 42F470 802A9650 0C0526F9 */  jal       func_80149BE4
+/* 42F470 802A9650 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 42F474 802A9654 00073880 */   sll      $a3, $a3, 2
 /* 42F478 802A9658 86220054 */  lh        $v0, 0x54($s1)
 /* 42F47C 802A965C 96230054 */  lhu       $v1, 0x54($s1)
@@ -318,7 +318,7 @@ glabel L802A93D0_42F1F0
 /* 42F4FC 802A96DC 0C093EB1 */  jal       set_popup_duration
 /* 42F500 802A96E0 0000202D */   daddu    $a0, $zero, $zero
 /* 42F504 802A96E4 3C048000 */  lui       $a0, 0x8000
-/* 42F508 802A96E8 0C05271B */  jal       stop_sound
+/* 42F508 802A96E8 0C05271B */  jal       sfx_stop_sound
 /* 42F50C 802A96EC 34840041 */   ori      $a0, $a0, 0x41
 /* 42F510 802A96F0 24020005 */  addiu     $v0, $zero, 5
 /* 42F514 802A96F4 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s
index 517291d8c8..63bf426048 100644
--- a/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s
+++ b/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s
@@ -94,7 +94,7 @@ glabel L802A9394_4303B4
 /* 430400 802A93E0 A6200044 */  sh        $zero, 0x44($s1)
 /* 430404 802A93E4 A2400084 */  sb        $zero, 0x84($s2)
 /* 430408 802A93E8 A220005C */  sb        $zero, 0x5c($s1)
-/* 43040C 802A93EC 0C0526AE */  jal       _play_sound
+/* 43040C 802A93EC 0C0526AE */  jal       sfx_play_sound_with_params
 /* 430410 802A93F0 A6220054 */   sh       $v0, 0x54($s1)
 /* 430414 802A93F4 2402000B */  addiu     $v0, $zero, 0xb
 /* 430418 802A93F8 A622004C */  sh        $v0, 0x4c($s1)
@@ -300,7 +300,7 @@ glabel L802A93FC_43041C
 /* 4306FC 802A96DC 00023840 */  sll       $a3, $v0, 1
 /* 430700 802A96E0 00E23821 */  addu      $a3, $a3, $v0
 /* 430704 802A96E4 00073880 */  sll       $a3, $a3, 2
-/* 430708 802A96E8 0C0526F9 */  jal       func_80149BE4
+/* 430708 802A96E8 0C0526F9 */  jal       sfx_adjust_env_sound_params
 /* 43070C 802A96EC A2480084 */   sb       $t0, 0x84($s2)
 /* 430710 802A96F0 86220054 */  lh        $v0, 0x54($s1)
 /* 430714 802A96F4 96230054 */  lhu       $v1, 0x54($s1)
@@ -344,7 +344,7 @@ glabel L802A93FC_43041C
 /* 430798 802A9778 0C093EB1 */  jal       set_popup_duration
 /* 43079C 802A977C 0000202D */   daddu    $a0, $zero, $zero
 /* 4307A0 802A9780 3C048000 */  lui       $a0, 0x8000
-/* 4307A4 802A9784 0C05271B */  jal       stop_sound
+/* 4307A4 802A9784 0C05271B */  jal       sfx_stop_sound
 /* 4307A8 802A9788 34840041 */   ori      $a0, $a0, 0x41
 /* 4307AC 802A978C 24020005 */  addiu     $v0, $zero, 5
 /* 4307B0 802A9790 A6220054 */  sh        $v0, 0x54($s1)
diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s
index 1d75abff46..fd4b758895 100644
--- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s
+++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s
@@ -86,7 +86,7 @@ glabel func_800E5A2C
 /* 7F008 800E5B58 00431024 */  and       $v0, $v0, $v1
 /* 7F00C 800E5B5C 10800004 */  beqz      $a0, .L800E5B70
 /* 7F010 800E5B60 AE020004 */   sw       $v0, 4($s0)
-/* 7F014 800E5B64 0C05271B */  jal       stop_sound
+/* 7F014 800E5B64 0C05271B */  jal       sfx_stop_sound
 /* 7F018 800E5B68 00000000 */   nop
 .L800E5B6C:
 /* 7F01C 800E5B6C 3C138000 */  lui       $s3, 0x8000
diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s
index 8faf4a36f0..ef416c7d2c 100644
--- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s
+++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s
@@ -23,7 +23,7 @@ glabel phys_player_land
 /* 7C770 800E32C0 00621824 */  and       $v1, $v1, $v0
 /* 7C774 800E32C4 E6000044 */  swc1      $f0, 0x44($s0)
 /* 7C778 800E32C8 E6020048 */  swc1      $f2, 0x48($s0)
-/* 7C77C 800E32CC 0C052736 */  jal       play_sound_at_player
+/* 7C77C 800E32CC 0C052736 */  jal       sfx_play_sound_at_player
 /* 7C780 800E32D0 AE030000 */   sw       $v1, ($s0)
 /* 7C784 800E32D4 3C038016 */  lui       $v1, %hi(gCollisionStatus)
 /* 7C788 800E32D8 2463A550 */  addiu     $v1, $v1, %lo(gCollisionStatus)
diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/can_pause.s b/ver/us/asm/nonmatchings/code_7fd10_len_b40/can_pause.s
index 462ac07002..57b1cb73db 100644
--- a/ver/us/asm/nonmatchings/code_7fd10_len_b40/can_pause.s
+++ b/ver/us/asm/nonmatchings/code_7fd10_len_b40/can_pause.s
@@ -98,7 +98,7 @@ glabel can_pause
 /* 7FFEC 800E6B3C 14620004 */  bne       $v1, $v0, .L800E6B50
 /* 7FFF0 800E6B40 0000102D */   daddu    $v0, $zero, $zero
 .L800E6B44:
-/* 7FFF4 800E6B44 0C05272D */  jal       play_sound
+/* 7FFF4 800E6B44 0C05272D */  jal       sfx_play_sound
 /* 7FFF8 800E6B48 2404021D */   addiu    $a0, $zero, 0x21d
 .L800E6B4C:
 /* 7FFFC 800E6B4C 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s b/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s
index 9030deac91..0ba9e71efa 100644
--- a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s
+++ b/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s
@@ -107,7 +107,7 @@ glabel L800E6DD8_80288
 /* 802F0 800E6E40 30420040 */  andi      $v0, $v0, 0x40
 /* 802F4 800E6E44 10400009 */  beqz      $v0, .L800E6E6C
 /* 802F8 800E6E48 00000000 */   nop
-/* 802FC 800E6E4C 0C05272D */  jal       play_sound
+/* 802FC 800E6E4C 0C05272D */  jal       sfx_play_sound
 /* 80300 800E6E50 2404021D */   addiu    $a0, $zero, 0x21d
 /* 80304 800E6E54 3C028011 */  lui       $v0, %hi(D_8010C9C0)
 /* 80308 800E6E58 8442C9C0 */  lh        $v0, %lo(D_8010C9C0)($v0)
@@ -216,7 +216,7 @@ glabel L800E6FC8_80478
 /* 80488 800E6FD8 00000000 */   nop
 /* 8048C 800E6FDC 0C00CD3C */  jal       set_game_mode
 /* 80490 800E6FE0 2404000A */   addiu    $a0, $zero, 0xa
-/* 80494 800E6FE4 0C05272D */  jal       play_sound
+/* 80494 800E6FE4 0C05272D */  jal       sfx_play_sound
 /* 80498 800E6FE8 240400C5 */   addiu    $a0, $zero, 0xc5
 /* 8049C 800E6FEC 2402000A */  addiu     $v0, $zero, 0xa
 /* 804A0 800E6FF0 3C018011 */  lui       $at, %hi(D_8010CCFA)
diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s b/ver/us/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s
index 622bb8e506..54411d859d 100644
--- a/ver/us/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s
+++ b/ver/us/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s
@@ -51,7 +51,7 @@ glabel func_800E6904
 /* 7FE60 800E69B0 24020021 */  addiu     $v0, $zero, 0x21
 /* 7FE64 800E69B4 12020004 */  beq       $s0, $v0, .L800E69C8
 /* 7FE68 800E69B8 24020001 */   addiu    $v0, $zero, 1
-/* 7FE6C 800E69BC 0C05272D */  jal       play_sound
+/* 7FE6C 800E69BC 0C05272D */  jal       sfx_play_sound
 /* 7FE70 800E69C0 2404021D */   addiu    $a0, $zero, 0x21d
 .L800E69C4:
 /* 7FE74 800E69C4 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/ver/us/asm/nonmatchings/code_80850_len_3060/update_status_menu.s
index f1d78477d7..93f4dde4c0 100644
--- a/ver/us/asm/nonmatchings/code_80850_len_3060/update_status_menu.s
+++ b/ver/us/asm/nonmatchings/code_80850_len_3060/update_status_menu.s
@@ -155,7 +155,7 @@ glabel update_status_menu
 /* 81790 800E82E0 14400015 */  bnez      $v0, .L800E8338
 /* 81794 800E82E4 24620001 */   addiu    $v0, $v1, 1
 /* 81798 800E82E8 A262003D */  sb        $v0, 0x3d($s3)
-/* 8179C 800E82EC 0C05272D */  jal       play_sound
+/* 8179C 800E82EC 0C05272D */  jal       sfx_play_sound
 /* 817A0 800E82F0 24040213 */   addiu    $a0, $zero, 0x213
 /* 817A4 800E82F4 0803A0CE */  j         .L800E8338
 /* 817A8 800E82F8 00000000 */   nop
@@ -209,7 +209,7 @@ glabel update_status_menu
 /* 81858 800E83A8 14400015 */  bnez      $v0, .L800E8400
 /* 8185C 800E83AC 24620001 */   addiu    $v0, $v1, 1
 /* 81860 800E83B0 A262003E */  sb        $v0, 0x3e($s3)
-/* 81864 800E83B4 0C05272D */  jal       play_sound
+/* 81864 800E83B4 0C05272D */  jal       sfx_play_sound
 /* 81868 800E83B8 24040217 */   addiu    $a0, $zero, 0x217
 /* 8186C 800E83BC 0803A100 */  j         .L800E8400
 /* 81870 800E83C0 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s
index 15825422bd..f14c4b8b40 100644
--- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s
+++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s
@@ -47,7 +47,7 @@ glabel L800F1734_8ABE4
 /* 8ABF4 800F1744 0200282D */   daddu    $a1, $s0, $zero
 /* 8ABF8 800F1748 24040002 */  addiu     $a0, $zero, 2
 .L800F174C:
-/* 8ABFC 800F174C 0C05272D */  jal       play_sound
+/* 8ABFC 800F174C 0C05272D */  jal       sfx_play_sound
 /* 8AC00 800F1750 00000000 */   nop
 /* 8AC04 800F1754 24040013 */  addiu     $a0, $zero, 0x13
 /* 8AC08 800F1758 0C051F9F */  jal       set_window_update
@@ -59,7 +59,7 @@ glabel L800F1768_8AC18
 /* 8AC1C 800F176C 24A57474 */  addiu     $a1, $a1, %lo(basic_window_update)
 /* 8AC20 800F1770 0C051F9F */  jal       set_window_update
 /* 8AC24 800F1774 2404000E */   addiu    $a0, $zero, 0xe
-/* 8AC28 800F1778 0C05272D */  jal       play_sound
+/* 8AC28 800F1778 0C05272D */  jal       sfx_play_sound
 /* 8AC2C 800F177C 24040001 */   addiu    $a0, $zero, 1
 .L800F1780:
 /* 8AC30 800F1780 24040015 */  addiu     $a0, $zero, 0x15
diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s
index 25aa0a3d07..fd24827c43 100644
--- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s
+++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s
@@ -950,7 +950,7 @@ glabel L800F2780_8BC30
 /* 8BC40 800F2790 0200282D */   daddu    $a1, $s0, $zero
 /* 8BC44 800F2794 24040002 */  addiu     $a0, $zero, 2
 .L800F2798:
-/* 8BC48 800F2798 0C05272D */  jal       play_sound
+/* 8BC48 800F2798 0C05272D */  jal       sfx_play_sound
 /* 8BC4C 800F279C 00000000 */   nop
 /* 8BC50 800F27A0 24040013 */  addiu     $a0, $zero, 0x13
 /* 8BC54 800F27A4 0C051F9F */  jal       set_window_update
@@ -962,7 +962,7 @@ glabel L800F27B4_8BC64
 /* 8BC68 800F27B8 24A57474 */  addiu     $a1, $a1, %lo(basic_window_update)
 /* 8BC6C 800F27BC 0C051F9F */  jal       set_window_update
 /* 8BC70 800F27C0 2404000E */   addiu    $a0, $zero, 0xe
-/* 8BC74 800F27C4 0C05272D */  jal       play_sound
+/* 8BC74 800F27C4 0C05272D */  jal       sfx_play_sound
 /* 8BC78 800F27C8 24040001 */   addiu    $a0, $zero, 1
 .L800F27CC:
 /* 8BC7C 800F27CC 24040015 */  addiu     $a0, $zero, 0x15
@@ -1087,7 +1087,7 @@ glabel L800F2860_8BD10
 /* 8BE28 800F2978 8E020000 */  lw        $v0, ($s0)
 /* 8BE2C 800F297C 10620004 */  beq       $v1, $v0, .L800F2990
 /* 8BE30 800F2980 0000302D */   daddu    $a2, $zero, $zero
-/* 8BE34 800F2984 0C05272D */  jal       play_sound
+/* 8BE34 800F2984 0C05272D */  jal       sfx_play_sound
 /* 8BE38 800F2988 240400C7 */   addiu    $a0, $zero, 0xc7
 /* 8BE3C 800F298C 0000302D */  daddu     $a2, $zero, $zero
 .L800F2990:
@@ -1173,7 +1173,7 @@ glabel L800F2860_8BD10
 /* 8BF68 800F2AB8 0803CAC0 */  j         .L800F2B00
 /* 8BF6C 800F2ABC 00000000 */   nop
 .L800F2AC0:
-/* 8BF70 800F2AC0 0C05272D */  jal       play_sound
+/* 8BF70 800F2AC0 0C05272D */  jal       sfx_play_sound
 /* 8BF74 800F2AC4 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 8BF78 800F2AC8 3C028011 */  lui       $v0, %hi(D_8010D68E)
 /* 8BF7C 800F2ACC 8042D68E */  lb        $v0, %lo(D_8010D68E)($v0)
@@ -1182,7 +1182,7 @@ glabel L800F2860_8BD10
 /* 8BF88 800F2AD8 0803CD93 */  j         .L800F364C
 /* 8BF8C 800F2ADC 2402FFFF */   addiu    $v0, $zero, -1
 .L800F2AE0:
-/* 8BF90 800F2AE0 0C05272D */  jal       play_sound
+/* 8BF90 800F2AE0 0C05272D */  jal       sfx_play_sound
 /* 8BF94 800F2AE4 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 8BF98 800F2AE8 3C028011 */  lui       $v0, %hi(D_8010D68E)
 /* 8BF9C 800F2AEC 8042D68E */  lb        $v0, %lo(D_8010D68E)($v0)
@@ -1200,7 +1200,7 @@ glabel L800F2860_8BD10
 /* 8BFC8 800F2B18 8C42018C */  lw        $v0, 0x18c($v0)
 /* 8BFCC 800F2B1C 10400009 */  beqz      $v0, .L800F2B44
 /* 8BFD0 800F2B20 24020001 */   addiu    $v0, $zero, 1
-/* 8BFD4 800F2B24 0C05272D */  jal       play_sound
+/* 8BFD4 800F2B24 0C05272D */  jal       sfx_play_sound
 /* 8BFD8 800F2B28 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 8BFDC 800F2B2C 3C028011 */  lui       $v0, %hi(D_8010D68E)
 /* 8BFE0 800F2B30 8042D68E */  lb        $v0, %lo(D_8010D68E)($v0)
@@ -1212,7 +1212,7 @@ glabel L800F2860_8BD10
 /* 8BFF4 800F2B44 8C630318 */  lw        $v1, 0x318($v1)
 /* 8BFF8 800F2B48 14620005 */  bne       $v1, $v0, .L800F2B60
 /* 8BFFC 800F2B4C 00000000 */   nop
-/* 8C000 800F2B50 0C05272D */  jal       play_sound
+/* 8C000 800F2B50 0C05272D */  jal       sfx_play_sound
 /* 8C004 800F2B54 2404021D */   addiu    $a0, $zero, 0x21d
 /* 8C008 800F2B58 0803CD93 */  j         .L800F364C
 /* 8C00C 800F2B5C 2402001E */   addiu    $v0, $zero, 0x1e
@@ -1226,7 +1226,7 @@ glabel L800F2860_8BD10
 /* 8C028 800F2B78 146202B6 */  bne       $v1, $v0, L800F3654_8CB04
 /* 8C02C 800F2B7C 00000000 */   nop
 .L800F2B80:
-/* 8C030 800F2B80 0C05272D */  jal       play_sound
+/* 8C030 800F2B80 0C05272D */  jal       sfx_play_sound
 /* 8C034 800F2B84 2404021D */   addiu    $a0, $zero, 0x21d
 /* 8C038 800F2B88 0803CD95 */  j         L800F3654_8CB04
 /* 8C03C 800F2B8C 00000000 */   nop
@@ -1268,7 +1268,7 @@ glabel L800F2BEC_8C09C
 /* 8C0B4 800F2C04 00431024 */  and       $v0, $v0, $v1
 /* 8C0B8 800F2C08 10400013 */  beqz      $v0, .L800F2C58
 /* 8C0BC 800F2C0C 00000000 */   nop
-/* 8C0C0 800F2C10 0C05272D */  jal       play_sound
+/* 8C0C0 800F2C10 0C05272D */  jal       sfx_play_sound
 /* 8C0C4 800F2C14 240400CA */   addiu    $a0, $zero, 0xca
 /* 8C0C8 800F2C18 3C028011 */  lui       $v0, %hi(D_8010D698)
 /* 8C0CC 800F2C1C 8042D698 */  lb        $v0, %lo(D_8010D698)($v0)
@@ -1313,7 +1313,7 @@ glabel L800F2BEC_8C09C
 /* 8C154 800F2CA4 00431024 */  and       $v0, $v0, $v1
 /* 8C158 800F2CA8 1040026A */  beqz      $v0, L800F3654_8CB04
 /* 8C15C 800F2CAC 00000000 */   nop
-/* 8C160 800F2CB0 0C05272D */  jal       play_sound
+/* 8C160 800F2CB0 0C05272D */  jal       sfx_play_sound
 /* 8C164 800F2CB4 240400CA */   addiu    $a0, $zero, 0xca
 /* 8C168 800F2CB8 0803CD93 */  j         .L800F364C
 /* 8C16C 800F2CBC 2402FFFA */   addiu    $v0, $zero, -6
diff --git a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s b/ver/us/asm/nonmatchings/code_B9D60/_update_message.s
index 924e7f5f00..f8a177b348 100644
--- a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s
+++ b/ver/us/asm/nonmatchings/code_B9D60/_update_message.s
@@ -177,7 +177,7 @@ glabel _update_message
 .L80123AE0:
 /* BA1E0 80123AE0 0000282D */  daddu     $a1, $zero, $zero
 /* BA1E4 80123AE4 00A0302D */  daddu     $a2, $a1, $zero
-/* BA1E8 80123AE8 0C0526AE */  jal       _play_sound
+/* BA1E8 80123AE8 0C0526AE */  jal       sfx_play_sound_with_params
 /* BA1EC 80123AEC 00A0382D */   daddu    $a3, $a1, $zero
 /* BA1F0 80123AF0 08048F72 */  j         .L80123DC8
 /* BA1F4 80123AF4 00000000 */   nop
@@ -249,7 +249,7 @@ glabel _update_message
 /* BA2E8 80123BE8 04420001 */  bltzl     $v0, .L80123BF0
 /* BA2EC 80123BEC 00021023 */   negu     $v0, $v0
 .L80123BF0:
-/* BA2F0 80123BF0 0C0526AE */  jal       _play_sound
+/* BA2F0 80123BF0 0C0526AE */  jal       sfx_play_sound_with_params
 /* BA2F4 80123BF4 A60204C8 */   sh       $v0, 0x4c8($s0)
 /* BA2F8 80123BF8 08048F72 */  j         .L80123DC8
 /* BA2FC 80123BFC 00000000 */   nop
@@ -340,7 +340,7 @@ glabel _update_message
 /* BA438 80123D38 24020001 */  addiu     $v0, $zero, 1
 /* BA43C 80123D3C A20204ED */  sb        $v0, 0x4ed($s0)
 .L80123D40:
-/* BA440 80123D40 0C0526AE */  jal       _play_sound
+/* BA440 80123D40 0C0526AE */  jal       sfx_play_sound_with_params
 /* BA444 80123D44 00000000 */   nop
 .L80123D48:
 /* BA448 80123D48 920304F8 */  lbu       $v1, 0x4f8($s0)
diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80124434.s b/ver/us/asm/nonmatchings/code_B9D60/func_80124434.s
index f7aab5c36d..bae59ddb47 100644
--- a/ver/us/asm/nonmatchings/code_B9D60/func_80124434.s
+++ b/ver/us/asm/nonmatchings/code_B9D60/func_80124434.s
@@ -75,7 +75,7 @@ glabel func_80124434
 /* BAC44 80124544 8E040524 */  lw        $a0, 0x524($s0)
 .L80124548:
 /* BAC48 80124548 9206051A */  lbu       $a2, 0x51a($s0)
-/* BAC4C 8012454C 0C0526AE */  jal       _play_sound
+/* BAC4C 8012454C 0C0526AE */  jal       sfx_play_sound_with_params
 /* BAC50 80124550 00073C03 */   sra      $a3, $a3, 0x10
 .L80124554:
 /* BAC54 80124554 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s b/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s
index 1d45fc1ed3..7206759bcf 100644
--- a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s
+++ b/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s
@@ -107,7 +107,7 @@ glabel L80124664_BAD64
 /* BADA8 801246A8 240400CB */   addiu    $a0, $zero, 0xcb
 /* BADAC 801246AC 0000282D */  daddu     $a1, $zero, $zero
 /* BADB0 801246B0 00A0302D */  daddu     $a2, $a1, $zero
-/* BADB4 801246B4 0C0526AE */  jal       _play_sound
+/* BADB4 801246B4 0C0526AE */  jal       sfx_play_sound_with_params
 /* BADB8 801246B8 00A0382D */   daddu    $a3, $a1, $zero
 /* BADBC 801246BC 08049580 */  j         L80125600_BBD00
 /* BADC0 801246C0 00000000 */   nop
@@ -271,7 +271,7 @@ glabel L801248BC_BAFBC
 /* BB004 80124904 2404021C */  addiu     $a0, $zero, 0x21c
 /* BB008 80124908 0000282D */  daddu     $a1, $zero, $zero
 /* BB00C 8012490C 00A0302D */  daddu     $a2, $a1, $zero
-/* BB010 80124910 0C0526AE */  jal       _play_sound
+/* BB010 80124910 0C0526AE */  jal       sfx_play_sound_with_params
 /* BB014 80124914 00A0382D */   daddu    $a3, $a1, $zero
 /* BB018 80124918 080492BC */  j         .L80124AF0
 /* BB01C 8012491C 00000000 */   nop
@@ -290,7 +290,7 @@ glabel L80124920_BB020
 /* BB04C 8012494C A6820514 */  sh        $v0, 0x514($s4)
 /* BB050 80124950 92620000 */  lbu       $v0, ($s3)
 /* BB054 80124954 00A0382D */  daddu     $a3, $a1, $zero
-/* BB058 80124958 0C0526AE */  jal       _play_sound
+/* BB058 80124958 0C0526AE */  jal       sfx_play_sound_with_params
 /* BB05C 8012495C A6820516 */   sh       $v0, 0x516($s4)
 /* BB060 80124960 96820500 */  lhu       $v0, 0x500($s4)
 /* BB064 80124964 8E8304FC */  lw        $v1, 0x4fc($s4)
@@ -819,7 +819,7 @@ glabel L801250D4_BB7D4
 /* BB7D4 801250D4 24040009 */  addiu     $a0, $zero, 9
 /* BB7D8 801250D8 0000282D */  daddu     $a1, $zero, $zero
 /* BB7DC 801250DC 00A0302D */  daddu     $a2, $a1, $zero
-/* BB7E0 801250E0 0C0526AE */  jal       _play_sound
+/* BB7E0 801250E0 0C0526AE */  jal       sfx_play_sound_with_params
 /* BB7E4 801250E4 00A0382D */   daddu    $a3, $a1, $zero
 /* BB7E8 801250E8 92640000 */  lbu       $a0, ($s3)
 /* BB7EC 801250EC 26730001 */  addiu     $s3, $s3, 1
diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s
index 4137d23986..f2f9d12273 100644
--- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s
+++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s
@@ -1013,7 +1013,7 @@ glabel update_item_entity_collectable
 .L801350FC:
 /* CB7FC 801350FC 8E460008 */  lw        $a2, 8($s2)
 /* CB800 80135100 8E47000C */  lw        $a3, 0xc($s2)
-/* CB804 80135104 0C052757 */  jal       play_sound_at_position
+/* CB804 80135104 0C052757 */  jal       sfx_play_sound_at_position
 /* CB808 80135108 0000282D */   daddu    $a1, $zero, $zero
 .L8013510C:
 /* CB80C 8013510C C642000C */  lwc1      $f2, 0xc($s2)
@@ -1139,7 +1139,7 @@ glabel update_item_entity_collectable
 /* CB9C0 801352C0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CB9C4 801352C4 8E460008 */  lw        $a2, 8($s2)
 /* CB9C8 801352C8 8E47000C */  lw        $a3, 0xc($s2)
-/* CB9CC 801352CC 0C052757 */  jal       play_sound_at_position
+/* CB9CC 801352CC 0C052757 */  jal       sfx_play_sound_at_position
 /* CB9D0 801352D0 0000282D */   daddu    $a1, $zero, $zero
 .L801352D4:
 /* CB9D4 801352D4 92620002 */  lbu       $v0, 2($s3)
@@ -1179,7 +1179,7 @@ glabel update_item_entity_collectable
 /* CBA54 80135354 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CBA58 80135358 8E460008 */  lw        $a2, 8($s2)
 /* CBA5C 8013535C 8E47000C */  lw        $a3, 0xc($s2)
-/* CBA60 80135360 0C052757 */  jal       play_sound_at_position
+/* CBA60 80135360 0C052757 */  jal       sfx_play_sound_at_position
 /* CBA64 80135364 0000282D */   daddu    $a1, $zero, $zero
 .L80135368:
 /* CBA68 80135368 92620005 */  lbu       $v0, 5($s3)
@@ -1199,7 +1199,7 @@ glabel update_item_entity_collectable
 /* CBA98 80135398 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CBA9C 8013539C 8E460008 */  lw        $a2, 8($s2)
 /* CBAA0 801353A0 8E47000C */  lw        $a3, 0xc($s2)
-/* CBAA4 801353A4 0C052757 */  jal       play_sound_at_position
+/* CBAA4 801353A4 0C052757 */  jal       sfx_play_sound_at_position
 /* CBAA8 801353A8 0000282D */   daddu    $a1, $zero, $zero
 /* CBAAC 801353AC 8E850028 */  lw        $a1, 0x28($s4)
 /* CBAB0 801353B0 868200B0 */  lh        $v0, 0xb0($s4)
@@ -1233,7 +1233,7 @@ glabel update_item_entity_collectable
 /* CBB18 80135418 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CBB1C 8013541C 8E460008 */  lw        $a2, 8($s2)
 /* CBB20 80135420 8E47000C */  lw        $a3, 0xc($s2)
-/* CBB24 80135424 0C052757 */  jal       play_sound_at_position
+/* CBB24 80135424 0C052757 */  jal       sfx_play_sound_at_position
 /* CBB28 80135428 0000282D */   daddu    $a1, $zero, $zero
 /* CBB2C 8013542C 3C030001 */  lui       $v1, 1
 /* CBB30 80135430 8E6202B4 */  lw        $v0, 0x2b4($s3)
@@ -1277,7 +1277,7 @@ glabel update_item_entity_collectable
 /* CBBB4 801354B4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CBBB8 801354B8 8E460008 */  lw        $a2, 8($s2)
 /* CBBBC 801354BC 8E47000C */  lw        $a3, 0xc($s2)
-/* CBBC0 801354C0 0C052757 */  jal       play_sound_at_position
+/* CBBC0 801354C0 0C052757 */  jal       sfx_play_sound_at_position
 /* CBBC4 801354C4 0000282D */   daddu    $a1, $zero, $zero
 .L801354C8:
 /* CBBC8 801354C8 0240202D */  daddu     $a0, $s2, $zero
diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s
index 7b85a01655..123d3bd98c 100644
--- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s
+++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s
@@ -126,12 +126,12 @@ glabel L801357A8_CBEA8
 /* CBF84 80135884 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CBF88 80135888 8E260008 */  lw        $a2, 8($s1)
 /* CBF8C 8013588C 8E27000C */  lw        $a3, 0xc($s1)
-/* CBF90 80135890 0C052757 */  jal       play_sound_at_position
+/* CBF90 80135890 0C052757 */  jal       sfx_play_sound_at_position
 /* CBF94 80135894 0000282D */   daddu    $a1, $zero, $zero
 /* CBF98 80135898 0804D62A */  j         .L801358A8
 /* CBF9C 8013589C 00000000 */   nop
 .L801358A0:
-/* CBFA0 801358A0 0C05272D */  jal       play_sound
+/* CBFA0 801358A0 0C05272D */  jal       sfx_play_sound
 /* CBFA4 801358A4 00000000 */   nop
 .L801358A8:
 /* CBFA8 801358A8 86220018 */  lh        $v0, 0x18($s1)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149670.s b/ver/us/asm/nonmatchings/code_DF950/func_80149670.s
index daa119958d..08436850ed 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149670.s
+++ b/ver/us/asm/nonmatchings/code_DF950/func_80149670.s
@@ -36,7 +36,7 @@ glabel func_80149670
 /* DFDE0 801496E0 8E040000 */  lw        $a0, ($s0)
 /* DFDE4 801496E4 92050008 */  lbu       $a1, 8($s0)
 /* DFDE8 801496E8 92060009 */  lbu       $a2, 9($s0)
-/* DFDEC 801496EC 0C015490 */  jal       func_80055240
+/* DFDEC 801496EC 0C015490 */  jal       snd_start_sound_with_shift
 /* DFDF0 801496F0 8607000A */   lh       $a3, 0xa($s0)
 .L801496F4:
 /* DFDF4 801496F4 2610001C */  addiu     $s0, $s0, 0x1c
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149A6C.s b/ver/us/asm/nonmatchings/code_DF950/func_80149A6C.s
index 4427ef7072..cf9f9210a7 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149A6C.s
+++ b/ver/us/asm/nonmatchings/code_DF950/func_80149A6C.s
@@ -5,7 +5,7 @@ glabel func_80149A6C
 /* E016C 80149A6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E0170 80149A70 AFB00010 */  sw        $s0, 0x10($sp)
 /* E0174 80149A74 AFBF0014 */  sw        $ra, 0x14($sp)
-/* E0178 80149A78 0C052631 */  jal       func_801498C4
+/* E0178 80149A78 0C052631 */  jal       sfx_get_env_sound_instance
 /* E017C 80149A7C 00A0802D */   daddu    $s0, $a1, $zero
 /* E0180 80149A80 0040202D */  daddu     $a0, $v0, $zero
 /* E0184 80149A84 10800008 */  beqz      $a0, .L80149AA8
@@ -15,7 +15,7 @@ glabel func_80149A6C
 /* E0194 80149A94 16000004 */  bnez      $s0, .L80149AA8
 /* E0198 80149A98 AC820000 */   sw       $v0, ($a0)
 /* E019C 80149A9C 8C840004 */  lw        $a0, 4($a0)
-/* E01A0 80149AA0 0C0154F0 */  jal       func_800553C0
+/* E01A0 80149AA0 0C0154F0 */  jal       snd_stop_sound
 /* E01A4 80149AA4 00000000 */   nop
 .L80149AA8:
 /* E01A8 80149AA8 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149BE4.s b/ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_params.s
similarity index 91%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149BE4.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_params.s
index 1619557b4f..16796a6fb7 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149BE4.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_params.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149BE4
+glabel sfx_adjust_env_sound_params
 /* E02E4 80149BE4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* E02E8 80149BE8 AFB00010 */  sw        $s0, 0x10($sp)
 /* E02EC 80149BEC 00A0802D */  daddu     $s0, $a1, $zero
@@ -17,7 +17,7 @@ glabel func_80149BE4
 /* E0314 80149C14 00021080 */  sll       $v0, $v0, 2
 /* E0318 80149C18 3C048015 */  lui       $a0, %hi(D_8014F2D0)
 /* E031C 80149C1C 00822021 */  addu      $a0, $a0, $v0
-/* E0320 80149C20 0C052631 */  jal       func_801498C4
+/* E0320 80149C20 0C052631 */  jal       sfx_get_env_sound_instance
 /* E0324 80149C24 8C84F2D0 */   lw       $a0, %lo(D_8014F2D0)($a0)
 /* E0328 80149C28 1040000A */  beqz      $v0, .L80149C54
 /* E032C 80149C2C 00000000 */   nop
@@ -29,7 +29,7 @@ glabel func_80149BE4
 /* E0340 80149C40 00123C00 */  sll       $a3, $s2, 0x10
 /* E0344 80149C44 30A500FF */  andi      $a1, $a1, 0xff
 /* E0348 80149C48 30C600FF */  andi      $a2, $a2, 0xff
-/* E034C 80149C4C 0C0154CC */  jal       func_80055330
+/* E034C 80149C4C 0C0154CC */  jal       snd_adjust_sound_with_shift
 /* E0350 80149C50 00073C03 */   sra      $a3, $a3, 0x10
 .L80149C54:
 /* E0354 80149C54 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_801499EC.s b/ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_pos.s
similarity index 94%
rename from ver/us/asm/nonmatchings/code_DF950/func_801499EC.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_pos.s
index a055ca248c..24fc476e74 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_801499EC.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_pos.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_801499EC
+glabel sfx_adjust_env_sound_pos
 /* E00EC 801499EC 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* E00F0 801499F0 F7B40020 */  sdc1      $f20, 0x20($sp)
 /* E00F4 801499F4 4486A000 */  mtc1      $a2, $f20
@@ -11,7 +11,7 @@ glabel func_801499EC
 /* E0104 80149A04 F7B60028 */  sdc1      $f22, 0x28($sp)
 /* E0108 80149A08 4487B000 */  mtc1      $a3, $f22
 /* E010C 80149A0C AFBF0018 */  sw        $ra, 0x18($sp)
-/* E0110 80149A10 0C052631 */  jal       func_801498C4
+/* E0110 80149A10 0C052631 */  jal       sfx_get_env_sound_instance
 /* E0114 80149A14 00A0882D */   daddu    $s1, $a1, $zero
 /* E0118 80149A18 0040202D */  daddu     $a0, $v0, $zero
 /* E011C 80149A1C 1080000B */  beqz      $a0, .L80149A4C
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149618.s b/ver/us/asm/nonmatchings/code_DF950/sfx_clear_sounds.s
similarity index 93%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149618.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_clear_sounds.s
index 7c02ec58b8..982d581408 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149618.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_clear_sounds.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149618
+glabel sfx_clear_sounds
 /* DFD18 80149618 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* DFD1C 8014961C AFB00010 */  sw        $s0, 0x10($sp)
 /* DFD20 80149620 3C108016 */  lui       $s0, %hi(D_801598A0)
@@ -18,7 +18,7 @@ glabel func_80149618
 /* DFD4C 8014964C AC309AD0 */  sw        $s0, %lo(D_80159AD0)($at)
 /* DFD50 80149650 0C0525FF */  jal       func_801497FC
 /* DFD54 80149654 0000202D */   daddu    $a0, $zero, $zero
-/* DFD58 80149658 0C052580 */  jal       use_default_door_sounds
+/* DFD58 80149658 0C052580 */  jal       sfx_reset_door_sounds
 /* DFD5C 8014965C 00000000 */   nop
 /* DFD60 80149660 8FBF0014 */  lw        $ra, 0x14($sp)
 /* DFD64 80149664 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149F58.s b/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_0.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149F58.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_0.s
index 5791f0c5b7..1c4eef9fba 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149F58.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_0.s
@@ -17,7 +17,7 @@ glabel D_80151288
 
 .section .text
 
-glabel func_80149F58
+glabel sfx_compute_spatialized_sound_params_0
 /* E0658 80149F58 44860000 */  mtc1      $a2, $f0
 /* E065C 80149F5C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* E0660 80149F60 AFB00030 */  sw        $s0, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_8014A1B4.s b/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_1.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_DF950/func_8014A1B4.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_1.s
index b3640d8671..ef531e8c53 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_8014A1B4.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_1.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8014A1B4
+glabel sfx_compute_spatialized_sound_params_1
 /* E08B4 8014A1B4 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* E08B8 8014A1B8 AFB00030 */  sw        $s0, 0x30($sp)
 /* E08BC 8014A1BC 00E0802D */  daddu     $s0, $a3, $zero
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149250.s b/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_2.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149250.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_2.s
index 4a0126c87d..c2779aa991 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149250.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_2.s
@@ -17,7 +17,7 @@ glabel D_80151268
 
 .section .text
 
-glabel func_80149250
+glabel sfx_compute_spatialized_sound_params_2
 /* DF950 80149250 44860000 */  mtc1      $a2, $f0
 /* DF954 80149254 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
 /* DF958 80149258 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_801498C4.s b/ver/us/asm/nonmatchings/code_DF950/sfx_get_env_sound_instance.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_DF950/func_801498C4.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_get_env_sound_instance.s
index 0b2d7e66d2..b3c9d1836a 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_801498C4.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_get_env_sound_instance.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_801498C4
+glabel sfx_get_env_sound_instance
 /* DFFC4 801498C4 3C038016 */  lui       $v1, %hi(D_80159AD0)
 /* DFFC8 801498C8 8C639AD0 */  lw        $v1, %lo(D_80159AD0)($v1)
 /* DFFCC 801498CC 0000282D */  daddu     $a1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149E04.s b/ver/us/asm/nonmatchings/code_DF950/sfx_get_spatialized_sound_params.s
similarity index 94%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149E04.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_get_spatialized_sound_params.s
index f23e374cf2..9eddd51da2 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149E04.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_get_spatialized_sound_params.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149E04
+glabel sfx_get_spatialized_sound_params
 /* E0504 80149E04 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* E0508 80149E08 44860000 */  mtc1      $a2, $f0
 /* E050C 80149E0C 8FA3003C */  lw        $v1, 0x3c($sp)
@@ -25,14 +25,14 @@ glabel func_80149E04
 .L80149E54:
 /* E0554 80149E54 44060000 */  mfc1      $a2, $f0
 /* E0558 80149E58 0220382D */  daddu     $a3, $s1, $zero
-/* E055C 80149E5C 0C0527D6 */  jal       func_80149F58
+/* E055C 80149E5C 0C0527D6 */  jal       sfx_compute_spatialized_sound_params_0
 /* E0560 80149E60 AFB20010 */   sw       $s2, 0x10($sp)
 /* E0564 80149E64 080527A7 */  j         .L80149E9C
 /* E0568 80149E68 3C020001 */   lui      $v0, 1
 .L80149E6C:
 /* E056C 80149E6C 44060000 */  mfc1      $a2, $f0
 /* E0570 80149E70 0220382D */  daddu     $a3, $s1, $zero
-/* E0574 80149E74 0C05286D */  jal       func_8014A1B4
+/* E0574 80149E74 0C05286D */  jal       sfx_compute_spatialized_sound_params_1
 /* E0578 80149E78 AFB20010 */   sw       $s2, 0x10($sp)
 /* E057C 80149E7C 080527A7 */  j         .L80149E9C
 /* E0580 80149E80 3C020001 */   lui      $v0, 1
@@ -40,7 +40,7 @@ glabel func_80149E04
 /* E0584 80149E84 44060000 */  mfc1      $a2, $f0
 /* E0588 80149E88 0220382D */  daddu     $a3, $s1, $zero
 /* E058C 80149E8C AFB20010 */  sw        $s2, 0x10($sp)
-/* E0590 80149E90 0C052494 */  jal       func_80149250
+/* E0590 80149E90 0C052494 */  jal       sfx_compute_spatialized_sound_params_2
 /* E0594 80149E94 AFB00014 */   sw       $s0, 0x14($sp)
 /* E0598 80149E98 3C020001 */  lui       $v0, 1
 .L80149E9C:
diff --git a/ver/us/asm/nonmatchings/code_DF950/play_sound_at_position.s b/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_at_position.s
similarity index 89%
rename from ver/us/asm/nonmatchings/code_DF950/play_sound_at_position.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_at_position.s
index dbad75cb45..e28aceeb85 100644
--- a/ver/us/asm/nonmatchings/code_DF950/play_sound_at_position.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_at_position.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel play_sound_at_position
+glabel sfx_play_sound_at_position
 /* E045C 80149D5C 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* E0460 80149D60 AFB20028 */  sw        $s2, 0x28($sp)
 /* E0464 80149D64 0080902D */  daddu     $s2, $a0, $zero
@@ -20,7 +20,7 @@ glabel play_sound_at_position
 /* E0498 80149D98 3C048015 */  lui       $a0, %hi(D_8014F2D0)
 /* E049C 80149D9C 00822021 */  addu      $a0, $a0, $v0
 /* E04A0 80149DA0 8C84F2D0 */  lw        $a0, %lo(D_8014F2D0)($a0)
-/* E04A4 80149DA4 0C05265D */  jal       func_80149974
+/* E04A4 80149DA4 0C05265D */  jal       sfx_register_looping_sound_at_position
 /* E04A8 80149DA8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* E04AC 80149DAC 0805277B */  j         .L80149DEC
 /* E04B0 80149DB0 00000000 */   nop
@@ -30,14 +30,14 @@ glabel play_sound_at_position
 /* E04BC 80149DBC 44060000 */  mfc1      $a2, $f0
 /* E04C0 80149DC0 27B0001A */  addiu     $s0, $sp, 0x1a
 /* E04C4 80149DC4 AFB00010 */  sw        $s0, 0x10($sp)
-/* E04C8 80149DC8 0C052781 */  jal       func_80149E04
+/* E04C8 80149DC8 0C052781 */  jal       sfx_get_spatialized_sound_params
 /* E04CC 80149DCC AFA50014 */   sw       $a1, 0x14($sp)
 /* E04D0 80149DD0 87A20018 */  lh        $v0, 0x18($sp)
 /* E04D4 80149DD4 04400005 */  bltz      $v0, .L80149DEC
 /* E04D8 80149DD8 0240202D */   daddu    $a0, $s2, $zero
 /* E04DC 80149DDC 92250001 */  lbu       $a1, 1($s1)
 /* E04E0 80149DE0 92060001 */  lbu       $a2, 1($s0)
-/* E04E4 80149DE4 0C0526AE */  jal       _play_sound
+/* E04E4 80149DE4 0C0526AE */  jal       sfx_play_sound_with_params
 /* E04E8 80149DE8 0000382D */   daddu    $a3, $zero, $zero
 .L80149DEC:
 /* E04EC 80149DEC 8FBF002C */  lw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149908.s b/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_looping.s
similarity index 94%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149908.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_looping.s
index bf7adff0da..2c3ab346d9 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149908.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_looping.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149908
+glabel sfx_play_sound_looping
 /* E0008 80149908 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E000C 8014990C 3C038016 */  lui       $v1, %hi(D_80159AD0)
 /* E0010 80149910 8C639AD0 */  lw        $v1, %lo(D_80159AD0)($v1)
@@ -26,7 +26,7 @@ glabel func_80149908
 /* E0054 80149954 00073C03 */  sra       $a3, $a3, 0x10
 /* E0058 80149958 AC640004 */  sw        $a0, 4($v1)
 /* E005C 8014995C 34420001 */  ori       $v0, $v0, 1
-/* E0060 80149960 0C015490 */  jal       func_80055240
+/* E0060 80149960 0C015490 */  jal       snd_start_sound_with_shift
 /* E0064 80149964 AC620000 */   sw       $v0, ($v1)
 /* E0068 80149968 8FBF0010 */  lw        $ra, 0x10($sp)
 /* E006C 8014996C 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/code_DF950/_play_sound.s b/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_with_params.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_DF950/_play_sound.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_with_params.s
index ead8ba5ebf..b177f0a987 100644
--- a/ver/us/asm/nonmatchings/code_DF950/_play_sound.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_with_params.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel _play_sound
+glabel _sfx_play_sound
 /* E01B8 80149AB8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* E01BC 80149ABC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
 /* E01C0 80149AC0 27BDFFE8 */  addiu     $sp, $sp, -0x18
@@ -37,7 +37,7 @@ glabel _play_sound
 /* E0230 80149B30 30A500FF */  andi      $a1, $a1, 0xff
 /* E0234 80149B34 30C600FF */  andi      $a2, $a2, 0xff
 /* E0238 80149B38 00073C00 */  sll       $a3, $a3, 0x10
-/* E023C 80149B3C 0C052642 */  jal       func_80149908
+/* E023C 80149B3C 0C052642 */  jal       sfx_play_sound_looping
 /* E0240 80149B40 00073C03 */   sra      $a3, $a3, 0x10
 /* E0244 80149B44 080526F6 */  j         .L80149BD8
 /* E0248 80149B48 00000000 */   nop
@@ -80,7 +80,7 @@ glabel _play_sound
 .L80149BC8:
 /* E02C8 80149BC8 30C600FF */  andi      $a2, $a2, 0xff
 /* E02CC 80149BCC 00093C00 */  sll       $a3, $t1, 0x10
-/* E02D0 80149BD0 0C015490 */  jal       func_80055240
+/* E02D0 80149BD0 0C015490 */  jal       snd_start_sound_with_shift
 /* E02D4 80149BD4 00073C03 */   sra      $a3, $a3, 0x10
 .L80149BD8:
 /* E02D8 80149BD8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149974.s b/ver/us/asm/nonmatchings/code_DF950/sfx_register_looping_sound_at_position.s
similarity index 93%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149974.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_register_looping_sound_at_position.s
index 35c287cabb..635c72854d 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149974.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_register_looping_sound_at_position.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149974
+glabel sfx_register_looping_sound_at_position
 /* E0074 80149974 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* E0078 80149978 44861000 */  mtc1      $a2, $f2
 /* E007C 8014997C 44872000 */  mtc1      $a3, $f4
@@ -29,7 +29,7 @@ glabel func_80149974
 /* E00CC 801499CC AC640004 */  sw        $a0, 4($v1)
 /* E00D0 801499D0 34420003 */  ori       $v0, $v0, 3
 /* E00D4 801499D4 AC620000 */  sw        $v0, ($v1)
-/* E00D8 801499D8 0C052757 */  jal       play_sound_at_position
+/* E00D8 801499D8 0C052757 */  jal       sfx_play_sound_at_position
 /* E00DC 801499DC E7A00010 */   swc1     $f0, 0x10($sp)
 /* E00E0 801499E0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* E00E4 801499E4 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149838.s b/ver/us/asm/nonmatchings/code_DF950/sfx_stop_env_sounds.s
similarity index 96%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149838.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_stop_env_sounds.s
index c5c26e9f0f..9b6d7e710a 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149838.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_stop_env_sounds.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149838
+glabel sfx_stop_env_sounds
 /* DFF38 80149838 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* DFF3C 8014983C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
 /* DFF40 80149840 27BDFFE0 */  addiu     $sp, $sp, -0x20
@@ -30,7 +30,7 @@ glabel func_80149838
 /* DFF90 80149890 10400004 */  beqz      $v0, .L801498A4
 /* DFF94 80149894 26310001 */   addiu    $s1, $s1, 1
 /* DFF98 80149898 8E040004 */  lw        $a0, 4($s0)
-/* DFF9C 8014989C 0C0154F0 */  jal       func_800553C0
+/* DFF9C 8014989C 0C0154F0 */  jal       snd_stop_sound
 /* DFFA0 801498A0 00000000 */   nop
 .L801498A4:
 /* DFFA4 801498A4 2A22000A */  slti      $v0, $s1, 0xa
diff --git a/ver/us/asm/nonmatchings/code_DF950/stop_sound.s b/ver/us/asm/nonmatchings/code_DF950/sfx_stop_sound.s
similarity index 93%
rename from ver/us/asm/nonmatchings/code_DF950/stop_sound.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_stop_sound.s
index 4c7d6d09af..b0ccdadbd4 100644
--- a/ver/us/asm/nonmatchings/code_DF950/stop_sound.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_stop_sound.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel stop_sound
+glabel sfx_stop_sound
 /* E036C 80149C6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E0370 80149C70 AFBF0010 */  sw        $ra, 0x10($sp)
 /* E0374 80149C74 0481000A */  bgez      $a0, .L80149CA0
@@ -16,7 +16,7 @@ glabel stop_sound
 /* E0398 80149C98 0805272A */  j         .L80149CA8
 /* E039C 80149C9C 00000000 */   nop
 .L80149CA0:
-/* E03A0 80149CA0 0C0154F0 */  jal       func_800553C0
+/* E03A0 80149CA0 0C0154F0 */  jal       snd_stop_sound
 /* E03A4 80149CA4 0040202D */   daddu    $a0, $v0, $zero
 .L80149CA8:
 /* E03A8 80149CA8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149734.s b/ver/us/asm/nonmatchings/code_DF950/sfx_update_looping_sound_params.s
similarity index 93%
rename from ver/us/asm/nonmatchings/code_DF950/func_80149734.s
rename to ver/us/asm/nonmatchings/code_DF950/sfx_update_looping_sound_params.s
index 5697c9a77f..a5613b36cc 100644
--- a/ver/us/asm/nonmatchings/code_DF950/func_80149734.s
+++ b/ver/us/asm/nonmatchings/code_DF950/sfx_update_looping_sound_params.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80149734
+glabel sfx_update_looping_sound_params
 /* DFE34 80149734 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* DFE38 80149738 AFB10024 */  sw        $s1, 0x24($sp)
 /* DFE3C 8014973C 3C118016 */  lui       $s1, %hi(D_80159AD0)
@@ -29,7 +29,7 @@ glabel func_80149734
 /* DFE90 80149790 8E060014 */  lw        $a2, 0x14($s0)
 /* DFE94 80149794 C60C000C */  lwc1      $f12, 0xc($s0)
 /* DFE98 80149798 C60E0010 */  lwc1      $f14, 0x10($s0)
-/* DFE9C 8014979C 0C052781 */  jal       func_80149E04
+/* DFE9C 8014979C 0C052781 */  jal       sfx_get_spatialized_sound_params
 /* DFEA0 801497A0 0280382D */   daddu    $a3, $s4, $zero
 /* DFEA4 801497A4 92820001 */  lbu       $v0, 1($s4)
 /* DFEA8 801497A8 A2020008 */  sb        $v0, 8($s0)
@@ -40,7 +40,7 @@ glabel func_80149734
 /* DFEB8 801497B8 8607000A */  lh        $a3, 0xa($s0)
 /* DFEBC 801497BC 8E040000 */  lw        $a0, ($s0)
 /* DFEC0 801497C0 92050008 */  lbu       $a1, 8($s0)
-/* DFEC4 801497C4 0C0154CC */  jal       func_80055330
+/* DFEC4 801497C4 0C0154CC */  jal       snd_adjust_sound_with_shift
 /* DFEC8 801497C8 26520001 */   addiu    $s2, $s2, 1
 .L801497CC:
 /* DFECC 801497CC 2610001C */  addiu     $s0, $s0, 0x1c
diff --git a/ver/us/asm/nonmatchings/code_E21870/func_802B71D4.s b/ver/us/asm/nonmatchings/code_E21870/func_802B71D4.s
index 0240692079..df7583f109 100644
--- a/ver/us/asm/nonmatchings/code_E21870/func_802B71D4.s
+++ b/ver/us/asm/nonmatchings/code_E21870/func_802B71D4.s
@@ -165,7 +165,7 @@ glabel L802B73E8_E21C58
 /* E21CA0 802B7430 00000000 */   nop
 /* E21CA4 802B7434 AC800020 */  sw        $zero, 0x20($a0)
 /* E21CA8 802B7438 2404007D */  addiu     $a0, $zero, 0x7d
-/* E21CAC 802B743C 0C052736 */  jal       play_sound_at_player
+/* E21CAC 802B743C 0C052736 */  jal       sfx_play_sound_at_player
 /* E21CB0 802B7440 0000282D */   daddu    $a1, $zero, $zero
 .L802B7444:
 /* E21CB4 802B7444 8E020000 */  lw        $v0, ($s0)
diff --git a/ver/us/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s b/ver/us/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s
index 25bdfd372d..9937ff1253 100644
--- a/ver/us/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s
+++ b/ver/us/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s
@@ -102,7 +102,7 @@ glabel func_802B735C_E2290C
 /* E22A74 802B74C4 24420001 */  addiu     $v0, $v0, 1
 /* E22A78 802B74C8 E480000C */  swc1      $f0, 0xc($a0)
 /* E22A7C 802B74CC AC820024 */  sw        $v0, 0x24($a0)
-/* E22A80 802B74D0 0C052736 */  jal       play_sound_at_player
+/* E22A80 802B74D0 0C052736 */  jal       sfx_play_sound_at_player
 /* E22A84 802B74D4 2404017B */   addiu    $a0, $zero, 0x17b
 /* E22A88 802B74D8 080ADD5A */  j         .L802B7568
 /* E22A8C 802B74DC 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s b/ver/us/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s
index ce257e7405..b8f7877e6f 100644
--- a/ver/us/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s
+++ b/ver/us/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s
@@ -39,7 +39,7 @@ glabel func_802B60B4_E240F4
 /* E24174 802B6134 24042081 */   addiu    $a0, $zero, 0x2081
 /* E24178 802B6138 24042082 */  addiu     $a0, $zero, 0x2082
 .L802B613C:
-/* E2417C 802B613C 0C052736 */  jal       play_sound_at_player
+/* E2417C 802B613C 0C052736 */  jal       sfx_play_sound_at_player
 /* E24180 802B6140 0000282D */   daddu    $a1, $zero, $zero
 .L802B6144:
 /* E24184 802B6144 8E030004 */  lw        $v1, 4($s0)
diff --git a/ver/us/asm/nonmatchings/code_E24920/func_802B6000_E24920.s b/ver/us/asm/nonmatchings/code_E24920/func_802B6000_E24920.s
index 5ed896ca4a..1b282e21c0 100644
--- a/ver/us/asm/nonmatchings/code_E24920/func_802B6000_E24920.s
+++ b/ver/us/asm/nonmatchings/code_E24920/func_802B6000_E24920.s
@@ -51,10 +51,10 @@ glabel func_802B6000_E24920
 /* E249CC 802B60AC 0C037FBF */  jal       func_800DFEFC
 /* E249D0 802B60B0 00000000 */   nop
 /* E249D4 802B60B4 34048161 */  ori       $a0, $zero, 0x8161
-/* E249D8 802B60B8 0C052736 */  jal       play_sound_at_player
+/* E249D8 802B60B8 0C052736 */  jal       sfx_play_sound_at_player
 /* E249DC 802B60BC 0000282D */   daddu    $a1, $zero, $zero
 /* E249E0 802B60C0 24040148 */  addiu     $a0, $zero, 0x148
-/* E249E4 802B60C4 0C052736 */  jal       play_sound_at_player
+/* E249E4 802B60C4 0C052736 */  jal       sfx_play_sound_at_player
 /* E249E8 802B60C8 0000282D */   daddu    $a1, $zero, $zero
 /* E249EC 802B60CC 96220002 */  lhu       $v0, 2($s1)
 /* E249F0 802B60D0 30424000 */  andi      $v0, $v0, 0x4000
diff --git a/ver/us/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s b/ver/us/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s
index 9cf08181cb..c31ea2ff19 100644
--- a/ver/us/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s
+++ b/ver/us/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s
@@ -29,7 +29,7 @@ glabel func_802B62CC_E24BEC
 /* E24C4C 802B632C A60000C2 */  sh        $zero, 0xc2($s0)
 /* E24C50 802B6330 AE020000 */  sw        $v0, ($s0)
 /* E24C54 802B6334 E6000044 */  swc1      $f0, 0x44($s0)
-/* E24C58 802B6338 0C052736 */  jal       play_sound_at_player
+/* E24C58 802B6338 0C052736 */  jal       sfx_play_sound_at_player
 /* E24C5C 802B633C E6020048 */   swc1     $f2, 0x48($s0)
 /* E24C60 802B6340 96220002 */  lhu       $v0, 2($s1)
 /* E24C64 802B6344 30424000 */  andi      $v0, $v0, 0x4000
diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s b/ver/us/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s
index 442692298a..5ecc657690 100644
--- a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s
+++ b/ver/us/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s
@@ -148,7 +148,7 @@ glabel L802B6258_E25128
 /* E25128 802B6258 2410205B */  addiu     $s0, $zero, 0x205b
 .L802B625C:
 /* E2512C 802B625C 0200202D */  daddu     $a0, $s0, $zero
-/* E25130 802B6260 0C052736 */  jal       play_sound_at_player
+/* E25130 802B6260 0C052736 */  jal       sfx_play_sound_at_player
 /* E25134 802B6264 0000282D */   daddu    $a1, $zero, $zero
 /* E25138 802B6268 24040100 */  addiu     $a0, $zero, 0x100
 /* E2513C 802B626C 0C00A3C2 */  jal       start_rumble
diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s b/ver/us/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s
index f60acbe9d2..96a3a230a6 100644
--- a/ver/us/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s
+++ b/ver/us/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s
@@ -61,7 +61,7 @@ glabel func_802B66A8_E25578
 /* E2564C 802B677C 0C037FBF */  jal       func_800DFEFC
 /* E25650 802B6780 00000000 */   nop
 /* E25654 802B6784 0200202D */  daddu     $a0, $s0, $zero
-/* E25658 802B6788 0C052736 */  jal       play_sound_at_player
+/* E25658 802B6788 0C052736 */  jal       sfx_play_sound_at_player
 /* E2565C 802B678C 0000282D */   daddu    $a1, $zero, $zero
 /* E25660 802B6790 3C02802B */  lui       $v0, %hi(D_802B6DB0_E25C80)
 /* E25664 802B6794 8C426DB0 */  lw        $v0, %lo(D_802B6DB0_E25C80)($v0)
diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s b/ver/us/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s
index 5cf5f91cf1..4793df5f66 100644
--- a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s
+++ b/ver/us/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s
@@ -248,7 +248,7 @@ glabel func_802B6820_E256F0
 /* E25A80 802B6BB0 24042115 */   addiu    $a0, $zero, 0x2115
 /* E25A84 802B6BB4 24042116 */  addiu     $a0, $zero, 0x2116
 .L802B6BB8:
-/* E25A88 802B6BB8 0C052736 */  jal       play_sound_at_player
+/* E25A88 802B6BB8 0C052736 */  jal       sfx_play_sound_at_player
 /* E25A8C 802B6BBC 0000282D */   daddu    $a1, $zero, $zero
 /* E25A90 802B6BC0 3C02802B */  lui       $v0, %hi(D_802B6DB0_E25C80)
 /* E25A94 802B6BC4 8C426DB0 */  lw        $v0, %lo(D_802B6DB0_E25C80)($v0)
diff --git a/ver/us/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s b/ver/us/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s
index 3fd887b668..5bfa789f12 100644
--- a/ver/us/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s
+++ b/ver/us/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s
@@ -137,7 +137,7 @@ glabel func_802B6000_E25D60
 /* E25F50 802B61F0 AE020030 */  sw        $v0, 0x30($s0)
 .L802B61F4:
 /* E25F54 802B61F4 8E040030 */  lw        $a0, 0x30($s0)
-/* E25F58 802B61F8 0C052736 */  jal       play_sound_at_player
+/* E25F58 802B61F8 0C052736 */  jal       sfx_play_sound_at_player
 /* E25F5C 802B61FC 0000282D */   daddu    $a1, $zero, $zero
 /* E25F60 802B6200 0C037FDE */  jal       func_800DFF78
 /* E25F64 802B6204 0260202D */   daddu    $a0, $s3, $zero
@@ -256,7 +256,7 @@ glabel func_802B6000_E25D60
 /* E2610C 802B63AC 00451024 */  and       $v0, $v0, $a1
 /* E26110 802B63B0 00661824 */  and       $v1, $v1, $a2
 /* E26114 802B63B4 AE220004 */  sw        $v0, 4($s1)
-/* E26118 802B63B8 0C05271B */  jal       stop_sound
+/* E26118 802B63B8 0C05271B */  jal       sfx_stop_sound
 /* E2611C 802B63BC AE230000 */   sw       $v1, ($s1)
 /* E26120 802B63C0 27A40010 */  addiu     $a0, $sp, 0x10
 /* E26124 802B63C4 0C0388C1 */  jal       input_to_move_vector
@@ -357,7 +357,7 @@ glabel func_802B6000_E25D60
 /* E26294 802B6534 00451024 */  and       $v0, $v0, $a1
 /* E26298 802B6538 00661824 */  and       $v1, $v1, $a2
 /* E2629C 802B653C AE220000 */  sw        $v0, ($s1)
-/* E262A0 802B6540 0C05271B */  jal       stop_sound
+/* E262A0 802B6540 0C05271B */  jal       sfx_stop_sound
 /* E262A4 802B6544 AE230004 */   sw       $v1, 4($s1)
 .L802B6548:
 /* E262A8 802B6548 080ADA5B */  j         .L802B696C
diff --git a/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s b/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s
index 98025cc0a4..7303e0da68 100644
--- a/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s
+++ b/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s
@@ -200,7 +200,7 @@ glabel L802B6244_E26954
 /* E269FC 802B62EC 34420004 */  ori       $v0, $v0, 4
 /* E26A00 802B62F0 24630001 */  addiu     $v1, $v1, 1
 /* E26A04 802B62F4 AE020000 */  sw        $v0, ($s0)
-/* E26A08 802B62F8 0C052736 */  jal       play_sound_at_player
+/* E26A08 802B62F8 0C052736 */  jal       sfx_play_sound_at_player
 /* E26A0C 802B62FC A20300B6 */   sb       $v1, 0xb6($s0)
 .L802B6300:
 /* E26A10 802B6300 8FA20010 */  lw        $v0, 0x10($sp)
@@ -281,7 +281,7 @@ glabel L802B6354_E26A64
 /* E26B2C 802B641C 0C0B2D5B */  jal       exec_ShakeCam1
 /* E26B30 802B6420 24060004 */   addiu    $a2, $zero, 4
 /* E26B34 802B6424 2404014A */  addiu     $a0, $zero, 0x14a
-/* E26B38 802B6428 0C052736 */  jal       play_sound_at_player
+/* E26B38 802B6428 0C052736 */  jal       sfx_play_sound_at_player
 /* E26B3C 802B642C 0000282D */   daddu    $a1, $zero, $zero
 /* E26B40 802B6430 24040100 */  addiu     $a0, $zero, 0x100
 /* E26B44 802B6434 0C00A3C2 */  jal       start_rumble
@@ -341,7 +341,7 @@ glabel L802B6354_E26A64
 /* E26C10 802B6500 0C0B2D5B */  jal       exec_ShakeCam1
 /* E26C14 802B6504 A20200B6 */   sb       $v0, 0xb6($s0)
 /* E26C18 802B6508 2404014A */  addiu     $a0, $zero, 0x14a
-/* E26C1C 802B650C 0C052736 */  jal       play_sound_at_player
+/* E26C1C 802B650C 0C052736 */  jal       sfx_play_sound_at_player
 /* E26C20 802B6510 0000282D */   daddu    $a1, $zero, $zero
 /* E26C24 802B6514 24040100 */  addiu     $a0, $zero, 0x100
 /* E26C28 802B6518 0C00A3C2 */  jal       start_rumble
diff --git a/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s b/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s
index 59a5922396..57ecdd474c 100644
--- a/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s
+++ b/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s
@@ -42,7 +42,7 @@ glabel func_802B6000_E26DE0
 /* E26E74 802B6094 34420200 */  ori       $v0, $v0, 0x200
 /* E26E78 802B6098 34630001 */  ori       $v1, $v1, 1
 /* E26E7C 802B609C AE020000 */  sw        $v0, ($s0)
-/* E26E80 802B60A0 0C052736 */  jal       play_sound_at_player
+/* E26E80 802B60A0 0C052736 */  jal       sfx_play_sound_at_player
 /* E26E84 802B60A4 A4C30002 */   sh       $v1, 2($a2)
 .L802B60A8:
 /* E26E88 802B60A8 820300B6 */  lb        $v1, 0xb6($s0)
@@ -315,7 +315,7 @@ glabel L802B631C_E270FC
 /* E27274 802B6494 0C0B2D5B */  jal       exec_ShakeCam1
 /* E27278 802B6498 A20300B6 */   sb       $v1, 0xb6($s0)
 /* E2727C 802B649C 24040149 */  addiu     $a0, $zero, 0x149
-/* E27280 802B64A0 0C052736 */  jal       play_sound_at_player
+/* E27280 802B64A0 0C052736 */  jal       sfx_play_sound_at_player
 /* E27284 802B64A4 0000282D */   daddu    $a1, $zero, $zero
 /* E27288 802B64A8 24040080 */  addiu     $a0, $zero, 0x80
 /* E2728C 802B64AC 0C00A3C2 */  jal       start_rumble
diff --git a/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s b/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s
index 0110603c51..a162d25103 100644
--- a/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s
+++ b/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s
@@ -37,7 +37,7 @@ glabel func_802B6060_E27570
 /* E275F0 802B60E0 0C037FBF */  jal       func_800DFEFC
 /* E275F4 802B60E4 3484000A */   ori      $a0, $a0, 0xa
 /* E275F8 802B60E8 24040167 */  addiu     $a0, $zero, 0x167
-/* E275FC 802B60EC 0C052736 */  jal       play_sound_at_player
+/* E275FC 802B60EC 0C052736 */  jal       sfx_play_sound_at_player
 /* E27600 802B60F0 0000282D */   daddu    $a1, $zero, $zero
 /* E27604 802B60F4 3C03800B */  lui       $v1, %hi(gCameras)
 /* E27608 802B60F8 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
@@ -210,7 +210,7 @@ glabel L802B6184_E27694
 /* E27888 802B6378 46000005 */  abs.s     $f0, $f0
 /* E2788C 802B637C 46001080 */  add.s     $f2, $f2, $f0
 /* E27890 802B6380 24040167 */  addiu     $a0, $zero, 0x167
-/* E27894 802B6384 0C0154F0 */  jal       func_800553C0
+/* E27894 802B6384 0C0154F0 */  jal       snd_stop_sound
 /* E27898 802B6388 E602002C */   swc1     $f2, 0x2c($s0)
 /* E2789C 802B638C 080AD9C7 */  j         .L802B671C
 /* E278A0 802B6390 00000000 */   nop
@@ -272,7 +272,7 @@ glabel L802B6394_E278A4
 /* E27978 802B6468 450000AC */  bc1f      .L802B671C
 /* E2797C 802B646C E6000054 */   swc1     $f0, 0x54($s0)
 /* E27980 802B6470 24040172 */  addiu     $a0, $zero, 0x172
-/* E27984 802B6474 0C052736 */  jal       play_sound_at_player
+/* E27984 802B6474 0C052736 */  jal       sfx_play_sound_at_player
 /* E27988 802B6478 0000282D */   daddu    $a1, $zero, $zero
 /* E2798C 802B647C 3C040001 */  lui       $a0, 1
 /* E27990 802B6480 0C037FDE */  jal       func_800DFF78
@@ -355,7 +355,7 @@ glabel L802B6544_E27A54
 /* E27AB4 802B65A4 0C037FDE */  jal       func_800DFF78
 /* E27AB8 802B65A8 E6200000 */   swc1     $f0, ($s1)
 /* E27ABC 802B65AC 24040162 */  addiu     $a0, $zero, 0x162
-/* E27AC0 802B65B0 0C052736 */  jal       play_sound_at_player
+/* E27AC0 802B65B0 0C052736 */  jal       sfx_play_sound_at_player
 /* E27AC4 802B65B4 0000282D */   daddu    $a1, $zero, $zero
 /* E27AC8 802B65B8 080AD9AC */  j         .L802B66B0
 /* E27ACC 802B65BC 00000000 */   nop
@@ -400,7 +400,7 @@ glabel L802B660C_E27B1C
 /* E27B58 802B6648 0C037FDE */  jal       func_800DFF78
 /* E27B5C 802B664C 34840031 */   ori      $a0, $a0, 0x31
 /* E27B60 802B6650 24040172 */  addiu     $a0, $zero, 0x172
-/* E27B64 802B6654 0C052736 */  jal       play_sound_at_player
+/* E27B64 802B6654 0C052736 */  jal       sfx_play_sound_at_player
 /* E27B68 802B6658 0000282D */   daddu    $a1, $zero, $zero
 /* E27B6C 802B665C 920200B6 */  lbu       $v0, 0xb6($s0)
 /* E27B70 802B6660 2403000F */  addiu     $v1, $zero, 0xf
diff --git a/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s b/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s
index 4008f19e79..1a0d290ca5 100644
--- a/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s
+++ b/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s
@@ -59,7 +59,7 @@ glabel func_802B6000_E27F40
 /* E28014 802B60D4 8C620000 */  lw        $v0, ($v1)
 /* E28018 802B60D8 0000282D */  daddu     $a1, $zero, $zero
 /* E2801C 802B60DC 34420040 */  ori       $v0, $v0, 0x40
-/* E28020 802B60E0 0C052736 */  jal       play_sound_at_player
+/* E28020 802B60E0 0C052736 */  jal       sfx_play_sound_at_player
 /* E28024 802B60E4 AC620000 */   sw       $v0, ($v1)
 .L802B60E8:
 /* E28028 802B60E8 820300B6 */  lb        $v1, 0xb6($s0)
@@ -482,7 +482,7 @@ glabel L802B666C_E285AC
 /* E2864C 802B670C 94620002 */  lhu       $v0, 2($v1)
 /* E28650 802B6710 0000282D */  daddu     $a1, $zero, $zero
 /* E28654 802B6714 3042FFFD */  andi      $v0, $v0, 0xfffd
-/* E28658 802B6718 0C052736 */  jal       play_sound_at_player
+/* E28658 802B6718 0C052736 */  jal       sfx_play_sound_at_player
 /* E2865C 802B671C A4620002 */   sh       $v0, 2($v1)
 /* E28660 802B6720 3C040008 */  lui       $a0, 8
 /* E28664 802B6724 0C037FDE */  jal       func_800DFF78
diff --git a/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s b/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s
index 9329c5ba11..02d427ec96 100644
--- a/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s
+++ b/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s
@@ -131,7 +131,7 @@ glabel L802B6174_E29314
 /* E29388 802B61E8 0440002B */  bltz      $v0, L802B6298_E29438
 /* E2938C 802B61EC 46000506 */   mov.s    $f20, $f0
 /* E29390 802B61F0 24040162 */  addiu     $a0, $zero, 0x162
-/* E29394 802B61F4 0C052736 */  jal       play_sound_at_player
+/* E29394 802B61F4 0C052736 */  jal       sfx_play_sound_at_player
 /* E29398 802B61F8 0000282D */   daddu    $a1, $zero, $zero
 /* E2939C 802B61FC 3C040008 */  lui       $a0, 8
 /* E293A0 802B6200 0C037FDE */  jal       func_800DFF78
diff --git a/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s b/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s
index 5510541739..09f4387985 100644
--- a/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s
+++ b/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s
@@ -59,7 +59,7 @@ glabel func_802B6000_E2A340
 /* E2A418 802B60D8 E4600010 */  swc1      $f0, 0x10($v1)
 /* E2A41C 802B60DC E4620014 */  swc1      $f2, 0x14($v1)
 /* E2A420 802B60E0 E4640018 */  swc1      $f4, 0x18($v1)
-/* E2A424 802B60E4 0C052736 */  jal       play_sound_at_player
+/* E2A424 802B60E4 0C052736 */  jal       sfx_play_sound_at_player
 /* E2A428 802B60E8 AC620000 */   sw       $v0, ($v1)
 .L802B60EC:
 /* E2A42C 802B60EC 822300B6 */  lb        $v1, 0xb6($s1)
diff --git a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s b/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s
index d57a2417c3..0014ed53c5 100644
--- a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s
+++ b/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s
@@ -95,7 +95,7 @@ glabel func_802B6120_E2A7D0
 /* E2A930 802B6280 8E220000 */  lw        $v0, ($s1)
 /* E2A934 802B6284 3C030010 */  lui       $v1, 0x10
 /* E2A938 802B6288 00431025 */  or        $v0, $v0, $v1
-/* E2A93C 802B628C 0C052736 */  jal       play_sound_at_player
+/* E2A93C 802B628C 0C052736 */  jal       sfx_play_sound_at_player
 /* E2A940 802B6290 AE220000 */   sw       $v0, ($s1)
 .L802B6294:
 /* E2A944 802B6294 822300B6 */  lb        $v1, 0xb6($s1)
@@ -122,7 +122,7 @@ glabel L802B62B8_E2A968
 /* E2A994 802B62E4 0C037FBF */  jal       func_800DFEFC
 /* E2A998 802B62E8 34840024 */   ori      $a0, $a0, 0x24
 /* E2A99C 802B62EC 24040092 */  addiu     $a0, $zero, 0x92
-/* E2A9A0 802B62F0 0C052736 */  jal       play_sound_at_player
+/* E2A9A0 802B62F0 0C052736 */  jal       sfx_play_sound_at_player
 /* E2A9A4 802B62F4 0000282D */   daddu    $a1, $zero, $zero
 /* E2A9A8 802B62F8 922200B6 */  lbu       $v0, 0xb6($s1)
 /* E2A9AC 802B62FC 24420001 */  addiu     $v0, $v0, 1
@@ -170,7 +170,7 @@ glabel L802B6370_E2AA20
 /* E2AA44 802B6394 00461025 */  or        $v0, $v0, $a2
 /* E2AA48 802B6398 24630001 */  addiu     $v1, $v1, 1
 /* E2AA4C 802B639C AE220000 */  sw        $v0, ($s1)
-/* E2AA50 802B63A0 0C052736 */  jal       play_sound_at_player
+/* E2AA50 802B63A0 0C052736 */  jal       sfx_play_sound_at_player
 /* E2AA54 802B63A4 A22300B6 */   sb       $v1, 0xb6($s1)
 /* E2AA58 802B63A8 080ADA7C */  j         L802B69F0_E2B0A0
 /* E2AA5C 802B63AC 00000000 */   nop
@@ -772,7 +772,7 @@ glabel L802B69F0_E2B0A0
 /* E2B318 802B6C68 2402000A */   addiu    $v0, $zero, 0xa
 /* E2B31C 802B6C6C 14620003 */  bne       $v1, $v0, .L802B6C7C
 /* E2B320 802B6C70 240400FE */   addiu    $a0, $zero, 0xfe
-/* E2B324 802B6C74 0C052736 */  jal       play_sound_at_player
+/* E2B324 802B6C74 0C052736 */  jal       sfx_play_sound_at_player
 /* E2B328 802B6C78 0000282D */   daddu    $a1, $zero, $zero
 .L802B6C7C:
 /* E2B32C 802B6C7C 8E42000C */  lw        $v0, 0xc($s2)
diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s b/ver/us/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s
index 440665d79d..9f9e9c55a9 100644
--- a/ver/us/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s
+++ b/ver/us/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s
@@ -152,7 +152,7 @@ glabel L802BB398_E2BAC8
 /* E2BB54 802BB424 24630001 */  addiu     $v1, $v1, 1
 /* E2BB58 802BB428 E6000008 */  swc1      $f0, 8($s0)
 /* E2BB5C 802BB42C E602000C */  swc1      $f2, 0xc($s0)
-/* E2BB60 802BB430 0C05272D */  jal       play_sound
+/* E2BB60 802BB430 0C05272D */  jal       sfx_play_sound
 /* E2BB64 802BB434 A2030012 */   sb       $v1, 0x12($s0)
 /* E2BB68 802BB438 080AED75 */  j         .L802BB5D4
 /* E2BB6C 802BB43C 00000000 */   nop
@@ -233,7 +233,7 @@ glabel L802BB4E0_E2BC10
 /* E2BC84 802BB554 A2030011 */  sb        $v1, 0x11($s0)
 /* E2BC88 802BB558 24420001 */  addiu     $v0, $v0, 1
 .L802BB55C:
-/* E2BC8C 802BB55C 0C05272D */  jal       play_sound
+/* E2BC8C 802BB55C 0C05272D */  jal       sfx_play_sound
 /* E2BC90 802BB560 A2020012 */   sb       $v0, 0x12($s0)
 /* E2BC94 802BB564 080AED75 */  j         .L802BB5D4
 /* E2BC98 802BB568 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s b/ver/us/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s
index 560c85247c..a260cc6800 100644
--- a/ver/us/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s
+++ b/ver/us/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s
@@ -11,7 +11,7 @@ glabel func_802BB314_E2DC44
 /* E2DC5C 802BB32C E7A00010 */  swc1      $f0, 0x10($sp)
 /* E2DC60 802BB330 8C460048 */  lw        $a2, 0x48($v0)
 /* E2DC64 802BB334 8C47004C */  lw        $a3, 0x4c($v0)
-/* E2DC68 802BB338 0C052757 */  jal       play_sound_at_position
+/* E2DC68 802BB338 0C052757 */  jal       sfx_play_sound_at_position
 /* E2DC6C 802BB33C 0000282D */   daddu    $a1, $zero, $zero
 /* E2DC70 802BB340 8FBF0018 */  lw        $ra, 0x18($sp)
 /* E2DC74 802BB344 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s b/ver/us/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s
index 62649074c5..f044d647f4 100644
--- a/ver/us/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s
+++ b/ver/us/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s
@@ -4,7 +4,7 @@
 glabel func_802BB34C_E2DC7C
 /* E2DC7C 802BB34C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E2DC80 802BB350 AFBF0010 */  sw        $ra, 0x10($sp)
-/* E2DC84 802BB354 0C05272D */  jal       play_sound
+/* E2DC84 802BB354 0C05272D */  jal       sfx_play_sound
 /* E2DC88 802BB358 24040791 */   addiu    $a0, $zero, 0x791
 /* E2DC8C 802BB35C 24040391 */  addiu     $a0, $zero, 0x391
 /* E2DC90 802BB360 0C05269B */  jal       func_80149A6C
diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s b/ver/us/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s
index da55864a56..31e61782d9 100644
--- a/ver/us/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s
+++ b/ver/us/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s
@@ -56,7 +56,7 @@ glabel L802BBA30_E2E360
 /* E2E3D4 802BBAA4 24A50214 */  addiu     $a1, $a1, 0x214
 /* E2E3D8 802BBAA8 0C048052 */  jal       play_model_animation
 /* E2E3DC 802BBAAC 00000000 */   nop
-/* E2E3E0 802BBAB0 0C05272D */  jal       play_sound
+/* E2E3E0 802BBAB0 0C05272D */  jal       sfx_play_sound
 /* E2E3E4 802BBAB4 240400F2 */   addiu    $a0, $zero, 0xf2
 /* E2E3E8 802BBAB8 0C0AEE35 */  jal       func_802BB8D4_E2E204
 /* E2E3EC 802BBABC 0240202D */   daddu    $a0, $s2, $zero
diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s b/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s
index 279adb62a3..825b02a487 100644
--- a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s
+++ b/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s
@@ -45,7 +45,7 @@ glabel func_802BC3E4_E2ED14
 /* E2EDB0 802BC480 00000000 */  nop
 /* E2EDB4 802BC484 45000003 */  bc1f      .L802BC494
 /* E2EDB8 802BC488 00000000 */   nop
-/* E2EDBC 802BC48C 0C05272D */  jal       play_sound
+/* E2EDBC 802BC48C 0C05272D */  jal       sfx_play_sound
 /* E2EDC0 802BC490 24040392 */   addiu    $a0, $zero, 0x392
 .L802BC494:
 /* E2EDC4 802BC494 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s b/ver/us/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s
index 38fc0b4867..c05e4d76fd 100644
--- a/ver/us/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s
+++ b/ver/us/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s
@@ -36,7 +36,7 @@ glabel L802BC5BC_E30F0C
 /* E30F38 802BC5E8 A2020005 */  sb        $v0, 5($s0)
 /* E30F3C 802BC5EC 90620001 */  lbu       $v0, 1($v1)
 /* E30F40 802BC5F0 24042085 */  addiu     $a0, $zero, 0x2085
-/* E30F44 802BC5F4 0C05272D */  jal       play_sound
+/* E30F44 802BC5F4 0C05272D */  jal       sfx_play_sound
 /* E30F48 802BC5F8 A2020004 */   sb       $v0, 4($s0)
 glabel L802BC5FC_E30F4C
 /* E30F4C 802BC5FC C60C0014 */  lwc1      $f12, 0x14($s0)
diff --git a/ver/us/asm/nonmatchings/code_F5750/player_jump.s b/ver/us/asm/nonmatchings/code_F5750/player_jump.s
index 2bb2426e4a..e16d97fc5d 100644
--- a/ver/us/asm/nonmatchings/code_F5750/player_jump.s
+++ b/ver/us/asm/nonmatchings/code_F5750/player_jump.s
@@ -148,7 +148,7 @@ glabel player_jump
 /* F60B4 802D1704 0C037FBF */  jal       func_800DFEFC
 /* F60B8 802D1708 00000000 */   nop
 /* F60BC 802D170C 24042081 */  addiu     $a0, $zero, 0x2081
-/* F60C0 802D1710 0C052736 */  jal       play_sound_at_player
+/* F60C0 802D1710 0C052736 */  jal       sfx_play_sound_at_player
 /* F60C4 802D1714 0000282D */   daddu    $a1, $zero, $zero
 .L802D1718:
 /* F60C8 802D1718 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s
index 93f5768184..efe2ed4065 100644
--- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s
+++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s
@@ -105,7 +105,7 @@ glabel L8010FD08_A6408
 /* A6428 8010FD28 AE220000 */   sw       $v0, ($s1)
 glabel L8010FD2C_A642C
 /* A642C 8010FD2C 8E040000 */  lw        $a0, ($s0)
-/* A6430 8010FD30 0C05272D */  jal       play_sound
+/* A6430 8010FD30 0C05272D */  jal       sfx_play_sound
 /* A6434 8010FD34 26100004 */   addiu    $s0, $s0, 4
 /* A6438 8010FD38 24040001 */  addiu     $a0, $zero, 1
 /* A643C 8010FD3C 08043F54 */  j         .L8010FD50
diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s
index 223b48c665..0473e0a45f 100644
--- a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s
+++ b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s
@@ -747,7 +747,7 @@ glabel L80142174_D8874
 glabel L801421A4_D88A4
 /* D88A4 801421A4 8E060000 */  lw        $a2, ($s0)
 /* D88A8 801421A8 26100004 */  addiu     $s0, $s0, 4
-/* D88AC 801421AC 0C05272D */  jal       play_sound
+/* D88AC 801421AC 0C05272D */  jal       sfx_play_sound
 /* D88B0 801421B0 00C0202D */   daddu    $a0, $a2, $zero
 /* D88B4 801421B4 24020001 */  addiu     $v0, $zero, 1
 /* D88B8 801421B8 0805087D */  j         .L801421F4
diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_music_settings.s
similarity index 97%
rename from ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
rename to ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_music_settings.s
index 8dbf22c3dd..a3959ad796 100644
--- a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
+++ b/ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_music_settings.s
@@ -8,7 +8,7 @@ glabel jtbl_80151290
 
 .section .text
 
-glabel func_8014A548
+glabel bgm_update_music_settings
 /* E0C48 8014A548 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* E0C4C 8014A54C AFB1001C */  sw        $s1, 0x1c($sp)
 /* E0C50 8014A550 3C118016 */  lui       $s1, %hi(gMusicPlayers)
@@ -115,7 +115,7 @@ glabel L8014A698_E0D98
 /* E0DB4 8014A6B4 080529E8 */  j         L8014A7A0_E0EA0
 /* E0DB8 8014A6B8 A6000000 */   sh       $zero, ($s0)
 .L8014A6BC:
-/* E0DBC 8014A6BC 0C015635 */  jal       func_800558D4
+/* E0DBC 8014A6BC 0C015635 */  jal       snd_load_song
 /* E0DC0 8014A6C0 0240282D */   daddu    $a1, $s2, $zero
 /* E0DC4 8014A6C4 3403FFFF */  ori       $v1, $zero, 0xffff
 /* E0DC8 8014A6C8 0062182B */  sltu      $v1, $v1, $v0
@@ -139,7 +139,7 @@ glabel L8014A698_E0D98
 .L8014A710:
 /* E0E10 8014A710 3C048016 */  lui       $a0, %hi(gMusicUnkVolume)
 /* E0E14 8014A714 84849AE0 */  lh        $a0, %lo(gMusicUnkVolume)($a0)
-/* E0E18 8014A718 0C052B21 */  jal       transition_music_volume_to
+/* E0E18 8014A718 0C052B21 */  jal       bgm_set_target_volume
 /* E0E1C 8014A71C 00000000 */   nop
 .L8014A720:
 /* E0E20 8014A720 8E040016 */  lw        $a0, 0x16($s0)
@@ -184,7 +184,7 @@ glabel L8014A7A0_E0EA0
 /* E0EA8 8014A7A8 2A420002 */  slti      $v0, $s2, 2
 /* E0EAC 8014A7AC 1440FF75 */  bnez      $v0, .L8014A584
 /* E0EB0 8014A7B0 26310030 */   addiu    $s1, $s1, 0x30
-/* E0EB4 8014A7B4 0C052B25 */  jal       func_8014AC94
+/* E0EB4 8014A7B4 0C052B25 */  jal       bgm_update_volume
 /* E0EB8 8014A7B8 00000000 */   nop
 /* E0EBC 8014A7BC 8FBF0030 */  lw        $ra, 0x30($sp)
 /* E0EC0 8014A7C0 8FB5002C */  lw        $s5, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_volume.s
similarity index 99%
rename from ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
rename to ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_volume.s
index 189a5c2958..3080df8de7 100644
--- a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
+++ b/ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_volume.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8014AC94
+glabel bgm_update_volume
 /* E1394 8014AC94 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E1398 8014AC98 3C048015 */  lui       $a0, %hi(D_8014F738)
 /* E139C 8014AC9C 2484F738 */  addiu     $a0, $a0, %lo(D_8014F738)
diff --git a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
index 81a16801a4..6b62b74860 100644
--- a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
+++ b/ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
@@ -32,7 +32,7 @@ glabel func_80033BC0
 /* F02C 80033C2C 00431024 */  and       $v0, $v0, $v1
 /* F030 80033C30 0C018030 */  jal       nuContRmbForceStopEnd
 /* F034 80033C34 AC820000 */   sw       $v0, ($a0)
-/* F038 80033C38 0C05260E */  jal       func_80149838
+/* F038 80033C38 0C05260E */  jal       sfx_stop_env_sounds
 /* F03C 80033C3C 00000000 */   nop
 /* F040 80033C40 0C016AFA */  jal       get_current_map_header
 /* F044 80033C44 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s b/ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s
index 6f81983484..a3bb0cd3ea 100644
--- a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s
+++ b/ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s
@@ -42,7 +42,7 @@ glabel step_battle
 /* ED70 80033970 A2020000 */   sb       $v0, ($s0)
 /* ED74 80033974 0C018030 */  jal       nuContRmbForceStopEnd
 /* ED78 80033978 00000000 */   nop
-/* ED7C 8003397C 0C05260E */  jal       func_80149838
+/* ED7C 8003397C 0C05260E */  jal       sfx_stop_env_sounds
 /* ED80 80033980 00000000 */   nop
 /* ED84 80033984 0C00EC6A */  jal       func_8003B1A8
 /* ED88 80033988 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/ver/us/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
index e1bede4932..c5a97d81e6 100644
--- a/ver/us/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
+++ b/ver/us/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
@@ -117,7 +117,7 @@ glabel func_80034C3C
 /* 101F0 80034DF0 8C840924 */  lw        $a0, %lo(D_800A0924)($a0)
 /* 101F4 80034DF4 0C0525FF */  jal       func_801497FC
 /* 101F8 80034DF8 00000000 */   nop
-/* 101FC 80034DFC 0C052B1C */  jal       func_8014AC70
+/* 101FC 80034DFC 0C052B1C */  jal       bgm_reset_max_volume
 /* 10200 80034E00 00000000 */   nop
 /* 10204 80034E04 0C0169B0 */  jal       load_world_script_api
 /* 10208 80034E08 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s b/ver/us/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s
index 76d663b12d..e83c80d3ae 100644
--- a/ver/us/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s
+++ b/ver/us/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s
@@ -70,7 +70,7 @@ glabel step_pause_menu
 /* FE74 80034A74 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
 /* FE78 80034A78 8E030000 */  lw        $v1, ($s0)
 /* FE7C 80034A7C 9462015C */  lhu       $v0, 0x15c($v1)
-/* FE80 80034A80 0C05260E */  jal       func_80149838
+/* FE80 80034A80 0C05260E */  jal       sfx_stop_env_sounds
 /* FE84 80034A84 A462015E */   sh       $v0, 0x15e($v1)
 /* FE88 80034A88 0C00EC6A */  jal       func_8003B1A8
 /* FE8C 80034A8C 00000000 */   nop
@@ -122,7 +122,7 @@ glabel step_pause_menu
 /* FF44 80034B44 AC220924 */  sw        $v0, %lo(D_800A0924)($at)
 /* FF48 80034B48 0C0525FF */  jal       func_801497FC
 /* FF4C 80034B4C 0000202D */   daddu    $a0, $zero, $zero
-/* FF50 80034B50 0C052B17 */  jal       func_8014AC5C
+/* FF50 80034B50 0C052B17 */  jal       bgm_quiet_max_volume
 /* FF54 80034B54 00000000 */   nop
 /* FF58 80034B58 3C048007 */  lui       $a0, %hi(D_8007795C)
 /* FF5C 80034B5C 0C018038 */  jal       nuPiReadRomOverlay
diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240000_BECDF0.s b/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240000_BECDF0.s
index 7bd05b7908..149747c9a9 100644
--- a/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240000_BECDF0.s
+++ b/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240000_BECDF0.s
@@ -11,7 +11,7 @@ glabel func_80240000_BECDF0
 /* BECE08 80240018 E7A00010 */  swc1      $f0, 0x10($sp)
 /* BECE0C 8024001C 8E060000 */  lw        $a2, ($s0)
 /* BECE10 80240020 8E070004 */  lw        $a3, 4($s0)
-/* BECE14 80240024 0C05267B */  jal       func_801499EC
+/* BECE14 80240024 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* BECE18 80240028 0000282D */   daddu    $a1, $zero, $zero
 /* BECE1C 8024002C 86020044 */  lh        $v0, 0x44($s0)
 /* BECE20 80240030 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s
index 346d526fd0..fe305a5c2f 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s
@@ -49,7 +49,7 @@ glabel func_80241874_BFF0F4
 /* BFF198 80241918 E7A00010 */  swc1      $f0, 0x10($sp)
 /* BFF19C 8024191C 8E260038 */  lw        $a2, 0x38($s1)
 /* BFF1A0 80241920 8E27003C */  lw        $a3, 0x3c($s1)
-/* BFF1A4 80241924 0C052757 */  jal       play_sound_at_position
+/* BFF1A4 80241924 0C052757 */  jal       sfx_play_sound_at_position
 /* BFF1A8 80241928 24050002 */   addiu    $a1, $zero, 2
 /* BFF1AC 8024192C 2402000F */  addiu     $v0, $zero, 0xf
 /* BFF1B0 80241930 A620008E */  sh        $zero, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
index bef7592cce..5c14cd8518 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
@@ -22,7 +22,7 @@ glabel func_80241954_BFF1D4
 /* BFF218 80241998 E7A00010 */  swc1      $f0, 0x10($sp)
 /* BFF21C 8024199C 8E460038 */  lw        $a2, 0x38($s2)
 /* BFF220 802419A0 8E47003C */  lw        $a3, 0x3c($s2)
-/* BFF224 802419A4 0C05267B */  jal       func_801499EC
+/* BFF224 802419A4 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* BFF228 802419A8 24050002 */   addiu    $a1, $zero, 2
 /* BFF22C 802419AC 0220202D */  daddu     $a0, $s1, $zero
 /* BFF230 802419B0 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s
index 4630932c64..fe03dff0b5 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s
@@ -29,7 +29,7 @@ glabel func_80241BF0_BFF470
 /* BFF4D0 80241C50 10400008 */  beqz      $v0, .L80241C74
 /* BFF4D4 80241C54 00000000 */   nop
 /* BFF4D8 80241C58 3C048000 */  lui       $a0, 0x8000
-/* BFF4DC 80241C5C 0C05271B */  jal       stop_sound
+/* BFF4DC 80241C5C 0C05271B */  jal       sfx_stop_sound
 /* BFF4E0 80241C60 34840011 */   ori      $a0, $a0, 0x11
 /* BFF4E4 80241C64 8E02006C */  lw        $v0, 0x6c($s0)
 /* BFF4E8 80241C68 2403EFFF */  addiu     $v1, $zero, -0x1001
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s
index b64cc24b07..fb841822f6 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s
@@ -33,7 +33,7 @@ glabel func_80241754_C37C84
 /* C37CF0 802417C0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* C37CF4 802417C4 8E260038 */  lw        $a2, 0x38($s1)
 /* C37CF8 802417C8 8E27003C */  lw        $a3, 0x3c($s1)
-/* C37CFC 802417CC 0C052757 */  jal       play_sound_at_position
+/* C37CFC 802417CC 0C052757 */  jal       sfx_play_sound_at_position
 /* C37D00 802417D0 24050002 */   addiu    $a1, $zero, 2
 /* C37D04 802417D4 2402000F */  addiu     $v0, $zero, 0xf
 /* C37D08 802417D8 A620008E */  sh        $zero, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
index b3b054b39c..f6b32451d6 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
@@ -22,7 +22,7 @@ glabel func_802417F8_C37D28
 /* C37D6C 8024183C E7A00010 */  swc1      $f0, 0x10($sp)
 /* C37D70 80241840 8E460038 */  lw        $a2, 0x38($s2)
 /* C37D74 80241844 8E47003C */  lw        $a3, 0x3c($s2)
-/* C37D78 80241848 0C05267B */  jal       func_801499EC
+/* C37D78 80241848 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C37D7C 8024184C 24050002 */   addiu    $a1, $zero, 2
 /* C37D80 80241850 0220202D */  daddu     $a0, $s1, $zero
 /* C37D84 80241854 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s
index d8c4fb131d..df55624514 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s
@@ -29,7 +29,7 @@ glabel func_80241A94_C37FC4
 /* C38024 80241AF4 10400008 */  beqz      $v0, .L80241B18
 /* C38028 80241AF8 00000000 */   nop
 /* C3802C 80241AFC 3C048000 */  lui       $a0, 0x8000
-/* C38030 80241B00 0C05271B */  jal       stop_sound
+/* C38030 80241B00 0C05271B */  jal       sfx_stop_sound
 /* C38034 80241B04 34840011 */   ori      $a0, $a0, 0x11
 /* C38038 80241B08 8E02006C */  lw        $v0, 0x6c($s0)
 /* C3803C 80241B0C 2403EFFF */  addiu     $v1, $zero, -0x1001
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s
index cdc5f7e59c..49ecc108a2 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s
@@ -49,7 +49,7 @@ glabel func_80242EB4_C42C64
 /* C42D08 80242F58 E7A00010 */  swc1      $f0, 0x10($sp)
 /* C42D0C 80242F5C 8E260038 */  lw        $a2, 0x38($s1)
 /* C42D10 80242F60 8E27003C */  lw        $a3, 0x3c($s1)
-/* C42D14 80242F64 0C052757 */  jal       play_sound_at_position
+/* C42D14 80242F64 0C052757 */  jal       sfx_play_sound_at_position
 /* C42D18 80242F68 24050002 */   addiu    $a1, $zero, 2
 /* C42D1C 80242F6C 2402000F */  addiu     $v0, $zero, 0xf
 /* C42D20 80242F70 A620008E */  sh        $zero, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
index 81b2302723..f106088ff1 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
@@ -22,7 +22,7 @@ glabel func_80242F94_C42D44
 /* C42D88 80242FD8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* C42D8C 80242FDC 8E460038 */  lw        $a2, 0x38($s2)
 /* C42D90 80242FE0 8E47003C */  lw        $a3, 0x3c($s2)
-/* C42D94 80242FE4 0C05267B */  jal       func_801499EC
+/* C42D94 80242FE4 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C42D98 80242FE8 24050002 */   addiu    $a1, $zero, 2
 /* C42D9C 80242FEC 0220202D */  daddu     $a0, $s1, $zero
 /* C42DA0 80242FF0 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s
index 939747ad49..c4843b7444 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s
@@ -29,7 +29,7 @@ glabel func_80243230_C42FE0
 /* C43040 80243290 10400008 */  beqz      $v0, .L802432B4
 /* C43044 80243294 00000000 */   nop
 /* C43048 80243298 3C048000 */  lui       $a0, 0x8000
-/* C4304C 8024329C 0C05271B */  jal       stop_sound
+/* C4304C 8024329C 0C05271B */  jal       sfx_stop_sound
 /* C43050 802432A0 34840011 */   ori      $a0, $a0, 0x11
 /* C43054 802432A4 8E02006C */  lw        $v0, 0x6c($s0)
 /* C43058 802432A8 2403EFFF */  addiu     $v1, $zero, -0x1001
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s
index acc57d1130..2b8ba70ff0 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s
@@ -33,7 +33,7 @@ glabel func_80242B78_C49758
 /* C497C4 80242BE4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* C497C8 80242BE8 8E260038 */  lw        $a2, 0x38($s1)
 /* C497CC 80242BEC 8E27003C */  lw        $a3, 0x3c($s1)
-/* C497D0 80242BF0 0C052757 */  jal       play_sound_at_position
+/* C497D0 80242BF0 0C052757 */  jal       sfx_play_sound_at_position
 /* C497D4 80242BF4 24050002 */   addiu    $a1, $zero, 2
 /* C497D8 80242BF8 2402000F */  addiu     $v0, $zero, 0xf
 /* C497DC 80242BFC A620008E */  sh        $zero, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
index 0446d7db51..a87c93c3e2 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
@@ -22,7 +22,7 @@ glabel func_80242C1C_C497FC
 /* C49840 80242C60 E7A00010 */  swc1      $f0, 0x10($sp)
 /* C49844 80242C64 8E460038 */  lw        $a2, 0x38($s2)
 /* C49848 80242C68 8E47003C */  lw        $a3, 0x3c($s2)
-/* C4984C 80242C6C 0C05267B */  jal       func_801499EC
+/* C4984C 80242C6C 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C49850 80242C70 24050002 */   addiu    $a1, $zero, 2
 /* C49854 80242C74 0220202D */  daddu     $a0, $s1, $zero
 /* C49858 80242C78 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s
index a46ba72de9..2d93cb4d7f 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s
@@ -29,7 +29,7 @@ glabel func_80242EB8_C49A98
 /* C49AF8 80242F18 10400008 */  beqz      $v0, .L80242F3C
 /* C49AFC 80242F1C 00000000 */   nop
 /* C49B00 80242F20 3C048000 */  lui       $a0, 0x8000
-/* C49B04 80242F24 0C05271B */  jal       stop_sound
+/* C49B04 80242F24 0C05271B */  jal       sfx_stop_sound
 /* C49B08 80242F28 34840011 */   ori      $a0, $a0, 0x11
 /* C49B0C 80242F2C 8E02006C */  lw        $v0, 0x6c($s0)
 /* C49B10 80242F30 2403EFFF */  addiu     $v1, $zero, -0x1001
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
index a419cbf37f..e1f259a267 100644
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
+++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
@@ -304,7 +304,7 @@ glabel L802427C4_96B984
 /* 96BA50 80242890 0000282D */  daddu     $a1, $zero, $zero
 /* 96BA54 80242894 24060068 */  addiu     $a2, $zero, 0x68
 .L80242898:
-/* 96BA58 80242898 0C0526AE */  jal       _play_sound
+/* 96BA58 80242898 0C0526AE */  jal       sfx_play_sound_with_params
 /* 96BA5C 8024289C 00A0382D */   daddu    $a3, $a1, $zero
 /* 96BA60 802428A0 08090BA5 */  j         L80242E94_96C054
 /* 96BA64 802428A4 00000000 */   nop
@@ -689,7 +689,7 @@ glabel L80242C2C_96BDEC
 /* 96C014 80242E54 0000202D */  daddu     $a0, $zero, $zero
 /* 96C018 80242E58 0C01BFBC */  jal       func_8006FEF0
 /* 96C01C 80242E5C E7A00010 */   swc1     $f0, 0x10($sp)
-/* 96C020 80242E60 0C05272D */  jal       play_sound
+/* 96C020 80242E60 0C05272D */  jal       sfx_play_sound
 /* 96C024 80242E64 24040206 */   addiu    $a0, $zero, 0x206
 /* 96C028 80242E68 0000282D */  daddu     $a1, $zero, $zero
 /* 96C02C 80242E6C 3C048025 */  lui       $a0, %hi(D_8024EF90)
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s
index 5a6be9fa69..7649313a57 100644
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s
+++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s
@@ -7,7 +7,7 @@ glabel func_8024303C_96C1FC
 /* 96C204 80243044 0000282D */  daddu     $a1, $zero, $zero
 /* 96C208 80243048 24060018 */  addiu     $a2, $zero, 0x18
 /* 96C20C 8024304C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C210 80243050 0C0526AE */  jal       _play_sound
+/* 96C210 80243050 0C0526AE */  jal       sfx_play_sound_with_params
 /* 96C214 80243054 00A0382D */   daddu    $a3, $a1, $zero
 /* 96C218 80243058 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 96C21C 8024305C 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s
index 78b5428668..c4fa5cf1b8 100644
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s
+++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s
@@ -7,7 +7,7 @@ glabel func_80243068_96C228
 /* 96C230 80243070 0000282D */  daddu     $a1, $zero, $zero
 /* 96C234 80243074 24060068 */  addiu     $a2, $zero, 0x68
 /* 96C238 80243078 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C23C 8024307C 0C0526AE */  jal       _play_sound
+/* 96C23C 8024307C 0C0526AE */  jal       sfx_play_sound_with_params
 /* 96C240 80243080 00A0382D */   daddu    $a3, $a1, $zero
 /* 96C244 80243084 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 96C248 80243088 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s
index f5fce7e06a..f546485cb7 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s
@@ -41,7 +41,7 @@ glabel func_802433C0_CC6BD0
 /* CC6C5C 8024344C 8E460040 */  lw        $a2, 0x40($s2)
 /* CC6C60 80243450 C64C0038 */  lwc1      $f12, 0x38($s2)
 /* CC6C64 80243454 C64E003C */  lwc1      $f14, 0x3c($s2)
-/* CC6C68 80243458 0C052781 */  jal       func_80149E04
+/* CC6C68 80243458 0C052781 */  jal       sfx_get_spatialized_sound_params
 /* CC6C6C 8024345C 0200382D */   daddu    $a3, $s0, $zero
 /* CC6C70 80243460 3C0543FA */  lui       $a1, 0x43fa
 /* CC6C74 80243464 8E620074 */  lw        $v0, 0x74($s3)
@@ -57,7 +57,7 @@ glabel func_802433C0_CC6BD0
 /* CC6C9C 8024348C 00073C00 */  sll       $a3, $a3, 0x10
 /* CC6CA0 80243490 92050001 */  lbu       $a1, 1($s0)
 /* CC6CA4 80243494 92260001 */  lbu       $a2, 1($s1)
-/* CC6CA8 80243498 0C0526AE */  jal       _play_sound
+/* CC6CA8 80243498 0C0526AE */  jal       sfx_play_sound_with_params
 /* CC6CAC 8024349C 00073C03 */   sra      $a3, $a3, 0x10
 .L802434A0:
 /* CC6CB0 802434A0 8E630070 */  lw        $v1, 0x70($s3)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s
index a5f9222d60..18bf0f4f28 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s
@@ -35,7 +35,7 @@ glabel func_802434D4_CC6CE4
 /* CC6D58 80243548 8CA60040 */  lw        $a2, 0x40($a1)
 /* CC6D5C 8024354C C4AC0038 */  lwc1      $f12, 0x38($a1)
 /* CC6D60 80243550 C4AE003C */  lwc1      $f14, 0x3c($a1)
-/* CC6D64 80243554 0C052781 */  jal       func_80149E04
+/* CC6D64 80243554 0C052781 */  jal       sfx_get_spatialized_sound_params
 /* CC6D68 80243558 0200382D */   daddu    $a3, $s0, $zero
 /* CC6D6C 8024355C 0000202D */  daddu     $a0, $zero, $zero
 /* CC6D70 80243560 3C0543FA */  lui       $a1, 0x43fa
@@ -51,7 +51,7 @@ glabel func_802434D4_CC6CE4
 /* CC6D98 80243588 00073C00 */  sll       $a3, $a3, 0x10
 /* CC6D9C 8024358C 92050001 */  lbu       $a1, 1($s0)
 /* CC6DA0 80243590 92260001 */  lbu       $a2, 1($s1)
-/* CC6DA4 80243594 0C0526AE */  jal       _play_sound
+/* CC6DA4 80243594 0C0526AE */  jal       sfx_play_sound_with_params
 /* CC6DA8 80243598 00073C03 */   sra      $a3, $a3, 0x10
 .L8024359C:
 /* CC6DAC 8024359C 8E430070 */  lw        $v1, 0x70($s2)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s
index 637e983d82..7084324fa5 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s
@@ -32,7 +32,7 @@ glabel func_8024046C_CCB77C
 /* CCB7E8 802404D8 00000000 */  nop
 /* CCB7EC 802404DC 46800020 */  cvt.s.w   $f0, $f0
 /* CCB7F0 802404E0 AE220078 */  sw        $v0, 0x78($s1)
-/* CCB7F4 802404E4 0C05267B */  jal       func_801499EC
+/* CCB7F4 802404E4 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* CCB7F8 802404E8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* CCB7FC 802404EC 8FBF0020 */  lw        $ra, 0x20($sp)
 /* CCB800 802404F0 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s
index db31a34eea..514f69580c 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s
@@ -11,7 +11,7 @@ glabel func_80240000_CE6700
 /* CE6718 80240018 E7A00010 */  swc1      $f0, 0x10($sp)
 /* CE671C 8024001C 8E060000 */  lw        $a2, ($s0)
 /* CE6720 80240020 8E070004 */  lw        $a3, 4($s0)
-/* CE6724 80240024 0C05267B */  jal       func_801499EC
+/* CE6724 80240024 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* CE6728 80240028 0000282D */   daddu    $a1, $zero, $zero
 /* CE672C 8024002C 86020044 */  lh        $v0, 0x44($s0)
 /* CE6730 80240030 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s
index 100775aac1..62832c3f8c 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s
@@ -37,7 +37,7 @@ glabel L80244118_A2E358
 /* A2E384 80244144 2405001A */  addiu     $a1, $zero, 0x1a
 /* A2E388 80244148 ACC50000 */  sw        $a1, ($a2)
 /* A2E38C 8024414C 24630001 */  addiu     $v1, $v1, 1
-/* A2E390 80244150 0C05272D */  jal       play_sound
+/* A2E390 80244150 0C05272D */  jal       sfx_play_sound
 /* A2E394 80244154 AC430000 */   sw       $v1, ($v0)
 /* A2E398 80244158 08091111 */  j         .L80244444
 /* A2E39C 8024415C 0000102D */   daddu    $v0, $zero, $zero
@@ -197,7 +197,7 @@ glabel L80244288_A2E4C8
 /* A2E5D4 80244394 3C038025 */  lui       $v1, %hi(D_8024AA20_A34C60)
 /* A2E5D8 80244398 8C63AA20 */  lw        $v1, %lo(D_8024AA20_A34C60)($v1)
 /* A2E5DC 8024439C 240200FF */  addiu     $v0, $zero, 0xff
-/* A2E5E0 802443A0 0C05272D */  jal       play_sound
+/* A2E5E0 802443A0 0C05272D */  jal       sfx_play_sound
 /* A2E5E4 802443A4 A462005C */   sh       $v0, 0x5c($v1)
 /* A2E5E8 802443A8 08091111 */  j         .L80244444
 /* A2E5EC 802443AC 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s
index 4a2beb9fd8..e97a5231c4 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s
@@ -11,7 +11,7 @@ glabel func_80240000_9951F0
 /* 995208 80240018 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 99520C 8024001C 8E060000 */  lw        $a2, ($s0)
 /* 995210 80240020 8E070004 */  lw        $a3, 4($s0)
-/* 995214 80240024 0C05267B */  jal       func_801499EC
+/* 995214 80240024 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* 995218 80240028 0000282D */   daddu    $a1, $zero, $zero
 /* 99521C 8024002C 86020044 */  lh        $v0, 0x44($s0)
 /* 995220 80240030 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s
index a6330181aa..05e4001653 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s
@@ -51,7 +51,7 @@ glabel func_80240118_90CD58
 /* 90CE04 802401C4 E7A20010 */  swc1      $f2, 0x10($sp)
 /* 90CE08 802401C8 8E260038 */  lw        $a2, 0x38($s1)
 /* 90CE0C 802401CC 44070000 */  mfc1      $a3, $f0
-/* 90CE10 802401D0 0C052757 */  jal       play_sound_at_position
+/* 90CE10 802401D0 0C052757 */  jal       sfx_play_sound_at_position
 /* 90CE14 802401D4 0000282D */   daddu    $a1, $zero, $zero
 /* 90CE18 802401D8 962300A8 */  lhu       $v1, 0xa8($s1)
 /* 90CE1C 802401DC C624003C */  lwc1      $f4, 0x3c($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s
index c6158b01f9..e00cbb6a54 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s
@@ -32,7 +32,7 @@ glabel func_80240310_B52B40
 /* B52BAC 8024037C 00000000 */  nop
 /* B52BB0 80240380 46800020 */  cvt.s.w   $f0, $f0
 /* B52BB4 80240384 AE220078 */  sw        $v0, 0x78($s1)
-/* B52BB8 80240388 0C05267B */  jal       func_801499EC
+/* B52BB8 80240388 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* B52BBC 8024038C E7A00010 */   swc1     $f0, 0x10($sp)
 /* B52BC0 80240390 8FBF0020 */  lw        $ra, 0x20($sp)
 /* B52BC4 80240394 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s
index c472aecc3a..704df2495a 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s
@@ -45,7 +45,7 @@ glabel func_80240000_B70860
 /* B708FC 8024009C 14400004 */  bnez      $v0, .L802400B0
 /* B70900 802400A0 24020001 */   addiu    $v0, $zero, 1
 /* B70904 802400A4 AE020074 */  sw        $v0, 0x74($s0)
-/* B70908 802400A8 0C05272D */  jal       play_sound
+/* B70908 802400A8 0C05272D */  jal       sfx_play_sound
 /* B7090C 802400AC 24042011 */   addiu    $a0, $zero, 0x2011
 .L802400B0:
 /* B70910 802400B0 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240000_B70860
 /* B7094C 802400EC 284200FF */  slti      $v0, $v0, 0xff
 /* B70950 802400F0 10400003 */  beqz      $v0, .L80240100
 /* B70954 802400F4 AE000074 */   sw       $zero, 0x74($s0)
-/* B70958 802400F8 0C05272D */  jal       play_sound
+/* B70958 802400F8 0C05272D */  jal       sfx_play_sound
 /* B7095C 802400FC 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240100:
 /* B70960 80240100 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s
index c982d7e8f7..ed3b4c3993 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s
@@ -35,7 +35,7 @@ glabel func_80240214_B769C4
 /* B76A3C 8024028C 00000000 */  nop
 /* B76A40 80240290 46800020 */  cvt.s.w   $f0, $f0
 /* B76A44 80240294 AE220078 */  sw        $v0, 0x78($s1)
-/* B76A48 80240298 0C05267B */  jal       func_801499EC
+/* B76A48 80240298 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* B76A4C 8024029C E7A00010 */   swc1     $f0, 0x10($sp)
 .L802402A0:
 /* B76A50 802402A0 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s
index ccff77f830..9f47017ef9 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s
@@ -35,7 +35,7 @@ glabel func_80241020_B851A0
 /* B85218 80241098 00000000 */  nop
 /* B8521C 8024109C 46800020 */  cvt.s.w   $f0, $f0
 /* B85220 802410A0 AE220078 */  sw        $v0, 0x78($s1)
-/* B85224 802410A4 0C05267B */  jal       func_801499EC
+/* B85224 802410A4 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* B85228 802410A8 E7A00010 */   swc1     $f0, 0x10($sp)
 .L802410AC:
 /* B8522C 802410AC 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s
index 9d9033d3a7..935f2cf12e 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s
@@ -35,7 +35,7 @@ glabel func_802410C4_B85244
 /* B852BC 8024113C 00000000 */  nop
 /* B852C0 80241140 46800020 */  cvt.s.w   $f0, $f0
 /* B852C4 80241144 AE220078 */  sw        $v0, 0x78($s1)
-/* B852C8 80241148 0C05267B */  jal       func_801499EC
+/* B852C8 80241148 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* B852CC 8024114C E7A00010 */   swc1     $f0, 0x10($sp)
 .L80241150:
 /* B852D0 80241150 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s
index c27b9f5d2f..4a96543afe 100644
--- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s
+++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s
@@ -45,7 +45,7 @@ glabel func_80240000_8A9A10
 /* 8A9AAC 8024009C 14400004 */  bnez      $v0, .L802400B0
 /* 8A9AB0 802400A0 24020001 */   addiu    $v0, $zero, 1
 /* 8A9AB4 802400A4 AE020074 */  sw        $v0, 0x74($s0)
-/* 8A9AB8 802400A8 0C05272D */  jal       play_sound
+/* 8A9AB8 802400A8 0C05272D */  jal       sfx_play_sound
 /* 8A9ABC 802400AC 24042011 */   addiu    $a0, $zero, 0x2011
 .L802400B0:
 /* 8A9AC0 802400B0 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240000_8A9A10
 /* 8A9AFC 802400EC 284200FF */  slti      $v0, $v0, 0xff
 /* 8A9B00 802400F0 10400003 */  beqz      $v0, .L80240100
 /* 8A9B04 802400F4 AE000074 */   sw       $zero, 0x74($s0)
-/* 8A9B08 802400F8 0C05272D */  jal       play_sound
+/* 8A9B08 802400F8 0C05272D */  jal       sfx_play_sound
 /* 8A9B0C 802400FC 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240100:
 /* 8A9B10 80240100 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s
index 6deeec764c..a5ab587fd4 100644
--- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s
+++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s
@@ -45,7 +45,7 @@ glabel func_80240000_8AA450
 /* 8AA4EC 8024009C 14400004 */  bnez      $v0, .L802400B0
 /* 8AA4F0 802400A0 24020001 */   addiu    $v0, $zero, 1
 /* 8AA4F4 802400A4 AE020074 */  sw        $v0, 0x74($s0)
-/* 8AA4F8 802400A8 0C05272D */  jal       play_sound
+/* 8AA4F8 802400A8 0C05272D */  jal       sfx_play_sound
 /* 8AA4FC 802400AC 24042011 */   addiu    $a0, $zero, 0x2011
 .L802400B0:
 /* 8AA500 802400B0 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240000_8AA450
 /* 8AA53C 802400EC 284200FF */  slti      $v0, $v0, 0xff
 /* 8AA540 802400F0 10400003 */  beqz      $v0, .L80240100
 /* 8AA544 802400F4 AE000074 */   sw       $zero, 0x74($s0)
-/* 8AA548 802400F8 0C05272D */  jal       play_sound
+/* 8AA548 802400F8 0C05272D */  jal       sfx_play_sound
 /* 8AA54C 802400FC 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240100:
 /* 8AA550 80240100 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240330_AD6200.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240330_AD6200.s
index 9a7d7c18de..11f325bfb8 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240330_AD6200.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240330_AD6200.s
@@ -16,7 +16,7 @@ glabel func_80240330_AD6200
 /* AD622C 8024035C 44061000 */  mfc1      $a2, $f2
 /* AD6230 80240360 4407A000 */  mfc1      $a3, $f20
 /* AD6234 80240364 0000282D */  daddu     $a1, $zero, $zero
-/* AD6238 80240368 0C05267B */  jal       func_801499EC
+/* AD6238 80240368 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* AD623C 8024036C E7A00010 */   swc1     $f0, 0x10($sp)
 /* AD6240 80240370 4600A10D */  trunc.w.s $f4, $f20
 /* AD6244 80240374 E6040084 */  swc1      $f4, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240390_AD6260.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240390_AD6260.s
index 15cf75d782..4c80bdce0b 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240390_AD6260.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_80240390_AD6260.s
@@ -16,7 +16,7 @@ glabel func_80240390_AD6260
 /* AD628C 802403BC 44061000 */  mfc1      $a2, $f2
 /* AD6290 802403C0 4407A000 */  mfc1      $a3, $f20
 /* AD6294 802403C4 0000282D */  daddu     $a1, $zero, $zero
-/* AD6298 802403C8 0C05267B */  jal       func_801499EC
+/* AD6298 802403C8 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* AD629C 802403CC E7A00010 */   swc1     $f0, 0x10($sp)
 /* AD62A0 802403D0 4600A10D */  trunc.w.s $f4, $f20
 /* AD62A4 802403D4 E6040084 */  swc1      $f4, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240080_B02900.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240080_B02900.s
index b73a51d694..e4aaa55f94 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240080_B02900.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240080_B02900.s
@@ -16,7 +16,7 @@ glabel func_80240080_B02900
 /* B0292C 802400AC 44061000 */  mfc1      $a2, $f2
 /* B02930 802400B0 4407A000 */  mfc1      $a3, $f20
 /* B02934 802400B4 0000282D */  daddu     $a1, $zero, $zero
-/* B02938 802400B8 0C05267B */  jal       func_801499EC
+/* B02938 802400B8 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* B0293C 802400BC E7A00010 */   swc1     $f0, 0x10($sp)
 /* B02940 802400C0 4600A10D */  trunc.w.s $f4, $f20
 /* B02944 802400C4 E6040084 */  swc1      $f4, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s
index 6abb9f9431..fb848cc7a6 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s
@@ -115,7 +115,7 @@ glabel func_802405F0_8AC580
 /* 8AC72C 8024079C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 8AC730 802407A0 8E060038 */  lw        $a2, 0x38($s0)
 /* 8AC734 802407A4 8E07003C */  lw        $a3, 0x3c($s0)
-/* 8AC738 802407A8 0C052757 */  jal       play_sound_at_position
+/* 8AC738 802407A8 0C052757 */  jal       sfx_play_sound_at_position
 /* 8AC73C 802407AC 0000282D */   daddu    $a1, $zero, $zero
 /* 8AC740 802407B0 C602003C */  lwc1      $f2, 0x3c($s0)
 /* 8AC744 802407B4 3C0141A0 */  lui       $at, 0x41a0
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s
index dfe8707663..b2f7a280e5 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s
@@ -28,7 +28,7 @@ glabel L802428B4_8EE6D4
 /* 8EE6E8 802428C8 A6000008 */  sh        $zero, 8($s0)
 /* 8EE6EC 802428CC A600000A */  sh        $zero, 0xa($s0)
 /* 8EE6F0 802428D0 AE000004 */  sw        $zero, 4($s0)
-/* 8EE6F4 802428D4 0C015478 */  jal       func_800551E0
+/* 8EE6F4 802428D4 0C015478 */  jal       snd_start_sound
 /* 8EE6F8 802428D8 A6020000 */   sh       $v0, ($s0)
 glabel L802428DC_8EE6FC
 /* 8EE6FC 802428DC 3C054200 */  lui       $a1, 0x4200
@@ -77,7 +77,7 @@ glabel L80242974_8EE794
 /* 8EE79C 8024297C 00A0302D */  daddu     $a2, $a1, $zero
 /* 8EE7A0 80242980 24020004 */  addiu     $v0, $zero, 4
 /* 8EE7A4 80242984 AE000004 */  sw        $zero, 4($s0)
-/* 8EE7A8 80242988 0C015478 */  jal       func_800551E0
+/* 8EE7A8 80242988 0C015478 */  jal       snd_start_sound
 /* 8EE7AC 8024298C A6020000 */   sh       $v0, ($s0)
 glabel L80242990_8EE7B0
 /* 8EE7B0 80242990 0000202D */  daddu     $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s
index 4ae18fbc4d..b1eafc0941 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s
@@ -45,7 +45,7 @@ glabel func_80240000_A46F60
 /* A46FFC 8024009C 14400004 */  bnez      $v0, .L802400B0
 /* A47000 802400A0 24020001 */   addiu    $v0, $zero, 1
 /* A47004 802400A4 AE020074 */  sw        $v0, 0x74($s0)
-/* A47008 802400A8 0C05272D */  jal       play_sound
+/* A47008 802400A8 0C05272D */  jal       sfx_play_sound
 /* A4700C 802400AC 24042011 */   addiu    $a0, $zero, 0x2011
 .L802400B0:
 /* A47010 802400B0 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240000_A46F60
 /* A4704C 802400EC 284200FF */  slti      $v0, $v0, 0xff
 /* A47050 802400F0 10400003 */  beqz      $v0, .L80240100
 /* A47054 802400F4 AE000074 */   sw       $zero, 0x74($s0)
-/* A47058 802400F8 0C05272D */  jal       play_sound
+/* A47058 802400F8 0C05272D */  jal       sfx_play_sound
 /* A4705C 802400FC 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240100:
 /* A47060 80240100 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s
index b788280a78..8e1651f7d4 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s
@@ -45,7 +45,7 @@ glabel func_80240000_A485C0
 /* A4865C 8024009C 14400004 */  bnez      $v0, .L802400B0
 /* A48660 802400A0 24020001 */   addiu    $v0, $zero, 1
 /* A48664 802400A4 AE020074 */  sw        $v0, 0x74($s0)
-/* A48668 802400A8 0C05272D */  jal       play_sound
+/* A48668 802400A8 0C05272D */  jal       sfx_play_sound
 /* A4866C 802400AC 24042011 */   addiu    $a0, $zero, 0x2011
 .L802400B0:
 /* A48670 802400B0 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240000_A485C0
 /* A486AC 802400EC 284200FF */  slti      $v0, $v0, 0xff
 /* A486B0 802400F0 10400003 */  beqz      $v0, .L80240100
 /* A486B4 802400F4 AE000074 */   sw       $zero, 0x74($s0)
-/* A486B8 802400F8 0C05272D */  jal       play_sound
+/* A486B8 802400F8 0C05272D */  jal       sfx_play_sound
 /* A486BC 802400FC 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240100:
 /* A486C0 80240100 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s
index 1fb6608eef..ae95daaad2 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s
@@ -35,7 +35,7 @@ glabel func_80242DB0_C63AC0
 /* C63B38 80242E28 00000000 */  nop
 /* C63B3C 80242E2C 46800020 */  cvt.s.w   $f0, $f0
 /* C63B40 80242E30 AE220078 */  sw        $v0, 0x78($s1)
-/* C63B44 80242E34 0C05267B */  jal       func_801499EC
+/* C63B44 80242E34 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C63B48 80242E38 E7A00010 */   swc1     $f0, 0x10($sp)
 .L80242E3C:
 /* C63B4C 80242E3C 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s
index 206e3a17f5..1e32700706 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s
@@ -35,7 +35,7 @@ glabel func_80242E54_C63B64
 /* C63BDC 80242ECC 00000000 */  nop
 /* C63BE0 80242ED0 46800020 */  cvt.s.w   $f0, $f0
 /* C63BE4 80242ED4 AE220078 */  sw        $v0, 0x78($s1)
-/* C63BE8 80242ED8 0C05267B */  jal       func_801499EC
+/* C63BE8 80242ED8 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C63BEC 80242EDC E7A00010 */   swc1     $f0, 0x10($sp)
 .L80242EE0:
 /* C63BF0 80242EE0 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
index 37dac9cdaf..8b539e517c 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
@@ -233,7 +233,7 @@ glabel func_80241050_C69180
 /* C694EC 802413BC 8C8422F0 */  lw        $a0, %lo(D_802422F0_C6A420)($a0)
 /* C694F0 802413C0 8E060004 */  lw        $a2, 4($s0)
 /* C694F4 802413C4 8E070008 */  lw        $a3, 8($s0)
-/* C694F8 802413C8 0C052757 */  jal       play_sound_at_position
+/* C694F8 802413C8 0C052757 */  jal       sfx_play_sound_at_position
 /* C694FC 802413CC 0000282D */   daddu    $a1, $zero, $zero
 .L802413D0:
 /* C69500 802413D0 C60C0004 */  lwc1      $f12, 4($s0)
@@ -298,7 +298,7 @@ glabel func_80241050_C69180
 /* C695EC 802414BC 8E67002C */  lw        $a3, 0x2c($s3)
 /* C695F0 802414C0 C6600030 */  lwc1      $f0, 0x30($s3)
 /* C695F4 802414C4 0000282D */  daddu     $a1, $zero, $zero
-/* C695F8 802414C8 0C052757 */  jal       play_sound_at_position
+/* C695F8 802414C8 0C052757 */  jal       sfx_play_sound_at_position
 /* C695FC 802414CC E7A00010 */   swc1     $f0, 0x10($sp)
 /* C69600 802414D0 2402002D */  addiu     $v0, $zero, 0x2d
 /* C69604 802414D4 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xA)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
index 8ee1991633..941407ffe6 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
@@ -28,7 +28,7 @@ glabel func_80240310_C6CC30
 /* C6CC8C 8024036C E7A00010 */  swc1      $f0, 0x10($sp)
 /* C6CC90 80240370 8E060048 */  lw        $a2, 0x48($s0)
 /* C6CC94 80240374 8E07004C */  lw        $a3, 0x4c($s0)
-/* C6CC98 80240378 0C052757 */  jal       play_sound_at_position
+/* C6CC98 80240378 0C052757 */  jal       sfx_play_sound_at_position
 /* C6CC9C 8024037C 0000282D */   daddu    $a1, $zero, $zero
 .L80240380:
 /* C6CCA0 80240380 8E230070 */  lw        $v1, 0x70($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
index 661a8f378b..3a10947dfc 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
@@ -28,7 +28,7 @@ glabel func_80240720_C6EA50
 /* C6EAAC 8024077C E7A00010 */  swc1      $f0, 0x10($sp)
 /* C6EAB0 80240780 8E060048 */  lw        $a2, 0x48($s0)
 /* C6EAB4 80240784 8E07004C */  lw        $a3, 0x4c($s0)
-/* C6EAB8 80240788 0C052757 */  jal       play_sound_at_position
+/* C6EAB8 80240788 0C052757 */  jal       sfx_play_sound_at_position
 /* C6EABC 8024078C 0000282D */   daddu    $a1, $zero, $zero
 .L80240790:
 /* C6EAC0 80240790 8E230070 */  lw        $v1, 0x70($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s
index a3d5001604..5e3d2f2adb 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s
@@ -103,7 +103,7 @@ glabel func_80243EE0_C75360
 /* C754D8 80244058 14400004 */  bnez      $v0, .L8024406C
 /* C754DC 8024405C 24020001 */   addiu    $v0, $zero, 1
 /* C754E0 80244060 AE020074 */  sw        $v0, 0x74($s0)
-/* C754E4 80244064 0C05272D */  jal       play_sound
+/* C754E4 80244064 0C05272D */  jal       sfx_play_sound
 /* C754E8 80244068 24042011 */   addiu    $a0, $zero, 0x2011
 .L8024406C:
 /* C754EC 8024406C 8E020070 */  lw        $v0, 0x70($s0)
@@ -125,7 +125,7 @@ glabel func_80243EE0_C75360
 /* C75528 802440A8 284200FF */  slti      $v0, $v0, 0xff
 /* C7552C 802440AC 10400003 */  beqz      $v0, .L802440BC
 /* C75530 802440B0 AE000074 */   sw       $zero, 0x74($s0)
-/* C75534 802440B4 0C05272D */  jal       play_sound
+/* C75534 802440B4 0C05272D */  jal       sfx_play_sound
 /* C75538 802440B8 24042012 */   addiu    $a0, $zero, 0x2012
 .L802440BC:
 /* C7553C 802440BC 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s
index 655f17a77a..250f5132a2 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s
@@ -35,7 +35,7 @@ glabel func_80240D40_C77A20
 /* C77A98 80240DB8 00000000 */  nop
 /* C77A9C 80240DBC 46800020 */  cvt.s.w   $f0, $f0
 /* C77AA0 80240DC0 AE220078 */  sw        $v0, 0x78($s1)
-/* C77AA4 80240DC4 0C05267B */  jal       func_801499EC
+/* C77AA4 80240DC4 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C77AA8 80240DC8 E7A00010 */   swc1     $f0, 0x10($sp)
 .L80240DCC:
 /* C77AAC 80240DCC 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s
index f1124f7544..44e573a879 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s
@@ -35,7 +35,7 @@ glabel func_80240DE4_C77AC4
 /* C77B3C 80240E5C 00000000 */  nop
 /* C77B40 80240E60 46800020 */  cvt.s.w   $f0, $f0
 /* C77B44 80240E64 AE220078 */  sw        $v0, 0x78($s1)
-/* C77B48 80240E68 0C05267B */  jal       func_801499EC
+/* C77B48 80240E68 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C77B4C 80240E6C E7A00010 */   swc1     $f0, 0x10($sp)
 .L80240E70:
 /* C77B50 80240E70 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s
index 0de619f849..fe07319489 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s
@@ -32,7 +32,7 @@ glabel func_80240638_C7E7B8
 /* C7E824 802406A4 00000000 */  nop
 /* C7E828 802406A8 46800020 */  cvt.s.w   $f0, $f0
 /* C7E82C 802406AC AE220078 */  sw        $v0, 0x78($s1)
-/* C7E830 802406B0 0C05267B */  jal       func_801499EC
+/* C7E830 802406B0 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C7E834 802406B4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* C7E838 802406B8 8FBF0020 */  lw        $ra, 0x20($sp)
 /* C7E83C 802406BC 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
index dd7c68c45b..54248f470b 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
@@ -233,7 +233,7 @@ glabel func_80241F4C_C820EC
 /* C82458 802422B8 8C8437B4 */  lw        $a0, %lo(D_802437B4_C83954)($a0)
 /* C8245C 802422BC 8E060004 */  lw        $a2, 4($s0)
 /* C82460 802422C0 8E070008 */  lw        $a3, 8($s0)
-/* C82464 802422C4 0C052757 */  jal       play_sound_at_position
+/* C82464 802422C4 0C052757 */  jal       sfx_play_sound_at_position
 /* C82468 802422C8 0000282D */   daddu    $a1, $zero, $zero
 .L802422CC:
 /* C8246C 802422CC C60C0004 */  lwc1      $f12, 4($s0)
@@ -298,7 +298,7 @@ glabel func_80241F4C_C820EC
 /* C82558 802423B8 8E67002C */  lw        $a3, 0x2c($s3)
 /* C8255C 802423BC C6600030 */  lwc1      $f0, 0x30($s3)
 /* C82560 802423C0 0000282D */  daddu     $a1, $zero, $zero
-/* C82564 802423C4 0C052757 */  jal       play_sound_at_position
+/* C82564 802423C4 0C052757 */  jal       sfx_play_sound_at_position
 /* C82568 802423C8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* C8256C 802423CC 2402002D */  addiu     $v0, $zero, 0x2d
 /* C82570 802423D0 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xA)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s
index 5bbcfd6519..c7fd4ee642 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s
@@ -32,7 +32,7 @@ glabel func_80243004_C88AB4
 /* C88B20 80243070 00000000 */  nop
 /* C88B24 80243074 46800020 */  cvt.s.w   $f0, $f0
 /* C88B28 80243078 AE220078 */  sw        $v0, 0x78($s1)
-/* C88B2C 8024307C 0C05267B */  jal       func_801499EC
+/* C88B2C 8024307C 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C88B30 80243080 E7A00010 */   swc1     $f0, 0x10($sp)
 /* C88B34 80243084 8FBF0020 */  lw        $ra, 0x20($sp)
 /* C88B38 80243088 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s
index f59a729b8d..58e08485f8 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s
@@ -11,7 +11,7 @@ glabel func_8024030C_C8DEBC
 /* C8DED4 80240324 E7A00010 */  swc1      $f0, 0x10($sp)
 /* C8DED8 80240328 8E060000 */  lw        $a2, ($s0)
 /* C8DEDC 8024032C 8E070004 */  lw        $a3, 4($s0)
-/* C8DEE0 80240330 0C05267B */  jal       func_801499EC
+/* C8DEE0 80240330 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* C8DEE4 80240334 0000282D */   daddu    $a1, $zero, $zero
 /* C8DEE8 80240338 86020044 */  lh        $v0, 0x44($s0)
 /* C8DEEC 8024033C 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
index 6b84468a47..e4c44d2070 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
@@ -34,7 +34,7 @@ glabel func_802431B0_855320
 /* 855394 80243224 4406B000 */  mfc1      $a2, $f22
 /* 855398 80243228 4407A000 */  mfc1      $a3, $f20
 /* 85539C 8024322C 0000282D */  daddu     $a1, $zero, $zero
-/* 8553A0 80243230 0C05267B */  jal       func_801499EC
+/* 8553A0 80243230 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* 8553A4 80243234 E7B80010 */   swc1     $f24, 0x10($sp)
 .L80243238:
 /* 8553A8 80243238 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s
index 3be1fc8898..96e89854a5 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s
@@ -29,7 +29,7 @@ glabel func_802415FC_86613C
 /* 86619C 8024165C 4406C000 */  mfc1      $a2, $f24
 /* 8661A0 80241660 4407A000 */  mfc1      $a3, $f20
 /* 8661A4 80241664 0000282D */  daddu     $a1, $zero, $zero
-/* 8661A8 80241668 0C05267B */  jal       func_801499EC
+/* 8661A8 80241668 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* 8661AC 8024166C E7B60010 */   swc1     $f22, 0x10($sp)
 .L80241670:
 /* 8661B0 80241670 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s
index 94b82fffe2..97600e0762 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s
@@ -26,7 +26,7 @@ glabel L80241588_E0FD28
 /* E0FD30 80241590 00A0302D */  daddu     $a2, $a1, $zero
 /* E0FD34 80241594 24020001 */  addiu     $v0, $zero, 1
 /* E0FD38 80241598 AE000004 */  sw        $zero, 4($s0)
-/* E0FD3C 8024159C 0C015478 */  jal       func_800551E0
+/* E0FD3C 8024159C 0C015478 */  jal       snd_start_sound
 /* E0FD40 802415A0 AE020000 */   sw       $v0, ($s0)
 glabel L802415A4_E0FD44
 /* E0FD44 802415A4 3C054200 */  lui       $a1, 0x4200
@@ -75,7 +75,7 @@ glabel L8024163C_E0FDDC
 /* E0FDE4 80241644 00A0302D */  daddu     $a2, $a1, $zero
 /* E0FDE8 80241648 24020004 */  addiu     $v0, $zero, 4
 /* E0FDEC 8024164C AE000004 */  sw        $zero, 4($s0)
-/* E0FDF0 80241650 0C015478 */  jal       func_800551E0
+/* E0FDF0 80241650 0C015478 */  jal       snd_start_sound
 /* E0FDF4 80241654 AE020000 */   sw       $v0, ($s0)
 glabel L80241658_E0FDF8
 /* E0FDF8 80241658 0000202D */  daddu     $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s
index 4c69a80aaa..5a8dfa757c 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s
@@ -119,7 +119,7 @@ glabel func_802401D0_E12930
 /* E12AD0 80240370 24040211 */  addiu     $a0, $zero, 0x211
 /* E12AD4 80240374 0000282D */  daddu     $a1, $zero, $zero
 /* E12AD8 80240378 24060040 */  addiu     $a2, $zero, 0x40
-/* E12ADC 8024037C 0C0526AE */  jal       _play_sound
+/* E12ADC 8024037C 0C0526AE */  jal       sfx_play_sound_with_params
 /* E12AE0 80240380 24070032 */   addiu    $a3, $zero, 0x32
 .L80240384:
 /* E12AE4 80240384 24060020 */  addiu     $a2, $zero, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s
index c6c3a06f53..6e0ca64506 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s
@@ -43,7 +43,7 @@ glabel func_80240CD0_E13430
 /* E134B4 80240D54 AE02000C */   sw       $v0, 0xc($s0)
 /* E134B8 80240D58 8E02000C */  lw        $v0, 0xc($s0)
 /* E134BC 80240D5C 24040211 */  addiu     $a0, $zero, 0x211
-/* E134C0 80240D60 0C05272D */  jal       play_sound
+/* E134C0 80240D60 0C05272D */  jal       sfx_play_sound
 /* E134C4 80240D64 AE020010 */   sw       $v0, 0x10($s0)
 /* E134C8 80240D68 8E02000C */  lw        $v0, 0xc($s0)
 /* E134CC 80240D6C 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
index cfc123ea31..1df3f42606 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
@@ -57,7 +57,7 @@ glabel func_80240F90_E136F0
 /* E137B8 80241058 24040283 */  addiu     $a0, $zero, 0x283
 /* E137BC 8024105C 24050050 */  addiu     $a1, $zero, 0x50
 /* E137C0 80241060 0000302D */  daddu     $a2, $zero, $zero
-/* E137C4 80241064 0C0526AE */  jal       _play_sound
+/* E137C4 80241064 0C0526AE */  jal       sfx_play_sound_with_params
 /* E137C8 80241068 00C0382D */   daddu    $a3, $a2, $zero
 /* E137CC 8024106C 8FBF002C */  lw        $ra, 0x2c($sp)
 /* E137D0 80241070 8FB40028 */  lw        $s4, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s
index 3fc89ab290..8e2e4ce6af 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s
@@ -70,7 +70,7 @@ glabel func_80241090_E137F0
 /* E138E4 80241184 08090466 */  j         .L80241198
 /* E138E8 80241188 00822021 */   addu     $a0, $a0, $v0
 .L8024118C:
-/* E138EC 8024118C 0C05272D */  jal       play_sound
+/* E138EC 8024118C 0C05272D */  jal       sfx_play_sound
 /* E138F0 80241190 2404021D */   addiu    $a0, $zero, 0x21d
 /* E138F4 80241194 0000202D */  daddu     $a0, $zero, $zero
 .L80241198:
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
index 3c2961d280..acfb7d3c65 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
@@ -171,7 +171,7 @@ glabel func_80241234_E13994
 /* E13C14 802414B4 24040003 */  addiu     $a0, $zero, 3
 /* E13C18 802414B8 0C01BFBC */  jal       func_8006FEF0
 /* E13C1C 802414BC E7A00010 */   swc1     $f0, 0x10($sp)
-/* E13C20 802414C0 0C05272D */  jal       play_sound
+/* E13C20 802414C0 0C05272D */  jal       sfx_play_sound
 /* E13C24 802414C4 24040213 */   addiu    $a0, $zero, 0x213
 /* E13C28 802414C8 8EA20074 */  lw        $v0, 0x74($s5)
 /* E13C2C 802414CC 24030003 */  addiu     $v1, $zero, 3
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s
index ef894878a0..c28e7b2e73 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s
@@ -16,7 +16,7 @@ glabel func_80241510_E13C70
 .L8024153C:
 /* E13C9C 8024153C 0C03A830 */  jal       add_coins
 /* E13CA0 80241540 2404FFFF */   addiu    $a0, $zero, -1
-/* E13CA4 80241544 0C05272D */  jal       play_sound
+/* E13CA4 80241544 0C05272D */  jal       sfx_play_sound
 /* E13CA8 80241548 24040211 */   addiu    $a0, $zero, 0x211
 /* E13CAC 8024154C 8E030070 */  lw        $v1, 0x70($s0)
 /* E13CB0 80241550 24630001 */  addiu     $v1, $v1, 1
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
index 1f69078f29..5729db5162 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
@@ -90,7 +90,7 @@ glabel L80240CCC_E16A4C
 /* E16A78 80240CF8 8E04008C */  lw        $a0, 0x8c($s0)
 /* E16A7C 80240CFC 8E660038 */  lw        $a2, 0x38($s3)
 /* E16A80 80240D00 8E67003C */  lw        $a3, 0x3c($s3)
-/* E16A84 80240D04 0C052757 */  jal       play_sound_at_position
+/* E16A84 80240D04 0C052757 */  jal       sfx_play_sound_at_position
 /* E16A88 80240D08 3C050010 */   lui      $a1, 0x10
 /* E16A8C 80240D0C 27A50068 */  addiu     $a1, $sp, 0x68
 /* E16A90 80240D10 27A6006C */  addiu     $a2, $sp, 0x6c
@@ -203,7 +203,7 @@ glabel L80240E60_E16BE0
 /* E16C2C 80240EAC AEA20028 */  sw        $v0, 0x28($s5)
 /* E16C30 80240EB0 24020008 */  addiu     $v0, $zero, 8
 /* E16C34 80240EB4 A662008E */  sh        $v0, 0x8e($s3)
-/* E16C38 80240EB8 0C05272D */  jal       play_sound
+/* E16C38 80240EB8 0C05272D */  jal       sfx_play_sound
 /* E16C3C 80240EBC 8E04008C */   lw       $a0, 0x8c($s0)
 /* E16C40 80240EC0 3C070001 */  lui       $a3, 1
 /* E16C44 80240EC4 34E70001 */  ori       $a3, $a3, 1
@@ -528,7 +528,7 @@ glabel L80241384_E17104
 /* E17124 802413A4 8E04008C */  lw        $a0, 0x8c($s0)
 /* E17128 802413A8 8E660038 */  lw        $a2, 0x38($s3)
 /* E1712C 802413AC 8E67003C */  lw        $a3, 0x3c($s3)
-/* E17130 802413B0 0C052757 */  jal       play_sound_at_position
+/* E17130 802413B0 0C052757 */  jal       sfx_play_sound_at_position
 /* E17134 802413B4 3C050010 */   lui      $a1, 0x10
 /* E17138 802413B8 27A50068 */  addiu     $a1, $sp, 0x68
 /* E1713C 802413BC 27A6006C */  addiu     $a2, $sp, 0x6c
@@ -730,7 +730,7 @@ glabel L8024164C_E173CC
 /* E17428 802416A8 A662008E */  sh        $v0, 0x8e($s3)
 /* E1742C 802416AC 24020023 */  addiu     $v0, $zero, 0x23
 /* E17430 802416B0 E67A003C */  swc1      $f26, 0x3c($s3)
-/* E17434 802416B4 0C05272D */  jal       play_sound
+/* E17434 802416B4 0C05272D */  jal       sfx_play_sound
 /* E17438 802416B8 AE82002C */   sw       $v0, 0x2c($s4)
 /* E1743C 802416BC 080906CF */  j         .L80241B3C
 /* E17440 802416C0 2694001C */   addiu    $s4, $s4, 0x1c
@@ -818,7 +818,7 @@ glabel L802417AC_E1752C
 /* E17578 802417F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* E1757C 802417FC 8E660038 */  lw        $a2, 0x38($s3)
 /* E17580 80241800 8E67003C */  lw        $a3, 0x3c($s3)
-/* E17584 80241804 0C052757 */  jal       play_sound_at_position
+/* E17584 80241804 0C052757 */  jal       sfx_play_sound_at_position
 /* E17588 80241808 3C050020 */   lui      $a1, 0x20
 /* E1758C 8024180C 0240282D */  daddu     $a1, $s2, $zero
 /* E17590 80241810 0200302D */  daddu     $a2, $s0, $zero
@@ -948,7 +948,7 @@ glabel L802418C4_E17644
 /* E17768 802419E8 080906C2 */  j         .L80241B08
 /* E1776C 802419EC AE820030 */   sw       $v0, 0x30($s4)
 glabel L802419F0_E17770
-/* E17770 802419F0 0C05272D */  jal       play_sound
+/* E17770 802419F0 0C05272D */  jal       sfx_play_sound
 /* E17774 802419F4 2404021C */   addiu    $a0, $zero, 0x21c
 /* E17778 802419F8 8E840044 */  lw        $a0, 0x44($s4)
 /* E1777C 802419FC 0C046C04 */  jal       get_model_list_index_from_tree_index
@@ -1106,7 +1106,7 @@ glabel L80241B38_E178B8
 .L80241C1C:
 /* E1799C 80241C1C 240401A7 */  addiu     $a0, $zero, 0x1a7
 .L80241C20:
-/* E179A0 80241C20 0C05272D */  jal       play_sound
+/* E179A0 80241C20 0C05272D */  jal       sfx_play_sound
 /* E179A4 80241C24 00000000 */   nop
 .L80241C28:
 /* E179A8 80241C28 8EA20008 */  lw        $v0, 8($s5)
@@ -1198,7 +1198,7 @@ glabel L80241B38_E178B8
 /* E17AE0 80241D60 240400D4 */   addiu    $a0, $zero, 0xd4
 /* E17AE4 80241D64 2404021D */  addiu     $a0, $zero, 0x21d
 .L80241D68:
-/* E17AE8 80241D68 0C05272D */  jal       play_sound
+/* E17AE8 80241D68 0C05272D */  jal       sfx_play_sound
 /* E17AEC 80241D6C 00000000 */   nop
 /* E17AF0 80241D70 3C030001 */  lui       $v1, 1
 /* E17AF4 80241D74 8E020000 */  lw        $v0, ($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s
index 36dac5edb0..4b02ad272b 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s
@@ -41,7 +41,7 @@ glabel func_80241F38_E17CB8
 /* E17D34 80241FB4 00441023 */  subu      $v0, $v0, $a0
 /* E17D38 80241FB8 0C03A830 */  jal       add_coins
 /* E17D3C 80241FBC AE020020 */   sw       $v0, 0x20($s0)
-/* E17D40 80241FC0 0C05272D */  jal       play_sound
+/* E17D40 80241FC0 0C05272D */  jal       sfx_play_sound
 /* E17D44 80241FC4 24040211 */   addiu    $a0, $zero, 0x211
 /* E17D48 80241FC8 8E020020 */  lw        $v0, 0x20($s0)
 /* E17D4C 80241FCC 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s
index 7771471daf..fd44cd75d4 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s
@@ -62,7 +62,7 @@ glabel func_80241FE4_E17D64
 /* E17E44 802420C4 8E070040 */  lw        $a3, 0x40($s0)
 /* E17E48 802420C8 0C01BECC */  jal       fx_walk_normal
 /* E17E4C 802420CC 24040001 */   addiu    $a0, $zero, 1
-/* E17E50 802420D0 0C05272D */  jal       play_sound
+/* E17E50 802420D0 0C05272D */  jal       sfx_play_sound
 /* E17E54 802420D4 24040283 */   addiu    $a0, $zero, 0x283
 .L802420D8:
 /* E17E58 802420D8 8E020000 */  lw        $v0, ($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s
index 019a0c6377..379e3734db 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s
@@ -16,7 +16,7 @@ glabel func_80242340_E180C0
 .L8024236C:
 /* E180EC 8024236C 0C03A830 */  jal       add_coins
 /* E180F0 80242370 2404FFFF */   addiu    $a0, $zero, -1
-/* E180F4 80242374 0C05272D */  jal       play_sound
+/* E180F4 80242374 0C05272D */  jal       sfx_play_sound
 /* E180F8 80242378 24040211 */   addiu    $a0, $zero, 0x211
 /* E180FC 8024237C 8E030070 */  lw        $v1, 0x70($s0)
 /* E18100 80242380 24630001 */  addiu     $v1, $v1, 1
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s
index d492cfcd97..03cda5e678 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s
@@ -236,7 +236,7 @@ glabel L8024038C_BBD52C
 /* BBD5A0 80240400 00000000 */  nop
 /* BBD5A4 80240404 45000003 */  bc1f      .L80240414
 /* BBD5A8 80240408 2404009D */   addiu    $a0, $zero, 0x9d
-/* BBD5AC 8024040C 0C052736 */  jal       play_sound_at_player
+/* BBD5AC 8024040C 0C052736 */  jal       sfx_play_sound_at_player
 /* BBD5B0 80240410 0000282D */   daddu    $a1, $zero, $zero
 .L80240414:
 /* BBD5B4 80240414 E6340014 */  swc1      $f20, 0x14($s1)
@@ -257,7 +257,7 @@ glabel L8024038C_BBD52C
 /* BBD5EC 8024044C 3484000F */  ori       $a0, $a0, 0xf
 /* BBD5F0 80240450 E7A00010 */  swc1      $f0, 0x10($sp)
 /* BBD5F4 80240454 8E270010 */  lw        $a3, 0x10($s1)
-/* BBD5F8 80240458 0C052757 */  jal       play_sound_at_position
+/* BBD5F8 80240458 0C052757 */  jal       sfx_play_sound_at_position
 /* BBD5FC 8024045C 0000282D */   daddu    $a1, $zero, $zero
 /* BBD600 80240460 24020001 */  addiu     $v0, $zero, 1
 /* BBD604 80240464 08090123 */  j         .L8024048C
@@ -268,7 +268,7 @@ glabel L8024038C_BBD52C
 /* BBD614 80240474 00000000 */  nop
 /* BBD618 80240478 45000004 */  bc1f      .L8024048C
 /* BBD61C 8024047C 3C048000 */   lui      $a0, 0x8000
-/* BBD620 80240480 0C05271B */  jal       stop_sound
+/* BBD620 80240480 0C05271B */  jal       sfx_stop_sound
 /* BBD624 80240484 3484000F */   ori      $a0, $a0, 0xf
 /* BBD628 80240488 AE800078 */  sw        $zero, 0x78($s4)
 .L8024048C:
@@ -295,7 +295,7 @@ glabel L8024038C_BBD52C
 /* BBD678 802404D8 44071000 */  mfc1      $a3, $f2
 /* BBD67C 802404DC C7A00060 */  lwc1      $f0, 0x60($sp)
 /* BBD680 802404E0 0000282D */  daddu     $a1, $zero, $zero
-/* BBD684 802404E4 0C052757 */  jal       play_sound_at_position
+/* BBD684 802404E4 0C052757 */  jal       sfx_play_sound_at_position
 /* BBD688 802404E8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* BBD68C 802404EC 24020001 */  addiu     $v0, $zero, 1
 /* BBD690 802404F0 08090145 */  j         .L80240514
@@ -305,7 +305,7 @@ glabel L8024038C_BBD52C
 /* BBD69C 802404FC 56020006 */  bnel      $s0, $v0, .L80240518
 /* BBD6A0 80240500 AE900088 */   sw       $s0, 0x88($s4)
 /* BBD6A4 80240504 3C048000 */  lui       $a0, 0x8000
-/* BBD6A8 80240508 0C05271B */  jal       stop_sound
+/* BBD6A8 80240508 0C05271B */  jal       sfx_stop_sound
 /* BBD6AC 8024050C 34840010 */   ori      $a0, $a0, 0x10
 /* BBD6B0 80240510 AE80007C */  sw        $zero, 0x7c($s4)
 .L80240514:
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s
index 2eb868addf..b78115e3e3 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s
@@ -377,7 +377,7 @@ glabel func_802408D0_BC4B50
 /* BC50BC 80240E3C 44071000 */  mfc1      $a3, $f2
 /* BC50C0 80240E40 C7A00060 */  lwc1      $f0, 0x60($sp)
 /* BC50C4 80240E44 0000282D */  daddu     $a1, $zero, $zero
-/* BC50C8 80240E48 0C052757 */  jal       play_sound_at_position
+/* BC50C8 80240E48 0C052757 */  jal       sfx_play_sound_at_position
 /* BC50CC 80240E4C E7A00010 */   swc1     $f0, 0x10($sp)
 /* BC50D0 80240E50 08090397 */  j         .L80240E5C
 /* BC50D4 80240E54 AE500078 */   sw       $s0, 0x78($s2)
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s
index b5b4b338f3..a7f7413284 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s
@@ -73,7 +73,7 @@ glabel func_80240624_BC8484
 /* BC8588 80240728 E7A00010 */  swc1      $f0, 0x10($sp)
 /* BC858C 8024072C 8E060038 */  lw        $a2, 0x38($s0)
 /* BC8590 80240730 8E07003C */  lw        $a3, 0x3c($s0)
-/* BC8594 80240734 0C052757 */  jal       play_sound_at_position
+/* BC8594 80240734 0C052757 */  jal       sfx_play_sound_at_position
 /* BC8598 80240738 0000282D */   daddu    $a1, $zero, $zero
 /* BC859C 8024073C AE740074 */  sw        $s4, 0x74($s3)
 /* BC85A0 80240740 C6000038 */  lwc1      $f0, 0x38($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s
index dcdf1fdc28..e2f17cc3e8 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s
@@ -377,7 +377,7 @@ glabel func_80240050_BCD0B0
 /* BCD61C 802405BC 44071000 */  mfc1      $a3, $f2
 /* BCD620 802405C0 C7A00060 */  lwc1      $f0, 0x60($sp)
 /* BCD624 802405C4 0000282D */  daddu     $a1, $zero, $zero
-/* BCD628 802405C8 0C052757 */  jal       play_sound_at_position
+/* BCD628 802405C8 0C052757 */  jal       sfx_play_sound_at_position
 /* BCD62C 802405CC E7A00010 */   swc1     $f0, 0x10($sp)
 /* BCD630 802405D0 08090177 */  j         .L802405DC
 /* BCD634 802405D4 AE500078 */   sw       $s0, 0x78($s2)
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s
index 29e0fbcf42..6ff069c179 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s
@@ -15,7 +15,7 @@ glabel func_8024130C_BCFEFC
 /* BCFF24 80241334 3C058024 */  lui       $a1, %hi(D_80243098_BD1C88)
 /* BCFF28 80241338 00A22821 */  addu      $a1, $a1, $v0
 /* BCFF2C 8024133C 8CA53098 */  lw        $a1, %lo(D_80243098_BD1C88)($a1)
-/* BCFF30 80241340 0C052A46 */  jal       set_music_track
+/* BCFF30 80241340 0C052A46 */  jal       bgm_set_song
 /* BCFF34 80241344 240701F4 */   addiu    $a3, $zero, 0x1f4
 /* BCFF38 80241348 8FBF0018 */  lw        $ra, 0x18($sp)
 /* BCFF3C 8024134C 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s
index 9471db1246..c614844528 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s
@@ -58,7 +58,7 @@ glabel L80240DA4_BD4614
 /* BD464C 80240DDC E7A00010 */  swc1      $f0, 0x10($sp)
 /* BD4650 80240DE0 8E060038 */  lw        $a2, 0x38($s0)
 /* BD4654 80240DE4 8E07003C */  lw        $a3, 0x3c($s0)
-/* BD4658 80240DE8 0C052757 */  jal       play_sound_at_position
+/* BD4658 80240DE8 0C052757 */  jal       sfx_play_sound_at_position
 /* BD465C 80240DEC 0000282D */   daddu    $a1, $zero, $zero
 /* BD4660 80240DF0 24020002 */  addiu     $v0, $zero, 2
 /* BD4664 80240DF4 AE420074 */  sw        $v0, 0x74($s2)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
index 1800a4581c..cd073ef448 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
@@ -97,7 +97,7 @@ glabel func_80240000_D9AEF0
 /* D9B04C 8024015C 3C014320 */  lui       $at, 0x4320
 /* D9B050 80240160 44810000 */  mtc1      $at, $f0
 /* D9B054 80240164 0000382D */  daddu     $a3, $zero, $zero
-/* D9B058 80240168 0C052757 */  jal       play_sound_at_position
+/* D9B058 80240168 0C052757 */  jal       sfx_play_sound_at_position
 /* D9B05C 8024016C E7A00010 */   swc1     $f0, 0x10($sp)
 /* D9B060 80240170 E6540004 */  swc1      $f20, 4($s2)
 .L80240174:
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s
index b5dc9cc94c..b6cb040725 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s
@@ -106,7 +106,7 @@ glabel func_80240040_D9D510
 /* D9D690 802401C0 3C0142CC */  lui       $at, 0x42cc
 /* D9D694 802401C4 44810000 */  mtc1      $at, $f0
 /* D9D698 802401C8 0000382D */  daddu     $a3, $zero, $zero
-/* D9D69C 802401CC 0C052757 */  jal       play_sound_at_position
+/* D9D69C 802401CC 0C052757 */  jal       sfx_play_sound_at_position
 /* D9D6A0 802401D0 E7A00010 */   swc1     $f0, 0x10($sp)
 /* D9D6A4 802401D4 E6540004 */  swc1      $f20, 4($s2)
 .L802401D8:
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s
index 6c9ba9209b..83cf6a9ccd 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s
@@ -45,7 +45,7 @@ glabel func_802401A0_DDC9D0
 /* DDCA70 80240240 44810000 */  mtc1      $at, $f0
 /* DDCA74 80240244 3C148024 */  lui       $s4, %hi(D_80241760_DDDF90)
 /* DDCA78 80240248 26941760 */  addiu     $s4, $s4, %lo(D_80241760_DDDF90)
-/* DDCA7C 8024024C 0C052757 */  jal       play_sound_at_position
+/* DDCA7C 8024024C 0C052757 */  jal       sfx_play_sound_at_position
 /* DDCA80 80240250 E7A00010 */   swc1     $f0, 0x10($sp)
 /* DDCA84 80240254 0C00AB39 */  jal       heap_malloc
 /* DDCA88 80240258 24040210 */   addiu    $a0, $zero, 0x210
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s
index 3f05c7f49d..cb796e52a2 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s
@@ -45,7 +45,7 @@ glabel func_80240184_DDF494
 /* DDF530 80240220 14400004 */  bnez      $v0, .L80240234
 /* DDF534 80240224 24020001 */   addiu    $v0, $zero, 1
 /* DDF538 80240228 AE020074 */  sw        $v0, 0x74($s0)
-/* DDF53C 8024022C 0C05272D */  jal       play_sound
+/* DDF53C 8024022C 0C05272D */  jal       sfx_play_sound
 /* DDF540 80240230 24042011 */   addiu    $a0, $zero, 0x2011
 .L80240234:
 /* DDF544 80240234 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240184_DDF494
 /* DDF580 80240270 284200FF */  slti      $v0, $v0, 0xff
 /* DDF584 80240274 10400003 */  beqz      $v0, .L80240284
 /* DDF588 80240278 AE000074 */   sw       $zero, 0x74($s0)
-/* DDF58C 8024027C 0C05272D */  jal       play_sound
+/* DDF58C 8024027C 0C05272D */  jal       sfx_play_sound
 /* DDF590 80240280 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240284:
 /* DDF594 80240284 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s
index ea0339b03a..b0b0009689 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s
@@ -104,7 +104,7 @@ glabel func_80240000_DE2490
 /* DE2608 80240178 3C0142BE */  lui       $at, 0x42be
 /* DE260C 8024017C 44810000 */  mtc1      $at, $f0
 /* DE2610 80240180 0000382D */  daddu     $a3, $zero, $zero
-/* DE2614 80240184 0C052757 */  jal       play_sound_at_position
+/* DE2614 80240184 0C052757 */  jal       sfx_play_sound_at_position
 /* DE2618 80240188 E7A00010 */   swc1     $f0, 0x10($sp)
 /* DE261C 8024018C E6540004 */  swc1      $f20, 4($s2)
 .L80240190:
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s
index b67fb1881a..ec399f85e0 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s
@@ -45,7 +45,7 @@ glabel func_80240000_DE56B0
 /* DE574C 8024009C 14400004 */  bnez      $v0, .L802400B0
 /* DE5750 802400A0 24020001 */   addiu    $v0, $zero, 1
 /* DE5754 802400A4 AE020074 */  sw        $v0, 0x74($s0)
-/* DE5758 802400A8 0C05272D */  jal       play_sound
+/* DE5758 802400A8 0C05272D */  jal       sfx_play_sound
 /* DE575C 802400AC 24042011 */   addiu    $a0, $zero, 0x2011
 .L802400B0:
 /* DE5760 802400B0 8E020070 */  lw        $v0, 0x70($s0)
@@ -67,7 +67,7 @@ glabel func_80240000_DE56B0
 /* DE579C 802400EC 284200FF */  slti      $v0, $v0, 0xff
 /* DE57A0 802400F0 10400003 */  beqz      $v0, .L80240100
 /* DE57A4 802400F4 AE000074 */   sw       $zero, 0x74($s0)
-/* DE57A8 802400F8 0C05272D */  jal       play_sound
+/* DE57A8 802400F8 0C05272D */  jal       sfx_play_sound
 /* DE57AC 802400FC 24042012 */   addiu    $a0, $zero, 0x2012
 .L80240100:
 /* DE57B0 80240100 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s
index 34e8ce39e8..166a81ce5f 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s
@@ -11,7 +11,7 @@ glabel func_80240000_DE8770
 /* DE8788 80240018 E7A00010 */  swc1      $f0, 0x10($sp)
 /* DE878C 8024001C 8E060000 */  lw        $a2, ($s0)
 /* DE8790 80240020 8E070004 */  lw        $a3, 4($s0)
-/* DE8794 80240024 0C05267B */  jal       func_801499EC
+/* DE8794 80240024 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* DE8798 80240028 0000282D */   daddu    $a1, $zero, $zero
 /* DE879C 8024002C 86020044 */  lh        $v0, 0x44($s0)
 /* DE87A0 80240030 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s
index 82cc16d51f..59fd5903a8 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s
@@ -11,7 +11,7 @@ glabel func_80240020_D86A20
 /* D86A38 80240038 E7A00010 */  swc1      $f0, 0x10($sp)
 /* D86A3C 8024003C 8E060000 */  lw        $a2, ($s0)
 /* D86A40 80240040 8E070004 */  lw        $a3, 4($s0)
-/* D86A44 80240044 0C05267B */  jal       func_801499EC
+/* D86A44 80240044 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* D86A48 80240048 0000282D */   daddu    $a1, $zero, $zero
 /* D86A4C 8024004C 86020044 */  lh        $v0, 0x44($s0)
 /* D86A50 80240050 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s
index 480aead3c9..41c24fecf8 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s
@@ -35,7 +35,7 @@ glabel func_802416A4_D31324
 /* D3139C 8024171C 44820000 */  mtc1      $v0, $f0
 /* D313A0 80241720 00000000 */  nop
 /* D313A4 80241724 46800020 */  cvt.s.w   $f0, $f0
-/* D313A8 80241728 0C05267B */  jal       func_801499EC
+/* D313A8 80241728 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* D313AC 8024172C E7A00010 */   swc1     $f0, 0x10($sp)
 /* D313B0 80241730 8FBF0024 */  lw        $ra, 0x24($sp)
 /* D313B4 80241734 8FB20020 */  lw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
index 101917025e..9e06ea9ff9 100644
--- a/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
+++ b/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
@@ -233,7 +233,7 @@ glabel func_80240310_9BB5B0
 /* 9BB91C 8024067C 8C840F00 */  lw        $a0, %lo(D_80240F00_9BC1A0)($a0)
 /* 9BB920 80240680 8E060004 */  lw        $a2, 4($s0)
 /* 9BB924 80240684 8E070008 */  lw        $a3, 8($s0)
-/* 9BB928 80240688 0C052757 */  jal       play_sound_at_position
+/* 9BB928 80240688 0C052757 */  jal       sfx_play_sound_at_position
 /* 9BB92C 8024068C 0000282D */   daddu    $a1, $zero, $zero
 .L80240690:
 /* 9BB930 80240690 C60C0004 */  lwc1      $f12, 4($s0)
@@ -298,7 +298,7 @@ glabel func_80240310_9BB5B0
 /* 9BBA1C 8024077C 8E67002C */  lw        $a3, 0x2c($s3)
 /* 9BBA20 80240780 C6600030 */  lwc1      $f0, 0x30($s3)
 /* 9BBA24 80240784 0000282D */  daddu     $a1, $zero, $zero
-/* 9BBA28 80240788 0C052757 */  jal       play_sound_at_position
+/* 9BBA28 80240788 0C052757 */  jal       sfx_play_sound_at_position
 /* 9BBA2C 8024078C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 9BBA30 80240790 2402002D */  addiu     $v0, $zero, 0x2d
 /* 9BBA34 80240794 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xA)
diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s
index 27f8a748a4..c880142f2b 100644
--- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s
+++ b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s
@@ -11,7 +11,7 @@ glabel func_80240000_9C2910
 /* 9C2928 80240018 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 9C292C 8024001C 8E060000 */  lw        $a2, ($s0)
 /* 9C2930 80240020 8E070004 */  lw        $a3, 4($s0)
-/* 9C2934 80240024 0C05267B */  jal       func_801499EC
+/* 9C2934 80240024 0C05267B */  jal       sfx_adjust_env_sound_pos
 /* 9C2938 80240028 0000282D */   daddu    $a1, $zero, $zero
 /* 9C293C 8024002C 86020044 */  lh        $v0, 0x44($s0)
 /* 9C2940 80240030 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s
index bd44a02967..9362d62f1e 100644
--- a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s
+++ b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s
@@ -245,7 +245,7 @@ glabel func_802BD758_3184A8
 /* 318840 802BDAF0 2442FFFF */   addiu    $v0, $v0, -1
 /* 318844 802BDAF4 3C048000 */  lui       $a0, 0x8000
 /* 318848 802BDAF8 0000282D */  daddu     $a1, $zero, $zero
-/* 31884C 802BDAFC 0C052742 */  jal       play_sound_at_npc
+/* 31884C 802BDAFC 0C052742 */  jal       sfx_play_sound_at_npc
 /* 318850 802BDB00 2406FFFC */   addiu    $a2, $zero, -4
 /* 318854 802BDB04 26240038 */  addiu     $a0, $s1, 0x38
 /* 318858 802BDB08 4480A000 */  mtc1      $zero, $f20
@@ -389,7 +389,7 @@ glabel func_802BD758_3184A8
 /* 318A64 802BDD14 24040141 */  addiu     $a0, $zero, 0x141
 .L802BDD18:
 /* 318A68 802BDD18 0000282D */  daddu     $a1, $zero, $zero
-/* 318A6C 802BDD1C 0C052742 */  jal       play_sound_at_npc
+/* 318A6C 802BDD1C 0C052742 */  jal       sfx_play_sound_at_npc
 /* 318A70 802BDD20 2406FFFC */   addiu    $a2, $zero, -4
 .L802BDD24:
 /* 318A74 802BDD24 8E430074 */  lw        $v1, 0x74($s2)
@@ -477,7 +477,7 @@ glabel func_802BD758_3184A8
 /* 318B94 802BDE44 10400004 */  beqz      $v0, .L802BDE58
 /* 318B98 802BDE48 00000000 */   nop
 /* 318B9C 802BDE4C AC600000 */  sw        $zero, ($v1)
-/* 318BA0 802BDE50 0C05271B */  jal       stop_sound
+/* 318BA0 802BDE50 0C05271B */  jal       sfx_stop_sound
 /* 318BA4 802BDE54 3C048000 */   lui      $a0, 0x8000
 .L802BDE58:
 /* 318BA8 802BDE58 3C108011 */  lui       $s0, %hi(gPlayerData)
@@ -529,7 +529,7 @@ glabel func_802BD758_3184A8
 /* 318C50 802BDF00 24042018 */  addiu     $a0, $zero, 0x2018
 .L802BDF04:
 /* 318C54 802BDF04 0000282D */  daddu     $a1, $zero, $zero
-/* 318C58 802BDF08 0C052742 */  jal       play_sound_at_npc
+/* 318C58 802BDF08 0C052742 */  jal       sfx_play_sound_at_npc
 /* 318C5C 802BDF0C 2406FFFC */   addiu    $a2, $zero, -4
 /* 318C60 802BDF10 0000202D */  daddu     $a0, $zero, $zero
 /* 318C64 802BDF14 0080282D */  daddu     $a1, $a0, $zero
@@ -838,7 +838,7 @@ glabel func_802BD758_3184A8
 /* 3190E4 802BE394 1040004A */  beqz      $v0, .L802BE4C0
 /* 3190E8 802BE398 24020002 */   addiu    $v0, $zero, 2
 /* 3190EC 802BE39C AC600000 */  sw        $zero, ($v1)
-/* 3190F0 802BE3A0 0C05271B */  jal       stop_sound
+/* 3190F0 802BE3A0 0C05271B */  jal       sfx_stop_sound
 /* 3190F4 802BE3A4 3C048000 */   lui      $a0, 0x8000
 /* 3190F8 802BE3A8 080AF930 */  j         .L802BE4C0
 /* 3190FC 802BE3AC 24020002 */   addiu    $v0, $zero, 2
@@ -912,7 +912,7 @@ glabel func_802BD758_3184A8
 /* 3191F8 802BE4A8 10400005 */  beqz      $v0, .L802BE4C0
 /* 3191FC 802BE4AC 24020002 */   addiu    $v0, $zero, 2
 /* 319200 802BE4B0 AC600000 */  sw        $zero, ($v1)
-/* 319204 802BE4B4 0C05271B */  jal       stop_sound
+/* 319204 802BE4B4 0C05271B */  jal       sfx_stop_sound
 /* 319208 802BE4B8 3C048000 */   lui      $a0, 0x8000
 /* 31920C 802BE4BC 24020002 */  addiu     $v0, $zero, 2
 .L802BE4C0:
diff --git a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s
index cc0e7c94f5..40cb3d9a62 100644
--- a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s
+++ b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s
@@ -96,7 +96,7 @@ glabel func_802BE6E8_319438
 /* 319594 802BE844 10400004 */  beqz      $v0, .L802BE858
 /* 319598 802BE848 00000000 */   nop
 /* 31959C 802BE84C AC600000 */  sw        $zero, ($v1)
-/* 3195A0 802BE850 0C05271B */  jal       stop_sound
+/* 3195A0 802BE850 0C05271B */  jal       sfx_stop_sound
 /* 3195A4 802BE854 3C048000 */   lui      $a0, 0x8000
 .L802BE858:
 /* 3195A8 802BE858 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s
index ae0b42b31b..445a44428a 100644
--- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s
+++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s
@@ -330,7 +330,7 @@ glabel L802BDA20_324370
 /* 3244B8 802BDB68 34840014 */   ori      $a0, $a0, 0x14
 /* 3244BC 802BDB6C 2404200E */  addiu     $a0, $zero, 0x200e
 /* 3244C0 802BDB70 0000282D */  daddu     $a1, $zero, $zero
-/* 3244C4 802BDB74 0C052742 */  jal       play_sound_at_npc
+/* 3244C4 802BDB74 0C052742 */  jal       sfx_play_sound_at_npc
 /* 3244C8 802BDB78 2406FFFC */   addiu    $a2, $zero, -4
 /* 3244CC 802BDB7C 24020001 */  addiu     $v0, $zero, 1
 /* 3244D0 802BDB80 080AF771 */  j         L802BDDC4_324714
@@ -481,7 +481,7 @@ glabel L802BDD74_3246C4
 .L802BDDA4:
 /* 3246F4 802BDDA4 2404200F */  addiu     $a0, $zero, 0x200f
 /* 3246F8 802BDDA8 0000282D */  daddu     $a1, $zero, $zero
-/* 3246FC 802BDDAC 0C052742 */  jal       play_sound_at_npc
+/* 3246FC 802BDDAC 0C052742 */  jal       sfx_play_sound_at_npc
 /* 324700 802BDDB0 2406FFFC */   addiu    $a2, $zero, -4
 /* 324704 802BDDB4 0C0AF77C */  jal       func_802BDDF0_324740
 /* 324708 802BDDB8 0240202D */   daddu    $a0, $s2, $zero
diff --git a/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF08_324858.s b/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF08_324858.s
index e621979490..ef30b4347d 100644
--- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF08_324858.s
+++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF08_324858.s
@@ -14,7 +14,7 @@ glabel func_802BDF08_324858
 /* 32487C 802BDF2C 10400004 */  beqz      $v0, .L802BDF40
 /* 324880 802BDF30 2404200F */   addiu    $a0, $zero, 0x200f
 /* 324884 802BDF34 0000282D */  daddu     $a1, $zero, $zero
-/* 324888 802BDF38 0C052742 */  jal       play_sound_at_npc
+/* 324888 802BDF38 0C052742 */  jal       sfx_play_sound_at_npc
 /* 32488C 802BDF3C 2406FFFC */   addiu    $a2, $zero, -4
 .L802BDF40:
 /* 324890 802BDF40 0C0AF77C */  jal       func_802BDDF0_324740
diff --git a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
index 5be00ca1d4..ddf087fc60 100644
--- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
+++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
@@ -295,7 +295,7 @@ glabel L802BD7F0_31B810
 /* 31BAAC 802BDA8C 0000282D */  daddu     $a1, $zero, $zero
 /* 31BAB0 802BDA90 3C01802C */  lui       $at, %hi(D_802BEC60)
 /* 31BAB4 802BDA94 AC20EC60 */  sw        $zero, %lo(D_802BEC60)($at)
-/* 31BAB8 802BDA98 0C052742 */  jal       play_sound_at_npc
+/* 31BAB8 802BDA98 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31BABC 802BDA9C 2406FFFC */   addiu    $a2, $zero, -4
 /* 31BAC0 802BDAA0 24020002 */  addiu     $v0, $zero, 2
 /* 31BAC4 802BDAA4 AEA20070 */  sw        $v0, 0x70($s5)
@@ -465,11 +465,11 @@ glabel L802BDAA8_31BAC8
 /* 31BD40 802BDD20 3C01802C */  lui       $at, %hi(D_802BEC60)
 /* 31BD44 802BDD24 AC20EC60 */  sw        $zero, %lo(D_802BEC60)($at)
 /* 31BD48 802BDD28 34420001 */  ori       $v0, $v0, 1
-/* 31BD4C 802BDD2C 0C052742 */  jal       play_sound_at_npc
+/* 31BD4C 802BDD2C 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31BD50 802BDD30 A4620002 */   sh       $v0, 2($v1)
 /* 31BD54 802BDD34 24040284 */  addiu     $a0, $zero, 0x284
 /* 31BD58 802BDD38 0000282D */  daddu     $a1, $zero, $zero
-/* 31BD5C 802BDD3C 0C052742 */  jal       play_sound_at_npc
+/* 31BD5C 802BDD3C 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31BD60 802BDD40 2406FFFC */   addiu    $a2, $zero, -4
 /* 31BD64 802BDD44 080AF8E8 */  j         L802BE3A0_31C3C0
 /* 31BD68 802BDD48 00000000 */   nop
@@ -523,7 +523,7 @@ glabel L802BDD4C_31BD6C
 /* 31BE20 802BDE00 14400004 */  bnez      $v0, .L802BDE14
 /* 31BE24 802BDE04 2404010C */   addiu    $a0, $zero, 0x10c
 /* 31BE28 802BDE08 0000282D */  daddu     $a1, $zero, $zero
-/* 31BE2C 802BDE0C 0C052742 */  jal       play_sound_at_npc
+/* 31BE2C 802BDE0C 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31BE30 802BDE10 2406FFFC */   addiu    $a2, $zero, -4
 .L802BDE14:
 /* 31BE34 802BDE14 C60C000C */  lwc1      $f12, 0xc($s0)
@@ -553,7 +553,7 @@ glabel L802BDD4C_31BD6C
 /* 31BE94 802BDE74 24040003 */   addiu    $a0, $zero, 3
 /* 31BE98 802BDE78 0000202D */  daddu     $a0, $zero, $zero
 /* 31BE9C 802BDE7C 0080282D */  daddu     $a1, $a0, $zero
-/* 31BEA0 802BDE80 0C052742 */  jal       play_sound_at_npc
+/* 31BEA0 802BDE80 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31BEA4 802BDE84 2406FFFC */   addiu    $a2, $zero, -4
 /* 31BEA8 802BDE88 080AF8E7 */  j         .L802BE39C
 /* 31BEAC 802BDE8C 24020007 */   addiu    $v0, $zero, 7
@@ -684,7 +684,7 @@ glabel L802BDD4C_31BD6C
 /* 31C094 802BE074 1040002F */  beqz      $v0, .L802BE134
 /* 31C098 802BE078 24040286 */   addiu    $a0, $zero, 0x286
 /* 31C09C 802BE07C 0000282D */  daddu     $a1, $zero, $zero
-/* 31C0A0 802BE080 0C052742 */  jal       play_sound_at_npc
+/* 31C0A0 802BE080 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31C0A4 802BE084 2406FFFC */   addiu    $a2, $zero, -4
 /* 31C0A8 802BE088 C60C000C */  lwc1      $f12, 0xc($s0)
 /* 31C0AC 802BE08C 0C00A8BB */  jal       sin_deg
@@ -713,7 +713,7 @@ glabel L802BDD4C_31BD6C
 /* 31C108 802BE0E8 24040003 */   addiu    $a0, $zero, 3
 /* 31C10C 802BE0EC 0000202D */  daddu     $a0, $zero, $zero
 /* 31C110 802BE0F0 0080282D */  daddu     $a1, $a0, $zero
-/* 31C114 802BE0F4 0C052742 */  jal       play_sound_at_npc
+/* 31C114 802BE0F4 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31C118 802BE0F8 2406FFFC */   addiu    $a2, $zero, -4
 /* 31C11C 802BE0FC 24020004 */  addiu     $v0, $zero, 4
 /* 31C120 802BE100 AEA20070 */  sw        $v0, 0x70($s5)
@@ -736,7 +736,7 @@ glabel L802BDD4C_31BD6C
 /* 31C160 802BE140 1462000B */  bne       $v1, $v0, .L802BE170
 /* 31C164 802BE144 0000202D */   daddu    $a0, $zero, $zero
 /* 31C168 802BE148 0080282D */  daddu     $a1, $a0, $zero
-/* 31C16C 802BE14C 0C052742 */  jal       play_sound_at_npc
+/* 31C16C 802BE14C 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31C170 802BE150 2406FFFC */   addiu    $a2, $zero, -4
 /* 31C174 802BE154 24020005 */  addiu     $v0, $zero, 5
 /* 31C178 802BE158 AEA20070 */  sw        $v0, 0x70($s5)
@@ -759,7 +759,7 @@ glabel L802BDD4C_31BD6C
 /* 31C1B4 802BE194 2406FFFC */  addiu     $a2, $zero, -4
 /* 31C1B8 802BE198 24020007 */  addiu     $v0, $zero, 7
 /* 31C1BC 802BE19C AEA20070 */  sw        $v0, 0x70($s5)
-/* 31C1C0 802BE1A0 0C052742 */  jal       play_sound_at_npc
+/* 31C1C0 802BE1A0 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31C1C4 802BE1A4 AE000018 */   sw       $zero, 0x18($s0)
 /* 31C1C8 802BE1A8 080AF8E8 */  j         L802BE3A0_31C3C0
 /* 31C1CC 802BE1AC 00000000 */   nop
@@ -1011,7 +1011,7 @@ glabel L802BE3A0_31C3C0
 /* 31C578 802BE558 2406FFFC */  addiu     $a2, $zero, -4
 /* 31C57C 802BE55C E6000038 */  swc1      $f0, 0x38($s0)
 /* 31C580 802BE560 E602003C */  swc1      $f2, 0x3c($s0)
-/* 31C584 802BE564 0C052742 */  jal       play_sound_at_npc
+/* 31C584 802BE564 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31C588 802BE568 E6040040 */   swc1     $f4, 0x40($s0)
 /* 31C58C 802BE56C C60C000C */  lwc1      $f12, 0xc($s0)
 /* 31C590 802BE570 0C00A8BB */  jal       sin_deg
@@ -1145,7 +1145,7 @@ glabel L802BE3A0_31C3C0
 /* 31C77C 802BE75C A2C00000 */  sb        $zero, ($s6)
 /* 31C780 802BE760 AE00001C */  sw        $zero, 0x1c($s0)
 /* 31C784 802BE764 A60200A8 */  sh        $v0, 0xa8($s0)
-/* 31C788 802BE768 0C05271B */  jal       stop_sound
+/* 31C788 802BE768 0C05271B */  jal       sfx_stop_sound
 /* 31C78C 802BE76C AE050028 */   sw       $a1, 0x28($s0)
 /* 31C790 802BE770 0C00EB6B */  jal       disable_npc_blur
 /* 31C794 802BE774 0200202D */   daddu    $a0, $s0, $zero
diff --git a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s
index 7c18fc2efc..733146aa29 100644
--- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s
+++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s
@@ -46,7 +46,7 @@ glabel func_802BEA24_31CA44
 /* 31CAE0 802BEAC0 00431024 */  and       $v0, $v0, $v1
 /* 31CAE4 802BEAC4 2403FFBF */  addiu     $v1, $zero, -0x41
 /* 31CAE8 802BEAC8 00431024 */  and       $v0, $v0, $v1
-/* 31CAEC 802BEACC 0C05271B */  jal       stop_sound
+/* 31CAEC 802BEACC 0C05271B */  jal       sfx_stop_sound
 /* 31CAF0 802BEAD0 AE220000 */   sw       $v0, ($s1)
 /* 31CAF4 802BEAD4 0C039769 */  jal       set_action_state
 /* 31CAF8 802BEAD8 0000202D */   daddu    $a0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s
index d1ff9bd0db..9bc83c58b1 100644
--- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s
+++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s
@@ -98,7 +98,7 @@ glabel func_802BDDD8_321928
 /* 321A88 802BDF38 0000282D */  daddu     $a1, $zero, $zero
 /* 321A8C 802BDF3C 24060040 */  addiu     $a2, $zero, 0x40
 /* 321A90 802BDF40 00073C00 */  sll       $a3, $a3, 0x10
-/* 321A94 802BDF44 0C0526AE */  jal       _play_sound
+/* 321A94 802BDF44 0C0526AE */  jal       sfx_play_sound_with_params
 /* 321A98 802BDF48 00073C03 */   sra      $a3, $a3, 0x10
 .L802BDF4C:
 /* 321A9C 802BDF4C C6400038 */  lwc1      $f0, 0x38($s2)
diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s
index 7de87198c1..018eaa6b29 100644
--- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s
+++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s
@@ -394,7 +394,7 @@ glabel func_802BE724_322274
 /* 32282C 802BECDC 00000000 */   nop
 .L802BECE0:
 /* 322830 802BECE0 0000282D */  daddu     $a1, $zero, $zero
-/* 322834 802BECE4 0C052742 */  jal       play_sound_at_npc
+/* 322834 802BECE4 0C052742 */  jal       sfx_play_sound_at_npc
 /* 322838 802BECE8 2406FFFC */   addiu    $a2, $zero, -4
 /* 32283C 802BECEC 3C040001 */  lui       $a0, 1
 /* 322840 802BECF0 0C037FBF */  jal       func_800DFEFC
@@ -632,7 +632,7 @@ glabel func_802BE724_322274
 /* 322BB4 802BF064 3C03BFFF */   lui      $v1, 0xbfff
 /* 322BB8 802BF068 2404021D */  addiu     $a0, $zero, 0x21d
 /* 322BBC 802BF06C 0000282D */  daddu     $a1, $zero, $zero
-/* 322BC0 802BF070 0C052742 */  jal       play_sound_at_npc
+/* 322BC0 802BF070 0C052742 */  jal       sfx_play_sound_at_npc
 /* 322BC4 802BF074 2406FFFC */   addiu    $a2, $zero, -4
 /* 322BC8 802BF078 3C03BFFF */  lui       $v1, 0xbfff
 .L802BF07C:
diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s
index 80008f3a04..81a3c93c5f 100644
--- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s
+++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s
@@ -106,7 +106,7 @@ glabel func_802BFBA0_3236F0
 .L802BFD24:
 /* 323874 802BFD24 0000282D */  daddu     $a1, $zero, $zero
 .L802BFD28:
-/* 323878 802BFD28 0C052742 */  jal       play_sound_at_npc
+/* 323878 802BFD28 0C052742 */  jal       sfx_play_sound_at_npc
 /* 32387C 802BFD2C 2406FFFC */   addiu    $a2, $zero, -4
 /* 323880 802BFD30 3C020008 */  lui       $v0, 8
 /* 323884 802BFD34 3C014000 */  lui       $at, 0x4000
diff --git a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s
index 4bacf1baf7..e4bd17af7c 100644
--- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s
+++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s
@@ -298,7 +298,7 @@ glabel L802BD904_319E74
 /* 31A028 802BDAB8 E6020018 */   swc1     $f2, 0x18($s0)
 /* 31A02C 802BDABC 24042009 */  addiu     $a0, $zero, 0x2009
 /* 31A030 802BDAC0 0000282D */  daddu     $a1, $zero, $zero
-/* 31A034 802BDAC4 0C052742 */  jal       play_sound_at_npc
+/* 31A034 802BDAC4 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31A038 802BDAC8 2406FFFC */   addiu    $a2, $zero, -4
 /* 31A03C 802BDACC 3C038016 */  lui       $v1, %hi(gCollisionStatus)
 /* 31A040 802BDAD0 2463A550 */  addiu     $v1, $v1, %lo(gCollisionStatus)
@@ -352,7 +352,7 @@ glabel L802BDAF8_31A068
 /* 31A0F4 802BDB84 14600004 */  bnez      $v1, .L802BDB98
 /* 31A0F8 802BDB88 24042009 */   addiu    $a0, $zero, 0x2009
 /* 31A0FC 802BDB8C 0000282D */  daddu     $a1, $zero, $zero
-/* 31A100 802BDB90 0C052742 */  jal       play_sound_at_npc
+/* 31A100 802BDB90 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31A104 802BDB94 2406FFFC */   addiu    $a2, $zero, -4
 .L802BDB98:
 /* 31A108 802BDB98 3C12802C */  lui       $s2, %hi(D_802BEBC4)
@@ -826,7 +826,7 @@ glabel L802BE210_31A780
 /* 31A824 802BE2B4 14600004 */  bnez      $v1, .L802BE2C8
 /* 31A828 802BE2B8 24042009 */   addiu    $a0, $zero, 0x2009
 /* 31A82C 802BE2BC 0000282D */  daddu     $a1, $zero, $zero
-/* 31A830 802BE2C0 0C052742 */  jal       play_sound_at_npc
+/* 31A830 802BE2C0 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31A834 802BE2C4 2406FFFC */   addiu    $a2, $zero, -4
 .L802BE2C8:
 /* 31A838 802BE2C8 C604001C */  lwc1      $f4, 0x1c($s0)
@@ -1170,7 +1170,7 @@ glabel L802BE78C_31ACFC
 /* 31AD50 802BE7E0 A2E00003 */  sb        $zero, 3($s7)
 /* 31AD54 802BE7E4 0C03BCCA */  jal       enable_partner_ai
 /* 31AD58 802BE7E8 A2E00000 */   sb       $zero, ($s7)
-/* 31AD5C 802BE7EC 0C05271B */  jal       stop_sound
+/* 31AD5C 802BE7EC 0C05271B */  jal       sfx_stop_sound
 /* 31AD60 802BE7F0 24042009 */   addiu    $a0, $zero, 0x2009
 /* 31AD64 802BE7F4 3C02802C */  lui       $v0, %hi(D_802BEBB4)
 /* 31AD68 802BE7F8 8C42EBB4 */  lw        $v0, %lo(D_802BEBB4)($v0)
diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
index 4443f20ccc..135205612a 100644
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
@@ -724,7 +724,7 @@ glabel func_802BD414_31E184
 /* 31EC50 802BDEE0 24040694 */  addiu     $a0, $zero, 0x694
 /* 31EC54 802BDEE4 0000282D */  daddu     $a1, $zero, $zero
 /* 31EC58 802BDEE8 2406FFFC */  addiu     $a2, $zero, -4
-/* 31EC5C 802BDEEC 0C052742 */  jal       play_sound_at_npc
+/* 31EC5C 802BDEEC 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31EC60 802BDEF0 AE020028 */   sw       $v0, 0x28($s0)
 /* 31EC64 802BDEF4 24020003 */  addiu     $v0, $zero, 3
 /* 31EC68 802BDEF8 3C01802C */  lui       $at, %hi(D_802BFEE4)
diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
index a6d4636d76..54498f5c37 100644
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
@@ -297,7 +297,7 @@ glabel L802BE77C_31F4EC
 /* 31F584 802BE814 0000102D */   daddu    $v0, $zero, $zero
 /* 31F588 802BE818 24042081 */  addiu     $a0, $zero, 0x2081
 /* 31F58C 802BE81C 0000282D */  daddu     $a1, $zero, $zero
-/* 31F590 802BE820 0C052742 */  jal       play_sound_at_npc
+/* 31F590 802BE820 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31F594 802BE824 2406FFFC */   addiu    $a2, $zero, -4
 /* 31F598 802BE828 3C040001 */  lui       $a0, 1
 /* 31F59C 802BE82C 0C037FBF */  jal       func_800DFEFC
@@ -464,7 +464,7 @@ glabel L802BE9E4_31F754
 /* 31F80C 802BEA9C AE420000 */   sw       $v0, ($s2)
 /* 31F810 802BEAA0 24042013 */  addiu     $a0, $zero, 0x2013
 /* 31F814 802BEAA4 0000282D */  daddu     $a1, $zero, $zero
-/* 31F818 802BEAA8 0C052742 */  jal       play_sound_at_npc
+/* 31F818 802BEAA8 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31F81C 802BEAAC 2406FFFC */   addiu    $a2, $zero, -4
 /* 31F820 802BEAB0 C6200038 */  lwc1      $f0, 0x38($s1)
 /* 31F824 802BEAB4 3C014040 */  lui       $at, 0x4040
@@ -545,7 +545,7 @@ glabel L802BEB18_31F888
 /* 31F944 802BEBD4 24042015 */  addiu     $a0, $zero, 0x2015
 .L802BEBD8:
 /* 31F948 802BEBD8 0000282D */  daddu     $a1, $zero, $zero
-/* 31F94C 802BEBDC 0C052742 */  jal       play_sound_at_npc
+/* 31F94C 802BEBDC 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31F950 802BEBE0 2406FFFC */   addiu    $a2, $zero, -4
 .L802BEBE4:
 /* 31F954 802BEBE4 3C01802C */  lui       $at, %hi(D_802BFEF8)
@@ -785,7 +785,7 @@ glabel L802BEB18_31F888
 /* 31FCD0 802BEF60 0000102D */   daddu    $v0, $zero, $zero
 /* 31FCD4 802BEF64 24040294 */  addiu     $a0, $zero, 0x294
 /* 31FCD8 802BEF68 0000282D */  daddu     $a1, $zero, $zero
-/* 31FCDC 802BEF6C 0C052742 */  jal       play_sound_at_npc
+/* 31FCDC 802BEF6C 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31FCE0 802BEF70 2406FFFC */   addiu    $a2, $zero, -4
 /* 31FCE4 802BEF74 080AFD3D */  j         .L802BF4F4
 /* 31FCE8 802BEF78 0000102D */   daddu    $v0, $zero, $zero
@@ -938,7 +938,7 @@ glabel L802BEB18_31F888
 /* 31FF30 802BF1C0 46022100 */  add.s     $f4, $f4, $f2
 /* 31FF34 802BF1C4 2406FFFC */  addiu     $a2, $zero, -4
 /* 31FF38 802BF1C8 E7A00030 */  swc1      $f0, 0x30($sp)
-/* 31FF3C 802BF1CC 0C052742 */  jal       play_sound_at_npc
+/* 31FF3C 802BF1CC 0C052742 */  jal       sfx_play_sound_at_npc
 /* 31FF40 802BF1D0 E624001C */   swc1     $f4, 0x1c($s1)
 /* 31FF44 802BF1D4 3C040001 */  lui       $a0, 1
 /* 31FF48 802BF1D8 0C037FBF */  jal       func_800DFEFC
diff --git a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s
index 8019873187..1338c4dc4f 100644
--- a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s
+++ b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s
@@ -132,7 +132,7 @@ glabel L800EA83C_83CEC
 .L800EA890:
 /* 83D40 800EA890 0C03805E */  jal       disable_player_input
 /* 83D44 800EA894 00000000 */   nop
-/* 83D48 800EA898 0C05272D */  jal       play_sound
+/* 83D48 800EA898 0C05272D */  jal       sfx_play_sound
 /* 83D4C 800EA89C 2404000D */   addiu    $a0, $zero, 0xd
 /* 83D50 800EA8A0 3C108011 */  lui       $s0, %hi(D_8010CFDC)
 /* 83D54 800EA8A4 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
@@ -177,7 +177,7 @@ glabel L800EA83C_83CEC
 /* 83DEC 800EA93C AC22CFD8 */  sw        $v0, %lo(D_8010CFD8)($at)
 /* 83DF0 800EA940 0C03A974 */  jal       load_partner_npc
 /* 83DF4 800EA944 A2620012 */   sb       $v0, 0x12($s3)
-/* 83DF8 800EA948 0C05272D */  jal       play_sound
+/* 83DF8 800EA948 0C05272D */  jal       sfx_play_sound
 /* 83DFC 800EA94C 2404000E */   addiu    $a0, $zero, 0xe
 /* 83E00 800EA950 3C028011 */  lui       $v0, %hi(wPartner)
 /* 83E04 800EA954 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
@@ -343,7 +343,7 @@ glabel L800EAB90_84040
 .L800EABB4:
 /* 84064 800EABB4 0C03805E */  jal       disable_player_input
 /* 84068 800EABB8 00000000 */   nop
-/* 8406C 800EABBC 0C05272D */  jal       play_sound
+/* 8406C 800EABBC 0C05272D */  jal       sfx_play_sound
 /* 84070 800EABC0 2404000D */   addiu    $a0, $zero, 0xd
 /* 84074 800EABC4 3C108011 */  lui       $s0, %hi(D_8010CFDC)
 /* 84078 800EABC8 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s b/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s
index ab3b55dccd..c1a046178b 100644
--- a/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s
+++ b/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s
@@ -22,7 +22,7 @@ glabel func_802822A8
 /* 7E316C 802822EC 44071000 */  mfc1      $a3, $f2
 /* 7E3170 802822F0 C7A00020 */  lwc1      $f0, 0x20($sp)
 /* 7E3174 802822F4 0000282D */  daddu     $a1, $zero, $zero
-/* 7E3178 802822F8 0C052757 */  jal       play_sound_at_position
+/* 7E3178 802822F8 0C052757 */  jal       sfx_play_sound_at_position
 /* 7E317C 802822FC E7A00010 */   swc1     $f0, 0x10($sp)
 /* 7E3180 80282300 8FBF002C */  lw        $ra, 0x2c($sp)
 /* 7E3184 80282304 8FB00028 */  lw        $s0, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s b/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s
index 93d5c3cd92..431801073f 100644
--- a/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s
+++ b/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s
@@ -25,7 +25,7 @@ glabel load_map_by_IDs
 /* 35B10 8005A710 AFB40048 */  sw        $s4, 0x48($sp)
 /* 35B14 8005A714 0000A02D */  daddu     $s4, $zero, $zero
 /* 35B18 8005A718 AFBF004C */  sw        $ra, 0x4c($sp)
-/* 35B1C 8005A71C 0C05260E */  jal       func_80149838
+/* 35B1C 8005A71C 0C05260E */  jal       sfx_stop_env_sounds
 /* 35B20 8005A720 AFB20040 */   sw       $s2, 0x40($sp)
 /* 35B24 8005A724 3C05800A */  lui       $a1, %hi(gOverrideFlags)
 /* 35B28 8005A728 24A5A650 */  addiu     $a1, $a1, %lo(gOverrideFlags)
@@ -254,7 +254,7 @@ glabel load_map_by_IDs
 /* 35E78 8005AA78 00822021 */  addu      $a0, $a0, $v0
 /* 35E7C 8005AA7C 0C0525FF */  jal       func_801497FC
 /* 35E80 8005AA80 8C84FF60 */   lw       $a0, %lo(D_8008FF60)($a0)
-/* 35E84 8005AA84 0C052580 */  jal       use_default_door_sounds
+/* 35E84 8005AA84 0C052580 */  jal       sfx_reset_door_sounds
 /* 35E88 8005AA88 00000000 */   nop
 /* 35E8C 8005AA8C 1680000B */  bnez      $s4, .L8005AABC
 /* 35E90 8005AA90 00000000 */   nop
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index e29792515f..f8a4c9eadc 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -1512,8 +1512,9 @@ segments:
     start: 0x415D90
     vram: 0x802A1000
     subsections:
-    - [0x415D90, c]
-    - [0x4200D0, bin]
+    - [0x415D90, c, code_415D90]
+    - [0x4200D0, .data, code_415D90]
+    - [0x420500, .rodata, code_415D90]
   - type: code
     start: 0x4219F0
     vram: 0x802A9000
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 9572d54c80..d5125eaeae 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -490,9 +490,9 @@ func_8004B328 = 0x8004B328; // type:func rom:0x26728
 alLink = 0x8004B3EC; // type:func rom:0x267EC
 alUnlink = 0x8004B40C; // type:func rom:0x2680C
 func_8004B440 = 0x8004B440; // type:func rom:0x26840
-func_8004B62C = 0x8004B62C; // type:func rom:0x26A2C
-func_8004B698 = 0x8004B698; // type:func rom:0x26A98
-func_8004B6D8 = 0x8004B6D8; // type:func rom:0x26AD8
+snd_load_sfx_groups_from_SEF = 0x8004B62C; // type:func rom:0x26A2C
+snd_clear_sfx_queue = 0x8004B698; // type:func rom:0x26A98
+snd_enqueue_sfx_event = 0x8004B6D8; // type:func rom:0x26AD8
 func_8004B748 = 0x8004B748; // type:func rom:0x26B48
 func_8004B9E4 = 0x8004B9E4; // type:func rom:0x26DE4
 func_8004BA54 = 0x8004BA54; // type:func rom:0x26E54
@@ -501,8 +501,8 @@ func_8004C0E4 = 0x8004C0E4; // type:func rom:0x274E4
 func_8004C268 = 0x8004C268; // type:func rom:0x27668
 func_8004C2A4 = 0x8004C2A4; // type:func rom:0x276A4
 func_8004C300 = 0x8004C300; // type:func rom:0x27700
-func_8004C358 = 0x8004C358; // type:func rom:0x27758
-func_8004C3D4 = 0x8004C3D4; // type:func rom:0x277D4
+snd_set_modifiers = 0x8004C358; // type:func rom:0x27758
+snd_set_player_modifiers = 0x8004C3D4; // type:func rom:0x277D4
 func_8004C444 = 0x8004C444; // type:func rom:0x27844
 func_8004C578 = 0x8004C578; // type:func rom:0x27978
 func_8004C844 = 0x8004C844; // type:func rom:0x27C44
@@ -538,7 +538,7 @@ func_8004D428 = 0x8004D428; // type:func rom:0x28828
 func_8004D484 = 0x8004D484; // type:func rom:0x28884
 func_8004D4BC = 0x8004D4BC; // type:func rom:0x288BC
 func_8004D510 = 0x8004D510; // type:func rom:0x28910
-func_8004D794 = 0x8004D794; // type:func rom:0x28B94
+snd_get_player_with_song_name = 0x8004D794; // type:func rom:0x28B94
 func_8004D7E0 = 0x8004D7E0; // type:func rom:0x28BE0
 func_8004DA0C = 0x8004DA0C; // type:func rom:0x28E0C
 func_8004DA74 = 0x8004DA74; // type:func rom:0x28E74
@@ -553,10 +553,10 @@ func_8004DFD4 = 0x8004DFD4; // type:func rom:0x293D4
 func_8004E0F4 = 0x8004E0F4; // type:func rom:0x294F4
 func_8004E158 = 0x8004E158; // type:func rom:0x29558
 func_8004E344 = 0x8004E344; // type:func rom:0x29744
-func_8004E3A4 = 0x8004E3A4; // type:func rom:0x297A4
+snd_update_bgm_fade = 0x8004E3A4; // type:func rom:0x297A4
 func_8004E444 = 0x8004E444; // type:func rom:0x29844
 func_8004E4B8 = 0x8004E4B8; // type:func rom:0x298B8
-func_8004E5D8 = 0x8004E5D8; // type:func rom:0x299D8
+snd_initialize_bgm_player = 0x8004E5D8; // type:func rom:0x299D8
 func_8004E844 = 0x8004E844; // type:func rom:0x29C44
 func_8004E880 = 0x8004E880; // type:func rom:0x29C80
 func_8004E904 = 0x8004E904; // type:func rom:0x29D04
@@ -564,35 +564,35 @@ func_8004EA34 = 0x8004EA34; // type:func rom:0x29E34
 func_8004EAD4 = 0x8004EAD4; // type:func rom:0x29ED4
 func_8004EC04 = 0x8004EC04; // type:func rom:0x2A004
 func_8004EC68 = 0x8004EC68; // type:func rom:0x2A068
-func_8004FBBC = 0x8004FBBC; // type:func rom:0x2AFBC
-func_8004FC08 = 0x8004FC08; // type:func rom:0x2B008
-func_8004FCB4 = 0x8004FCB4; // type:func rom:0x2B0B4
-func_8004FCE4 = 0x8004FCE4; // type:func rom:0x2B0E4
-func_8004FD04 = 0x8004FD04; // type:func rom:0x2B104
-func_8004FD38 = 0x8004FD38; // type:func rom:0x2B138
-func_8004FD94 = 0x8004FD94; // type:func rom:0x2B194
-func_8004FE10 = 0x8004FE10; // type:func rom:0x2B210
-func_8004FE6C = 0x8004FE6C; // type:func rom:0x2B26C
-func_8004FEB0 = 0x8004FEB0; // type:func rom:0x2B2B0
-func_8004FED0 = 0x8004FED0; // type:func rom:0x2B2D0
-func_8004FF3C = 0x8004FF3C; // type:func rom:0x2B33C
-func_8004FF58 = 0x8004FF58; // type:func rom:0x2B358
-func_8004FF70 = 0x8004FF70; // type:func rom:0x2B370
-func_8004FF88 = 0x8004FF88; // type:func rom:0x2B388
-func_8004FFA8 = 0x8004FFA8; // type:func rom:0x2B3A8
-func_8004FFB4 = 0x8004FFB4; // type:func rom:0x2B3B4
-func_8004FFC8 = 0x8004FFC8; // type:func rom:0x2B3C8
-func_8004FFE4 = 0x8004FFE4; // type:func rom:0x2B3E4
-func_8004FFF0 = 0x8004FFF0; // type:func rom:0x2B3F0
-func_8004FFFC = 0x8004FFFC; // type:func rom:0x2B3FC
-func_80050004 = 0x80050004; // type:func rom:0x2B404
-func_80050020 = 0x80050020; // type:func rom:0x2B420
-func_80050128 = 0x80050128; // type:func rom:0x2B528
-func_8005015C = 0x8005015C; // type:func rom:0x2B55C
-func_80050184 = 0x80050184; // type:func rom:0x2B584
-func_800501A8 = 0x800501A8; // type:func rom:0x2B5A8
-func_800502F0 = 0x800502F0; // type:func rom:0x2B6F0
-func_80050560 = 0x80050560; // type:func rom:0x2B960
+snd_BGMCmd_E0_MasterTempo = 0x8004FBBC; // type:func rom:0x2AFBC
+snd_bpm_to_tempo = 0x8004FC08; // type:func rom:0x2B008
+snd_BGMCmd_E1_MasterVolume = 0x8004FCB4; // type:func rom:0x2B0B4
+snd_BGMCmd_E2_MasterTranspose = 0x8004FCE4; // type:func rom:0x2B0E4
+snd_BGMCmd_E3 = 0x8004FD04; // type:func rom:0x2B104
+snd_BGMCmd_E6_MasterEffect = 0x8004FD38; // type:func rom:0x2B138
+snd_BGMCmd_E4_MasterTempoFade = 0x8004FD94; // type:func rom:0x2B194
+snd_BGMCmd_E5_MasterVolumeFade = 0x8004FE10; // type:func rom:0x2B210
+snd_BGMCmd_E8_TrackOverridePatch = 0x8004FE6C; // type:func rom:0x2B26C
+snd_BGMCmd_E9_SubTrackVolume = 0x8004FEB0; // type:func rom:0x2B2B0
+snd_BGMCmd_F6_TrackVolumeFade = 0x8004FED0; // type:func rom:0x2B2D0
+snd_BGMCmd_EA_SubTrackPan = 0x8004FF3C; // type:func rom:0x2B33C
+snd_BGMCmd_EB_SubTrackReverb = 0x8004FF58; // type:func rom:0x2B358
+snd_BGMCmd_EC_SegTrackVolume = 0x8004FF70; // type:func rom:0x2B370
+snd_BGMCmd_ED_SubTrackCoarseTune = 0x8004FF88; // type:func rom:0x2B388
+snd_BGMCmd_EE_SubTrackFineTune = 0x8004FFA8; // type:func rom:0x2B3A8
+snd_BGMCmd_EF_SegTrackTune = 0x8004FFB4; // type:func rom:0x2B3B4
+snd_BGMCmd_F0_TrackTremolo = 0x8004FFC8; // type:func rom:0x2B3C8
+snd_BGMCmd_F1_TrackTremoloSpeed = 0x8004FFE4; // type:func rom:0x2B3E4
+snd_BGMCmd_F2_TrackTremoloTime = 0x8004FFF0; // type:func rom:0x2B3F0
+snd_BGMCmd_F3_TrackTremoloStop = 0x8004FFFC; // type:func rom:0x2B3FC
+snd_BGMCmd_F4 = 0x80050004; // type:func rom:0x2B404
+snd_BGMCmd_F5_TrackVoice = 0x80050020; // type:func rom:0x2B420
+snd_BGMCmd_F7_SubTrackReverbType = 0x80050128; // type:func rom:0x2B528
+snd_BGMCmd_FD = 0x8005015C; // type:func rom:0x2B55C
+snd_BGMCmd_FE = 0x80050184; // type:func rom:0x2B584
+snd_BGMCmd_FC_Jump = 0x800501A8; // type:func rom:0x2B5A8
+snd_BGMCmd_FF = 0x800502F0; // type:func rom:0x2B6F0
+snd_BGMCmd_NOP = 0x80050560; // type:func rom:0x2B960
 func_80050568 = 0x80050568; // type:func rom:0x2B968
 func_800505E4 = 0x800505E4; // type:func rom:0x2B9E4
 func_80050654 = 0x80050654; // type:func rom:0x2BA54
@@ -634,17 +634,17 @@ func_80052BF8 = 0x80052BF8; // type:func rom:0x2DFF8
 func_80052CFC = 0x80052CFC; // type:func rom:0x2E0FC
 func_80052E18 = 0x80052E18; // type:func rom:0x2E218
 func_80052E30 = 0x80052E30; // type:func rom:0x2E230
-func_80052E5C = 0x80052E5C; // type:func rom:0x2E25C
-func_800532F4 = 0x800532F4; // type:func rom:0x2E6F4
+snd_load_audio_data = 0x80052E5C; // type:func rom:0x2E25C
+snd_reset_instrument = 0x800532F4; // type:func rom:0x2E6F4
 func_80053370 = 0x80053370; // type:func rom:0x2E770
 func_800533A8 = 0x800533A8; // type:func rom:0x2E7A8
-func_800533D0 = 0x800533D0; // type:func rom:0x2E7D0
+snd_update_sequence_players = 0x800533D0; // type:func rom:0x2E7D0
 func_800535C0 = 0x800535C0; // type:func rom:0x2E9C0
 func_80053654 = 0x80053654; // type:func rom:0x2EA54
 func_80053888 = 0x80053888; // type:func rom:0x2EC88
 func_800538C4 = 0x800538C4; // type:func rom:0x2ECC4
 func_800538F8 = 0x800538F8; // type:func rom:0x2ECF8
-func_80053974 = 0x80053974; // type:func rom:0x2ED74
+snd_initialize_fade = 0x80053974; // type:func rom:0x2ED74
 func_80053A18 = 0x80053A18; // type:func rom:0x2EE18
 func_80053A28 = 0x80053A28; // type:func rom:0x2EE28
 func_80053A98 = 0x80053A98; // type:func rom:0x2EE98
@@ -653,43 +653,43 @@ func_80053AEC = 0x80053AEC; // type:func rom:0x2EEEC
 func_80053B04 = 0x80053B04; // type:func rom:0x2EF04
 func_80053BA8 = 0x80053BA8; // type:func rom:0x2EFA8
 func_80053BE8 = 0x80053BE8; // type:func rom:0x2EFE8
-func_80053C58 = 0x80053C58; // type:func rom:0x2F058
-func_80053CB4 = 0x80053CB4; // type:func rom:0x2F0B4
-func_80053CF8 = 0x80053CF8; // type:func rom:0x2F0F8
+snd_get_sequence_player_and_track = 0x80053C58; // type:func rom:0x2F058
+snd_get_sequence_player = 0x80053CB4; // type:func rom:0x2F0B4
+snd_load_song_files = 0x80053CF8; // type:func rom:0x2F0F8
 func_80053E58 = 0x80053E58; // type:func rom:0x2F258
 func_80053F64 = 0x80053F64; // type:func rom:0x2F364
 func_80053F80 = 0x80053F80; // type:func rom:0x2F380
 func_80054248 = 0x80054248; // type:func rom:0x2F648
-al_LoadINIT = 0x800542BC; // type:func rom:0x2F6BC
-al_CopyFileTableEntry = 0x8005447C; // type:func rom:0x2F87C
-al_LoadPER = 0x800544F8; // type:func rom:0x2F8F8
-al_LoadPRG = 0x800545B4; // type:func rom:0x2F9B4
-func_8005465C = 0x8005465C; // type:func rom:0x2FA5C
-func_80054744 = 0x80054744; // type:func rom:0x2FB44
-al_LoadBank = 0x800547C8; // type:func rom:0x2FBC8
-func_800549F8 = 0x800549F8; // type:func rom:0x2FDF8
+snd_load_INIT = 0x800542BC; // type:func rom:0x2F6BC
+snd_fetch_SBN_file = 0x8005447C; // type:func rom:0x2F87C
+snd_load_PER = 0x800544F8; // type:func rom:0x2F8F8
+snd_load_PRG = 0x800545B4; // type:func rom:0x2F9B4
+snd_load_BGM = 0x8005465C; // type:func rom:0x2FA5C
+snd_get_BK_instruments = 0x80054744; // type:func rom:0x2FB44
+snd_load_BK_to_bank = 0x800547C8; // type:func rom:0x2FBC8
+snd_swizzle_BK_instruments = 0x800549F8; // type:func rom:0x2FDF8
 func_80054AA0 = 0x80054AA0; // type:func rom:0x2FEA0
-func_80054C4C = 0x80054C4C; // type:func rom:0x3004C
+snd_load_BK = 0x80054C4C; // type:func rom:0x3004C
 func_80054C84 = 0x80054C84; // type:func rom:0x30084
 func_80054CE0 = 0x80054CE0; // type:func rom:0x300E0
 func_80054D74 = 0x80054D74; // type:func rom:0x30174
 func_80054DA8 = 0x80054DA8; // type:func rom:0x301A8
-al_DmaCopy = 0x80054E00; // type:func rom:0x30200
-func_80054E90 = 0x80054E90; // type:func rom:0x30290
-func_80054F48 = 0x80054F48; // type:func rom:0x30348
-al_CopyWords = 0x80054F74; // type:func rom:0x30374
-al_LoadBKHeaders = 0x80054FC0; // type:func rom:0x303C0
+snd_read_rom = 0x80054E00; // type:func rom:0x30200
+snd_memset = 0x80054E90; // type:func rom:0x30290
+snd_bcopy = 0x80054F48; // type:func rom:0x30348
+snd_copy_words = 0x80054F74; // type:func rom:0x30374
+snd_load_BK_headers = 0x80054FC0; // type:func rom:0x303C0
 func_80055050 = 0x80055050; // type:func rom:0x30450
 func_80055068 = 0x80055068; // type:func rom:0x30468
 func_80055110 = 0x80055110; // type:func rom:0x30510
 func_8005513C = 0x8005513C; // type:func rom:0x3053C
-func_800551E0 = 0x800551E0; // type:func rom:0x305E0
-func_80055240 = 0x80055240; // type:func rom:0x30640
-func_800552D0 = 0x800552D0; // type:func rom:0x306D0
-func_80055330 = 0x80055330; // type:func rom:0x30730
-func_800553C0 = 0x800553C0; // type:func rom:0x307C0
+snd_start_sound = 0x800551E0; // type:func rom:0x305E0
+snd_start_sound_with_shift = 0x80055240; // type:func rom:0x30640
+snd_adjust_sound = 0x800552D0; // type:func rom:0x306D0
+snd_adjust_sound_with_shift = 0x80055330; // type:func rom:0x30730
+snd_stop_sound = 0x800553C0; // type:func rom:0x307C0
 func_800553F4 = 0x800553F4; // type:func rom:0x307F4
-func_80055408 = 0x80055408; // type:func rom:0x30808
+snd_start_sound_raw = 0x80055408; // type:func rom:0x30808
 func_80055448 = 0x80055448; // type:func rom:0x30848
 func_80055464 = 0x80055464; // type:func rom:0x30864
 func_800554A4 = 0x800554A4; // type:func rom:0x308A4
@@ -704,7 +704,7 @@ func_80055718 = 0x80055718; // type:func rom:0x30B18
 func_80055760 = 0x80055760; // type:func rom:0x30B60
 func_800557CC = 0x800557CC; // type:func rom:0x30BCC
 func_80055848 = 0x80055848; // type:func rom:0x30C48
-func_800558D4 = 0x800558D4; // type:func rom:0x30CD4
+snd_load_song = 0x800558D4; // type:func rom:0x30CD4
 func_8005591C = 0x8005591C; // type:func rom:0x30D1C
 func_80055970 = 0x80055970; // type:func rom:0x30D70
 func_800559C4 = 0x800559C4; // type:func rom:0x30DC4
@@ -784,7 +784,7 @@ func_80057EB0 = 0x80057EB0; // type:func rom:0x332B0
 func_80057ED0 = 0x80057ED0; // type:func rom:0x332D0
 alHeapInit = 0x80057F20; // type:func rom:0x33320
 alHeapAlloc = 0x80057F90; // type:func rom:0x33390
-func_80057FD8 = 0x80057FD8; // type:func rom:0x333D8
+alCopy = 0x80057FD8; // type:func rom:0x333D8
 func_80058004 = 0x80058004; // type:func rom:0x33404
 func_80058050 = 0x80058050; // type:func rom:0x33450
 func_80058B20 = 0x80058B20; // type:func rom:0x33F20
@@ -2257,51 +2257,51 @@ func_80148154 = 0x80148154; // type:func rom:0xDE854
 render_shaded_sprite = 0x801481C4; // type:func rom:0xDE8C4
 appendGfx_shaded_sprite = 0x801489B8; // type:func rom:0xDF0B8
 func_801491E4 = 0x801491E4; // type:func rom:0xDF8E4
-func_80149250 = 0x80149250; // type:func rom:0xDF950
-use_default_door_sounds = 0x80149600; // type:func rom:0xDFD00
-func_80149618 = 0x80149618; // type:func rom:0xDFD18
+sfx_compute_spatialized_sound_params_2 = 0x80149250; // type:func rom:0xDF950
+sfx_reset_door_sounds = 0x80149600; // type:func rom:0xDFD00
+sfx_clear_sounds = 0x80149618; // type:func rom:0xDFD18
 func_80149670 = 0x80149670; // type:func rom:0xDFD70
-func_80149734 = 0x80149734; // type:func rom:0xDFE34
+sfx_update_looping_sound_params = 0x80149734; // type:func rom:0xDFE34
 func_801497FC = 0x801497FC; // type:func rom:0xDFEFC
 func_80149828 = 0x80149828; // type:func rom:0xDFF28
-func_80149838 = 0x80149838; // type:func rom:0xDFF38
-func_801498C4 = 0x801498C4; // type:func rom:0xDFFC4
-func_80149908 = 0x80149908; // type:func rom:0xE0008
-func_80149974 = 0x80149974; // type:func rom:0xE0074
-func_801499EC = 0x801499EC; // type:func rom:0xE00EC
+sfx_stop_env_sounds = 0x80149838; // type:func rom:0xDFF38
+sfx_get_env_sound_instance = 0x801498C4; // type:func rom:0xDFFC4
+sfx_play_sound_looping = 0x80149908; // type:func rom:0xE0008
+sfx_register_looping_sound_at_position = 0x80149974; // type:func rom:0xE0074
+sfx_adjust_env_sound_pos = 0x801499EC; // type:func rom:0xE00EC
 func_80149A6C = 0x80149A6C; // type:func rom:0xE016C
-_play_sound = 0x80149AB8; // type:func rom:0xE01B8
-func_80149BE4 = 0x80149BE4; // type:func rom:0xE02E4
-stop_sound = 0x80149C6C; // type:func rom:0xE036C
-play_sound = 0x80149CB4; // type:func rom:0xE03B4
-play_sound_at_player = 0x80149CD8; // type:func rom:0xE03D8
-play_sound_at_npc = 0x80149D08; // type:func rom:0xE0408
-play_sound_at_position = 0x80149D5C; // type:func rom:0xE045C
-func_80149E04 = 0x80149E04; // type:func rom:0xE0504
-func_80149F58 = 0x80149F58; // type:func rom:0xE0658
-func_8014A1B4 = 0x8014A1B4; // type:func rom:0xE08B4
-get_song_variation_override_for_cur_map = 0x8014A430; // type:func rom:0xE0B30
-func_8014A498 = 0x8014A498; // type:func rom:0xE0B98
-func_8014A52C = 0x8014A52C; // type:func rom:0xE0C2C
-func_8014A548 = 0x8014A548; // type:func rom:0xE0C48
-_set_music_track = 0x8014A7E0; // type:func rom:0xE0EE0
-set_music_track = 0x8014A918; // type:func rom:0xE1018
+sfx_play_sound_with_params = 0x80149AB8; // type:func rom:0xE01B8
+sfx_adjust_env_sound_params = 0x80149BE4; // type:func rom:0xE02E4
+sfx_stop_sound = 0x80149C6C; // type:func rom:0xE036C
+sfx_play_sound = 0x80149CB4; // type:func rom:0xE03B4
+sfx_play_sound_at_player = 0x80149CD8; // type:func rom:0xE03D8
+sfx_play_sound_at_npc = 0x80149D08; // type:func rom:0xE0408
+sfx_play_sound_at_position = 0x80149D5C; // type:func rom:0xE045C
+sfx_get_spatialized_sound_params = 0x80149E04; // type:func rom:0xE0504
+sfx_compute_spatialized_sound_params_0 = 0x80149F58; // type:func rom:0xE0658
+sfx_compute_spatialized_sound_params_1 = 0x8014A1B4; // type:func rom:0xE08B4
+bgm_get_map_default_variation = 0x8014A430; // type:func rom:0xE0B30
+bgm_reset_sequence_players = 0x8014A498; // type:func rom:0xE0B98
+bgm_reset_volume = 0x8014A52C; // type:func rom:0xE0C2C
+bgm_update_music_settings = 0x8014A548; // type:func rom:0xE0C48
+_bgm_set_song = 0x8014A7E0; // type:func rom:0xE0EE0
+bgm_set_song = 0x8014A918; // type:func rom:0xE1018
 func_8014A964 = 0x8014A964; // type:func rom:0xE1064
 func_8014AA54 = 0x8014AA54; // type:func rom:0xE1154
 func_8014AB0C = 0x8014AB0C; // type:func rom:0xE120C
 func_8014AB60 = 0x8014AB60; // type:func rom:0xE1260
 func_8014ABB4 = 0x8014ABB4; // type:func rom:0xE12B4
-func_8014AC08 = 0x8014AC08; // type:func rom:0xE1308
-func_8014AC5C = 0x8014AC5C; // type:func rom:0xE135C
-func_8014AC70 = 0x8014AC70; // type:func rom:0xE1370
-transition_music_volume_to = 0x8014AC84; // type:func rom:0xE1384
-func_8014AC94 = 0x8014AC94; // type:func rom:0xE1394
+bgm_init_music_players = 0x8014AC08; // type:func rom:0xE1308
+bgm_quiet_max_volume = 0x8014AC5C; // type:func rom:0xE135C
+bgm_reset_max_volume = 0x8014AC70; // type:func rom:0xE1370
+bgm_set_target_volume = 0x8014AC84; // type:func rom:0xE1384
+bgm_update_volume = 0x8014AC94; // type:func rom:0xE1394
 func_8014AD40 = 0x8014AD40; // type:func rom:0xE1440
-func_8014ADA4 = 0x8014ADA4; // type:func rom:0xE14A4
-func_8014ADF8 = 0x8014ADF8; // type:func rom:0xE14F8
-func_8014AE6C = 0x8014AE6C; // type:func rom:0xE156C
-func_8014AEF8 = 0x8014AEF8; // type:func rom:0xE15F8
-func_8014AF8C = 0x8014AF8C; // type:func rom:0xE168C
+bgm_pop_song = 0x8014ADA4; // type:func rom:0xE14A4
+bgm_push_song = 0x8014ADF8; // type:func rom:0xE14F8
+bgm_pop_battle_song = 0x8014AE6C; // type:func rom:0xE156C
+bgm_push_battle_song = 0x8014AEF8; // type:func rom:0xE15F8
+bgm_set_battle_song = 0x8014AF8C; // type:func rom:0xE168C
 func_8014AFA0 = 0x8014AFA0; // type:func rom:0xE16A0
 gCloudyFlowerFieldsBg = 0x8014F120; // type:data rom:0xE5820
 gSunnyFlowerFieldsBg = 0x8014F128; // type:data rom:0xE5828
@@ -5294,6 +5294,41 @@ update_targeting_enemies = 0x802AA688; // type:func rom:0x41F418
 func_802AACD8 = 0x802AACD8; // type:func rom:0x41FA68
 func_802AB330 = 0x802AB330; // type:func rom:0x4200C0
 func_802AB338 = 0x802AB338; // type:func rom:0x4200C8
+D_802AB340 = 0x802AB340; // type:data rom:0x4200D0
+D_802AB344 = 0x802AB344; // type:data rom:0x4200D4
+battle_menu_iconScripts = 0x802AB348; // type:data rom:0x4200D8
+D_802AB368 = 0x802AB368; // type:data rom:0x4200F8
+D_802AB388 = 0x802AB388; // type:data rom:0x420118
+D_802AB390 = 0x802AB390; // type:data rom:0x420120
+D_802AB398 = 0x802AB398; // type:data rom:0x420128
+D_802AB3F8 = 0x802AB3F8; // type:data rom:0x420188
+D_802AB438 = 0x802AB438; // type:data rom:0x4201C8
+D_802AB478 = 0x802AB478; // type:data rom:0x420208
+D_802AB47C = 0x802AB47C; // type:data rom:0x42020C
+D_802AB480 = 0x802AB480; // type:data rom:0x420210
+D_802AB488 = 0x802AB488; // type:data rom:0x420218
+battle_menu_leftJustfiedMessages = 0x802AB490; // type:data rom:0x420220
+D_802AB4A4 = 0x802AB4A4; // type:data rom:0x420234
+D_802AB4B4 = 0x802AB4B4; // type:data rom:0x420244
+battle_menu_centeredMessages = 0x802AB4C0; // type:data rom:0x420250
+D_802AB4C8 = 0x802AB4C8; // type:data rom:0x420258
+D_802AB4DC = 0x802AB4DC; // type:data rom:0x42026C
+D_802AB4E0 = 0x802AB4E0; // type:data rom:0x420270
+D_802AB4F0 = 0x802AB4F0; // type:data rom:0x420280
+D_802AB520 = 0x802AB520; // type:data rom:0x4202B0
+D_802AB558 = 0x802AB558; // type:data rom:0x4202E8
+D_802AB590 = 0x802AB590; // type:data rom:0x420320
+D_802AB720 = 0x802AB720; // type:data rom:0x4204B0
+D_802AB728 = 0x802AB728; // type:data rom:0x4204B8
+D_802AB72C = 0x802AB72C; // type:data rom:0x4204BC
+D_802AB734 = 0x802AB734; // type:data rom:0x4204C4
+D_802AB738 = 0x802AB738; // type:data rom:0x4204C8
+D_802AB7F0 = 0x802AB7F0; // type:data rom:0x420580
+D_802AB7F8 = 0x802AB7F8; // type:data rom:0x420588
+D_802AB800 = 0x802AB800; // type:data rom:0x420590
+D_802AC090 = 0x802AC090; // type:data rom:0x420E20
+D_802AC880 = 0x802AC880; // type:data rom:0x421610
+D_802ACBE0 = 0x802ACBE0; // type:data rom:0x421970
 func_802A9000_4219F0 = 0x802A9000; // type:func rom:0x4219F0
 func_802A9120_421B10 = 0x802A9120; // type:func rom:0x421B10
 func_802A9234_421C24 = 0x802A9234; // type:func rom:0x421C24
@@ -17393,42 +17428,7 @@ D_802AA320 = 0x802AA320; // type:data
 D_802AA694 = 0x802AA694; // type:data
 D_802AAA08 = 0x802AAA08; // type:data
 D_802AAA30 = 0x802AAA30; // type:data
-D_802AB340 = 0x802AB340; // type:data
-D_802AB344 = 0x802AB344; // type:data
-battle_menu_iconScripts = 0x802AB348; // type:data
-D_802AB368 = 0x802AB368; // type:data
-D_802AB388 = 0x802AB388; // type:data
-D_802AB390 = 0x802AB390; // type:data
-D_802AB398 = 0x802AB398; // type:data
-D_802AB3F8 = 0x802AB3F8; // type:data
-D_802AB438 = 0x802AB438; // type:data
-D_802AB478 = 0x802AB478; // type:data
-D_802AB47C = 0x802AB47C; // type:data
-D_802AB480 = 0x802AB480; // type:data
-D_802AB488 = 0x802AB488; // type:data
-battle_menu_leftJustfiedMessages = 0x802AB490; // type:data
-D_802AB4A4 = 0x802AB4A4; // type:data
-D_802AB4B4 = 0x802AB4B4; // type:data
-battle_menu_centeredMessages = 0x802AB4C0; // type:data
-D_802AB4C8 = 0x802AB4C8; // type:data
-D_802AB4DC = 0x802AB4DC; // type:data
-D_802AB4E0 = 0x802AB4E0; // type:data
-D_802AB4F0 = 0x802AB4F0; // type:data
 D_802AB513 = 0x802AB513; // type:data
-D_802AB520 = 0x802AB520; // type:data
-D_802AB558 = 0x802AB558; // type:data
-D_802AB590 = 0x802AB590; // type:data
-D_802AB720 = 0x802AB720; // type:data
-D_802AB728 = 0x802AB728; // type:data
-D_802AB72C = 0x802AB72C; // type:data
-D_802AB734 = 0x802AB734; // type:data
-D_802AB738 = 0x802AB738; // type:data
-D_802AB7F0 = 0x802AB7F0; // type:data
-D_802AB7F8 = 0x802AB7F8; // type:data
-D_802AB800 = 0x802AB800; // type:data
-D_802AC090 = 0x802AC090; // type:data
-D_802AC880 = 0x802AC880; // type:data
-D_802ACBE0 = 0x802ACBE0; // type:data
 D_802ACC38 = 0x802ACC38; // type:data
 D_802ACC60 = 0x802ACC60; // type:data
 D_802ACC64 = 0x802ACC64; // type:data
diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt
index a0b8e058ec..cdea3817ee 100644
--- a/ver/us/undefined_syms_auto.txt
+++ b/ver/us/undefined_syms_auto.txt
@@ -2070,43 +2070,6 @@ D_802AA320 = 0x802AA320;
 D_802AA694 = 0x802AA694;
 D_802AAA08 = 0x802AAA08;
 D_802AAA30 = 0x802AAA30;
-D_802AB340 = 0x802AB340;
-D_802AB344 = 0x802AB344;
-battle_menu_iconScripts = 0x802AB348;
-D_802AB368 = 0x802AB368;
-D_802AB388 = 0x802AB388;
-D_802AB390 = 0x802AB390;
-D_802AB398 = 0x802AB398;
-D_802AB3F8 = 0x802AB3F8;
-D_802AB438 = 0x802AB438;
-D_802AB478 = 0x802AB478;
-D_802AB47C = 0x802AB47C;
-D_802AB480 = 0x802AB480;
-D_802AB488 = 0x802AB488;
-battle_menu_leftJustfiedMessages = 0x802AB490;
-D_802AB4A4 = 0x802AB4A4;
-D_802AB4B4 = 0x802AB4B4;
-battle_menu_centeredMessages = 0x802AB4C0;
-D_802AB4C8 = 0x802AB4C8;
-D_802AB4DC = 0x802AB4DC;
-D_802AB4E0 = 0x802AB4E0;
-D_802AB4F0 = 0x802AB4F0;
-D_802AB513 = 0x802AB513;
-D_802AB520 = 0x802AB520;
-D_802AB558 = 0x802AB558;
-D_802AB590 = 0x802AB590;
-D_802AB720 = 0x802AB720;
-D_802AB728 = 0x802AB728;
-D_802AB72C = 0x802AB72C;
-D_802AB734 = 0x802AB734;
-D_802AB738 = 0x802AB738;
-D_802AB7F0 = 0x802AB7F0;
-D_802AB7F8 = 0x802AB7F8;
-D_802AB800 = 0x802AB800;
-D_802AC090 = 0x802AC090;
-D_802AC880 = 0x802AC880;
-D_802ACBE0 = 0x802ACBE0;
-D_802ACC38 = 0x802ACC38;
 D_802ACC60 = 0x802ACC60;
 D_802ACC64 = 0x802ACC64;
 D_802ACC68 = 0x802ACC68;
@@ -3256,17 +3219,6 @@ D_E0126C30 = 0xE0126C30;
 D_E0126BC4 = 0xE0126BC4;
 D_E0126C38 = 0xE0126C38;
 D_E0126BC0 = 0xE0126BC0;
-jtbl_802AB770 = 0x802AB770;
-jtbl_802AB808 = 0x802AB808;
-jtbl_802AB8C0 = 0x802AB8C0;
-jtbl_802AB970 = 0x802AB970;
-jtbl_802AB9F0 = 0x802AB9F0;
-jtbl_802ABAA8 = 0x802ABAA8;
-jtbl_802ABB58 = 0x802ABB58;
-jtbl_802ABBD8 = 0x802ABBD8;
-jtbl_802AC3C8 = 0x802AC3C8;
-jtbl_802ACBB0 = 0x802ACBB0;
-jtbl_802ACC08 = 0x802ACC08;
 jtbl_802A9A90_422A90 = 0x802A9A90;
 jtbl_802A98E0_4233B0 = 0x802A98E0;
 jtbl_802A9840_423C30 = 0x802A9840;