Merge struct audiohandle and struct sndstate

src/include/game/bondgun.h

@@ -136,7 +136,7 @@ void bgunTickMaulerCharge(void);
 void bgun0f0a6c30(void);
 s32 bgunAllocateFireslot(void);
 void bgun0f0a7138(Gfx **gdl);
-struct audiohandle **bgunAllocateAudioHandle(void);
+struct sndstate **bgunAllocateAudioHandle(void);
 void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum);
 void bgun0f0a8404(struct coord *pos, s16 *rooms, s32 arg2);
 void bgunPlayBgHitSound(struct gset *gset, struct coord *arg1, s32 texturenum, s16 *arg3);

src/include/game/game_092610.h

@@ -26,7 +26,7 @@ u32 func0f094940(void);
 u32 func0f094b1c(void);
 u32 func0f094d78(void);
 void func0f094ef4(struct coord *pos, s16 *rooms, s32 soundnum, s32 *arg3, s32 *arg4);
-void func0f09505c(struct audiohandle *handle, struct coord *pos, f32 arg2, f32 arg3, f32 arg4, s16 *rooms, s16 soundnum, u16 arg7, u32 arg8);
+void func0f09505c(struct sndstate *handle, struct coord *pos, f32 arg2, f32 arg3, f32 arg4, s16 *rooms, s16 soundnum, u16 arg7, u32 arg8);
 u32 func0f095200(void);
 s32 func0f095278(s32 channelnum);