mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-08 22:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renames

Browse Source
This commit is contained in:
robojumper
2025-06-22 18:04:01 +02:00
parent 6af50ca383
commit 21eef4331b
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+6 -6
View File
@@ -1079,9 +1079,9 @@ holdSound__9dAcBase_cFUl = .text:0x8002D710; // type:function size:0x28
holdSoundWithIntParam__9dAcBase_cFUll = .text:0x8002D740; // type:function size:0x28
holdSoundWithFloatParam__9dAcBase_cFUlf = .text:0x8002D770; // type:function size:0x28
holdSoundWithParams__9dAcBase_cFUlfl = .text:0x8002D7A0; // type:function size:0x28
onSoundSourceFlag2__9dAcBase_cFUl = .text:0x8002D7D0; // type:function size:0x20
onSoundSourceFlag1__9dAcBase_cFUl = .text:0x8002D7F0; // type:function size:0x20
offSoundSourceFlag1__9dAcBase_cFUl = .text:0x8002D810; // type:function size:0x20
holdSoundSourceFlag__9dAcBase_cFUl = .text:0x8002D7D0; // type:function size:0x20
onSoundSourceFlag__9dAcBase_cFUl = .text:0x8002D7F0; // type:function size:0x20
offSoundSourceFlag__9dAcBase_cFUl = .text:0x8002D810; // type:function size:0x20
isPlayingSound__9dAcBase_cFUl = .text:0x8002D830; // type:function size:0x28
setBattleBgmRelated__9dAcBase_cFi = .text:0x8002D860; // type:function size:0x20
getSoundSource__9dAcBase_cFv = .text:0x8002D880; // type:function size:0x8
@@ -20592,7 +20592,7 @@ fn_80374DE0 = .text:0x80374DE0; // type:function size:0x58
fn_80374E40 = .text:0x80374E40; // type:function size:0x10
fn_80374E50 = .text:0x80374E50; // type:function size:0x330
checkFlag__14dSoundSource_cCFUl = .text:0x80375180; // type:function size:0x28
onFlag2__14dSoundSource_cFUl = .text:0x803751B0; // type:function size:0x10
holdFlag__14dSoundSource_cFUl = .text:0x803751B0; // type:function size:0x10
fn_803751C0 = .text:0x803751C0; // type:function size:0x70
fn_80375230 = .text:0x80375230; // type:function size:0xA4
fn_803752E0 = .text:0x803752E0; // type:function size:0xC8
@@ -21035,8 +21035,8 @@ vt_0xDC__14dSoundSource_cFv = .text:0x80385B10; // type:function size:0x8
startVoiceLine__14dSoundSource_cFUl = .text:0x80385B20; // type:function size:0x8
setCtxParam__14dSoundSource_cFPC17dSndSoundCtxParam = .text:0x80385B30; // type:function size:0x8
stopAllSound__14dSoundSource_cFl = .text:0x80385B40; // type:function size:0x8
offFlag1__14dSoundSource_cFUl = .text:0x80385B50; // type:function size:0x10
onFlag1__14dSoundSource_cFUl = .text:0x80385B60; // type:function size:0x10
offFlag__14dSoundSource_cFUl = .text:0x80385B50; // type:function size:0x10
onFlag__14dSoundSource_cFUl = .text:0x80385B60; // type:function size:0x10
setField0x102__14dSoundSource_cFUc = .text:0x80385B70; // type:function size:0x8
postSetup__14dSoundSource_cFv = .text:0x80385B80; // type:function size:0x4
vt_0x020__14dSoundSource_cFv = .text:0x80385B90; // type:function size:0x4
include/d/a/d_a_base.h
+3 -3
View File
@@ -217,9 +217,9 @@ public:
/* 8002d740 */ bool holdSoundWithIntParam(u32 soundId, s32 param);
/* 8002d770 */ bool holdSoundWithFloatParam(u32 soundId, f32 param);
/* 8002d7a0 */ bool holdSoundWithParams(u32 soundId, f32 fValue, s32 value);
/* 8002d7d0 */ void onSoundSourceFlag2(u32 mask);
/* 8002d7f0 */ void onSoundSourceFlag1(u32 mask);
/* 8002d810 */ void offSoundSourceFlag1(u32 mask);
/* 8002d7d0 */ void holdSoundSourceFlag(u32 mask);
/* 8002d7f0 */ void onSoundSourceFlag(u32 mask);
/* 8002d810 */ void offSoundSourceFlag(u32 mask);
/* 8002d830 */ bool isPlayingSound(u32 soundId);
/* 8002d860 */ void setBattleBgmRelated(UNKWORD val);
/* 8002d880 */ dSoundSourceIf_c *getSoundSource();
include/d/snd/d_snd_source.h
+9 -9
View File
@@ -113,17 +113,17 @@ public:
}
/* 0x028 */ virtual const nw4r::math::VEC3 &getListenerPosition() const override;
/* 0x02C */ void calc(const nw4r::math::VEC3 &) override;
/* 0x030 */ virtual void onFlag1(u32 mask) override {
field_0x104 |= mask;
/* 0x030 */ virtual void onFlag(u32 mask) override {
mFlagsPersistent |= mask;
}
/* 0x034 */ virtual void offFlag1(u32 mask) override {
field_0x104 &= ~mask;
/* 0x034 */ virtual void offFlag(u32 mask) override {
mFlagsPersistent &= ~mask;
}
/* 0x038 */ virtual bool checkFlag(u32 mask) const override {
return (field_0x104 & mask) != 0 || (field_0x108 & mask) != 0;
return (mFlagsPersistent & mask) != 0 || (mFlagsHold & mask) != 0;
}
/* 0x03C */ virtual void onFlag2(u32 mask) override {
field_0x108 |= mask;
/* 0x03C */ virtual void holdFlag(u32 mask) override {
mFlagsHold |= mask;
}
/* 0x040 */ virtual void stopAllSound(s32 fadeFrames) override {
SoundActor::StopAllSound(fadeFrames);
@@ -273,8 +273,8 @@ protected:
/* 0x100 */ u8 field_0x100;
/* 0x101 */ u8 field_0x101;
/* 0x102 */ u8 field_0x102;
/* 0x104 */ u32 field_0x104;
/* 0x108 */ u32 field_0x108;
/* 0x104 */ u32 mFlagsPersistent;
/* 0x108 */ u32 mFlagsHold;
/* 0x10C */ const dSndSoundCtxParam *mpCtxParam;
/* 0x110 */ LIST_MEMBER(dSndDistantSoundActor_c, DistantSound); // node offset 0xEC
/* 0x11C */ UNKWORD field_0x11C;
include/d/snd/d_snd_source_if.h
+3 -3
View File
@@ -38,10 +38,10 @@ public:
/* 0x024 */ virtual void setSubtype(u8 subtype) = 0;
/* 0x028 */ virtual const nw4r::math::VEC3 &getListenerPosition() const = 0;
/* 0x02C */ virtual void calc(const nw4r::math::VEC3 &) = 0;
/* 0x030 */ virtual void onFlag1(u32 mask) = 0;
/* 0x034 */ virtual void offFlag1(u32 mask) = 0;
/* 0x030 */ virtual void onFlag(u32 mask) = 0;
/* 0x034 */ virtual void offFlag(u32 mask) = 0;
/* 0x038 */ virtual bool checkFlag(u32 mask) const = 0;
/* 0x03C */ virtual void onFlag2(u32 mask) = 0;
/* 0x03C */ virtual void holdFlag(u32 mask) = 0;
/* 0x040 */ virtual void stopAllSound(s32 fadeFrames) = 0;
/* 0x044 */ virtual void shutdown() = 0;
/* 0x048 */ virtual bool hasPlayingSounds() const = 0;
src/d/a/d_a_base.cpp
+6 -6
View File
@@ -590,25 +590,25 @@ bool dAcBase_c::holdSoundWithParams(u32 soundId, f32 fValue, s32 value) {
return mpSoundSource->holdSoundWithParams(soundId, fValue, value);
}
void dAcBase_c::onSoundSourceFlag2(u32 mask) {
void dAcBase_c::holdSoundSourceFlag(u32 mask) {
if (mpSoundSource == nullptr) {
return;
}
mpSoundSource->onFlag2(mask);
mpSoundSource->holdFlag(mask);
}
void dAcBase_c::onSoundSourceFlag1(u32 mask) {
void dAcBase_c::onSoundSourceFlag(u32 mask) {
if (mpSoundSource == nullptr) {
return;
}
mpSoundSource->onFlag1(mask);
mpSoundSource->onFlag(mask);
}
void dAcBase_c::offSoundSourceFlag1(u32 mask) {
void dAcBase_c::offSoundSourceFlag(u32 mask) {
if (mpSoundSource == nullptr) {
return;
}
mpSoundSource->offFlag1(mask);
mpSoundSource->offFlag(mask);
}
bool dAcBase_c::isPlayingSound(u32 soundId) {
src/d/snd/d_snd_source.cpp
+3 -3
View File
@@ -48,8 +48,8 @@ dSoundSource_c::dSoundSource_c(u8 sourceType, dAcBase_c *actor, const char *name
field_0x100(0),
field_0x101(0),
field_0x102(0),
field_0x104(0),
field_0x108(0),
mFlagsPersistent(0),
mFlagsHold(0),
mpCtxParam(nullptr),
field_0x11C(0),
mpOwnerGroup(pOwnerGroup),
@@ -141,7 +141,7 @@ void dSoundSource_c::calc(const nw4r::math::VEC3 &pos) {
calcHandles();
calcVolumeFade();
postCalc();
field_0x108 = 0;
mFlagsHold = 0;
}
void dSoundSource_c::preCalc() {