Camera Preparation (#644)

* Copy progress from z_camera

* cleanup functions.h

* Oops

* Revert `SUB16` and `ADD16` back to original names

* PR Suggestions

* PR Suggestions

* Fix merge with master
This commit is contained in:
engineer124
2022-02-20 11:33:47 +11:00
committed by GitHub
parent 71c0120fbd
commit fa069535d0
64 changed files with 424 additions and 384 deletions
+21 -21
View File
@@ -786,13 +786,13 @@ asm/non_matchings/code/z_camera/Camera_ChangeMode.s,Camera_ChangeMode,0x800DF840
asm/non_matchings/code/z_camera/func_800DF86C.s,func_800DF86C,0x800DF86C,0x20
asm/non_matchings/code/z_camera/func_800DF8EC.s,func_800DF8EC,0x800DF8EC,0x77
asm/non_matchings/code/z_camera/func_800DFAC8.s,func_800DFAC8,0x800DFAC8,0x13
asm/non_matchings/code/z_camera/func_800DFB14.s,func_800DFB14,0x800DFB14,0x42
asm/non_matchings/code/z_camera/Camera_ChangeDataIdx.s,Camera_ChangeDataIdx,0x800DFB14,0x42
asm/non_matchings/code/z_camera/func_800DFC1C.s,func_800DFC1C,0x800DFC1C,0x9
asm/non_matchings/code/z_camera/func_800DFC40.s,func_800DFC40,0x800DFC40,0xA
asm/non_matchings/code/z_camera/func_800DFC68.s,func_800DFC68,0x800DFC68,0xA
asm/non_matchings/code/z_camera/Camera_GetInputDirYaw.s,Camera_GetInputDirYaw,0x800DFC68,0xA
asm/non_matchings/code/z_camera/func_800DFC90.s,func_800DFC90,0x800DFC90,0x9
asm/non_matchings/code/z_camera/func_800DFCB4.s,func_800DFCB4,0x800DFCB4,0xA
asm/non_matchings/code/z_camera/func_800DFCDC.s,func_800DFCDC,0x800DFCDC,0xA
asm/non_matchings/code/z_camera/Camera_GetCamDirPitch.s,Camera_GetCamDirPitch,0x800DFCB4,0xA
asm/non_matchings/code/z_camera/Camera_GetCamDirYaw.s,Camera_GetCamDirYaw,0x800DFCDC,0xA
asm/non_matchings/code/z_camera/func_800DFD04.s,func_800DFD04,0x800DFD04,0x1D
asm/non_matchings/code/z_camera/func_800DFD78.s,func_800DFD78,0x800DFD78,0x5E
asm/non_matchings/code/z_camera/func_800DFEF0.s,func_800DFEF0,0x800DFEF0,0xA
@@ -808,9 +808,9 @@ asm/non_matchings/code/z_camera/func_800E01B8.s,func_800E01B8,0x800E01B8,0x9
asm/non_matchings/code/z_camera/func_800E01DC.s,func_800E01DC,0x800E01DC,0x13
asm/non_matchings/code/z_camera/func_800E0228.s,func_800E0228,0x800E0228,0x4
asm/non_matchings/code/z_camera/func_800E0238.s,func_800E0238,0x800E0238,0x1D
asm/non_matchings/code/z_camera/func_800E02AC.s,func_800E02AC,0x800E02AC,0x17
asm/non_matchings/code/z_camera/func_800E0308.s,func_800E0308,0x800E0308,0x5
asm/non_matchings/code/z_camera/func_800E031C.s,func_800E031C,0x800E031C,0xB
asm/non_matchings/code/z_camera/Camera_SetToTrackActor.s,Camera_SetToTrackActor,0x800E02AC,0x17
asm/non_matchings/code/z_camera/Camera_SetTargetActor.s,Camera_SetTargetActor,0x800E0308,0x5
asm/non_matchings/code/z_camera/Camera_GetWaterYPos.s,Camera_GetWaterYPos,0x800E031C,0xB
asm/non_matchings/code/z_camera/func_800E0348.s,func_800E0348,0x800E0348,0x16
asm/non_matchings/code/z_collision_btltbls/DamageTable_Get.s,DamageTable_Get,0x800E03A0,0xB
asm/non_matchings/code/z_collision_btltbls/DamageTable_Clear.s,DamageTable_Clear,0x800E03CC,0xD
@@ -2520,24 +2520,24 @@ asm/non_matchings/code/z_play/func_8016927C.s,func_8016927C,0x8016927C,0x12
asm/non_matchings/code/z_play/func_801692C4.s,func_801692C4,0x801692C4,0x44
asm/non_matchings/code/z_play/Play_SceneInit.s,Play_SceneInit,0x801693D4,0x28
asm/non_matchings/code/z_play/func_80169474.s,func_80169474,0x80169474,0x1A
asm/non_matchings/code/z_play/func_801694DC.s,func_801694DC,0x801694DC,0x2A
asm/non_matchings/code/z_play/Play_GetActiveCameraIndex.s,Play_GetActiveCameraIndex,0x80169584,0x3
asm/non_matchings/code/z_play/func_80169590.s,func_80169590,0x80169590,0x1C
asm/non_matchings/code/z_play/func_80169600.s,func_80169600,0x80169600,0x1A
asm/non_matchings/code/z_play/func_80169668.s,func_80169668,0x80169668,0x1B
asm/non_matchings/code/z_play/Play_CreateSubCamera.s,Play_CreateSubCamera,0x801694DC,0x2A
asm/non_matchings/code/z_play/Play_GetActiveCamId.s,Play_GetActiveCamId,0x80169584,0x3
asm/non_matchings/code/z_play/Play_CameraChangeStatus.s,Play_CameraChangeStatus,0x80169590,0x1C
asm/non_matchings/code/z_play/Play_ClearCamera.s,Play_ClearCamera,0x80169600,0x1A
asm/non_matchings/code/z_play/Play_ClearAllSubCameras.s,Play_ClearAllSubCameras,0x80169668,0x1B
asm/non_matchings/code/z_play/Play_GetCamera.s,Play_GetCamera,0x801696D4,0xE
asm/non_matchings/code/z_play/Play_CameraSetAtEye.s,Play_CameraSetAtEye,0x8016970C,0x44
asm/non_matchings/code/z_play/func_8016981C.s,func_8016981C,0x8016981C,0x49
asm/non_matchings/code/z_play/func_80169940.s,func_80169940,0x80169940,0x12
asm/non_matchings/code/z_play/func_80169988.s,func_80169988,0x80169988,0x13
asm/non_matchings/code/z_play/func_801699D4.s,func_801699D4,0x801699D4,0x1F
asm/non_matchings/code/z_play/Play_CameraSetAtEyeUp.s,Play_CameraSetAtEyeUp,0x8016981C,0x49
asm/non_matchings/code/z_play/Play_CameraSetFov.s,Play_CameraSetFov,0x80169940,0x12
asm/non_matchings/code/z_play/Play_CameraSetRoll.s,Play_CameraSetRoll,0x80169988,0x13
asm/non_matchings/code/z_play/Play_CopyCamera.s,Play_CopyCamera,0x801699D4,0x1F
asm/non_matchings/code/z_play/func_80169A50.s,func_80169A50,0x80169A50,0x1C
asm/non_matchings/code/z_play/func_80169AC0.s,func_80169AC0,0x80169AC0,0xF
asm/non_matchings/code/z_play/Play_CameraChangeSetting.s,Play_CameraChangeSetting,0x80169AC0,0xF
asm/non_matchings/code/z_play/func_80169AFC.s,func_80169AFC,0x80169AFC,0x32
asm/non_matchings/code/z_play/func_80169BC4.s,func_80169BC4,0x80169BC4,0xD
asm/non_matchings/code/z_play/Play_CameraGetUID.s,Play_CameraGetUID,0x80169BC4,0xD
asm/non_matchings/code/z_play/func_80169BF8.s,func_80169BF8,0x80169BF8,0x1B
asm/non_matchings/code/z_play/func_80169C64.s,func_80169C64,0x80169C64,0x8
asm/non_matchings/code/z_play/func_80169C84.s,func_80169C84,0x80169C84,0xE
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
@@ -2834,7 +2834,7 @@ asm/non_matchings/code/sys_math3d/func_8017CFA4.s,func_8017CFA4,0x8017CFA4,0x1F
asm/non_matchings/code/sys_math3d/Math3D_TriChkLineSegParaZIntersect.s,Math3D_TriChkLineSegParaZIntersect,0x8017D020,0x63
asm/non_matchings/code/sys_math3d/func_8017D1AC.s,func_8017D1AC,0x8017D1AC,0x1D
asm/non_matchings/code/sys_math3d/func_8017D220.s,func_8017D220,0x8017D220,0x37
asm/non_matchings/code/sys_math3d/func_8017D2FC.s,func_8017D2FC,0x8017D2FC,0x42
asm/non_matchings/code/sys_math3d/Math3D_LineSegVsPlane.s,Math3D_LineSegVsPlane,0x8017D2FC,0x42
asm/non_matchings/code/sys_math3d/func_8017D404.s,func_8017D404,0x8017D404,0x59
asm/non_matchings/code/sys_math3d/Math3D_TriSetCoords.s,Math3D_TriSetCoords,0x8017D568,0x2C
asm/non_matchings/code/sys_math3d/Math3D_IsPointInSphere.s,Math3D_IsPointInSphere,0x8017D618,0x14
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
786 asm/non_matchings/code/z_camera/func_800DF86C.s func_800DF86C 0x800DF86C 0x20
787 asm/non_matchings/code/z_camera/func_800DF8EC.s func_800DF8EC 0x800DF8EC 0x77
788 asm/non_matchings/code/z_camera/func_800DFAC8.s func_800DFAC8 0x800DFAC8 0x13
789 asm/non_matchings/code/z_camera/func_800DFB14.s asm/non_matchings/code/z_camera/Camera_ChangeDataIdx.s func_800DFB14 Camera_ChangeDataIdx 0x800DFB14 0x42
790 asm/non_matchings/code/z_camera/func_800DFC1C.s func_800DFC1C 0x800DFC1C 0x9
791 asm/non_matchings/code/z_camera/func_800DFC40.s func_800DFC40 0x800DFC40 0xA
792 asm/non_matchings/code/z_camera/func_800DFC68.s asm/non_matchings/code/z_camera/Camera_GetInputDirYaw.s func_800DFC68 Camera_GetInputDirYaw 0x800DFC68 0xA
793 asm/non_matchings/code/z_camera/func_800DFC90.s func_800DFC90 0x800DFC90 0x9
794 asm/non_matchings/code/z_camera/func_800DFCB4.s asm/non_matchings/code/z_camera/Camera_GetCamDirPitch.s func_800DFCB4 Camera_GetCamDirPitch 0x800DFCB4 0xA
795 asm/non_matchings/code/z_camera/func_800DFCDC.s asm/non_matchings/code/z_camera/Camera_GetCamDirYaw.s func_800DFCDC Camera_GetCamDirYaw 0x800DFCDC 0xA
796 asm/non_matchings/code/z_camera/func_800DFD04.s func_800DFD04 0x800DFD04 0x1D
797 asm/non_matchings/code/z_camera/func_800DFD78.s func_800DFD78 0x800DFD78 0x5E
798 asm/non_matchings/code/z_camera/func_800DFEF0.s func_800DFEF0 0x800DFEF0 0xA
808 asm/non_matchings/code/z_camera/func_800E01DC.s func_800E01DC 0x800E01DC 0x13
809 asm/non_matchings/code/z_camera/func_800E0228.s func_800E0228 0x800E0228 0x4
810 asm/non_matchings/code/z_camera/func_800E0238.s func_800E0238 0x800E0238 0x1D
811 asm/non_matchings/code/z_camera/func_800E02AC.s asm/non_matchings/code/z_camera/Camera_SetToTrackActor.s func_800E02AC Camera_SetToTrackActor 0x800E02AC 0x17
812 asm/non_matchings/code/z_camera/func_800E0308.s asm/non_matchings/code/z_camera/Camera_SetTargetActor.s func_800E0308 Camera_SetTargetActor 0x800E0308 0x5
813 asm/non_matchings/code/z_camera/func_800E031C.s asm/non_matchings/code/z_camera/Camera_GetWaterYPos.s func_800E031C Camera_GetWaterYPos 0x800E031C 0xB
814 asm/non_matchings/code/z_camera/func_800E0348.s func_800E0348 0x800E0348 0x16
815 asm/non_matchings/code/z_collision_btltbls/DamageTable_Get.s DamageTable_Get 0x800E03A0 0xB
816 asm/non_matchings/code/z_collision_btltbls/DamageTable_Clear.s DamageTable_Clear 0x800E03CC 0xD
2520 asm/non_matchings/code/z_play/func_801692C4.s func_801692C4 0x801692C4 0x44
2521 asm/non_matchings/code/z_play/Play_SceneInit.s Play_SceneInit 0x801693D4 0x28
2522 asm/non_matchings/code/z_play/func_80169474.s func_80169474 0x80169474 0x1A
2523 asm/non_matchings/code/z_play/func_801694DC.s asm/non_matchings/code/z_play/Play_CreateSubCamera.s func_801694DC Play_CreateSubCamera 0x801694DC 0x2A
2524 asm/non_matchings/code/z_play/Play_GetActiveCameraIndex.s asm/non_matchings/code/z_play/Play_GetActiveCamId.s Play_GetActiveCameraIndex Play_GetActiveCamId 0x80169584 0x3
2525 asm/non_matchings/code/z_play/func_80169590.s asm/non_matchings/code/z_play/Play_CameraChangeStatus.s func_80169590 Play_CameraChangeStatus 0x80169590 0x1C
2526 asm/non_matchings/code/z_play/func_80169600.s asm/non_matchings/code/z_play/Play_ClearCamera.s func_80169600 Play_ClearCamera 0x80169600 0x1A
2527 asm/non_matchings/code/z_play/func_80169668.s asm/non_matchings/code/z_play/Play_ClearAllSubCameras.s func_80169668 Play_ClearAllSubCameras 0x80169668 0x1B
2528 asm/non_matchings/code/z_play/Play_GetCamera.s Play_GetCamera 0x801696D4 0xE
2529 asm/non_matchings/code/z_play/Play_CameraSetAtEye.s Play_CameraSetAtEye 0x8016970C 0x44
2530 asm/non_matchings/code/z_play/func_8016981C.s asm/non_matchings/code/z_play/Play_CameraSetAtEyeUp.s func_8016981C Play_CameraSetAtEyeUp 0x8016981C 0x49
2531 asm/non_matchings/code/z_play/func_80169940.s asm/non_matchings/code/z_play/Play_CameraSetFov.s func_80169940 Play_CameraSetFov 0x80169940 0x12
2532 asm/non_matchings/code/z_play/func_80169988.s asm/non_matchings/code/z_play/Play_CameraSetRoll.s func_80169988 Play_CameraSetRoll 0x80169988 0x13
2533 asm/non_matchings/code/z_play/func_801699D4.s asm/non_matchings/code/z_play/Play_CopyCamera.s func_801699D4 Play_CopyCamera 0x801699D4 0x1F
2534 asm/non_matchings/code/z_play/func_80169A50.s func_80169A50 0x80169A50 0x1C
2535 asm/non_matchings/code/z_play/func_80169AC0.s asm/non_matchings/code/z_play/Play_CameraChangeSetting.s func_80169AC0 Play_CameraChangeSetting 0x80169AC0 0xF
2536 asm/non_matchings/code/z_play/func_80169AFC.s func_80169AFC 0x80169AFC 0x32
2537 asm/non_matchings/code/z_play/func_80169BC4.s asm/non_matchings/code/z_play/Play_CameraGetUID.s func_80169BC4 Play_CameraGetUID 0x80169BC4 0xD
2538 asm/non_matchings/code/z_play/func_80169BF8.s func_80169BF8 0x80169BF8 0x1B
2539 asm/non_matchings/code/z_play/func_80169C64.s asm/non_matchings/code/z_play/Play_GetCsCamDataSetting.s func_80169C64 Play_GetCsCamDataSetting 0x80169C64 0x8
2540 asm/non_matchings/code/z_play/func_80169C84.s asm/non_matchings/code/z_play/Play_GetCsCamDataVec3s.s func_80169C84 Play_GetCsCamDataVec3s 0x80169C84 0xE
2541 asm/non_matchings/code/z_play/convert_scene_number_among_shared_scenes.s convert_scene_number_among_shared_scenes 0x80169CBC 0x21
2542 asm/non_matchings/code/z_play/func_80169D40.s func_80169D40 0x80169D40 0x23
2543 asm/non_matchings/code/z_play/func_80169DCC.s func_80169DCC 0x80169DCC 0x28
2834 asm/non_matchings/code/sys_math3d/Math3D_TriChkLineSegParaZIntersect.s Math3D_TriChkLineSegParaZIntersect 0x8017D020 0x63
2835 asm/non_matchings/code/sys_math3d/func_8017D1AC.s func_8017D1AC 0x8017D1AC 0x1D
2836 asm/non_matchings/code/sys_math3d/func_8017D220.s func_8017D220 0x8017D220 0x37
2837 asm/non_matchings/code/sys_math3d/func_8017D2FC.s asm/non_matchings/code/sys_math3d/Math3D_LineSegVsPlane.s func_8017D2FC Math3D_LineSegVsPlane 0x8017D2FC 0x42
2838 asm/non_matchings/code/sys_math3d/func_8017D404.s func_8017D404 0x8017D404 0x59
2839 asm/non_matchings/code/sys_math3d/Math3D_TriSetCoords.s Math3D_TriSetCoords 0x8017D568 0x2C
2840 asm/non_matchings/code/sys_math3d/Math3D_IsPointInSphere.s Math3D_IsPointInSphere 0x8017D618 0x14