diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /src/reset_save_heap.c | |
parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
fix merge conflict
Diffstat (limited to 'src/reset_save_heap.c')
-rw-r--r-- | src/reset_save_heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c index b786ff9f8..d4dbc5f42 100644 --- a/src/reset_save_heap.c +++ b/src/reset_save_heap.c @@ -5,7 +5,7 @@ #include "load_save.h" #include "save.h" #include "new_game.h" -#include "rom4.h" +#include "overworld.h" #include "malloc.h" void sub_81700F8(void) |