From f3eb54ccf85bfde5e742d00045eff066ebd7da1e Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Mon, 6 Nov 2023 02:05:53 -0500
Subject: [PATCH] Set up headers for all JAZelAudio TUs

---
 include/JAZelAudio/JAIZelAnime.h        |  17 ++++
 include/JAZelAudio/JAIZelBasic.h        |  23 +++--
 include/JAZelAudio/JAIZelInst.h         |  31 +++++++
 include/JAZelAudio/JAIZelParam.h        |   6 ++
 include/JAZelAudio/JAIZelSound.h        |  17 ++++
 include/JSystem/JAudio/JAIAnimation.h   |   4 +-
 include/m_Do/m_Do_audio.h               |  10 +--
 include/m_Do/m_Do_ext.h                 |   4 +-
 src/JAZelAudio/JAIZelAnime.cpp          |  10 +--
 src/JAZelAudio/JAIZelAtmos.cpp          |  16 ++--
 src/JAZelAudio/JAIZelBasic.cpp          | 115 ++++++++++++------------
 src/JAZelAudio/JAIZelCharVoiceTable.cpp |   2 +-
 src/JAZelAudio/JAIZelInst.cpp           |  24 ++---
 src/JAZelAudio/JAIZelParam.cpp          |   3 +-
 src/JAZelAudio/JAIZelScene.cpp          |   2 +-
 src/JAZelAudio/JAIZelSound.cpp          |  10 +--
 16 files changed, 179 insertions(+), 115 deletions(-)
 create mode 100644 include/JAZelAudio/JAIZelAnime.h
 create mode 100644 include/JAZelAudio/JAIZelInst.h
 create mode 100644 include/JAZelAudio/JAIZelParam.h
 create mode 100644 include/JAZelAudio/JAIZelSound.h

diff --git a/include/JAZelAudio/JAIZelAnime.h b/include/JAZelAudio/JAIZelAnime.h
new file mode 100644
index 000000000..70058878b
--- /dev/null
+++ b/include/JAZelAudio/JAIZelAnime.h
@@ -0,0 +1,17 @@
+#ifndef JAIZELANIME_H
+#define JAIZELANIME_H
+
+#include "JSystem/JAudio/JAIAnimation.h"
+
+class JAIZelAnime : public JAIAnimeSound {
+public:
+    JAIZelAnime() {}
+    
+    virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
+    virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
+    
+    void setAnimSound(Vec*, f32, f32, u32, s8);
+    void setPlayPosition(f32);
+};
+
+#endif /* JAIZELANIME_H */
diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h
index 4d603478a..7d5fa5378 100644
--- a/include/JAZelAudio/JAIZelBasic.h
+++ b/include/JAZelAudio/JAIZelBasic.h
@@ -4,9 +4,9 @@
 #include "dolphin/types.h"
 #include "JAZelAudio/JAZelAudio_SE.h"
 #include "JAZelAudio/JAZelAudio_BGM.h"
-#include "JSystem/JAudio/JAIAnimation.h"
 #include "dolphin/mtx/mtx.h"
 
+class JAISound;
 class JKRSolidHeap;
 
 class JAIZelBasic {
@@ -155,6 +155,19 @@ public:
 
     static JAIZelBasic* zel_basic;
 
+    // static m_bgm_mute_state;
+
+    // static charVoiceTable;
+    // static linkVoiceTable;
+
+    // static m_bgm_wave_info;
+    // static m_dy_wave_set_1st;
+    // static m_dy_wave_set_2nd;
+    // static m_scene_info;
+    // static m_isle_info;
+    // static spot_dir_name;
+    // static mIsleArea;
+
     /* 0x0004 */ u8 field_0x0004[0x0020 - 0x0004];
     /* 0x0020 */ u8 field_0x0020;
     /* 0x0021 */ u8 field_0x0021;
@@ -249,12 +262,4 @@ public:
     /* 0x1F44 */ u8 field_0x1F44[0x20F4 - 0x1F44];
 };
 
-class JAIZelAnime : public JAIAnimeSound {
-public:
-    JAIZelAnime() { }
-    
-    virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
-    virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
-};
-
 #endif /* JAZELAUDIO_JAIZELBASIC_H */
