camera control points union (#958)

* union for camera points

* remove raw

* first cleanup

* enums and names

* one minor thing

* corrected comment

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-03-02 03:32:54 -05:00 committed by GitHub
parent 8a7432f465
commit 1cf0d59f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
82 changed files with 716 additions and 3936 deletions

View File

@ -131,13 +131,13 @@ typedef struct Matrix4s {
/* 0x20 */ s16 frac[4][4];
} Matrix4s; // size = 0x40
typedef struct CamPosSettings {
typedef struct CamConfiguration {
/* 0x00 */ f32 boomYaw;
/* 0x04 */ f32 boomLength;
/* 0x08 */ f32 boomPitch;
/* 0x0C */ f32 viewPitch;
/* 0x10 */ Vec3f pos;
} CamPosSettings; // size = 0x1C
/* 0x10 */ Vec3f targetPos;
} CamConfiguration; // size = 0x1C
typedef struct DmaTable {
/* 0x00 */ u8* start;
@ -716,7 +716,7 @@ typedef struct UiStatus {
typedef struct CameraInitData {
/* 0x00 */ s16 flags;
/* 0x02 */ s8 type;
/* 0x02 */ s8 updateMode;
/* 0x03 */ char unk_03;
/* 0x04 */ s16 viewWidth;
/* 0x06 */ s16 viewHeight;
@ -741,8 +741,24 @@ typedef struct CameraControlSettings {
/* 0x00 */ s32 type;
/* 0x04 */ f32 boomLength;
/* 0x08 */ f32 boomPitch;
/* 0x0C */ Vec3f posA;
/* 0x18 */ Vec3f posB;
union {
struct {
f32 Ax;
f32 Ay;
f32 Az;
f32 Bx;
f32 By;
f32 Bz;
} two;
struct {
f32 Ax;
f32 Cx;
f32 Az;
f32 Bx;
f32 Cz;
f32 Bz;
} three;
} points;
/* 0x24 */ f32 viewPitch;
/* 0x28 */ s32 flag;
} CameraControlSettings; // size = 0x2C
@ -808,8 +824,8 @@ typedef struct Camera {
/* 0x214 */ CameraUnk unk_214[4];
/* 0x444 */ CameraControlSettings* prevController;
/* 0x448 */ CameraControlSettings* currentController;
/* 0x44C */ CamPosSettings oldCameraSettings;
/* 0x468 */ CamPosSettings newCameraSettings;
/* 0x44C */ CamConfiguration prevConfiguration;
/* 0x468 */ CamConfiguration goalConfiguration;
/* 0x484 */ f32 interpAlpha;
/* 0x488 */ f32 linearInterp;
/* 0x48C */ f32 linearInterpScale; /* 3.0? */
@ -818,9 +834,7 @@ typedef struct Camera {
/* 0x498 */ f32 unk_498;
/* 0x49C */ f32 unk_49C;
/* 0x4A0 */ f32 savedTargetY;
/* 0x4A4 */ f32 unk_4A4;
/* 0x4A8 */ f32 unk_4A8;
/* 0x4AC */ f32 unk_4AC;
/* 0x4A4 */ Vec3f prevTargetPos;
/* 0x4B0 */ Vec3f movePos;
/* 0x4BC */ Vec3f prevPrevMovePos;
/* 0x4C8 */ Vec3f prevMovePos;

View File

@ -5366,14 +5366,51 @@ enum CameraMoveFlags {
CAMERA_MOVE_FLAG_4 = 0x00000004,
};
enum CameraSettingsType {
CAMERA_SETTINGS_TYPE_0 = 0,
CAMERA_SETTINGS_TYPE_1 = 1,
CAMERA_SETTINGS_TYPE_2 = 2,
CAMERA_SETTINGS_TYPE_3 = 3,
CAMERA_SETTINGS_TYPE_4 = 4,
CAMERA_SETTINGS_TYPE_5 = 5,
CAMERA_SETTINGS_TYPE_6 = 6,
enum CameraUpdateType {
CAM_UPDATE_MODE_0 = 0,
CAM_UPDATE_MODE_1 = 1,
CAM_UPDATE_MODE_2 = 2,
CAM_UPDATE_MODE_3 = 3,
CAM_UPDATE_MODE_4 = 4,
CAM_UPDATE_MODE_5 = 5,
CAM_UPDATE_MODE_6 = 6,
};
enum CameraControlType {
// Camera follows the player, using a fixed yaw position.
// Uses: A/B as 2D points
// Yaw is defined by the line segment AB
// flag 0 = free forward movement (follow player)
// flag 1 = lock forward movement (must intersect B)
CAM_CONTROL_FIXED_ORIENTATION = 0,
// Camera faces toward or away from a point with the player in the center of the frame.
// Use a negative boom length to look away from a point.
// flag 1 = Constrain to Fixed Radius
CAM_CONTROL_LOOK_AT_POINT = 1,
// Camera is contrained to a point along the line segment BC.
// Use these near exits to stop camera movement.
// Uses: A/B/C as 2D points
// The target position is found by projecting player position onto BC along a line orthogonal to AB.
// If posA == posB, AB is ignored and the projection axis will be along a line orthogonal to BC with
// the resulting position being the closest point on BC to the player.
// flag 1 = Freeze Camera Position
CAM_CONTROL_CONSTRAIN_TO_LINE = 2,
// Follows the player using whatever yaw value the camera initially possessed.
CAM_CONTROL_FOLLOW_PLAYER = 3,
// Both position and yaw are fixed.
CAM_CONTROL_FIXED_POS_AND_ORIENTATION = 4,
// Look Toward Point, Constrain to Line
// flag 1 = Freeze Target at Point
CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE = 5,
// Camera position is contrained to a line segment, with yaw perpendicular to the line segment.
// flag 1 = Disable Forward Motion
CAM_CONTROL_CONSTAIN_BETWEEN_POINTS = 6,
};
enum BtlCameraPreset {

View File

@ -724,22 +724,22 @@
// only set perspective to standard values
#define EVT_SETUP_CAMERA_MINIMAL() \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
#define EVT_SETUP_CAMERA_DEFAULT() \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) \
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
#define EVT_SETUP_CAMERA_NO_LEAD() \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) \
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) \
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
// same as EVT_SETUP_CAMERA_NO_LEAD with calls reordered
#define EVT_SETUP_CAMERA_ALT_NO_LEAD() \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) \
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) \
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -24,25 +24,25 @@ void update_cameras(void) {
gCurrentCamID = i;
switch (cam->updateMode) {
case 3:
case CAM_UPDATE_MODE_3:
update_camera_zone_interp(cam);
break;
case 0:
case CAM_UPDATE_MODE_0:
update_camera_mode_0(cam);
break;
case 1:
case CAM_UPDATE_MODE_1:
update_camera_mode_1(cam);
break;
case 2:
case CAM_UPDATE_MODE_2:
update_camera_mode_2(cam);
break;
case 4:
case CAM_UPDATE_MODE_4:
update_camera_mode_4(cam);
break;
case 5:
case CAM_UPDATE_MODE_5:
update_camera_mode_5(cam);
break;
case 6:
case CAM_UPDATE_MODE_6:
default:
update_camera_mode_6(cam);
break;
@ -237,7 +237,7 @@ void create_cameras_a(void) {
}
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 0;
@ -248,7 +248,7 @@ void create_cameras_a(void) {
initialize_next_camera(camDataPtr);
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 160;
@ -259,7 +259,7 @@ void create_cameras_a(void) {
initialize_next_camera(camDataPtr);
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 0;
@ -270,7 +270,7 @@ void create_cameras_a(void) {
initialize_next_camera(camDataPtr);
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 160;
@ -291,7 +291,7 @@ void create_cameras_b(void) {
}
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 0;
@ -302,7 +302,7 @@ void create_cameras_b(void) {
initialize_next_camera(camDataPtr);
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 160;
@ -313,7 +313,7 @@ void create_cameras_b(void) {
initialize_next_camera(camDataPtr);
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 0;
@ -324,7 +324,7 @@ void create_cameras_b(void) {
initialize_next_camera(camDataPtr);
camDataPtr->flags = CAMERA_FLAG_ENABLED;
camDataPtr->type = 0;
camDataPtr->updateMode = CAM_UPDATE_MODE_0;
camDataPtr->viewWidth = 160;
camDataPtr->viewHeight = 120;
camDataPtr->viewStartX = 160;
@ -363,7 +363,7 @@ Camera* initialize_next_camera(CameraInitData* initData) {
camera->trueRotation.x = 0.0f;
camera->trueRotation.y = 0.0f;
camera->trueRotation.z = 0.0f;
camera->updateMode = initData->type;
camera->updateMode = initData->updateMode;
camera->unk_06 = TRUE;
camera->nearClip = initData->nearClip;
camera->farClip = initData->farClip;

File diff suppressed because it is too large Load Diff

View File

@ -1005,7 +1005,7 @@ EvtScript N(80220100) = {
EVT_WAIT(12)
EVT_CALL(SetCamEnabled, CAM_TATTLE, TRUE)
EVT_CALL(SetCamFlag80, CAM_TATTLE, FALSE)
EVT_CALL(SetCamPerspective, CAM_TATTLE, 6, 25, 16, 1024)
EVT_CALL(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024)
EVT_CALL(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1019,7 +1019,7 @@ EvtScript N(80220100) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_282)
EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE)
EVT_WAIT(10)
EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, 1, 0x0009000F, 0x00090001)
EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, 1, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle)
EVT_CALL(func_80218E2C_4652BC, LVar5)
EVT_WAIT(12)
EVT_CALL(SetCamEnabled, CAM_TATTLE, FALSE)

View File

@ -499,7 +499,7 @@ EvtScript N(goombario_tattle) = {
EVT_CALL(func_802535B4, 0)
EVT_CALL(SetCamEnabled, CAM_TATTLE, TRUE)
EVT_CALL(SetCamFlag80, CAM_TATTLE, FALSE)
EVT_CALL(SetCamPerspective, CAM_TATTLE, 6, 25, 16, 1024)
EVT_CALL(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024)
EVT_CALL(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

View File

@ -1441,7 +1441,7 @@ EvtScript N(tattle) = {
EVT_WAIT(12)
EVT_CALL(SetCamEnabled, CAM_TATTLE, TRUE)
EVT_CALL(SetCamFlag80, CAM_TATTLE, FALSE)
EVT_CALL(SetCamPerspective, CAM_TATTLE, 6, 25, 16, 1024)
EVT_CALL(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024)
EVT_CALL(SetCamViewport, CAM_TATTLE, 137, 95, 138, 99)
EVT_CALL(GetOwnerTarget, LVarA, LVarB)
EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2)

View File

@ -122,10 +122,10 @@ EvtScript CamPreset_A = {
};
EvtScript EVS_OnBattleInit = {
EVT_CALL(SetCamPerspective, 1, 6, 25, 16, 1024)
EVT_CALL(SetCamViewport, 1, 12, 20, 296, 200)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetCamEnabled, 1, 1)
EVT_CALL(SetCamPerspective, CAM_BATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024)
EVT_CALL(SetCamViewport, CAM_BATTLE, 12, 20, 296, 200)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_BATTLE, TRUE)
EVT_WAIT(1)
EVT_CALL(InitVirtualEntityList)
EVT_CALL(InitAnimatedModels)

View File

@ -218,7 +218,6 @@ s32 calculate_line_segment_intersection(f32 A1x, f32 A1z, f32 A2x, f32 A2z, f32
return TRUE;
}
s32 func_800328A4(CameraControlSettings* camSettings, f32 x, f32 z) {
f32 product1, product2;
f32 delta, p1, p2, p3, p4;
@ -226,20 +225,20 @@ s32 func_800328A4(CameraControlSettings* camSettings, f32 x, f32 z) {
if (camSettings == NULL) {
return 0;
}
if (camSettings->type != CAMERA_SETTINGS_TYPE_6) {
if (camSettings->type != CAM_CONTROL_CONSTAIN_BETWEEN_POINTS) {
return 0;
}
delta = x - camSettings->posA.x;
p1 = (camSettings->posB.x - camSettings->posA.x) * delta;
delta = x - camSettings->points.two.Ax;
p1 = (camSettings->points.two.Bx - camSettings->points.two.Ax) * delta;
delta = z - camSettings->posA.z;
p2 = (camSettings->posB.z - camSettings->posA.z) * delta;
delta = z - camSettings->points.two.Az;
p2 = (camSettings->points.two.Bz - camSettings->points.two.Az) * delta;
delta = x - camSettings->posB.x;
p3 = (camSettings->posB.x - camSettings->posA.x) * delta;
delta = x - camSettings->points.two.Bx;
p3 = (camSettings->points.two.Bx - camSettings->points.two.Ax) * delta;
delta = z - camSettings->posB.z;
p4 = (camSettings->posB.z - camSettings->posA.z) * delta;
delta = z - camSettings->points.two.Bz;
p4 = (camSettings->points.two.Bz - camSettings->points.two.Az) * delta;
product1 = p1 + p2;
product2 = p3 + p4;
@ -260,7 +259,7 @@ void func_80032970(Camera* camera, f32 arg1) {
s32 flags = camera->flags & CAMERA_FLAG_1000;
s32 a2 = flags != 0;
if (camera->currentController != NULL && camera->currentController->type == CAMERA_SETTINGS_TYPE_4) {
if (camera->currentController != NULL && camera->currentController->type == CAM_CONTROL_FIXED_POS_AND_ORIENTATION) {
a2 = TRUE;
}
@ -377,7 +376,7 @@ void func_80032C64(Camera* camera) {
settings3 = settings = test_ray_zone(camera->targetPos.x, camera->targetPos.y + 10.0f, camera->targetPos.z, NULL);
if (settings != NULL) {
if (settings->type == CAMERA_SETTINGS_TYPE_2 || settings->type == CAMERA_SETTINGS_TYPE_5 || (s2 = func_800328A4(settings, camera->targetPos.x, camera->targetPos.z))) {
if (settings->type == CAM_CONTROL_CONSTRAIN_TO_LINE || settings->type == CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE || (s2 = func_800328A4(settings, camera->targetPos.x, camera->targetPos.z))) {
if (camera->unk_530) {
guPerspectiveF(camera->perspectiveMatrix, &camera->perspNorm, camera->vfov,
(f32)camera->viewportW / (f32)camera->viewportH, camera->nearClip, camera->farClip, 1.0f);
@ -394,7 +393,7 @@ void func_80032C64(Camera* camera) {
} else {
CameraControlSettings* aabbForZoneBelow = camera->aabbForZoneBelow;
if (!(aabbForZoneBelow != NULL && (aabbForZoneBelow->type == CAMERA_SETTINGS_TYPE_2 || aabbForZoneBelow->type == CAMERA_SETTINGS_TYPE_5 || func_800328A4(settings, camera->unk_524, camera->unk_528) != 0))) {
if (!(aabbForZoneBelow != NULL && (aabbForZoneBelow->type == CAM_CONTROL_CONSTRAIN_TO_LINE || aabbForZoneBelow->type == CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE || func_800328A4(settings, camera->unk_524, camera->unk_528) != 0))) {
if (aabbForZoneBelow != NULL && s2 != 0) {
camera->unk_52C = s2;
} else {
@ -427,22 +426,22 @@ void func_80032C64(Camera* camera) {
newPosZ = camera->targetPos.z + leadAmount * sin_rad(rotationRad);
settings = test_ray_zone(newPosX, camera->targetPos.y + 10.0f, newPosZ, &zone);
if (settings != NULL) {
if (settings->type == CAMERA_SETTINGS_TYPE_2 || settings->type == CAMERA_SETTINGS_TYPE_5 || func_800328A4(camera->aabbForZoneBelow, newPosX, newPosZ) != 0) {
if (settings->type == CAM_CONTROL_CONSTRAIN_TO_LINE || settings->type == CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE || func_800328A4(camera->aabbForZoneBelow, newPosX, newPosZ) != 0) {
cond = TRUE;
dist = SQ(1000.0f);
if (camera->aabbForZoneBelow != NULL && camera->aabbForZoneBelow->type == CAMERA_SETTINGS_TYPE_6) {
if (camera->aabbForZoneBelow != NULL && camera->aabbForZoneBelow->type == CAM_CONTROL_CONSTAIN_BETWEEN_POINTS) {
settings2 = camera->aabbForZoneBelow;
cond = FALSE;
deltaPosX = settings2->posB.x - settings2->posA.x;
deltaPosZ = settings2->posB.z - settings2->posA.z;
deltaPosX = settings2->points.two.Bx - settings2->points.two.Ax;
deltaPosZ = settings2->points.two.Bz - settings2->points.two.Az;
if (calculate_line_segment_intersection(settings2->posA.x, settings2->posA.z, settings2->posA.x - deltaPosZ, settings2->posA.z + deltaPosX,
if (calculate_line_segment_intersection(settings2->points.two.Ax, settings2->points.two.Az, settings2->points.two.Ax - deltaPosZ, settings2->points.two.Az + deltaPosX,
camera->targetPos.x, camera->targetPos.z, newPosX, newPosZ, &sp44, &sp48, &sp4C) && sp4C < SQ(1000.0f)) {
dist = sp4C;
}
do {
if (calculate_line_segment_intersection(settings2->posB.x, settings2->posB.z, settings2->posB.x - deltaPosZ, settings2->posB.z + deltaPosX,
if (calculate_line_segment_intersection(settings2->points.two.Bx, settings2->points.two.Bz, settings2->points.two.Bx - deltaPosZ, settings2->points.two.Bz + deltaPosX,
camera->targetPos.x, camera->targetPos.z, newPosX, newPosZ, &sp44, &sp48, &sp4C) && sp4C < dist) {
dist = sp4C;
}

View File

@ -50,11 +50,12 @@ ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall) {
s16 farClip = evt_get_variable(script, *args++);
Camera* camera = &gCameras[id];
camera->farClip = farClip;
camera->updateMode = mode;
camera->unk_06 = TRUE;
camera->isChangingMap = TRUE;
camera->vfov = vfov;
camera->farClip = farClip;
camera->nearClip = nearClip;
return ApiStatus_DONE2;
}
@ -79,7 +80,7 @@ ApiStatus func_802CA988(Evt* script, s32 isInitialCall) {
Bytecode outVar4 = *args++;
f32 dx, dy, dz;
gCameras[id].updateMode = 2;
gCameras[id].updateMode = CAM_UPDATE_MODE_2;
gCameras[id].unk_06 = FALSE;
gCameras[id].auxPitch = -round(gCameras[id].currentPitch);
gCameras[id].auxBoomLength = -gCameras[id].currentBlendedYawNegated;
@ -457,8 +458,8 @@ ApiStatus SetCamPosA(Evt* script, s32 isInitialCall) {
f32 x = evt_get_float_variable(script, *args++);
f32 z = evt_get_float_variable(script, *args++);
camera->controlSettings.posA.x = x;
camera->controlSettings.posA.z = z;
camera->controlSettings.points.two.Ax = x;
camera->controlSettings.points.two.Az = z;
return ApiStatus_DONE2;
}
@ -469,8 +470,8 @@ ApiStatus SetCamPosB(Evt* script, s32 isInitialCall) {
f32 x = evt_get_float_variable(script, *args++);
f32 z = evt_get_float_variable(script, *args++);
camera->controlSettings.posB.x = x;
camera->controlSettings.posB.z = z;
camera->controlSettings.points.two.Bx = x;
camera->controlSettings.points.two.Bz = z;
return ApiStatus_DONE2;
}
@ -481,8 +482,8 @@ ApiStatus SetCamPosC(Evt* script, s32 isInitialCall) {
f32 y1 = evt_get_float_variable(script, *args++);
f32 y2 = evt_get_float_variable(script, *args++);
camera->controlSettings.posA.y = y1;
camera->controlSettings.posB.y = y2;
camera->controlSettings.points.two.Ay = y1;
camera->controlSettings.points.two.By = y2;
return ApiStatus_DONE2;
}
@ -552,8 +553,8 @@ ApiStatus GetCamPosA(Evt* script, s32 isInitialCall) {
Bytecode outVar2 = *args++;
Camera* camera = &gCameras[id];
evt_set_float_variable(script, outVar1, camera->controlSettings.posA.x);
evt_set_float_variable(script, outVar2, camera->controlSettings.posA.z);
evt_set_float_variable(script, outVar1, camera->controlSettings.points.two.Ax);
evt_set_float_variable(script, outVar2, camera->controlSettings.points.two.Az);
return ApiStatus_DONE2;
}
@ -564,8 +565,8 @@ ApiStatus GetCamPosB(Evt* script, s32 isInitialCall) {
Bytecode outVar2 = *args++;
Camera* camera = &gCameras[id];
evt_set_float_variable(script, outVar1, camera->controlSettings.posB.x);
evt_set_float_variable(script, outVar2, camera->controlSettings.posB.z);
evt_set_float_variable(script, outVar1, camera->controlSettings.points.two.Bx);
evt_set_float_variable(script, outVar2, camera->controlSettings.points.two.Bz);
return ApiStatus_DONE2;
}
@ -576,8 +577,8 @@ ApiStatus GetCamPosC(Evt* script, s32 isInitialCall) {
Bytecode outVar2 = *args++;
Camera* camera = &gCameras[id];
evt_set_float_variable(script, outVar1, camera->controlSettings.posA.y);
evt_set_float_variable(script, outVar2, camera->controlSettings.posB.y);
evt_set_float_variable(script, outVar1, camera->controlSettings.points.two.Ay);
evt_set_float_variable(script, outVar2, camera->controlSettings.points.two.By);
return ApiStatus_DONE2;
}

View File

@ -682,7 +682,7 @@ void init_hud_element_list(void) {
void func_801413F8(void) {
set_cam_viewport(CAM_3, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
gCameras[CAM_3].updateMode = 2;
gCameras[CAM_3].updateMode = CAM_UPDATE_MODE_2;
gCameras[CAM_3].unk_06 = TRUE;
gCameras[CAM_3].lookAt_dist = 15551;
gCameras[CAM_3].nearClip = CAM_NEAR_CLIP;

View File

@ -58,7 +58,7 @@ void state_init_file_select(void) {
hud_element_set_aux_cache(0, 0);
hud_element_clear_cache();
load_model_textures(0, 0, 0);
gCameras[CAM_DEFAULT].updateMode = 6;
gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6;
gCameras[CAM_DEFAULT].unk_06 = 1;
gCameras[CAM_DEFAULT].nearClip = 16;
gCameras[CAM_DEFAULT].farClip = 4096;

View File

@ -68,7 +68,7 @@ void state_init_logos(void) {
nuContRmbForceStop();
create_cameras_a();
gCameras[CAM_DEFAULT].updateMode = 6;
gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6;
gCameras[CAM_DEFAULT].unk_06 = TRUE;
gCameras[CAM_DEFAULT].nearClip = 16;
gCameras[CAM_DEFAULT].farClip = 4096;

View File

@ -114,7 +114,7 @@ void state_init_title_screen(void) {
#endif
create_cameras_a();
gCameras[CAM_DEFAULT].updateMode = 6;
gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6;
gCameras[CAM_DEFAULT].unk_06 = TRUE;
gCameras[CAM_DEFAULT].nearClip = CAM_NEAR_CLIP;
gCameras[CAM_DEFAULT].farClip = CAM_FAR_CLIP;

View File

@ -1,7 +1,7 @@
#include "end_00.h"
EvtScript N(EVS_Main) = {
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 35, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 35, 16, 4096)
EVT_CALL(SetCamViewport, CAM_DEFAULT, 15, 28, 290, 128)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -6,7 +6,7 @@ API_CALLABLE(N(WidenCameraFOV)) {
}
EvtScript N(EVS_Main) = {
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamViewport, CAM_DEFAULT, 15, 28, 290, 128)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -15,21 +15,19 @@ Vec3f N(TwinkFlightPath)[] = {
s32 N(Unused) = 0;
CameraControlSettings N(CamSettings_PreHeist) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 700,
.boomPitch = -0.9,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 500.0, -1.0, 0.0 },
.points = { .two = { 0.0, -1.0, 0.0, 500.0, -1.0, 0.0 }},
.viewPitch = -17.4,
.flag = FALSE,
};
CameraControlSettings N(CamSettings_PostHeist) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 665,
.boomPitch = -0.9,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 500.0, -1.0, 0.0 },
.points = { .two = { 0.0, -1.0, 0.0, 500.0, -1.0, 0.0 }},
.viewPitch = -17.4,
.flag = FALSE,
};

View File

@ -26,7 +26,7 @@ EvtScript N(EVS_Starship_FlyingAway) = {
EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 45, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 45, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -280, 0, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, -280, 0, 0)
EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE)

View File

@ -278,7 +278,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = {
EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Back)
EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o616, COLLIDER_FLAGS_UPPER_MASK)
EVT_CALL(SetZoneEnabled, ZONE_o622, FALSE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5))

View File

@ -53,171 +53,154 @@ s32 N(D_802495DC_A3381C) = 0;
s32 N(D_802495E0_A33820) = 0;
CameraControlSettings N(IntroCamSettings0) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 130.4,
.boomPitch = 12.4,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 0.0, -1.0, -500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 0.0, -1.0, -500.0 }},
.viewPitch = -16.8,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings1) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 130.4,
.boomPitch = 12.4,
.posA = { 0.0, -1.0, 0.0 },
.posB = { -433.0127, -1.0, -250.0 },
.points = { .two = { 0.0, -1.0, 0.0, -433.0127, -1.0, -250.0 }},
.viewPitch = -16.8,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings2) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 400.0,
.boomPitch = 2.7,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 0.0, -1.0, -500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 0.0, -1.0, -500.0 }},
.viewPitch = -7.4,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings3) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 274.4,
.boomPitch = -9.3,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 114.3, -1.0, 500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 114.3, -1.0, 500.0 }},
.viewPitch = 0.7,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings4) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 274.4,
.boomPitch = -9.3,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 114.3, -1.0, 500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 114.3, -1.0, 500.0 }},
.viewPitch = 0.7,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings5) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 243.3,
.boomPitch = 16.0,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 56.1, -1.0, -1.1 },
.points = { .two = { 0.0, -1.0, 0.0, 56.1, -1.0, -1.1 }},
.viewPitch = -3.0,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings6) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 192.5,
.boomPitch = 12.4,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 0.0, -1.0, 500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 0.0, -1.0, 500.0 }},
.viewPitch = -10.7,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings7) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 467.0,
.boomPitch = 21.0,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 71.3, -1.0, 154.3 },
.points = { .two = { 0.0, -1.0, 0.0, 71.3, -1.0, 154.3 }},
.viewPitch = -3.0,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings8) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 121.6,
.boomPitch = 0.0,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 24.4, -1.0, 154.3 },
.points = { .two = { 0.0, -1.0, 0.0, 24.4, -1.0, 154.3 }},
.viewPitch = 0.0,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings9) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 474.7,
.boomPitch = 0.0,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 24.4, -1.0, 154.3 },
.points = { .two = { 0.0, -1.0, 0.0, 24.4, -1.0, 154.3 }},
.viewPitch = 0.0,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings10) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 225.7,
.boomPitch = 9.7,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 6.9, -1.0, 168.8 },
.points = { .two = { 0.0, -1.0, 0.0, 6.9, -1.0, 168.8 }},
.viewPitch = -3.0,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings11) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 130.0,
.boomPitch = 9.8,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 40.0, -1.0, 168.8 },
.points = { .two = { 0.0, -1.0, 0.0, 40.0, -1.0, 168.8 }},
.viewPitch = -9.3,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings12) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 270.0,
.boomPitch = 9.8,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 40.0, -1.0, 168.8 },
.points = { .two = { 0.0, -1.0, 0.0, 40.0, -1.0, 168.8 }},
.viewPitch = -9.3,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings13) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 246.1,
.boomPitch = -1.3,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 500.0, -1.0, 500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 500.0, -1.0, 500.0 }},
.viewPitch = 0.5,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings14) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 180.0,
.boomPitch = -1.3,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 0.0, -1.0, -500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 0.0, -1.0, -500.0 }},
.viewPitch = 0.5,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings15) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 90.0,
.boomPitch = 5.4,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 0.0, -1.0, 500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 0.0, -1.0, 500.0 }},
.viewPitch = -6.9,
.flag = FALSE,
};
CameraControlSettings N(IntroCamSettings16) = {
.type = CAMERA_SETTINGS_TYPE_0,
.type = CAM_CONTROL_FIXED_ORIENTATION,
.boomLength = 445.8,
.boomPitch = 5.4,
.posA = { 0.0, -1.0, 0.0 },
.posB = { 0.0, -1.0, 500.0 },
.points = { .two = { 0.0, -1.0, 0.0, 0.0, -1.0, 500.0 }},
.viewPitch = -6.9,
.flag = FALSE,
};
@ -381,8 +364,8 @@ API_CALLABLE(N(InitializeStoryCamera)) {
camera->controlSettings.boomLength = IntroCamStateA_BoomLength;
camera->controlSettings.boomPitch = IntroCamStateA_BoomPitch;
camera->controlSettings.viewPitch = IntroCamStateA_ViewPitch;
camera->controlSettings.posB.x = sin_deg(N(StoryCameraAngle)) * 500.0f;
camera->controlSettings.posB.z = cos_deg(N(StoryCameraAngle)) * -500.0f;
camera->controlSettings.points.two.Bx = sin_deg(N(StoryCameraAngle)) * 500.0f;
camera->controlSettings.points.two.Bz = cos_deg(N(StoryCameraAngle)) * -500.0f;
camera->panActive = TRUE;
return ApiStatus_DONE2;
}
@ -412,8 +395,8 @@ API_CALLABLE(N(UnusedInitializeStoryCamera)) {
camera->controlSettings.boomLength = IntroCamStateB_BoomLength;
camera->controlSettings.boomPitch = IntroCamStateB_BoomPitch;
camera->controlSettings.viewPitch = IntroCamStateB_ViewPitch;
camera->controlSettings.posB.x = sin_deg(N(StoryCameraAngle)) * 500.0f;
camera->controlSettings.posB.z = cos_deg(N(StoryCameraAngle)) * -500.0f;
camera->controlSettings.points.two.Bx = sin_deg(N(StoryCameraAngle)) * 500.0f;
camera->controlSettings.points.two.Bz = cos_deg(N(StoryCameraAngle)) * -500.0f;
camera->panActive = TRUE;
N(D_802498FC_A33B3C)++;
if (N(StoryCameraAngle) == 0.0f) {
@ -861,8 +844,8 @@ API_CALLABLE(N(CamPanAcrossRoom)) {
camera->panActive = TRUE;
camera->movePos.x = N(PanAcrossRoomCamX);
camera->movePos.z = N(PanAcrossRoomCamZ);
camera->controlSettings.posB.x = sin_deg(N(PanAcrossRoomAngle)) * 500.0f;
camera->controlSettings.posB.z = cos_deg(N(PanAcrossRoomAngle)) * 500.0f;
camera->controlSettings.points.two.Bx = sin_deg(N(PanAcrossRoomAngle)) * 500.0f;
camera->controlSettings.points.two.Bz = cos_deg(N(PanAcrossRoomAngle)) * 500.0f;
N(PanAcrossRoomTime)++;
if (N(PanAcrossRoomTime) == 170) {
@ -884,8 +867,8 @@ API_CALLABLE(N(CamMove_OrbitKammy)) {
N(interp_value_with_easing)(INTRO_MATH_EASING_COS_IN_OUT, 50.0f, 35.0f, N(OrbitKammyTime), 30.0f, &N(OrbitKammyFov));
N(interp_value_with_easing)(INTRO_MATH_EASING_COS_IN_OUT, 246.1f, 180.0f, N(OrbitKammyTime), 30.0f, &N(OrbitKammyBoomLength));
N(interp_value_with_easing)(INTRO_MATH_EASING_COS_IN_OUT, 200.0f, 220.0f, N(OrbitKammyTime), 30.0f, &N(OrbitKammyCamY));
camera->controlSettings.posB.x = sin_deg(N(OrbitKammyAngle)) * 500.0f;
camera->controlSettings.posB.z = cos_deg(N(OrbitKammyAngle)) * 500.0f;
camera->controlSettings.points.two.Bx = sin_deg(N(OrbitKammyAngle)) * 500.0f;
camera->controlSettings.points.two.Bz = cos_deg(N(OrbitKammyAngle)) * 500.0f;
N(adjust_cam_vfov)(CAM_DEFAULT, N(OrbitKammyFov));
camera->panActive = TRUE;
camera->controlSettings.boomLength = N(OrbitKammyBoomLength);

View File

@ -28,7 +28,7 @@ EvtScript N(EVS_MonitorSceneSkip) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_MT_RUGGED)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 30, 16, 4096) // uses fov 25 instead of 30
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 30, 16, 4096) // uses fov 25 instead of 30
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -30,7 +30,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -139,7 +139,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION)
EVT_END_IF
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 208, 208, 208)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -143,7 +143,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION)
EVT_END_IF
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 208, 208, 208)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -73,7 +73,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION)
EVT_END_IF
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 208, 208, 208)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -167,7 +167,7 @@ EvtScript N(EVS_LowerWaterLevel0) = {
EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK)
EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK)
EVT_WAIT(10)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(DisablePlayerPhysics, FALSE)
@ -271,7 +271,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = {
EVT_CALL(EnableModel, MODEL_o388, FALSE)
EVT_END_THREAD
EVT_WAIT(230)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK)
@ -409,7 +409,7 @@ EvtScript N(EVS_LowerWaterLevel1) = {
EVT_CALL(PlaySound, SOUND_22B | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(func_802D62E4, SOUND_22B)
EVT_WAIT(10)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(DisablePlayerPhysics, FALSE)
@ -514,7 +514,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = {
EVT_CALL(EnableModel, MODEL_o388, FALSE)
EVT_END_THREAD
EVT_WAIT(230)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(DisablePlayerPhysics, FALSE)

View File

@ -32,7 +32,7 @@ EvtScript N(EVS_Scene_Arrival) = {
EVT_SET(MV_Starship_PosY, 0)
EVT_SET(MV_Starship_PosZ, 0)
EVT_EXEC(N(EVS_SetStarshipPosRot))
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 30, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 30, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_Departure) = {
EVT_SET(MV_Starship_PosY, 160)
EVT_SET(MV_Starship_PosZ, -970)
EVT_EXEC(N(EVS_SetStarshipPosRot))
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 30, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 30, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))

View File

@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_MT_LAVALAVA)
EVT_CALL(SetSpriteShading, SHADING_KZN_17)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))

