diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 21:59:57 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-07 08:46:55 -0600 |
| commit | 105e1721d665d8386afd47882020c51d6d97c522 (patch) | |
| tree | c8069eb2186b2099d345676b91728a88200ed53b /src | |
| parent | 00814740183a670a2b122d9b3d708b97c5d2df4e (diff) | |
Overhaul scaninc to work recursively
This also fixes the bug where scaninc would ignore #include lines
in assembly files.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/field_message_box.c | 2 | ||||
| -rwxr-xr-x | src/item_menu.c | 2 | ||||
| -rw-r--r-- | src/main_menu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/field_message_box.c b/src/field_message_box.c index ac5e7a4bb..ca1c05e22 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -1,6 +1,6 @@ +#include <string.h> #include "global.h" #include "menu.h" -#include "string.h" #include "string_util.h" #include "task.h" #include "text.h" diff --git a/src/item_menu.c b/src/item_menu.c index 5b9946e62..5d5dfe854 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1,3 +1,4 @@ +#include <string.h> #include "global.h" #include "item_menu.h" #include "battle.h" @@ -40,7 +41,6 @@ #include "shop.h" #include "sound.h" #include "sprite.h" -#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" diff --git a/src/main_menu.c b/src/main_menu.c index e6e29d942..1879495f5 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1,3 +1,4 @@ +#include <string.h> #include "global.h" #include "trainer_pokemon_sprites.h" #include "bg.h" @@ -30,7 +31,6 @@ #include "scanline_effect.h" #include "sound.h" #include "sprite.h" -#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" |