address review comments

6 files changed, 14 insertions, 13 deletions

diff --git a/arm9/lib/include/RTC_internal.h b/arm9/lib/include/RTC_internal.h
index 77934291..440d8b95 100644
--- a/arm9/lib/include/RTC_internal.h
+++ b/arm9/lib/include/RTC_internal.h
@@ -1,7 +1,8 @@
 #ifndef NITRO_RTC_INTERNAL_H_
 #define NITRO_RTC_INTERNAL_H_
 
-BOOL RtcSendPxiCommand(u8 command);
+#include "nitro/types.h"
+
 BOOL RTCi_WriteRawStatus2Async(void);
 BOOL RTCi_ReadRawTimeAsync(void);
 BOOL RTCi_ReadRawDateAsync(void);
diff --git a/arm9/lib/src/RTC_internal.c b/arm9/lib/src/RTC_internal.c
index fcd4da69..c7a5f2aa 100644
--- a/arm9/lib/src/RTC_internal.c
+++ b/arm9/lib/src/RTC_internal.c
@@ -1,28 +1,30 @@
-#include "global.h"
+#include "function_target.h"
 #include "PXI_fifo.h"
 #include "RTC_internal.h"
 
-BOOL RTCi_ReadRawDateTimeAsync(void)
+static BOOL RtcSendPxiCommand(u8 command);
+
+ARM_FUNC BOOL RTCi_ReadRawDateTimeAsync(void)
 {
     return RtcSendPxiCommand(16);
 }
 
-BOOL RTCi_ReadRawDateAsync(void)
+ARM_FUNC BOOL RTCi_ReadRawDateAsync(void)
 {
     return RtcSendPxiCommand(17);
 }
 
-BOOL RTCi_ReadRawTimeAsync(void)
+ARM_FUNC BOOL RTCi_ReadRawTimeAsync(void)
 {
     return RtcSendPxiCommand(18);
 }
 
-BOOL RTCi_WriteRawStatus2Async(void)
+ARM_FUNC BOOL RTCi_WriteRawStatus2Async(void)
 {
     return RtcSendPxiCommand(39);
 }
 
-BOOL RtcSendPxiCommand(u8 command)
+ARM_FUNC static BOOL RtcSendPxiCommand(u8 command)
 {
     s32 data = command << 8 & 0x7f00;
     return PXI_SendWordByFifo(PXI_FIFO_TAG_RTC, data, FALSE) >= 0;
diff --git a/arm9/src/WIFI_stubsmd5_dummy.c b/arm9/src/WIFI_stubsmd5_dummy.c
index a6447af9..6de2edca 100644
--- a/arm9/src/WIFI_stubsmd5_dummy.c
+++ b/arm9/src/WIFI_stubsmd5_dummy.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "function_target.h"
 #include "WIFI_stubsmd5_dummy.h"
 
 ARM_FUNC void MD5Final(u8 *digest, struct DGTHash1Context *context)
diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c
index 405ea15b..0267a87c 100644
--- a/arm9/src/unk_02022504.c
+++ b/arm9/src/unk_02022504.c
@@ -26,7 +26,7 @@ THUMB_FUNC u8 *LoadHallOfFame(struct SaveBlock2 *sav2, u32 heap_id, int *ret_p)
     return ReadSaveFileFromFlash(sav2, heap_id, 0, ret_p);
 }
 
-THUMB_FUNC int *SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data)
+THUMB_FUNC s32 *SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data)
 {
     return WriteSaveFileToFlash(sav2, 0, data);
 }
diff --git a/include/WIFI_stubsmd5_dummy.h b/include/WIFI_stubsmd5_dummy.h
index 73e83e39..d82b55c5 100644
--- a/include/WIFI_stubsmd5_dummy.h
+++ b/include/WIFI_stubsmd5_dummy.h
@@ -1,12 +1,11 @@
 #ifndef POKEDIAMOND_WIFI_STUBSMD5_DUMMY_H
 #define POKEDIAMOND_WIFI_STUBSMD5_DUMMY_H
 
+#include "nitro/types.h"
 #include "dgt.h"
 
 void MD5Final(u8 *digest, struct DGTHash1Context *context);
 void MD5Update(struct DGTHash1Context *context, u8 *input, u32 length);
 void MD5Init(struct DGTHash1Context *context);
 
-
 #endif //POKEDIAMOND_WIFI_STUBSMD5_DUMMY_H
-
diff --git a/include/unk_02022504.h b/include/unk_02022504.h
index 3473ffff..aa541f85 100644
--- a/include/unk_02022504.h
+++ b/include/unk_02022504.h
@@ -9,7 +9,6 @@ struct PCStorage *GetStoragePCPointer(struct SaveBlock2 *sav2);
 void *FUN_0202251C(struct SaveBlock2 *sav2);
 void *FUN_02022528(struct SaveBlock2 *sav2);
 u8 *LoadHallOfFame(struct SaveBlock2 *sav2, u32 heap_id, int *ret_p);
-int *SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data);
+s32 *SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data);
 
 #endif //POKEDIAMOND_UNK_02022504_H
-