\ No newline at end of file
diff --git a/include/JAZelAudio/JAIZelInst.h b/include/JAZelAudio/JAIZelInst.h
new file mode 100644
index 000000000..7dcb05dd1
--- /dev/null
+++ b/include/JAZelAudio/JAIZelInst.h
@@ -0,0 +1,31 @@
+#ifndef JAIZELINST_H
+#define JAIZELINST_H
+
+#include "dolphin/types.h"
+
+class JAIZelInst {
+public:
+    JAIZelInst();
+    void reset();
+    void playArmSwing(s32, s32);
+    void stopArmSwing();
+    void setStickPos(s32, s32);
+    void play();
+    void setBeat(s32);
+    void setVolume(f32);
+    void metronomePlay(s32, s32);
+    void judge(s32, s32);
+    void ambientPlay();
+    void armSoundPlay(s32);
+    f32 getMelodyPattern(s32, s32, s32*);
+    void getMelodyBeat(s32);
+    void getMelodyGFrames(s32);
+    void melodyPlay(s32);
+    void melodyStop();
+
+public:
+    /* 0x00 */ u8 pad[0x1F];
+    /* 0x1F */ u8 mMelodyNum;
+};
+
+#endif /* JAIZELINST_H */
diff --git a/include/JAZelAudio/JAIZelParam.h b/include/JAZelAudio/JAIZelParam.h
new file mode 100644
index 000000000..b9ee40c4f
--- /dev/null
+++ b/include/JAZelAudio/JAIZelParam.h
@@ -0,0 +1,6 @@
+#ifndef JAIZELPARAM_H
+#define JAIZELPARAM_H
+
+class JAIZelParam;
+
+#endif /* JAIZELPARAM_H */
diff --git a/include/JAZelAudio/JAIZelSound.h b/include/JAZelAudio/JAIZelSound.h
new file mode 100644
index 000000000..ac2dd92d9
--- /dev/null
+++ b/include/JAZelAudio/JAIZelSound.h
@@ -0,0 +1,17 @@
+#ifndef JAIZELSOUND_H
+#define JAIZELSOUND_H
+
+#include "dolphin/types.h"
+
+class JAIZelSound /* : public JAISound */ {
+public:
+    JAIZelSound();
+    ~JAIZelSound() {}
+
+    void setDistanceVolumeCommon(f32, u8);
+    void setSeDistanceVolume(u8);
+    void setSeDistancePan(u8);
+    void setSeDistanceDolby(u8);
+};
+
+#endif /* JAIZELSOUND_H */
diff --git a/include/JSystem/JAudio/JAIAnimation.h b/include/JSystem/JAudio/JAIAnimation.h
index e5fe36adf..07e091c56 100644
--- a/include/JSystem/JAudio/JAIAnimation.h
+++ b/include/JSystem/JAudio/JAIAnimation.h
@@ -24,8 +24,8 @@ public:
     void setAnimSoundVec(JAIBasic*, Vec*, f32, f32, u32, u8);
     void setAnimSoundActor(JAIBasic*, JAInter::Actor*, f32, f32, u8);
     void playActorAnimSound(JAIBasic*, JAInter::Actor*, f32, u8);
-    void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
-    void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
+    virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
+    virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
     void stop();
 
 public:
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index e1870be65..443fbc991 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -2,15 +2,7 @@
 #define M_DO_AUDIO_H
 
 #include "JAZelAudio/JAIZelBasic.h"
