summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-02-28 13:18:21 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-02-28 13:18:21 -0500
commit9cf19244fa1fe925d4273eb32c8b7c68c5271152 (patch)
tree9fd19206d77565875f50a6d4c2d6a661fd64ecf7 /include
parent8a092738468de1f4bbe11b7ef4d338735312e9dd (diff)
Port Lavaridge Gym B1F Warp from Emerald
Diffstat (limited to 'include')
-rw-r--r--include/event_object_movement.h1
-rw-r--r--include/field_fadetransition.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index ebd5b44db..bbf34a23b 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -117,6 +117,7 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
u8 sub_8063F2C(u8 direction);
+u8 sub_8064194(u8 direction);
void sub_805F378(s16 x, s16 y);
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index c23f201dc..a1fe590fa 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -16,7 +16,7 @@ void WarpFadeOutScreen(void);
void FieldCallback_ReturnToEventScript2(void);
void FadeInFromBlack(void);
void FadeTransition_FadeInOnReturnToStartMenu(void);
-void pal_fill_for_maplights(void);
+void WarpFadeInScreen(void);
void sub_807DCE4(void);