mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-07 08:24:55 +00:00
Code Issues Projects Releases Wiki Activity

Introduce OPEN_DISPS/CLOSE_DISPS macros (#360)

Browse source
This commit is contained in:
Roman971 2020-08-30 01:00:17 +02:00 • committed by GitHub
parent 1f1b5e39f5
commit 2a2fdf7f3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3133 additions and 3775 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_camera.c
View file

@ -3175,7 +3175,7 @@ void func_80057C6C(Camera* camera, View* view, CollisionContext* colCtx, GlobalC
s32 func_8005AD40(Camera* camera, Actor* doorActor, s16 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6);
void func_80057FC4(Camera* camera) {
if (camera != &camera->globalCtx->cameras[0]) {
if (camera != &camera->globalCtx->mainCamera) {
camera->unk_154 = camera->setting = CAM_SET_FREE0;
camera->unk_14C &= ~0x4;
} else if (camera->globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) {
@ -3246,7 +3246,7 @@ void func_80058148(Camera* camera, Player* player) {
camera->unk_118 = -1;
camera->unk_11C = -1;
camera->unk_14C |= 4;
if (camera == &camera->globalCtx->cameras[0]) {
if (camera == &camera->globalCtx->mainCamera) {
D_8011D3A0.w = 0xB200;
} else {
D_8011D3A0.w = 0;