From 53a4effd577cc60a9e3af422bf99109d54053440 Mon Sep 17 00:00:00 2001
From: PokeCodec <67983839+PokeCodec@users.noreply.github.com>
Date: Sat, 5 Sep 2020 16:41:44 -0400
Subject: [PATCH] Tidy up headers

---
 include/AgbRfu_LinkManager.h |  4 ++--
 include/gba/m4a_internal.h   |  6 +++---
 include/librfu.h             |  1 +
 src/m4a_1.s                  | 10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/AgbRfu_LinkManager.h b/include/AgbRfu_LinkManager.h
index d4ef13183e..4e1a879c22 100644
--- a/include/AgbRfu_LinkManager.h
+++ b/include/AgbRfu_LinkManager.h
@@ -176,8 +176,8 @@ typedef struct linkManagerTag
     /* 0x024 */ VBL_TIMER nameAcceptTimer;
     /* 0x030 */ VBL_TIMER linkRecoveryTimer;
     /* 0x03c */ INIT_PARAM *init_param;
-    /* 0x040 */ void (*LMAN_callback)(u8, u8);
-    /* 0x044 */ void (*MSC_callback)(u16);
+    /* 0x040 */ void (*LMAN_callback)(u8 msg, u8  paramCount);
+    /* 0x044 */ void (*MSC_callback)(u16 REQ_commandID);
 } LINK_MANAGER;
 
 extern struct linkManagerTag lman;
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index bdff1b8651..09e5646f28 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -317,9 +317,9 @@ struct SoundInfo
     u8 pcmDmaPeriod; // number of V-blanks per PCM DMA
     u8 maxLines;
     u8 gap[3];
-    s32 pcmSamplesPerVBlank;
-    s32 pcmFreq;
-    s32 divFreq;
+    u32 pcmSamplesPerVBlank;
+    u32 pcmFreq;
+    u32 divFreq;
     struct CgbChannel *cgbChans;
     void (*func)();
     u32 intp;
diff --git a/include/librfu.h b/include/librfu.h
index 69c6961729..3c56491c3a 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -407,6 +407,7 @@ struct RfuTgtData
     u16 serialNo;                              // Game serial number of parent candidate                 Game serial number of connection partner
     u8  gname[RFU_GAME_NAME_LENGTH + 2];       // Game name of parent candidate                          Game name of connection partner
     u8  uname[RFU_USER_NAME_LENGTH + 1];       // User name for parent candidate                         User name for connection partner
+    u8 padding[2];
 };
 
 struct RfuLinkStatus
diff --git a/src/m4a_1.s b/src/m4a_1.s
index eace09b05f..290404ad04 100644
--- a/src/m4a_1.s
+++ b/src/m4a_1.s
@@ -1392,10 +1392,10 @@ _081DD9F6:
 	bl ChnVolSetAsm
 	cmp r6, 0
 	beq _081DDA14
-	ldrb r0, [r4, o_CgbChannel_mo]
+	ldrb r0, [r4, #o_CgbChannel_mo]
 	movs r1, 0x1
 	orrs r0, r1
-	strb r0, [r4, o_CgbChannel_mo]
+	strb r0, [r4, #o_CgbChannel_mo]
 _081DDA14:
 	ldrb r3, [r5, #o_MusicPlayerTrack_flags]
 	movs r0, 0xC
@@ -1416,11 +1416,11 @@ _081DDA28:
 	ldrb r2, [r5, #o_MusicPlayerTrack_pitM]
 	adds r0, r6, 0
 	bl call_r3
-	str r0, [r4, o_CgbChannel_fr]
-	ldrb r0, [r4, o_CgbChannel_mo]
+	str r0, [r4, #o_CgbChannel_fr]
+	ldrb r0, [r4, #o_CgbChannel_mo]
 	movs r1, 0x2
 	orrs r0, r1
-	strb r0, [r4, o_CgbChannel_mo]
+	strb r0, [r4, #o_CgbChannel_mo]
 	b _081DDA52
 _081DDA46:
 	adds r1, r2, 0