a bit of cleanup

5 files changed, 14 insertions, 16 deletions

diff --git a/arm9/modules/21/asm/mod21_02254A6C_asm.s b/arm9/modules/21/asm/mod21_02254A6C_asm.s
index 45ff2a27..f1cc2984 100644
--- a/arm9/modules/21/asm/mod21_02254A6C_asm.s
+++ b/arm9/modules/21/asm/mod21_02254A6C_asm.s
@@ -3,16 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD21_02254B04
-MOD21_02254B04: ; 0x02254B04
-	push {r3, lr}
-	cmp r0, #0
-	beq _02254B0E
-	bl FreeToHeap
-_02254B0E:
-	pop {r3, pc}
-	thumb_func_end MOD21_02254B04
-
 	thumb_func_start MOD21_02254B10
 MOD21_02254B10: ; 0x02254B10
 	push {lr}
diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h
index b501962e..cc716a1d 100644
--- a/arm9/modules/21/include/mod21_02254854.h
+++ b/arm9/modules/21/include/mod21_02254854.h
@@ -2,6 +2,7 @@
 #define POKEDIAMOND_MOD21_02254854_H
 
 #include "nitro/types.h"
+#include "mod21_02254A6C.h"
 
 typedef struct UnkStruct02254854
 {
diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h
index 71bc78e7..493c2746 100644
--- a/arm9/modules/21/include/mod21_02254A6C.h
+++ b/arm9/modules/21/include/mod21_02254A6C.h
@@ -14,5 +14,6 @@ typedef struct UnkStruct02254A6C
 
 BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1);
 void MOD21_02254AD4(void *param0, void *param1);
+void MOD21_02254B04(void *param0);
 
 #endif //POKEDIAMOND_MOD21_02254A6C_H
diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c
index 44c97b8e..0cdb0c32 100644
--- a/arm9/modules/21/src/mod21_02254854.c
+++ b/arm9/modules/21/src/mod21_02254854.c
@@ -6,17 +6,15 @@
 extern void GF_RTC_CopyTime(u32 *param0);
 
 u8 const MOD21_02254D80[] = { 0x10, 0xAF, 0x10, 0xCF };
-extern BOOL MOD21_02254A6C(u32 *param0, u32 *param1);
 extern BOOL MOD20_02254130(void *param0, BOOL param1, void *param2, UnkStruct02254854 *param3, u32 param4);
 extern void MOD20_02252C14(u32 param0, BOOL param1);
 
-extern void MOD21_02254B04(u32 param0);
 extern void MOD20_02254198(BOOL param0);
 extern void MOD20_022529A0(u32 param0);
 
-extern void MOD21_02254B10(u32 param0, u32 param1);
-extern BOOL MOD21_02254B34(u32 param0, u32 param1);
-extern BOOL MOD21_02254B40(u32 param0);
+extern void MOD21_02254B10(void *param0, u32 param1);
+extern BOOL MOD21_02254B34(void *param0, u32 param1);
+extern BOOL MOD21_02254B40(void *param0);
 extern void MOD20_0225298C(u32 param0);
 
 extern void Poketch_InitApp(void *func1, void *func2);
@@ -47,7 +45,7 @@ THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param
 THUMB_FUNC BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3)
 {
 #pragma unused (param2, param3) //not sure, please check
-    if (MOD21_02254A6C(&param0->Unk24, param0->Unk14))
+    if (MOD21_02254A6C((UnkStruct02254A6C *)&param0->Unk24, param0->Unk14)) //todo fix
     {
         param0->bytearray[0] = 0;
         param0->bytearray[1] = 0;
diff --git a/arm9/modules/21/src/mod21_02254A6C_src.c b/arm9/modules/21/src/mod21_02254A6C_src.c
index 4bd810d4..a37b5728 100644
--- a/arm9/modules/21/src/mod21_02254A6C_src.c
+++ b/arm9/modules/21/src/mod21_02254A6C_src.c
@@ -42,3 +42,11 @@ THUMB_FUNC void MOD21_02254AD4(void *param0, void *param1)
         param1 = (void *)((u32)param1 + 0x50);
     }
 }
+
+THUMB_FUNC void MOD21_02254B04(void *param0)
+{
+    if (param0 != NULL)
+    {
+        FreeToHeap(param0);
+    }
+}