diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-11 13:51:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 13:51:45 -0600 |
| commit | 2b56f43fce75871f2be993d43b483ceefd0bfc0f (patch) | |
| tree | 6fefa6a95a940c731ce7e551d1bc5c00a2626db0 /src/field/pokeblock.c | |
| parent | a51b95150ba86a3982f613886471626f742aeacd (diff) | |
| parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) | |
Merge branch 'master' into assert
Diffstat (limited to 'src/field/pokeblock.c')
| -rw-r--r-- | src/field/pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index dd94e1755..7e8bdc2ce 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -8,7 +8,7 @@ #include "script.h" #include "strings.h" #include "task.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "text.h" #include "main.h" #include "menu.h" @@ -255,7 +255,7 @@ static bool8 sub_810B6C0(void) gMain.state++; break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); gMain.state++; break; case 2: |