More and cleanup

include/d/a/d_a_base.h

@@ -78,7 +78,7 @@ public:
     /* 0xCC */ mVec3_c mScale;
     /* 0xD8 */ u32 actor_properties;
     /* 0xDC */ dAcRef_c<dAcBase_c> actor_node;
-    /* 0xE8 */ u32 field_0xe8;
+    /* 0xE8 */ u32 mTgSndAreaFlags;
     /* 0xEC */ s8 roomid;
     /* 0xED */ u8 actor_subtype;
     /* 0xEE */ u8 polyAttr0;
@@ -177,7 +177,7 @@ public:
     /* 8002c710 */ int initAllocatorWork1Heap(int size, char *name, int align);
     /* 8002c720 */ int initAllocator(int size, char *name, EGG::Heap *heap, int align);
     /* 8002c7b0 */ bool addActorToRoom(s32 roomId);
-    /* 8002c840 */ void setBit_field_0xE8(s32);
+    /* 8002c840 */ void setTgSndAreaFlag(s32);
     /* 8002cf10 */ u32 itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype);
     /* 8002cf90 */ void fillUpperParams2Byte();
     /* 8002cfa0 */ u32 getParams2_ignoreLower();

include/d/a/d_a_player.h

@@ -93,6 +93,10 @@ public:
         return LINK;
     }
 
+    static dAcPy_c *GetLinkM() {
+        return LINK;
+    }
+
     static dAcPy_c *GetLink2() {
         return LINK2;
     }

include/d/snd/d_snd_3d_actor.h

@@ -128,7 +128,7 @@ protected:
     /* 0xCC */ u16 mFlags;
     /* 0xD0 */ nw4r::math::VEC3 mPositionRelativeToPlayer;
     /* 0xDC */ f32 mDistanceToPlayer;
-    /* 0xE0 */ f32 a_field_0xE0;
+    /* 0xE0 */ f32 mFxSend3D;
 };
 
 #endif

include/d/snd/d_snd_bgm_mgr.h

@@ -46,6 +46,12 @@ public:
     bool onEventFinalize(const char *eventName, u32 soundEventId, bool skipped);
     void prepareBgm();
 
+    void setOverrideBgmId(u32 id);
+    void activateOverrideBgmId();
+
+    void onTgSndAreaMgFlagsChange(u32 newFlags, u32 oldFlags);
+    void onTgSndAreaFlagsChange(u32 newFlags, u32 oldFlags);
+
     dSndBgmSound_c *getSoundHandleForBgm(u32 soundId, u32 startOffset);
     bool isPlayingBgmSound() const;
     bool isPlayingBgmSoundId(u32 soundId) const;

include/d/snd/d_snd_harp_song_mgr.h

@@ -19,6 +19,9 @@ public:
 
     void calc();
 
+    void activate();
+    void deactivate();
+
     nw4r::snd::SoundHandle &getFiSingHandle() {
         return mFiSingHandle;
     }

include/d/snd/d_snd_state_mgr.h

@@ -17,6 +17,7 @@ public:
 
 public:
     typedef void (*OnEventStartCallback)(s32 soundEventId, u32 flags);
+    typedef void (*OnFlagsChangeCallback)(u32 newFlags, u32 oldFlags);
 
     enum StageFlags_e {
         STAGE_FIELD = 0x1,
@@ -77,12 +78,10 @@ public:
         return mFrameCounter;
     }
 
