summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-04-07 23:58:50 +0200
committerLéo Lam <leo@leolam.fr>2021-04-07 23:58:50 +0200
commit5adfee548a8aa5aca4e5a34fdddf855e5085e2eb (patch)
tree8af085f3d90fbd97df99674b09a0f6c818cfc6c3 /src
parent96101229398ae35c34a8b60799afeb2e772948ec (diff)
ksys/res: Fix ASList struct definition
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/Resource/resResourceASList.h23
1 files changed, 10 insertions, 13 deletions
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<ASDefine> as_defines;
- sead::Buffer<CFDefine> cf_defines;
- sead::Buffer<AddRes> 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<ASDefine>& getASDefines() const { return mBuffers.as_defines; }
- const sead::Buffer<CFDefine>& getCFDefines() const { return mBuffers.cf_defines; }
- const sead::Buffer<AddRes>& getAddReses() const { return mBuffers.add_reses; }
+ const sead::Buffer<ASDefine>& getASDefines() const { return mASDefines; }
+ const sead::Buffer<CFDefine>& getCFDefines() const { return mCFDefines; }
+ const sead::Buffer<AddRes>& 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<ASDefine> mASDefines;
+ sead::Buffer<CFDefine> mCFDefines;
+ sead::Buffer<AddRes> mAddReses;
agl::utl::ParameterList mCFDefinesList;
agl::utl::ParameterList mASDefinesList;
agl::utl::ParameterList mAddResesList;