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

pull decomp changes: actor functions, z_en_horse.c (#6877)

Browse Source
This commit is contained in:
Philip Dubé
2026-07-07 01:51:44 +00:00
committed by GitHub
parent 8602c6d154
commit 5cf03a4cda
235 changed files with 829 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_camera.c
+3 -3
View File
@@ -430,7 +430,7 @@ f32 Camera_GetFloorYLayer(Camera* camera, Vec3f* norm, Vec3f* pos, s32* bgId) {
norm->z = 0.0f;
floorY = BGCHECK_Y_MIN;
break;
} else if (func_80041D4C(colCtx, floorPoly, *bgId) == 1) {
} else if (SurfaceType_GetFloorType(colCtx, floorPoly, *bgId) == 1) {
// floor is not solid, check below that floor.
pos->y = floorY - 10.0f;
continue;
@@ -5272,11 +5272,11 @@ s32 Camera_Unique9(Camera* camera) {
Camera_UpdateInterface(0xF000 | ((anim->curKeyFrame->unk_01 & 0xF) << 8));
} else if (camera->player->stateFlags1 & PLAYER_STATE1_IN_WATER &&
player->currentBoots != PLAYER_BOOTS_IRON) {
func_8002DF38(camera->play, camera->target, 8);
Player_SetCsAction(camera->play, camera->target, 8);
osSyncPrintf("camera: demo: player demo set WAIT\n");
} else {
osSyncPrintf("camera: demo: player demo set %d\n", anim->curKeyFrame->unk_01);
func_8002DF38(camera->play, camera->target, anim->curKeyFrame->unk_01);
Player_SetCsAction(camera->play, camera->target, anim->curKeyFrame->unk_01);
}
}
} else {