slight refactor

include/def/audio_bank.h

@@ -42,3 +42,4 @@ void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId);
 void Audio_StopSfxByTokenAndId(u8, u16);
 void func_800F8884(u8, Vec3f*);
 void func_800F8F88(void);
+void Audio_StopAllBanks(void);

include/def/code_800C3C20.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void func_800C3C20(void);

include/def/code_800D31A0.h

@@ -1,7 +0,0 @@
-#pragma once
-
-extern u32 gIsCtrlr2Valid;
-
-void func_800D31A0(void);
-void func_800D31F0(void);
-void func_800D3210(void);

include/def/code_800FBCE0.h

@@ -1,4 +0,0 @@
-#pragma once
-
-void func_800FBCE0();
-void func_800FBFD8(void);

include/def/code_800FC620.h

@@ -1,4 +0,0 @@
-#pragma once
-
-s32 Overlay_Load(Pointer vRomStart, Pointer vRomEnd, Pointer vRamStart, Pointer vRamEnd, Pointer allocatedVRamAddress);
-void SystemHeap_Init(void* start, u32 size);

include/def/code_80106860.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void* z_memset(void* ptr, s32 val, size_t size);

include/def/code_801068B0.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void* func_801068B0(void* dst, void* src, size_t size);

include/functions.h

@@ -514,7 +514,7 @@ Gfx* THGA_AllocEnd64(TwoHeadGfxArena* thga);
 Gfx* THGA_AllocEndArray16(TwoHeadGfxArena* thga, u32 count);
 Gfx* THGA_AllocEnd16(TwoHeadGfxArena* thga);
 
-void func_800C3C20(void);
+void Audio_StopAllBanks(void);
 void func_800C3C80(AudioMgr* audioMgr);
 void AudioMgr_HandleRetrace(AudioMgr* audioMgr);
 void AudioMgr_HandlePRENMI(AudioMgr* audioMgr);

src/code/audio.cpp

@@ -11,14 +11,14 @@
 #include "def/audio_data.h"
 #include "def/audio_load.h"
 #include "def/audio_sound_params.h"
-#include "def/code_800E4FE0.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
-#include "def/code_800F9280.h"
+#include "def/audio_rsp.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
+#include "def/audio_command.h"
 #include "def/gettime.h"
 
 
-// TODO: can these macros be shared between files? code_800F9280 seems to use
+// TODO: can these macros be shared between files? audio_command seems to use
 // versions without any casts...
 #define Audio_DisableSeq(playerIdx, fadeOut) Audio_QueueCmdS32(0x83000000 | ((u8)playerIdx << 16), fadeOut)
 #define Audio_StartSeq(playerIdx, fadeTimer, seqId) \

src/code/audioMgr.cpp

@@ -8,8 +8,8 @@
 #include "regs.h"
 #include "z64game.h"
 #include "def/audioMgr.h"
-#include "def/code_800EC960.h"
-#include "def/code_800E4FE0.h"
+#include "def/audio.h"
+#include "def/audio_rsp.h"
 #include "def/audio_playback.h"
 
 static AudioMgr* g_audioMgr = NULL;

src/code/audio_bank.cpp

@@ -5,10 +5,10 @@
 #include "sequence.h"
 #include "vt.h"
 #include "def/audio_sound_params.h"
