mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 19:04:38 +00:00
Code Issues Projects Releases Wiki Activity

Split remaining z_camera files (#98)

Browse source 
* split func_800473A0.s

* split func_80051B3C.s

* split func_80054478

* split func_8004B5A0, match a few functions

* rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96)

* rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf

* rename Matrix_RotateRPYf to Matrix_JointPosition

* rename Matrix_RotateZYX to Matrix_RotateRPY

* extract camera floats, and jump tables

* decompile baby functions

priv_wip

wip

* rename struct_80045714 to VecSph
This commit is contained in:
krimtonz 2020-04-30 09:49:11 -05:00 • committed by GitHub
parent 58e38276c6
commit 16b304d548
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 16903 additions and 16217 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/code/z_play.c
View file

@ -232,7 +232,7 @@ void Gameplay_Init(GlobalContext* globalCtx) {
}
globalCtx->cameraPtrs[0] = &globalCtx->cameras[0];
globalCtx->cameraPtrs[0]->unk_130 = 0;
globalCtx->cameraPtrs[0]->uid = 0;
globalCtx->activeCamera = 0;
func_8005AC48(&globalCtx->cameras[0], 0xFF);
func_800A9D28(globalCtx, &globalCtx->sub_1F74);
@ -1719,7 +1719,7 @@ s16 func_800C09A4(GlobalContext* globalCtx, s16 camId) {
Camera* camera = globalCtx->cameraPtrs[camId];
if (camera != NULL) {
return camera->unk_130;
return camera->uid;
} else {
return -1;
}
@ -1730,9 +1730,9 @@ s16 func_800C09D8(GlobalContext* globalCtx, s16 camId, s16 arg2) {
if (camera != NULL) {
return 0;
} else if (camera->unk_130 != arg2) {
} else if (camera->uid != arg2) {
return 0;
} else if (camera->unk_140 != 7) {
} else if (camera->status != 7) {
return 2;
} else {
return 1;