mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-07-31 00:15:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add scene table (#3131)

Browse Source 
* Add scene table

* Re-add accidentally deleted entry

* Update CrashHandlerExt.cpp

* Update CrashHandlerExt.cpp
This commit is contained in:
Pepe20129
2023-09-01 18:46:19 +02:00
committed by GitHub
parent 0e7c658523
commit 45b7520dcb
109 changed files with 2407 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_camera.c
+4 -4
View File
@@ -6631,7 +6631,7 @@ s32 Camera_Special7(Camera* camera) {
yOffset = Player_GetHeight(camera->player);
if (camera->animState == 0) {
if (camera->play->sceneNum == SCENE_JYASINZOU) {
if (camera->play->sceneNum == SCENE_SPIRIT_TEMPLE) {
// Spirit Temple
spec7->idx = 3;
} else if (playerPosRot->pos.x < 1500.0f) {
@@ -7326,7 +7326,7 @@ s32 Camera_UpdateWater(Camera* camera) {
if (camera->waterDistortionTimer > 0) {
camera->waterDistortionTimer--;
camera->distortionFlags |= DISTORTION_UNDERWATER_STRONG;
} else if (camera->play->sceneNum == SCENE_TURIBORI) {
} else if (camera->play->sceneNum == SCENE_FISHING_POND) {
camera->distortionFlags |= DISTORTION_UNDERWATER_FISHING;
} else {
camera->distortionFlags |= DISTORTION_UNDERWATER_WEAK;
@@ -7677,7 +7677,7 @@ Vec3s Camera_Update(Camera* camera) {
Camera_UpdateDistortion(camera);
if ((camera->play->sceneNum == SCENE_SPOT00) && (camera->fov < 59.0f)) {
if ((camera->play->sceneNum == SCENE_HYRULE_FIELD) && (camera->fov < 59.0f)) {
View_SetScale(&camera->play->view, 0.79f);
} else {
View_SetScale(&camera->play->view, 1.0f);
@@ -7921,7 +7921,7 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) {
}
}
if (((setting == CAM_SET_MEADOW_BIRDS_EYE) || (setting == CAM_SET_MEADOW_UNUSED)) && LINK_IS_ADULT &&
(camera->play->sceneNum == SCENE_SPOT05)) {
(camera->play->sceneNum == SCENE_SACRED_FOREST_MEADOW)) {
camera->unk_14A |= 0x10;
return -5;
}