diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /src/field_poison.c | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'src/field_poison.c')
| -rw-r--r-- | src/field_poison.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_poison.c b/src/field_poison.c index 89cd02728..532c7f027 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_pike.h" +#include "battle_pyramid.h" #include "event_data.h" #include "field_message_box.h" #include "field_poison.h" @@ -8,7 +9,6 @@ #include "frontier_util.h" #include "party_menu.h" #include "pokenav.h" -#include "rom_818CFC8.h" #include "script.h" #include "string_util.h" #include "strings.h" |