summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/link.h7
-rw-r--r--include/link_rfu.h1
-rw-r--r--include/m4a.h4
-rw-r--r--include/malloc.h1
-rw-r--r--include/new_menu_helpers.h2
5 files changed, 13 insertions, 2 deletions
diff --git a/include/link.h b/include/link.h
index d4610eed5..2689f2596 100644
--- a/include/link.h
+++ b/include/link.h
@@ -17,6 +17,7 @@
#define LINK_STAT_RECEIVED_NOTHING 0x00000100
#define LINK_STAT_RECEIVED_NOTHING_SHIFT 8
#define LINK_STAT_ERRORS 0x0007F000
+#define LINK_STAT_ERRORS_SHIFT 12
#define EXTRACT_PLAYER_COUNT(status) \
(((status) & LINK_STAT_PLAYER_COUNT) >> LINK_STAT_PLAYER_COUNT_SHIFT)
@@ -26,6 +27,8 @@
(((status) >> LINK_STAT_CONN_ESTABLISHED_SHIFT) & 1)
#define EXTRACT_RECEIVED_NOTHING(status) \
(((status) >> LINK_STAT_RECEIVED_NOTHING_SHIFT) & 1)
+#define EXTRACT_LINK_ERRORS(status) \
+(((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT)
struct LinkStatus
{
@@ -239,8 +242,8 @@ extern void (*gLinkCallback)(void);
extern bool8 gShouldAdvanceLinkState;
extern u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS];
extern u8 gBlockRequestType;
-extern u8 gUnknown_03003160;
-extern u8 gUnknown_03004130;
+extern u8 gLastSendQueueCount;
+extern u8 gLastRecvQueueCount;
extern u16 gUnknown_03004134;
extern u32 gUnknown_03003074;
extern u32 gFiller_03003154;
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 59cdc82d0..1f29d863d 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -24,5 +24,6 @@ bool8 sub_8010500(void);
bool8 Rfu_IsMaster(void);
void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
void sub_8010434(void);
+void sub_800E604(void);
#endif //GUARD_LINK_RFU_H
diff --git a/include/m4a.h b/include/m4a.h
index 8c3380dd8..316b85082 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -17,4 +17,8 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
+extern struct MusicPlayerInfo gMPlay_SE1;
+extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlay_SE3;
+
#endif //GUARD_M4A_H
diff --git a/include/malloc.h b/include/malloc.h
index f3a731797..a6abab5e4 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,6 +1,7 @@
#ifndef GUARD_MALLOC_H
#define GUARD_MALLOC_H
+#define HEAP_SIZE 0x1C000
#define malloc Alloc
#define calloc(ct, sz) AllocZeroed((ct) * (sz))
#define free Free
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index 42b8c60b1..2deb8d8cd 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -4,6 +4,8 @@
#include "text.h"
#include "task.h"
+extern const u16 gUnknown_0860F074[];
+
void sub_81973A4(void);
void sub_81973C4(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram);