diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /include/roulette_util.h | |
parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'include/roulette_util.h')
-rw-r--r-- | include/roulette_util.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/roulette_util.h b/include/roulette_util.h index 7f0b9cbf8..76752fe74 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROULETTE_UTIL_H #define GUARD_ROULETTE_UTIL_H +#include "roulette.h" + struct PulseBlendSettings { u16 blendColor; @@ -41,5 +43,10 @@ void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8); void UpdatePulseBlend(struct PulseBlend *); void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height); void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height); +void task_tutorial_controls_fadein(struct UnkStruct0 *r0); +void sub_8151678(struct UnkStruct0 *r0); +u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2); +void sub_8151A9C(struct UnkStruct0 *r0, u16 r1); +void sub_8151A48(struct UnkStruct0 *r0, u16 r1); #endif // GUARD_ROULETTE_UTIL_H |