-
-class JAIZelInst {
-public:
-    f32 getMelodyPattern(s32, s32, s32*);
-
-public:
-    /* 0x00 */ u8 pad[0x1F];
-    /* 0x1F */ u8 mMelodyNum;
-};
+#include "JAZelAudio/JAIZelInst.h"
 
 class mDoAud_zelAudio_c : public JAIZelBasic {
 public:
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index d6c6525e3..ba4d04499 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -5,7 +5,7 @@
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include "JAZelAudio/JAIZelBasic.h"
+#include "JAZelAudio/JAIZelAnime.h"
 #include "d/d_kankyo.h"
 
 class JKRArchive;
@@ -324,7 +324,7 @@ public:
 
 class mDoExt_zelAnime : public JAIZelAnime {
 public:
-    mDoExt_zelAnime() { }
+    mDoExt_zelAnime() {}
 
 public:
     /* 0x98 */ void* mpBasAnm;
diff --git a/src/JAZelAudio/JAIZelAnime.cpp b/src/JAZelAudio/JAIZelAnime.cpp
index 9b03931d0..088e7eb1d 100644
--- a/src/JAZelAudio/JAIZelAnime.cpp
+++ b/src/JAZelAudio/JAIZelAnime.cpp
@@ -3,25 +3,25 @@
 // Translation Unit: JAIZelAnime.cpp
 //
 
-#include "JSystem/JAudio/JAIZelAnime.h"
+#include "JAZelAudio/JAIZelAnime.h"
 #include "dolphin/types.h"
 
 /* 802AC830-802AC888       .text setAnimSound__11JAIZelAnimeFP3VecffUlSc */
-void JAIZelAnime::setAnimSound(Vec*, float, float, unsigned long, signed char) {
+void JAIZelAnime::setAnimSound(Vec*, f32, f32, u32, s8) {
     /* Nonmatching */
 }
 
 /* 802AC888-802ACD34       .text startAnimSound__11JAIZelAnimeFPvUlPP8JAISoundPQ27JAInter5ActorUc */
-void JAIZelAnime::startAnimSound(void*, unsigned long, JAISound**, JAInter::Actor*, unsigned char) {
+void JAIZelAnime::startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8) {
     /* Nonmatching */
 }
 
 /* 802ACD34-802ACFA0       .text setSpeedModifySound__11JAIZelAnimeFP8JAISoundP22JAIAnimeFrameSoundDataf */
-void JAIZelAnime::setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, float) {
+void JAIZelAnime::setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32) {
     /* Nonmatching */
 }
 
 /* 802ACFA0-802AD008       .text setPlayPosition__11JAIZelAnimeFf */
-void JAIZelAnime::setPlayPosition(float) {
+void JAIZelAnime::setPlayPosition(f32) {
     /* Nonmatching */
 }
diff --git a/src/JAZelAudio/JAIZelAtmos.cpp b/src/JAZelAudio/JAIZelAtmos.cpp
index 3d0f97a61..2bd49664b 100644
--- a/src/JAZelAudio/JAIZelAtmos.cpp
+++ b/src/JAZelAudio/JAIZelAtmos.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: JAIZelAtmos.cpp
 //
 
-#include "JSystem/JAudio/JAIZelAtmos.h"
+#include "JAZelAudio/JAIZelBasic.h"
 #include "dolphin/types.h"
 
 /* 802AD008-802AD014       .text initSeaEnvPos__11JAIZelBasicFv */
@@ -17,7 +17,7 @@ void JAIZelBasic::registSeaEnvPos(Vec*) {
 }
 
 /* 802AD0A8-802AD54C       .text seaEnvSePlay__11JAIZelBasicFUlSc */
-void JAIZelBasic::seaEnvSePlay(unsigned long, signed char) {
+void JAIZelBasic::seaEnvSePlay(u32, s8) {
     /* Nonmatching */
 }
 
@@ -27,17 +27,17 @@ void JAIZelBasic::calcPosPanLR(Vec*) {
 }
 
 /* 802AD63C-802AD728       .text calcPosPanSR__11JAIZelBasicFP3Vecf */
-void JAIZelBasic::calcPosPanSR(Vec*, float) {
+void JAIZelBasic::calcPosPanSR(Vec*, f32) {
     /* Nonmatching */
 }
 
 /* 802AD728-802AD878       .text calcPosVolume__11JAIZelBasicFP3Vecf */
-void JAIZelBasic::calcPosVolume(Vec*, float) {
+void JAIZelBasic::calcPosVolume(Vec*, f32) {
     /* Nonmatching */
 }
 
 /* 802AD878-802AD98C       .text seaShoreSE__11JAIZelBasicFUlP3VecUlSc */
-void JAIZelBasic::seaShoreSE(unsigned long, Vec*, unsigned long, signed char) {
+void JAIZelBasic::seaShoreSE(u32, Vec*, u32, s8) {
     /* Nonmatching */
 }
 
@@ -52,12 +52,12 @@ void JAIZelBasic::registRiverPos(Vec*) {
 }
 
 /* 802ADB38-802ADC58       .text riverSePlay__11JAIZelBasicFUcSc */
-void JAIZelBasic::riverSePlay(unsigned char, signed char) {
+void JAIZelBasic::riverSePlay(u8, s8) {
     /* Nonmatching */
 }
 
 /* 802ADC58-802ADE68       .text waterfallSePlay__11JAIZelBasicFUcP3VecSc */
-void JAIZelBasic::waterfallSePlay(unsigned char, Vec*, signed char) {
+void JAIZelBasic::waterfallSePlay(u8, Vec*, s8) {
     /* Nonmatching */
 }
 
@@ -72,6 +72,6 @@ void JAIZelBasic::registWindowPos(Vec*) {
 }
 
 /* 802ADF20-802AE04C       .text rainPlay__11JAIZelBasicFl */
-void JAIZelBasic::rainPlay(long) {
+void JAIZelBasic::rainPlay(s32) {
     /* Nonmatching */
 }
diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp
index 82f99e612..951471956 100644
--- a/src/JAZelAudio/JAIZelBasic.cpp
+++ b/src/JAZelAudio/JAIZelBasic.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: JAIZelBasic.cpp
 //
 
-#include "JSystem/JAudio/JAIZelBasic.h"
+#include "JAZelAudio/JAIZelBasic.h"
 #include "dolphin/types.h"
 
 /* 802A1C78-802A1EB4       .text __ct__11JAIZelBasicFv */
@@ -42,7 +42,7 @@ void JAIZelBasic::resetRecover() {
 }
 
 /* 802A334C-802A33D0       .text bgmStreamPrepare__11JAIZelBasicFUl */
-void JAIZelBasic::bgmStreamPrepare(unsigned long) {
+void JAIZelBasic::bgmStreamPrepare(u32) {
     /* Nonmatching */
 }
 
@@ -52,22 +52,22 @@ void JAIZelBasic::bgmStreamPlay() {
 }
 
 /* 802A34A4-802A4658       .text bgmStart__11JAIZelBasicFUlUll */
-void JAIZelBasic::bgmStart(unsigned long, unsigned long, long) {
+void JAIZelBasic::bgmStart(u32, u32, s32) {
     /* Nonmatching */
 }
 
 /* 802A4658-802A4770       .text bgmStop__11JAIZelBasicFUll */
-void JAIZelBasic::bgmStop(unsigned long, long) {
+void JAIZelBasic::bgmStop(u32, s32) {
     /* Nonmatching */
 }
 
 /* 802A4770-802A47B8       .text mainBgmStopOnly__11JAIZelBasicFUl */
-void JAIZelBasic::mainBgmStopOnly(unsigned long) {
+void JAIZelBasic::mainBgmStopOnly(u32) {
     /* Nonmatching */
 }
 
 /* 802A47B8-802A4CDC       .text subBgmStart__11JAIZelBasicFUl */
-void JAIZelBasic::subBgmStart(unsigned long) {
+void JAIZelBasic::subBgmStart(u32) {
     /* Nonmatching */
 }
 
@@ -82,7 +82,7 @@ void JAIZelBasic::subBgmStopInner() {
 }
 
 /* 802A4EB8-802A53B4       .text bgmNowBattle__11JAIZelBasicFf */
-void JAIZelBasic::bgmNowBattle(float) {
+void JAIZelBasic::bgmNowBattle(f32) {
     /* Nonmatching */
 }
 
@@ -102,12 +102,12 @@ void JAIZelBasic::bgmNowKaitengiri() {
 }
 
 /* 802A564C-802A579C       .text bgmHitSound__11JAIZelBasicFl */
-void JAIZelBasic::bgmHitSound(long) {
+void JAIZelBasic::bgmHitSound(s32) {
     /* Nonmatching */
 }
 
 /* 802A579C-802A57A4       .text bgmSetSwordUsing__11JAIZelBasicFl */
-void JAIZelBasic::bgmSetSwordUsing(long) {
+void JAIZelBasic::bgmSetSwordUsing(s32) {
     /* Nonmatching */
 }
 
@@ -122,7 +122,7 @@ void JAIZelBasic::mbossBgmMuteProcess() {
 }
 
 /* 802A591C-802A59B0       .text mbossBgmNearByProcess__11JAIZelBasicFf */
-void JAIZelBasic::mbossBgmNearByProcess(float) {
+void JAIZelBasic::mbossBgmNearByProcess(f32) {
     /* Nonmatching */
 }
 
@@ -152,12 +152,12 @@ void JAIZelBasic::checkPlayingStreamBgmFlag() {
 }
 
 /* 802A5A40-802A5A78       .text changeBgmStatus__11JAIZelBasicFl */
-void JAIZelBasic::changeBgmStatus(long) {
+void JAIZelBasic::changeBgmStatus(s32) {
     /* Nonmatching */
 }
 
 /* 802A5A78-802A5AC0       .text changeSubBgmStatus__11JAIZelBasicFl */
-void JAIZelBasic::changeSubBgmStatus(long) {
+void JAIZelBasic::changeSubBgmStatus(s32) {
     /* Nonmatching */
 }
 
@@ -177,7 +177,7 @@ void JAIZelBasic::enemyNearByGFrame() {
 }
 
 /* 802A5C8C-802A5D0C       .text bgmAllMute__11JAIZelBasicFUl */
-void JAIZelBasic::bgmAllMute(unsigned long) {
+void JAIZelBasic::bgmAllMute(u32) {
     /* Nonmatching */
 }
 
@@ -212,7 +212,7 @@ void JAIZelBasic::checkCbPracticePlay() {
 }
 
 /* 802A6570-802A659C       .text prepareLandingDemo__11JAIZelBasicFl */
-void JAIZelBasic::prepareLandingDemo(long) {
+void JAIZelBasic::prepareLandingDemo(s32) {
     /* Nonmatching */
 }
 
@@ -232,22 +232,22 @@ void JAIZelBasic::initSe() {
 }
 
 /* 802A6720-802A8550       .text seStart__11JAIZelBasicFUlP3VecUlScffffUc */
-void JAIZelBasic::seStart(unsigned long, Vec*, unsigned long, signed char, float, float, float, float, unsigned char) {
+void JAIZelBasic::seStart(u32, Vec*, u32, s8, f32, f32, f32, f32, u8) {
     /* Nonmatching */
 }
 
 /* 802A8550-802A85F4       .text seStop__11JAIZelBasicFUll */
-void JAIZelBasic::seStop(unsigned long, long) {
+void JAIZelBasic::seStop(u32, s32) {
     /* Nonmatching */
 }
 
 /* 802A85F4-802A8634       .text checkSePlaying__11JAIZelBasicFUl */
-void JAIZelBasic::checkSePlaying(unsigned long) {
+void JAIZelBasic::checkSePlaying(u32) {
     /* Nonmatching */
 }
 
 /* 802A8634-802A8688       .text seStopActor__11JAIZelBasicFP3VecUl */
-void JAIZelBasic::seStopActor(Vec*, unsigned long) {
+void JAIZelBasic::seStopActor(Vec*, u32) {
     /* Nonmatching */
 }
 
@@ -257,12 +257,12 @@ void JAIZelBasic::seDeleteObject(Vec*) {
 }
 
 /* 802A86A8-802A8748       .text getLinkVoiceVowel__11JAIZelBasicFUl */
-void JAIZelBasic::getLinkVoiceVowel(unsigned long) {
+u8 JAIZelBasic::getLinkVoiceVowel(u32) {
     /* Nonmatching */
 }
 
 /* 802A8748-802A892C       .text linkVoiceStart__11JAIZelBasicFUlP3VecUcSc */
-void JAIZelBasic::linkVoiceStart(unsigned long, Vec*, unsigned char, signed char) {
+void JAIZelBasic::linkVoiceStart(u32, Vec*, u8, s8) {
     /* Nonmatching */
 }
 
@@ -272,22 +272,22 @@ void JAIZelBasic::monsSeInit() {
 }
 
 /* 802A8958-802A8B24       .text monsSeStart__11JAIZelBasicFUlP3VecUlUlSc */
-void JAIZelBasic::monsSeStart(unsigned long, Vec*, unsigned long, unsigned long, signed char) {
+void JAIZelBasic::monsSeStart(u32, Vec*, u32, u32, s8) {
     /* Nonmatching */
 }
 
 /* 802A8B24-802A8BE4       .text kuroboMotionPlay__11JAIZelBasicFUlP3VecUlSc */
-void JAIZelBasic::kuroboMotionPlay(unsigned long, Vec*, unsigned long, signed char) {
+void JAIZelBasic::kuroboMotionPlay(u32, Vec*, u32, s8) {
     /* Nonmatching */
 }
 
 /* 802A8BE4-802A8CB4       .text kuroboVoicePlay__11JAIZelBasicFUlP3VecSc */
-void JAIZelBasic::kuroboVoicePlay(unsigned long, Vec*, signed char) {
+void JAIZelBasic::kuroboVoicePlay(u32, Vec*, s8) {
     /* Nonmatching */
 }
 
 /* 802A8CB4-802A8F58       .text setLevObjSE__11JAIZelBasicFUlP3VecSc */
-void JAIZelBasic::setLevObjSE(unsigned long, Vec*, signed char) {
+void JAIZelBasic::setLevObjSE(u32, Vec*, s8) {
     /* Nonmatching */
 }
 
@@ -302,32 +302,32 @@ void JAIZelBasic::initLevObjSE() {
 }
 
 /* 802A9120-802A91CC       .text charVoicePlay__11JAIZelBasicFllP3VecSc */
-void JAIZelBasic::charVoicePlay(long, long, Vec*, signed char) {
+void JAIZelBasic::charVoicePlay(s32, s32, Vec*, s8) {
     /* Nonmatching */
 }
 
 /* 802A91CC-802A92CC       .text messageSePlay__11JAIZelBasicFUsP3VecSc */
-void JAIZelBasic::messageSePlay(unsigned short, Vec*, signed char) {
+void JAIZelBasic::messageSePlay(u16, Vec*, s8) {
     /* Nonmatching */
 }
 
 /* 802A92CC-802A965C       .text shipCruiseSePlay__11JAIZelBasicFP3Vecf */
-void JAIZelBasic::shipCruiseSePlay(Vec*, float) {
+void JAIZelBasic::shipCruiseSePlay(Vec*, f32) {
     /* Nonmatching */
 }
 
 /* 802A965C-802A9664       .text setShipSailState__11JAIZelBasicFl */
-void JAIZelBasic::setShipSailState(long) {
+void JAIZelBasic::setShipSailState(s32) {
     /* Nonmatching */
 }
 
 /* 802A9664-802A9874       .text init__11JAIZelBasicFP12JKRSolidHeapUl */
-void JAIZelBasic::init(JKRSolidHeap*, unsigned long) {
+void JAIZelBasic::init(JKRSolidHeap*, u32) {
     /* Nonmatching */
 }
 
 /* 802A9874-802A98A0       .text setOutputMode__11JAIZelBasicFUl */
-void JAIZelBasic::setOutputMode(unsigned long) {
+void JAIZelBasic::setOutputMode(u32) {
     /* Nonmatching */
 }
 
@@ -352,12 +352,12 @@ void JAIZelBasic::menuOut() {
 }
 
 /* 802A9CF8-802A9DB0       .text getCameraInfo__11JAIZelBasicFP3VecPA4_fUl */
-void JAIZelBasic::getCameraInfo(Vec*, float(*)[4], unsigned long) {
+void JAIZelBasic::getCameraInfo(Vec*, f32(*)[4], u32) {
     /* Nonmatching */
 }
 
 /* 802A9DB0-802A9DB8       .text getCameraMapInfo__11JAIZelBasicFUl */
-void JAIZelBasic::getCameraMapInfo(unsigned long) {
+void JAIZelBasic::getCameraMapInfo(u32) {
     /* Nonmatching */
 }
 
@@ -367,7 +367,7 @@ void JAIZelBasic::setCameraPolygonPos(Vec*) {
 }
 
 /* 802A9DDC-802A9F60       .text setCameraGroupInfo__11JAIZelBasicFUc */
-void JAIZelBasic::setCameraGroupInfo(unsigned char) {
+void JAIZelBasic::setCameraGroupInfo(u8) {
     /* Nonmatching */
 }
 
@@ -382,32 +382,32 @@ void JAIZelBasic::startIsleBgm() {
 }
 
 /* 802AA348-802AA378       .text setLinkGroupInfo__11JAIZelBasicFUc */
-void JAIZelBasic::setLinkGroupInfo(unsigned char) {
+void JAIZelBasic::setLinkGroupInfo(u8) {
     /* Nonmatching */
 }
 
 /* 802AA378-802AA380       .text getMapInfoFxline__11JAIZelBasicFUl */
-void JAIZelBasic::getMapInfoFxline(unsigned long) {
+void JAIZelBasic::getMapInfoFxline(u32) {
     /* Nonmatching */
 }
 
 /* 802AA380-802AA388       .text getMapInfoFxParameter__11JAIZelBasicFUl */
-void JAIZelBasic::getMapInfoFxParameter(unsigned long) {
+void JAIZelBasic::getMapInfoFxParameter(u32) {
     /* Nonmatching */
 }
 
 /* 802AA388-802AA390       .text getMapInfoGround__11JAIZelBasicFUl */
-void JAIZelBasic::getMapInfoGround(unsigned long) {
+void JAIZelBasic::getMapInfoGround(u32) {
     /* Nonmatching */
 }
 
 /* 802AA390-802AACE8       .text setScene__11JAIZelBasicFllll */
-void JAIZelBasic::setScene(long, long, long, long) {
+void JAIZelBasic::setScene(s32, s32, s32, s32) {
     /* Nonmatching */
 }
 
 /* 802AACE8-802AAD0C       .text expandSceneBgmNum__11JAIZelBasicFUl */
-void JAIZelBasic::expandSceneBgmNum(unsigned long) {
+void JAIZelBasic::expandSceneBgmNum(u32) {
     /* Nonmatching */
 }
 
@@ -422,7 +422,7 @@ void JAIZelBasic::checkLinkOnBoardSea() {
 }
 
 /* 802AAD94-802AAE80       .text setSceneName__11JAIZelBasicFPcll */
-void JAIZelBasic::setSceneName(char*, long, long) {
+void JAIZelBasic::setSceneName(char*, s32, s32) {
     /* Nonmatching */
 }
 
@@ -432,7 +432,7 @@ void JAIZelBasic::spotNameToId(char*) {
 }
 
 /* 802AAF04-802AB204       .text sceneChange__11JAIZelBasicFUlUlUll */
-void JAIZelBasic::sceneChange(unsigned long, unsigned long, unsigned long, long) {
+void JAIZelBasic::sceneChange(u32, u32, u32, s32) {
     /* Nonmatching */
 }
 
@@ -447,7 +447,7 @@ void JAIZelBasic::load1stDynamicWave() {
 }
 
 /* 802AB678-802AB6F4       .text check1stDynamicWave__11JAIZelBasicFv */
-void JAIZelBasic::check1stDynamicWave() {
+BOOL JAIZelBasic::check1stDynamicWave() {
     /* Nonmatching */
 }
 
@@ -467,37 +467,37 @@ BOOL JAIZelBasic::checkFirstWaves() {
 }
 
 /* 802AB8B0-802AB9F4       .text setLinkHp__11JAIZelBasicFll */
-void JAIZelBasic::setLinkHp(long, long) {
+void JAIZelBasic::setLinkHp(s32, s32) {
     /* Nonmatching */
 }
 
 /* 802AB9F4-802ABA44       .text setLinkSwordType__11JAIZelBasicFll */
-void JAIZelBasic::setLinkSwordType(long, long) {
+void JAIZelBasic::setLinkSwordType(s32, s32) {
     /* Nonmatching */
 }
 
 /* 802ABA44-802ABA94       .text setLinkShieldType__11JAIZelBasicFll */
-void JAIZelBasic::setLinkShieldType(long, long) {
+void JAIZelBasic::setLinkShieldType(s32, s32) {
     /* Nonmatching */
 }
 
 /* 802ABA94-802ABA9C       .text setLinkBootsType__11JAIZelBasicFl */
-void JAIZelBasic::setLinkBootsType(long) {
+void JAIZelBasic::setLinkBootsType(s32) {
     /* Nonmatching */
 }
 
 /* 802ABA9C-802ABB18       .text setLinkOnBoard__11JAIZelBasicFl */
-void JAIZelBasic::setLinkOnBoard(long) {
+void JAIZelBasic::setLinkOnBoard(s32) {
     /* Nonmatching */
 }
 
 /* 802ABB18-802ABBD0       .text bgmMute__11JAIZelBasicFPP8JAISoundUllUl */
-void JAIZelBasic::bgmMute(JAISound**, unsigned long, long, unsigned long) {
+void JAIZelBasic::bgmMute(JAISound**, u32, s32, u32) {
     /* Nonmatching */
 }
 
 /* 802ABBD0-802ABC3C       .text checkStreamPlaying__11JAIZelBasicFUl */
-void JAIZelBasic::checkStreamPlaying(unsigned long) {
+void JAIZelBasic::checkStreamPlaying(u32) {
     /* Nonmatching */
 }
 
@@ -522,7 +522,7 @@ void JAIZelBasic::stSkyCloistersProcess() {
 }
 
 /* 802ABDE0-802ABE10       .text getRandomU32__11JAIZelBasicFUl */
-void JAIZelBasic::getRandomU32(unsigned long) {
+void JAIZelBasic::getRandomU32(u32) {
     /* Nonmatching */
 }
 
@@ -532,7 +532,7 @@ void JAIZelBasic::setEventBit(void*) {
 }
 
 /* 802ABE18-802ABE50       .text checkEventBit__11JAIZelBasicFUs */
-void JAIZelBasic::checkEventBit(unsigned short) {
+void JAIZelBasic::checkEventBit(u16) {
     /* Nonmatching */
 }
 
@@ -552,17 +552,17 @@ void JAIZelBasic::processMorningToNormal() {
 }
 
 /* 802ABFC0-802AC1BC       .text checkOnOuterSea__11JAIZelBasicFPf */
-void JAIZelBasic::checkOnOuterSea(float*) {
+void JAIZelBasic::checkOnOuterSea(f32*) {
     /* Nonmatching */
 }
 
 /* 802AC1BC-802AC258       .text makeSound__11JAIZelBasicFUl */
-void JAIZelBasic::makeSound(unsigned long) {
+void JAIZelBasic::makeSound(u32) {
     /* Nonmatching */
 }
 
 /* 802AC258-802AC300       .text checkSeqIDDemoPlaying__11JAIZelBasicFUl */
-void JAIZelBasic::checkSeqIDDemoPlaying(unsigned long) {
+void JAIZelBasic::checkSeqIDDemoPlaying(u32) {
     /* Nonmatching */
 }
 
@@ -587,7 +587,7 @@ void JAIZelBasic::unmuteMainBgmAll() {
 }
 
 /* 802AC6C0-802AC758       .text demoBgmStop__11JAIZelBasicFUl */
-void JAIZelBasic::demoBgmStop(unsigned long) {
+void JAIZelBasic::demoBgmStop(u32) {
     /* Nonmatching */
 }
 
@@ -600,8 +600,3 @@ void JAIZelBasic::isDemo() {
 void JAIZelBasic::checkSeaBgmID() {
     /* Nonmatching */
 }
-
-/* 802AC7E8-802AC830       .text __dt__11JAIZelSoundFv */
-JAIZelSound::~JAIZelSound() {
-    /* Nonmatching */
-}
diff --git a/src/JAZelAudio/JAIZelCharVoiceTable.cpp b/src/JAZelAudio/JAIZelCharVoiceTable.cpp
index b12995dff..72360119a 100644
--- a/src/JAZelAudio/JAIZelCharVoiceTable.cpp
+++ b/src/JAZelAudio/JAIZelCharVoiceTable.cpp
@@ -3,5 +3,5 @@
 // Translation Unit: JAIZelCharVoiceTable.cpp
 //
 
-#include "JSystem/JAudio/JAIZelCharVoiceTable.h"
+#include "JAZelAudio/JAIZelBasic.h"
 #include "dolphin/types.h"
diff --git a/src/JAZelAudio/JAIZelInst.cpp b/src/JAZelAudio/JAIZelInst.cpp
index a0df2f4ab..166d24086 100644
--- a/src/JAZelAudio/JAIZelInst.cpp
+++ b/src/JAZelAudio/JAIZelInst.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: JAIZelInst.cpp
 //
 
-#include "JSystem/JAudio/JAIZelInst.h"
+#include "JAZelAudio/JAIZelInst.h"
 #include "dolphin/types.h"
 
 /* 802AE04C-802AE0B4       .text __ct__10JAIZelInstFv */
@@ -17,7 +17,7 @@ void JAIZelInst::reset() {
 }
 
 /* 802AE1C0-802AE278       .text playArmSwing__10JAIZelInstFll */
-void JAIZelInst::playArmSwing(long, long) {
+void JAIZelInst::playArmSwing(s32, s32) {
     /* Nonmatching */
 }
 
@@ -27,7 +27,7 @@ void JAIZelInst::stopArmSwing() {
 }
 
 /* 802AE2B8-802AE444       .text setStickPos__10JAIZelInstFll */
-void JAIZelInst::setStickPos(long, long) {
+void JAIZelInst::setStickPos(s32, s32) {
     /* Nonmatching */
 }
 
@@ -37,22 +37,22 @@ void JAIZelInst::play() {
 }
 
 /* 802AE4B4-802AE590       .text setBeat__10JAIZelInstFl */
-void JAIZelInst::setBeat(long) {
+void JAIZelInst::setBeat(s32) {
     /* Nonmatching */
 }
 
 /* 802AE590-802AE5D0       .text setVolume__10JAIZelInstFf */
-void JAIZelInst::setVolume(float) {
+void JAIZelInst::setVolume(f32) {
     /* Nonmatching */
 }
 
 /* 802AE5D0-802AE864       .text metronomePlay__10JAIZelInstFll */
-void JAIZelInst::metronomePlay(long, long) {
+void JAIZelInst::metronomePlay(s32, s32) {
     /* Nonmatching */
 }
 
 /* 802AE864-802AEB5C       .text judge__10JAIZelInstFll */
-void JAIZelInst::judge(long, long) {
+void JAIZelInst::judge(s32, s32) {
     /* Nonmatching */
 }
 
@@ -62,27 +62,27 @@ void JAIZelInst::ambientPlay() {
 }
 
 /* 802AEC50-802AECC0       .text armSoundPlay__10JAIZelInstFl */
-void JAIZelInst::armSoundPlay(long) {
+void JAIZelInst::armSoundPlay(s32) {
     /* Nonmatching */
 }
 
 /* 802AECC0-802AED48       .text getMelodyPattern__10JAIZelInstFllPl */
-void JAIZelInst::getMelodyPattern(long, long, long*) {
+f32 JAIZelInst::getMelodyPattern(s32, s32, s32*) {
     /* Nonmatching */
 }
 
 /* 802AED48-802AEDB8       .text getMelodyBeat__10JAIZelInstFl */
-void JAIZelInst::getMelodyBeat(long) {
+void JAIZelInst::getMelodyBeat(s32) {
     /* Nonmatching */
 }
 
 /* 802AEDB8-802AEE1C       .text getMelodyGFrames__10JAIZelInstFl */
-void JAIZelInst::getMelodyGFrames(long) {
+void JAIZelInst::getMelodyGFrames(s32) {
     /* Nonmatching */
 }
 
 /* 802AEE1C-802AEEA8       .text melodyPlay__10JAIZelInstFl */
-void JAIZelInst::melodyPlay(long) {
+void JAIZelInst::melodyPlay(s32) {
     /* Nonmatching */
 }
 
diff --git a/src/JAZelAudio/JAIZelParam.cpp b/src/JAZelAudio/JAIZelParam.cpp
index c9c2a0dfb..54fbe7b4b 100644
--- a/src/JAZelAudio/JAIZelParam.cpp
+++ b/src/JAZelAudio/JAIZelParam.cpp
@@ -3,5 +3,6 @@
 // Translation Unit: JAIZelParam.cpp
 //
 
-#include "JSystem/JAudio/JAIZelParam.h"
+#include "JAZelAudio/JAIZelParam.h"
+#include "JAZelAudio/JAIZelBasic.h"
 #include "dolphin/types.h"
diff --git a/src/JAZelAudio/JAIZelScene.cpp b/src/JAZelAudio/JAIZelScene.cpp
index 5bea1dd35..7524dde45 100644
--- a/src/JAZelAudio/JAIZelScene.cpp
+++ b/src/JAZelAudio/JAIZelScene.cpp
@@ -3,5 +3,5 @@
 // Translation Unit: JAIZelScene.cpp
 //
 
-#include "JSystem/JAudio/JAIZelScene.h"
+#include "JAZelAudio/JAIZelBasic.h"
 #include "dolphin/types.h"
diff --git a/src/JAZelAudio/JAIZelSound.cpp b/src/JAZelAudio/JAIZelSound.cpp
index 12dc36f6e..9d6076ed1 100644
--- a/src/JAZelAudio/JAIZelSound.cpp
+++ b/src/JAZelAudio/JAIZelSound.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: JAIZelSound.cpp
 //
 
-#include "JSystem/JAudio/JAIZelSound.h"
+#include "JAZelAudio/JAIZelSound.h"
 #include "dolphin/types.h"
 
 /* 802AEF64-802AEFA0       .text __ct__11JAIZelSoundFv */
@@ -12,21 +12,21 @@ JAIZelSound::JAIZelSound() {
 }
 
 /* 802AEFA0-802AF19C       .text setDistanceVolumeCommon__11JAIZelSoundFfUc */
-void JAIZelSound::setDistanceVolumeCommon(float, unsigned char) {
+void JAIZelSound::setDistanceVolumeCommon(f32, u8) {
     /* Nonmatching */
 }
 
 /* 802AF19C-802AF2A0       .text setSeDistanceVolume__11JAIZelSoundFUc */
-void JAIZelSound::setSeDistanceVolume(unsigned char) {
+void JAIZelSound::setSeDistanceVolume(u8) {
     /* Nonmatching */
 }
 
 /* 802AF2A0-802AF314       .text setSeDistancePan__11JAIZelSoundFUc */
-void JAIZelSound::setSeDistancePan(unsigned char) {
+void JAIZelSound::setSeDistancePan(u8) {
     /* Nonmatching */
 }
 
 /* 802AF314-802AF458       .text setSeDistanceDolby__11JAIZelSoundFUc */
-void JAIZelSound::setSeDistanceDolby(unsigned char) {
+void JAIZelSound::setSeDistanceDolby(u8) {
     /* Nonmatching */
 }