Merge branch 'master' into fldeff

20 files changed, 106 insertions, 29 deletions

diff --git a/include/blit.h b/include/blit.h
new file mode 100644
index 000000000..78f67766e
--- /dev/null
+++ b/include/blit.h
@@ -0,0 +1,17 @@
+#ifndef GUARD_BLIT_H
+#define GUARD_BLIT_H
+
+struct Bitmap
+{
+    u8 *pixels;
+    u32 width:16;
+    u32 height:16;
+};
+
+void BlitBitmapRect4BitWithoutColorKey(const struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height);
+void BlitBitmapRect4Bit(const struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey);
+void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
+void BlitBitmapRect4BitTo8Bit(const struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey, u8 paletteOffset);
+void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
+
+#endif // GUARD_BLIT_H
diff --git a/include/constants/maps.h b/include/constants/maps.h
index 8a8a023a8..5fb5f88fa 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -9,4 +9,6 @@
 #define MAP_GROUP(map) (MAP_##map >> 8)
 #define MAP_NUM(map) (MAP_##map & 0xFF)
 
+#define MAP(map) MAP_GROUP(map), MAP_NUM(map)
+
 #endif  // GUARD_CONSTANTS_MAPS_H
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index a2a4d3eac..228ff3bfb 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -12,5 +12,6 @@ void DoFallWarp(void);
 void sub_807E59C(void);
 void sub_807E500(void);
 void sub_807DF64(void);
+void sub_807DC18(void);
 
 #endif // GUARD_FIELD_FADETRANSITION_H
diff --git a/include/field_weather.h b/include/field_weather.h
index eb80c455a..eeda3b5b5 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -12,5 +12,6 @@ void sub_80AEDBC(void);
 void DoCurrentWeather(void);
 void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
+void play_some_sound(void);
 
 #endif // GUARD_WEATHER_H
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 89d5c1f5a..6f05a176a 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -100,7 +100,7 @@ struct CgbChannel
     u8 le;
     u8 sw;
     u32 fr;
-    u32 wp;
+    u32 * wp;
     u32 cp;
     u32 tp;
     u32 pp;
diff --git a/include/global.h b/include/global.h
index 8e85b3123..de2221f8c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -760,13 +760,6 @@ struct SaveBlock1
 
 extern struct SaveBlock1* gSaveBlock1Ptr;
 
-struct Bitmap           // TODO: Find a better spot for this
-{
-    u8* pixels;
-    u32 width:16;
-    u32 height:16;
-};
-
 extern u8 gReservedSpritePaletteCount;
 
 #endif // GUARD_GLOBAL_H
diff --git a/include/help_system.h b/include/help_system.h
index 3ef5f53e4..6398d306b 100644
--- a/include/help_system.h
+++ b/include/help_system.h
@@ -7,5 +7,6 @@ extern bool8 gUnknown_3005ECC;
 
 void sub_812B484(void);
 void HelpSystem_SetSomeVariable2(u8);
+void sub_812B478(void);
 
 #endif //GUARD_HELP_SYSTEM_H
diff --git a/include/link.h b/include/link.h
index 93ad9dfe1..a875149aa 100644
--- a/include/link.h
+++ b/include/link.h
@@ -204,7 +204,7 @@ bool8 sub_800AA48(void);
 void sub_800A5BC(void);
 void sub_800AA80(u8);
 void sub_80098D8(void);
-void sub_80098B8(void);
+void CloseLink(void);
 bool8 sub_800A4BC(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 6e54fcc6c..d076efae6 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -1,9 +1,15 @@
 #ifndef GUARD_LINK_RFU_H
 #define GUARD_LINK_RFU_H
 
-void sub_8142504(const u8 *str);
-bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src);
+void AddTextPrinterToWindow1(const u8 *str);
+bool32 MG_PrintTextOnWindow1AndWaitButton(u8 * cmdPtr, const u8 * src);
 void sub_80FA190(void);
