diff options
| author | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
| commit | af208a6bbb671cbf471d08856994470e707c5051 (patch) | |
| tree | 9a57703eecf8c18f444454f2fae8f5dccf19d408 /src/secret_base.c | |
| parent | 7e170a06cc3155a6a8785af0b910434e5ab43d2b (diff) | |
| parent | f801eed3a84862d88af0d5e43c6b6754e36001f2 (diff) | |
Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff
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 d50ad94bb..39377e9df 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" |