View File

@ -113,7 +113,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 90, 4096) // note: unusually large near clip dist: 90 vs 16
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 90, 4096) // note: unusually large near clip dist: 90 vs 16
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_01)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_02)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -24,7 +24,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_03)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_04)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_05)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_06)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_07)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -44,7 +44,7 @@ EvtScript N(D_802431F0_BB0B30) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_08)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -24,7 +24,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_09)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)

View File

@ -97,7 +97,7 @@ EvtScript N(EVS_Bootler_SpookPlayer) = {
EvtScript N(EVS_Scene_BootlersInvitation) = {
EVT_CALL(N(AwaitPlayerApproachForest))
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650)
EVT_CALL(N(InitializeLightingBright))
EVT_THREAD
EVT_CALL(N(ReduceFogEndDist))

View File

@ -30,7 +30,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST)
EVT_CALL(SetSpriteShading, SHADING_MIM_12)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 1024)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 1024)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))

View File

@ -210,7 +210,7 @@ EvtScript N(MV_Scene_CastleAscending) = {
EVT_CALL(EnableGroup, MODEL_kemuri, FALSE)
EVT_CALL(EnableGroup, MODEL_obj, FALSE)
EVT_CALL(EnableGroup, MODEL_g277, FALSE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 80, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetCamType, CAM_DEFAULT, 1, TRUE)
EVT_CALL(SetPanTarget, CAM_DEFAULT, -150, 0, 0)
@ -249,7 +249,7 @@ EvtScript N(MV_Scene_PlayerTossedOut) = {
EVT_CALL(EnableGroup, MODEL_jimen, FALSE)
EVT_CALL(EnableGroup, MODEL_kemuri, FALSE)
EVT_CALL(EnableGroup, MODEL_obj, FALSE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 80, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-13.0), EVT_FLOAT(18.0))
@ -298,7 +298,7 @@ EvtScript N(EVS_Scene_UnusedTossOut) = {
EVT_CALL(EnableGroup, MODEL_jimen, FALSE)
EVT_CALL(EnableGroup, MODEL_kemuri, FALSE)
EVT_CALL(EnableGroup, MODEL_obj, FALSE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 6000)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 6000)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, -400, -1500, 0)
EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(3500.0))