-void sub_8142420(void);
+void MG_DrawCheckerboardPattern(void);
+void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
+bool8 IsNoOneConnected(void);
+void DestroyWirelessStatusIndicatorSprite(void);
+void MEvent_CreateTask_CardOrNewsWithFriend(u8);
+void MEvent_CreateTask_CardOrNewsOverWireless(u8);
+void MEvent_CreateTask_Leader(u8);
 
 #endif //GUARD_LINK_RFU_H
diff --git a/include/list_menu.h b/include/list_menu.h
index 3fd54d0d1..8ff65da0b 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -59,5 +59,7 @@ void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
 void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
 void sub_8107D38(u8, u8);
+s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
+void ListMenuDefaultCursorMoveFunc(s32, u8, struct ListMenu *);
 
 #endif //GUARD_LIST_MENU_H
diff --git a/include/menews_jisan.h b/include/menews_jisan.h
index 4db5a7be2..ca09d4347 100644
--- a/include/menews_jisan.h
+++ b/include/menews_jisan.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void sub_8146C30(u32 a0);
+void GenerateRandomNews(u32 a0);
 void sub_8146C88(void);
 void sub_8146CA4(void);
 
diff --git a/include/mevent.h b/include/mevent.h
index d940b212c..b9b17d8c0 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -33,12 +33,13 @@ struct MEvent_Str_2
     u8 fill_00[0x40];
 };
 
-struct MEventBuffer_3120_Sub * sub_8143D58(void);
-struct MEventBuffer_32E0_Sub * sav1_get_mevent_buffer_1(void);
+struct MEventBuffer_3120_Sub * GetSavedWonderNews(void);
+struct MEventBuffer_32E0_Sub * GetSavedWonderCard(void);
 struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
 struct MysteryEventStruct * sub_8143D94(void);
 bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src);
-bool32 sub_8143E1C(void);
+bool32 ValidateReceivedWonderNews(void);
+bool32 ValidateReceivedWonderCard(void);
 bool32 sub_8143EF4(const u8 * src);
 bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data);
 void sub_814410C(struct MEventBuffer_32E0_Sub * buffer);
@@ -49,5 +50,21 @@ u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void *
 u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused);
 bool32 sub_8144474(const struct MEventStruct_Unk1442CC * a0, const u16 * a1);
 u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command);
+bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6);
+bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0);
+s32 FadeToWonderCardMenu(void);
+s32 FadeToWonderNewsMenu(void);
+void DestroyWonderCard(void);
+void DestroyWonderNews(void);
+void DestroyWonderCardResources(void);
+void DestroyWonderNewsResources(void);
+s32 FadeOutFromWonderCard(bool32 flag);
+s32 FadeOutFromWonderNews(bool32 flag);
+bool32 CheckReceivedGiftFromWonderCard(void);
+void MENews_AddScrollIndicatorArrowPair(void);
+void MENews_RemoveScrollIndicatorArrowPair(void);
+bool32 WonderNews_Test_Unk_02(void);
+bool32 WonderCard_Test_Unk_08_6(void);
+u32 MENews_GetInput(u16 input);
 
 #endif //GUARD_MEVENT_H
diff --git a/include/mevent_server.h b/include/mevent_server.h
index e593b5dbd..10ee96401 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -37,7 +37,7 @@ struct mevent_cmd_ish
     u32 parameter;
 };
 
-struct mevent_srv_ish
+struct mevent_client
 {
     u32 unk_00;
     u32 param;
@@ -83,13 +83,13 @@ void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recv
 void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size);
 void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest);
 
-void mevent_srv_ish_do_init(void);
-u32 mevent_srv_ish_do_exec(u16 * a0);
-void mevent_srv_ish_inc_flag(void);
-void * mevent_srv_ish_get_buffer(void);
-void mevent_srv_ish_set_param(u32 a0);
-void mevent_srv_common_do_init_1(void);
-void mevent_srv_common_do_init_2(void);
-u32 mevent_srv_init_do_exec(u16 * a0);
+void mevent_client_do_init(void);
+u32 mevent_client_do_exec(u16 * a0);
+void mevent_client_inc_flag(void);
+void * mevent_client_get_buffer(void);
+void mevent_client_set_param(u32 a0);
+void mevent_srv_init_wnews(void);
+void mevent_srv_new_wcard(void);
+u32 mevent_srv_common_do_exec(u16 * a0);
 
 #endif //GUARD_MEVENT_SERVER_H
diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h
index e96c3069b..ac228576d 100644
--- a/include/mystery_event_msg.h
+++ b/include/mystery_event_msg.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_MYSTERY_EVENT_MSG_H
 #define GUARD_MYSTERY_EVENT_MSG_H
 
-#include <gba/gba.h>
+#include "gba/gba.h"
 
 extern const u8 gText_MysteryGiftBerry[];
 extern const u8 gText_MysteryGiftBerryTransform[];
diff --git a/include/mystery_gift_menu.h b/include/mystery_gift_menu.h
index 24bf85a13..c7b047f56 100644
--- a/include/mystery_gift_menu.h
+++ b/include/mystery_gift_menu.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_MYSTERY_GIFT_MENU_H
 #define GUARD_MYSTERY_GIFT_MENU_H
 
-extern bool8 gUnknown_203F3B8;
+extern bool8 gGiftIsFromEReader;
 
-void sub_81422FC(void);
-void sub_8142344(bool8, bool32);
+void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void);
+void PrintMysteryGiftOrEReaderTopMenu(bool8, bool32);
 
 #endif //GUARD_MYSTERY_GIFT_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index b17326667..fc9c1b9dc 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -30,5 +30,6 @@ void Menu_LoadStdPalAt(u16);
 void * malloc_and_decompress(const void * src, u32 * size);
 u16 sub_80F796C(void);
 void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
+void sub_80F696C(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/overworld.h b/include/overworld.h
index 234fb7c01..ac3d5283f 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -96,11 +96,17 @@ void sub_80563F0(void);
 extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
 
+extern void (*gUnknown_3005020)(void);
 extern bool8 (* gFieldCallback2)(void);
+
 void SetLastHealLocationWarp(u8 healLocaionId);
 void sub_8055864(u8 mapGroup, u8 mapNum);
 void CB2_NewGame(void);
 bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
 void Overworld_ResetStateAfterTeleport(void);
 
+void Overworld_FadeOutMapMusic(void);
+void sub_805671C(void);
+bool8 sub_8055FC4(void);
+
 #endif //GUARD_ROM4_H
diff --git a/include/seagallop.h b/include/seagallop.h
new file mode 100644
index 000000000..cce6da8ff
--- /dev/null
+++ b/include/seagallop.h
@@ -0,0 +1,21 @@
+#ifndef GUARD_SEAGALLOP_H
+#define GUARD_SEAGALLOP_H
+
+enum SeaGallopDestinations
+{
+    SEAGALLOP_VERMILION_CITY,
+    SEAGALLOP_ONE_ISLAND,
+    SEAGALLOP_TWO_ISLAND,
+    SEAGALLOP_THREE_ISLAND,
+    SEAGALLOP_FOUR_ISLAND,
+    SEAGALLOP_FIVE_ISLAND,
+    SEAGALLOP_SIX_ISLAND,
+    SEAGALLOP_SEVEN_ISLAND,
+    SEAGALLOP_CINNABAR_ISLAND,
+    SEAGALLOP_NAVEL_ROCK,
+    SEAGALLOP_BIRTH_ISLAND
+};
+
+void ScrSpecial_SeaGallopFerry(void);
+
+#endif //GUARD_SEAGALLOP_H
diff --git a/include/text_window.h b/include/text_window.h
index 8a4113c62..9fbc90799 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -23,5 +23,8 @@ void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
 void sub_814FEAC(u8 windowId, u16 tileStart, u8 palette);
 void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette);
 void sub_815001C(u8 windowId, u16 tileStart, u8 palette);
+void sub_814FE40(u8 windowId, u16 tileStart, u8 palette);
+void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
+void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
 
 #endif // GUARD_TEXT_WINDOW_H
diff --git a/include/title_screen.h b/include/title_screen.h
new file mode 100644
index 000000000..8e7a6a275
--- /dev/null
+++ b/include/title_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_TITLE_SCREEN_H
+#define GUARD_TITLE_SCREEN_H
+
+void CB2_InitTitleScreen(void);
+
+#endif //GUARD_TITLE_SCREEN_H