diff --git a/src/KingSystem/Resource/resResourceASList.h b/src/KingSystem/Resource/resResourceASList.h index 34795aa4..4d976186 100644 --- a/src/KingSystem/Resource/resResourceASList.h +++ b/src/KingSystem/Resource/resResourceASList.h @@ -50,15 +50,6 @@ public: }; KSYS_CHECK_SIZE_NX150(Common, 0x50); - struct Buffers { - Buffers() { _0 = 0; } - - s32 _0; - sead::Buffer as_defines; - sead::Buffer cf_defines; - sead::Buffer add_reses; - }; - ASList(); ~ASList() override; @@ -66,9 +57,9 @@ public: bool needsParse() const override { return true; } bool parse_(u8* data, size_t size, sead::Heap* heap) override; - const sead::Buffer& getASDefines() const { return mBuffers.as_defines; } - const sead::Buffer& getCFDefines() const { return mBuffers.cf_defines; } - const sead::Buffer& getAddReses() const { return mBuffers.add_reses; } + const sead::Buffer& getASDefines() const { return mASDefines; } + const sead::Buffer& getCFDefines() const { return mCFDefines; } + const sead::Buffer& getAddReses() const { return mAddReses; } const Common& getCommon() const { return mCommon.ref(); } void addAS_(s32 index, AS* as); @@ -78,7 +69,13 @@ protected: bool m7_() override; private: - Buffers mBuffers; + u8 _2b0 = 0; + u8 _2b1 = 0; + u8 _2b2 = 0; + u8 _2b3 = 0; + sead::Buffer mASDefines; + sead::Buffer mCFDefines; + sead::Buffer mAddReses; agl::utl::ParameterList mCFDefinesList; agl::utl::ParameterList mASDefinesList; agl::utl::ParameterList mAddResesList;