summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/roulette.h30
-rw-r--r--include/roulette_util.h32
2 files changed, 31 insertions, 31 deletions
diff --git a/include/roulette.h b/include/roulette.h
index 71100d0d3..c753f671c 100755
--- a/include/roulette.h
+++ b/include/roulette.h
@@ -1,34 +1,6 @@
#ifndef GUARD_ROULETTE_H
#define GUARD_ROULETTE_H
-struct UnkStruct1
-{
- u16 var00;
- u16 var02;
- u8 var04;
- u8 var05;
- u8 var06;
- s8 var07_0:5;
- s8 var07_5:2;
- s8 var07_7:1;
-};
-
-struct UnkStruct3
-{
- u8 var00_0:7;
- u8 var00_7:1;
- u8 var01;
- s8 var02;
- s8 var03;
- struct UnkStruct1 var04;
-};
-
-struct UnkStruct0
-{
- u8 var00;
- u8 var01;
- u16 var02; //flag for each UnkStruct3
- struct UnkStruct3 var04[0x10];
-};
+void PlayRoulette(void);
#endif // GUARD_ROULETTE_H
diff --git a/include/roulette_util.h b/include/roulette_util.h
index 2153b19f6..d18d22d0f 100644
--- a/include/roulette_util.h
+++ b/include/roulette_util.h
@@ -1,8 +1,6 @@
#ifndef GUARD_ROULETTE_UTIL_H
#define GUARD_ROULETTE_UTIL_H
-#include "roulette.h"
-
struct PulseBlendSettings
{
u16 blendColor;
@@ -35,6 +33,36 @@ struct PulseBlend
struct PulseBlendPalette pulseBlendPalettes[16];
};
+struct UnkStruct1
+{
+ u16 var00;
+ u16 var02;
+ u8 var04;
+ u8 var05;
+ u8 var06;
+ s8 var07_0:5;
+ s8 var07_5:2;
+ s8 var07_7:1;
+};
+
+struct UnkStruct3
+{
+ u8 var00_0:7;
+ bool8 active:1;
+ u8 var01;
+ s8 var02;
+ s8 var03;
+ struct UnkStruct1 var04;
+};
+
+struct UnkStruct0
+{
+ u8 var00;
+ u8 var01;
+ u16 var02; //flag for each UnkStruct3
+ struct UnkStruct3 var04[0x10];
+};
+
int InitPulseBlendPaletteSettings(struct PulseBlend *, const struct PulseBlendSettings *);
void InitPulseBlend(struct PulseBlend *);
void MarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);