Merge branch 'master' into pokemon_storage_system

5 files changed, 60 insertions, 2 deletions

diff --git a/include/easy_chat.h b/include/easy_chat.h
index a70d7ad0c..c68a3fa02 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -115,7 +115,6 @@ struct Shared1000
 };
 
 extern u8 gUnknown_020388AC;
-extern u8 gUnknown_03000740;
 
 // const pointer to shared1000. easy_chat might be two separate files.
 extern struct Shared1000 *const gEasyChatStruct;
diff --git a/include/ewram.h b/include/ewram.h
index d8ebd71ec..f24f089f6 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -197,13 +197,14 @@ extern u8 gSharedMem[];
 #define B_FUNCTION_STACK                ((struct funcStack *)        (gSharedMem + 0x17140))
 #define ewram17160                      (gSharedMem[0x17160])
 #define ewram17800                      ((struct Struct2017800 *)    (gSharedMem + 0x17800))
+#define ewram17800_2                    (&gSharedMem[0x17800])
 #define EWRAM_17800                     ((struct UnknownStruct1 *)(gSharedMem + 0x17800))
 #define eTransformStatuses              ((struct TransformStatus *)(gSharedMem + 0x17800))
-#define ewram17800_2                    (&gSharedMem[0x17800])
 #define ewram17810                      ((struct Struct2017810 *)    (gSharedMem + 0x17810))
 #define EWRAM_17810                     ((struct UnknownStruct3 *)(gSharedMem + 0x17810))
 #define ewram17840                      (*(struct Struct2017840 *)   (gSharedMem + 0x17840))
 #define ewram17850                      ((struct UnknownStruct5 *)(gSharedMem + 0x17850))
+#define ewram17E00                      ((u16 *)(gSharedMem + 0x17E00))
 #define ewram_2018000                   (*(struct PlayerRecords *)(gSharedMem + 0x18000))
 #define EWRAM_18000                     ((u16 *)(gSharedMem + 0x18000))
 #define ewram18000                      ((u16 *)(gSharedMem + 0x18000))
@@ -217,9 +218,14 @@ extern u8 gSharedMem[];
 #define ewram18300                      ((u16 *)(gSharedMem + 0x18300))
 #define ewram18800                      (&gSharedMem[0x18800])
 #define ePokedexView2                   (struct PokedexView *)(gSharedMem + 0x18800)
+#define ewram189a0                      ((u16 *)(gSharedMem + 0x189A0))
+#define ewram18a20                      ((u16 *)(gSharedMem + 0x18A20))
+#define ewram18a32                      ((u16 *)(gSharedMem + 0x18A32))
+#define ewram18a80                      ((u16 *)(gSharedMem + 0x18a80))
 #define ewram19000                      (&gSharedMem[0x19000])
 #define eCableCar2                      ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000))
 #define ePokedexView3                   (struct PokedexView *)(gSharedMem + 0x19000)
+#define eRoulette                       ((struct Roulette *)(gSharedMem + 0x19000))
 #define EWRAM_19348                     (*(u16 *)(gSharedMem + 0x19348))
 #define ewram19800                      (&gSharedMem[0x19800])
 #define ePokedexView4                   (struct PokedexView *)(gSharedMem + 0x19800)
diff --git a/include/m4a.h b/include/m4a.h
index 7d016c98b..57a749a58 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -8,6 +8,7 @@ void m4aSoundVSync(void);
 void m4aSoundInit(void);
 void m4aSoundMain(void);
 void m4aSongNumStart(u16);
+void m4aSongNumStartOrChange(u16);
 void m4aSongNumStop(u16 n);
 void m4aMPlayAllStop(void);
 void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
diff --git a/include/roulette.h b/include/roulette.h
new file mode 100644
index 000000000..7d114a073
--- /dev/null
+++ b/include/roulette.h
@@ -0,0 +1,38 @@
+#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];
+};
+
+s16 sub_81174C4(s16, s16);
+s16 sub_81174E0(s16);
+void PlayRoulette(void);
+
+#endif
diff --git a/include/roulette_util.h b/include/roulette_util.h
new file mode 100644
index 000000000..daeaeeeef
--- /dev/null
+++ b/include/roulette_util.h
@@ -0,0 +1,14 @@
+#ifndef GUARD_ROULETTE_UTIL_H
+#define GUARD_ROULETTE_UTIL_H
+
+#include "roulette.h"
+
+void sub_8124918(struct UnkStruct0 *);
+u8 sub_812492C(struct UnkStruct0 *, u8, struct UnkStruct1 *);
+void task_tutorial_controls_fadein(struct UnkStruct0 *);
+void sub_8124CE8(struct UnkStruct0 *, u16);
+void sub_8124D3C(struct UnkStruct0 *, u16);
+void sub_8124DDC(u16 *, u16, u8, u8, u8, u8);
+void sub_8124E2C(u16 *, u16 *, u8, u8, u8, u8);
+
+#endif