View File

@ -45,7 +45,7 @@ EvtScript N(EVS_Scene_Starship) = {
EVT_SET(MV_CastleLiftDist, 0)
EVT_EXEC(N(EVS_AnimateSwingingChains))
EVT_EXEC(N(EVS_AnimateSpinningRing))
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 80, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-13.0), EVT_FLOAT(18.0))

View File

@ -118,7 +118,7 @@ EvtScript N(EVS_Scene_BeginInterlude) = {
EVT_CALL(EnableGroup, MODEL_jimen, FALSE)
EVT_CALL(EnableGroup, MODEL_kemuri, FALSE)
EVT_CALL(EnableGroup, MODEL_obj, FALSE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 80, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -1, 0)
EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-13.0), EVT_FLOAT(18.0))

View File

@ -123,7 +123,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = {
EVT_EXEC(N(EVS_AnimateSpinningRing))
EVT_EXEC(N(EVS_UpdateCamShaking))
EVT_EXEC_GET_TID(N(EVS_PlayExplosionFX), LVar9)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 22, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 22, 16, 4096)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamType, CAM_DEFAULT, 1, TRUE)
EVT_CALL(SetPanTarget, CAM_DEFAULT, -60, 0, 0)
@ -150,7 +150,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = {
EVT_CALL(UpdateLerp)
EVT_SETF(LVar2, LVar0)
EVT_DIVF(LVar2, 10)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, LVar2, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, LVar2, 16, 4096)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
@ -161,7 +161,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = {
EVT_CALL(UpdateLerp)
EVT_SETF(LVar2, LVar0)
EVT_DIVF(LVar2, 10)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, LVar2, 1, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, LVar2, 1, 4096)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP

