diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:41:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:46:04 -0400 |
| commit | b8fec3d9f617ec9a764bb56804c526ff7449631f (patch) | |
| tree | 2e84d0bf6107a15ebcb94a23c3158e2bc6382f6f /src/pokemon.c | |
| parent | 9fe74ac590f75a0571de8ebcd499fdf892419328 (diff) | |
| parent | 8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 4685dcbcd..1159b1861 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -13,7 +13,6 @@ #include "event_data.h" #include "util.h" #include "pokemon_storage_system.h" -#include "data.h" #include "battle_gfx_sfx_util.h" #include "battle_controllers.h" #include "evolution_scene.h" |