6 files changed, 9 insertions, 9 deletions
diff --git a/include/fame_checker.h b/include/fame_checker.h
index 257431d8b..af705e34f 100644
--- a/include/fame_checker.h
+++ b/include/fame_checker.h
@@ -41,7 +41,7 @@ extern u8 gIconDescriptionBoxIsOpen;
 
 void ResetFameChecker(void);
 void FullyUnlockFameChecker(void);
-void UseFameChecker(MainCallback savedCallback);
+void UseFameChecker(void (*)());
 void SetFlavorTextFlagFromSpecialVars(void);
 void UpdatePickStateFromSpecialVar8005(void);
 
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 459122d32..d67fc476c 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -46,7 +46,7 @@ void FieldObjectClearAnim(struct MapObject *);
 void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
 void SpawnFieldObjectsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
-u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
+u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8);
 u8 show_sprite(u8, u8, u8);
 u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index a14905cc2..3623737ea 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -51,8 +51,8 @@ struct Tileset
     /*0x04*/ void *tiles;
     /*0x08*/ void *palettes;
     /*0x0c*/ void *metatiles;
-    /*0x14*/ TilesetCB callback;
-    /*0x10*/ void *metatileAttributes;
+    /*0x10*/ TilesetCB callback;
+    /*0x14*/ void *metatileAttributes;
 };
 
 struct MapData
diff --git a/include/list_menu.h b/include/list_menu.h
index 8ff65da0b..fe42651b6 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -43,7 +43,7 @@ struct ListMenu {
     u16 selectedRow;
     u8 unk_1C;
     u8 unk_1D;
-    u8 unk_1E;
+    u8 taskId;
     u8 unk_1F;
 };
 
@@ -54,7 +54,7 @@ extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 
 u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2);
 s32 ListMenuHandleInput(u8 id);
-void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2);
+void ListMenuGetScrollAndRow(u8 a0, u16 *a1, u16 *a2);
 void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
 void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index e27fb4e5d..892636ba0 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -20,8 +20,8 @@ void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
 bool8 sub_81221AC(void);
 bool8 sub_80BF72C(void);
 bool8 sub_80BF708(void);
-void sub_80BF768(void);
-void sub_80BF7C8(void);
+void VblankHblankHandlerSetZero(void);
+void InitBgReg(void);
 u8 sub_80BF8E4(void);
 u8 sub_80BF848(s16 * a0, u16 a1);
 void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
diff --git a/include/teachy_tv.h b/include/teachy_tv.h
index 374780c04..382ad117d 100644
--- a/include/teachy_tv.h
+++ b/include/teachy_tv.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TEACHY_TV_H
 #define GUARD_TEACHY_TV_H
 
-void CB2_ReturnToTeachyTV(void);
+void sub_815ABFC(void);
 void sub_815AC20(void);
 
 #endif //GUARD_TEACHY_TV_H