fix merge conflicts

1 files changed, 31 insertions, 0 deletions

diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
new file mode 100644
index 000000000..764adfc9a
--- /dev/null
+++ b/include/field_fadetransition.h
@@ -0,0 +1,31 @@
+#ifndef GUARD_FIELD_FADETRANSITION_H
+#define GUARD_FIELD_FADETRANSITION_H
+
+void palette_bg_fill_white(void);
+void palette_bg_fill_black(void);
+void pal_fill_black(void);
+void pal_fill_black();
+void pal_fill_black(void);
+void task0A_asap_script_env_2_enable_and_set_ctx_running(u8);
+void sub_8080990(void);
+void sub_80809B0(void);
+void sub_8080A3C(void);
+void sub_8080AC4(void);
+void mapldr_default();
+void sub_8080B60(void);
+void atk17_seteffectuser(void);
+void sub_8080E28(void);
+void sub_8080E44(void);
+int 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);
+void sub_8080F2C(u8);
+void sub_8080F48(void);
+void sub_8080F58(void);
+void sub_8080F68(void);
+void sub_8080F9C(void);
+
+#endif // GUARD_FIELD_FADETRANSITION_H