Merge branch 'master' of github.com:pret/pokeemerald into trade

1 files changed, 4 insertions, 4 deletions

diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index f3ac2e866..3daf8d892 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -19,11 +19,11 @@ void sub_80AF688(void);
 bool8 sub_80AF6A4(void);
 void sub_80AF6D4(void);
 void sub_80AF6F0(void);
-void sub_80AF734(void);
-void sp13E_warp_to_last_warp(void);
+void DoWarp(void);
+void DoDiveWarp(void);
 void sub_80AF79C(void);
-void sub_80AF7D0(void);
-void sp13F_fall_to_last_warp(void);
+void DoDoorWarp(void);
+void DoFallWarp(void);
 void sub_80AF80C(u8 metatileBehavior);
 void sub_80AF828(void);
 void sub_80AF838(void);