Match more functions

2 files changed, 5 insertions, 1 deletions

diff --git a/include/constants/rgb.h b/include/constants/rgb.h
index 80d951f4b..737ea7678 100644
--- a/include/constants/rgb.h
+++ b/include/constants/rgb.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_RGB_H
 #define GUARD_RGB_H
 
+#define R(color) ((color) & 0x1F)
+#define G(color) (((color) >> 5) & 0x1F)
+#define B(color) (((color) >> 10) & 0x1F)
+
 #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))
diff --git a/include/pokenav.h b/include/pokenav.h
index ac916f3ba..d40cfea11 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -313,7 +313,7 @@ bool32 WaitForHelpBar(void);
 void sub_81C78A0(void);
 bool32 MainMenuLoopedTaskIsBusy(void);
 void sub_81C7FDC(void);
-void sub_81C79BC(const u16 *a0, const u16 *a1, u32 a2, u32 a3, u32 a4, u16 *a5);
+void sub_81C79BC(const u16 *a0, const u16 *a1, s32 a2, s32 a3, s32 a4, u16 *palette);
 void sub_81C7B40(void);
 struct Sprite *PauseSpinningPokenavSprite(void);
 void ResumeSpinningPokenavSprite(void);