Decompile and partially document some functions in z_play (#582)

* Decomp 10 functions in z_play, start documentation

* Add numbers to enums in z_en_torch2.h

* Decompile a 5 more functions (56 unattempted)

* Add more details, name some more variables

* Bit more Doxygen

* Format

* Fix arguments

* Add symbols to actorfixer.py

* Merge branch 'master' into play

* Fix z_actor

* Review

* Deduplicate CycleSceneFlags

* Fix warning

* Fix unk4

* Review

tools/actorfixer.py

@@ -409,6 +409,11 @@ animdict = {
     "func_800A81F0": "EffectBlure_AddVertex",
     "func_800A8514": "EffectBlure_AddSpace",
     "Effect_GetParams": "Effect_GetByIndex",
+    "convert_scene_number_among_shared_scenes": "Play_GetOriginalSceneNumber",
+    "func_80169D40": "Play_SaveCycleSceneFlags",
+    "func_80169DCC": "Play_SetRespawnData",
+    "func_80169E6C": "Play_SetupRespawnPoint",
+    "func_8016A0AC": "Play_IsUnderwater",
     "func_800F5A8C": "Environment_LerpWeight",
     "func_801A3F54": "Audio_SetCutsceneFlag",
     "func_801518B0": "Message_StartTextbox",

tools/disasm/functions.txt

@@ -3024,10 +3024,10 @@
     0x80169BF8:("func_80169BF8",),
     0x80169C64:("Play_GetCsCamDataSetting",),
     0x80169C84:("Play_GetCsCamDataVec3s",),
-    0x80169CBC:("convert_scene_number_among_shared_scenes",),
-    0x80169D40:("func_80169D40",),
-    0x80169DCC:("func_80169DCC",),
-    0x80169E6C:("func_80169E6C",),
+    0x80169CBC:("Play_GetOriginalSceneNumber",),
+    0x80169D40:("Play_SaveCycleSceneFlags",),
+    0x80169DCC:("Play_SetRespawnData",),
+    0x80169E6C:("Play_SetupRespawnPoint",),
     0x80169ECC:("func_80169ECC",),
     0x80169EFC:("func_80169EFC",),
     0x80169F78:("func_80169F78",),
@@ -3035,9 +3035,9 @@
     0x80169FFC:("func_80169FFC",),
     0x8016A01C:("FrameAdvance_IsEnabled",),
     0x8016A02C:("func_8016A02C",),
-    0x8016A0AC:("func_8016A0AC",),
+    0x8016A0AC:("Play_IsUnderwater",),
     0x8016A168:("func_8016A168",),
-    0x8016A178:("func_8016A178",),
+    0x8016A178:("Play_AssignPlayerActorCsIdsFromScene",),
     0x8016A268:("func_8016A268",),
     0x8016A2C8:("Play_Init",),
     0x8016AC10:("func_8016AC10",),

tools/disasm/variables.txt

@@ -2179,7 +2179,7 @@
     0x801D0D58:("D_801D0D58","UNK_TYPE2","",0x2),
     0x801D0D5C:("D_801D0D5C","UNK_TYPE2","",0x2),
     0x801D0D60:("D_801D0D60","Input*","",0x4),
-    0x801D0D64:("D_801D0D64","UNK_TYPE2","",0x2),
+    0x801D0D64:("D_801D0D64","s16","[10]",0x14),
     0x801D0D7A:("D_801D0D7A","UNK_TYPE1","",0x1),
     0x801D0D80:("D_801D0D80","UNK_TYPE1","",0x1),
     0x801D11F4:("D_801D11F4","UNK_TYPE1","",0x1),

tools/sizes/code_functions.csv

@@ -2538,10 +2538,10 @@ asm/non_matchings/code/z_play/Play_CameraGetUID.s,Play_CameraGetUID,0x80169BC4,0
 asm/non_matchings/code/z_play/func_80169BF8.s,func_80169BF8,0x80169BF8,0x1B
 asm/non_matchings/code/z_play/Play_GetCsCamDataSetting.s,Play_GetCsCamDataSetting,0x80169C64,0x8
 asm/non_matchings/code/z_play/Play_GetCsCamDataVec3s.s,Play_GetCsCamDataVec3s,0x80169C84,0xE
-asm/non_matchings/code/z_play/convert_scene_number_among_shared_scenes.s,convert_scene_number_among_shared_scenes,0x80169CBC,0x21
-asm/non_matchings/code/z_play/func_80169D40.s,func_80169D40,0x80169D40,0x23
-asm/non_matchings/code/z_play/func_80169DCC.s,func_80169DCC,0x80169DCC,0x28
-asm/non_matchings/code/z_play/func_80169E6C.s,func_80169E6C,0x80169E6C,0x18
+asm/non_matchings/code/z_play/Play_GetOriginalSceneNumber.s,Play_GetOriginalSceneNumber,0x80169CBC,0x21
+asm/non_matchings/code/z_play/Play_SaveCycleSceneFlags.s,Play_SaveCycleSceneFlags,0x80169D40,0x23
+asm/non_matchings/code/z_play/Play_SetRespawnData.s,Play_SetRespawnData,0x80169DCC,0x28
+asm/non_matchings/code/z_play/Play_SetupRespawnPoint.s,Play_SetupRespawnPoint,0x80169E6C,0x18
 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
@@ -2549,7 +2549,7 @@ 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/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/func_8016A0AC.s,func_8016A0AC,0x8016A0AC,0x2F
+asm/non_matchings/code/z_play/Play_IsUnderwater.s,Play_IsUnderwater,0x8016A0AC,0x2F
 asm/non_matchings/code/z_play/func_8016A168.s,func_8016A168,0x8016A168,0x4
 asm/non_matchings/code/z_play/func_8016A178.s,func_8016A178,0x8016A178,0x3C
 asm/non_matchings/code/z_play/func_8016A268.s,func_8016A268,0x8016A268,0x18