From 87a3705039533b309a04baaaa0f99010b5d71c00 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 18 Jan 2026 17:59:57 -0800 Subject: m_Do debug (#3052) * m_Do debug * m_Do wii data --- include/Z2AudioLib/Z2AudioMgr.h | 4 ++-- include/Z2AudioLib/Z2SoundObjMgr.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'include/Z2AudioLib') diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h index 7f47400af2..e543bf6061 100644 --- a/include/Z2AudioLib/Z2AudioMgr.h +++ b/include/Z2AudioLib/Z2AudioMgr.h @@ -4,14 +4,14 @@ #include "JSystem/JAudio2/JASAudioReseter.h" #include "Z2AudioLib/Z2Audience.h" #include "Z2AudioLib/Z2FxLineMgr.h" -#include "Z2AudioLib/Z2SceneMgr.h" #include "Z2AudioLib/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SceneMgr.h" +#include "Z2AudioLib/Z2StatusMgr.h" #include "Z2AudioLib/Z2SoundInfo.h" #include "Z2AudioLib/Z2SoundMgr.h" #include "Z2AudioLib/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2SpeechMgr2.h" -#include "Z2AudioLib/Z2StatusMgr.h" #include "Z2AudioLib/Z2DebugSys.h" #include "global.h" diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index a353ff1bcc..c0b4ed778c 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -82,7 +82,7 @@ enum Z2EnemyID { /* 0x3F */ Z2_ENEMY_TN, }; -class Z2SoundObjMgr : public JASGlobalInstance, protected JSUList { +class Z2SoundObjMgr : public JASGlobalInstance { public: Z2SoundObjMgr(); void setForceBattleArea(bool forceBattle, u16, u16, u16); @@ -98,13 +98,14 @@ public: u8 getEnemyNumNear() const { return enemuNumNear_; } u8 getEnemyNumVeryFar() const { return enemuNumVeryFar_; } bool isForceBattle() { return forceBattle_; } - JSUList* getEnemyList() { return this; } + JSUList* getEnemyList() { return &field_0x0; } #if DEBUG JSUList* getAllList() { return &allList_; } #endif private: + /* 0x00 */ JSUList field_0x0; #if DEBUG /* 0x0C */ JSUList allList_; #endif -- cgit v1.2.3