View File

@ -321,7 +321,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -56,7 +56,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -52,7 +52,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -41,7 +41,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -48,7 +48,7 @@ EvtScript N(EVS_EnterDoors_0) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -70,7 +70,7 @@ EvtScript N(EVS_BlastWall) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -21,7 +21,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -48,7 +48,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -154,7 +154,7 @@ EvtScript N(EVS_BlastWall_Far) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -52,7 +52,7 @@ EvtScript N(EVS_BlastWallB) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -162,7 +162,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -112,7 +112,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -52,7 +52,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -164,7 +164,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -60,7 +60,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -207,7 +207,7 @@ EvtScript N(EVS_PushStatue) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -47,7 +47,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -47,7 +47,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -153,7 +153,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_EXEC_WAIT(N(EVS_MakeEntities))

View File

@ -82,7 +82,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -96,7 +96,7 @@ EvtScript N(EVS_BlastWall) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -198,7 +198,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -93,7 +93,7 @@ EvtScript N(D_802432B8_D90508) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -39,7 +39,7 @@ EvtScript N(EVS_EnterMap) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)

View File

@ -315,7 +315,7 @@ s32 N(BetaPanelData)[] = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_TESTING)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs)))

View File

@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = {
EvtScript N(EVS_Main) = {
EVT_SET(GB_WorldLocation, LOCATION_MT_LAVALAVA)
EVT_CALL(SetSpriteShading, SHADING_KZN_17)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096)
EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0)
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))

