diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
| commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
| tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /src/random.c | |
| parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
| parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) | |
resolve merge conflicts
Diffstat (limited to 'src/random.c')
| -rw-r--r-- | src/random.c | 4 |
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; |