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/JSystem | |
| parent | 046d178003035ea87d3042a61917c2d482c68c74 (diff) | |
| parent | a2e21275cb2722aed941cd5290b57b29732ce6d7 (diff) | |
Merge pull request #202 from lepelog/inline-stuff
move inlines
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DGD.h | 7 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAParticle.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h index 246c6bb65a..6cd5659f57 100644 --- a/include/JSystem/J3DGraphBase/J3DGD.h +++ b/include/JSystem/J3DGraphBase/J3DGD.h @@ -2,5 +2,12 @@ #define J3DGD_H #include "dolphin/types.h" +#include "dolphin/gx/GX.h" + +static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) { + GFX_FIFO(u8) = cmd; + GFX_FIFO(u16) = indx; + GFX_FIFO(u16) = addr; +} #endif /* J3DGD_H */ diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 92f7b1de73..91b256d6a8 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -363,4 +363,9 @@ public: /* 0x2D */ u8 mResMax; }; +// not sure where this belongs +static inline u32 COLOR_MULTI(u32 a, u32 b) { + return ((a * (b + 1)) * 0x10000) >> 24; +} + #endif /* JPAPARTICLE_H */ |