5 files changed, 6 insertions, 32 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 9c642bb36..e7ec52fd1 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_EASYCHAT_H
-#define GUARD_EASYCHAT_H
+#ifndef GUARD_EASY_CHAT_H
+#define GUARD_EASY_CHAT_H
 
 #include "global.h"
 #include "constants/easy_chat.h"
@@ -45,6 +45,6 @@ u16 GetDisplayedWordByIndex(u16 index);
 u16 GetNumDisplayedWords(void);
 const u8 *GetEasyChatWordGroupName(u8);
 u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
-void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); // TODO: currently in link_rfu.s. further file split needed? 
+void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback);
 
-#endif // GUARD_EASYCHAT_H
+#endif // GUARD_EASY_CHAT_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 5b7c3f784..b81a61664 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -104,5 +104,6 @@ void sub_8069058(u8, u8);
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
+extern const struct OamData gObjectEventBaseOam_32x32;
 
 #endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h
deleted file mode 100644
index 048825778..000000000
--- a/include/rom_818CFC8.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_818CFC8_H
-#define GUARD_ROM_818CFC8_H
-
-#include "global.h"
-
-bool8 InBattlePyramid(void);
-u8 sub_81AAA40(void);
-
-#endif //GUARD_ROM_818CFC8_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
deleted file mode 100644
index 17b02ffa4..000000000
--- a/include/rom_81BE66C.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_81BE66C_H
-#define GUARD_ROM_81BE66C_H
-
-#include "global.h"
-
-bool32 InTrainerHill(void);
-bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
-u32 sub_81D427C(void);
-
-#endif //GUARD_ROM_81BE66C_H
diff --git a/include/trade.h b/include/trade.h
index b3b1de23b..030a03a83 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -11,7 +11,7 @@ extern u8 gSelectedTradeMonPositions[2];
 extern const u16 gUnknown_826601C[];
 void CB2_ReturnFromLinkTrade(void);
 s32 sub_804FB34(void);
-s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet); // TODO: currently in link_rfu_2.s. further file split needed? 
+s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
 s32 GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, struct UnkLinkRfuStruct_02022B14Substruct rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
 
 #endif //GUARD_TRADE_H