1 files changed, 2 insertions, 16 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 6a0fe1dce..1e1162350 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -16,18 +16,13 @@
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
+#include "strings2.h"
 #include "task.h"
 #include "wild_encounter.h"
 
-extern u8 gOtherText_OhABite[];
-extern u8 gOtherText_PokeOnHook[];
-extern u8 gOtherText_NotEvenANibble[];
-extern u8 gOtherText_ItGotAway[];
-
 extern u32 gUnknown_0202FF84[];
 
 //Functions
-static u32 sub_80587D8(void);
 static bool8 sub_8058854(struct MapObject *, u8);
 static void npc_clear_strange_bits(struct MapObject *a);
 static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c);
@@ -246,16 +241,7 @@ static u8 (*const gUnknown_0830FC98[])(struct Task *, struct MapObject *) =
     sub_805A1B8,
 };
 
-
-void sub_80587B4(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_80587D8);
-}
-
-static u32 sub_80587D8(void)
-{
-    return 0;
-}
+fieldmap_object_null_cb(sub_80587B4, sub_80587D8);
 
 void player_step(u8 direction, u16 newKeys, u16 heldKeys)
 {