diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/safari_zone.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/safari_zone.c')
| -rw-r--r-- | src/safari_zone.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index 08bfbefbf..8c2b63469 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -1,12 +1,13 @@ #include "global.h" #include "safari_zone.h" #include "asm.h" -#include "field_player_avatar.h" #include "event_data.h" +#include "field_player_avatar.h" #include "main.h" +#include "rom4.h" #include "script.h" #include "string_util.h" -#include "rom4.h" +#include "text.h" struct PokeblockFeeder { |