diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
commit | cd069446e06c277222be0aaa05fb43b090259234 (patch) | |
tree | a740e2042ff6af3465cfdaa15fc29c35269cfa70 /include/field_screen_effect.h | |
parent | 3181c64c64afa47b3adc04f325ad3798c8c324ec (diff) | |
parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) |
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'include/field_screen_effect.h')
-rw-r--r-- | include/field_screen_effect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index b4429c167..a62a76b2a 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -5,7 +5,7 @@ void pal_fill_for_maplights(void); void pal_fill_black(void); void WarpFadeScreen(void); void sub_80AF128(void); -void sub_80AF168(void); +void FieldCallback_ReturnToEventScript2(void); void sub_80AF188(void); void sub_80AF214(void); void sub_80AF2B4(u8 taskId); |