diff options
author | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
commit | 0051947414df4656826a5ba0b252fdbb5fb0e065 (patch) | |
tree | 4ac69544094baaa620b1e8556ddf79715db4fde3 /src/battle_transition.c | |
parent | 72f9afcbf4a81909019f21acad0484b72ed217f6 (diff) | |
parent | ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff) |
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r-- | src/battle_transition.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index d1d92cb50..fc8c0eeee 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -19,7 +19,7 @@ #include "gpu_regs.h" #include "decompress.h" #include "bg.h" -#include "blend_palette.h" +#include "util.h" struct TransitionData { |