diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-06-30 16:20:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 16:20:26 -0700 |
| commit | 7d2e4e81dc2e1e598b41fc41a859faa8668514e8 (patch) | |
| tree | 7ceebcfd86a24530ea395c146ac1759683bd585b /include/Z2AudioLib | |
| parent | 046d178003035ea87d3042a61917c2d482c68c74 (diff) | |
| parent | a2e21275cb2722aed941cd5290b57b29732ce6d7 (diff) | |
Merge pull request #202 from lepelog/inline-stuff
move inlines
Diffstat (limited to 'include/Z2AudioLib')
| -rw-r--r-- | include/Z2AudioLib/Z2Creature.h | 4 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2EnvSeMgr.h | 2 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SoundMgr.h | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 7c9ab52d08..2d92cdce46 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -93,6 +93,10 @@ private: /* 0xCC */ u8 mFlags2; }; // Size: 0xD0 +inline Z2CreatureLink* Z2GetLink() { + return Z2CreatureLink::mLinkPtr; +} + class Z2CreatureRide; struct Z2RideSoundStarter : public Z2SoundStarter { /* 802C5234 */ Z2RideSoundStarter(Z2CreatureRide*); diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h index da494c8791..f2862b8c69 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr.h +++ b/include/Z2AudioLib/Z2EnvSeMgr.h @@ -162,4 +162,6 @@ struct Z2EnvSeMgr { STATIC_ASSERT(sizeof(Z2EnvSeMgr) == 0x30C); +extern Z2EnvSeMgr g_mEnvSeMgr; + #endif /* Z2ENVSEMGR_H */ diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index a738b09d6a..7d90ecfc62 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -36,4 +36,10 @@ private: STATIC_ASSERT(sizeof(Z2SoundMgr) == 0x810); +extern Z2SoundMgr* data_80450B60; + +inline Z2SoundMgr* Z2GetSoundMgr() { + return data_80450B60; +} + #endif /* Z2SOUNDMGR_H */ |