diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
| commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
| tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /include/roulette_util.h | |
| parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
| parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) | |
Fix merge conflicts
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 |