diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
tree | 70220c06025360d7089011f5d80239b61ac183af /include/field_fadetransition.h | |
parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) |
fix merge conflicts
Diffstat (limited to 'include/field_fadetransition.h')
-rw-r--r-- | include/field_fadetransition.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h new file mode 100644 index 000000000..7c2d16a24 --- /dev/null +++ b/include/field_fadetransition.h @@ -0,0 +1,12 @@ +#ifndef GUARD_FIELD_FADETRANSITION_H +#define GUARD_FIELD_FADETRANSITION_H + +void sub_80AF734(void); +void sp13E_warp_to_last_warp(void); +void sub_80AF7D0(void); +void sp13F_fall_to_last_warp(void); + +void sub_80AF848(void); +void sub_80AF87C(void); + +#endif // GUARD_FIELD_FADETRANSITION_H |