diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
| commit | 46023e742c7704c449ae7ec9c2a592cd923f40e6 (patch) | |
| tree | 9f6c6591e60f83003f6abccb5a28cfb3004ad2ab /src/field/field_effect.c | |
| parent | cb674ce14dc43f99dd76f456e69ab8a90cc3d506 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' into german_debug
Conflicts:
asm/pokemon_storage_system.s
data/pokemon_storage_system.s
src/pokemon/pokemon_1.c
src/pokemon/pokemon_storage_system.c
sym_common.txt
sym_ewram.txt
Diffstat (limited to 'src/field/field_effect.c')
| -rw-r--r-- | src/field/field_effect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/field/field_effect.c b/src/field/field_effect.c index ad570cf7f..e1389c378 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -25,6 +25,7 @@ #include "field_map_obj.h" #include "util.h" #include "field_effect_helpers.h" +#include "pokemon_storage_system.h" #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} |