diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-16 17:47:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 17:47:35 -0800 |
| commit | bf434629af83d7193db0d6c7f0e690ac9301e841 (patch) | |
| tree | 0d8a0189e3a67b50288290f025ecfe885c132ef0 /src | |
| parent | c7fe3c43880f2099db3830c488de14dff0914f2e (diff) | |
| parent | b199c5d7f13eb6450b31ea3440a7633c434576a9 (diff) | |
Merge pull request #131 from TwitchPlaysPokemon/master
make ROM compile again/fix warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/save_failed_screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index c35118858..8c724e1c5 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -8,6 +8,7 @@ #include "save.h" #include "m4a.h" #include "gba/flash_internal.h" +#include "asm.h" extern u8 unk_2000000[]; @@ -372,10 +373,10 @@ _081472E0: .4byte gUnknown_0203933E\n\ bool8 sub_81472E4(u16 var) { - u32 *ptr = unk_2000000; + u32 * ptr = (u32 *) unk_2000000; u16 i; - ReadFlash(var, 0, ptr, 4096); + ReadFlash(var, 0, (u8 *) ptr, 4096); for(i = 0; i < 0x400; i++, ptr++) if(*ptr) |