diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-12-05 17:15:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-05 17:15:10 -0800 |
| commit | f7916ebde17cb384c75921cf55878f5b7b305366 (patch) | |
| tree | d78f1b895c9f6b515933c3549134c3be2f590eab /include/JSystem/J2DGraph | |
| parent | cc29e8e5c961daee206ebe49543517aee901fe71 (diff) | |
| parent | 751a4112a02a7ddc4f638d8300e66ab57afcde34 (diff) | |
Merge pull request #165 from TakaRikka/link
daAlink work
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DAnmLoader.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPane.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h index 0c2f69d007..b6867363da 100644 --- a/include/JSystem/J2DGraph/J2DAnmLoader.h +++ b/include/JSystem/J2DGraph/J2DAnmLoader.h @@ -6,7 +6,7 @@ #include "dolphin/types.h" struct J2DAnmLoaderDataBase { - /* 80308A6C */ static void load(void const*); + /* 80308A6C */ static void* load(void const*); }; class J2DAnmLoader { diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index d73d42d169..a58858aa85 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -128,6 +128,7 @@ public: void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive); void animationTransform(); void updateTransform(const J2DAnmTransform* transform); + void setUserInfo(u64 info) { mUserInfoTag = info; } static f32 static_mBounds[4]; |