diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-12-19 11:06:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 12:06:32 -0700 |
| commit | ca71275bbecc7db9a4eeca3a6ac4215b66de4318 (patch) | |
| tree | c2851f8cec211216fe0cb6a31a0260a62fc3bf53 /include/Z2AudioLib | |
| parent | 1114b13da81ab0b52fd4bb56a32f32331a21e581 (diff) | |
big d_a_alink pass (#214)
* d_a_alink pass1 wip
* more d_a_alink work
* remove asm
* more daalink work
* 20% dol code decompiled
* fixed some nonmatchings for building
* a few daalink functions and labeling some HIO data
Diffstat (limited to 'include/Z2AudioLib')
| -rw-r--r-- | include/Z2AudioLib/Z2Creature.h | 4 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SoundHandles.h | 2 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SoundMgr.h | 3 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SoundObject.h | 16 |
4 files changed, 23 insertions, 2 deletions
diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 2d92cdce46..64e2a8e7f9 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -72,6 +72,10 @@ public: int startHitItemSE(u32, u32, Z2SoundObjBase*, float); void setResumeAttack(bool); + void setInWater(bool status) { + mFlags = (u8)((mFlags & ~0x40) | ((status << 6) & 0x40)); // what is going on here + } + static Z2CreatureLink* mLinkPtr; private: diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h index 51414f3d70..8e43695b6e 100644 --- a/include/Z2AudioLib/Z2SoundHandles.h +++ b/include/Z2AudioLib/Z2SoundHandles.h @@ -29,7 +29,7 @@ public: u32 getNumHandles() const { return this->getNumLinks(); } private: - u8 mNumHandles; + /* 0xC */ u8 mNumHandles; }; #endif /* Z2SOUNDHANDLES_H */ diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index 7d90ecfc62..8070294ba8 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -27,6 +27,9 @@ public: /* 802A9EE8 */ /* virtual */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*); /* 0x000 */ void* vtable; // remove later + + JAISeMgr* getSeMgr() { return &mSeMgr; } + private: /* 0x004 */ JAISeMgr mSeMgr; /* 0x728 */ JAISeqMgr mSeqMgr; diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index 22fdd22cef..f5be57d208 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -72,14 +72,28 @@ public: }; class Z2DopplerSoundObjBase : public Z2SoundHandles { +public: Z2DopplerSoundObjBase(); ~Z2DopplerSoundObjBase(); - virtual void temp(); // temp to build OK, remove later virtual void framework(u32, s8); virtual void init(Vec*, u8); virtual void startSound(JAISoundID, u32, s8); virtual void startLevelSound(JAISoundID, u32, s8); + + /* 0x14 */ Z2SoundStarter* field_0x14; + /* 0x18 */ JGeometry::TVec3<f32>* field_0x18; + /* 0x1C */ u16 field_0x1c; + /* 0x1E */ u8 field_0x1e; + /* 0x1F */ bool field_0x1f; + /* 0x20 */ JGeometry::TVec3<f32> field_0x20; + /* 0x2C */ JGeometry::TVec3<f32> field_0x2c; +}; + +class Z2SoundObjArrow : public Z2DopplerSoundObjBase { +public: + /* 802BEB38 */ Z2SoundObjArrow(); + /* 802BEB74 */ virtual void init(Vec*, u8); }; #endif /* Z2SOUNDOBJECT_H */ |