diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-09 21:24:47 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-09 21:24:47 +0100 |
| commit | bb1ae5f8572cbbda145bc88e9677de5988646696 (patch) | |
| tree | 9e7fa573390eb971aafc20884d0865246497458e /src/main.c | |
| parent | 6561b62986a003e83811abfc85bf07ebc6f3a1ae (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 665a4dd84..07ce07f1c 100644 --- a/src/main.c +++ b/src/main.c @@ -2,7 +2,7 @@ #include "main.h" #include "m4a.h" #include "rtc.h" -#include "rng.h" +#include "random.h" #include "dma3.h" #include "gba/flash_internal.h" #include "battle.h" |