diff --git a/include/functions.h b/include/functions.h
index a0eebb1c72..2333252e40 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -3927,7 +3927,8 @@ void func_801A3EC0(void); // func_801A3EC0
 void func_801A3F54(void); // func_801A3F54
 void func_801A3F6C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6); // func_801A3F6C
 void func_801A3FB4(void); // func_801A3FB4
-/*Audio_SetBGM*/ void func_801A400C(u32 bgmID); // func_801A400C
+void func_801A3FFC(UNK_TYPE1 param_1); // func_801A3FFC
+void audio_setBGM(u32 bgmID); // func_801A400C
 void func_801A4058(void); // func_801A4058
 void func_801A41C8(void); // func_801A41C8
 void func_801A41F8(void); // func_801A41F8
@@ -3999,7 +4000,6 @@ void func_801A7D04(void); // func_801A7D04
 void func_801A7D84(void); // func_801A7D84
 void func_801A89A8(void); // func_801A89A8
 void func_801A89D0(void); // func_801A89D0
-// may not be s32 in param or return
 s32 func_801A8A50(s32 param1); // func_801A8A50
 void func_801A8ABC(void); // func_801A8ABC
 void func_801A8BD0(void); // func_801A8BD0
diff --git a/include/structs.h b/include/structs.h
index 9483f4b703..ed33d84278 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -621,197 +621,219 @@ typedef struct {
 } RoomMeshType2Params; // size = 0x10
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 data2;
-} SCmdBase;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdActorList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdSpawnList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdAltHeaders; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdActorList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 data2;
+} SCmdBase; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdCsCameraList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdColHeader; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdColHeader;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdCsCameraList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdRoomList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdCutsceneActorList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x02 */ UNK_TYPE1 pad2[2];
-/* 0x04 */ s8  unk4;
-/* 0x05 */ s8  unk5;
-/* 0x06 */ s8  unk6;
-/* 0x07 */ u8  unk7;
-} SCmdWindSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdCutsceneData; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdEntranceList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x5];
+/* 0x7 */ u8 echo;
+} SCmdEchoSettings; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  cUpElfMsgNum;
-/* 0x04 */ u32 keepObjectId;
-} SCmdSpecialFiles;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 data2;
+} SCmdEndMarker; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  gpFlag1;
-/* 0x04 */ u32 gpFlag2;
-} SCmdRoomBehavior;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdEntranceList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdMesh;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdExitList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdObjectList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdLightList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdLightList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdLightSettingList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdPathList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdMesh; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdTransiActorList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdMinimapChests; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdLightSettingList;
+/* 0x0 */ u8 code;
+/* 0x1 */ UNK_TYPE1 pad1[0x3];
+/* 0x4 */ u32 segment;
+} SCmdMinimapSettings; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x02 */ UNK_TYPE1 pad2[2];
-/* 0x04 */ u8  hour;
-/* 0x05 */ u8  min;
-/* 0x06 */ u8  unk6;
-} SCmdTimeSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 cameraMovement;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 area;
+} SCmdMiscSettings; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x02 */ UNK_TYPE1 pad2[2];
-/* 0x04 */ u8  skyboxId;
-/* 0x05 */ u8  unk5;
-/* 0x06 */ u8  unk6;
-} SCmdSkyboxSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdObjectList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x02 */ UNK_TYPE1 pad2[2];
-/* 0x04 */ u8  unk4;
-/* 0x05 */ u8  unk5;
-} SCmdSkyboxDisables;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdPathList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 data2;
-} SCmdEndMarker;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 gpFlag1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 gpFlag2;
+} SCmdRoomBehavior; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdExitList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdRoomList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  bgmId;
-/* 0x02 */ UNK_TYPE1 pad2[4];
-/* 0x06 */ u8  nighttimeSFX;
-/* 0x07 */ u8  musicSeq;
-} SCmdSoundSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u8 unk4;
+/* 0x5 */ u8 unk5;
+} SCmdSkyboxDisables; // size = 0x6
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x02 */ UNK_TYPE1 pad2[5];
-/* 0x07 */ u8  echo;
-} SCmdEchoSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u8 skyboxId;
+/* 0x5 */ u8 unk5;
+/* 0x6 */ u8 unk6;
+} SCmdSkyboxSettings; // size = 0x7
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdCutsceneData;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 bgmId;
+/* 0x2 */ UNK_TYPE1 pad2[0x4];
+/* 0x6 */ u8 nighttimeSFX;
+/* 0x7 */ u8 musicSeq;
+} SCmdSoundSettings; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  data1;
-/* 0x04 */ u32 segment;
-} SCmdAltHeaders;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdSpawnList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  cameraMovement;
-/* 0x04 */ u32 area;
-} SCmdMiscSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 cUpElfMsgNum;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 keepObjectId;
+} SCmdSpecialFiles; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdCutsceneActorList;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u8 hour;
+/* 0x5 */ u8 min;
+/* 0x6 */ u8 unk6;
+} SCmdTimeSettings; // size = 0x7
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ UNK_TYPE1 pad1[2];
-/* 0x04 */ u32 segment;
-} SCmdMinimapSettings;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 num;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ u32 segment;
+} SCmdTransiActorList; // size = 0x8
 
 typedef struct {
-/* 0x00 */ u8  code;
-/* 0x01 */ u8  num;
-/* 0x04 */ u32 segment;
-} SCmdMinimapChests;
+/* 0x0 */ u8 code;
+/* 0x1 */ u8 data1;
+/* 0x2 */ UNK_TYPE1 pad2[0x2];
+/* 0x4 */ s8 unk4;
+/* 0x5 */ s8 unk5;
+/* 0x6 */ s8 unk6;
+/* 0x7 */ u8 unk7;
+} SCmdWindSettings; // size = 0x8
 
 // Extra information in the save context that is not saved
 typedef struct {
-/* 0x000 */ UNK_TYPE1 pad0[0xB];
+/* 0x000 */ UNK_TYPE1 pad0[0xC];
 /* 0x00C */ s32 sceneSetupIndex;
 /* 0x010 */ s32 unk10;
 /* 0x014 */ UNK_TYPE1 pad14[0x2E];
@@ -825,7 +847,7 @@ typedef struct {
 /* 0x2AC */ u8 cutsceneTrigger;
 /* 0x2AD */ UNK_TYPE1 pad2AD[0x17];
 /* 0x2C4 */ f32 unk2C4;
-/* 0x2C8 */ CycleSceneFlags cycleSceneFlags[0x78];
+/* 0x2C8 */ CycleSceneFlags cycleSceneFlags[120];
 } SaveContextExtra; // size = 0xC28
 
 typedef struct {
@@ -859,37 +881,36 @@ typedef struct {
 /* 0x00 */ UNK_TYPE1 pad0[0x22];
 } SaveContext_struct2; // size = 0x22
 
-
 typedef union {
-    SCmdBase              base;
-    SCmdSpawnList         spawnList;
-    SCmdActorList         actorList;
-    SCmdCsCameraList      csCameraList;
-    SCmdRoomList          roomList;
-    SCmdEntranceList      entranceList;
-    SCmdObjectList        objectList;
-    SCmdLightList         lightList;
-    SCmdPathList          pathList;
-    SCmdTransiActorList   transiActorList;
-    SCmdLightSettingList  lightSettingList;
-    SCmdExitList          exitList;
-    SCmdColHeader         colHeader;
-    SCmdMesh              mesh;
-    SCmdSpecialFiles      specialFiles;
-    SCmdCutsceneData      cutsceneData;
-    SCmdRoomBehavior      roomBehavior;
-    SCmdWindSettings      windSettings;
-    SCmdTimeSettings      timeSettings;
-    SCmdSkyboxSettings    skyboxSettings;
-    SCmdSkyboxDisables    skyboxDisables;
-    SCmdEndMarker         endMarker;
-    SCmdSoundSettings     soundSettings;
-    SCmdEchoSettings      echoSettings;
-    SCmdMiscSettings      miscSettings;
-    SCmdAltHeaders        altHeaders;
+    SCmdBase base;
+    SCmdSpawnList spawnList;
+    SCmdActorList actorList;
+    SCmdCsCameraList csCameraList;
+    SCmdRoomList roomList;
+    SCmdEntranceList entranceList;
+    SCmdObjectList objectList;
+    SCmdLightList lightList;
+    SCmdPathList pathList;
+    SCmdTransiActorList transiActorList;
+    SCmdLightSettingList lightSettingList;
+    SCmdExitList exitList;
+    SCmdColHeader colHeader;
+    SCmdMesh mesh;
+    SCmdSpecialFiles specialFiles;
+    SCmdCutsceneData cutsceneData;
+    SCmdRoomBehavior roomBehavior;
+    SCmdWindSettings windSettings;
+    SCmdTimeSettings timeSettings;
+    SCmdSkyboxSettings skyboxSettings;
+    SCmdSkyboxDisables skyboxDisables;
+    SCmdEndMarker endMarker;
+    SCmdSoundSettings soundSettings;
+    SCmdEchoSettings echoSettings;
+    SCmdMiscSettings miscSettings;
+    SCmdAltHeaders altHeaders;
     SCmdCutsceneActorList cutsceneActorList;
-    SCmdMinimapSettings   minimapSettings;
-    SCmdMinimapChests     minimapChests;
+    SCmdMinimapSettings minimapSettings;
+    SCmdMinimapChests minimapChests;
 } SceneCmd; // size = 0x8
 
 typedef struct {
@@ -1312,8 +1333,8 @@ typedef struct {
 } EffectDustInit; // size = 0x35
 
 typedef union {
-/* 0x0 */ F3DVertexColor color;
-/* 0x0 */ F3DVertexNormal normal;
+    F3DVertexColor color;
+    F3DVertexNormal normal;
 } F3DVertex; // size = 0x10
 
 typedef struct {
@@ -1795,9 +1816,9 @@ typedef struct {
 } MessageContext; // size = 0x120D8
 
 typedef union {
-/* 0x0 */ RoomMeshType0 type0;
-/* 0x0 */ RoomMeshType1 type1;
-/* 0x0 */ RoomMeshType2 type2;
+    RoomMeshType0 type0;
+    RoomMeshType1 type1;
+    RoomMeshType2 type2;
 } RoomMesh; // size = 0xC
 
 // Full save context
diff --git a/tables/functions.txt b/tables/functions.txt
index 5046b147f8..223e04512a 100644
--- a/tables/functions.txt
+++ b/tables/functions.txt
@@ -569,7 +569,7 @@
     0x800AFB24:("Effect_DrawAll","void","GraphicsContext* gCtxt"),
     0x800AFC60:("Effect_UpdateAll","void","GlobalContext* ctxt"),
     0x800AFDCC:("Effect_Destroy","void","GlobalContext* ctxt, s32 index"),
-    0x800AFF24:("Effect_DestroyAll","void","void"),
+    0x800AFF24:("Effect_DestroyAll","void","GlobalContext* ctxt"),
     0x800B0050:("EffectSS_Init","void","GlobalContext* ctxt, s32 numEntries"),
     0x800B0140:("EffectSS_Clear","void","GlobalContext* ctxt"),
     0x800B0200:("EffectSS_GetTable","LoadedParticleEntry*","void"),
@@ -1928,14 +1928,14 @@
     0x801045AC:("func_801045AC","void","void"),
     0x80104AE8:("func_80104AE8","void","void"),
     0x80104C80:("func_80104C80","void","void"),
-    0x80104CF4:("func_80104CF4","void","void"),
+    0x80104CF4:("func_80104CF4","void","GlobalContext* ctxt"),
     0x80104F34:("func_80104F34","void","void"),
     0x80105294:("func_80105294","void","void"),
     0x80105318:("func_80105318","void","void"),
     0x80105328:("func_80105328","void","void"),
     0x8010534C:("func_8010534C","void","void"),
-    0x8010549C:("func_8010549C","void","void"),
-    0x8010565C:("func_8010565C","void","void"),
+    0x8010549C:("func_8010549C","void","GlobalContext* ctxt, u32 segmentAddress"),
+    0x8010565C:("func_8010565C","void","GlobalContext* ctxt, u8 num, u32 segmentAddress"),
     0x80105818:("func_80105818","void","GlobalContext* ctxt, unsigned int uParm2, TransitionActorInit* puParm3"),
     0x80105A40:("func_80105A40","void","void"),
     0x80105B34:("func_80105B34","void","void"),
@@ -2422,10 +2422,10 @@
     0x8012F1BC:("func_8012F1BC","void","void"),
     0x8012F22C:("func_8012F22C","void","void"),
     0x8012F278:("func_8012F278","void","void"),
-    0x8012F2E0:("Scene_LoadObject","s32","SceneContext* sceneCtxt, short id"),
+    0x8012F2E0:("Scene_LoadObject","s32","SceneContext* sceneCtxt, s16 id"),
     0x8012F3D0:("Scene_Init","void","GlobalContext* ctxt, SceneContext* sceneCtxt"),
     0x8012F4FC:("Scene_ReloadUnloadedObjects","void","SceneContext* sceneCtxt"),
-    0x8012F608:("Scene_FindSceneObjectIndex","s32","SceneContext* sceneCtxt, short id"),
+    0x8012F608:("Scene_FindSceneObjectIndex","s32","SceneContext* sceneCtxt, s16 id"),
     0x8012F668:("Scene_IsObjectLoaded","s32","SceneContext* iParm1, s32 index"),
     0x8012F698:("Scene_DmaAllObjects","void","SceneContext* sceneCtxt"),
     0x8012F73C:("func_8012F73C","u32","SceneContext* sceneCtxt, s32 iParm2, s16 id"),
@@ -2442,9 +2442,9 @@
     0x8012FDA4:("Scene_HeaderCommand0C","void","GlobalContext* ctxt, SceneCmd* entry"),
     0x8012FE2C:("Scene_HeaderCommand0D","void","GlobalContext* ctxt, SceneCmd* entry"),
     0x8012FE5C:("Scene_HeaderCommand0E","void","GlobalContext* ctxt, SceneCmd* entry"),
-    0x8012FEBC:("func_8012FEBC","void","void"),
+    0x8012FEBC:("func_8012FEBC","void","GlobalContext* ctxt, u8* nbTransitionActors"),
     0x8012FECC:("Scene_HeaderCommand0F","void","GlobalContext* ctxt, SceneCmd* entry"),
-    0x8012FF10:("func_8012FF10","void","GlobalContext* ctxt, int iParm2"),
+    0x8012FF10:("func_8012FF10","s32","GlobalContext* ctxt, s32 fileIndex"),
     0x8012FF8C:("Scene_HeaderCommand11","void","GlobalContext* ctxt, SceneCmd* entry"),
     0x8012FFF0:("Scene_HeaderCommand12","void","GlobalContext* ctxt, SceneCmd* entry"),
     0x80130018:("Scene_HeaderCommand10","void","GlobalContext* ctxt, SceneCmd* entry"),
@@ -3005,7 +3005,7 @@
     0x801690CC:("func_801690CC","void","void"),
     0x80169100:("func_80169100","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5"),
     0x801691F0:("func_801691F0","void","void"),
-    0x80169220:("Play_LoadScene","void*","GlobalContext* ctxt, SceneTableEntry* entry"),
+    0x80169220:("Play_LoadScene","void*","GlobalContext* ctxt, ObjectFileTableEntry* entry"),
     0x8016927C:("func_8016927C","void","GlobalContext* ctxt, short sParm2"),
     0x801692C4:("func_801692C4","void","GlobalContext* ctxt, UNK_TYPE1 uParm2"),
     0x801693D4:("Play_SceneInit","void","GlobalContext* ctxt, int sceneIndex, UNK_TYPE1 param_3"),
@@ -3924,7 +3924,8 @@
     0x801A3F54:("func_801A3F54","void","void"),
     0x801A3F6C:("func_801A3F6C","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6"),
     0x801A3FB4:("func_801A3FB4","void","void"),
-    0x801A400C:("func_801A400C","void","void"),
+    0x801A3FFC:("func_801A3FFC","void","UNK_TYPE1 param_1"),
+    0x801A400C:("audio_setBGM","void","u32 bgmID"),
     0x801A4058:("func_801A4058","void","void"),
     0x801A41C8:("func_801A41C8","void","void"),
     0x801A41F8:("func_801A41F8","void","void"),
@@ -3996,7 +3997,7 @@
     0x801A7D84:("func_801A7D84","void","void"),
     0x801A89A8:("func_801A89A8","void","void"),
     0x801A89D0:("func_801A89D0","void","void"),
-    0x801A8A50:("func_801A8A50","void","void"),
+    0x801A8A50:("func_801A8A50","s32","s32 param1"),
     0x801A8ABC:("func_801A8ABC","void","void"),
     0x801A8BD0:("func_801A8BD0","void","void"),
     0x801A8D5C:("func_801A8D5C","void","void"),
diff --git a/tables/variables.txt b/tables/variables.txt
index aa1fac5188..bd9a31ff3a 100644
--- a/tables/variables.txt
+++ b/tables/variables.txt
@@ -1539,8 +1539,8 @@
     0x801C23E0:("D_801C23E0","UNK_TYPE1","",0x1),
     0x801C23F8:("D_801C23F8","UNK_TYPE1","",0x1),
     0x801C2410:("D_801C2410","UNK_TYPE1","",0x1),
-    0x801C2650:("D_801C2650","UNK_TYPE1","",0x1),
-    0x801C2660:("D_801C2660","UNK_TYPE1","",0x1),
+    0x801C2650:("D_801C2650","ObjectFileTableEntry","[2]",0x10),
+    0x801C2660:("D_801C2660","ObjectFileTableEntry","[9]",0x48),
     0x801C26A8:("sceneHeaderFuncTable","scene_header_func","[31]",0x7c),
     0x801C2730:("D_801C2730","s16","[8]",0x10),
     0x801C2740:("objectFileTable","ObjectFileTableEntry","[643]",0x1418),