summaryrefslogtreecommitdiff
path: root/src/random.c
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-05-10 03:34:36 -0400
committergolem galvanize <golemgalvanize@github.com>2018-05-10 03:34:36 -0400
commit13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch)
tree57ae51e1b35c38d24d69e090dbf39b27a687d17b /src/random.c
parentd31600e70e53fb252fe67e8c427ecb7498719b86 (diff)
parent7defc27b994069715e5749245700d20dd740e4f0 (diff)
fixing conflicts
Diffstat (limited to 'src/random.c')
-rw-r--r--src/random.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/random.c b/src/random.c
index f2f0ede58..f0b2d9e5f 100644
--- a/src/random.c
+++ b/src/random.c
@@ -7,6 +7,10 @@
EWRAM_DATA static u8 sUnknown = 0;
EWRAM_DATA static u32 sRandCount = 0;
+// IWRAM common
+IWRAM_DATA u32 gRngValue;
+IWRAM_DATA u32 gRng2Value;
+
u16 Random(void)
{
gRngValue = 1103515245 * gRngValue + 24691;