diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-12-17 01:36:30 +0000 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-12-17 01:36:30 +0000 |
| commit | b199c5d7f13eb6450b31ea3440a7633c434576a9 (patch) | |
| tree | 0d8a0189e3a67b50288290f025ecfe885c132ef0 | |
| parent | c7fe3c43880f2099db3830c488de14dff0914f2e (diff) | |
make ROM compile again/fix warnings
| -rw-r--r-- | include/asm.inc.h | 2 | ||||
| -rw-r--r-- | src/save_failed_screen.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 280e49910..7585e70e1 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -484,7 +484,7 @@ void sub_813EDBC(/*TODO: arg types*/); void CB2_InitMysteryEventMenu(void); // asm/save_failed_screen.o -void fullscreen_save_activate(); +void fullscreen_save_activate(u8); // asm/rom_81473B8.o bool8 sub_81474C8(void); 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) |