through sub_805D1A8

5 files changed, 8 insertions, 5 deletions

diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 08634f5f2..cccba35ff 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -7,14 +7,14 @@
 #define OBJ_EVENT_GFX_RED_ITEM 3
 #define OBJ_EVENT_GFX_RED_FISH 4
 #define OBJ_EVENT_GFX_RED_ITEM_COPY 5
-#define OBJ_EVENT_GFX_RED_VS_SEEKER 6
+#define OBJ_EVENT_GFX_RED_FIELD_MOVE_BIKE 6
 #define OBJ_EVENT_GFX_GREEN_NORMAL 7
 #define OBJ_EVENT_GFX_GREEN_BIKE 8
 #define OBJ_EVENT_GFX_GREEN_SURF 9
 #define OBJ_EVENT_GFX_GREEN_ITEM 10
 #define OBJ_EVENT_GFX_GREEN_FISH 11
 #define OBJ_EVENT_GFX_GREEN_ITEM_COPY 12
-#define OBJ_EVENT_GFX_GREEN_VS_SEEKER 13
+#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE_BIKE 13
 #define OBJ_EVENT_GFX_RS_BRENDAN 14
 #define OBJ_EVENT_GFX_RS_MAY 15
 #define OBJ_EVENT_GFX_LITTLE_BOY 16
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 335076a9d..e0873aa52 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -35,5 +35,6 @@ void FieldClearPlayerInput(struct FieldInput *input);
 int ProcessPlayerFieldInput(struct FieldInput *input);
 void FieldInput_HandleCancelSignpost(struct FieldInput * input);
 void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys);
+void sub_806DE70(u16 x, u16 y);
 
 #endif //GUARD_FIELD_CONTROL_AVATAR_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 9472f0b94..a1fbe49b2 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -22,5 +22,7 @@ bool8 sub_80DCBE0(struct ObjectEvent *);
 void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
 u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
 u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
+void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
+void SetSpriteInvisible(u8 spriteId);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 7440bd0bd..1dcdb8e5d 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -20,7 +20,7 @@ void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
 u8 GetPlayerAvatarGraphicsIdByStateId(u8);
 void SetPlayerAvatarStateMask(u8 mask);
 void sub_805D9C4(struct Sprite *sprite);
-void sub_805D154(u8 direction);
+void CreateStopSurfingTask_NoMusicChange(u8 direction);
 void sub_805DAE4(u8 direction);
 void SetPlayerAvatarTransitionFlags(u16 a);
 bool8 IsPlayerFacingSurfableFishableWater(void);
@@ -29,7 +29,7 @@ u8 GetPlayerAvatarObjectId(void);
 u8 PlayerGetZCoord(void);
 u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
 void sub_805CB70(void);
-void sub_805CB04(bool8);
+void SetPlayerInvisibility(bool8);
 void sub_805DC04(void);
 void sub_805DAB0(void);
 bool32 sub_805DAD0(void);
diff --git a/include/overworld.h b/include/overworld.h
index bd4dda9b6..730df3667 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -85,7 +85,7 @@ void sub_8084EBC(s16, s16);
 void sub_80555E0(void);
 void copy_saved_warp3_bank_and_enter_x_to_warp1(void);
 u8 IsMapTypeOutdoors(u8 mapType);
-void sav1_reset_battle_music_maybe(void);
+void Overworld_ClearSavedMusic(void);
 bool32 sub_8056124(u16 song);
 
 void player_avatar_init_params_reset(void);