summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-12-29 12:10:06 +0100
committerMarcus Huderle <huderlem@gmail.com>2018-12-29 11:48:28 -0600
commit55e44b0951395c4d351738f825c6dd67281e6cb3 (patch)
treea2e0adda976a2ec8ef085d970ef09977a1fa077d /include
parent34243bbe1d89e11c905e0950ddfba4720ffed04d (diff)
a bit more of contest painting effect
Diffstat (limited to 'include')
-rw-r--r--include/constants/rgb.h3
-rwxr-xr-xinclude/contest_painting_effects.h8
2 files changed, 6 insertions, 5 deletions
diff --git a/include/constants/rgb.h b/include/constants/rgb.h
index fd9c5c5a7..80d951f4b 100644
--- a/include/constants/rgb.h
+++ b/include/constants/rgb.h
@@ -2,6 +2,7 @@
#define GUARD_RGB_H
#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
+#define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
#define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F))
#define RGB_BLACK RGB(0, 0, 0)
@@ -12,6 +13,6 @@
#define RGB_YELLOW RGB(31, 31, 0)
#define RGB_MAGENTA RGB(31, 0, 31)
#define RGB_CYAN RGB(0, 31, 31)
-#define RGB_WHITEALPHA RGB_WHITE | 0x8000
+#define RGB_WHITEALPHA (RGB_WHITE | 0x8000)
#endif // GUARD_RGB_H
diff --git a/include/contest_painting_effects.h b/include/contest_painting_effects.h
index 3b6964666..86c87842c 100755
--- a/include/contest_painting_effects.h
+++ b/include/contest_painting_effects.h
@@ -1,7 +1,7 @@
#ifndef GUARD_CONTEST_PAINTING_EFFECTS_H
#define GUARD_CONTEST_PAINTING_EFFECTS_H
-struct Unk030061A0
+struct Unk03005E20
{
u8 var_0;
u8 pad1[3];
@@ -21,8 +21,8 @@ struct Unk030061A0
u8 var_1F;
};
-void sub_8124F2C(struct Unk030061A0 *);
-void sub_81261A4(struct Unk030061A0 *);
-void sub_8126058(struct Unk030061A0 *);
+void sub_8124F2C(struct Unk03005E20 *);
+void sub_81261A4(struct Unk03005E20 *);
+void sub_8126058(struct Unk03005E20 *);
#endif