m_Do / d_a_npc work

This commit is contained in:
TakaRikka
2022-06-01 03:49:32 -07:00
parent 36e62e0b80
commit 3f22fa4483
63 changed files with 925 additions and 963 deletions
+1 -5
View File
@@ -38,11 +38,7 @@ public:
/* 0x04A4 */ Z2SceneMgr mSceneMgr;
/* 0x04C4 */ Z2StatusMgr mStatusMgr;
/* 0x04F4 */ Z2SoundObjMgr mSoundObjMgr;
/* 0x0514 */ /* virtual */ void startSound(JAISoundID, JAISoundHandle*,
JGeometry::TVec3<f32> const*);
/* 0x0514 */ void* vtable; // remove later
/* 0x0514 */ virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
/* 0x0518 */ bool mResettingFlag;
/* 0x0519 */ bool field_0x519;
/* 0x051C */ JASAudioReseter mAudioReseter;
+45 -34
View File
@@ -4,18 +4,29 @@
#include "Z2AudioLib/Z2SoundObject.h"
#include "dolphin/types.h"
struct Z2WolfHowlData {};
/*
* Z2WolfHowlData
* mLineNum: Number of lines/points within the song
* mSongData: u16 array which corresponds to each line/point
*
* The high byte of each u16 line corresponds to bar type (low, middle, high)
* The low byte of each u16 line corresponds to length of note
*/
struct Z2WolfHowlData {
u8 mLineNum;
u16* mSongData;
};
class Z2WolfHowlMgr {
public:
Z2WolfHowlMgr();
void resetState();
void calcVolumeMod(float);
void calcVolumeMod(f32);
void getNowPitch();
void getNowInputValue();
void calcPitchMod(float, float);
void startWolfHowlSound(float, float, bool, float);
void calcPitchMod(f32, f32);
void startWolfHowlSound(f32, f32, bool, f32);
void setCorrectData(s8, Z2WolfHowlData*);
void getCorrectLine(u8);
void getCorrectLineNum();
@@ -29,37 +40,37 @@ private:
/* 0x00 */ JAISoundHandle* field_0x00;
/* 0x04 */ JAISoundHandle* field_0x04;
/* 0x08 */ JAISoundHandle* field_0x08;
/* 0x0C */ Z2WolfHowlData* field_0x0c;
/* 0x10 */ void* field_0x10;
/* 0x14 */ float mNowInputValue;
/* 0x18 */ float field_0x18;
/* 0x1C */ float field_0x1c;
/* 0x20 */ float field_0x20;
/* 0x24 */ float field_0x24;
/* 0x28 */ float field_0x28;
/* 0x0C */ Z2WolfHowlData* mpCurSong;
/* 0x10 */ Z2WolfHowlData** mpSongList;
/* 0x14 */ f32 mNowInputValue;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ u8 field_0x2c[4];
/* 0x30 */ float field_0x30;
/* 0x34 */ float field_0x34;
/* 0x38 */ float field_0x38;
/* 0x3C */ float field_0x3c;
/* 0x40 */ float field_0x40;
/* 0x44 */ float field_0x44;
/* 0x48 */ float field_0x48;
/* 0x4C */ float field_0x4c;
/* 0x50 */ float field_0x50;
/* 0x54 */ float field_0x54;
/* 0x58 */ float field_0x58;
/* 0x5C */ float field_0x5c;
/* 0x60 */ float field_0x60;
/* 0x64 */ float field_0x64;
/* 0x68 */ float field_0x68;
/* 0x6C */ float field_0x6c;
/* 0x70 */ float field_0x70;
/* 0x74 */ float field_0x74;
/* 0x78 */ float field_0x78;
/* 0x7C */ float field_0x7c;
/* 0x80 */ float field_0x80;
/* 0x84 */ float field_0x84;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
/* 0x64 */ f32 field_0x64;
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ f32 field_0x70;
/* 0x74 */ f32 field_0x74;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ f32 field_0x84;
/* 0x88 */ void* mTimer;
/* 0x8C */ u8 mReleaseTimer;
/* 0x8D */ u8 field_0x8d;