diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/field_poison.c | |
parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'src/field_poison.c')
-rw-r--r-- | src/field_poison.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/field_poison.c b/src/field_poison.c index 4d4d4b975..8c9e029e1 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,13 +1,14 @@ #include "global.h" -#include "asm.h" +#include "field_poison.h" #include "field_message_box.h" +#include "fldeff_80C5CD4.h" #include "pokemon.h" +#include "pokemon_summary_screen.h" #include "script.h" #include "string_util.h" #include "task.h" #include "text.h" -extern struct Pokemon gPlayerParty[6]; extern u16 gScriptResult; extern u8 fieldPoisonText_PokemonFainted[]; |