diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-17 08:11:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 08:11:32 -0800 |
| commit | 90c7299e519783fe1e22d9ec8d3351d08bda65f6 (patch) | |
| tree | b24d8bdcd6809c5465c6aa18f6d3109af2aad915 /src/pokemon_1.c | |
| parent | 4f9aab81ffdfedc84dfeafb88b4248dc6c7c2068 (diff) | |
| parent | 46cf490edd4fd5971d3a3511516beb0910e33c32 (diff) | |
Merge pull request #193 from marijnvdwerf/clean/cleanup-1
Clean up various things
Diffstat (limited to 'src/pokemon_1.c')
| -rw-r--r-- | src/pokemon_1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index b8735fbc4..1c11449c3 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -1,14 +1,14 @@ #include "global.h" #include "asm.h" -#include "text.h" -#include "string_util.h" +#include "items.h" +#include "main.h" #include "pokemon.h" +#include "rng.h" #include "rom4.h" #include "species.h" -#include "main.h" -#include "rng.h" #include "sprite.h" -#include "items.h" +#include "string_util.h" +#include "text.h" //Extracts the upper 16 bits of a 32-bit number #define HIHALF(n) (((n) & 0xFFFF0000) >> 16) |