5 files changed, 38 insertions, 25 deletions
diff --git a/include/constants/global.h b/include/constants/global.h
index 1cece7975..518fe6bad 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -87,6 +87,8 @@
 #define MOVE_NAME_LENGTH 12
 #define NUM_QUESTIONNAIRE_WORDS 4
 #define QUIZ_QUESTION_LEN 9
+#define WONDER_CARD_TEXT_LENGTH 40
+#define WONDER_NEWS_TEXT_LENGTH 40
 
 #define MALE 0
 #define FEMALE 1
diff --git a/include/constants/mevent.h b/include/constants/mevent.h
index 25bbcdf36..3478816fd 100644
--- a/include/constants/mevent.h
+++ b/include/constants/mevent.h
@@ -12,4 +12,7 @@
 
 #define REQUIRED_CARD_BATTLES 3
 
+// Number of different types/colors of Wonder Card and News backgrounds
+#define NUM_WONDER_BGS 8
+
 #endif //GUARD_MEVENT_H
diff --git a/include/global.h b/include/global.h
index d14aa60f4..f8bb24da7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -849,9 +849,9 @@ struct MysteryEventStruct
 {
     u16 unk_00;
     u8 unk_02;
-    u8 unk_03;
-    u8 unk_04[40];
-    u8 unk_2C[10][40];
+    u8 bgType;
+    u8 unk_04[WONDER_NEWS_TEXT_LENGTH];
+    u8 unk_2C[10][WONDER_NEWS_TEXT_LENGTH];
 };
 
  struct WonderNewsSaveStruct
@@ -866,14 +866,14 @@ struct MysteryEventStruct
     u16 unk_02;
     u32 unk_04;
     u8 unk_08_0:2;
-    u8 unk_08_2:4;
+    u8 bgType:4;
     u8 unk_08_6:2;
     u8 unk_09;
-    u8 unk_0A[40];
-    u8 unk_32[40];
-    u8 unk_5A[4][40];
-    u8 unk_FA[40];
-    u8 unk_122[40];
+    u8 unk_0A[WONDER_CARD_TEXT_LENGTH];
+    u8 unk_32[WONDER_CARD_TEXT_LENGTH];
+    u8 unk_5A[4][WONDER_CARD_TEXT_LENGTH];
+    u8 unk_FA[WONDER_CARD_TEXT_LENGTH];
+    u8 unk_122[WONDER_CARD_TEXT_LENGTH];
 };
 
  struct WonderCardSaveStruct
diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h
deleted file mode 100644
index d76bc92c2..000000000
--- a/include/mevent_801BAAC.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef GUARD_MEVENT_801BAAC_H
-#define GUARD_MEVENT_801BAAC_H
-
-bool32 InitWonderCardResources(struct WonderCard * r5, struct MEventBuffer_3430_Sub * r6);
-bool32 InitWonderNewsResources(const struct WonderNews * a0);
-s32 FadeToWonderCardMenu(void);
-s32 FadeToWonderNewsMenu(void);
-s32 FadeOutFromWonderCard(bool32 flag);
-void DestroyWonderCardResources(void);
-s32 FadeOutFromWonderNews(bool32 flag);
-void DestroyWonderNewsResources(void);
-u32 MENews_GetInput(u16 input);
-void MENews_AddScrollIndicatorArrowPair(void);
-void MENews_RemoveScrollIndicatorArrowPair(void);
-
-#endif //GUARD_MEVENT_801BAAC_H
diff --git a/include/wonder_transfer.h b/include/wonder_transfer.h
new file mode 100644
index 000000000..65b475725
--- /dev/null
+++ b/include/wonder_transfer.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_WONDER_TRANSFER_H
+#define GUARD_WONDER_TRANSFER_H
+
+enum {
+    NEWS_INPUT_A,
+    NEWS_INPUT_B,
+    NEWS_INPUT_SCROLL_UP,
+    NEWS_INPUT_SCROLL_DOWN,
+    NEWS_INPUT_NONE = 0xFF
+};
+
+bool32 WonderCard_Init(struct WonderCard * card, struct MEventBuffer_3430_Sub * r6);
+bool32 WonderNews_Init(const struct WonderNews * news);
+s32 WonderCard_Enter(void);
+s32 WonderNews_Enter(void);
+s32 WonderCard_Exit(bool32 flag);
+s32 WonderNews_Exit(bool32 flag);
+void WonderCard_Destroy(void);
+void WonderNews_Destroy(void);
+u32 WonderNews_GetInput(u16 input);
+void WonderNews_AddScrollIndicatorArrowPair(void);
+void WonderNews_RemoveScrollIndicatorArrowPair(void);
+
+#endif //GUARD_WONDER_TRANSFER_H