diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 02:24:41 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 02:24:41 -0600 |
| commit | 48c6d764e00285378d3f24d954855c6bde613bc0 (patch) | |
| tree | 82f907925cb280cfeccfc0eeb66595e87cea6f5b /include | |
| parent | 4e1098beb6a84a46f0ac2bff37013a3f675f6750 (diff) | |
| parent | d373f41c2cbd2dc71ca2287b179c7c8777b9eb02 (diff) | |
fix merge conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/random.h (renamed from include/rng.h) | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/rng.h b/include/random.h index dec8c6e26..a928a97b5 100644 --- a/include/rng.h +++ b/include/random.h @@ -1,5 +1,5 @@ -#ifndef GUARD_RNG_H -#define GUARD_RNG_H +#ifndef GUARD_RANDOM_H +#define GUARD_RANDOM_H extern u32 gRngValue; @@ -12,4 +12,5 @@ u16 Random(void); //Sets the initial seed value of the pseudorandom number generator void SeedRng(u16 seed); -#endif // GUARD_RNG_H +#endif // GUARD_RANDOM_H + |