-#include "def/code_800E4FE0.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
-#include "def/code_800F9280.h"
+#include "def/audio_rsp.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
+#include "def/audio_command.h"
 
 typedef struct {
     /* 0x00 */ u16 sfxId;
@@ -36,7 +36,7 @@ char D_80133344[] = VT_COL(RED, WHITE) "<INAGAKI CHECK> dist over! flag:%04X ptr
 // file padding
 s32 D_8013338C = 0;
 
-// rodata for Audio_ProcessSeqCmd (code_800F9280.c)
+// rodata for Audio_ProcessSeqCmd (audio_command.c)
 char D_80133390[] = "SEQ H";
 char D_80133398[] = "    L";
 
@@ -55,6 +55,21 @@ static u8 sSoundBankUnused[7];
 static u8 sCurSfxPlayerChannelIdx;
 static UnusedBankLerp sUnusedBankLerp[7];
 
+u8 D_8012D200[] = {
+    0, 1, 2, 3, 4, 5, 6,
+};
+
+void Audio_StopAllBanks(void)
+{
+	s32 i;
+
+	for(i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFF; i++)
+	{
+		Audio_StopSfxByBank(D_8012D200[i]);
+	}
+}
+
+
 ActiveSound gActiveSounds[7][MAX_CHANNELS_PER_BANK]; // total size = 0xA8
 u8 gSoundBankMuted[0x100];
 u16 gAudioSfxSwapSource[10];

src/code/audio_command.cpp

@@ -4,10 +4,10 @@
 #include "z64audio.h"
 #include "sequence.h"
 #include "ultra64/abi.h"
-#include "def/code_800E4FE0.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
-#include "def/code_800F9280.h"
+#include "def/audio_rsp.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
+#include "def/audio_command.h"
 
 u8 sSeqCmdWrPos = 0;
 u8 sSeqCmdRdPos = 0;
@@ -17,7 +17,7 @@ u8 D_80133410[] = {0, 1, 2, 3};
 u8 gAudioSpecId = 0;
 u8 D_80133418	= 0;
 
-// TODO: clean up these macros. They are similar to ones in code_800EC960.c but without casts.
+// TODO: clean up these macros. They are similar to ones in audio.c but without casts.
 #define Audio_StartSeq(playerIdx, fadeTimer, seqId) \
     Audio_QueueSeqCmd(0x00000000 | ((playerIdx) << 24) | ((fadeTimer) << 16) | (seqId))
 #define Audio_SeqCmdA(playerIdx, a) Audio_QueueSeqCmd(0xA0000000 | ((playerIdx) << 24) | (a))

src/code/audio_effects.cpp

@@ -5,7 +5,7 @@
 #include "def/audio_data.h"
 #include "def/audio_effects.h"
 #include "def/audio_seqplayer.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 
 void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 b) {
     f32 channelVolume;

src/code/audio_heap.cpp

@@ -9,7 +9,7 @@
 #include "def/audio_playback.h"
 #include "def/audio_seqplayer.h"
 #include "def/code_800E6840.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/initialize.h"
 
 void AudioHeap_InitSampleCaches(u32 persistentSize, u32 temporarySize);

src/code/audio_load.cpp

@@ -13,9 +13,9 @@
 #include "def/audio_playback.h"
 #include "def/audio_seqplayer.h"
 #include "def/cartrominit.h"
-#include "def/code_800E4FE0.h"
+#include "def/audio_rsp.h"
 #include "def/code_800E6840.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/createmesgqueue.h"
 #include "def/heaps.h"
 #include "def/recvmesg.h"

src/code/audio_playback.cpp

@@ -7,7 +7,7 @@
 #include "def/audio_load.h"
 #include "def/audio_playback.h"
 #include "def/audio_seqplayer.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 
 void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
     f32 volRight, volLeft;

src/code/audio_rsp.cpp

@@ -1,8 +1,10 @@
 #define INTERNAL_SRC_CODE_CODE_800E4FE0_C
 #include "global.h"
 #include "rsp.h"
+#include <string.h>
 #include "z64audio.h"
 #include "ultra64/abi.h"
+#include "ultra64/mbi.h"
 #include "def/aigetlen.h"
 #include "def/aisetnextbuf.h"
 #include "def/audio_data.h"
@@ -11,13 +13,34 @@
 #include "def/audio_playback.h"
 #include "def/audio_seqplayer.h"
 #include "def/audio_synthesis.h"
-#include "def/code_800E4FE0.h"
-#include "def/code_800F7260.h"
+#include "def/audio_rsp.h"
+#include "def/audio_bank.h"
 #include "def/createmesgqueue.h"
 #include "def/recvmesg.h"
 
 #include "redef_msgqueue.h"
 
+static const int16_t RESAMPLE_LUT[64 * 4] = {
+    (int16_t)0x0c39, (int16_t)0x66ad, (int16_t)0x0d46, (int16_t)0xffdf, (int16_t)0x0b39, (int16_t)0x6696, (int16_t)0x0e5f, (int16_t)0xffd8, (int16_t)0x0a44, (int16_t)0x6669, (int16_t)0x0f83, (int16_t)0xffd0, (int16_t)0x095a, (int16_t)0x6626,
+    (int16_t)0x10b4, (int16_t)0xffc8, (int16_t)0x087d, (int16_t)0x65cd, (int16_t)0x11f0, (int16_t)0xffbf, (int16_t)0x07ab, (int16_t)0x655e, (int16_t)0x1338, (int16_t)0xffb6, (int16_t)0x06e4, (int16_t)0x64d9, (int16_t)0x148c, (int16_t)0xffac,
+    (int16_t)0x0628, (int16_t)0x643f, (int16_t)0x15eb, (int16_t)0xffa1, (int16_t)0x0577, (int16_t)0x638f, (int16_t)0x1756, (int16_t)0xff96, (int16_t)0x04d1, (int16_t)0x62cb, (int16_t)0x18cb, (int16_t)0xff8a, (int16_t)0x0435, (int16_t)0x61f3,
+    (int16_t)0x1a4c, (int16_t)0xff7e, (int16_t)0x03a4, (int16_t)0x6106, (int16_t)0x1bd7, (int16_t)0xff71, (int16_t)0x031c, (int16_t)0x6007, (int16_t)0x1d6c, (int16_t)0xff64, (int16_t)0x029f, (int16_t)0x5ef5, (int16_t)0x1f0b, (int16_t)0xff56,
+    (int16_t)0x022a, (int16_t)0x5dd0, (int16_t)0x20b3, (int16_t)0xff48, (int16_t)0x01be, (int16_t)0x5c9a, (int16_t)0x2264, (int16_t)0xff3a, (int16_t)0x015b, (int16_t)0x5b53, (int16_t)0x241e, (int16_t)0xff2c, (int16_t)0x0101, (int16_t)0x59fc,
+    (int16_t)0x25e0, (int16_t)0xff1e, (int16_t)0x00ae, (int16_t)0x5896, (int16_t)0x27a9, (int16_t)0xff10, (int16_t)0x0063, (int16_t)0x5720, (int16_t)0x297a, (int16_t)0xff02, (int16_t)0x001f, (int16_t)0x559d, (int16_t)0x2b50, (int16_t)0xfef4,
+    (int16_t)0xffe2, (int16_t)0x540d, (int16_t)0x2d2c, (int16_t)0xfee8, (int16_t)0xffac, (int16_t)0x5270, (int16_t)0x2f0d, (int16_t)0xfedb, (int16_t)0xff7c, (int16_t)0x50c7, (int16_t)0x30f3, (int16_t)0xfed0, (int16_t)0xff53, (int16_t)0x4f14,
+    (int16_t)0x32dc, (int16_t)0xfec6, (int16_t)0xff2e, (int16_t)0x4d57, (int16_t)0x34c8, (int16_t)0xfebd, (int16_t)0xff0f, (int16_t)0x4b91, (int16_t)0x36b6, (int16_t)0xfeb6, (int16_t)0xfef5, (int16_t)0x49c2, (int16_t)0x38a5, (int16_t)0xfeb0,
+    (int16_t)0xfedf, (int16_t)0x47ed, (int16_t)0x3a95, (int16_t)0xfeac, (int16_t)0xfece, (int16_t)0x4611, (int16_t)0x3c85, (int16_t)0xfeab, (int16_t)0xfec0, (int16_t)0x4430, (int16_t)0x3e74, (int16_t)0xfeac, (int16_t)0xfeb6, (int16_t)0x424a,
+    (int16_t)0x4060, (int16_t)0xfeaf, (int16_t)0xfeaf, (int16_t)0x4060, (int16_t)0x424a, (int16_t)0xfeb6, (int16_t)0xfeac, (int16_t)0x3e74, (int16_t)0x4430, (int16_t)0xfec0, (int16_t)0xfeab, (int16_t)0x3c85, (int16_t)0x4611, (int16_t)0xfece,
+    (int16_t)0xfeac, (int16_t)0x3a95, (int16_t)0x47ed, (int16_t)0xfedf, (int16_t)0xfeb0, (int16_t)0x38a5, (int16_t)0x49c2, (int16_t)0xfef5, (int16_t)0xfeb6, (int16_t)0x36b6, (int16_t)0x4b91, (int16_t)0xff0f, (int16_t)0xfebd, (int16_t)0x34c8,
+    (int16_t)0x4d57, (int16_t)0xff2e, (int16_t)0xfec6, (int16_t)0x32dc, (int16_t)0x4f14, (int16_t)0xff53, (int16_t)0xfed0, (int16_t)0x30f3, (int16_t)0x50c7, (int16_t)0xff7c, (int16_t)0xfedb, (int16_t)0x2f0d, (int16_t)0x5270, (int16_t)0xffac,
+    (int16_t)0xfee8, (int16_t)0x2d2c, (int16_t)0x540d, (int16_t)0xffe2, (int16_t)0xfef4, (int16_t)0x2b50, (int16_t)0x559d, (int16_t)0x001f, (int16_t)0xff02, (int16_t)0x297a, (int16_t)0x5720, (int16_t)0x0063, (int16_t)0xff10, (int16_t)0x27a9,
+    (int16_t)0x5896, (int16_t)0x00ae, (int16_t)0xff1e, (int16_t)0x25e0, (int16_t)0x59fc, (int16_t)0x0101, (int16_t)0xff2c, (int16_t)0x241e, (int16_t)0x5b53, (int16_t)0x015b, (int16_t)0xff3a, (int16_t)0x2264, (int16_t)0x5c9a, (int16_t)0x01be,
+    (int16_t)0xff48, (int16_t)0x20b3, (int16_t)0x5dd0, (int16_t)0x022a, (int16_t)0xff56, (int16_t)0x1f0b, (int16_t)0x5ef5, (int16_t)0x029f, (int16_t)0xff64, (int16_t)0x1d6c, (int16_t)0x6007, (int16_t)0x031c, (int16_t)0xff71, (int16_t)0x1bd7,
+    (int16_t)0x6106, (int16_t)0x03a4, (int16_t)0xff7e, (int16_t)0x1a4c, (int16_t)0x61f3, (int16_t)0x0435, (int16_t)0xff8a, (int16_t)0x18cb, (int16_t)0x62cb, (int16_t)0x04d1, (int16_t)0xff96, (int16_t)0x1756, (int16_t)0x638f, (int16_t)0x0577,
+    (int16_t)0xffa1, (int16_t)0x15eb, (int16_t)0x643f, (int16_t)0x0628, (int16_t)0xffac, (int16_t)0x148c, (int16_t)0x64d9, (int16_t)0x06e4, (int16_t)0xffb6, (int16_t)0x1338, (int16_t)0x655e, (int16_t)0x07ab, (int16_t)0xffbf, (int16_t)0x11f0,
+    (int16_t)0x65cd, (int16_t)0x087d, (int16_t)0xffc8, (int16_t)0x10b4, (int16_t)0x6626, (int16_t)0x095a, (int16_t)0xffd0, (int16_t)0x0f83, (int16_t)0x6669, (int16_t)0x0a44, (int16_t)0xffd8, (int16_t)0x0e5f, (int16_t)0x6696, (int16_t)0x0b39,
+    (int16_t)0xffdf, (int16_t)0x0d46, (int16_t)0x66ad, (int16_t)0x0c39};
+
 u32 osGetCount(void);
 
 #define SAMPLES_TO_OVERPRODUCE 0x10
@@ -57,6 +80,286 @@ AudioTask* func_800E4FE0(void) {
 
 extern u64 rspAspMainDataStart[0x5C];
 
+static inline int16_t clamp_s16(int32_t v)
+{
+	return v < -32768 ? -32768 : v > 32767 ? 32767 : v;
+}
+
+static inline int16_t sample_mix(int16_t dst, int16_t src, int16_t gain)
+{
+	int32_t src_modified = (src * gain) >> 15;
+	return clamp_s16(dst + src_modified);
+}
+
+static const u32 MAX_MEMORY_SIZE = 0xFFFF;
+static u8 m_memory[MAX_MEMORY_SIZE];
+
+class AudioRsp
+{
+	typedef void (AudioRsp::*AbiHandler)(const Acmd& cmds);
+	public:
+
+	constexpr AudioRsp()
+	{
+	}
+
+	void execute(Acmd* cmds, size_t len)
+	{
+		for(size_t i = 0; i < len; i++)
+		{
+			const auto& cmd = cmds[i];
+			u8 op		= _SHIFTR(cmd.words.w0, 24, 8);
+
+			if(op >= sizeof(m_abiHandlers))
+			{
+				break;
+			}
+
+			(*this.*m_abiHandlers[op])(cmd);
+		}
+	}
+
+	protected:
+	void cmd_SPNOOP(const Acmd& cmd)
+	{
+	}
+
+	void cmd_ADPCM(const Acmd& cmd)
+	{
+		return;
+	}
+
+	void cmd_CLEARBUFF(const Acmd& cmd)
+	{
+		DMem addr = _SHIFTR(cmd.words.w0, 0, 16);
+		u16 count = _SHIFTR(cmd.words.w1, 0, 16);
+
+        memset(addr, 0, count);
+		return;
+	}
+
+	void cmd_UNK3(const Acmd& cmd)
+	{
+	}
+
+	void cmd_ADDMIXER(const Acmd& cmd)
+	{
+	}
+
+	void cmd_RESAMPLE(const Acmd& cmd)
+	{
+		u8 flags		   = _SHIFTR(cmd.words.w0, 16, 8);
+		uintptr_t s		   = cmd.words.w1;
+		u16 p			   = _SHIFTR(cmd.words.w0, 0, 16);
+		/*_a->words.w0		   = (_SHIFTL(A_RESAMPLE, 24, 8) | _SHIFTL(f, 16, 8) | _SHIFTL(p, 0, 16));
+		_a->words.w1		   = (uintptr_t)(s);
+
+		int16_t* dst		   = (int16_t*)(alist_buffer + alist_audio.out);
+		int16_t* src		   = (int16_t*)(alist_buffer + alist_audio.in);
+		size_t count		   = alist_audio.count >> 1;
+		uint32_t pitch_accumulator = 0;
+
+		count = align(count, 8);
+
+		src -= 4;
+
+		if(flags & A_INIT)
+		{
+			memset(src, 0, 4 * sizeof(int16_t));
+		}
+		else
+		{
+			memcpy(src, state_addr, 4 * sizeof(int16_t));
+			pitch_accumulator = state_addr[4];
+		}
+
+		while(count != 0)
+		{
+			const int16_t* lut = RESAMPLE_LUT + ((pitch_accumulator & 0xfc00) >> 8);
+
+			*dst++ = clamp_s16((src[0] * lut[0] + src[1] * lut[1] + src[2] * lut[2] + src[3] * lut[3]) >> 15);
+			pitch_accumulator += (pitch << 1);
+			src += pitch_accumulator >> 16;
+			pitch_accumulator &= 0xffff;
+			--count;
+		}
+
+		memcpy(state_addr, src, 4 * sizeof(int16_t));
+		state_addr[4] = pitch_accumulator;*/
+		return;
+	}
+
+	void cmd_RESAMPLE_ZOH(const Acmd& cmd)
+	{
+	}
+
+	void cmd_FILTER(const Acmd& cmd)
+	{
+	}
+
+	void cmd_SETBUFF(const Acmd& cmd)
+	{
+		return;
+	}
+
+	void cmd_DUPLICATE(const Acmd& cmd)
+	{
+		return;
+	}
+
+	void cmd_DMEMMOVE(const Acmd& cmd)
+	{
+		return;
+	}
+
+	void cmd_LOADADPCM(const Acmd& cmd)
+	{
+		return;
+	}
+
+	void cmd_MIXER(const Acmd& cmd)
+	{
+		u16 count = _SHIFTR(cmd.words.w0, 16, 8);
+		s16 gain = _SHIFTR(cmd.words.w0, 0, 16);
+		DMem _src  = _SHIFTR(cmd.words.w1, 16, 16);
+		DMem _dest = _SHIFTR(cmd.words.w1, 0, 16);
+
+
+		int16_t* dst	   = (int16_t*)_dest.buffer();
+		const int16_t* src = (const int16_t*)_src.buffer();
+
+		while(count != 0)
+		{
+			*dst = sample_mix(*dst, *src, gain);
+			++dst;
+			++src;
+			--count;
+		}
+		return;
+	}
+
+	void cmd_INTERLEAVE(const Acmd& cmd)
+	{
+		u16 count = _SHIFTR(cmd.words.w0, 16, 8) << 4;
+		DMem dest  = _SHIFTR(cmd.words.w0, 0, 16);
+		DMem L  = _SHIFTR(cmd.words.w1, 16, 16);
+		DMem R	  = _SHIFTR(cmd.words.w1, 0, 16);
+
+        int16_t* dst  = (int16_t*)dest.buffer();
+		int16_t* srcL = (int16_t*)L.buffer();
+		int16_t* srcR = (int16_t*)R.buffer();
+
+		// Unroll a bit
+		while(count != 0)
+		{
+			int16_t l1 = *srcL++;
+			int16_t l2 = *srcL++;
+			int16_t r1 = *srcR++;
+			int16_t r2 = *srcR++;
+
+			*dst++ = l1;
+			*dst++ = r1;
+			*dst++ = l2;
+			*dst++ = r2;
+
+			--count;
+		}
+
+		return;
+	}
+
+	void cmd_HILOGAIN(const Acmd& cmd)
+	{
+	}
+
+	void cmd_SETLOOP(const Acmd& cmd)
+	{
+	}
+
+	void cmd_UNK16(const Acmd& cmd)
+	{
+	}
+
+	void cmd_INTERL(const Acmd& cmd)
+	{
+	}
+
+	void cmd_ENVSETUP1(const Acmd& cmd)
+	{
+	}
+
+	void cmd_ENVMIXER(const Acmd& cmd)
+	{
+	}
+
+	void cmd_LOADBUFF(const Acmd& cmd)
+	{
+		auto addr = (void*)cmd.words.w1;
+		size_t len       = _SHIFTR(cmd.words.w0, 16, 8) << 4;
+		DMem arg2   = _SHIFTR(cmd.words.w0, 0, 16);
+		memcpy(addr, arg2, len);
+
+		return;
+	}
+
+	void cmd_SAVEBUFF(const Acmd& cmd)
+	{
+		size_t len = _SHIFTR(cmd.words.w0, 16, 8) << 4;
+		auto addr = (void*)cmd.words.w1;
+		DMem arg2       = _SHIFTR(cmd.words.w0, 0, 16);
+		memcpy(arg2, addr, len);
+		return;
+	}
+
+	void cmd_ENVSETUP2(const Acmd& cmd)
+	{
+	}
+
+	void cmd_UNK17(const Acmd& cmd)
+	{
+	}
+
+    AbiHandler m_abiHandlers[24] = {&AudioRsp::cmd_SPNOOP,   &AudioRsp::cmd_ADPCM,     &AudioRsp::cmd_CLEARBUFF, &AudioRsp::cmd_UNK3,	  &AudioRsp::cmd_ADDMIXER,  &AudioRsp::cmd_RESAMPLE,
+				       &AudioRsp::cmd_RESAMPLE_ZOH, &AudioRsp::cmd_FILTER,   &AudioRsp::cmd_SETBUFF,   &AudioRsp::cmd_DUPLICATE, &AudioRsp::cmd_DMEMMOVE, &AudioRsp::cmd_LOADADPCM, &AudioRsp::cmd_MIXER,
+				       &AudioRsp::cmd_INTERLEAVE,   &AudioRsp::cmd_HILOGAIN, &AudioRsp::cmd_SETLOOP,   &AudioRsp::cmd_UNK16,	 &AudioRsp::cmd_INTERL,	  &AudioRsp::cmd_ENVSETUP1, &AudioRsp::cmd_ENVMIXER,
+				       &AudioRsp::cmd_LOADBUFF,	    &AudioRsp::cmd_SAVEBUFF, &AudioRsp::cmd_ENVSETUP2, &AudioRsp::cmd_UNK17};
+
+ 
+    class DMem
+    {
+	    public:
+	    DMem(u16 addr)
+	    {
+		    m_address = (uintptr_t)m_memory + addr;
+	    }
+
+        void* buffer()
+	    {
+		return (void*)m_address;
+	    }
+
+        operator uintptr_t()
+	    {
+		return m_address;
+	    }
+
+        operator u8*()
+	    {
+		    return (u8*)m_address;
+	    }
+
+        /*operator int16_t*()
+	    {
+		    return (int16_t*)m_address;
+	    }*/
+
+	    protected:
+	    uintptr_t m_address;
+    };
+};
+
+static AudioRsp rsp;
+
 AudioTask* func_800E5000(void) {
     static s32 sMaxAbiCmdCnt = 0x80;
     static AudioTask* sWaitingAudioTask = NULL;
@@ -209,6 +512,8 @@ AudioTask* func_800E5000(void) {
     task->yield_data_ptr = NULL;
     task->yield_data_size = 0;
 
+    rsp.execute(gAudioContext.abiCmdBufs[index], abiCmdCnt);
+
     if (sMaxAbiCmdCnt < abiCmdCnt) {
         sMaxAbiCmdCnt = abiCmdCnt;
     }

src/code/audio_seqplayer.cpp

@@ -8,8 +8,8 @@
 #include "def/audio_load.h"
 #include "def/audio_playback.h"
 #include "def/audio_seqplayer.h"
-#include "def/code_800E4FE0.h"
-#include "def/code_800F7260.h"
+#include "def/audio_rsp.h"
+#include "def/audio_bank.h"
 
 #define PORTAMENTO_IS_SPECIAL(x) ((x).mode & 0x80)
 #define PORTAMENTO_MODE(x) ((x).mode & ~0x80)

src/code/audio_synthesis.cpp

@@ -8,7 +8,7 @@
 #include "def/audio_seqplayer.h"
 #include "def/audio_synthesis.h"
 #include "def/code_800E6840.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 
 #define DEFAULT_LEN_1CH 0x1A0
 #define DEFAULT_LEN_2CH 0x340

src/code/code_8006BA00.cpp

@@ -2,7 +2,7 @@
 #include "global.h"
 #include "z64global.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/z_skin_matrix.h"
 
 void func_8006BA00(GlobalContext* globalCtx) {

src/code/code_800C3C20.cpp

@@ -1,18 +0,0 @@
-#define INTERNAL_SRC_CODE_CODE_800C3C20_C
-#include "global.h"
-#include "z64math.h"
-#include "z64audio.h"
-#include "def/code_800C3C20.h"
-#include "def/code_800F7260.h"
-
-u8 D_8012D200[] = {
-    0, 1, 2, 3, 4, 5, 6,
-};
-
-void func_800C3C20(void) {
-    s32 i;
-
-    for (i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFF; i++) {
-        Audio_StopSfxByBank(D_8012D200[i]);
-    }
-}

src/code/code_800D31A0.cpp

@@ -1,23 +0,0 @@
-#define INTERNAL_SRC_CODE_CODE_800D31A0_C
-#include "global.h"
-#include "vt.h"
-#include "padmgr.h"
-#include "def/code_800D31A0.h"
-#include "def/sleep.h"
-
-u32 gIsCtrlr2Valid = false;
-
-void func_800D31A0(void) {
-    osSyncPrintf(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST);
-    while (true) {
-        Sleep_Msec(1000);
-    }
-}
-
-void func_800D31F0(void) {
-    gIsCtrlr2Valid = (gPadMgr.validCtrlrsMask & 2) != 0;
-}
-
-void func_800D3210(void) {
-    gIsCtrlr2Valid = false;
-}

src/code/code_800FBCE0.cpp

@@ -1,60 +0,0 @@
-#define INTERNAL_SRC_CODE_CODE_800FBCE0_C
-#include "global.h"
-#include "ultra64/rdp.h"
-#include "ultra64/rsp.h"
-#include "def/code_800FBCE0.h"
-#include "def/dpgetstat.h"
-#include "def/dpsetstat.h"
-#include "def/spgetstat.h"
-#include "def/spsetstat.h"
-
-#define printSpStatus(x, name) \
-    if (x & SP_STATUS_##name)  \
-    osSyncPrintf(#name " ")
-#define printDpStatus(x, name) \
-    if (x & DPC_STATUS_##name) \
-    osSyncPrintf(#name " ")
-
-void func_800FBCE0() {
-    u32 spStatus = 0; // __osSpGetStatus();
-    u32 dpStatus = 0; // osDpGetStatus();
-
-    osSyncPrintf("osSpGetStatus=%08x: ", spStatus);
-    printSpStatus(spStatus, HALT);
-    printSpStatus(spStatus, BROKE);
-    printSpStatus(spStatus, DMA_BUSY);
-    printSpStatus(spStatus, DMA_FULL);
-    printSpStatus(spStatus, IO_FULL);
-    printSpStatus(spStatus, SSTEP);
-    printSpStatus(spStatus, INTR_BREAK);
-    printSpStatus(spStatus, YIELD);
-    printSpStatus(spStatus, YIELDED);
-    printSpStatus(spStatus, TASKDONE);
-    printSpStatus(spStatus, SIG3);
-    printSpStatus(spStatus, SIG4);
-    printSpStatus(spStatus, SIG5);
-    printSpStatus(spStatus, SIG6);
-    printSpStatus(spStatus, SIG7);
-    osSyncPrintf("\n");
-
-    osSyncPrintf("osDpGetStatus=%08x:", dpStatus);
-    printDpStatus(dpStatus, XBUS_DMEM_DMA);
-    printDpStatus(dpStatus, FREEZE);
-    printDpStatus(dpStatus, FLUSH);
-    printDpStatus(dpStatus, START_GCLK);
-    printDpStatus(dpStatus, TMEM_BUSY);
-    printDpStatus(dpStatus, PIPE_BUSY);
-    printDpStatus(dpStatus, CMD_BUSY);
-    printDpStatus(dpStatus, CBUF_READY);
-    printDpStatus(dpStatus, DMA_BUSY);
-    printDpStatus(dpStatus, END_VALID);
-    printDpStatus(dpStatus, START_VALID);
-    osSyncPrintf("\n");
-}
-
-void func_800FBFD8() {
-    func_800FBCE0();
-    //osDpSetStatus(DPC_SET_FREEZE | DPC_SET_FLUSH);
-    //__osSpSetStatus(SP_SET_HALT | SP_SET_SIG2 | SP_CLR_INTR_BREAK);
-    func_800FBCE0();
-}

src/code/code_800FC620.cpp

@@ -1,139 +0,0 @@
-#define INTERNAL_SRC_CODE_CODE_800FC620_C
-#include "global.h"
-#include "z64scene.h"
-#include "def/__osMalloc.h"
-#include "def/code_800FC620.h"
-#include "def/system_malloc.h"
-
-typedef void (*arg3_800FC868)(void*);
-typedef void (*arg3_800FC8D8)(void*, u32);
-typedef void (*arg3_800FC948)(void*, u32, u32, u32, u32, u32, u32, u32, u32);
-typedef void (*arg3_800FCA18)(void*, u32);
-
-typedef struct InitFunc {
-    s32 nextOffset;
-    void (*func)(void);
-} InitFunc;
-
-// .data
-void* sInitFuncs = NULL;
-
-char sNew[] = { 'n', 'e', 'w' };
-
-char D_80134488[0x18] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00,
-    0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-};
-
-s32 Overlay_Load(Pointer vRomStart, Pointer vRomEnd, Pointer vRamStart, Pointer vRamEnd, Pointer allocatedVRamAddr)
-{
-    return 0;
-}
-
-// possibly some kind of new() function
-void* func_800FC800(u32 size) {
-    if (size == 0) {
-        size = 1;
-    }
-#ifndef USE_NATIVE_MALLOC
-    return __osMallocDebug(&gSystemArena, size, sNew, 0);
-#else
-    return malloc(size);
-#endif
-}
-
-// possible some kind of delete() function
-void func_800FC83C(void* ptr) {
-    if (ptr != NULL) {
-#ifndef USE_NATIVE_MALLOC
-        __osFree(&gSystemArena, ptr);
-#else
-        free(ptr);
-#endif
-    }
-}
-
-void func_800FC868(void* blk, u32 nBlk, u32 blkSize, arg3_800FC868 arg3) {
-    uintptr_t pos;
-
-    for (pos = (uintptr_t)blk; pos < (uintptr_t)blk + (nBlk * blkSize); pos = (uintptr_t)pos + (blkSize & ~0)) {
-        arg3((void*)pos);
-    }
-}
-
-void func_800FC8D8(void* blk, u32 nBlk, s32 blkSize, arg3_800FC8D8 arg3) {
-    uintptr_t pos;
-
-    for (pos = (uintptr_t)blk; pos < (uintptr_t)blk + (nBlk * blkSize); pos = (uintptr_t)pos + (blkSize & ~0)) {
-        arg3((void*)pos, 2);
-    }
-}
-
-void* func_800FC948(void* blk, u32 nBlk, u32 blkSize, arg3_800FC948 arg3) {
-    uintptr_t pos;
-
-    if (blk == NULL) {
-        blk = func_800FC800(nBlk * blkSize);
-    }
-
-    if (blk != NULL && arg3 != NULL) {
-        pos = (uintptr_t)blk;
-        while (pos < (uintptr_t)blk + (nBlk * blkSize)) {
-            arg3((void*)pos, 0, 0, 0, 0, 0, 0, 0, 0);
-            pos = (uintptr_t)pos + (blkSize & ~0);
-        }
-    }
-    return blk;
-}
-
-void func_800FCA18(void* blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg4) {
-    uintptr_t pos;
-    uintptr_t end;
-    s32 masked_arg2;
-
-    if (blk == 0) {
-        return;
-    }
-    if (arg3 != 0) {
-        end = (uintptr_t)blk;
-        masked_arg2 = (s32)(blkSize & ~0);
-        pos = (uintptr_t)end + (nBlk * blkSize);
-
-        while (pos > end) {
-            pos -= masked_arg2;
-            arg3((void*)pos, 2);
-            if (1) {}
-        }
-    }
-
-    if (arg4 != 0) {
-        func_800FC83C(blk);
-    }
-}
-
-void func_800FCB34(void) {
-    InitFunc* initFunc = (InitFunc*)&sInitFuncs;
-    u32 nextOffset = initFunc->nextOffset;
-    InitFunc* prev = NULL;
-
-    while (nextOffset != 0) {
-        initFunc = (InitFunc*)((u8*)initFunc + nextOffset);
-
-        if (initFunc->func != NULL) {
-            (*initFunc->func)();
-        }
-
-        nextOffset = initFunc->nextOffset;
-        initFunc->nextOffset = (s32)prev;
-        prev = initFunc;
-    }
-
-    sInitFuncs = prev;
-}
-
-void SystemHeap_Init(void* start, u32 size) {
-#ifndef USE_NATIVE_MALLOC
-    SystemArena_Init(start, size);
-#endif
-    func_800FCB34();
-}

src/code/code_801067F0.cpp

@@ -1,12 +0,0 @@
-#include "global.h"
-
-// fmodf?
-f32 func_801067F0(f32 arg0, f32 arg1) {
-    s32 sp4;
-
-    if (arg1 == 0.0f) {
-        return 0.0f;
-    }
-    sp4 = arg0 / arg1;
-    return arg0 - (sp4 * arg1);
-}

src/code/code_80106860.cpp

@@ -1,14 +0,0 @@
-#define INTERNAL_SRC_CODE_CODE_80106860_C
-#include "global.h"
-#include "def/code_80106860.h"
-
-// memset used in __osMalloc, z_quake, z_view, and z_camera
-void* z_memset(void* ptr, s32 val, size_t size) {
-    u8* sp4 = (u8*)ptr;
-    register s32 a3;
-
-    for (a3 = size--; a3 != 0; a3 = size--) {
-        *sp4++ = val;
-    }
-    return ptr;
-}

src/code/code_801068B0.cpp

@@ -1,26 +0,0 @@
-#define INTERNAL_SRC_CODE_CODE_801068B0_C
-#include "global.h"
-#include "def/code_801068B0.h"
-
-// memmove used in __osMalloc.c
-void* func_801068B0(void* dst, void* src, size_t size) {
-    u8* spC = (u8*)dst;
-	u8* sp8 = (u8*)src;
-    register s32 a3;
-
-    if (spC == sp8) {
-        return dst;
-    }
-    if (spC < sp8) {
-        for (a3 = size--; a3 != 0; a3 = size--) {
-            *spC++ = *sp8++;
-        }
-    } else {
-        spC += size - 1;
-        sp8 += size - 1;
-        for (a3 = size--; a3 != 0; a3 = size--) {
-            *spC-- = *sp8--;
-        }
-    }
-    return dst;
-}

src/code/db_camera.cpp

@@ -8,7 +8,7 @@
 #include "z_demo.h"
 #include "gfx.h"
 #include "def/code_800BB0A0.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/db_camera.h"
 #include "def/debug_malloc.h"
 #include "def/mempak.h"

src/code/environment_flags.cpp

@@ -1,7 +1,7 @@
 #define INTERNAL_SRC_CODE_CODE_8006C3A0_C
 #include "global.h"
 #include "z64global.h"
-#include "def/code_8006C3A0.h"
+#include "def/environment_flags.h"
 
 void Flags_UnsetAllEnv(GlobalContext* globalCtx) {
     u8 i;

src/code/game.cpp

@@ -15,9 +15,8 @@
 #include "def/code_800A9F30.h"
 #include "def/code_800ACE70.h"
 #include "def/code_800AD920.h"
-#include "def/code_800C3C20.h"
-#include "def/code_800D31A0.h"
-#include "def/code_800EC960.h"
+#include "def/audio_bank.h"
+#include "def/audio.h"
 #include "def/fault.h"
 #include "def/fault_drawer.h"
 #include "def/game.h"
@@ -495,7 +494,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g
 
 void GameState_Destroy(GameState* gameState) {
     osSyncPrintf("game destructor start\n"); // "game destructor start"
-    func_800C3C20();
+    Audio_StopAllBanks();
     func_800F3054();
     osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK);
     LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1139);

src/code/graph.cpp

@@ -13,12 +13,12 @@
 #include "gfx.h"
 #include "gfxapi.h"
 #include "sched.h"
+#include "padmgr.h"
 #include "z64save.h"
 #include "speedmeter.h"
 #include "z_prenmi_buff.h"
 #include "def/TwoHeadArena.h"
-#include "def/code_800D31A0.h"
-#include "def/code_800EC960.h"
+#include "def/audio.h"
 #include "def/createmesgqueue.h"
 #include "def/fault.h"
 #include "def/game.h"
@@ -114,11 +114,11 @@ void Graph_Init(GraphicsContext* gfxCtx) {
     gfxCtx->viFeatures = gViConfigFeatures;
     gfxCtx->xScale = gViConfigXScale;
     gfxCtx->yScale = gViConfigYScale;
-    func_800D31F0();
+    gIsCtrlr2Valid     = (gPadMgr.validCtrlrsMask & 2) != 0;
 }
 
 void Graph_Destroy(GraphicsContext* gfxCtx) {
-    func_800D3210();
+	gIsCtrlr2Valid = false;
 }
 
 void gfx_run(OSTask_t* task, u32 sz);

src/code/inventory.cpp

@@ -8,7 +8,7 @@
 #include "textures/icon_item_static/icon_item_static.h"
 #include "textures/icon_item_24_static/icon_item_24_static.h"
 #include "textures/parameter_static/parameter_static.h"
-#include "def/code_80097A00.h"
+#include "def/inventory.h"
 #include "def/z_common_data.h"
 #include "def/z_player_lib.h"
 

src/code/math_float.cpp

@@ -1,7 +1,7 @@
 #define INTERNAL_SRC_CODE_CODE_800FCE80_C
 #include "global.h"
 #include "fp.h"
-#include "def/code_800FCE80.h"
+#include "def/math_float.h"
 
 s32 gUseAtanContFrac;
 

src/code/padmgr.cpp

@@ -12,6 +12,7 @@ extern "C"
 	void hid_update();
 }
 
+u32 gIsCtrlr2Valid = false;
 s32 D_8012D280 = 1;
 
 OSMesgQueue* PadMgr_LockSerialMesgQueue(PadMgr* padMgr) {

src/code/random.cpp

@@ -1,6 +1,6 @@
 #define INTERNAL_SRC_CODE_CODE_800FD970_C
 #include "global.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 
 // The latest generated random number, used to generate the next number in the sequence.
 static u32 sRandInt = 1;

src/code/sys_matrix.cpp

@@ -7,7 +7,7 @@
 #include "math.h"
 #include "z64memory.h"
 #include "z64skinmatrix.h"
-#include "def/code_800FCE80.h"
+#include "def/math_float.h"
 #include "def/game.h"
 #include "def/graph.h"
 #include "def/mtxf2l.h"

src/code/z_actor.cpp

@@ -20,11 +20,10 @@
 #include "def/code_800430A0.h"
 #include "def/code_8006BA00.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FC620.h"
-#include "def/code_800FCE80.h"
-#include "def/code_800FD970.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
+#include "def/math_float.h"
+#include "def/random.h"
 #include "def/fault.h"
 #include "def/fault_drawer.h"
 #include "def/graph.h"
@@ -2720,7 +2719,6 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId
             }
 
             overlayLoaded = true;
-            Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr);
 
             overlayEntry->numLoaded = 0;
         }

src/code/z_camera.cpp

@@ -12,10 +12,9 @@
 #include "vt.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 #include "def/code_800BB0A0.h"
-#include "def/code_800EC960.h"
-#include "def/code_800FCE80.h"
-#include "def/code_800FD970.h"
-#include "def/code_80106860.h"
+#include "def/audio.h"
+#include "def/math_float.h"
+#include "def/random.h"
 #include "def/db_camera.h"
 #include "def/shrink_window.h"
 #include "def/sys_math3d.h"
@@ -6829,7 +6828,7 @@ void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, GlobalCon
     s16 curUID;
     s16 j;
 
-    z_memset(camera, 0, sizeof(*camera));
+    memset(camera, 0, sizeof(*camera));
     if (sInitRegs) {
         for (i = 0; i < sOREGInitCnt; i++) {
             OREG(i) = sOREGInit[i];

src/code/z_collision_check.cpp

@@ -6,7 +6,7 @@
 #include "z64global.h"
 #include "z64effect.h"
 #include "sfx.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/graph.h"
 #include "def/sys_math3d.h"
 #include "def/sys_matrix.h"

src/code/z_demo.cpp

@@ -42,11 +42,11 @@
 
 #include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
 #include "def/code_80069420.h"
-#include "def/code_8006C3A0.h"
+#include "def/environment_flags.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
-#include "def/code_800F9280.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
+#include "def/audio_command.h"
 #include "def/gfxprint.h"
 #include "def/graph.h"
 #include "def/shrink_window.h"

src/code/z_eff_blure.cpp

@@ -5,7 +5,7 @@
 #include "z64effect.h"
 #include "gfx.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "def/code_800FCE80.h"
+#include "def/math_float.h"
 #include "def/graph.h"
 #include "def/sys_math3d.h"
 #include "def/sys_matrix.h"

src/code/z_eff_shield_particle.cpp

@@ -6,7 +6,7 @@
 #include "z64camera.h"
 #include "z64global.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_eff_shield_particle.h"
 #include "def/z_effect.h"

src/code/z_eff_spark.cpp

@@ -5,7 +5,7 @@
 #include "z64effect.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "z64global.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/graph.h"
 #include "def/sys_matrix.h"
 #include "def/z_eff_spark.h"

src/code/z_effect_soft_sprite.cpp

@@ -4,8 +4,7 @@
 #include "z64global.h"
 #include "segment_symbols.h"
 #include "vt.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FC620.h"
+#include "def/audio_bank.h"
 #include "def/game.h"
 #include "def/z_effect_soft_sprite.h"
 #include "def/z_effect_soft_sprite_dlftbls.h"
@@ -217,9 +216,6 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init
                 return;
             }
 
-            Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd,
-                         overlayEntry->loadedRamAddr);
-
             osSyncPrintf(VT_FGCOL(GREEN));
             osSyncPrintf("EFFECT SS OVL:SegRom %08x %08x, Seg %08x %08x, RamStart %08x, type: %d\n",
                          overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd,

src/code/z_effect_soft_sprite_old_init.cpp

@@ -42,7 +42,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
 #include "overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_effect_soft_sprite.h"

src/code/z_elf_message.cpp

@@ -5,7 +5,7 @@
 #include "z64global.h"
 #include "z64player.h"
 #include "z64elf_message.h"
-#include "def/code_80097A00.h"
+#include "def/inventory.h"
 #include "def/z_actor.h"
 #include "def/z_common_data.h"
 #include "def/z_elf_message.h"

src/code/z_en_item00.cpp

@@ -9,8 +9,8 @@
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_collision_check.h"

src/code/z_fbdemo_circle.cpp

@@ -11,7 +11,7 @@ Gfx sCircleNullDList[] = {
 };
 
 #include "code/fbdemo_circle/z_fbdemo_circle.cpp"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/lookat.h"
 #include "def/perspective.h"
 #include "def/rotate.h"

src/code/z_kaleido_manager.cpp

@@ -5,7 +5,6 @@
 #include "include/kaleido.h"
 #include "vt.h"
 #include <string.h>
-#include "def/code_800FC620.h"
 #include "def/game.h"
 #include "def/logutils.h"
 #include "def/z_kaleido_manager.h"
@@ -27,9 +26,8 @@ u8 gBossMarkState = 0;
 
 void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl) {
     ovl->loadedRamAddr = (void*)ovl->vromStart;
-    Overlay_Load(ovl->vromStart, ovl->vromEnd, ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr);
 
-    ovl->offset = 0; // POINTER_SUB(ovl->loadedRamAddr, ovl->vramStart);
+    ovl->offset = 0;
     gKaleidoMgrCurOvl = ovl;
 }
 

src/code/z_kaleido_setup.cpp

@@ -6,7 +6,7 @@
 #include "z64global.h"
 #include "z64item.h"
 #include "framerate.h"
-#include "def/code_800EC960.h"
+#include "def/audio.h"
 #include "def/shrink_window.h"
 #include "def/z_actor.h"
 #include "def/z_common_data.h"

src/code/z_kankyo.cpp

@@ -19,9 +19,9 @@
 #include "z_kankyo_assets.h"
 #include "z64file.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F9280.h"
-#include "def/code_800FD970.h"
+#include "def/audio.h"
+#include "def/audio_command.h"
+#include "def/random.h"
 #include "def/createmesgqueue.h"
 #include "def/gfxprint.h"
 #include "def/graph.h"

src/code/z_lib.cpp

@@ -7,8 +7,8 @@
 #include "z64actor.h"
 #include "z64audio.h"
 #include "framerate.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/coss.h"
 #include "def/sins.h"
 #include "def/sys_math_atan.h"

src/code/z_map_exp.cpp

@@ -13,8 +13,8 @@
 #include "textures/parameter_static/parameter_static.h"
 #include "textures/map_grand_static/map_grand_static.h"
 #include "textures/map_i_static/map_i_static.h"
-#include "def/code_80097A00.h"
-#include "def/code_800F7260.h"
+#include "def/inventory.h"
+#include "def/audio_bank.h"
 #include "def/game.h"
 #include "def/sys_matrix.h"
 #include "def/z_common_data.h"

src/code/z_map_mark.cpp

@@ -9,7 +9,6 @@
 #include "vt.h"
 #include "gfx_align.h"
 #include "textures/parameter_static/parameter_static.h"
-#include "def/code_800FC620.h"
 #include "def/game.h"
 #include "def/logutils.h"
 #include "def/z_actor.h"
@@ -76,8 +75,6 @@ void MapMark_Init(GlobalContext* globalCtx) {
     overlay->loadedRamAddr = GameState_Alloc(&globalCtx->state, overlaySize, "../z_map_mark.c", 235);
     LogUtils_CheckNullPointer("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236);
 
-    Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr);
-
     sLoadedMarkDataTable = (MapMarkData**)gMapMarkDataTable;
     sLoadedMarkDataTable = (MapMarkData**)overlay->vramTable;
 }

src/code/z_message_PAL.cpp

@@ -24,9 +24,9 @@
 #include "sequence.h"
 #include "z64player.h"
 #include "def/code_80069420.h"
-#include "def/code_80097A00.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
+#include "def/inventory.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
 #include "def/gfxprint.h"
 #include "def/graph.h"
 #include "def/xprintf.h"

src/code/z_olib.cpp

@@ -1,7 +1,7 @@
 #define INTERNAL_SRC_CODE_Z_OLIB_C
 #include "global.h"
 #include "z64math.h"
-#include "def/code_800FCE80.h"
+#include "def/math_float.h"
 #include "def/z_lib.h"
 #include "def/z_olib.h"
 

src/code/z_onepointdemo.cpp

@@ -14,8 +14,8 @@ static s16 sUnused = -1;
 static s32 sPrevFrameCs1100 = -4096;
 
 #include "z_onepointdemo_data.cpp"
-#include "def/code_800FCE80.h"
-#include "def/code_800FD970.h"
+#include "def/math_float.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_camera.h"

src/code/z_parameter.cpp

@@ -17,9 +17,9 @@
 #include "textures/parameter_static/parameter_static.h"
 #include "textures/do_action_static/do_action_static.h"
 #include "textures/icon_item_static/icon_item_static.h"
-#include "def/code_80097A00.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
+#include "def/inventory.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
 #include "def/createmesgqueue.h"
 #include "def/flg_set.h"
 #include "def/graph.h"

src/code/z_path.cpp

@@ -2,7 +2,7 @@
 #include "global.h"
 #include "z64global.h"
 #include "z64math.h"
-#include "def/code_800FCE80.h"
+#include "def/math_float.h"
 #include "def/z_path.h"
 
 Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max) {

src/code/z_play.cpp

@@ -24,11 +24,11 @@
 #include "def/PreRender.h"
 #include "def/TwoHeadArena.h"
 #include "def/code_8006BA00.h"
-#include "def/code_8006C3A0.h"
+#include "def/environment_flags.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800EC960.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/fault.h"
 #include "def/game.h"
 #include "def/gettime.h"

src/code/z_player_lib.cpp

@@ -9,7 +9,7 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_link_boy/object_link_boy.h"
 #include "objects/object_link_child/object_link_child.h"
-#include "def/code_800FCE80.h"
+#include "def/math_float.h"
 #include "def/graph.h"
 #include "def/lookat.h"
 #include "def/perspective.h"

src/code/z_quake.cpp

@@ -5,8 +5,7 @@
 #include "z64camera.h"
 #include "z64global.h"
 #include <string.h>
-#include "def/code_800FD970.h"
-#include "def/code_80106860.h"
+#include "def/random.h"
 #include "def/z_lib.h"
 #include "def/z_olib.h"
 #include "def/z_quake.h"
@@ -162,7 +161,7 @@ QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx) {
     s16 idx = Quake_GetFreeIndex();
     QuakeRequest* req = &sQuakeRequest[idx];
 
-    z_memset(req, 0, sizeof(QuakeRequest)); // memset
+    memset(req, 0, sizeof(QuakeRequest));
     req->cam = cam;
     req->camPtrIdx = cam->thisIdx;
     req->callbackIdx = callbackIdx;

src/code/z_room.cpp

@@ -8,7 +8,7 @@
 #include "z64player.h"
 #include "z64save.h"
 #include "rsp.h"
-#include "def/code_800EC960.h"
+#include "def/audio.h"
 #include "def/createmesgqueue.h"
 #include "def/game.h"
 #include "def/gettime.h"

src/code/z_scene.cpp

@@ -11,8 +11,8 @@
 #include "z64item.h"
 #include "sfx.h"
 #include "sequence.h"
-#include "def/code_80097A00.h"
-#include "def/code_800F9280.h"
+#include "def/inventory.h"
+#include "def/audio_command.h"
 #include "def/createmesgqueue.h"
 #include "def/game.h"
 #include "def/recvmesg.h"

src/code/z_scene_table.cpp

@@ -137,7 +137,7 @@ extern Gfx gEmptyDL[];
 
 #include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h"
 #include "z_scene_table_assets.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/coss.h"
 #include "def/graph.h"
 #include "def/sys_matrix.h"

src/code/z_sram.cpp

@@ -10,8 +10,8 @@
 #include "z64item.h"
 #include "z_file_choose.h"
 #include "def/code_80069420.h"
-#include "def/code_80097A00.h"
-#include "def/code_800EC960.h"
+#include "def/inventory.h"
+#include "def/audio.h"
 #include "def/game.h"
 #include "def/z_common_data.h"
 #include "def/z_parameter.h"

src/code/z_view.cpp

@@ -8,10 +8,10 @@
 #include "regs.h"
 #include "z64game.h"
 #include "z_view.h"
+#include <string.h>
 #include "z64gu.h"
 #include "z64memory.h"
 #include "shrink_window.h"
-#include "def/code_80106860.h"
 #include "def/graph.h"
 #include "def/logutils.h"
 #include "def/lookat.h"
@@ -42,7 +42,7 @@ View* View_New(GraphicsContext* gfxCtx) {
     View* view = (View*)SystemArena_MallocDebug(sizeof(View), "../z_view.c", 285);
 
     if (view != NULL) {
-        z_memset(view, 0, sizeof(View)); // memset
+        memset(view, 0, sizeof(View));
         View_Init(view, gfxCtx);
     }
 

src/overlays/actors/ovl_Arms_Hook/z_arms_hook.cpp

@@ -3,8 +3,8 @@
 #include "z_arms_hook.h"
 #include "framerate.h"
 #include "objects/object_link_boy/object_link_boy.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FCE80.h"
+#include "def/audio_bank.h"
+#include "def/math_float.h"
 #include "def/sys_math_atan.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.cpp

@@ -10,7 +10,7 @@
 #include "objects/object_bdan_objects/object_bdan_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800EC960.h"
+#include "def/audio.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.cpp

@@ -9,7 +9,7 @@
 #include "z_bg_bombwall.h"
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.cpp

@@ -11,8 +11,8 @@
 #include "objects/object_bwall/object_bwall.h"
 #include "objects/object_kingdodongo/object_kingdodongo.h"
 #include "def/code_80043480.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.cpp

@@ -10,8 +10,8 @@
 #include "objects/object_ddan_objects/object_ddan_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_camera.h"

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.cpp

@@ -11,7 +11,7 @@
 #include "objects/object_ddan_objects/object_ddan_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.cpp

@@ -12,7 +12,7 @@
 #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
 #include "scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
 #include "scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_camera.h"

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.cpp

@@ -11,7 +11,7 @@
 #include "vt.h"
 #include "def/code_80043480.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.cpp

@@ -8,7 +8,7 @@
 
 #include "z_bg_gnd_darkmeiro.h"
 #include "objects/object_demo_kekkai/object_demo_kekkai.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.cpp

@@ -9,7 +9,7 @@
 #include "z_bg_gnd_iceblock.h"
 #include "objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.cpp

@@ -9,8 +9,8 @@
 #include "z_bg_gnd_soulmeiro.h"
 #include "objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "global.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.cpp

@@ -10,7 +10,7 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_haka_objects/object_haka_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.cpp

@@ -10,7 +10,7 @@
 #include "objects/object_hakach_objects/object_hakach_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.cpp

@@ -9,7 +9,7 @@
 #include "z_bg_haka_ship.h"
 #include "objects/object_haka_objects/object_haka_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/sinf.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.cpp

@@ -9,8 +9,8 @@
 #include "z_bg_haka_trap.h"
 #include "objects/object_haka_objects/object_haka_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800F7260.h"
-#include "def/code_800FD970.h"
+#include "def/audio_bank.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.cpp

@@ -11,7 +11,7 @@
 #include "objects/object_haka_objects/object_haka_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.cpp

@@ -10,7 +10,7 @@
 #include "objects/object_hakach_objects/object_hakach_objects.h"
 #include "objects/object_haka_objects/object_haka_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.cpp

@@ -8,7 +8,7 @@
 
 #include "z_bg_hidan_curtain.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_collision_check.h"

src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.cpp

@@ -9,7 +9,7 @@
 #include "z_bg_hidan_dalm.h"
 #include "objects/object_hidan_objects/object_hidan_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.cpp

@@ -12,7 +12,7 @@
 #include "objects/object_hidan_objects/object_hidan_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.cpp

@@ -10,7 +10,7 @@
 #include "objects/object_hidan_objects/object_hidan_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_800A9F30.h"
-#include "def/code_800F7260.h"
+#include "def/audio_bank.h"
 #include "def/sinf.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.cpp

@@ -9,7 +9,7 @@
 #include "z_bg_ice_objects.h"
 #include "objects/object_ice_objects/object_ice_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.cpp

@@ -3,7 +3,7 @@
 #include "z_bg_ice_shelter.h"
 #include "objects/object_ice_objects/object_ice_objects.h"
 #include "def/code_80043480.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.cpp

@@ -10,7 +10,7 @@
 #include "objects/object_ice_objects/object_ice_objects.h"
 #include "def/code_80043480.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.cpp

@@ -4,7 +4,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
 #include "objects/object_jya_obj/object_jya_obj.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/sys_matrix.h"
 #include "def/z_actor.h"
 #include "def/z_cheap_proc.h"

src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.cpp

@@ -12,7 +12,7 @@
 #include "vt.h"
 #include "def/code_80043480.h"
 #include "def/code_8006BA00.h"
-#include "def/code_800FD970.h"
+#include "def/random.h"
 #include "def/z_actor.h"
 #include "def/z_bgcheck.h"
 #include "def/z_cheap_proc.h"