diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
| commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
| tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /src/rom_8011DC0.c | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/rom_8011DC0.c')
| -rw-r--r-- | src/rom_8011DC0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index a197598de..deec55c9d 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -7,7 +7,7 @@ #include "link.h" #include "link_rfu.h" #include "librfu.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "list_menu.h" #include "menu_helpers.h" @@ -32,7 +32,7 @@ #include "decompress.h" #include "start_menu.h" #include "data2.h" -#include "field_screen.h" +#include "field_screen_effect.h" extern void HealPlayerParty(void); |