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/clear_save_data_menu.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/clear_save_data_menu.c')
| -rw-r--r-- | src/clear_save_data_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c index 198dce340..6b0cc821a 100644 --- a/src/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c @@ -1,13 +1,13 @@ #include "global.h" #include "clear_save_data_menu.h" -#include "save.h" -#include "task.h" -#include "songs.h" -#include "menu.h" #include "main.h" -#include "sprite.h" +#include "menu.h" #include "palette.h" +#include "save.h" +#include "songs.h" #include "sound.h" +#include "sprite.h" +#include "task.h" extern u8 gSystemText_ClearAllSaveDataPrompt[]; extern u8 gSystemText_ClearingData[]; |