From 9cf19244fa1fe925d4273eb32c8b7c68c5271152 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 13:18:21 -0500 Subject: Port Lavaridge Gym B1F Warp from Emerald --- include/event_object_movement.h | 1 + include/field_fadetransition.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') 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); -- cgit v1.2.3