diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/mystery_event_menu.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/mystery_event_menu.c')
| -rw-r--r-- | src/mystery_event_menu.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 09523ff40..693b28948 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -1,17 +1,17 @@ #include "global.h" -#include "sprite.h" -#include "menu.h" +#include "mystery_event_menu.h" +#include "asm.h" #include "link.h" -#include "text.h" #include "main.h" +#include "menu.h" #include "palette.h" -#include "task.h" -#include "string_util.h" +#include "save.h" #include "songs.h" #include "sound.h" -#include "save.h" -#include "asm.h" -#include "mystery_event_menu.h" +#include "sprite.h" +#include "string_util.h" +#include "task.h" +#include "text.h" extern u8 unk_2000000[]; extern u8 gUnknown_02039338; @@ -295,7 +295,7 @@ static void CB2_MysteryEventMenu(void) unkVal = sub_812613C(unk_2000000); CpuFill32(0, unk_2000000, 0x7D4); if (!GetEventLoadMessage(gStringVar4, unkVal)) - sub_8125D44(0); + TrySavingData(NORMAL_SAVE); gMain.state++; break; case 12: |