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/secret_base.c | |
parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/secret_base.c')
-rw-r--r-- | src/secret_base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 8436d8520..9b5685d8b 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,9 +1,7 @@ - -// Includes #include "global.h" #include "constants/bg_event_constants.h" #include "constants/decorations.h" -#include "malloc.h" +#include "alloc.h" #include "main.h" #include "task.h" #include "palette.h" @@ -19,7 +17,7 @@ #include "fieldmap.h" #include "field_camera.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "event_object_movement.h" #include "field_effect.h" |