Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 66 additions & 5 deletions include/Inagaki/GameSoundMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class KartSoundMgr : public SoundMgr<KartSoundMgr>
public:
KartSoundMgr(Vec *, JKRHeap *, u8, u8); // 0x80123118
~KartSoundMgr(); // 0x80123328
void startSoundHandleNumber(u8, u32, u32); // 0x801233fc
virtual void startSoundHandleNumber(u8, u32, u32); // 0x801233fc
virtual void dispose(); // 0x801236d0
virtual void init(); // 0x80123708
void changeDriver(bool); // 0x80123ad4
Expand Down Expand Up @@ -226,24 +226,81 @@ class KartSoundMgr : public SoundMgr<KartSoundMgr>
void clearInvincibleBgm(u8); // 0x80128c30
void setChibiFlag(bool, bool); // 0x80128e98

// UNUSED {
void startSoundEngine(u8, u32);
void changeAttribute(u8);
void checkCourseSound(u8);
void setHandleVolume(JAISoundHandle&, f32);
void setWaterDepth(f32);
void getEngineIDOffsetAtt();
// } UNUSED

static u8 smKartCount;
static u8 smEntryKartCount;
static u8 smGoalKartCount;

static u8 smKartRankClassMem[7];

u8 _5c[0x61 - 0x5c];
u8 _5c;
u8 _5d;
u8 _5e;
u8 _5f;
u8 _60;
u8 _61;
u8 mKartCount; // 62
u8 _63;
u8 _64;
u8 _65;
u8 _66;
u8 _67[0x6c - 0x67];
u8 _67;
f32 _68;
f32 _6c;
u8 _70[0x8d - 0x70];
f32 _70;
u32 _74;
u32 _78;
u32 _7c;
u32 _80;
f32 _84;
f32 _88;
u8 _8c;
u8 _8d;
u8 _8e[0x134 - 0x8e];
u16 _8e;
u16 _90;
u16 _92;
u16 _94;
u16 _96;
f32 _98;
u8 _9c;
u8 _9d[3]; // padding
f32 _a0;
f32 _a4[4];
f32 _b4[4];
f32 _c4[4];
f32 _d4[4];
u8 _e4[4];
u8 _e8[4];
f32 _ec;
f32 _f0;
u32 _f4;
u16 _f8;
u8 _fa[2]; // padding
f32 _fc;
u8 _100;
u8 _101;
u8 _102;
u8 _103;
u8 _104;
u8 _105;
u8 _106[0x110 - 0x106];
f32 _110;
f32 _114;
u8 _118[0x11c - 0x118];
u32 _11c;
f32 _120;
f32 mCameraVolume; // 124
u8 _128[0x12c - 0x128];
u32 _12c;
CrsArea* _130;
};

class CharacterSoundMgr : public SoundMgr<CharacterSoundMgr> {
Expand Down Expand Up @@ -346,6 +403,10 @@ class ShoreSoundMgr : public SoundMgr<ShoreSoundMgr> {
private:
static CustomAudience<4> *smAudience; // 0x80416278

JGeometry::TVec3f& getPlayPos(s32 index) { // fabricated
return _64[index];
}

u8 _5c;
u8 _5d;
u8 _5e[0x60 - 0x5e]; // padding?
Expand Down
14 changes: 14 additions & 0 deletions include/JSystem/JAudio/Interface/JAISound.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,20 @@ struct JAISoundFader
mIntensity = 0.0f;
fadeIn(fadeCount);
}

// Same as fadeInFromOut but branching order is inversed
// Needed by KartSoundMgr...
void fadeInFromOut2(u32 fadeCount)
{
mIntensity = 0.f;
if (fadeCount != 0) {
mTransition.set(1.0f, mIntensity, fadeCount);
}
else
{
forceIn();
}
}
bool isOut() { return (mTransition.mCount == 0 && mIntensity < 0.01f); }
void calc() { mIntensity = mTransition.apply(mIntensity); }
f32 getIntensity() { return mIntensity; }
Expand Down
Loading
Loading