From 3c5ac052e970fcfcbf67fd57fa7830cab88084f1 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 7 Dec 2019 13:39:17 +1000
Subject: [PATCH] Move commented random function to proper file

---
 src/library/library_126b0.c | 11 -----------
 src/library/library_12dc0.c | 12 +++++++++++-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/library/library_126b0.c b/src/library/library_126b0.c
index 5c1703529..52c1d860f 100644
--- a/src/library/library_126b0.c
+++ b/src/library/library_126b0.c
@@ -559,14 +559,3 @@ glabel func00012d48
 /*    12db8:	00000000 */ 	sll	$zero,$zero,0x0
 /*    12dbc:	00000000 */ 	sll	$zero,$zero,0x0
 );
-
-// func00012dc0
-// Commented because compiler won't bitshift a u64
-//u8 random(void)
-//{
-//	rand_seed = ((rand_seed << 63) >> 31 | (rand_seed << 31) >> 32) ^
-//		(rand_seed << 44) >> 32;
-//	rand_seed = rand_seed >> 20 & 0xfff ^ rand_seed;
-//
-//	return rand_seed;
-//}
\ No newline at end of file
diff --git a/src/library/library_12dc0.c b/src/library/library_12dc0.c
index 55ffdff90..4737258d1 100644
--- a/src/library/library_12dc0.c
+++ b/src/library/library_12dc0.c
@@ -5,6 +5,7 @@
 #include "library/library_2fa00.h"
 #include "library/library_4a5e0.h"
 #include "library/library_4e530.h"
+#include "setup/setup_000000.h"
 
 const u32 var70053ff0[] = {0x00000000};
 const char var70053ff4[] = "-d";
@@ -36,6 +37,15 @@ glabel random
 /*    12e04:	0002103f */ 	dsra32	$v0,$v0,0x0
 );
 
+// Commented because ld isn't happy with bitshifting a u64.
+//u32 random(void)
+//{
+//	rand_seed = ((rand_seed << 63) >> 31 | (rand_seed << 31) >> 32) ^ (rand_seed << 44) >> 32;
+//	rand_seed = rand_seed >> 20 & 0xfff ^ rand_seed;
+//
+//	return rand_seed;
+//}
+
 GLOBAL_ASM(
 glabel func00012e08
 /*    12e08:	64840001 */ 	daddiu	$a0,$a0,0x1
@@ -281,4 +291,4 @@ glabel func000130d4
 /*    13124:	03e00008 */ 	jr	$ra
 /*    13128:	00000000 */ 	sll	$zero,$zero,0x0
 /*    1312c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);