Merge branch 'master' into voice

16 files changed, 33 insertions, 33 deletions

diff --git a/src/code/audio_effects.c b/src/code/audio/audio_effects.c
index e795d5e9f..e795d5e9f 100644
--- a/src/code/audio_effects.c
+++ b/src/code/audio/audio_effects.c
diff --git a/src/code/audio_heap.c b/src/code/audio/audio_heap.c
index 7c43ef0f1..7c43ef0f1 100644
--- a/src/code/audio_heap.c
+++ b/src/code/audio/audio_heap.c
diff --git a/src/code/audio_load.c b/src/code/audio/audio_load.c
index 15e54b3c5..15e54b3c5 100644
--- a/src/code/audio_load.c
+++ b/src/code/audio/audio_load.c
diff --git a/src/code/audio_playback.c b/src/code/audio/audio_playback.c
index ec8dd86b8..ec8dd86b8 100644
--- a/src/code/audio_playback.c
+++ b/src/code/audio/audio_playback.c
diff --git a/src/code/audio_seqplayer.c b/src/code/audio/audio_seqplayer.c
index e3841a50a..e3841a50a 100644
--- a/src/code/audio_seqplayer.c
+++ b/src/code/audio/audio_seqplayer.c
diff --git a/src/code/audio_synthesis.c b/src/code/audio/audio_synthesis.c
index 51842a33f..51842a33f 100644
--- a/src/code/audio_synthesis.c
+++ b/src/code/audio/audio_synthesis.c
diff --git a/src/code/code_80192BE0.c b/src/code/audio/code_80192BE0.c
index d408361c7..d408361c7 100644
--- a/src/code/code_80192BE0.c
+++ b/src/code/audio/code_80192BE0.c
diff --git a/src/code/audio/code_80194710.c b/src/code/audio/code_80194710.c
new file mode 100644
index 000000000..090c5735b
--- /dev/null
+++ b/src/code/audio/code_80194710.c
@@ -0,0 +1,5 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194710.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194750.s")
diff --git a/src/code/audio/code_80194790.c b/src/code/audio/code_80194790.c
new file mode 100644
index 000000000..9ba2436de
--- /dev/null
+++ b/src/code/audio/code_80194790.c
@@ -0,0 +1,9 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_80194790.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_80194804.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_80194840.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_801948B0.s")
diff --git a/src/code/code_8019AF00.c b/src/code/audio/code_8019AF00.c
index 227384d0a..227384d0a 100644
--- a/src/code/code_8019AF00.c
+++ b/src/code/audio/code_8019AF00.c
diff --git a/src/code/code_801A5BD0.c b/src/code/audio/code_801A5BD0.c
index 32889dcb8..32889dcb8 100644
--- a/src/code/code_801A5BD0.c
+++ b/src/code/audio/code_801A5BD0.c
diff --git a/src/code/code_801A7B10.c b/src/code/audio/code_801A7B10.c
index 707996820..d2d9a71a2 100644
--- a/src/code/code_801A7B10.c
+++ b/src/code/audio/code_801A7B10.c
@@ -29,19 +29,3 @@
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A99B8.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9A74.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9B10.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9B78.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9BFC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9C68.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9D10.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9DCC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9EA4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9F4C.s")
diff --git a/src/code/code_80194710.c b/src/code/code_80194710.c
deleted file mode 100644
index aa4f784c4..000000000
--- a/src/code/code_80194710.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "global.h"
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194710.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194750.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194790.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194804.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194840.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_801948B0.s")
diff --git a/src/code/code_801AA020.c b/src/code/code_801AA020.c
index 2144c6bcb..6cefc66d9 100644
--- a/src/code/code_801AA020.c
+++ b/src/code/code_801AA020.c
@@ -1,7 +1,5 @@
 #include "global.h"
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/D_801E1100.s")
-
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA020.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA248.s")
diff --git a/src/code/jpegutils.c b/src/code/jpegutils.c
new file mode 100644
index 000000000..89ed4e97d
--- /dev/null
+++ b/src/code/jpegutils.c
@@ -0,0 +1,17 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9B10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9B78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9BFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9C68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9D10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9DCC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9EA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9F4C.s")
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index ad3e93a5f..7f79bb51c 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -474,7 +474,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
 }
 
 void func_80134148(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* jointTable,
-                   OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, UnkActorDraw unkDraw,
+                   OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, UnkActorDrawOpa unkDraw,
                    Actor* actor, Mtx** mtx) {
     StandardLimb* limb;
     Gfx* newDList;
@@ -538,7 +538,7 @@ void func_80134148(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec
 }
 
 void func_801343C0(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, s32 dListCount,
-                   OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, UnkActorDraw unkDraw,
+                   OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, UnkActorDrawOpa unkDraw,
                    Actor* actor) {
     StandardLimb* rootLimb;
     s32 pad;