diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /include/field_fadetransition.h | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'include/field_fadetransition.h')
| -rw-r--r-- | include/field_fadetransition.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index cd0cb6eab..04538753a 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -13,12 +13,11 @@ void sub_8080A3C(void); void sub_8080AC4(void); void mapldr_default(); void sub_8080B60(void); -void atk17_seteffectsecondary(void); +void sub_8080DEC(void); void sub_8080E28(void); void sub_8080E44(void); bool32 sub_8080E70(void); void sub_8080E88(void); -void sub_8080E88(); void sp13E_warp_to_last_warp(void); void sub_8080EF0(void); void sp13F_fall_to_last_warp(void); @@ -28,5 +27,7 @@ void sub_8080F58(void); void sub_8080F68(void); void sub_8080F9C(void); void debug_sub_80888D8(void); +void WarpFadeScreen(void); +void pal_fill_for_map_transition(void); #endif // GUARD_FIELD_FADETRANSITION_H |