diff options
| author | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:16:07 -0400 |
|---|---|---|
| committer | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:16:07 -0400 |
| commit | e129f4864fa342fdca46399f216ee0c0c46c26b4 (patch) | |
| tree | 9df7fd1157581d84567225e2dcbc6318901dc2e9 /src/battle_factory.c | |
| parent | 2bd86dad2fddb1c836b462a4137fab724c7eb305 (diff) | |
| parent | 0979ea91fb247b642cf7aa9e0bea5265917923d8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
Diffstat (limited to 'src/battle_factory.c')
| -rw-r--r-- | src/battle_factory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 36c5ed2e8..2c8ab1052 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -20,7 +20,7 @@ #include "pokemon_summary_screen.h" #include "sound.h" #include "pokedex.h" -#include "blend_palette.h" +#include "util.h" #include "trainer_pokemon_sprites.h" #include "constants/battle_frontier.h" #include "constants/songs.h" |