diff --git a/configure.py b/configure.py index cd172fe57..d0784e882 100644 --- a/configure.py +++ b/configure.py @@ -678,7 +678,7 @@ config.libs = [ Object(NonMatching, "JSystem/JAudio/JASDrumSet.cpp"), Object(NonMatching, "JSystem/JAudio/JASBasicWaveBank.cpp"), Object(NonMatching, "JSystem/JAudio/JASSimpleWaveBank.cpp"), - Object(NonMatching, "JSystem/JAudio/JASInstEffect.cpp"), + Object(Matching, "JSystem/JAudio/JASInstEffect.cpp"), Object(NonMatching, "JSystem/JAudio/JASInstSense.cpp"), Object(NonMatching, "JSystem/JAudio/JASInstRand.cpp"), Object(NonMatching, "JSystem/JAudio/JASWSParser.cpp"), diff --git a/include/JSystem/JAudio/JASInstEffect.h b/include/JSystem/JAudio/JASInstEffect.h new file mode 100644 index 000000000..78f4a56c4 --- /dev/null +++ b/include/JSystem/JAudio/JASInstEffect.h @@ -0,0 +1,17 @@ +#ifndef JASINSTEFFECT_H +#define JASINSTEFFECT_H + +#include "dolphin/types.h" + +namespace JASystem { + class TInstEffect { + public: + TInstEffect() { mTarget = 0; } + virtual f32 getY(int, int) const = 0; + void setTarget(int); + + /* 0x04 */ u8 mTarget; + }; +} + +#endif /* JASINSTEFFECT_H */ diff --git a/src/JSystem/JAudio/JASInstEffect.cpp b/src/JSystem/JAudio/JASInstEffect.cpp index a91f7cd29..aa3986ff4 100644 --- a/src/JSystem/JAudio/JASInstEffect.cpp +++ b/src/JSystem/JAudio/JASInstEffect.cpp @@ -3,11 +3,12 @@ // Translation Unit: JASInstEffect.cpp // -#include "JASInstEffect.h" -#include "dolphin/types.h" +#include "JSystem/JAudio/JASInstEffect.h" +#include "JSystem/JUtility/JUTAssert.h" /* 8028684C-802868F0 .text setTarget__Q28JASystem11TInstEffectFi */ -void JASystem::TInstEffect::setTarget(int) { - /* Nonmatching */ +void JASystem::TInstEffect::setTarget(int target) { + JUT_ASSERT(16, target >= 0); + JUT_ASSERT(17, target < 256); + mTarget = target; } -