From 9ff579dac825bf4afa7c9fb4ea3e5a1ffb2d996d Mon Sep 17 00:00:00 2001 From: Michael Panzlaff Date: Thu, 24 Jun 2021 15:55:08 +0200 Subject: cleanup header includes and orders Not complete, but a good start. --- arm9/lib/include/SND_work.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'arm9/lib/include/SND_work.h') diff --git a/arm9/lib/include/SND_work.h b/arm9/lib/include/SND_work.h index dec2bd71..a8a3d62b 100644 --- a/arm9/lib/include/SND_work.h +++ b/arm9/lib/include/SND_work.h @@ -4,31 +4,7 @@ #include "global.h" #include "SND_main.h" -#include "SND_alarm.h" - -#define SND_PLAYER_COUNT 16 -#define SND_CHANNEL_COUNT 16 -#define SND_TRACK_COUNT 32 - -struct SNDWork { - struct SNDExChannel channels[SND_CHANNEL_COUNT]; // 0x00 - struct SNDPlayer players[SND_PLAYER_COUNT]; // 0x540 - struct SNDTrack tracks[SND_TRACK_COUNT]; // 0x780 - struct SNDAlarm alarms[SND_ALARM_COUNT]; // 0xF80 -}; // size = 0x1180 - -struct SNDSharedWork { - u32 finishedCommandTag; // 0x0 - u32 playerStatus; // 0x4 - u16 channelStatus; // 0x8 - u16 captureStatus; // 0xA - u8 unk_C[0x14]; // 0xC - struct { - s16 localVars[16]; // local 0x0 - u32 tickCounter; // local 0x20 - } players[SND_PLAYER_COUNT]; // 0x20 - s16 globalVars[16]; // 0x260 -}; // size = 0x280 +#include "nitro/SND_work_shared.h" struct SNDDriverInfo { struct SNDWork work; // 0x0000 -- cgit v1.2.3