View File

@ -268,7 +268,7 @@ dlabel GfxTaskMgrStack
dlabel D_8009E6D0
.space 0x00000020
dlabel blendedCamSettings
dlabel gCurrentCamConfiguration
.space 0x0000001c
dlabel D_800A08DC

File diff suppressed because it is too large Load Diff

View File

@ -205,7 +205,7 @@ dlabel GfxTaskMgrStack
dlabel D_8009E6D0
.space 0x00000020
dlabel blendedCamSettings
dlabel gCurrentCamConfiguration
.space 0x0000001C
dlabel D_800A08DC

File diff suppressed because it is too large Load Diff

View File

@ -260,7 +260,7 @@ dlabel siMgrThread
dlabel siMgrStack
.space 0x2000
dlabel blendedCamSettings
dlabel gCurrentCamConfiguration
.space 0x0000001c
dlabel D_800A08DC

File diff suppressed because it is too large Load Diff

View File

@ -2706,7 +2706,7 @@ record_jump_apex = 0x800E26B0; // type:func rom:0x7BB60
can_trigger_loading_zone = 0x800E26C4; // type:func rom:0x7BB74
move_player = 0x800E2778; // type:func rom:0x7BC28
collision_main_above = 0x800E27E0; // type:func rom:0x7BC90
blendedCamSettings = 0x800A08C0; // type:data rom:0x7BCC0
gCurrentCamConfiguration = 0x800A08C0; // type:data rom:0x7BCC0
D_800A08DC = 0x800A08DC; // type:data rom:0x7BCDC
D_800A08E0 = 0x800A08E0; // type:data rom:0x7BCE0
D_800A08E4 = 0x800A08E4; // type:data rom:0x7BCE4