Set up headers for all JAZelAudio TUs

This commit is contained in:
LagoLunatic
2023-11-06 02:05:53 -05:00
parent f7c8988e7e
commit f3eb54ccf8
16 changed files with 179 additions and 115 deletions
+17
View File
@@ -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 */
+14 -9
View File
@@ -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 */
+31
View File
@@ -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 */
+6
View File
@@ -0,0 +1,6 @@
#ifndef JAIZELPARAM_H
#define JAIZELPARAM_H
class JAIZelParam;
#endif /* JAIZELPARAM_H */
+17
View File
@@ -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 */
+2 -2
View File
@@ -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:
+1 -9
View File
@@ -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:
+2 -2
View File
@@ -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;