From 44153caeca88911f4a3ecb8d5ea314a8f88bcb7d Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Sun, 23 Feb 2025 22:13:21 +0000
Subject: [PATCH] move rand.h funcs to stdlib.h

---
 arm9/lib/MSL_C/include/MSL.h    | 1 -
 arm9/lib/MSL_C/include/rand.h   | 7 -------
 arm9/lib/MSL_C/include/stdlib.h | 2 ++
 arm9/lib/MSL_C/src/rand.c       | 2 +-
 arm9/src/scrcmd_3.c             | 3 +--
 5 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 arm9/lib/MSL_C/include/rand.h

diff --git a/arm9/lib/MSL_C/include/MSL.h b/arm9/lib/MSL_C/include/MSL.h
index f3287f28e..26be2270f 100644
--- a/arm9/lib/MSL_C/include/MSL.h
+++ b/arm9/lib/MSL_C/include/MSL.h
@@ -3,7 +3,6 @@
 
 //include all msl files here
 
-#include "rand.h"
 #include "stdlib.h"
 #include "string.h"
 
diff --git a/arm9/lib/MSL_C/include/rand.h b/arm9/lib/MSL_C/include/rand.h
deleted file mode 100644
index f2c5fd896..000000000
--- a/arm9/lib/MSL_C/include/rand.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef POKEDIAMOND_MSL_RAND_H
-#define POKEDIAMOND_MSL_RAND_H
-
-int rand(void);
-void srand(unsigned int seed);
-
-#endif // POKEDIAMOND_MSL_RAND_H
diff --git a/arm9/lib/MSL_C/include/stdlib.h b/arm9/lib/MSL_C/include/stdlib.h
index 21772e8b7..941b648de 100644
--- a/arm9/lib/MSL_C/include/stdlib.h
+++ b/arm9/lib/MSL_C/include/stdlib.h
@@ -4,5 +4,7 @@
 // this file MUST be called stdlib.h, as the filename affects matching for some reason
 
 int abs(int val);
+void srand(unsigned int seed);
+int rand(void);
 
 #endif // POKEDIAMOND_MSL_C_STDLIB_H
diff --git a/arm9/lib/MSL_C/src/rand.c b/arm9/lib/MSL_C/src/rand.c
index 6224059c2..db5996ea1 100644
--- a/arm9/lib/MSL_C/src/rand.c
+++ b/arm9/lib/MSL_C/src/rand.c
@@ -1,5 +1,5 @@
-#include "rand.h"
 #include "code32.h"
+#include "stdlib.h"
 
 static unsigned long int random_next = 1;
 
diff --git a/arm9/src/scrcmd_3.c b/arm9/src/scrcmd_3.c
index 6bc45a8f3..8f2f7aaba 100644
--- a/arm9/src/scrcmd_3.c
+++ b/arm9/src/scrcmd_3.c
@@ -5,9 +5,9 @@
 #include "party.h"
 #include "pokedex.h"
 #include "pokemon_storage_system.h"
+#include "sav_chatot.h"
 #include "save_vars_flags.h"
 #include "scrcmd.h"
-#include "sav_chatot.h"
 
 extern void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, u8 idx);
 extern SaveFashionData *Save_FashionData_Get(SaveData *save);
@@ -55,7 +55,6 @@ static BOOL sub_0203FEF4(ScriptContext *ctx);
 static BOOL sub_020401F0(ScriptContext *ctx);
 static BOOL sub_02040618(ScriptContext *ctx);
 
-
 BOOL ScrCmd_Unk00F8(ScriptContext *ctx) {
     void **miscDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR);