z_room (1 non-matching) (#1143)

* begin room docs and decomp

* match Room_DrawImageSingle

* match Room_DrawImageMulti

* Room_AllocateAndLoad non-matching

* big improvements on Room_DrawCullable

* match Room_AllocateAndLoad

* improvement?

* cleanup

* comments

* cleanup

* small pr suggestions

* PR Suggestions

* cleanup sceneCmds

* some PR

* PR Suggestions

* more PR Suggestions

* col to collision

4 files changed, 88 insertions, 85 deletions

diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index ae62d6f36..437840bc6 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -2391,14 +2391,14 @@
     0x8012CF0C:("func_8012CF0C",),
     0x8012D374:("func_8012D374",),
     0x8012D40C:("func_8012D40C",),
-    0x8012D510:("Room_nop8012D510",),
-    0x8012D528:("Room_DrawType3Mesh",),
-    0x8012D53C:("Room_DrawType0Mesh",),
-    0x8012D750:("Room_DrawType2Mesh",),
-    0x8012DEE8:("func_8012DEE8",),
-    0x8012E254:("func_8012E254",),
-    0x8012E32C:("func_8012E32C",),
-    0x8012E6A8:("Room_DrawType1Mesh",),
+    0x8012D510:("Room_Noop",),
+    0x8012D528:("Room_DrawNone",),
+    0x8012D53C:("Room_DrawNormal",),
+    0x8012D750:("Room_DrawCullable",),
+    0x8012DEE8:("Room_DrawImageSingle",),
+    0x8012E254:("Room_GetImageMultiBgEntry",),
+    0x8012E32C:("Room_DrawImageMulti",),
+    0x8012E6A8:("Room_DrawImage",),
     0x8012E710:("Room_Init",),
     0x8012E750:("Room_AllocateAndLoad",),
     0x8012E96C:("Room_StartRoomTransition",),
@@ -2422,40 +2422,40 @@
     0x8012F668:("Object_IsLoaded",),
     0x8012F698:("Object_LoadAll",),
     0x8012F73C:("func_8012F73C",),
-    0x8012F79C:("Scene_HeaderCmdSpawnList",),
-    0x8012F90C:("Scene_HeaderCmdActorList",),
-    0x8012F954:("Scene_HeaderCmdActorCutsceneCamList",),
-    0x8012F984:("Scene_HeaderCmdColHeader",),
-    0x8012FA24:("Scene_HeaderCmdRoomList",),
-    0x8012FA68:("Scene_HeaderCmdEntranceList",),
-    0x8012FA98:("Scene_HeaderCmdSpecialFiles",),
-    0x8012FB60:("Scene_HeaderCmdRoomBehavior",),
-    0x8012FBE8:("Scene_HeaderCmdMesh",),
-    0x8012FC18:("Scene_HeaderCmdObjectList",),
-    0x8012FDA4:("Scene_HeaderCmdLightList",),
-    0x8012FE2C:("Scene_HeaderCmdPathList",),
-    0x8012FE5C:("Scene_HeaderCmdTransiActorList",),
+    0x8012F79C:("Scene_CommandSpawnList",),
+    0x8012F90C:("Scene_CommandActorList",),
+    0x8012F954:("Scene_CommandActorCutsceneCamList",),
+    0x8012F984:("Scene_CommandCollisionHeader",),
+    0x8012FA24:("Scene_CommandRoomList",),
+    0x8012FA68:("Scene_CommandEntranceList",),
+    0x8012FA98:("Scene_CommandSpecialFiles",),
+    0x8012FB60:("Scene_CommandRoomBehavior",),
+    0x8012FBE8:("Scene_CommandMesh",),
+    0x8012FC18:("Scene_CommandObjectList",),
+    0x8012FDA4:("Scene_CommandLightList",),
+    0x8012FE2C:("Scene_CommandPathList",),
+    0x8012FE5C:("Scene_CommandTransiActorList",),
     0x8012FEBC:("Door_InitContext",),
-    0x8012FECC:("Scene_HeaderCmdEnvLightSettings",),
+    0x8012FECC:("Scene_CommandEnvLightSettings",),
     0x8012FF10:("Scene_LoadAreaTextures",),
-    0x8012FF8C:("Scene_HeaderCmdSkyboxSettings",),
-    0x8012FFF0:("Scene_HeaderCmdSkyboxDisables",),
-    0x80130018:("Scene_HeaderCmdTimeSettings",),
-    0x8013033C:("Scene_HeaderCmdWindSettings",),
-    0x801303A0:("Scene_HeaderCmdExitList",),
-    0x801303D0:("Scene_HeaderCmd09",),
-    0x801303E0:("Scene_HeaderCmdSoundSettings",),
-    0x8013043C:("Scene_HeaderCmdEchoSetting",),
-    0x80130454:("Scene_HeaderCmdAltHeaderList",),
-    0x801304CC:("Scene_HeaderCmdCutsceneList",),
-    0x80130500:("Scene_HeaderCmdActorCutsceneList",),
-    0x80130540:("Scene_HeaderCmdMiniMap",),
-    0x80130578:("Scene_HeaderCmd1D",),
-    0x80130588:("Scene_HeaderCmdMiniMapCompassInfo",),
-    0x801305B0:("Scene_HeaderCmdSetRegionVisitedFlag",),
-    0x80130674:("Scene_HeaderCmdAnimatedMaterials",),
+    0x8012FF8C:("Scene_CommandSkyboxSettings",),
+    0x8012FFF0:("Scene_CommandSkyboxDisables",),
+    0x80130018:("Scene_CommandTimeSettings",),
+    0x8013033C:("Scene_CommandWindSettings",),
+    0x801303A0:("Scene_CommandExitList",),
+    0x801303D0:("Scene_Command09",),
+    0x801303E0:("Scene_CommandSoundSettings",),
+    0x8013043C:("Scene_CommandEchoSetting",),
+    0x80130454:("Scene_CommandAltHeaderList",),
+    0x801304CC:("Scene_CommandCutsceneList",),
+    0x80130500:("Scene_CommandActorCutsceneList",),
+    0x80130540:("Scene_CommandMiniMap",),
+    0x80130578:("Scene_Command1D",),
+    0x80130588:("Scene_CommandMiniMapCompassInfo",),
+    0x801305B0:("Scene_CommandSetRegionVisitedFlag",),
+    0x80130674:("Scene_CommandAnimatedMaterials",),
     0x801306A4:("Scene_SetExitFade",),
-    0x801306E8:("Scene_ProcessHeader",),
+    0x801306E8:("Scene_ExecuteCommands",),
     0x80130768:("Entrance_Create",),
     0x80130784:("Entrance_CreateFromSpawn",),
     0x801307C0:("Scene_Draw",),
@@ -3032,7 +3032,7 @@
     0x80169EFC:("func_80169EFC",),
     0x80169F78:("func_80169F78",),
     0x80169FDC:("func_80169FDC",),
-    0x80169FFC:("func_80169FFC",),
+    0x80169FFC:("Play_CamIsNotFixed",),
     0x8016A01C:("FrameAdvance_IsEnabled",),
     0x8016A02C:("func_8016A02C",),
     0x8016A0AC:("Play_IsUnderwater",),
@@ -3079,7 +3079,7 @@
     0x80172078:("PreRender_ApplyFiltersSlowlyDestroy",),
     0x801720C4:("func_801720C4",),
     0x801720FC:("func_801720FC",),
-    0x80172758:("func_80172758",),
+    0x80172758:("Prerender_DrawBackground2D",),
     0x801727F0:("THGA_Ct",),
     0x80172810:("THGA_Dt",),
     0x80172830:("THGA_IsCrash",),
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index de6991bd5..bf6d8e8bb 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -1339,8 +1339,8 @@
     0x801C0EF0:("sSetupDL","Gfx","[438]",0xdb0),
     0x801C1CA0:("sFillSetupDL","Gfx","[12]",0x60),
     0x801C1D00:("gEmptyDL","Gfx","[1]",0x8),
-    0x801C1D10:("D_801C1D10","Vec3f","",0xc),
-    0x801C1D1C:("roomDrawFuncs","room_draw_func","[4]",0x10),
+    0x801C1D10:("sZeroVec","Vec3f","",0xc),
+    0x801C1D1C:("sRoomDrawHandlers","RoomDrawHandler","[4]",0x10),
     0x801C1D30:("gBitFlags","u32","[32]",0x80),
     0x801C1DB0:("gEquipMasks","u16","[4]",0x8),
     0x801C1DB8:("gEquipNegMasks","u16","[4]",0x8),
diff --git a/tools/namefixer.py b/tools/namefixer.py
index 828cf46bb..cb902dcb6 100755
--- a/tools/namefixer.py
+++ b/tools/namefixer.py
@@ -492,7 +492,7 @@ wordReplace = {
     "func_800DFC90": "Camera_GetCamDir",
     "func_800DFD04": "Camera_AddQuake",
     "func_800DFFAC": "Camera_ChangeDoorCam",
-
+    "func_80169FFC": "Play_CamIsNotFixed",
     "func_801694DC": "Play_CreateSubCamera",
     "Play_GetActiveCameraIndex": "Play_GetActiveCamId",
     "func_80169590": "Play_ChangeCameraStatus",
@@ -814,6 +814,9 @@ wordReplace = {
     "play->nextEntranceIndex": "play->nextEntrance",
     "play->sceneNum": "play->sceneId",
     "play->pauseCtx.unk_1F0": "play->pauseCtx.bombersNotebookOpen",
+    "play->roomCtx.curRoom.unk3": "play->roomCtx.curRoom.behaviorType1",
+    "play->roomCtx.curRoom.unk2": "play->roomCtx.curRoom.behaviorType2",
+    "play->roomCtx.unk31": "play->roomCtx.status",
 
     "actorCtx.unkC": "actorCtx.halfDaysBit",
     "actorCtx.unk1F4": "actorCtx.unk_1F4.unk_00",
diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv
index 3dd0ba708..0f33e599d 100644
--- a/tools/sizes/code_functions.csv
+++ b/tools/sizes/code_functions.csv
@@ -1905,14 +1905,14 @@ asm/non_matchings/code/z_rcp/Gfx_PrimColor.s,Gfx_PrimColor,0x8012CEA8,0x19
 asm/non_matchings/code/z_rcp/func_8012CF0C.s,func_8012CF0C,0x8012CF0C,0x11A
 asm/non_matchings/code/z_rcp/func_8012D374.s,func_8012D374,0x8012D374,0x26
 asm/non_matchings/code/z_rcp/func_8012D40C.s,func_8012D40C,0x8012D40C,0x3D
-asm/non_matchings/code/z_room/Room_nop8012D510.s,Room_nop8012D510,0x8012D510,0x6
-asm/non_matchings/code/z_room/Room_DrawType3Mesh.s,Room_DrawType3Mesh,0x8012D528,0x5
-asm/non_matchings/code/z_room/Room_DrawType0Mesh.s,Room_DrawType0Mesh,0x8012D53C,0x85
-asm/non_matchings/code/z_room/Room_DrawType2Mesh.s,Room_DrawType2Mesh,0x8012D750,0x1E6
-asm/non_matchings/code/z_room/func_8012DEE8.s,func_8012DEE8,0x8012DEE8,0xDB
-asm/non_matchings/code/z_room/func_8012E254.s,func_8012E254,0x8012E254,0x36
-asm/non_matchings/code/z_room/func_8012E32C.s,func_8012E32C,0x8012E32C,0xDF
-asm/non_matchings/code/z_room/Room_DrawType1Mesh.s,Room_DrawType1Mesh,0x8012E6A8,0x1A
+asm/non_matchings/code/z_room/Room_Noop.s,Room_Noop,0x8012D510,0x6
+asm/non_matchings/code/z_room/Room_DrawNone.s,Room_DrawNone,0x8012D528,0x5
+asm/non_matchings/code/z_room/Room_DrawNormal.s,Room_DrawNormal,0x8012D53C,0x85
+asm/non_matchings/code/z_room/Room_DrawCullable.s,Room_DrawCullable,0x8012D750,0x1E6
+asm/non_matchings/code/z_room/Room_DrawImageSingle.s,Room_DrawImageSingle,0x8012DEE8,0xDB
+asm/non_matchings/code/z_room/Room_GetImageMultiBgEntry.s,Room_GetImageMultiBgEntry,0x8012E254,0x36
+asm/non_matchings/code/z_room/Room_DrawImageMulti.s,Room_DrawImageMulti,0x8012E32C,0xDF
+asm/non_matchings/code/z_room/Room_DrawImage.s,Room_DrawImage,0x8012E6A8,0x1A
 asm/non_matchings/code/z_room/Room_Init.s,Room_Init,0x8012E710,0x10
 asm/non_matchings/code/z_room/Room_AllocateAndLoad.s,Room_AllocateAndLoad,0x8012E750,0x87
 asm/non_matchings/code/z_room/Room_StartRoomTransition.s,Room_StartRoomTransition,0x8012E96C,0x4F
@@ -1936,40 +1936,40 @@ asm/non_matchings/code/z_scene/Object_GetIndex.s,Object_GetIndex,0x8012F608,0x18
 asm/non_matchings/code/z_scene/Object_IsLoaded.s,Object_IsLoaded,0x8012F668,0xC
 asm/non_matchings/code/z_scene/Object_LoadAll.s,Object_LoadAll,0x8012F698,0x29
 asm/non_matchings/code/z_scene/func_8012F73C.s,func_8012F73C,0x8012F73C,0x18
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSpawnList.s,Scene_HeaderCmdSpawnList,0x8012F79C,0x5C
-asm/non_matchings/code/z_scene/Scene_HeaderCmdActorList.s,Scene_HeaderCmdActorList,0x8012F90C,0x12
-asm/non_matchings/code/z_scene/Scene_HeaderCmdActorCutsceneCamList.s,Scene_HeaderCmdActorCutsceneCamList,0x8012F954,0xC
-asm/non_matchings/code/z_scene/Scene_HeaderCmdColHeader.s,Scene_HeaderCmdColHeader,0x8012F984,0x28
-asm/non_matchings/code/z_scene/Scene_HeaderCmdRoomList.s,Scene_HeaderCmdRoomList,0x8012FA24,0x11
-asm/non_matchings/code/z_scene/Scene_HeaderCmdEntranceList.s,Scene_HeaderCmdEntranceList,0x8012FA68,0xC
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSpecialFiles.s,Scene_HeaderCmdSpecialFiles,0x8012FA98,0x32
-asm/non_matchings/code/z_scene/Scene_HeaderCmdRoomBehavior.s,Scene_HeaderCmdRoomBehavior,0x8012FB60,0x22
-asm/non_matchings/code/z_scene/Scene_HeaderCmdMesh.s,Scene_HeaderCmdMesh,0x8012FBE8,0xC
-asm/non_matchings/code/z_scene/Scene_HeaderCmdObjectList.s,Scene_HeaderCmdObjectList,0x8012FC18,0x63
-asm/non_matchings/code/z_scene/Scene_HeaderCmdLightList.s,Scene_HeaderCmdLightList,0x8012FDA4,0x22
-asm/non_matchings/code/z_scene/Scene_HeaderCmdPathList.s,Scene_HeaderCmdPathList,0x8012FE2C,0xC
-asm/non_matchings/code/z_scene/Scene_HeaderCmdTransiActorList.s,Scene_HeaderCmdTransiActorList,0x8012FE5C,0x18
+asm/non_matchings/code/z_scene/Scene_CommandSpawnList.s,Scene_CommandSpawnList,0x8012F79C,0x5C
+asm/non_matchings/code/z_scene/Scene_CommandActorList.s,Scene_CommandActorList,0x8012F90C,0x12
+asm/non_matchings/code/z_scene/Scene_CommandActorCutsceneCamList.s,Scene_CommandActorCutsceneCamList,0x8012F954,0xC
+asm/non_matchings/code/z_scene/Scene_CommandCollisionHeader.s,Scene_CommandCollisionHeader,0x8012F984,0x28
+asm/non_matchings/code/z_scene/Scene_CommandRoomList.s,Scene_CommandRoomList,0x8012FA24,0x11
+asm/non_matchings/code/z_scene/Scene_CommandEntranceList.s,Scene_CommandEntranceList,0x8012FA68,0xC
+asm/non_matchings/code/z_scene/Scene_CommandSpecialFiles.s,Scene_CommandSpecialFiles,0x8012FA98,0x32
+asm/non_matchings/code/z_scene/Scene_CommandRoomBehavior.s,Scene_CommandRoomBehavior,0x8012FB60,0x22
+asm/non_matchings/code/z_scene/Scene_CommandMesh.s,Scene_CommandMesh,0x8012FBE8,0xC
+asm/non_matchings/code/z_scene/Scene_CommandObjectList.s,Scene_CommandObjectList,0x8012FC18,0x63
+asm/non_matchings/code/z_scene/Scene_CommandLightList.s,Scene_CommandLightList,0x8012FDA4,0x22
+asm/non_matchings/code/z_scene/Scene_CommandPathList.s,Scene_CommandPathList,0x8012FE2C,0xC
+asm/non_matchings/code/z_scene/Scene_CommandTransiActorList.s,Scene_CommandTransiActorList,0x8012FE5C,0x18
 asm/non_matchings/code/z_scene/Door_InitContext.s,Door_InitContext,0x8012FEBC,0x4
-asm/non_matchings/code/z_scene/Scene_HeaderCmdEnvLightSettings.s,Scene_HeaderCmdEnvLightSettings,0x8012FECC,0x11
+asm/non_matchings/code/z_scene/Scene_CommandEnvLightSettings.s,Scene_CommandEnvLightSettings,0x8012FECC,0x11
 asm/non_matchings/code/z_scene/Scene_LoadAreaTextures.s,Scene_LoadAreaTextures,0x8012FF10,0x1F
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSkyboxSettings.s,Scene_HeaderCmdSkyboxSettings,0x8012FF8C,0x19
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSkyboxDisables.s,Scene_HeaderCmdSkyboxDisables,0x8012FFF0,0xA
-asm/non_matchings/code/z_scene/Scene_HeaderCmdTimeSettings.s,Scene_HeaderCmdTimeSettings,0x80130018,0xC9
-asm/non_matchings/code/z_scene/Scene_HeaderCmdWindSettings.s,Scene_HeaderCmdWindSettings,0x8013033C,0x19
-asm/non_matchings/code/z_scene/Scene_HeaderCmdExitList.s,Scene_HeaderCmdExitList,0x801303A0,0xC
-asm/non_matchings/code/z_scene/Scene_HeaderCmd09.s,Scene_HeaderCmd09,0x801303D0,0x4
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSoundSettings.s,Scene_HeaderCmdSoundSettings,0x801303E0,0x17
-asm/non_matchings/code/z_scene/Scene_HeaderCmdEchoSetting.s,Scene_HeaderCmdEchoSetting,0x8013043C,0x6
-asm/non_matchings/code/z_scene/Scene_HeaderCmdAltHeaderList.s,Scene_HeaderCmdAltHeaderList,0x80130454,0x1E
-asm/non_matchings/code/z_scene/Scene_HeaderCmdCutsceneList.s,Scene_HeaderCmdCutsceneList,0x801304CC,0xD
-asm/non_matchings/code/z_scene/Scene_HeaderCmdActorCutsceneList.s,Scene_HeaderCmdActorCutsceneList,0x80130500,0x10
-asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMap.s,Scene_HeaderCmdMiniMap,0x80130540,0xE
-asm/non_matchings/code/z_scene/Scene_HeaderCmd1D.s,Scene_HeaderCmd1D,0x80130578,0x4
-asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMapCompassInfo.s,Scene_HeaderCmdMiniMapCompassInfo,0x80130588,0xA
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSetRegionVisitedFlag.s,Scene_HeaderCmdSetRegionVisitedFlag,0x801305B0,0x31
-asm/non_matchings/code/z_scene/Scene_HeaderCmdAnimatedMaterials.s,Scene_HeaderCmdAnimatedMaterials,0x80130674,0xC
+asm/non_matchings/code/z_scene/Scene_CommandSkyboxSettings.s,Scene_CommandSkyboxSettings,0x8012FF8C,0x19
+asm/non_matchings/code/z_scene/Scene_CommandSkyboxDisables.s,Scene_CommandSkyboxDisables,0x8012FFF0,0xA
+asm/non_matchings/code/z_scene/Scene_CommandTimeSettings.s,Scene_CommandTimeSettings,0x80130018,0xC9
+asm/non_matchings/code/z_scene/Scene_CommandWindSettings.s,Scene_CommandWindSettings,0x8013033C,0x19
+asm/non_matchings/code/z_scene/Scene_CommandExitList.s,Scene_CommandExitList,0x801303A0,0xC
+asm/non_matchings/code/z_scene/Scene_Command09.s,Scene_Command09,0x801303D0,0x4
+asm/non_matchings/code/z_scene/Scene_CommandSoundSettings.s,Scene_CommandSoundSettings,0x801303E0,0x17
+asm/non_matchings/code/z_scene/Scene_CommandEchoSetting.s,Scene_CommandEchoSetting,0x8013043C,0x6
+asm/non_matchings/code/z_scene/Scene_CommandAltHeaderList.s,Scene_CommandAltHeaderList,0x80130454,0x1E
+asm/non_matchings/code/z_scene/Scene_CommandCutsceneList.s,Scene_CommandCutsceneList,0x801304CC,0xD
+asm/non_matchings/code/z_scene/Scene_CommandActorCutsceneList.s,Scene_CommandActorCutsceneList,0x80130500,0x10
+asm/non_matchings/code/z_scene/Scene_CommandMiniMap.s,Scene_CommandMiniMap,0x80130540,0xE
+asm/non_matchings/code/z_scene/Scene_Command1D.s,Scene_Command1D,0x80130578,0x4
+asm/non_matchings/code/z_scene/Scene_CommandMiniMapCompassInfo.s,Scene_CommandMiniMapCompassInfo,0x80130588,0xA
+asm/non_matchings/code/z_scene/Scene_CommandSetRegionVisitedFlag.s,Scene_CommandSetRegionVisitedFlag,0x801305B0,0x31
+asm/non_matchings/code/z_scene/Scene_CommandAnimatedMaterials.s,Scene_CommandAnimatedMaterials,0x80130674,0xC
 asm/non_matchings/code/z_scene/Scene_SetExitFade.s,Scene_SetExitFade,0x801306A4,0x11
-asm/non_matchings/code/z_scene/Scene_ProcessHeader.s,Scene_ProcessHeader,0x801306E8,0x20
+asm/non_matchings/code/z_scene/Scene_ExecuteCommands.s,Scene_ExecuteCommands,0x801306E8,0x20
 asm/non_matchings/code/z_scene/Entrance_Create.s,Entrance_Create,0x80130768,0x7
 asm/non_matchings/code/z_scene/Entrance_CreateFromSpawn.s,Entrance_CreateFromSpawn,0x80130784,0xF
 asm/non_matchings/code/z_scene_proc/Scene_Draw.s,Scene_Draw,0x801307C0,0xD
@@ -2546,7 +2546,7 @@ asm/non_matchings/code/z_play/func_80169ECC.s,func_80169ECC,0x80169ECC,0xC
 asm/non_matchings/code/z_play/func_80169EFC.s,func_80169EFC,0x80169EFC,0x1F
 asm/non_matchings/code/z_play/func_80169F78.s,func_80169F78,0x80169F78,0x19
 asm/non_matchings/code/z_play/func_80169FDC.s,func_80169FDC,0x80169FDC,0x8
-asm/non_matchings/code/z_play/func_80169FFC.s,func_80169FFC,0x80169FFC,0x8
+asm/non_matchings/code/z_play/Play_CamIsNotFixed.s,Play_CamIsNotFixed,0x80169FFC,0x8
 asm/non_matchings/code/z_play/FrameAdvance_IsEnabled.s,FrameAdvance_IsEnabled,0x8016A01C,0x4
 asm/non_matchings/code/z_play/func_8016A02C.s,func_8016A02C,0x8016A02C,0x20
 asm/non_matchings/code/z_play/Play_IsUnderwater.s,Play_IsUnderwater,0x8016A0AC,0x2F
@@ -2593,7 +2593,7 @@ asm/non_matchings/code/PreRender/PreRender_ApplyFiltersSlowlyInit.s,PreRender_Ap
 asm/non_matchings/code/PreRender/PreRender_ApplyFiltersSlowlyDestroy.s,PreRender_ApplyFiltersSlowlyDestroy,0x80172078,0x13
 asm/non_matchings/code/PreRender/func_801720C4.s,func_801720C4,0x801720C4,0xE
 asm/non_matchings/code/PreRender/func_801720FC.s,func_801720FC,0x801720FC,0x197
-asm/non_matchings/code/PreRender/func_80172758.s,func_80172758,0x80172758,0x26
+asm/non_matchings/code/PreRender/Prerender_DrawBackground2D.s,Prerender_DrawBackground2D,0x80172758,0x26
 asm/non_matchings/code/TwoHeadGfxArena/THGA_Ct.s,THGA_Ct,0x801727F0,0x8
 asm/non_matchings/code/TwoHeadGfxArena/THGA_Dt.s,THGA_Dt,0x80172810,0x8
 asm/non_matchings/code/TwoHeadGfxArena/THGA_IsCrash.s,THGA_IsCrash,0x80172830,0x8