-    f32 getField_0x49C() const {
-        return field_0x49C;
+    f32 getFxSend3D() const {
+        return mFxSend3D;
     }
 
-    
-    
     void resetEventName() {
         mEventName = "EVENT_NONE";
     }
@@ -173,6 +172,8 @@ public:
 
     void onStageOrLayerUpdate();
     void onStageLoad();
+    void onRestartScene(s32 fadeFrames);
+    void onGotoStage(s32 fadeFrames);
     void loadStageSound();
     void loadObjectSound();
 
@@ -227,6 +228,8 @@ private:
     void setRoomId(s32 roomId);
     void calcTgSnd();
     void calcFilters();
+    void calcFxSend3D();
+    void setFxSend3DTarget();
 
     u32 getBgmLabelSoundId();
     void doLabelSuffix(const char *suffix);
@@ -250,7 +253,7 @@ private:
     u32 getCmdCameraId();
     u32 getCmdMsgWaitId();
     u32 getCmdFrameCountId();
-    
+
     void calcSe();
     bool calcBgm();
     void calcCmd();
@@ -306,16 +309,16 @@ private:
     /* 0x060 */ UNKWORD field_0x060;
     /* 0x064 */ u8 field_0x064;
     /* 0x065 */ bool field_0x065;
-    /* 0x066 */ u8 field_0x066;
-    /* 0x067 */ u8 field_0x067;
-    /* 0x068 */ UNKWORD field_0x068;
-    /* 0x06C */ UNKWORD field_0x06C;
+    /* 0x066 */ bool mHasChangedTgSndAreaFlags;
+    /* 0x067 */ bool mHasChangedTgSndAreaMgFlags;
+    /* 0x068 */ u32 mSavedTgSndAreaFlags;
+    /* 0x06C */ u32 mSavedTgSndAreaMgFlags;
     /* 0x070 */ void (*mpUnkCallback)();
     /* 0x074 */ UNKWORD field_0x074;
     /* 0x078 */ OnEventStartCallback mpOnEventStartCallback;
     /* 0x07C */ UNKWORD field_0x07C;
-    /* 0x080 */ UNKWORD field_0x080;
-    /* 0x084 */ UNKWORD field_0x084;
+    /* 0x080 */ OnFlagsChangeCallback mpTgSndAreaFlagsChangeCallback;
+    /* 0x084 */ OnFlagsChangeCallback mpTgSndAreaMgFlagsChangeCallback;
     /* 0x088 */ UNKWORD field_0x088;
     /* 0x08C */ s32 mSoundEventId;
     /* 0x090 */ s32 mCameraCutCounter;
@@ -346,11 +349,11 @@ private:
     /* 0x258 */ u32 field_0x258;
     /* 0x25C */ nw4r::snd::FxReverbStdDpl2 mFx;
     /* 0x48C */ UNKWORD field_0x48C;
-    /* 0x490 */ f32 field_0x490;
-    /* 0x494 */ f32 field_0x494;
-    /* 0x498 */ f32 field_0x498;
-    /* 0x49C */ f32 field_0x49C;
-    /* 0x4A0 */ f32 field_0x4A0;
+    /* 0x490 */ f32 mFxSend3DDefault;
+    /* 0x494 */ f32 mFxSend3DOverride;
+    /* 0x498 */ f32 mFxSend3DNext;
+    /* 0x49C */ f32 mFxSend3D;
+    /* 0x4A0 */ f32 mFxSend3DTarget;
     /* 0x4A4 */ u32 field_0x4A4;
     /* 0x4A8 */ u8 field_0x4A8;
     /* 0x4A9 */ bool mNeedsGroupsReload;

include/d/t/d_t_sound_area_mgr.h

@@ -16,8 +16,12 @@ public:
     virtual int doDelete() override;
     virtual int create() override;
 
-    void setBgmFlag(int flag) {
-        mBgmFlags |= 1 << flag;
+    void setSndFlag(int flag) {
+        mSndFlags |= 1 << flag;
+    }
+
+    u32 getSndFlags() const {
+        return mSndFlags;
     }
 
     static dTgSndMg_c *GetInstance() {
@@ -26,7 +30,8 @@ public:
 
 private:
     static dTgSndMg_c *sInstance;
-    u32 mBgmFlags;
+    
+    /* 0xFC */ u32 mSndFlags;
 };
 
 #endif

include/toBeSorted/music_mgrs.h

@@ -3,9 +3,6 @@
 
 #include "common.h"
 #include "d/snd/d_snd_player_mgr.h"
-#include "d/snd/d_snd_state_mgr.h"
-
-class dSndSound_c;
 
 // A lot of these names are and were guesses that are probably wrong in a lot of ways.
 
@@ -16,8 +13,4 @@ extern "C" void fn_8035E820(dSndPlayerMgr_c *);
 extern "C" void fn_8035E880(dSndPlayerMgr_c *);
 extern "C" void fn_8035E310(dSndPlayerMgr_c *);
 
-#define ENEMY_SOUND_MGR (dSndStateMgr_c::GetInstance())
-extern "C" void fn_80362150(dSndStateMgr_c *, u16);
-extern "C" void fn_803625F0(dSndStateMgr_c *, u16);
-
 #endif