summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-02-28 10:02:40 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-02-28 10:02:40 -0500
commit1779aedbf0e321188ff239095a3e20f38cf22575 (patch)
treec21416e1aa4824283bb3340d316befea33d7fdb5 /include
parentdb12644f0001346604c19e4004eead5cd2203fea (diff)
Escalator field effect
Diffstat (limited to 'include')
-rw-r--r--include/field_effect.h2
-rw-r--r--include/field_fadetransition.h2
-rw-r--r--include/overworld.h2
-rw-r--r--include/quest_log.h1
-rw-r--r--include/special_field_anim.h2
5 files changed, 5 insertions, 4 deletions
diff --git a/include/field_effect.h b/include/field_effect.h
index 7e980bd22..3c92afb6a 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -17,7 +17,7 @@ void StartEscapeRopeFieldEffect(void);
void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
void FieldCB_FallWarpExit(void);
-void StartEscalatorWarp(u8 a0, u8 a1);
+void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
void StartLavaridgeGymB1FWarp(u8 a0);
void StartLavaridgeGym1FWarp(u8 a0);
void sub_8083598(u8 a0);
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index 70aa7d023..c23f201dc 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -12,7 +12,7 @@ void DoFallWarp(void);
void sub_807E59C(void);
void sub_807E500(void);
void sub_807DF64(void);
-void sub_807DC18(void);
+void WarpFadeOutScreen(void);
void FieldCallback_ReturnToEventScript2(void);
void FadeInFromBlack(void);
void FadeTransition_FadeInOnReturnToStartMenu(void);
diff --git a/include/overworld.h b/include/overworld.h
index 8fdbfabe3..754094907 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -155,7 +155,7 @@ u8 GetCurrentMapType(void);
u8 get_map_light_from_warp0(void);
const struct MapHeader *warp1_get_mapheader(void);
-void sub_8055F88(void);
+void TryFadeOutOldMapMusic(void);
void CB2_ReturnToFieldCableClub(void);
void ResetGameStats(void);
diff --git a/include/quest_log.h b/include/quest_log.h
index 752cb3921..016a94267 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -50,5 +50,6 @@ void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
void sub_8110840(void *oldSave);
void sub_8112F18(u8 windowId);
bool8 sub_8111C2C(void);
+void sub_81128BC(u8 a0);
#endif //GUARD_QUEST_LOG_H
diff --git a/include/special_field_anim.h b/include/special_field_anim.h
index d21c932bf..37c31f97b 100644
--- a/include/special_field_anim.h
+++ b/include/special_field_anim.h
@@ -3,7 +3,7 @@
#include "global.h"
-void StartEscalator(u8 a0);
+void StartEscalator(bool8 goingUp);
void StopEscalator(void);
bool8 IsEscalatorMoving(void);