diff --git a/include/camera.h b/include/camera.h index 996d4d83be7..e473f1cfca0 100644 --- a/include/camera.h +++ b/include/camera.h @@ -1,14 +1,14 @@ #ifndef _CAMERA_H_ #define _CAMERA_H_ -extern f32 D_8009A5EC; +extern f32 CamLengthScale; -void update_camera_mode_0(Camera*); -void update_camera_mode_1(Camera*); -void update_camera_mode_2(Camera*); -void update_camera_mode_4(Camera*); -void update_camera_mode_5(Camera*); -void update_camera_mode_6(Camera*); +void update_camera_minimal(Camera*); +void update_camera_unused_radial(Camera*); +void update_camera_interp_pos(Camera*); +void update_camera_unused_confined(Camera*); +void update_camera_unused_leading(Camera*); +void update_camera_no_interp(Camera*); void create_camera_leadplayer_matrix(Camera*); void update_camera_zone_interp(Camera* camera); diff --git a/include/common_structs.h b/include/common_structs.h index 69440fbe9e5..c9f0951e51b 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -136,13 +136,13 @@ typedef struct Matrix4s { /* 0x20 */ s16 frac[4][4]; } Matrix4s; // size = 0x40 -typedef struct CamConfiguration { +typedef struct CameraRig { /* 0x00 */ f32 boomYaw; /* 0x04 */ f32 boomLength; /* 0x08 */ f32 boomPitch; /* 0x0C */ f32 viewPitch; /* 0x10 */ Vec3f targetPos; -} CamConfiguration; // size = 0x1C +} CameraRig; // size = 0x1C typedef struct DmaTable { /* 0x00 */ u8* start; @@ -752,15 +752,15 @@ typedef struct CameraControlSettings { } three; } points; /* 0x24 */ f32 viewPitch; - /* 0x28 */ s32 flag; + /* 0x28 */ b32 flag; } CameraControlSettings; // size = 0x2C typedef struct Camera { /* 0x000 */ u16 flags; /* 0x002 */ s16 moveFlags; /* 0x004 */ s16 updateMode; - /* 0x006 */ s16 needsInit; - /* 0x008 */ b16 isChangingMap; + /* 0x006 */ b16 needsInit; + /* 0x008 */ b16 needsReinit; // used when loading from a save point or calling SetCamPerspective /* 0x00A */ s16 viewportW; /* 0x00C */ s16 viewportH; /* 0x00E */ s16 viewportStartX; @@ -769,31 +769,65 @@ typedef struct Camera { /* 0x014 */ s16 farClip; /* 0x016 */ char unk_16[2]; /* 0x018 */ f32 vfov; - /* 0x01C */ s16 auxPitch; - /* 0x01E */ s16 auxBoomLength; - /* 0x020 */ s16 lookAt_dist; - /* 0x022 */ s16 auxBoomPitch; - /* 0x024 */ s16 auxBoomYaw; - /* 0x026 */ s16 auxBoomZOffset; - /* 0x028 */ s16 unk_28; - /* 0x02A */ s16 zoomPercent; + union { + struct { + /* 0x01C */ s16 camParam1; + /* 0x01E */ s16 camParam2; + /* 0x020 */ s16 camParam3; + /* 0x022 */ s16 camParam4; + /* 0x024 */ s16 camParam5; + /* 0x026 */ s16 camParam6; + /* 0x028 */ s16 camParam7; + /* 0x02A */ s16 zoomPercent; + } world; + struct { + /* 0x01C */ b16 skipRecalc; + /* 0x01E */ s16 dist; + /* 0x020 */ s16 fovScale; // 100 --> vfov = 25, scales as 1/x so larger values mean smaller vfov + /* 0x022 */ s16 pitch; + /* 0x024 */ s16 yaw; + /* 0x026 */ s16 offsetY; + /* 0x028 */ s16 camParam7; + /* 0x02A */ s16 zoomPercent; + } basic; + struct { + /* 0x01C */ s16 pitch; + /* 0x01E */ s16 yaw; + /* 0x020 */ s16 dist; + /* 0x022 */ s16 offsetY; + } interp; + struct { + /* 0x01C */ s16 pitch; + /* 0x01E */ s16 minRadius; + /* 0x020 */ s16 dist; + /* 0x022 */ s16 offsetY; + } radial; + struct { + /* 0x01C */ s16 xLimit; + /* 0x01E */ s16 zLimit; + /* 0x020 */ s16 dist; + /* 0x022 */ s16 offsetY; + } confined; + } params; /* 0x02C */ s16 bgColor[3]; - /* 0x032 */ Vec3s targetScreenCoords; + /* 0x032 */ Vec3s targetScreenCoords; // screen coords corresponding to targetPos /* 0x038 */ u16 perspNorm; /* 0x03A */ char unk_3A[2]; - /* 0x03C */ Vec3f lookAt_eye; - /* 0x048 */ Vec3f lookAt_obj; + /* 0x03C */ Vec3f lookAt_eye; // used to construct the view matrix + /* 0x048 */ Vec3f lookAt_obj; // used to construct the view matrix /* 0x054 */ Vec3f lookAt_obj_target; - /* 0x060 */ Vec3f targetPos; + /* 0x060 */ Vec3f targetPos; // target for camera rig, often but not necessarily the player position /* 0x06C */ f32 curYaw; - /* 0x070 */ f32 unk_70; - /* 0x074 */ f32 curBoomYaw; + /* 0x070 */ f32 interpYaw; // no camera mode actually uses this for interpolation + /* 0x074 */ f32 curBoomPitch; /* 0x078 */ f32 curBoomLength; - /* 0x07C */ f32 curYOffset; + /* 0x07C */ f32 targetOffsetY; /* 0x080 */ char unk_80[4]; - /* 0x084 */ Vec3f trueRot; - /* 0x090 */ f32 curBlendedYawNegated; - /* 0x094 */ f32 curPitch; + /* 0x084 */ f32 curBoomYaw; + /* 0x088 */ f32 targetBoomYaw; // only used by CAM_UPDATE_UNUSED_RADIAL + /* 0x08C */ f32 unk_8C; + /* 0x090 */ f32 lookAt_yaw; + /* 0x094 */ f32 lookAt_pitch; /* 0x098 */ f32 unk_98; /* 0x09C */ f32 unk_9C; /* 0x0A0 */ Vp vp; @@ -801,26 +835,26 @@ typedef struct Camera { /* 0x0C0 */ s32 unk_C0; /* 0x0C4 */ f32 unk_C4; /* 0x0C8 */ char unk_C8[0xC]; - /* 0x0D4 */ Matrix4f perspectiveMatrix; - /* 0x114 */ Matrix4f viewMtxPlayer; /* centers on player */ - /* 0x154 */ Matrix4f viewMtxLeading; /* leads player slightly */ - /* 0x194 */ Matrix4f viewMtxShaking; /* used while ShakeCam is active */ + /* 0x0D4 */ Matrix4f mtxPerspective; + /* 0x114 */ Matrix4f mtxViewPlayer; // centers on player + /* 0x154 */ Matrix4f mtxViewLeading; // leads player slightly + /* 0x194 */ Matrix4f mtxViewShaking; // used while ShakeCam is active /* 0x1D4 */ char unk_1D4[0x28]; /* 0x1FC */ void (*fpDoPreRender)(struct Camera*); /* 0x200 */ void (*fpDoPostRender)(struct Camera*); - /* 0x204 */ Mtx* unkMatrix; + /* 0x204 */ Mtx* mtxBillboard; // rotation matrix created from -curBoomYaw /* 0x208 */ s32 unk_208; /* 0x20C */ Matrix4s* unkEffectMatrix; /* 0x210 */ char unk_210[0x2]; /* 0x212 */ s16 unk_212; /* 0x214 */ CameraUnk unk_214[4]; - /* 0x444 */ CameraControlSettings* prevController; - /* 0x448 */ CameraControlSettings* curController; - /* 0x44C */ CamConfiguration prevConfiguration; - /* 0x468 */ CamConfiguration goalConfiguration; + /* 0x444 */ CameraControlSettings* prevSettings; + /* 0x448 */ CameraControlSettings* curSettings; + /* 0x44C */ CameraRig prevRig; + /* 0x468 */ CameraRig nextRig; /* 0x484 */ f32 interpAlpha; /* 0x488 */ f32 linearInterp; - /* 0x48C */ f32 linearInterpScale; /* 3.0? */ + /* 0x48C */ f32 linearInterpRate; /* 0x490 */ f32 moveSpeed; /* 0x494 */ f32 yinterpGoal; /* 0x498 */ f32 yinterpAlpha; @@ -835,22 +869,22 @@ typedef struct Camera { /* 0x4D8 */ CameraControlSettings controlSettings; /* 0x504 */ u16 followPlayer; /* 0x506 */ u16 panActive; - /* 0x508 */ f32 panPhase; + /* 0x508 */ f32 interpEasingParameter; // controls whether easing for camera rig interpolation is more cosine-like (values near 0) or quadratic (values near 1) /* 0x50C */ f32 leadAmount; /* 0x510 */ f32 targetLeadAmount; /* 0x514 */ f32 leadInterpAlpha; /* 0x518 */ f32 accumulatedStickLead; /* 0x51C */ s32 increasingLeadInterp; - /* 0x520 */ f32 unk_520; - /* 0x524 */ f32 leadUnkX; - /* 0x528 */ f32 leadUnkZ; - /* 0x52C */ s32 unk_52C; - /* 0x530 */ s32 unk_530; - /* 0x534 */ CameraControlSettings* leadControlSettings; + /* 0x520 */ f32 leadAmtScale; + /* 0x524 */ f32 prevLeadPosX; + /* 0x528 */ f32 prevLeadPosZ; + /* 0x52C */ s32 leadConstrainDir; + /* 0x530 */ b32 needsInitialConstrainDir; + /* 0x534 */ CameraControlSettings* prevLeadSettings; /* 0x538 */ char unk_538[0x18]; - /* 0x550 */ f32 unk_550; - /* 0x554 */ s16 unk_554; - /* 0x556 */ s16 unk_556; + /* 0x550 */ f32 unusedLeadAmt; + /* 0x554 */ s16 unusedLeadCounter; + /* 0x556 */ s16 unusedLeadDir; } Camera; // size = 0x558 typedef struct BattleStatus { @@ -2007,7 +2041,7 @@ typedef struct PlayerStatus { /* 0x06C */ f32 maxJumpSpeed; /* 0x070 */ f32 gravityIntegrator[4]; // derivatives of y; 0 = velocity, 1 = accel, etc /* 0x080 */ f32 targetYaw; - /* 0x084 */ f32 curYaw; + /* 0x084 */ f32 curYaw; // the direction of player input in world-space (not camera-relative) /* 0x088 */ f32 overlapPushYaw; /* 0x08C */ f32 pitch; /* 0x090 */ f32 flipYaw[4]; diff --git a/include/effects.h b/include/effects.h index 82242ab5417..9fe46e3cca0 100644 --- a/include/effects.h +++ b/include/effects.h @@ -1269,24 +1269,27 @@ typedef struct SmallGoldSparkleFXData { /* 0x20 */ s32 unk_20; } SmallGoldSparkleFXData; // size = 0x24 -typedef struct FlashingBoxShockwaveFXData { - /* 0x00 */ s32 unk_00; +enum ShockOverlayFXTypes { + FX_SHOCK_OVERLAY_SHOCK_HIT = 0, + FX_SHOCK_OVERLAY_LIGHTNING_WORLD = 1, + FX_SHOCK_OVERLAY_MEGA_SHOCK = 2, + FX_SHOCK_OVERLAY_LIGHTNING_BATTLE = 3, +}; + +typedef struct ShockOverlayFXData { + /* 0x00 */ s32 type; /* 0x04 */ Vec3f pos; /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; /* 0x18 */ s32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; + /* 0x1C */ s32 timeLeft; + /* 0x20 */ s32 lifetime; /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ s32 unk_30; - /* 0x34 */ s32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ s32 unk_44; -} FlashingBoxShockwaveFXData; // size = 0x48 + /* 0x28 */ f32 scaleX; + /* 0x2C */ f32 scaleY; + /* 0x30 */ Color3i primCol; + /* 0x3C */ Color3i envCol; +} ShockOverlayFXData; // size = 0x48 typedef struct BalloonFXData { /* 0x00 */ s32 unk_00; @@ -2542,7 +2545,7 @@ typedef union { struct GatherMagicFXData* gatherMagic; struct AttackResultTextFXData* attackResultText; struct SmallGoldSparkleFXData* smallGoldSparkle; - struct FlashingBoxShockwaveFXData* flashingBoxShockwave; + struct ShockOverlayFXData* flashingBoxShockwave; struct BalloonFXData* balloon; struct FloatingRockFXData* floatingRock; struct ChompDropFXData* chompDrop; diff --git a/include/enums.h b/include/enums.h index 9a3454b624c..a6b91d199d6 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1800,25 +1800,25 @@ enum Cams { CAM_DEFAULT = 0, CAM_BATTLE = 1, CAM_TATTLE = 2, - CAM_3 = 3, + CAM_HUD = 3, }; enum CamShakeModes { CAM_SHAKE_CONSTANT_VERTICAL = 0, CAM_SHAKE_ANGULAR_HORIZONTAL = 1, - CAM_SHAKE_DECAYING_VERTICAL = 2 + CAM_SHAKE_DECAYING_VERTICAL = 2, }; // for use with SetBattleCamParam -enum AuxCameraParams { - AUX_CAM_PARAM_1 = 1, - AUX_CAM_BOOM_LENGTH = 2, - AUX_CAM_PARAM_3 = 3, - AUX_CAM_BOOM_PITCH = 4, - AUX_CAM_BOOM_YAW = 5, - AUX_CAM_BOOM_ZOFFSET = 6, - AUX_CAM_PARAM_7 = 7, - AUX_CAM_ZOOM_PERCENT = 8 +enum BasicCameraParams { + CAM_PARAM_SKIP_RECALC = 1, + CAM_PARAM_BOOM_LENGTH = 2, + CAM_PARAM_FOV_SCALE = 3, + CAM_PARAM_BOOM_PITCH = 4, + CAM_PARAM_BOOM_YAW = 5, + CAM_PARAM_BOOM_Y_OFFSET = 6, + CAM_PARAM_UNK_7 = 7, + CAM_PARAM_ZOOM_PERCENT = 8, }; #include "item_enum.h" @@ -4286,6 +4286,32 @@ enum DebuffTypes { DEBUFF_TYPE_INVISIBLE = 0x04000000, }; +enum PlayerBasicJump { + PLAYER_BASIC_JUMP_0 = 0, + PLAYER_BASIC_JUMP_1 = 1, + PLAYER_BASIC_JUMP_2 = 2, + PLAYER_BASIC_JUMP_3 = 3, + PLAYER_BASIC_JUMP_4 = 4, +}; + +enum PlayerSuperJump { + PLAYER_SUPER_JUMP_0 = 0, + PLAYER_SUPER_JUMP_1 = 1, + PLAYER_SUPER_JUMP_2 = 2, + PLAYER_SUPER_JUMP_3 = 3, + PLAYER_SUPER_JUMP_4 = 4, + PLAYER_SUPER_JUMP_5 = 5, + PLAYER_SUPER_JUMP_6 = 6, +}; + +enum PlayerUltraJump { + PLAYER_ULTRA_JUMP_0 = 0, + PLAYER_ULTRA_JUMP_1 = 1, + PLAYER_ULTRA_JUMP_2 = 2, + PLAYER_ULTRA_JUMP_3 = 3, + PLAYER_ULTRA_JUMP_4 = 4, +}; + enum GlobalOverrides { GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD = 0x00000002, GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME = 0x00000008, @@ -4313,7 +4339,7 @@ enum GlobalOverrides { | MODEL_FLAG_20 \ | MODEL_FLAG_IGNORE_FOG \ | MODEL_FLAG_HAS_LOCAL_VERTEX_COPY \ - | MODEL_FLAG_USE_CAMERA_UNK_MATRIX \ + | MODEL_FLAG_BILLBOARD \ | MODEL_FLAG_DO_BOUNDS_CULLING \ | MODEL_FLAG_HAS_TRANSFORM \ | MODEL_FLAG_HAS_TEX_PANNER \ @@ -4331,7 +4357,7 @@ enum ModelFlags { MODEL_FLAG_20 = 0x0020, MODEL_FLAG_IGNORE_FOG = 0x0040, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY = 0x0080, - MODEL_FLAG_USE_CAMERA_UNK_MATRIX = 0x0100, + MODEL_FLAG_BILLBOARD = 0x0100, // rotate to face the camera MODEL_FLAG_DO_BOUNDS_CULLING = 0x0200, MODEL_FLAG_HAS_TRANSFORM = 0x0400, MODEL_FLAG_HAS_TEX_PANNER = 0x0800, @@ -4698,14 +4724,51 @@ enum CameraMoveFlags { CAMERA_MOVE_ACCEL_INTERP_Y = 0x00000004, }; -enum CameraUpdateType { - CAM_UPDATE_MODE_INIT = 0, - CAM_UPDATE_UNUSED_1 = 1, - CAM_UPDATE_MODE_2 = 2, +enum CameraUpdateMode { + // simple camera based on lookAt_eye and lookAt_obj with no blending or interpolation + // control this camera by directly setting these positions + // has no other control parameters + CAM_UPDATE_MINIMAL = 0, + + // this camera uses a set of control parameters to calculate its target lookAt_obj and lookAt_eye positions, + // then interpolates current positions toward those targets, moving up to half the remaining distance each frame + // the ultimate target is given by lookAt_obj_target + // mostly used for CAM_HUD + CAM_UPDATE_INTERP_POS = 2, + + // this camera samples camera zones below its targetPos and derives control parameters from their settings, + // interpolating its control parameters when changing zones. these control parameters determine the camera + // position and orientation just like other camera modes. + // note that this code does NOT directly reference the player position in any manner, it is only concerned + // with the camera's targetPos, which must be assigned elsewhere. + // this is the camera used during world gameplay CAM_UPDATE_FROM_ZONE = 3, - CAM_UPDATE_UNUSED_4 = 4, - CAM_UPDATE_UNUSED_5 = 5, - CAM_UPDATE_MODE_6 = 6, + + // this camera uses a set of control parameters to calculate its lookAt_obj and lookAt_eye positions, + // which are only updated if skipRecalc = FALSE + // the ultimate target is given by lookAt_obj_target, with an offset given by targetPos (?!) + // in practice, this is used for CAM_BATTLE and CAM_TATTLE, with skipRecalc almost always set to FALSE + CAM_UPDATE_NO_INTERP = 6, + + // this camera tracks lookAt_obj_target in a circular region centered on targetPos. the camera does not update + // unless lookAt_obj_target is greater than a minimum distance from targetPos to prevent wild movements. + CAM_UPDATE_UNUSED_RADIAL = 1, + + // this camera tracks targetPos, clamped within the rectangular region given by +/- xLimit and +/- zLimit + // y-position is drawn from lookAt_obj_target + // does not use easing or interpolation + CAM_UPDATE_UNUSED_CONFINED = 4, + + // this camera tracks player position and adds basic 'leading' in the x-direction only + // camera yaw is fixed at zero and the lead direction is determined by player world yaw + // thus, this only works for '2D' style maps where left is -x and right is +x + CAM_UPDATE_UNUSED_LEADING = 5, + + // this mode is completely unused in vanilla; it doesn't even have a case in update_cameras + // seems to be based on CAM_UPDATE_NO_INTERP (the one used for battle cam) + // tracks a point 400 units ahead of player position in the z-direction and 60 units above + // defaults to a relatively short boom length and no pitch angle, resulting in a head-on direct view + // CAM_UPDATE_UNUSED_AHEAD, }; enum CameraControlType { @@ -4745,93 +4808,93 @@ enum CameraControlType { CAM_CONTROL_CONSTAIN_BETWEEN_POINTS = 6, }; -enum BtlCameraPreset { - BTL_CAM_PRESET_00 = 0, // unused? - BTL_CAM_PRESET_01 = 1, // STOP - BTL_CAM_DEFAULT = 2, - BTL_CAM_PRESET_03 = 3, - BTL_CAM_PRESET_04 = 4, - BTL_CAM_PRESET_05 = 5, - BTL_CAM_PRESET_06 = 6, // unused? - BTL_CAM_PRESET_07 = 7, - BTL_CAM_PRESET_08 = 8, - BTL_CAM_PRESET_09 = 9, // unused? - BTL_CAM_PRESET_10 = 10, - BTL_CAM_PRESET_11 = 11, - BTL_CAM_PRESET_12 = 12, // unused? - BTL_CAM_PRESET_13 = 13, - BTL_CAM_PRESET_14 = 14, // FOCUS_ON_TARGET? - BTL_CAM_PRESET_15 = 15, - BTL_CAM_PRESET_16 = 16, // unused? - BTL_CAM_PRESET_17 = 17, // unused? - BTL_CAM_PRESET_18 = 18, // unused? - BTL_CAM_PRESET_19 = 19, - BTL_CAM_PRESET_20 = 20, // unused? - BTL_CAM_PRESET_21 = 21, // unused? - BTL_CAM_PLAYER_ENTRY = 22, - BTL_CAM_VICTORY = 23, // closeup on party while star points are tallied - BTL_CAM_PRESET_24 = 24, - BTL_CAM_PRESET_25 = 25, // closeup on player used when running away or being defeated - BTL_CAM_PLAYER_ATTACK_APPROACH = 26, - BTL_CAM_PRESET_27 = 27, - BTL_CAM_PRESET_28 = 28, - BTL_CAM_PRESET_29 = 29, - BTL_CAM_PLAYER_HIT_SPIKE = 30, // player hurt via spike contact - BTL_CAM_PLAYER_HIT_HAZARD = 31, // player hurt via burn or shock contact - BTL_CAM_PLAYER_CHARGE_UP = 32, - BTL_CAM_PLAYER_STATUS_AFFLICTED = 33, - BTL_CAM_PRESET_34 = 34, - BTL_CAM_PRESET_35 = 35, - BTL_CAM_PRESET_36 = 36, // unused? - BTL_CAM_PRESET_37 = 37, - BTL_CAM_PRESET_38 = 38, - BTL_CAM_PRESET_39 = 39, - BTL_CAM_PRESET_40 = 40, - BTL_CAM_PRESET_41 = 41, // unused? - BTL_CAM_PRESET_42 = 42, // unused? - BTL_CAM_PLAYER_AIM_HAMMER = 43, - BTL_CAM_PLAYER_HAMMER_STRIKE = 44, - BTL_CAM_PRESET_45 = 45, // unused? - BTL_CAM_PRESET_46 = 46, - BTL_CAM_PARTNER_APPROACH = 47, // used by Goombario and Watt (power shock only) - BTL_CAM_PRESET_48 = 48, - BTL_CAM_PRESET_49 = 49, // unused? - BTL_CAM_PRESET_50 = 50, - BTL_CAM_PRESET_51 = 51, - BTL_CAM_PRESET_52 = 52, - BTL_CAM_PRESET_53 = 53, - BTL_CAM_PARTNER_INJURED = 54, // closeup on partner after being injured - BTL_CAM_PRESET_55 = 55, - BTL_CAM_PRESET_56 = 56, // unused? - BTL_CAM_PRESET_57 = 57, // unused? - BTL_CAM_PRESET_58 = 58, // unused? - BTL_CAM_PRESET_59 = 59, - BTL_CAM_PRESET_60 = 60, // unused? - BTL_CAM_PRESET_61 = 61, - BTL_CAM_PRESET_62 = 62, - BTL_CAM_ENEMY_APPROACH = 63, // (very common) - BTL_CAM_PRESET_64 = 64, // unused? - BTL_CAM_PRESET_65 = 65, // unused? - BTL_CAM_PRESET_66 = 66, - BTL_CAM_PRESET_67 = 67, // unused? - BTL_CAM_PRESET_68 = 68, // unused? - BTL_CAM_PRESET_69 = 69, - BTL_CAM_PRESET_70 = 70, // unused? - BTL_CAM_PRESET_71 = 71, // unused? - BTL_CAM_PRESET_72 = 72, // unused? - BTL_CAM_PRESET_73 = 73, -}; - -enum BattleCamXModes { - BTL_CAM_MODEX_0 = 0, - BTL_CAM_MODEX_1 = 1, -}; - -enum BattleCamYModes { - BTL_CAM_MODEY_MINUS_2 = -2, - BTL_CAM_MODEY_MINUS_1 = -1, - BTL_CAM_MODEY_0 = 0, - BTL_CAM_MODEY_1 = 1, +enum BattleCamPreset { + BTL_CAM_RESET = 0x00, + BTL_CAM_INTERRUPT = 0x01, // forces camera motion to end + BTL_CAM_DEFAULT = 0x02, // wide shot of the entire arena + BTL_CAM_VIEW_ENEMIES = 0x03, // broad focus on enemy side of the field + BTL_CAM_RETURN_HOME = 0x04, + BTL_CAM_ACTOR_TARGET_MIDPOINT = 0x05, // focus on midpoint between subject actor and its target + BTL_CAM_ACTOR_PART = 0x06, // unused + BTL_CAM_ACTOR_GOAL_SIMPLE = 0x07, + BTL_CAM_ACTOR_SIMPLE = 0x08, // same as BTL_CAM_ACTOR, but does not change boom pitch, yaw, or y-offset + BTL_CAM_SLOW_DEFAULT = 0x09, // unused, same as BTL_CAM_DEFAULT but takes 4x as long + BTL_CAM_MIDPOINT_CLOSE = 0x0A, + BTL_CAM_MIDPOINT_NORMAL = 0x0B, + BTL_CAM_MIDPOINT_FAR = 0x0C, // unused + BTL_CAM_ACTOR_CLOSE = 0x0D, // focus on a targeted actor, closer than normal + BTL_CAM_ACTOR = 0x0E, // focus on a targeted actor using typical distance + BTL_CAM_ACTOR_FAR = 0x0F, // focus on a targeted actor, further away than normal + BTL_CAM_ACTOR_GOAL_NEAR = 0x10, // unused, focus on a targeted actor's goal, closer than normal + BTL_CAM_ACTOR_GOAL = 0x11, // unused, focus on a targeted actor's goal, using typical distance + BTL_CAM_ACTOR_GOAL_FAR = 0x12, // unused, focus on a targeted actor's goal, further away than normal + BTL_CAM_REPOSITION = 0x13, // generic reposition, lerp to target parameters over the next 20 frames + BTL_CAM_FOLLOW_ACTOR_Y = 0x14, // unused + BTL_CAM_FOLLOW_ACTOR_POS = 0x15, // unused + BTL_CAM_PLAYER_ENTRY = 0x16, + BTL_CAM_VICTORY = 0x17, // closeup on party while star points are tallied + BTL_CAM_PLAYER_DIES = 0x18, // closeup on player dying + BTL_CAM_PLAYER_FLEE = 0x19, // closeup on player while running away + BTL_CAM_PLAYER_ATTACK_APPROACH = 0x1A, + BTL_CAM_PLAYER_PRE_JUMP_FINISH = 0x1B, + BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH = 0x1C, + BTL_CAM_PLAYER_MISTAKE = 0x1D, // player missed a jump or hammer acion command + BTL_CAM_PLAYER_HIT_SPIKE = 0x1E, // player hurt via spike contact + BTL_CAM_PLAYER_HIT_HAZARD = 0x1F, // player hurt via burn or shock contact + BTL_CAM_PLAYER_CHARGE_UP = 0x20, + BTL_CAM_PLAYER_STATUS_AFFLICTED = 0x21, + BTL_CAM_PLAYER_JUMP_MIDAIR = 0x22, // move through the air with the player mid-jump + BTL_CAM_PLAYER_JUMP_FINISH = 0x23, // after a sucessful action command + BTL_CAM_PLAYER_JUMP_FINISH_CLOSE = 0x24, // unused + BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR = 0x25, // alternate BTL_CAM_PLAYER_JUMP_MIDAIR associated with an unused script for Super Jump + BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR = 0x26, // alternate BTL_CAM_PLAYER_JUMP_MIDAIR associated with an unused script for Ultra Jump + BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP = 0x27, // unused camera for followup hit of unused script for Ultra Jump + BTL_CAM_PLAYER_MULTIBOUNCE = 0x28, + BTL_CAM_PRESET_UNUSED_29 = 0x29, // unused + BTL_CAM_PRESET_UNUSED_2A = 0x2A, // unused + BTL_CAM_PLAYER_AIM_HAMMER = 0x2B, + BTL_CAM_PLAYER_HAMMER_STRIKE = 0x2C, + BTL_CAM_PRESET_UNUSED_2D = 0x2D, // unused, alterative to BTL_CAM_PLAYER_HAMMER_QUAKE + BTL_CAM_PLAYER_HAMMER_QUAKE = 0x2E, // slowly pan over the enemy side + BTL_CAM_PARTNER_APPROACH = 0x2F, // used by Goombario and Watt (power shock only) + BTL_CAM_CLOSER_PARTNER_APPROACH = 0x30, + BTL_CAM_PRESET_UNUSED_31 = 0x31, // unused + BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1 = 0x32, // goombario pre-jump 1 + BTL_CAM_PARTNER_MISTAKE = 0x33, + BTL_CAM_PARTNER_MIDAIR = 0x34, + BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2 = 0x35, // goombario pre-jump 2 + BTL_CAM_PARTNER_INJURED = 0x36, // closeup on partner after being injured + BTL_CAM_PARTNER_GOOMPA = 0x37, // focus on Goompa speaking or Goombario charging + BTL_CAM_PRESET_UNUSED_38 = 0x38, // unused + BTL_CAM_PRESET_UNUSED_39 = 0x39, // unused + BTL_CAM_PRESET_UNUSED_3A = 0x3A, // unused + BTL_CAM_PARTNER_CLOSE_UP = 0x3B, // close focus on partner, used when kooper or sushie are charging an attack + BTL_CAM_PRESET_UNUSED_3C = 0x3C, // unused + BTL_CAM_PARTNER_HIT_SPIKE = 0x3D, // partner hurt via spike contact + BTL_CAM_PARTNER_HIT_HAZARD = 0x3E, // partner hurt via burn or shock contact + BTL_CAM_ENEMY_APPROACH = 0x3F, // (very common) + BTL_CAM_PRESET_UNUSED_40 = 0x40, // unused + BTL_CAM_SLOWER_DEFAULT = 0x41, // unused, same as BTL_CAM_DEFAULT but takes slightly longer + BTL_CAM_ENEMY_DIVE = 0x42, // used just before contact from dive attacks (paragoomba, para jr troopa, etc) + BTL_CAM_PRESET_UNUSED_43 = 0x43, // unused + BTL_CAM_PRESET_UNUSED_44 = 0x44, // unused + BTL_CAM_PLAYER_WISH = 0x45, // used for Focus and Star Spirit wishing + BTL_CAM_PRESET_UNUSED_46 = 0x46, // unused + BTL_CAM_PRESET_UNUSED_47 = 0x47, // unused + BTL_CAM_PRESET_UNUSED_48 = 0x48, // unused + BTL_CAM_STAR_SPIRIT = 0x49, +}; + +enum BattleCamTargetAdjustX { + BTL_CAM_XADJ_NONE = 0, // use actor X + BTL_CAM_XADJ_AVG = 1, // use average +}; + +enum BattleCamTargetAdjustY { + BTL_CAM_YADJ_SLIGHT = -2, // target y position is weighted 75% actor and 25% target: + BTL_CAM_YADJ_TARGET = -1, // use target Y + BTL_CAM_YADJ_NONE = 0, // use actor Y + BTL_CAM_YADJ_AVG = 1, // target y position is weighted 66% actor and 33% target: }; enum ModelAnimatorFlags { diff --git a/include/evt.h b/include/evt.h index 16b066ed0df..33d7f51c2fc 100644 --- a/include/evt.h +++ b/include/evt.h @@ -133,7 +133,7 @@ enum EventGroupFlags { EVT_GROUP_EF = 0xEF, // ~10 EVT_GROUP_01 = 0x01, EVT_GROUP_02 = 0x02, - EVT_GROUP_04 = 0x04, + EVT_GROUP_SHAKE_CAM = 0x04, EVT_GROUP_08 = 0x08, EVT_GROUP_10 = 0x10, }; diff --git a/include/functions.h b/include/functions.h index 8594e8dc5e2..ef68443c930 100644 --- a/include/functions.h +++ b/include/functions.h @@ -881,12 +881,12 @@ void draw_entity_model_D(s32, Mtx*, s32, Vec3s*); void draw_entity_model_E(s32, Mtx*); void free_entity_model_by_index(s32 idx); void btl_cam_use_preset(s32); -void btl_cam_set_params(s16, s16, s16, s16, s32, s32, s32, s32); +void btl_cam_set_params(b16, s16, s16, s16, s32, s32, s32, s32); void btl_cam_set_zoffset(s16); void btl_cam_target_actor(s32); void btl_cam_set_zoom(s16); void btl_cam_move(s16); -void func_8024E60C(void); +void btl_cam_disable_clamp_x(void); void initialize_battle(void); @@ -1035,7 +1035,7 @@ void set_background_size(s16, s16, s16, s16); void set_background(BackgroundHeader*); void set_max_star_power(s8); void sync_status_bar(void); -void create_cameras_a(void); +void create_cameras(void); void func_80045AC0(void); void func_8005AF84(void); void npc_follow_init(Npc*, s32, FollowAnims*, f32, f32, s32, s32); diff --git a/include/script_api/battle.h b/include/script_api/battle.h index cdf0f3825c1..3b82ac42e08 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -13,15 +13,15 @@ API_CALLABLE(EnablePartnerBlur); API_CALLABLE(DisablePartnerBlur); API_CALLABLE(UseBattleCamPreset); API_CALLABLE(SetBattleCamTarget); -API_CALLABLE(SetBattleCamOffsetZ); -API_CALLABLE(AddBattleCamOffsetZ); +API_CALLABLE(SetBattleCamOffsetY); +API_CALLABLE(AddBattleCamOffsetY); API_CALLABLE(SetBattleCamYaw); API_CALLABLE(BattleCamTargetActor); API_CALLABLE(MoveBattleCamOver); -API_CALLABLE(SetBattleCamZoom); -API_CALLABLE(AddBattleCamZoom); +API_CALLABLE(SetBattleCamDist); +API_CALLABLE(AddBattleCamDist); API_CALLABLE(FreezeBattleCam); -API_CALLABLE(func_8024EDA4); +API_CALLABLE(DisableBattleCamClampX); API_CALLABLE(ShowMessageBox); API_CALLABLE(ShowVariableMessageBox); API_CALLABLE(IsMessageBoxDisplayed); @@ -203,9 +203,9 @@ API_CALLABLE(PlayerPowerBounceEnemy); API_CALLABLE(PlayerTestEnemy); API_CALLABLE(DispatchDamagePlayerEvent); API_CALLABLE(EnablePlayerBlur); -API_CALLABLE(func_80274A18); -API_CALLABLE(func_802752AC); -API_CALLABLE(func_80275F00); +API_CALLABLE(PlayerBasicJumpToGoal); +API_CALLABLE(PlayerSuperJumpToGoal); +API_CALLABLE(PlayerUltraJumpToGoal); API_CALLABLE(GetPlayerActionSuccess); API_CALLABLE(BindTakeTurn); API_CALLABLE(PauseTakeTurn); @@ -271,28 +271,15 @@ API_CALLABLE(DeletePartner); API_CALLABLE(GetDamageIntensity); API_CALLABLE(AddEffectOffset); API_CALLABLE(LoadStarPowerScript); -API_CALLABLE(CamPresetUpdate_B); -API_CALLABLE(CamPresetUpdate_F); -API_CALLABLE(CamPresetUpdate_M); -API_CALLABLE(CamPresetUpdate_G); -API_CALLABLE(CamPresetUpdate_I); -API_CALLABLE(CamPresetUpdate_H); -API_CALLABLE(CamPresetUpdate_N); -API_CALLABLE(BattleCamImpl_Default); -API_CALLABLE(CamPresetUpdate_D); -API_CALLABLE(CamPresetUpdate_E); -API_CALLABLE(CamPresetUpdate_J); -API_CALLABLE(CamPresetUpdate_K); -API_CALLABLE(CamPresetUpdate_L); -API_CALLABLE(SetBattleCamPos); +API_CALLABLE(ForceBattleCamTarget); API_CALLABLE(SetBattleCamParam); API_CALLABLE(GetPartAnimNotify); API_CALLABLE(InitAnimatedModels); -API_CALLABLE(func_8024CE9C); -API_CALLABLE(func_802CAE50); +API_CALLABLE(BattleCam_Init); +API_CALLABLE(SetCamLookTarget); API_CALLABLE(func_802807D0); API_CALLABLE(PartnerYieldTurn); ///< YieldTurn copy -API_CALLABLE(func_8024ECF8); +API_CALLABLE(SetBattleCamTargetingModes); API_CALLABLE(UseBattleCamPresetImmediately); API_CALLABLE(UseBattleCamPresetWait); API_CALLABLE(HideHealthBar); @@ -302,7 +289,7 @@ API_CALLABLE(EnableBattleStatusBar); API_CALLABLE(PlayerYieldTurn); API_CALLABLE(ShowStartRecoveryShimmer); API_CALLABLE(ShowRecoveryShimmer); -API_CALLABLE(func_80273444); +API_CALLABLE(PlayerHopToGoal); API_CALLABLE(WaitForState); API_CALLABLE(SetBattleMenuEnabledFlags); API_CALLABLE(SetBattleState); @@ -333,8 +320,8 @@ extern EvtScript EVS_StartDefend; extern EvtScript EVS_RunAwayStart; extern EvtScript EVS_RunAwayFail; extern EvtScript EVS_PlayerDies; -extern EvtScript EVS_PlayEatFX; -extern EvtScript EVS_PlayDrinkFX; +extern EvtScript EVS_Unused_EatItem; +extern EvtScript EVS_Unused_DrinkItem; extern EvtScript EVS_UseLifeShroom; extern EvtScript EVS_MerleeRunOut; extern EvtScript EVS_MerleeAttackBonus; @@ -392,19 +379,5 @@ extern EvtScript Rumble_Unused_1; extern EvtScript Rumble_Unused_2; extern EvtScript Rumble_Unused_3; extern EvtScript Rumble_Unused_4; -extern EvtScript CamPreset_A; -extern EvtScript CamPreset_B; -extern EvtScript EVS_BattleCam_Default; -extern EvtScript CamPreset_D; -extern EvtScript CamPreset_E; -extern EvtScript CamPreset_F; -extern EvtScript CamPreset_G; -extern EvtScript CamPreset_H; -extern EvtScript CamPreset_I; -extern EvtScript CamPreset_J; -extern EvtScript CamPreset_K; -extern EvtScript CamPreset_L; -extern EvtScript CamPreset_M; -extern EvtScript CamPreset_N; #endif diff --git a/include/script_api/common.h b/include/script_api/common.h index b1ab50cb659..943ef1a07ed 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -214,25 +214,25 @@ API_CALLABLE(SetCamNoDraw); API_CALLABLE(SetCamPerspective); /// @evtapi -API_CALLABLE(func_802CA90C); +API_CALLABLE(SetCamUpdateMode); /// @evtapi -API_CALLABLE(func_802CA988); +API_CALLABLE(GrabCamera); /// @evtapi API_CALLABLE(SetCamViewport); /// @evtapi -API_CALLABLE(func_802CABE8); +API_CALLABLE(SetInterpCamParams); /// @evtapi -API_CALLABLE(func_802CACC0); +API_CALLABLE(SetNoInterpCamParams); /// @evtapi API_CALLABLE(SetCamBGColor); /// @evtapi -API_CALLABLE(func_802CAE50); +API_CALLABLE(SetCamLookTarget); /// @evtapi API_CALLABLE(SetCamTarget); diff --git a/src/43F0.c b/src/43F0.c index 07f3cdc6db9..0119af72786 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -611,23 +611,23 @@ f32 get_clamped_angle_diff(f32 a, f32 b) { } f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ) { - f32 xDiff = endX - startX; - f32 zDiff = endZ - startZ; - f32 absXDiff = fabsf(xDiff); - f32 absZDiff = fabsf(zDiff); + f32 dx = endX - startX; + f32 dz = endZ - startZ; + f32 absXDiff = fabsf(dx); + f32 absZDiff = fabsf(dz); f32 ret; if (absZDiff < absXDiff) { ret = (absZDiff / absXDiff) * 45.0f; ret *= sAtanFactors[round(2.0f * ret)]; - if (xDiff >= 0.0f) { - if (zDiff >= 0.0f) { + if (dx >= 0.0f) { + if (dz >= 0.0f) { return ret + 90.0f; } else { return 90.0f - ret; } } - if (zDiff >= 0.0f) { + if (dz >= 0.0f) { return 270.0f - ret; } else { return ret + 270.0f; @@ -638,13 +638,13 @@ f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ) { } ret = (absXDiff / absZDiff) * 45.0f; ret *= sAtanFactors[round(2.0f * ret)]; - if (zDiff >= 0.0f) { - if (xDiff >= 0.0f) { + if (dz >= 0.0f) { + if (dx >= 0.0f) { return 180.0f - ret; } else { return ret + 180.0f; } - } else if (!(xDiff >= 0.0f)) { + } else if (!(dx >= 0.0f)) { return 360.0f - ret; } } diff --git a/src/7B440.c b/src/7B440.c index bbfd6b76c7d..f13c427128f 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -111,7 +111,7 @@ void reset_player_status(void) { playerStatus->flipYaw[CAM_DEFAULT] = 0.0f; playerStatus->flipYaw[CAM_BATTLE] = 0.0f; playerStatus->flipYaw[CAM_TATTLE] = 0.0f; - playerStatus->flipYaw[CAM_3] = 0.0f; + playerStatus->flipYaw[CAM_HUD] = 0.0f; mapSettings = gAreas[gGameStatusPtr->areaID].maps[gGameStatusPtr->mapID].settings; diff --git a/src/background.c b/src/background.c index 1ee98bea972..f41c66c1d75 100644 --- a/src/background.c +++ b/src/background.c @@ -190,7 +190,7 @@ void appendGfx_background_texture(void) { } } - theta = clamp_angle(-cam->trueRot.x); + theta = clamp_angle(-cam->curBoomYaw); sinTheta = sin_deg(theta); cosTheta = cos_deg(theta); f5 = cosTheta * cam->lookAt_obj.x - sinTheta * cam->lookAt_obj.z + cam->leadAmount; diff --git a/src/battle/16C8E0.c b/src/battle/16C8E0.c index c6b99343258..af604984ace 100644 --- a/src/battle/16C8E0.c +++ b/src/battle/16C8E0.c @@ -854,7 +854,7 @@ void tattle_cam_pre_render(Camera* camera) { gDPPipeSync(gMainGfxPos++); gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); - guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); + guMtxF2L(cam->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCamID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } diff --git a/src/battle/190B20.c b/src/battle/190B20.c index e3aba6fe25b..a98acb4294b 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -6,7 +6,7 @@ #include "model.h" #include "sprite.h" -EvtScript D_80293820 = { +EvtScript EVS_ShakeBattleCamPitch = { Wait(LVar0) Loop(4) Call(SetBattleCamParam, 4, 11) @@ -1054,8 +1054,8 @@ void reset_actor_turn_info(void) { } } -void func_80263CC4(s32 arg0) { - start_script(&D_80293820, EVT_PRIORITY_A, 0)->varTable[0] = arg0; +void shake_battle_cam_pitch(s32 initialDelay) { + start_script(&EVS_ShakeBattleCamPitch, EVT_PRIORITY_A, 0)->varTable[0] = initialDelay; } void set_actor_anim(s32 actorID, s32 partID, AnimID animID) { diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 875c6fa0e78..c8721b1088b 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -162,7 +162,7 @@ void N(update)(void) { sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionQuality * 12); switch (partner->actorBlueprint->level) { - case 0: + case PARTNER_RANK_NORMAL: if (battleStatus->actionQuality >= D_802A9984_429CA4[battleStatus->unk_85]) { battleStatus->unk_85++; } @@ -171,7 +171,7 @@ void N(update)(void) { battleStatus->unk_85--; } break; - case 1: + case PARTNER_RANK_SUPER: if (battleStatus->actionQuality >= D_802A9994_429CB4[battleStatus->unk_85]) { battleStatus->unk_85++; } @@ -179,7 +179,7 @@ void N(update)(void) { battleStatus->unk_85--; } break; - case 2: + case PARTNER_RANK_ULTRA: if (battleStatus->actionQuality >= D_802A99A8_429CC8[battleStatus->unk_85]) { battleStatus->unk_85++; } diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index eab4041ff36..076a5ca0f8e 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -148,7 +148,7 @@ void N(update)(void) { battleStatus->actionQuality = actionCommandStatus->barFillLevel / 100; sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionQuality * 12); switch (partner->actorBlueprint->level) { - case 0: + case PARTNER_RANK_NORMAL: if (battleStatus->actionQuality >= D_802A9964_427334[battleStatus->unk_85]) { battleStatus->unk_85++; } @@ -156,7 +156,7 @@ void N(update)(void) { battleStatus->unk_85--; } break; - case 1: + case PARTNER_RANK_SUPER: if (battleStatus->actionQuality >= D_802A9974_427344[battleStatus->unk_85]) { battleStatus->unk_85++; } @@ -164,7 +164,7 @@ void N(update)(void) { battleStatus->unk_85--; } break; - case 2: + case PARTNER_RANK_ULTRA: if (battleStatus->actionQuality >= D_802A9988_427358[battleStatus->unk_85]) { battleStatus->unk_85++; } diff --git a/src/battle/actor_api.c b/src/battle/actor_api.c index c2c20eb5833..dc54a46b48c 100644 --- a/src/battle/actor_api.c +++ b/src/battle/actor_api.c @@ -2065,7 +2065,7 @@ API_CALLABLE(SummonEnemy) { if (does_script_exist(actor2->takeTurnScriptID)) { break; } - + enemyIDs = battleStatus->enemyIDs; if (battleStatus->nextEnemyIndex == 0) { numEnemies = 0; @@ -2168,7 +2168,7 @@ API_CALLABLE(GetPartAnimInstanceID) { s32 outVar = *args++; Actor* actor; ActorPart* part; - + if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } @@ -2436,7 +2436,7 @@ API_CALLABLE(ChooseNextTarget) { return ApiStatus_DONE2; } -s32 func_8026E558(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8026E558) { Bytecode* args = script->ptrReadPos; SelectableTarget* target; s32 mode; @@ -3015,7 +3015,7 @@ API_CALLABLE(ResetAllActorSounds) { return ApiStatus_DONE2; } -s32 SetActorSounds(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetActorSounds) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; @@ -3230,12 +3230,12 @@ API_CALLABLE(BoostAttack) { script->functionTempPtr[1] = actor; script->functionTemp[2] = attackBoost; - btl_cam_use_preset(BTL_CAM_PRESET_08); + btl_cam_use_preset(BTL_CAM_ACTOR_SIMPLE); btl_cam_set_zoffset(12); btl_cam_target_actor(actor->actorID); btl_cam_set_zoom(250); btl_cam_move(10); - func_8024E60C(); + btl_cam_disable_clamp_x(); if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { btl_cam_set_zoffset(0); } @@ -3273,7 +3273,7 @@ API_CALLABLE(BoostAttack) { case 1: if (script->functionTemp[3] == 0) { fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_REPOSITION); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3353,12 +3353,12 @@ API_CALLABLE(BoostDefense) { script->functionTempPtr[1] = actor; script->functionTemp[2] = defenseBoost; - btl_cam_use_preset(BTL_CAM_PRESET_08); + btl_cam_use_preset(BTL_CAM_ACTOR_SIMPLE); btl_cam_set_zoffset(12); btl_cam_target_actor(actor->actorID); btl_cam_set_zoom(250); btl_cam_move(10); - func_8024E60C(); + btl_cam_disable_clamp_x(); if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { btl_cam_set_zoffset(0); } @@ -3397,7 +3397,7 @@ API_CALLABLE(BoostDefense) { case 1: if (script->functionTemp[3] == 0) { fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_REPOSITION); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3475,12 +3475,12 @@ API_CALLABLE(VanishActor) { script->functionTemp[1] = (s32) actor; script->functionTemp[2] = vanished; - btl_cam_use_preset(BTL_CAM_PRESET_08); + btl_cam_use_preset(BTL_CAM_ACTOR_SIMPLE); btl_cam_set_zoffset(12); btl_cam_target_actor(actor->actorID); btl_cam_set_zoom(250); btl_cam_move(10); - func_8024E60C(); + btl_cam_disable_clamp_x(); if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { btl_cam_set_zoffset(0); } @@ -3508,7 +3508,7 @@ API_CALLABLE(VanishActor) { case 1: if (script->functionTemp[3] == 0) { fx_radial_shimmer(3, x, y, z, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_REPOSITION); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3581,12 +3581,12 @@ API_CALLABLE(ElectrifyActor) { script->functionTempPtr[1] = actor; script->functionTemp[2] = electrified; - btl_cam_use_preset(BTL_CAM_PRESET_08); + btl_cam_use_preset(BTL_CAM_ACTOR_SIMPLE); btl_cam_set_zoffset(12); btl_cam_target_actor(actor->actorID); btl_cam_set_zoom(250); btl_cam_move(10); - func_8024E60C(); + btl_cam_disable_clamp_x(); if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { btl_cam_set_zoffset(0); } @@ -3614,7 +3614,7 @@ API_CALLABLE(ElectrifyActor) { case 1: if (script->functionTemp[3] == 0) { fx_snaking_static(8, x, y, z, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_REPOSITION); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3691,11 +3691,11 @@ API_CALLABLE(HealActor) { script->functionTempPtr[1] = actor; script->functionTemp[2] = hpBoost; - btl_cam_use_preset(BTL_CAM_PRESET_08); + btl_cam_use_preset(BTL_CAM_ACTOR_SIMPLE); btl_cam_set_zoffset(12); btl_cam_target_actor(actor->actorID); btl_cam_move(10); - func_8024E60C(); + btl_cam_disable_clamp_x(); ApplyingBuff = TRUE; script->functionTemp[3] = 5; diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 70613f89ba4..09767be19fd 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -274,9 +274,9 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_SlamFist) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) + Call(SetBattleCamDist, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Set(LVar1, ANIM_BattleTubba_Anim06) ExecWait(N(EVS_DummyCheck)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) @@ -340,9 +340,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) @@ -364,9 +364,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EvtScript N(EVS_Attack_BodySlam) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) + Call(SetBattleCamDist, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Set(LVar1, ANIM_BattleTubba_Anim06) ExecWait(N(EVS_DummyCheck)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) @@ -447,9 +447,9 @@ EvtScript N(EVS_Attack_BodySlam) = { EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index 2df857e1b29..382c938b8ac 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -293,7 +293,7 @@ EvtScript N(EVS_HandleEvent) = { }; EvtScript N(EVS_FleeFromBattle) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(40) @@ -336,12 +336,12 @@ EvtScript N(EVS_TakeTurn) = { //@bug -- meant to OR 3 with value of AVAR_Flags, not PARTNER_BOW BitwiseOrConst(LVar0, AVAL_Flag_TauntBow | AVAL_Flag_HidStatusBar) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(40) Call(ActorSpeak, MSG_CH3_00C3, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_PARTNER) Call(MoveBattleCamOver, 25) Wait(25) @@ -371,7 +371,7 @@ EvtScript N(EVS_TakeTurn) = { Call(GetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, LVar0) IfEq(LVar0, 0) Call(SetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(40) @@ -412,7 +412,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim03) Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -507,10 +507,10 @@ EvtScript N(EVS_Attack_Leap) = { }; EvtScript N(EVS_Move_Charge) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 85, 50, 0) - Call(SetBattleCamZoom, 280) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 280) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Wait(40) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim0B) @@ -553,10 +553,10 @@ EvtScript N(EVS_Move_Charge) = { EvtScript N(EVS_Attack_DarkSwarm) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 85, 50, 0) - Call(SetBattleCamZoom, 280) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 280) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 20) Wait(20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) @@ -616,11 +616,11 @@ EvtScript N(EVS_Attack_DarkSwarm) = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 35) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 35) Call(MoveBattleCamOver, 50) Wait(56) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SQUEEZE) diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index f87ea73f547..7c629ec18f9 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -168,12 +168,12 @@ EvtScript N(EVS_HandlePhase) = { IfEq(LVar0, 0) Call(EnableBattleStatusBar, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_CaughtYouTaunt, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 75) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 380) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 380) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH3_0102, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim09, ANIM_BattleTubba_Anim02) Thread @@ -364,12 +364,12 @@ EvtScript N(EVS_TakeTurn) = { IfEq(LVar0, AVAL_Taunt_Ready) Call(EnableBattleStatusBar, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_InvunerableTaunt, AVAL_Taunt_Done) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 75) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 380) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 380) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 20) Wait(20) Call(ActorSpeak, MSG_CH3_0103, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim09, ANIM_BattleTubba_Anim02) @@ -402,9 +402,9 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_SlamFist) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) + Call(SetBattleCamDist, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) IfNotFlag(LVar5, STATUS_FLAG_SHRINK) @@ -463,9 +463,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) @@ -489,9 +489,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EvtScript N(EVS_Attack_BodySlam) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 180) + Call(SetBattleCamDist, 180) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -570,9 +570,9 @@ EvtScript N(EVS_Attack_BodySlam) = { EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Set(LVarF, LVar0) Switch(LVarF) diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 4b9ddbb0776..2b35c8b0fb1 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -259,9 +259,9 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_SlamFist) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) + Call(SetBattleCamDist, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) IfNotFlag(LVar5, STATUS_FLAG_SHRINK) @@ -338,9 +338,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EvtScript N(EVS_Attack_BodySlam) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 180) + Call(SetBattleCamDist, 180) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 042a760005f..034dfcf2096 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -1010,10 +1010,10 @@ EvtScript N(EVS_Dialogue_PummelPermission) = { Goto(1) // found a Tuff Puff to speak Label(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, LVar0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, LVar0, FALSE) @@ -1028,10 +1028,10 @@ EvtScript N(EVS_Dialogue_PummelPermission) = { Wait(20) // Huff N Puff replies Label(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 180) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -1048,10 +1048,10 @@ EvtScript N(EVS_Dialogue_PummelPermission) = { EvtScript N(EVS_Dialogue_FullPower) = { UseArray(N(RuffPuffDataBuffer)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 180) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -1076,8 +1076,8 @@ EvtScript N(EVS_Dialogue_FullPower) = { // found a Tuff Puff to speak Label(0) Call(BattleCamTargetActor, LVar0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(GetActorPos, LVar0, LVar1, LVar2, LVar3) @@ -1118,10 +1118,10 @@ EvtScript N(EVS_Dialogue_FullPower) = { EvtScript N(EVS_Dialogue_PraiseHuff) = { UseArray(N(RuffPuffDataBuffer)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 180) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -1146,8 +1146,8 @@ EvtScript N(EVS_Dialogue_PraiseHuff) = { // found a Tuff Puff to speak Label(0) Call(BattleCamTargetActor, LVar0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(GetActorPos, LVar0, LVar1, LVar2, LVar3) @@ -1187,10 +1187,10 @@ EvtScript N(EVS_Dialogue_PraiseHuff) = { EvtScript N(EVS_Dialogue_Concerned) = { UseArray(N(RuffPuffDataBuffer)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 180) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -1215,8 +1215,8 @@ EvtScript N(EVS_Dialogue_Concerned) = { // found a Tuff Puff to speak Label(0) Call(BattleCamTargetActor, LVar0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, LVar0, FALSE) @@ -1229,10 +1229,10 @@ EvtScript N(EVS_Dialogue_Concerned) = { Call(UseIdleAnimation, LVar0, TRUE) // Huff N Puff replies Label(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) - Call(SetBattleCamOffsetZ, -10) + Call(SetBattleCamDist, 180) + Call(SetBattleCamOffsetY, -10) Call(MoveBattleCamOver, 30) Wait(30) Call(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -1371,8 +1371,8 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(AddBattleCamZoom, -200) - Call(SetBattleCamOffsetZ, -30) + Call(AddBattleCamDist, -200) + Call(SetBattleCamOffsetY, -30) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0) @@ -1392,7 +1392,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Switch(LVar0) CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim0B) Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim0C) Call(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim0D) @@ -1541,7 +1541,7 @@ EvtScript N(EVS_RuffPuff_Inhale) = { #define HNP_LOAD_SUCTION_PATH(idx) \ CaseEq(idx) \ Call(LoadPath, 40, Ref(N(SuctionPaths)[idx]), 3, EASING_QUADRATIC_IN) - + // select the suction path for this Tuff Puff FOR_CHILDREN_ORDERED(HNP_LOAD_SUCTION_PATH) @@ -1720,12 +1720,12 @@ EvtScript N(EVS_Move_HurricaneBreath) = { Wait(15) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 20) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 20) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 180) Wait(90) Call(StopSound, SOUND_HUFF_N_PUFF_INHALE) @@ -1992,11 +1992,11 @@ EvtScript N(EVS_Move_ChargeForGround) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) ExecGetTID(N(EVS_UpdateChargedJitter), LVarA) Call(SetActorVar, ACTOR_SELF, AVAR_ChargedJitterScriptID, LVarA) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 5) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim11) Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim12) @@ -2027,11 +2027,11 @@ EvtScript N(EVS_Move_ChargeForGround) = { EvtScript N(EVS_Attack_GroundLightning) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 5) Call(MoveBattleCamOver, 60) Call(N(StartRumbleWithParams), 70, 100) Thread @@ -2136,11 +2136,11 @@ EvtScript N(EVS_Move_ChargeForDirect) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) ExecGetTID(N(EVS_UpdateChargedJitter), LVarA) Call(SetActorVar, ACTOR_SELF, AVAR_ChargedJitterScriptID, LVarA) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 5) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim11) Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim12) @@ -2173,10 +2173,10 @@ EvtScript N(EVS_Attack_DirectLightning) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(AddBattleCamZoom, -100) - Call(SetBattleCamOffsetZ, 50) + Call(AddBattleCamDist, -100) + Call(SetBattleCamOffsetY, 50) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(N(StartRumbleWithParams), 70, 80) Thread Call(ShakeCam, CAM_BATTLE, 0, 40, Float(0.3)) @@ -2373,11 +2373,11 @@ EvtScript N(EVS_Attack_GroupSlam) = { UseArray(N(RuffPuffDataBuffer)) Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 5) Call(MoveBattleCamOver, 30) Wait(30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_REAR_UP) @@ -2631,7 +2631,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { // have each Tuff Puff return to their home position FOR_CHILDREN_SCATTERED(HNP_RETURN_HOME) - + Call(SetGoalToHome, ACTOR_SELF) Call(FlyToGoal, ACTOR_SELF, 20, -10, EASING_SIN_OUT) Wait(15) @@ -2646,7 +2646,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { IfFlag(LVar0, 1 << idx) \ Add(LVarA, 1) \ EndIf - + // add 1 damage for each Tuff Puff FOR_CHILDREN_ORDERED(HNP_ADD_CHILD) @@ -2758,7 +2758,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_ChildBits, LVar0) - + #define HNP_SWARM_MOVE_UP(idx) \ IfFlag(LVar0, 1 << idx) \ Thread \ @@ -2781,7 +2781,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { IfFlag(LVar0, 1 << idx) \ Add(LVarA, 1) \ EndIf - + // count the number of Tuff Puffs to compute radial spacing around the player FOR_CHILDREN_ORDERED(HNP_ADD_CHILD) @@ -2790,11 +2790,11 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { DivF(LVarB, LVarA) Thread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 35) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 35) Call(MoveBattleCamOver, 60) EndThread Set(LVarA, 0) @@ -2838,17 +2838,17 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { // move each Tuff Puff to a position surrounding the player FOR_CHILDREN_SCATTERED(HNP_SWARM_SURROUND_PLAYER) - + Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Set(LVar9, 0) Call(GetActorVar, ACTOR_SELF, AVAR_ChildBits, LVar0) - + #define HNP_ADD_CHILD(idx) \ IfFlag(LVar0, 1 << idx) \ Add(LVar9, 1) \ EndIf - + // count the number of Tuff Puffs FOR_CHILDREN_ORDERED(HNP_ADD_CHILD) @@ -3081,7 +3081,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.5)) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 1) + Call(PlayerHopToGoal, 20, 0, 1) Else Wait(20) EndIf diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 2e359b014d7..dc5aeff59cf 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -246,7 +246,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index eae6c9b7352..aaa21cecc7c 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -168,8 +168,8 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 40) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Run) Call(SetGoalToTarget, ACTOR_SELF) @@ -183,10 +183,10 @@ EvtScript N(EVS_TakeTurn) = { Wait(5) Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 40) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, -10, 0, 0) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 0c552137cee..382386d1a54 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -378,11 +378,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -788,7 +788,7 @@ EvtScript N(EVS_Move_HealOne) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -868,7 +868,7 @@ EvtScript N(EVS_Move_HealAll) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1423,7 +1423,7 @@ EvtScript N(EVS_Move_MakeClone) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, LVarA, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 25) Wait(25) @@ -1539,7 +1539,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1652,7 +1652,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1765,7 +1765,7 @@ EvtScript N(EVS_Move_TryElectrify) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1883,7 +1883,7 @@ EvtScript N(EVS_Move_TryTransparent) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index 1cf2271d294..12f99813d3f 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -683,7 +683,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.5)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Set(LVar1, 0) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 1361960294c..dfaa775309b 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -609,9 +609,9 @@ EvtScript N(EVS_Attack_ThrowShell) = { Sub(LVar0, 1) Call(SetActorVar, ACTOR_SELF, AVAR_ShellsLeft, LVar0) // begin the attack - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 0) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActorPart, ACTOR_SELF, LVar9) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Run) Call(GetPartOffset, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2) @@ -696,9 +696,9 @@ EvtScript N(EVS_Attack_ThrowShell) = { }; EvtScript N(EVS_Attack_DropDebris) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 0) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -706,7 +706,7 @@ EvtScript N(EVS_Attack_DropDebris) = { Call(GetActorVar, ACTOR_SELF, AVAR_DebrisDropState, LVar0) IfEq(LVar0, 0) // first use only - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -961,14 +961,14 @@ EvtScript N(EVS_Move_SummonChomp) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar0) IfFalse(LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout) Call(ActorSpeak, MSG_CH2_00E6, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout, ANIM_Tutankoopa_Shout) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -978,16 +978,16 @@ EvtScript N(EVS_Move_SummonChomp) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Idle) Call(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - Call(SetBattleCamZoom, 225) - Call(SetBattleCamOffsetZ, -30) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) + Call(SetBattleCamDist, 225) + Call(SetBattleCamOffsetY, -30) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 35) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 35) Call(MoveBattleCamOver, 40) EndIf // open the gate @@ -1036,21 +1036,21 @@ EvtScript N(EVS_Move_SummonChomp) = { ExecWait(N(EVS_SummonedChompHop)) Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar5) IfFalse(LVar5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 160) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 160) Call(GetActorPos, LVarB, LVar0, LVar1, LVar2) Set(LVar1, 60) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(MoveBattleCamOver, 8) Loop(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 150) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 150) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(MoveBattleCamOver, 5) Wait(4) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_BITE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 200) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 200) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(MoveBattleCamOver, 5) Wait(4) @@ -1150,7 +1150,7 @@ EvtScript N(EVS_SummonedChompHop) = { EvtScript N(EVS_LevitateToHomePos) = { Call(SetActorVar, ACTOR_SELF, AVAR_Unknown, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_MAGIC) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Levitate) @@ -1194,7 +1194,7 @@ EvtScript N(EVS_GetBackUp) = { Wait(10) Call(GetActorVar, ACTOR_SELF, AVAR_Dialogue_Recover, LVar0) IfFalse(LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 9efe30c5bff..5df6b854022 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -319,8 +319,8 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_WindBlast) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(SetBattleCamZoom, 180) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) + Call(SetBattleCamDist, 180) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 120) Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) @@ -396,10 +396,10 @@ EvtScript N(EVS_Attack_WindBlast) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(action_command_whirlwind_start, 0, 88 * DT, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -25, 60, 0) - Call(SetBattleCamZoom, 460) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 460) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 50) Call(N(StartRumbleWithParams), 70, 130) Thread @@ -461,10 +461,10 @@ EvtScript N(EVS_Attack_WindBlast) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(action_command_whirlwind_start, 0, 88 * DT, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -25, 60, 0) - Call(SetBattleCamZoom, 460) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 460) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 50) Call(N(StartRumbleWithParams), 70, 130) Thread @@ -539,9 +539,9 @@ EvtScript N(EVS_Attack_FeatherFling) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 180) - Call(SetBattleCamOffsetZ, 0) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 180) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) @@ -649,7 +649,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { Call(SetPartFlagBits, ACTOR_SELF, PRT_FEATHER_3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EndThread Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Wait(10) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -661,7 +661,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EndCaseGroup CaseDefault EndSwitch - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Thread Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -791,7 +791,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 240) + Call(SetBattleCamDist, 240) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -819,9 +819,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, -10) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, -10) Call(BattleCamTargetActor, ACTOR_SELF) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -848,9 +848,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Return EndCaseGroup CaseEq(HIT_RESULT_IMMUNE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, -10) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, -10) Call(BattleCamTargetActor, ACTOR_SELF) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -898,13 +898,13 @@ EvtScript N(EVS_Attack_GrappleDrop) = { CaseDefault EndSwitch Wait(10) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 360) + Call(UseBattleCamPresetImmediately, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 360) Call(MoveBattleCamOver, 30) Thread Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 360) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 360) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Set(LVar1, 27) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -945,9 +945,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Call(SetupMashMeter, 1, 30, 0, 0, 0, 0) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim17) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, -10) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, -10) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 60) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) @@ -977,8 +977,8 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Call(UseIdleAnimation, ACTOR_SELF, TRUE) Return EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 360) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 360) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Set(LVar1, 50) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -1040,9 +1040,9 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 240) + Call(SetBattleCamDist, 240) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 60, 15, 0) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index fcbcb3d67ad..9f9986cd505 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -164,10 +164,10 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_Taunted, LVar0) IfFalse(LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Taunted, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 10) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 10) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_MAC_Port_009C, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04) @@ -412,7 +412,7 @@ EvtScript N(EVS_Floor_HandleEvent) = { ExecWait(EVS_Enemy_Recover) CaseEq(EVENT_RECEIVE_BUFF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim19) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(SetActorJumpGravity, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -590,7 +590,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) ExecWait(N(EVS_LeaveHome)) Call(SetActorYaw, ACTOR_SELF, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A) @@ -754,7 +754,7 @@ EvtScript N(EVS_Attack_DisableTackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) ExecWait(N(EVS_LeaveHome)) Call(SetActorYaw, ACTOR_SELF, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A) @@ -938,7 +938,7 @@ EvtScript N(EVS_Attack_DisableTackle) = { EvtScript N(EVS_Recover) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index fe47a72677c..247d4f981a2 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -265,7 +265,7 @@ API_CALLABLE(N(DropBlock)) { EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Wait(30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim07) @@ -276,9 +276,9 @@ EvtScript N(EVS_TakeTurn) = { Add(LVar1, 40) PlayEffect(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 100, 0) Wait(20) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 80, 95, 15) - Call(SetBattleCamZoom, 340) + Call(SetBattleCamDist, 340) Call(MoveBattleCamOver, 60) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_SUMMON_BLOCK) Sub(LVar0, 15) @@ -314,15 +314,15 @@ EvtScript N(EVS_TakeTurn) = { Wait(20) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim08) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -80, 37, 5) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 1) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) ChildThread Wait(10) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 10) Wait(5) Call(N(FadeOutScreenBlur)) @@ -368,10 +368,10 @@ EvtScript N(EVS_TakeTurn) = { EndSwitch Call(GetLastDamage, ACTOR_PARTNER, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 69, 14, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 20) Call(FreezeBattleCam, TRUE) Wait(20) @@ -399,26 +399,26 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_PlayerTurnCount, LVar0) Switch(LVar0) CaseEq(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 69, 14, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 20) Wait(20) Call(ActorSpeak, MSG_CH8_0093, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -56, -9, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 1) Wait(10) Call(ActorSpeak, MSG_CH8_0094, ACTOR_PARTNER, 1, ANIM_Twink_ShoutAngry, ANIM_Twink_Angry) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -66, -9, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 10) Wait(10) Call(ActorSpeak, MSG_CH8_0095, ACTOR_PLAYER, 1, ANIM_BattleParakarry_EnterShell, ANIM_BattleParakarry_ShellFly) @@ -441,10 +441,10 @@ EvtScript N(EVS_CommentOnHit) = { Call(GetActorHP, ACTOR_SELF, LVar0) Switch(LVar0) CaseEq(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 69, 14, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 20) Call(FreezeBattleCam, TRUE) Wait(20) @@ -454,10 +454,10 @@ EvtScript N(EVS_CommentOnHit) = { Call(UseBattleCamPreset, BTL_CAM_DEFAULT) CaseOrEq(9) CaseOrEq(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 69, 14, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 20) Call(FreezeBattleCam, TRUE) Wait(20) @@ -477,10 +477,10 @@ EvtScript N(EVS_CommentOnHit) = { IfEq(LVar0, 2) BreakSwitch EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 69, 14, -18) - Call(SetBattleCamZoom, 340) - Call(SetBattleCamOffsetZ, 62) + Call(SetBattleCamDist, 340) + Call(SetBattleCamOffsetY, 62) Call(MoveBattleCamOver, 20) Call(FreezeBattleCam, TRUE) Wait(20) @@ -501,7 +501,7 @@ EvtScript N(EVS_CommentOnHit) = { EvtScript N(EVS_Death) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(HideHealthBar, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 60) Wait(10) @@ -517,7 +517,7 @@ EvtScript N(EVS_Death) = { Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index 2c232da0960..6bdf2223c1f 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -305,7 +305,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -483,7 +483,7 @@ EvtScript N(EVS_Init) = { EvtScript N(EVS_TakeTurn) = { Call(GetActorVar, ACTOR_SELF, AVAR_UsedTaunt, LVar0) IfEq(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -525,7 +525,7 @@ EvtScript N(EVS_GoombaBros_Death) = { Call(GetActorHP, ACTOR_RED_GOOMBA, LVar0) EndIf IfNe(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_RED_GOOMBA) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c index c88cbc12671..bd4476ba66f 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c @@ -296,7 +296,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index 1adef892bc3..1a40949d10b 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -387,17 +387,17 @@ EvtScript N(EVS_Attack_SpinSwipe) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(AddBattleCamZoom, -100) - Call(SetBattleCamOffsetZ, 20) + Call(AddBattleCamDist, -100) + Call(SetBattleCamOffsetY, 20) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(AddBattleCamZoom, -100) + Call(AddBattleCamDist, -100) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetStatusFlags, ACTOR_SELF, LVar0) @@ -480,11 +480,11 @@ EvtScript N(EVS_Attack_SpinSwipe) = { }; EvtScript N(EVS_Attack_GroundStomp) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(15) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Angry) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -661,7 +661,7 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, LVar0) IfEq(LVar0, FALSE) Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_RED_GOOMBA) Call(MoveBattleCamOver, 20) Wait(20) @@ -670,7 +670,7 @@ EvtScript N(EVS_HandlePhase) = { Call(ActorSpeak, MSG_CH0_00CB, ACTOR_RED_GOOMBA, PRT_MAIN, ANIM_GoombaBros_Red_Talk, ANIM_GoombaBros_Red_Talk) Call(EnableIdleScript, ACTOR_RED_GOOMBA, IDLE_SCRIPT_ENABLE) Call(UseIdleAnimation, ACTOR_RED_GOOMBA, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA) Call(MoveBattleCamOver, 10) Wait(10) @@ -679,13 +679,13 @@ EvtScript N(EVS_HandlePhase) = { Call(ActorSpeak, MSG_CH0_00CC, ACTOR_BLUE_GOOMBA, PRT_MAIN, ANIM_GoombaBros_Blue_Talk, ANIM_GoombaBros_Blue_Talk) Call(EnableIdleScript, ACTOR_BLUE_GOOMBA, IDLE_SCRIPT_ENABLE) Call(UseIdleAnimation, ACTOR_BLUE_GOOMBA, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_KING) Call(MoveBattleCamOver, 20) Wait(20) Call(ActorSpeak, MSG_CH0_00CD, ACTOR_KING, PRT_MAIN, ANIM_GoombaKing_Angry, ANIM_GoombaKing_Angry) Call(SetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_PLAYER) Call(MoveBattleCamOver, 10) Wait(10) diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 6094749634e..a575cc5252d 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -358,7 +358,7 @@ EvtScript N(EVS_DropNutOnGoombas) = { IfNe(LVar0, FALSE) Return EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) Call(BattleCamTargetActor, ACTOR_KING) Wait(20) Call(SetActorVar, ACTOR_SELF, AVAR_BigNutDropped, TRUE) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_1.c b/src/battle/area/kmr_part_2/actor/red_goomba_1.c index 14e96d6fe07..9469809a83b 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_1.c @@ -303,7 +303,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -507,7 +507,7 @@ EvtScript N(EVS_GoombaBros_Death) = { Call(GetActorHP, ACTOR_BLUE_GOOMBA, LVar0) EndIf IfNe(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_2.c b/src/battle/area/kmr_part_2/actor/red_goomba_2.c index 9f904c5e0e1..50343965b0f 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_2.c @@ -296,7 +296,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index c96495da802..cba60078fe5 100644 --- a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -126,10 +126,10 @@ ActorBlueprint NAMESPACE = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 38) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamOffsetY, 38) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 15) Return End @@ -146,7 +146,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -193,9 +193,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) @@ -399,7 +399,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run) Call(SetActorSpeed, ACTOR_SELF, Float(8.0)) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index 8e3c8af75fe..7c01a41d01a 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -320,10 +320,10 @@ EvtScript N(EVS_TransformFX) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 38) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamOffsetY, 38) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 15) Return End @@ -340,7 +340,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -387,9 +387,9 @@ EvtScript N(EVS_JrTroopa_BaseDeath) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) @@ -596,7 +596,7 @@ EvtScript N(EVS_TakeTurn) = { IfNotFlag(LVar0, AVAL_Dialogue_LowHP) BitwiseOrConst(LVar0, AVAL_Dialogue_LowHP) Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(GetActorVar, ACTOR_SELF, AVAR_Form, LVar0) @@ -653,7 +653,7 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Transform_Flying) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH8_005E, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_TiredTalk) @@ -681,7 +681,7 @@ EvtScript N(EVS_Transform_Flying) = { EvtScript N(EVS_Transform_Mage) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH8_005F, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_Talk, ANIM_SpikedParaJrTroopa_Talk) @@ -716,7 +716,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Run) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -861,7 +861,7 @@ EvtScript N(EVS_Attack_Swoop) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_FlyFast) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -872,8 +872,8 @@ EvtScript N(EVS_Attack_Swoop) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -912,8 +912,8 @@ EvtScript N(EVS_Attack_Swoop) = { CaseDefault EndSwitch Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -954,7 +954,7 @@ EvtScript N(EVS_Attack_SpikeDive) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -1323,7 +1323,7 @@ EvtScript N(EVS_Move_HealSelf) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -1390,7 +1390,7 @@ EvtScript N(EVS_HandlePhase) = { IfNotFlag(LVar0, AVAL_Dialogue_Begin) BitwiseOrConst(LVar0, AVAL_Dialogue_Begin) Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH8_005D, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTalk) @@ -1509,9 +1509,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) @@ -1562,9 +1562,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 8636be966ba..07b2a3186d6 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -114,10 +114,10 @@ ActorBlueprint NAMESPACE = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 38) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamOffsetY, 38) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 15) Return End @@ -134,7 +134,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -181,9 +181,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) @@ -314,7 +314,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run) Call(SetActorSpeed, ACTOR_SELF, Float(8.0)) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 231c831ac2c..9a0ce3a0022 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -215,10 +215,10 @@ EvtScript N(EVS_Transform) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 38) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamOffsetY, 38) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 15) Return End @@ -235,7 +235,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -589,9 +589,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index edb674a1c6d..92d88510c34 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -194,10 +194,10 @@ EvtScript N(EVS_Transform) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 38) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamOffsetY, 38) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 15) Return End @@ -214,7 +214,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -406,7 +406,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ParaJrTroopa_FlyFast) Call(SetGoalToTarget, ACTOR_SELF) @@ -418,8 +418,8 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -457,8 +457,8 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -514,9 +514,9 @@ EvtScript N(EVS_HandlePhase) = { IfFalse(LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Transformed, TRUE) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 35) + Call(SetBattleCamOffsetY, 35) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_CH3_0020, ACTOR_SELF, PRT_FLYING, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot) @@ -580,9 +580,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index a1d4879af5a..732d78f8b03 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -193,10 +193,10 @@ EvtScript N(EVS_Transform) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 38) - Call(SetBattleCamZoom, 256) + Call(SetBattleCamOffsetY, 38) + Call(SetBattleCamDist, 256) Call(MoveBattleCamOver, 15) Return End @@ -213,7 +213,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -459,7 +459,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_SpikedParaJrTroopa_FlyFast) Call(SetGoalToTarget, ACTOR_SELF) @@ -471,8 +471,8 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -510,8 +510,8 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -589,9 +589,9 @@ EvtScript N(EVS_HandlePhase) = { IfFalse(LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_LostHalfHP, TRUE) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 35) + Call(SetBattleCamOffsetY, 35) Call(MoveBattleCamOver, 30) Wait(20) Call(ActorSpeak, MSG_MAC_Port_00B8, ACTOR_SELF, PRT_FLYING, ANIM_JrTroopa_OutOfBreath, ANIM_JrTroopa_OutOfBreath) @@ -688,9 +688,9 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 260) - Call(SetBattleCamOffsetZ, 15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 260) + Call(SetBattleCamOffsetY, 15) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c index 24dbef08cb1..959b29b0dff 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -383,7 +383,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -395,10 +395,10 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -445,10 +445,10 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c index 8f8825fb148..f55a340f34f 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c @@ -311,7 +311,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/area/kpa2/actor/final_bowser_1.c b/src/battle/area/kpa2/actor/final_bowser_1.c index 47883410fd2..4aa9030eb94 100644 --- a/src/battle/area/kpa2/actor/final_bowser_1.c +++ b/src/battle/area/kpa2/actor/final_bowser_1.c @@ -337,17 +337,17 @@ EvtScript N(EVS_HandleEvent) = { PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.5), 20, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, LVar4) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_CH8_0085, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock, ANIM_BattleBowser_Mock) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_PLAYER) Call(MoveBattleCamOver, 20) Wait(20) @@ -608,22 +608,22 @@ EvtScript N(EVS_Recover) = { Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 97) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 39) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 294) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 294) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) @@ -683,22 +683,22 @@ EvtScript N(EVS_TakeTurn_Inner) = { IfEq(LVar0, 2) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 90) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 36) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) EndIf Call(ActorSpeak, MSG_CH8_0084, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock, ANIM_BattleBowser_Mock) @@ -877,18 +877,18 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 54) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 54) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, 21) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, 21) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1097,17 +1097,17 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 160) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 160) + Call(SetBattleCamOffsetY, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1182,22 +1182,22 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 24) Add(LVar1, 97) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 9) Add(LVar1, 39) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 375) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 375) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) @@ -1221,10 +1221,10 @@ EvtScript N(EVS_UseDrainingShockwave) = { PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, Float(0.4), LVarE, 0) EndIf Wait(25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -45, 60, 0) - Call(SetBattleCamZoom, 530) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 530) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 80) Wait(10) Call(RemoveEffect, LVarF) @@ -1329,20 +1329,20 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 81) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 56) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) + Call(SetBattleCamDist, 350) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) @@ -1541,7 +1541,7 @@ EvtScript N(EVS_BurnHit) = { EvtScript N(EVS_Attack_LightningBlast) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/kpa2/actor/final_bowser_2.c b/src/battle/area/kpa2/actor/final_bowser_2.c index 8f3f33877a2..eb59d34e3f9 100644 --- a/src/battle/area/kpa2/actor/final_bowser_2.c +++ b/src/battle/area/kpa2/actor/final_bowser_2.c @@ -298,22 +298,22 @@ EvtScript N(EVS_HandlePhase) = { Call(EnableBattleStatusBar, FALSE) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 90) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 36) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) EndIf Call(ActorSpeak, MSG_CH8_00A6, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) @@ -334,22 +334,22 @@ EvtScript N(EVS_HandlePhase) = { Call(EnableBattleStatusBar, FALSE) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 90) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 36) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) EndIf Call(ActorSpeak, MSG_CH8_00A8, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) @@ -500,13 +500,13 @@ EvtScript N(EVS_HandleEvent) = { Else Set(LVar3, 36) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, LVar3) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_00A7, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -542,22 +542,22 @@ EvtScript N(EVS_Death) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 67) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 15) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 27) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 15) EndIf Wait(30) @@ -642,22 +642,22 @@ EvtScript N(EVS_Death) = { Call(SetActorSize, ACTOR_SELF, 52, 115) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 45) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 18) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(ActorSpeak, MSG_CH8_00A9, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_DefeatedTalk, ANIM_BattleBowser_DefeatedIdle) @@ -868,22 +868,22 @@ EvtScript N(EVS_Recover) = { Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 97) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 39) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 294) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 294) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) @@ -1111,18 +1111,18 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 54) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 54) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, 21) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, 21) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1331,17 +1331,17 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 160) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 160) + Call(SetBattleCamOffsetY, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1416,22 +1416,22 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 24) Add(LVar1, 97) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 9) Add(LVar1, 39) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 375) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 375) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) @@ -1455,10 +1455,10 @@ EvtScript N(EVS_UseDrainingShockwave) = { PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, Float(0.4), LVarE, 0) EndIf Wait(25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -45, 60, 0) - Call(SetBattleCamZoom, 530) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 530) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 80) Wait(10) Call(RemoveEffect, LVarF) @@ -1563,20 +1563,20 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 81) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 56) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) + Call(SetBattleCamDist, 350) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) @@ -1775,7 +1775,7 @@ EvtScript N(EVS_BurnHit) = { EvtScript N(EVS_Attack_LightningBlast) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/kpa2/actor/hallway_bowser.c b/src/battle/area/kpa2/actor/hallway_bowser.c index 88bb675f83a..e8b58ad1522 100644 --- a/src/battle/area/kpa2/actor/hallway_bowser.c +++ b/src/battle/area/kpa2/actor/hallway_bowser.c @@ -246,7 +246,7 @@ EvtScript N(EVS_HandlePhase) = { BitwiseOrConst(LVar0, AVAL_Flag_InitialTaunt) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -300,7 +300,7 @@ EvtScript N(EVS_HandleEvent) = { Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) @@ -412,7 +412,7 @@ EvtScript N(EVS_HandleEvent) = { BitwiseOrConst(LVar0, AVAL_Flag_StarBeamRemark) BitwiseOrConst(LVar0, AVAL_Flag_HasBeenDisenchanted) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_0075, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt) @@ -461,7 +461,7 @@ EvtScript N(EVS_BasicHit) = { IfNotFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) Call(FreezeBattleCam, TRUE) ExecWait(N(EVS_Hit)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) @@ -567,7 +567,7 @@ EvtScript N(EVS_Move_UseStarRod) = { IfNotFlag(LVar0, AVAL_Flag_UsedStarRod) BitwiseOrConst(LVar0, AVAL_Flag_UsedStarRod) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -762,22 +762,22 @@ EvtScript N(EVS_Recover) = { Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 26) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 294) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 294) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) @@ -837,22 +837,22 @@ EvtScript N(EVS_TakeTurn_Inner) = { IfEq(LVar0, 2) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 60) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 24) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) EndIf ExecWait(N(EVS_Move_UseStarRod)) @@ -1029,18 +1029,18 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 36) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 36) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, 14) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, 14) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1249,17 +1249,17 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 160) - Call(SetBattleCamOffsetZ, 5) + Call(SetBattleCamDist, 160) + Call(SetBattleCamOffsetY, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1336,22 +1336,22 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 24) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 420) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 420) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 9) Add(LVar1, 26) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 250) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 250) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) @@ -1375,10 +1375,10 @@ EvtScript N(EVS_UseDrainingShockwave) = { PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, Float(0.4), LVarE, 0) EndIf Wait(25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -45, 60, 0) - Call(SetBattleCamZoom, 530) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 530) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 80) Wait(10) Call(RemoveEffect, LVarF) @@ -1483,20 +1483,20 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 45) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) + Call(SetBattleCamDist, 350) Call(MoveBattleCamOver, 40) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) diff --git a/src/battle/area/kpa2/actor/intro_bowser.c b/src/battle/area/kpa2/actor/intro_bowser.c index 07cbb9beff1..cc7ce15566e 100644 --- a/src/battle/area/kpa2/actor/intro_bowser.c +++ b/src/battle/area/kpa2/actor/intro_bowser.c @@ -199,10 +199,10 @@ EvtScript N(EVS_HandlePhase) = { IfEq(LVar0, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_PeachSpoke, TRUE) Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -115, 0, 0) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 50) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 50) Call(MoveBattleCamOver, 20) Wait(20) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) @@ -328,7 +328,7 @@ EvtScript N(EVS_TakeTurn) = { CaseEq(4) ExecWait(N(EVS_Attack_ClawSwipe)) CaseEq(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -342,10 +342,10 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_ClawSwipe) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 200) + Call(SetBattleCamDist, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 40, 0, 0) @@ -401,13 +401,13 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EvtScript N(EVS_Attack_FireBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) Wait(35) @@ -466,18 +466,18 @@ EvtScript N(EVS_Attack_FireBreath) = { }; EvtScript N(EVS_UseStarRod) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_Intro_0058, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 20) Wait(20) Thread @@ -494,13 +494,13 @@ EvtScript N(EVS_UseStarRod) = { Call(SetGoalToTarget, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) ExecWait(N(EVS_StarRodCast)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 25) Call(ActorSpeak, MSG_Intro_005A, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock, ANIM_BattleBowser_RearUpStill) Call(SetDefenseTable, ACTOR_SELF, PRT_MAIN, Ref(N(BoostedDefense))) @@ -618,13 +618,13 @@ EvtScript N(EVS_StarRodCast) = { EndIf PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.0), 15, 0) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 32) Wait(32) Return diff --git a/src/battle/area/kpa2/actor/unused_bowser.c b/src/battle/area/kpa2/actor/unused_bowser.c index c32a011e985..5f173cb90ee 100644 --- a/src/battle/area/kpa2/actor/unused_bowser.c +++ b/src/battle/area/kpa2/actor/unused_bowser.c @@ -279,8 +279,8 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 150) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) @@ -290,7 +290,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) Wait(25) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) Wait(3) Call(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) @@ -341,8 +341,8 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 150) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) @@ -350,7 +350,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(AddGoalPos, ACTOR_SELF, 80, 0, 0) Call(SetActorSpeed, ACTOR_SELF, Float(3.0)) Call(RunToGoal, ACTOR_SELF, 0, FALSE) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreJump) @@ -436,8 +436,8 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 150) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 150) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) @@ -504,7 +504,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 8f97eadedff..084b368558b 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -246,13 +246,13 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Fire) Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) Wait(1) Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) Wait(15) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) + Call(UseBattleCamPresetImmediately, BTL_CAM_REPOSITION) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) CaseOrEq(HIT_RESULT_MISS) diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index 614dfeb4dae..4d6d62b5a81 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -402,16 +402,16 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) IfEq(LVar0, VINE_1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 40, 30, 0) - Call(SetBattleCamZoom, 270) - Call(SetBattleCamOffsetZ, 20) + Call(SetBattleCamDist, 270) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 110, 35, 0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 20) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 30) EndIf Wait(30) @@ -480,10 +480,10 @@ EvtScript N(EVS_Move_SummonPetit) = { Thread Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 30) Wait(45) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -811,10 +811,10 @@ EvtScript N(EVS_Attack_SpitPetit) = { Wait(8) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar1, 25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 30) Wait(45) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 414db3054be..337fe96d83b 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -1140,10 +1140,10 @@ EvtScript N(EVS_TakeTurn) = { Call(SetActorVar, ACTOR_SELF, AVAR_Common_StunTurnsLeft, LVar0) IfLe(LVar0, 0) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 80, 70, 0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 30) Wait(30) Loop(10) @@ -1188,10 +1188,10 @@ EvtScript N(EVS_Attack_SpitFire) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Thread Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 80, 70, 0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 45) Wait(57) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -1270,10 +1270,10 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Thread Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 80, 70, 0) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 45) Wait(54) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -1415,10 +1415,10 @@ EvtScript N(EVS_Death) = { Call(GetActorVar, ACTOR_BUD_2, AVAR_Bud_WhichVine, LVar0) Call(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) Call(CancelEnemyTurn, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 90, 90, 0) - Call(SetBattleCamZoom, 360) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 360) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 240) Call(OverrideBattleDmaDest, VINE_0_BASE) Call(LoadBattleDmaData, VINE_ANIM_BOSS_DEATH_BEGIN) @@ -1508,10 +1508,10 @@ EvtScript N(EVS_Death) = { EndLoop EndThread Wait(35) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 90, 90, 0) - Call(SetBattleCamZoom, 360) - Call(SetBattleCamOffsetZ, -45) + Call(SetBattleCamDist, 360) + Call(SetBattleCamOffsetY, -45) Call(MoveBattleCamOver, 110) Wait(60) Call(SetAnimatedModelRootPosition, VINE_0, 0, -250, 0) @@ -1522,11 +1522,11 @@ EvtScript N(EVS_Death) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) Call(ForceHomePos, ACTOR_SELF, 61, 61, 0) Wait(65) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 240) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 240) + Call(SetBattleCamOffsetY, 40) Call(MoveBattleCamOver, 20) Wait(20) Thread @@ -1550,16 +1550,16 @@ EvtScript N(EVS_Death) = { Add(LVar1, 10) PlayEffect(EFFECT_EMOTE, EMOTE_QUESTION, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) Wait(50) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 90, 90, 0) - Call(SetBattleCamZoom, 360) - Call(SetBattleCamOffsetZ, -60) + Call(SetBattleCamDist, 360) + Call(SetBattleCamOffsetY, -60) Call(MoveBattleCamOver, 30) Wait(40) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 90, 90, 0) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, -60) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, -60) Call(MoveBattleCamOver, 40) Wait(40) Thread @@ -1568,10 +1568,10 @@ EvtScript N(EVS_Death) = { Wait(40) Call(UseIdleAnimation, ACTOR_PLAYER, TRUE) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 30, 90, 0) - Call(SetBattleCamZoom, 460) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 460) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) Call(N(StartRumbleWithParams), 180, 16) Thread @@ -1580,10 +1580,10 @@ EvtScript N(EVS_Death) = { EndThread ChildThread Wait(50) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 90, 90, 0) - Call(SetBattleCamZoom, 360) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 360) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 40) Wait(85) EndChildThread diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index a572a6c6cfc..b4a637ecb66 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -260,9 +260,9 @@ EvtScript N(EVS_TakeTurn) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) IfGe(LVar1, 41) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 380) - Call(SetBattleCamOffsetZ, -20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 380) + Call(SetBattleCamOffsetY, -20) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -275,9 +275,9 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(FlyToGoal, ACTOR_SELF, 20, -12, EASING_LINEAR) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 380) - Call(SetBattleCamOffsetZ, 0) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 380) + Call(SetBattleCamOffsetY, 0) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index 184ded55e9d..0e7cae875b3 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -585,7 +585,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(HPBarToHome, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -607,11 +607,11 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_FALL_QUICK, 0) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 430) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 430) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -742,7 +742,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_EnterShell) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ShellStill) @@ -774,7 +774,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 7d554aa9e46..84495e4f691 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -355,7 +355,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch) Wait(20) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) @@ -601,7 +601,7 @@ API_CALLABLE(N(AdjustFormationPriority)) { EvtScript N(EVS_Move_CopyPartner) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/area/mac/actor/lee_bow.inc.c b/src/battle/area/mac/actor/lee_bow.inc.c index 9db5c1bdd9f..1deb1bb2ec9 100644 --- a/src/battle/area/mac/actor/lee_bow.inc.c +++ b/src/battle/area/mac/actor/lee_bow.inc.c @@ -250,7 +250,7 @@ EvtScript N(EVS_TakeTurn) = { EndLoop EndThread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Thread @@ -265,7 +265,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) EndThread Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Set(LVar0, 55) diff --git a/src/battle/area/mac/actor/lee_goombario.inc.c b/src/battle/area/mac/actor/lee_goombario.inc.c index 36598734149..baa8d1b941b 100644 --- a/src/battle/area/mac/actor/lee_goombario.inc.c +++ b/src/battle/area/mac/actor/lee_goombario.inc.c @@ -271,7 +271,7 @@ EvtScript N(EVS_HeadbonkFollowthrough) = { EvtScript N(EVS_ApproachPlayer) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -525,7 +525,7 @@ EvtScript N(EVS_Move_Tattle) = { // enable the tattle viewport Call(SetCamEnabled, CAM_TATTLE, TRUE) Call(SetCamNoDraw, CAM_TATTLE, FALSE) - Call(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024) + Call(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_NO_INTERP, 25, 16, 1024) Call(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -533,8 +533,8 @@ EvtScript N(EVS_Move_Tattle) = { Set(LVar1, 0) Call(N(CalculateTattleCamBoomLength)) Wait(1) - Call(func_802CAE50, CAM_TATTLE, LVar0, LVar1, LVar2) - Call(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) + Call(SetCamLookTarget, CAM_TATTLE, LVar0, LVar1, LVar2) + Call(SetInterpCamParams, CAM_TATTLE, 0, LVar3, 100, 4) Wait(2) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TATTLE_WINDOW_OPEN) Call(SetCamNoDraw, CAM_TATTLE, TRUE) diff --git a/src/battle/area/mac/actor/lee_kooper.inc.c b/src/battle/area/mac/actor/lee_kooper.inc.c index bdc51866b27..593b13ec4e9 100644 --- a/src/battle/area/mac/actor/lee_kooper.inc.c +++ b/src/battle/area/mac/actor/lee_kooper.inc.c @@ -349,10 +349,10 @@ EvtScript N(EVS_TakeTurn) = { Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 75) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar0) Switch(LVar0) CaseEq(PARTNER_RANK_NORMAL) diff --git a/src/battle/area/mac/actor/lee_lakilester.inc.c b/src/battle/area/mac/actor/lee_lakilester.inc.c index e9748416bdd..096fe81d734 100644 --- a/src/battle/area/mac/actor/lee_lakilester.inc.c +++ b/src/battle/area/mac/actor/lee_lakilester.inc.c @@ -228,7 +228,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) diff --git a/src/battle/area/mac/actor/lee_parakarry.inc.c b/src/battle/area/mac/actor/lee_parakarry.inc.c index 1d60ebfec17..c59b1d30c1d 100644 --- a/src/battle/area/mac/actor/lee_parakarry.inc.c +++ b/src/battle/area/mac/actor/lee_parakarry.inc.c @@ -231,7 +231,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 20, 0, 0) @@ -239,7 +239,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Still) Wait(3) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) + Call(UseBattleCamPresetImmediately, BTL_CAM_INTERRUPT) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_PREDIVE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) diff --git a/src/battle/area/mac/actor/lee_sushie.inc.c b/src/battle/area/mac/actor/lee_sushie.inc.c index 60f47b03861..9c7670547d3 100644 --- a/src/battle/area/mac/actor/lee_sushie.inc.c +++ b/src/battle/area/mac/actor/lee_sushie.inc.c @@ -210,7 +210,7 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -227,11 +227,11 @@ EvtScript N(EVS_TakeTurn) = { Call(RunToGoal, ACTOR_SELF, LVarA, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(AddBattleCamZoom, -50) + Call(AddBattleCamDist, -50) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense1) Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) diff --git a/src/battle/area/mac/actor/lee_watt.inc.c b/src/battle/area/mac/actor/lee_watt.inc.c index aff8a51e476..38228fc2444 100644 --- a/src/battle/area/mac/actor/lee_watt.inc.c +++ b/src/battle/area/mac/actor/lee_watt.inc.c @@ -338,13 +338,13 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 40) Call(MoveBattleCamOver, 80) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Run) @@ -390,9 +390,9 @@ EvtScript N(EVS_TakeTurn) = { EndSwitch Call(N(WattFXSetActive), 0) Set(LVarA, 40) - Call(AddBattleCamZoom, -75) + Call(AddBattleCamDist, -75) Call(MoveBattleCamOver, LVarA) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfFlag(LVar0, STATUS_FLAG_SHRINK) @@ -417,7 +417,7 @@ EvtScript N(EVS_TakeTurn) = { EndLoop Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Idle) Call(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_IDLE) - Call(AddBattleCamZoom, 75) + Call(AddBattleCamDist, 75) Call(MoveBattleCamOver, 5) Thread Wait(2) diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index 9e9651e8366..29ea725d130 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -236,7 +236,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 8b076db4720..4d0c5366772 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -248,7 +248,7 @@ EvtScript N(EVS_Attack_StrikeOnce) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -349,15 +349,15 @@ EvtScript N(EVS_Attack_StrikeOnce) = { EvtScript N(EVS_Attack_StrikeTwice) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 13) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 13) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Wait(40) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 1) Wait(10) @@ -501,7 +501,7 @@ EvtScript N(EVS_HandlePhase) = { CaseEq(PHASE_PLAYER_BEGIN) Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0) IfEq(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Wait(10) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 2f8a1d61dca..3fb6905fe50 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Attack_StrikeOnce) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -381,15 +381,15 @@ EvtScript N(EVS_Attack_StrikeOnce) = { EvtScript N(EVS_Attack_StrikeTwice) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 13) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 13) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Wait(40) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 1) Wait(10) @@ -511,16 +511,16 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EvtScript N(EVS_Attack_StrikeThrice) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 13) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 13) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Wait(20) Call(ActorSpeak, MSG_MAC_Gate_003C, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedTalk, ANIM_TheMaster_AscendedWalk) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 1) Wait(10) @@ -598,7 +598,7 @@ EvtScript N(EVS_Attack_StrikeThrice) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 50, 0, 0) + Call(PlayerHopToGoal, 50, 0, 0) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EndThread Wait(15) @@ -701,10 +701,10 @@ EvtScript N(EVS_Attack_StrikeThrice) = { // Unused final phase of the battle, the Master rises into the air and becomes an airborne enemy EvtScript N(EVS_AscendToFinalForm) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 13) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 13) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Wait(20) @@ -754,10 +754,10 @@ EvtScript N(EVS_AscendToFinalForm) = { // The Master flies over to the player and waits an inordinately long time before dealing damage. EvtScript N(EVS_Attack_SpiritStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 13) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 13) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Set(LVar0, 80) @@ -806,10 +806,10 @@ EvtScript N(EVS_Attack_SpiritStrike) = { // The Master flies over to the player and waits an inordinately long time before dealing damage. EvtScript N(EVS_Attack_FlyingGrab) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 13) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 13) Call(MoveBattleCamOver, 60) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Set(LVar0, 80) @@ -892,7 +892,7 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0) IfEq(LVar0, FALSE) // 'To battle!' - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Wait(10) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index ccf240f66d8..48da829e47a 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -514,9 +514,9 @@ EvtScript N(EVS_TakeTurn) = { IfEq(LVar0, 1) Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 20) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 25) Call(GetActorVar, ACTOR_SELF, AVAR_FlippedTurns, LVar0) @@ -613,9 +613,9 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 200) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 200) + Call(SetBattleCamOffsetY, 20) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 25) Wait(20) @@ -669,10 +669,10 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -25, 60, 0) - Call(SetBattleCamZoom, 460) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 460) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 50) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) @@ -694,10 +694,10 @@ EvtScript N(EVS_Attack_ShellToss) = { EndSwitch EndCaseGroup CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -25, 60, 0) - Call(SetBattleCamZoom, 460) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 460) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 50) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(GetStatusFlags, ACTOR_PLAYER, LVar0) @@ -765,10 +765,10 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(UseIdleAnimation, ACTOR_SELF, TRUE) Return Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -45, 60, 0) - Call(SetBattleCamZoom, 460) - Call(SetBattleCamOffsetZ, 0) + Call(SetBattleCamDist, 460) + Call(SetBattleCamOffsetY, 0) Call(MoveBattleCamOver, 30) EndIf EndIf @@ -827,10 +827,10 @@ EvtScript N(EVS_Attack_HeavyStomp) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 280) + Call(SetBattleCamDist, 280) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 50) diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index b51dec9e10c..0b88f77432a 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -306,7 +306,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Thread @@ -426,11 +426,11 @@ EvtScript N(EVS_Attack_ShootLightning) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 40) Wait(40) Call(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_OPEN_HATCH) diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index 0c7a113ece1..e111e22e6f8 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -318,8 +318,8 @@ EvtScript N(EVS_Hit) = { IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainElectric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainElectric | AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 260) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 260) Call(SetBattleCamTarget, 85, 80, 0) Call(MoveBattleCamOver, 20) Wait(20) @@ -332,8 +332,8 @@ EvtScript N(EVS_Hit) = { IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainUnfair) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 260) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 260) Call(SetBattleCamTarget, 85, 80, 0) Call(MoveBattleCamOver, 20) Wait(20) @@ -346,8 +346,8 @@ EvtScript N(EVS_Hit) = { IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainGeneric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 260) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 260) Call(SetBattleCamTarget, 85, 80, 0) Call(MoveBattleCamOver, 20) Wait(20) @@ -425,7 +425,7 @@ EvtScript N(EVS_ManageTroopWaves) = { Call(SetActorVar, ACTOR_GENERAL, AVAR_General_WavesDefeated, 8) ExecWait(N(EVS_BeginWave_Tank)) Goto(LBL_DONE) - // ----------------------- begin unreachable code ----------------------- + // ----------------------- begin unreachable code ----------------------- // a second stilt phase? but nothing is summoned and AVAR_Tank_StiltPhase == AVAL_StiltPhase_Defeated Label(LBL_PHASE_BROKEN) Call(ActorExists, ACTOR_TANK, LVar0) @@ -471,7 +471,7 @@ EvtScript N(EVS_ManageTroopWaves) = { EndIf Wait(1) Goto(LBL_PHASE_UNUSED) - // ------------------------ end unreachable code ------------------------ + // ------------------------ end unreachable code ------------------------ Label(LBL_DONE) Return End @@ -538,7 +538,7 @@ EvtScript N(EVS_BeginWave_StiltGuys) = { EvtScript N(EVS_BeginWave_ShyStacks) = { Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(40) @@ -562,11 +562,11 @@ EvtScript N(EVS_BeginWave_ShyStacks) = { Wait(1) Goto(0) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_WAVE_B, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 60) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 60) Call(MoveBattleCamOver, 40) Wait(40) Call(ActorSpeak, MSG_CH4_006F, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) @@ -611,11 +611,11 @@ EvtScript N(EVS_BeginWave_ShyStacks) = { }; EvtScript N(EVS_SummonStiltGuys) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(40) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorVar, ACTOR_GENERAL, AVAR_General_WavesDefeated, LVar0) IfEq(LVar0, 1) Call(ActorSpeak, MSG_CH4_006B, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) @@ -635,10 +635,10 @@ EvtScript N(EVS_SummonStiltGuys) = { Wait(1) Goto(1) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 50, 1, 0) - Call(SetBattleCamZoom, 320) - Call(SetBattleCamOffsetZ, 60) + Call(SetBattleCamDist, 320) + Call(SetBattleCamOffsetY, 60) Call(MoveBattleCamOver, 40) Wait(40) Call(ActorSpeak, MSG_CH4_006C, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) @@ -675,11 +675,11 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = { Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ModulateDarkness, TRUE) Exec(N(EVS_ManageDarkness)) Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1) Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) Call(SetActorYaw, ACTOR_GENERAL, 0) @@ -691,15 +691,15 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = { Call(LoadBattleSection, BTL_AREA_OMO2_5) Call(SummonEnemy, Ref(N(ShySquadReduxFormation)), TRUE) Wait(155) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 350) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 350) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(40) Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim03) Call(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_WAVE_A) Call(MoveBattleCamOver, 30) Wait(20) @@ -736,7 +736,7 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = { EvtScript N(EVS_BeginWave_Tank) = { Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 60) Wait(60) @@ -779,7 +779,7 @@ EvtScript N(EVS_Death) = { Wait(15) PlayEffect(EFFECT_EXPLOSION, 2, 102, 40, 0, 0) Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ShouldTetherGeneral, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 60) Call(PlaySoundAtActor, ACTOR_TANK, SOUND_TOY_TANK_EXPLODE) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 880e311fc2e..b81e5be482e 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -494,8 +494,8 @@ EvtScript N(EVS_HandlePhase) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS1) ExecWait(N(EVS_MoveSquadHome)) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 360) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 360) Call(SetBattleCamTarget, 72, 45, 0) Call(MoveBattleCamOver, 30) Wait(30) @@ -1126,12 +1126,12 @@ EvtScript N(EVS_Attack_Swarm) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 20) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 34) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 34) Call(MoveBattleCamOver, 50) Set(LVar0, 15) Call(GetActorVar, ACTOR_SELF, AVAR_NumDefeated, LVar1) @@ -1300,7 +1300,7 @@ EvtScript N(EVS_Flee) = { Call(SetAnimation, ACTOR_SELF, LVar0, ANIM_ShySquadGuy_Anim08) Add(LVar0, 1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 6233694cce8..532d8b2026a 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -670,10 +670,10 @@ EvtScript N(EVS_Attack_Leap) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamOffsetY, 40) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_STILTS, ANIM_StiltGuy_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -890,7 +890,7 @@ EvtScript N(EVS_ShyGuy_SpinSmash) = { Call(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) Goto(1) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1)) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(GetActorSize, ACTOR_SELF, LVar0, LVar3) @@ -1083,7 +1083,7 @@ EvtScript N(EVS_ShyGuy_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -1178,7 +1178,7 @@ EvtScript N(EVS_ShyGuy_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim09) Wait(20) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 62123c140f0..0e620b537d0 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -956,7 +956,7 @@ EvtScript N(EVS_SpinSmashHit_Top) = { Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) Goto(1) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1)) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(GetActorSize, ACTOR_SELF, LVar0, LVar3) @@ -1158,7 +1158,7 @@ EvtScript N(EVS_SpinSmashHit_Stack) = { Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) Goto(1) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(SetPartJumpGravity, ACTOR_SELF, PRT_KNOCKOFF, Float(0.1)) Call(SetPartMoveSpeed, ACTOR_SELF, PRT_KNOCKOFF, Float(6.0)) Call(GetActorSize, ACTOR_SELF, LVar0, LVar3) @@ -1288,7 +1288,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorVar, ACTOR_SELF, AVAR_Anim_Attack, LVar0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0) Wait(20) diff --git a/src/battle/area/omo2_5/actor/shy_squad_redux.c b/src/battle/area/omo2_5/actor/shy_squad_redux.c index 9717dbbb938..713c91afd84 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_redux.c +++ b/src/battle/area/omo2_5/actor/shy_squad_redux.c @@ -721,7 +721,7 @@ EvtScript N(EVS_MemberShockReaction) = { Call(SetAnimation, ACTOR_SELF, LVar0, LVar1) Call(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) Call(GetActorSize, ACTOR_SELF, LVar4, LVar5) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar1, LVar2, LVar3, LVar5, LVar4, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_SHOCK_HIT, LVar1, LVar2, LVar3, LVar5, LVar4, 0) Call(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 0, 0) Call(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 1, 0) Wait(1) @@ -1103,7 +1103,7 @@ EvtScript N(EVS_Attack_Swarm) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 300) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Set(LVar0, PRT_MEMBER_01) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index 4284bfcb815..be98b687151 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -312,9 +312,9 @@ EvtScript N(EVS_HandlePhase) = { IfNotFlag(LVar0, 1) BitwiseOrConst(LVar0, 1) Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamOffsetY, 40) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_CH4_0051, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01) @@ -533,10 +533,10 @@ EvtScript N(attackHeavyJump) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 260) + Call(SetBattleCamDist, 260) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 50) @@ -604,10 +604,10 @@ EvtScript N(attackHeavyJump) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) Call(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) - Call(SetBattleCamZoom, 320) + Call(SetBattleCamDist, 320) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Thread Wait(5) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim10) @@ -642,11 +642,11 @@ EvtScript N(attackLightBeam) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(SetBattleCamZoom, 240) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) + Call(SetBattleCamDist, 240) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 80) @@ -657,9 +657,9 @@ EvtScript N(attackLightBeam) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) Wait(20) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 35) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 35) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 8) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_LIGHT) @@ -750,8 +750,8 @@ EvtScript N(extinguish) = { IfNotFlag(LVar0, 2) BitwiseOrConst(LVar0, 2) Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) - Call(SetBattleCamOffsetZ, 40) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) + Call(SetBattleCamOffsetY, 40) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -764,9 +764,9 @@ EvtScript N(extinguish) = { EndIf EndIf Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(SetBattleCamZoom, 230) - Call(SetBattleCamOffsetZ, 25) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) + Call(SetBattleCamDist, 230) + Call(SetBattleCamOffsetY, 25) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index d18819982aa..0b37b443be0 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -936,7 +936,7 @@ EvtScript N(EVS_Attack_IcyBreath) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) Wait(10) @@ -1033,7 +1033,7 @@ EvtScript N(EVS_Attack_IceBolt) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) Wait(10) @@ -1225,7 +1225,7 @@ Formation N(CloneFormation) = { EvtScript N(EVS_Move_MakeClones) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1268,7 +1268,7 @@ EvtScript N(EVS_Move_MakeClones) = { ExecGetTID(N(EVS_UpdateHovering), LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_HoveringScriptID, LVar0) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorVar, ACTOR_SELF, AVAR_Clone1_ID, LVarA) Call(SetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -1486,7 +1486,7 @@ EvtScript N(EVS_SummonBit) = { EvtScript N(EVS_Move_SummonBits) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1556,9 +1556,9 @@ EvtScript N(EVS_Attack_CloneBreath) = { BitwiseOrConst(LVar0, AVAL_Flag_SuspendHover) Call(SetActorVar, ACTOR_KING, AVAR_Flags, LVar0) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 35) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 35) Call(GetActorFlags, ACTOR_SELF, LVar0) IfFlag(LVar0, ACTOR_FLAG_FLYING) Call(SetBattleCamTarget, 70, 41, 5) @@ -1853,7 +1853,7 @@ EvtScript N(EVS_Attack_SpitBits) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) Wait(20) @@ -1997,9 +1997,9 @@ EvtScript N(EVS_Move_Recover) = { Call(UseIdleAnimation, LVarB, FALSE) Call(EnableIdleScript, LVarB, IDLE_SCRIPT_DISABLE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 50) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 50) Call(GetActorFlags, ACTOR_SELF, LVar0) IfFlag(LVar0, ACTOR_FLAG_FLYING) Call(SetBattleCamTarget, 70, 41, 5) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index d4d71bfa38f..718e1dc21c6 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -190,7 +190,7 @@ API_CALLABLE(N(UpdateMonstarImgFX)) { } return ApiStatus_BLOCK; - + #undef RGBA_BUF_SIZE } @@ -336,9 +336,9 @@ EvtScript N(EVS_ChargeUp) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(SetBattleCamZoom, 10) - Call(SetBattleCamOffsetZ, 5) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) + Call(SetBattleCamDist, 10) + Call(SetBattleCamOffsetY, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Monstar_GatherStrength1) @@ -360,11 +360,11 @@ EvtScript N(EVS_Attack_StarStorm) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 250) - Call(SetBattleCamOffsetZ, 55) + Call(SetBattleCamDist, 250) + Call(SetBattleCamOffsetY, 55) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -388,11 +388,11 @@ EvtScript N(EVS_Attack_StarStorm) = { EndThread Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) Call(N(StartRumbleWithParams), 80, 120) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 100) - Call(SetBattleCamOffsetZ, 60) + Call(SetBattleCamDist, 100) + Call(SetBattleCamOffsetY, 60) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 60) Wait(60) @@ -491,11 +491,11 @@ EvtScript N(EVS_HandlePhase) = { EvtScript N(EVS_TakeTurn) = { ExecWait(N(EVS_Attack_StarStorm)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 72) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 340) + Call(SetBattleCamDist, 340) Call(MoveBattleCamOver, 20) Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(GetActorVar, ACTOR_SELF, AVAR_TurnCount, LVar0) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index 8e71b84485f..4129f03380f 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -399,16 +399,16 @@ EvtScript N(EVS_Attack_SpinDrop) = { IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 95) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 400) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, 130) Else Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 72) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 340) + Call(SetBattleCamDist, 340) Call(MoveBattleCamOver, 130) EndIf Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -512,10 +512,10 @@ EvtScript N(EVS_Attack_InkBlast) = { Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) Call(FallToGoal, ACTOR_SELF, 8) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Sub(LVar0, 30) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) + Call(SetBattleCamDist, 350) Call(MoveBattleCamOver, 50) EndThread Call(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index 03c08ce0723..3a7e9e8764d 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -466,9 +466,9 @@ EvtScript N(EVS_TakeTurn) = { EndSwitch Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 50) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 325) + Call(SetBattleCamDist, 325) Call(MoveBattleCamOver, 30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim02) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8)) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 7745c034b37..cc22ddd3a2a 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -532,9 +532,9 @@ EvtScript N(EVS_Move_ChargeUp) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 65) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 320) + Call(SetBattleCamDist, 320) Call(MoveBattleCamOver, 50) Wait(20) Call(N(FadeBackgroundDarken)) @@ -568,16 +568,16 @@ EvtScript N(EVS_Attack_SpinDrop) = { IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 112) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 500) + Call(SetBattleCamDist, 500) Call(MoveBattleCamOver, 130) Else Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 82) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 385) + Call(SetBattleCamDist, 385) Call(MoveBattleCamOver, 130) EndIf Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -666,16 +666,16 @@ EvtScript N(EVS_Attack_ChargedDrop) = { IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 112) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 500) + Call(SetBattleCamDist, 500) Call(MoveBattleCamOver, 130) Else Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 82) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 385) + Call(SetBattleCamDist, 385) Call(MoveBattleCamOver, 130) EndIf Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -778,10 +778,10 @@ EvtScript N(EVS_Attack_InkBlast) = { Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) Call(FallToGoal, ACTOR_SELF, 8) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Sub(LVar0, 30) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) + Call(SetBattleCamDist, 350) Call(MoveBattleCamOver, 80) EndThread Call(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index cd10af79295..889a7f63f29 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -687,10 +687,10 @@ EvtScript N(EVS_Move_MakeBabies) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 50) - Call(SetBattleCamZoom, 330) + Call(SetBattleCamOffsetY, 50) + Call(SetBattleCamDist, 330) Call(MoveBattleCamOver, 40) Wait(20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) @@ -699,10 +699,10 @@ EvtScript N(EVS_Move_MakeBabies) = { Thread Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.3)) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 65) - Call(SetBattleCamZoom, 240) + Call(SetBattleCamOffsetY, 65) + Call(SetBattleCamDist, 240) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim09) Wait(15) @@ -710,10 +710,10 @@ EvtScript N(EVS_Move_MakeBabies) = { Thread Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.4)) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 80) - Call(SetBattleCamZoom, 150) + Call(SetBattleCamOffsetY, 80) + Call(SetBattleCamDist, 150) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0A) Wait(15) @@ -721,10 +721,10 @@ EvtScript N(EVS_Move_MakeBabies) = { Thread Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.5)) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 95) - Call(SetBattleCamZoom, 60) + Call(SetBattleCamOffsetY, 95) + Call(SetBattleCamDist, 60) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0B) Wait(30) @@ -757,10 +757,10 @@ EvtScript N(EVS_Move_Enrage) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_07) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 28) - Call(SetBattleCamZoom, 297) + Call(SetBattleCamOffsetY, 28) + Call(SetBattleCamDist, 297) Call(MoveBattleCamOver, 50) Wait(20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 40557300caf..5fe48592171 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -1542,10 +1542,10 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { Return EndIf Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 28, 75, -101) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 500) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 500) Call(MoveBattleCamOver, 20) Wait(15) Call(GetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, LVar0) @@ -1558,10 +1558,10 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { Call(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 2) CaseEq(2) Call(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, PRT_TARGET, -1, -1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 85, 81, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 249) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 249) Call(MoveBattleCamOver, 10) Wait(10) Call(ActorSpeak, MSG_CH1_0101, ACTOR_SELF, PRT_TARGET, -1, -1) @@ -1570,10 +1570,10 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { Call(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 3) CaseEq(3) Call(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, PRT_TARGET, -1, -1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 85, 81, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 249) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 249) Call(MoveBattleCamOver, 10) Wait(10) Call(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, PRT_TARGET, -1, -1) @@ -1594,11 +1594,11 @@ EvtScript N(EVS_FakeBowser_HandlePhase) = { CaseEq(PHASE_PLAYER_BEGIN) Call(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) IfNotFlag(LVar0, AFLAG_Boss_Dialogue_BowserReveal) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -4, 46, -2) Call(SetBattleCamYaw, 24) - Call(SetBattleCamOffsetZ, 30) - Call(SetBattleCamZoom, 461) + Call(SetBattleCamOffsetY, 30) + Call(SetBattleCamDist, 461) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, PRT_TARGET, -1, -1) @@ -1746,10 +1746,10 @@ EvtScript N(EVS_KoopaBrosEnter) = { Call(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch) EndThread Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 70, 46, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 292) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 292) Call(MoveBattleCamOver, 20) Wait(28) Call(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_ThumbsUp) @@ -1866,9 +1866,9 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { Call(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) Call(GetHomePos, LVar1, LVar2, LVar3, LVar4) Call(SetBattleCamTarget, LVar2, LVar3, LVar4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamOffsetZ, 50) - Call(SetBattleCamZoom, 400) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamOffsetY, 50) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, LVar0) Wait(LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) @@ -2243,9 +2243,9 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { Call(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) Call(GetHomePos, LVar1, LVar2, LVar3, LVar4) Call(SetBattleCamTarget, LVar2, LVar3, LVar4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamOffsetZ, 50) - Call(SetBattleCamZoom, 400) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamOffsetY, 50) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, 30) IfEq(LVarD, 2) Wait(25) @@ -2498,7 +2498,7 @@ EvtScript N(EVS_TryFormingTower) = { Return End #undef VAR_STANDING_COUNT - #undef VAR_CUR_KOOPA_IDX + #undef VAR_CUR_KOOPA_IDX }; // count the number of standing koopa bros @@ -3048,10 +3048,10 @@ EvtScript N(EVS_KoopaBros_TakeTurn) = { EndLoop // zoom in to show the toppled koopa bros and have them try to get up IfEq(LFlag0, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 90, 0, 0) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 40) Call(MoveBattleCamOver, 15) Wait(15) EndIf diff --git a/src/battle/battle.c b/src/battle/battle.c index c89080cfb3d..52b6e22288d 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -225,7 +225,7 @@ void load_demo_battle(u32 index) { general_heap_create(); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); clear_animator_list(); clear_entity_models(); diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index f5bb65069f5..64d3b54f50d 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -2076,7 +2076,7 @@ void btl_state_update_end_battle(void) { } if (encounterStatus->battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) { btl_cam_unfreeze(); - btl_cam_use_preset(BTL_CAM_PRESET_01); + btl_cam_use_preset(BTL_CAM_INTERRUPT); set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0); set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 160, 120); } @@ -2173,7 +2173,7 @@ void btl_state_draw_end_battle(void) { Camera* camera = &gCameras[gCurrentCameraID]; if (gCurrentEncounter.battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) { - camera->auxBoomZOffset += 256; + camera->params.basic.offsetY += 256; set_screen_overlay_params_front(OVERLAY_SCREEN_MARIO, BattleScreenFadeAmt); } else { set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt); @@ -2226,7 +2226,7 @@ void btl_state_update_run_away(void) { gBattleStatus.flags2 |= BS_FLAGS2_PLAYER_TURN_USED; playerData->fleeAttempts++; - btl_cam_use_preset(BTL_CAM_PRESET_25); + btl_cam_use_preset(BTL_CAM_PLAYER_FLEE); btl_cam_target_actor(ACTOR_PLAYER); // calculate average escape chance @@ -2405,7 +2405,7 @@ void btl_state_update_defeat(void) { player->disableEffect->data.disableX->koDuration = 0; } - btl_cam_use_preset(BTL_CAM_PRESET_25); + btl_cam_use_preset(BTL_CAM_PLAYER_FLEE); btl_cam_target_actor(ACTOR_PLAYER); battleStatus->battlePhase = PHASE_DEATH; script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); @@ -2484,7 +2484,7 @@ void btl_state_update_change_partner(void) { partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; battleStatus->stateFreezeCount = 0; gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; - btl_cam_use_preset(BTL_CAM_PRESET_19); + btl_cam_use_preset(BTL_CAM_REPOSITION); btl_cam_set_target_pos(-89.0, 40.0, -99.0); btl_cam_set_zoom(372); btl_cam_set_zoffset(0); @@ -2839,7 +2839,7 @@ void btl_state_update_player_move(void) { if (!enemyNotDone) { gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS; } else { - btl_cam_use_preset(BTL_CAM_PRESET_03); + btl_cam_use_preset(BTL_CAM_VIEW_ENEMIES); switch (actor->statusAfflicted) { case 4: messageIndex = BTL_MSG_ENEMY_DAZED; @@ -3347,7 +3347,7 @@ void btl_state_update_partner_move(void) { if (!enemyFound) { gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_DONE; } else { - btl_cam_use_preset(BTL_CAM_PRESET_03); + btl_cam_use_preset(BTL_CAM_VIEW_ENEMIES); switchCondition = enemyActor->statusAfflicted - 4; switch (switchCondition) { case 0: @@ -3890,7 +3890,7 @@ void btl_state_update_first_strike(void) { gBattleStatus.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE; gBattleStatus.flags1 &= ~BS_FLAGS1_PARTNER_ACTING; increment_status_bar_disabled(); - btl_cam_use_preset(BTL_CAM_PRESET_10); + btl_cam_use_preset(BTL_CAM_MIDPOINT_CLOSE); btl_cam_target_actor(ACTOR_PLAYER); reset_actor_turn_info(); // begin the partner turn script @@ -4093,7 +4093,7 @@ void btl_state_update_partner_striking_first(void) { gBattleStatus.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE; gBattleStatus.flags1 |= BS_FLAGS1_PARTNER_ACTING; increment_status_bar_disabled(); - btl_cam_use_preset(BTL_CAM_PRESET_10); + btl_cam_use_preset(BTL_CAM_MIDPOINT_CLOSE); btl_cam_target_actor(ACTOR_PARTNER); reset_actor_turn_info(); // begin the partner turn script diff --git a/src/battle/camera.c b/src/battle/camera.c index 4057235c38c..00b04934a86 100644 --- a/src/battle/camera.c +++ b/src/battle/camera.c @@ -7,26 +7,26 @@ static f32 BattleCam_PosX; static f32 BattleCam_PosY; static f32 BattleCam_PosZ; -static s16 BattleCam_TargetActor; -static s16 BattleCam_TargetActorPart; +static s16 BattleCam_SubjectActor; +static s16 BattleCam_SubjectActorPart; static s16 BattleCam_BoomLength; static s16 BattleCam_BoomYaw; static s16 BattleCam_BoomPitch; -static s16 BattleCam_BoomZOffset; +static s16 BattleCam_BoomOffsetY; static f32 D_8029F288; static f32 BattleCam_InitialBoomLength; static f32 BattleCam_InitialBoomYaw; static f32 BattleCam_InitialBoomPitch; -static f32 BattleCam_InitialBoomZOffset; +static f32 BattleCam_InitialBoomOffsetY; static s8 BattleCam_DoneMoving; static s16 BattleCam_MoveTimeLeft; static s16 BattleCam_MoveTimeTotal; -static s8 BattleCam_ModeY; -static s8 BattleCam_ModeX; +static s8 BattleCam_AdjustTargetYMode; +static s8 BattleCam_AdjustTargetXMode; static s8 BattleCam_SetImmediately; static s8 BattleCam_UseLinearInterp; -static s8 D_8029F2A6; -static s8 D_8029F2A7; +static s8 BattleCam_ClampPosX; +static s8 BattleCam_ExtraOffsetX; static f32 BattleCam_InitialPosX; static f32 BattleCam_InitialPosY; static f32 BattleCam_InitialPosZ; @@ -35,115 +35,129 @@ static EvtScript* BattleCam_ControlScript; s8 BattleCam_IsFrozen = FALSE; s32 BattleCam_CurrentPresetID = -1; -EvtScript CamPreset_B = { - Call(CamPresetUpdate_B) +API_CALLABLE(BattleCam_Update_Interrupt); +API_CALLABLE(BattleCam_Update_FocusMidpointA); +API_CALLABLE(BattleCam_Update_FocusMidpointB); +API_CALLABLE(BattleCam_Update_FocusActorPart); +API_CALLABLE(BattleCam_Update_FocusActor); +API_CALLABLE(BattleCam_Update_FocusGoal); +API_CALLABLE(BattleCam_Update_SimpleLerp_Unskippable); +API_CALLABLE(BattleCam_Update_ResetToNeutral_Skippable); +API_CALLABLE(BattleCam_Update_ViewAllEnemies); +API_CALLABLE(BattleCam_Update_ViewAllEnemies_MaintainY); +API_CALLABLE(BattleCam_Update_SimpleLerp_Skippable); +API_CALLABLE(BattleCam_Update_FollowActorY); +API_CALLABLE(BattleCam_Update_FollowActorPos); + +EvtScript EVS_BattleCam_Interrupt = { + Call(BattleCam_Update_Interrupt) Return End }; -EvtScript CamPreset_F = { - Call(CamPresetUpdate_F) +EvtScript EVS_BattleCam_UnkF_Skippable = { + Call(BattleCam_Update_FocusMidpointA) Return End }; -EvtScript CamPreset_M = { - Call(CamPresetUpdate_M) +EvtScript EVS_BattleCam_UnkM_Skippable = { + Call(BattleCam_Update_FocusMidpointB) Return End }; -EvtScript CamPreset_G = { - Call(CamPresetUpdate_G) +EvtScript EVS_BattleCam_UnkG_Skippable = { + Call(BattleCam_Update_FocusActorPart) Return End }; -EvtScript CamPreset_I = { - Call(CamPresetUpdate_I) +EvtScript EVS_BattleCam_FocusActor = { + Call(BattleCam_Update_FocusActor) Return End }; -EvtScript CamPreset_H = { - Call(CamPresetUpdate_H) +EvtScript EVS_BattleCam_FocusGoal = { + Call(BattleCam_Update_FocusGoal) Return End }; -EvtScript CamPreset_N = { - Call(CamPresetUpdate_N) +EvtScript EVS_BattleCam_SimpleLerp_Unskippable = { + Call(BattleCam_Update_SimpleLerp_Unskippable) Return End }; -EvtScript EVS_BattleCam_Default = { - Call(BattleCamImpl_Default) +EvtScript EVS_BattleCam_ResetNeutral = { + Call(BattleCam_Update_ResetToNeutral_Skippable) Return End }; -EvtScript CamPreset_D = { - Call(CamPresetUpdate_D) +EvtScript EVS_BattleCam_ViewEnemies = { + Call(BattleCam_Update_ViewAllEnemies) Return End }; -EvtScript CamPreset_E = { - Call(CamPresetUpdate_E) +EvtScript EVS_BattleCam_ViewEnemies_MaintainY = { + Call(BattleCam_Update_ViewAllEnemies_MaintainY) Return End }; -EvtScript CamPreset_J = { - Call(CamPresetUpdate_J) +EvtScript EVS_BattleCam_SimpleLerp_Skippable = { + Call(BattleCam_Update_SimpleLerp_Skippable) Return End }; -EvtScript CamPreset_K = { - Call(CamPresetUpdate_K) +EvtScript EVS_BattleCam_FollowActorY = { + Call(BattleCam_Update_FollowActorY) Return End }; -EvtScript CamPreset_L = { - Call(CamPresetUpdate_L) +EvtScript EVS_BattleCam_FollowActorPos = { + Call(BattleCam_Update_FollowActorPos) Return End }; -EvtScript CamPreset_A = { - Call(SetBattleCamPos, 0, 15, 0) - Call(SetBattleCamParam, AUX_CAM_BOOM_LENGTH, 550) - Call(SetBattleCamParam, AUX_CAM_PARAM_3, 100) - Call(SetBattleCamParam, AUX_CAM_BOOM_PITCH, 8) +EvtScript EVS_BattleCam_Reset = { + Call(ForceBattleCamTarget, 0, 15, 0) + Call(SetBattleCamParam, CAM_PARAM_BOOM_LENGTH, 550) + Call(SetBattleCamParam, CAM_PARAM_FOV_SCALE, 100) + Call(SetBattleCamParam, CAM_PARAM_BOOM_PITCH, 8) Return End }; EvtScript EVS_OnBattleInit = { - Call(SetCamPerspective, CAM_BATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024) + Call(SetCamPerspective, CAM_BATTLE, CAM_UPDATE_NO_INTERP, 25, 16, 1024) Call(SetCamViewport, CAM_BATTLE, 12, 20, 296, 200) Call(SetCamBGColor, CAM_BATTLE, 0, 0, 0) Call(SetCamEnabled, CAM_BATTLE, TRUE) Wait(1) Call(InitVirtualEntityList) Call(InitAnimatedModels) - Call(func_802CABE8, CAM_BATTLE, 0, 240, 100, 8) - Call(func_802CAE50, CAM_BATTLE, -75, 35, 0) + Call(SetInterpCamParams, CAM_BATTLE, 0, 240, 100, 8) + Call(SetCamLookTarget, CAM_BATTLE, -75, 35, 0) Call(BattleCamTargetActor, 0) - Call(func_8024CE9C) + Call(BattleCam_Init) Return End }; -API_CALLABLE(CamPresetUpdate_B) { +API_CALLABLE(BattleCam_Update_Interrupt) { BattleCam_DoneMoving = TRUE; return ApiStatus_BLOCK; } -s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleCam_Update_FocusMidpointA) { Actor* actor; Actor* targetActor; Camera* camera = &gCameras[CAM_BATTLE]; @@ -159,8 +173,8 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { f32 boomLength; f32 extraLength; f32 dist; - s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - s32 actorID = BattleCam_TargetActor & 0xFF; + s32 actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_SubjectActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -187,14 +201,14 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY != BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_TARGET) { middlePosY = y + (targetY - y) / 4; } else { middlePosY = targetY; @@ -226,8 +240,8 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) /2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -261,14 +275,14 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY == BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_AdjustTargetYMode == BTL_CAM_YADJ_TARGET) { middlePosY = targetY; } else { middlePosY = y; @@ -280,7 +294,7 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - if (D_8029F2A6) { + if (BattleCam_ClampPosX) { f32 upperBound = (500.0f - BattleCam_InitialBoomLength) * 0.4 + 30.0; f32 lowerBound = -upperBound; @@ -305,16 +319,16 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.x = middlePosX; camera->lookAt_obj_target.y = middlePosY; camera->lookAt_obj_target.z = middlePosZ; - camera->auxBoomLength = BattleCam_BoomLength; - camera->auxBoomZOffset = BattleCam_BoomZOffset * 256; - camera->auxBoomYaw = BattleCam_BoomYaw; - camera->auxBoomPitch = BattleCam_BoomPitch; + camera->params.basic.dist = BattleCam_BoomLength; + camera->params.basic.offsetY = BattleCam_BoomOffsetY * 256; + camera->params.basic.yaw = BattleCam_BoomYaw; + camera->params.basic.pitch = BattleCam_BoomPitch; } - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -337,7 +351,7 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, middlePosX, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, middlePosY, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, middlePosZ, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; dist = dist2D(camera->lookAt_obj_target.x, camera->lookAt_obj_target.z, middlePosX, middlePosZ); adjustedSize = (averageSize + targetAverageSize) / 8; @@ -345,9 +359,9 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { distToTarget = dist3D(x, y, z, targetX, targetY, targetZ); boomLength = BattleCam_BoomLength + extraLength + distToTarget * 0.5f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, boomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, boomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -358,7 +372,7 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleCam_Update_FocusMidpointB) { Actor* actor; Actor* targetActor; Camera* camera = &gCameras[CAM_BATTLE]; @@ -373,8 +387,8 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { f32 boomLength; f32 extraLength; f32 dist; - s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - s32 actorID = BattleCam_TargetActor & 0xFF; + s32 actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_SubjectActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -401,14 +415,14 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY != BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_TARGET) { middlePosY = y + (targetY - y) / 4; } else { middlePosY = targetY; @@ -440,8 +454,8 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) /2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -475,14 +489,14 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY == BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_AdjustTargetYMode == BTL_CAM_YADJ_TARGET) { middlePosY = targetY; } else { middlePosY = y; @@ -494,7 +508,7 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - if (D_8029F2A6) { + if (BattleCam_ClampPosX) { f32 upperBound = (500.0f - BattleCam_InitialBoomLength) * 0.4 + 30.0; f32 lowerBound = -upperBound; @@ -519,16 +533,16 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.x = middlePosX; camera->lookAt_obj_target.y = middlePosY; camera->lookAt_obj_target.z = middlePosZ; - camera->auxBoomLength = BattleCam_BoomLength; - camera->auxBoomZOffset = BattleCam_BoomZOffset * 256; - camera->auxBoomYaw = BattleCam_BoomYaw; - camera->auxBoomPitch = BattleCam_BoomPitch; + camera->params.basic.dist = BattleCam_BoomLength; + camera->params.basic.offsetY = BattleCam_BoomOffsetY * 256; + camera->params.basic.yaw = BattleCam_BoomYaw; + camera->params.basic.pitch = BattleCam_BoomPitch; } - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -551,16 +565,16 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, middlePosX, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, middlePosY, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, middlePosZ, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; dist = dist2D(camera->lookAt_obj_target.x, camera->lookAt_obj_target.z, middlePosX, middlePosZ); extraLength = dist + averageSize + targetAverageSize - 64.0f; distToTarget = dist3D(x, y, z, targetX, targetY, targetZ); boomLength = BattleCam_BoomLength + extraLength + distToTarget * 0.5f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, boomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, boomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -571,7 +585,7 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleCam_Update_FocusActorPart) { Actor* actor; Actor* targetActor; Actor* enemyActor; @@ -584,8 +598,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { f32 sizeX, sizeY; f32 targetAverageSize; f32 alpha; - s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - s32 actorID = BattleCam_TargetActor & 0xFF; + s32 actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_SubjectActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -611,8 +625,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -645,8 +659,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -661,7 +675,7 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { if (targetActor == NULL) { return ApiStatus_BLOCK; } - actorPart = get_actor_part(targetActor, BattleCam_TargetActorPart); + actorPart = get_actor_part(targetActor, BattleCam_SubjectActorPart); x = actorPart->absolutePos.x; y = actorPart->absolutePos.y + actorPart->size.y / 2 + actorPart->size.y / 4; z = actorPart->absolutePos.z; @@ -680,8 +694,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode > BTL_CAM_YADJ_TARGET) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -695,7 +709,7 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - if (D_8029F2A6) { + if (BattleCam_ClampPosX) { f32 upperBound = (500.0f - BattleCam_InitialBoomLength) * 0.4 + 30.0; f32 lowerBound = -upperBound; @@ -720,16 +734,16 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.x = middlePosX; camera->lookAt_obj_target.y = middlePosY; camera->lookAt_obj_target.z = middlePosZ; - camera->auxBoomLength = BattleCam_BoomLength; - camera->auxBoomZOffset = BattleCam_BoomZOffset * 256; - camera->auxBoomYaw = BattleCam_BoomYaw; - camera->auxBoomPitch = BattleCam_BoomPitch; + camera->params.basic.dist = BattleCam_BoomLength; + camera->params.basic.offsetY = BattleCam_BoomOffsetY * 256; + camera->params.basic.yaw = BattleCam_BoomYaw; + camera->params.basic.pitch = BattleCam_BoomPitch; } - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -752,11 +766,11 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, middlePosX, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, middlePosY, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, middlePosZ, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -767,7 +781,7 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleCam_Update_FocusActor) { Actor* actor; Camera* camera = &gCameras[CAM_BATTLE]; BattleStatus* battleStatus = &gBattleStatus; @@ -777,8 +791,8 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { f32 averageSize, targetAverageSize; f32 alpha; f32 extraLength; - s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - s32 actorID = BattleCam_TargetActor & 0xFF; + s32 actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_SubjectActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -827,7 +841,7 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - if (D_8029F2A6) { + if (BattleCam_ClampPosX) { f32 upperBound = (500.0f - BattleCam_InitialBoomLength) * 0.4 + 30.0; f32 lowerBound = -upperBound; @@ -848,10 +862,10 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { sizeY = 0.0f; } BattleCam_BoomLength += sizeX + sizeY; - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -867,19 +881,19 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { alpha /= BattleCam_MoveTimeTotal; } - if (BattleCam_ModeX != BTL_CAM_MODEX_0) { - camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x + D_8029F2A7, alpha); + if (BattleCam_AdjustTargetXMode != BTL_CAM_XADJ_NONE) { + camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x + BattleCam_ExtraOffsetX, alpha); } - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); } camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; extraLength = averageSize - 32.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength + extraLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength + extraLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -890,7 +904,7 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleCam_Update_FocusGoal) { Actor* actor; Camera* camera = &gCameras[CAM_BATTLE]; BattleStatus* battleStatus = &gBattleStatus; @@ -900,8 +914,8 @@ s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { f32 averageSize; f32 alpha; f32 extraLength; - s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - s32 actorID = BattleCam_TargetActor & 0xFF; + s32 actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_SubjectActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -944,19 +958,19 @@ s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { f32 delta = currentY - y; y += delta / 2 + delta / 6.0f; } - if (BattleCam_ModeX != BTL_CAM_MODEX_0) { + if (BattleCam_AdjustTargetXMode != BTL_CAM_XADJ_NONE) { x += (currentX - x) / 2; if (x > 75.0f) { x -= fabsf(75.0f - x); } } - if (D_8029F2A6) { + if (BattleCam_ClampPosX) { f32 upperBound = (500.0f - BattleCam_InitialBoomLength) * 0.4 + 30.0; f32 lowerBound = -upperBound; @@ -968,10 +982,10 @@ s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { } } if (isInitialCall) { - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -991,11 +1005,11 @@ s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; extraLength = averageSize - 32.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength + extraLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength + extraLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -1006,7 +1020,7 @@ s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_N) { +API_CALLABLE(BattleCam_Update_SimpleLerp_Unskippable) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; f32 x, y, z; @@ -1016,10 +1030,10 @@ API_CALLABLE(CamPresetUpdate_N) { z = BattleCam_PosZ; if (isInitialCall) { - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -1038,10 +1052,10 @@ API_CALLABLE(CamPresetUpdate_N) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -1052,7 +1066,7 @@ API_CALLABLE(CamPresetUpdate_N) { return ApiStatus_BLOCK; } -API_CALLABLE(BattleCamImpl_Default) { +API_CALLABLE(BattleCam_Update_ResetToNeutral_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; f32 x, y, z; @@ -1063,20 +1077,20 @@ API_CALLABLE(BattleCamImpl_Default) { BattleCam_PosZ = 0.0f; BattleCam_BoomYaw = 0; BattleCam_BoomPitch = 8; - BattleCam_BoomZOffset = 0; + BattleCam_BoomOffsetY = 0; if (BattleCam_SetImmediately) { camera->lookAt_obj_target.x = BattleCam_PosX; camera->lookAt_obj_target.y = BattleCam_PosY; camera->lookAt_obj_target.z = BattleCam_PosZ; - camera->auxBoomZOffset = BattleCam_BoomZOffset; - camera->auxBoomYaw = BattleCam_BoomYaw; - camera->auxBoomPitch = BattleCam_BoomPitch; - camera->auxBoomLength = BattleCam_BoomLength; + camera->params.basic.offsetY = BattleCam_BoomOffsetY; + camera->params.basic.yaw = BattleCam_BoomYaw; + camera->params.basic.pitch = BattleCam_BoomPitch; + camera->params.basic.dist = BattleCam_BoomLength; } - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -1099,10 +1113,10 @@ API_CALLABLE(BattleCamImpl_Default) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -1113,7 +1127,7 @@ API_CALLABLE(BattleCamImpl_Default) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_D) { +API_CALLABLE(BattleCam_Update_ViewAllEnemies) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; f32 x, y, z; @@ -1125,10 +1139,10 @@ API_CALLABLE(CamPresetUpdate_D) { BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -1151,10 +1165,10 @@ API_CALLABLE(CamPresetUpdate_D) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -1165,7 +1179,7 @@ API_CALLABLE(CamPresetUpdate_D) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_E) { +API_CALLABLE(BattleCam_Update_ViewAllEnemies_MaintainY) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; f32 x, y, z; @@ -1179,10 +1193,10 @@ API_CALLABLE(CamPresetUpdate_E) { BattleCam_PosZ = 0.0f; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -1205,10 +1219,10 @@ API_CALLABLE(CamPresetUpdate_E) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -1219,7 +1233,7 @@ API_CALLABLE(CamPresetUpdate_E) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_J) { +API_CALLABLE(BattleCam_Update_SimpleLerp_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; f32 x, y, z; @@ -1230,10 +1244,10 @@ API_CALLABLE(CamPresetUpdate_J) { BattleCam_PosY = camera->lookAt_obj_target.y; BattleCam_PosZ = camera->lookAt_obj_target.z; } - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomOffsetY = camera->params.basic.offsetY / 256; BattleCam_InitialPosX = camera->lookAt_obj_target.x; BattleCam_InitialPosY = camera->lookAt_obj_target.y; BattleCam_InitialPosZ = camera->lookAt_obj_target.z; @@ -1256,10 +1270,10 @@ API_CALLABLE(CamPresetUpdate_J) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); - camera->auxBoomZOffset = LERP(BattleCam_InitialBoomZOffset, BattleCam_BoomZOffset, alpha) * 256.0f; - camera->auxBoomLength = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); - camera->auxBoomYaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); - camera->auxBoomPitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); + camera->params.basic.offsetY = LERP(BattleCam_InitialBoomOffsetY, BattleCam_BoomOffsetY, alpha) * 256.0f; + camera->params.basic.dist = LERP(BattleCam_InitialBoomLength, BattleCam_BoomLength, alpha); + camera->params.basic.yaw = LERP(BattleCam_InitialBoomYaw, BattleCam_BoomYaw, alpha); + camera->params.basic.pitch = LERP(BattleCam_InitialBoomPitch, BattleCam_BoomPitch, alpha); if (BattleCam_MoveTimeLeft == 0) { BattleCam_DoneMoving = TRUE; @@ -1270,7 +1284,7 @@ API_CALLABLE(CamPresetUpdate_J) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_K) { +API_CALLABLE(BattleCam_Update_FollowActorY) { Camera* camera = &gCameras[CAM_BATTLE]; BattleStatus* battleStatus = &gBattleStatus; PlayerStatus* playerStatus = &gPlayerStatus; @@ -1284,14 +1298,14 @@ API_CALLABLE(CamPresetUpdate_K) { BattleCam_PosX = camera->lookAt_obj_target.x; BattleCam_PosY = camera->lookAt_obj_target.y; BattleCam_PosZ = camera->lookAt_obj_target.z; - D_8029F288 = camera->auxBoomLength; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; + D_8029F288 = camera->params.basic.dist; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; } y = 0.0f; - actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - actorID = BattleCam_TargetActor & 0xFF; + actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + actorID = BattleCam_SubjectActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -1336,12 +1350,12 @@ API_CALLABLE(CamPresetUpdate_K) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_L) { +API_CALLABLE(BattleCam_Update_FollowActorPos) { Camera* camera = &gCameras[CAM_BATTLE]; BattleStatus* battleStatus = &gBattleStatus; PlayerStatus* playerStatus = &gPlayerStatus; - s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; - s32 actorID = BattleCam_TargetActor & 0xFF; + s32 actorClass = BattleCam_SubjectActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_SubjectActor & 0xFF; f32 x, y, z; s32 screenX, screenY, screenZ; f32 delta; @@ -1378,9 +1392,9 @@ API_CALLABLE(CamPresetUpdate_L) { BattleCam_PosX = camera->lookAt_obj_target.x; BattleCam_PosY = camera->lookAt_obj_target.y; BattleCam_PosZ = camera->lookAt_obj_target.z; - D_8029F288 = camera->auxBoomLength; - BattleCam_InitialBoomYaw = camera->auxBoomYaw; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; + D_8029F288 = camera->params.basic.dist; + BattleCam_InitialBoomYaw = camera->params.basic.yaw; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; } get_screen_coords(CAM_BATTLE, x, y, z, &screenX, &screenY, &screenZ); @@ -1432,18 +1446,18 @@ API_CALLABLE(CamPresetUpdate_L) { return ApiStatus_BLOCK; } -API_CALLABLE(func_8024CE9C) { +API_CALLABLE(BattleCam_Init) { Camera* camera = &gCameras[CAM_BATTLE]; BattleCam_BoomPitch = 8; - camera->auxBoomYaw = 0; - camera->auxBoomZOffset = 0; - BattleCam_BoomYaw = BattleCam_BoomZOffset = 0; + camera->params.basic.yaw = 0; + camera->params.basic.offsetY = 0; + BattleCam_BoomYaw = BattleCam_BoomOffsetY = 0; BattleCam_IsFrozen = FALSE; - D_8029F288 = camera->auxPitch; - BattleCam_InitialBoomLength = camera->auxBoomLength; - BattleCam_InitialBoomPitch = camera->auxBoomPitch; - BattleCam_InitialBoomZOffset = BattleCam_InitialBoomYaw = 0.0f; + D_8029F288 = camera->params.basic.skipRecalc; + BattleCam_InitialBoomLength = camera->params.basic.dist; + BattleCam_InitialBoomPitch = camera->params.basic.pitch; + BattleCam_InitialBoomOffsetY = BattleCam_InitialBoomYaw = 0.0f; return ApiStatus_DONE2; } @@ -1453,18 +1467,18 @@ void btl_cam_use_preset_impl(s32 id) { Evt* newScript; if (!BattleCam_IsFrozen) { - D_8029F2A6 = TRUE; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_ClampPosX = TRUE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_UseLinearInterp = FALSE; - D_8029F2A7 = 0; + BattleCam_ExtraOffsetX = 0; switch (id) { - case BTL_CAM_PRESET_00: - preset = &CamPreset_A; + case BTL_CAM_RESET: + preset = &EVS_BattleCam_Reset; break; - case BTL_CAM_PRESET_01: - preset = &CamPreset_B; + case BTL_CAM_INTERRUPT: + preset = &EVS_BattleCam_Interrupt; break; case BTL_CAM_DEFAULT: if (BattleCam_CurrentPresetID == id) { @@ -1472,699 +1486,699 @@ void btl_cam_use_preset_impl(s32 id) { } BattleCam_BoomLength = 500; BattleCam_MoveTimeLeft = 30; - preset = &EVS_BattleCam_Default; + preset = &EVS_BattleCam_ResetNeutral; break; - case BTL_CAM_PRESET_03: + case BTL_CAM_VIEW_ENEMIES: if (BattleCam_CurrentPresetID == id) { return; } BattleCam_BoomLength = 480; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_D; + BattleCam_BoomOffsetY = 0; + preset = &EVS_BattleCam_ViewEnemies; break; - case BTL_CAM_PRESET_04: + case BTL_CAM_RETURN_HOME: if (BattleCam_CurrentPresetID == id) { return; } BattleCam_BoomLength = 500; BattleCam_MoveTimeLeft = 10; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_E; + BattleCam_BoomOffsetY = 0; + preset = &EVS_BattleCam_ViewEnemies_MaintainY; break; - case BTL_CAM_PRESET_05: + case BTL_CAM_ACTOR_TARGET_MIDPOINT: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_06: + case BTL_CAM_ACTOR_PART: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_G; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkG_Skippable; break; - case BTL_CAM_PRESET_07: + case BTL_CAM_ACTOR_GOAL_SIMPLE: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_H; + preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_08: + case BTL_CAM_ACTOR_SIMPLE: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_I; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_09: - if (BattleCam_ControlScript != &EVS_BattleCam_Default) { + case BTL_CAM_SLOW_DEFAULT: + if (BattleCam_ControlScript != &EVS_BattleCam_ResetNeutral) { BattleCam_BoomLength = 500; BattleCam_MoveTimeLeft = 120; - preset = &EVS_BattleCam_Default; + preset = &EVS_BattleCam_ResetNeutral; break; } return; - case BTL_CAM_PRESET_10: + case BTL_CAM_MIDPOINT_CLOSE: BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 15; + BattleCam_BoomOffsetY = 15; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_11: + case BTL_CAM_MIDPOINT_NORMAL: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_12: + case BTL_CAM_MIDPOINT_FAR: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 30; + BattleCam_BoomOffsetY = 30; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_13: + case BTL_CAM_ACTOR_CLOSE: BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 15; + BattleCam_BoomOffsetY = 15; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_I; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_14: + case BTL_CAM_ACTOR: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_I; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_15: + case BTL_CAM_ACTOR_FAR: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 30; + BattleCam_BoomOffsetY = 30; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_I; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_16: + case BTL_CAM_ACTOR_GOAL_NEAR: BattleCam_BoomLength = 267; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 23; - preset = &CamPreset_H; + BattleCam_BoomOffsetY = 23; + preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_17: + case BTL_CAM_ACTOR_GOAL: BattleCam_BoomLength = 300; BattleCam_BoomYaw = 0; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 8; - preset = &CamPreset_H; + BattleCam_BoomOffsetY = 8; + preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_18: + case BTL_CAM_ACTOR_GOAL_FAR: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_H; + BattleCam_BoomOffsetY = 0; + preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_19: + case BTL_CAM_REPOSITION: BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_20: + case BTL_CAM_FOLLOW_ACTOR_Y: BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_K; + BattleCam_BoomOffsetY = 0; + preset = &EVS_BattleCam_FollowActorY; break; - case BTL_CAM_PRESET_21: + case BTL_CAM_FOLLOW_ACTOR_POS: BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_L; + BattleCam_BoomOffsetY = 0; + preset = &EVS_BattleCam_FollowActorPos; break; - case BTL_CAM_PRESET_25: + case BTL_CAM_PLAYER_FLEE: BattleCam_BoomLength = 266; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 40; + BattleCam_BoomOffsetY = 40; btl_cam_set_target_pos(-80.0f, 0.0f, 0.0f); BattleCam_MoveTimeLeft = 20; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_J; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_24: + case BTL_CAM_PLAYER_DIES: BattleCam_BoomLength = 250; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 14; + BattleCam_BoomOffsetY = 14; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; BattleCam_IsFrozen = TRUE; - preset = &CamPreset_I; + preset = &EVS_BattleCam_FocusActor; break; case BTL_CAM_VICTORY: BattleCam_BoomLength = 255; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 29; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 29; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; btl_cam_set_target_pos(-95.0f, 18.0f, 10.0f); - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_J; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; case BTL_CAM_PLAYER_ENTRY: BattleCam_BoomLength = 230; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 0; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_J; + BattleCam_BoomOffsetY = 0; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; case BTL_CAM_PLAYER_ATTACK_APPROACH: BattleCam_BoomLength = 310; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_27: + case BTL_CAM_PLAYER_PRE_JUMP_FINISH: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 5; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; - break; - case BTL_CAM_PRESET_28: + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; + break; + case BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH: BattleCam_BoomLength = 340; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 5; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_TargetActor = ACTOR_PLAYER; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; break; case BTL_CAM_PLAYER_HIT_SPIKE: case BTL_CAM_PLAYER_HIT_HAZARD: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 15; - BattleCam_BoomZOffset = -32; - D_8029F2A7 = 20; + BattleCam_BoomOffsetY = -32; + BattleCam_ExtraOffsetX = 20; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_I; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_FocusActor; break; case BTL_CAM_PLAYER_CHARGE_UP: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_MoveTimeLeft = 10; - BattleCam_BoomZOffset = 10; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 10; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_PosZ = 0.0f; BattleCam_PosX = -65.0f; BattleCam_PosY = 30.0f; - preset = &CamPreset_N; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; case BTL_CAM_PLAYER_STATUS_AFFLICTED: BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = 24; + BattleCam_BoomOffsetY = 24; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_I; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_34: + case BTL_CAM_PLAYER_JUMP_MIDAIR: BattleCam_BoomLength = 280; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = -4; + BattleCam_BoomOffsetY = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_TargetActor = ACTOR_PLAYER; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_35: + case BTL_CAM_PLAYER_JUMP_FINISH: BattleCam_BoomLength = 380; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 60; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_UseLinearInterp = TRUE; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_37: + case BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = -4; + BattleCam_BoomOffsetY = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_36: + case BTL_CAM_PLAYER_JUMP_FINISH_CLOSE: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 60; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_UseLinearInterp = TRUE; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_38: + case BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = -4; + BattleCam_BoomOffsetY = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_39: + case BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; - break; - case BTL_CAM_PRESET_40: + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; + break; + case BTL_CAM_PLAYER_MULTIBOUNCE: BattleCam_BoomLength = 360; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = -4; + BattleCam_BoomOffsetY = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_M; - break; - case BTL_CAM_PRESET_41: - case BTL_CAM_PRESET_42: + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PLAYER; + preset = &EVS_BattleCam_UnkM_Skippable; + break; + case BTL_CAM_PRESET_UNUSED_29: + case BTL_CAM_PRESET_UNUSED_2A: BattleCam_BoomLength = 200; BattleCam_MoveTimeLeft = 7; BattleCam_MoveTimeTotal = 7; BattleCam_DoneMoving = FALSE; - D_8029F2A6 = FALSE; + BattleCam_ClampPosX = FALSE; preset = BattleCam_ControlScript; break; case BTL_CAM_PLAYER_AIM_HAMMER: BattleCam_BoomLength = 214; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 16; - BattleCam_ModeY = BTL_CAM_MODEY_MINUS_2; + BattleCam_BoomOffsetY = 16; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_SLIGHT; BattleCam_BoomYaw = 0; - BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; break; case BTL_CAM_PLAYER_HAMMER_STRIKE: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 8; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_1; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_45: + case BTL_CAM_PRESET_UNUSED_2D: BattleCam_BoomLength = 430; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 10; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 16; - BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 16; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_PosZ = 0.0f; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; - preset = &CamPreset_N; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_46: + case BTL_CAM_PLAYER_HAMMER_QUAKE: BattleCam_BoomLength = 460; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 10; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 27; - BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_BoomOffsetY = 27; + BattleCam_SubjectActor = ACTOR_PLAYER; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosZ = 0.0f; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; - preset = &CamPreset_N; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_70: + case BTL_CAM_PRESET_UNUSED_46: BattleCam_BoomLength = 390; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 45; + BattleCam_BoomOffsetY = 45; btl_cam_set_target_pos(-70.0f, 0.0f, 0.0f); BattleCam_MoveTimeLeft = 10; - D_8029F2A6 = FALSE; - preset = &CamPreset_J; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_71: + case BTL_CAM_PRESET_UNUSED_47: BattleCam_BoomLength = 500; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 45; + BattleCam_BoomOffsetY = 45; btl_cam_set_target_pos(0.0f, 0.0f, 0.0f); BattleCam_MoveTimeLeft = 40; - D_8029F2A6 = FALSE; - preset = &CamPreset_J; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_69: - case BTL_CAM_PRESET_72: + case BTL_CAM_PLAYER_WISH: + case BTL_CAM_PRESET_UNUSED_48: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 45; + BattleCam_BoomOffsetY = 45; btl_cam_set_target_pos(-50.0f, 0.0f, 0.0f); BattleCam_MoveTimeLeft = 20; - D_8029F2A6 = FALSE; - preset = &CamPreset_J; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_73: + case BTL_CAM_STAR_SPIRIT: BattleCam_BoomLength = 166; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 1; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 17; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 17; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_PosX = -75.0f; BattleCam_PosY = 150.0f; BattleCam_PosZ = 0.0f; - preset = &CamPreset_N; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; case BTL_CAM_PARTNER_APPROACH: BattleCam_BoomLength = 310; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_TargetActor = ACTOR_PARTNER; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_SubjectActor = ACTOR_PARTNER; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_48: + case BTL_CAM_CLOSER_PARTNER_APPROACH: BattleCam_BoomLength = 250; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 120; - BattleCam_BoomZOffset = 16; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; + BattleCam_BoomOffsetY = 16; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; BattleCam_UseLinearInterp = TRUE; BattleCam_BoomYaw = 0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_M; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_49: + case BTL_CAM_PRESET_UNUSED_31: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 120; - BattleCam_BoomZOffset = 16; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; + BattleCam_BoomOffsetY = 16; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; BattleCam_UseLinearInterp = TRUE; BattleCam_BoomYaw = 0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_I; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_50: + case BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 5; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_TargetActor = ACTOR_PARTNER; - D_8029F2A6 = FALSE; - preset = &CamPreset_M; - break; - case BTL_CAM_PRESET_29: - case BTL_CAM_PRESET_51: + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_SubjectActor = ACTOR_PARTNER; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_UnkM_Skippable; + break; + case BTL_CAM_PLAYER_MISTAKE: + case BTL_CAM_PARTNER_MISTAKE: BattleCam_MoveTimeLeft = 50; BattleCam_BoomLength = 500; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_D; + BattleCam_BoomOffsetY = 0; + preset = &EVS_BattleCam_ViewEnemies; break; - case BTL_CAM_PRESET_52: + case BTL_CAM_PARTNER_MIDAIR: BattleCam_BoomLength = 280; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = -4; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_BoomOffsetY = -4; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomYaw = 0; - BattleCam_ModeX = BTL_CAM_MODEX_0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_M; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_53: + case BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2: BattleCam_BoomLength = 380; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 60; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_UseLinearInterp = TRUE; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeX = BTL_CAM_MODEX_0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_M; + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_UnkM_Skippable; break; case BTL_CAM_PARTNER_INJURED: BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = 24; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; + BattleCam_BoomOffsetY = 24; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; BattleCam_BoomYaw = 0; - D_8029F2A6 = FALSE; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_I; + BattleCam_ClampPosX = FALSE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_55: + case BTL_CAM_PARTNER_GOOMPA: BattleCam_BoomLength = 210; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 10; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 10; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_PosZ = 0.0f; BattleCam_PosX = -95.0f; BattleCam_PosY = 22.0f; - preset = &CamPreset_N; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_56: + case BTL_CAM_PRESET_UNUSED_38: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_BoomZOffset = -4; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_BoomOffsetY = -4; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomYaw = 0; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_M; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_57: + case BTL_CAM_PRESET_UNUSED_39: BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 0; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_M; + BattleCam_BoomOffsetY = 0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_58: + case BTL_CAM_PRESET_UNUSED_3A: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomYaw = 0; - BattleCam_BoomZOffset = 10; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; + BattleCam_BoomOffsetY = 10; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; BattleCam_PosZ = 0.0f; BattleCam_PosX = 25.0f; BattleCam_PosY = 60.0f; - preset = &CamPreset_N; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_59: + case BTL_CAM_PARTNER_CLOSE_UP: BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 60; - BattleCam_BoomZOffset = 11; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; + BattleCam_BoomOffsetY = 11; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; BattleCam_UseLinearInterp = TRUE; BattleCam_BoomYaw = 0; - BattleCam_TargetActor = ACTOR_PARTNER; - D_8029F2A6 = FALSE; - preset = &CamPreset_I; + BattleCam_SubjectActor = ACTOR_PARTNER; + BattleCam_ClampPosX = FALSE; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_60: + case BTL_CAM_PRESET_UNUSED_3C: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 8; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_TargetActor = ACTOR_PARTNER; - BattleCam_ModeY = BTL_CAM_MODEY_0; - BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_I; + BattleCam_SubjectActor = ACTOR_PARTNER; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_61: - case BTL_CAM_PRESET_62: + case BTL_CAM_PARTNER_HIT_SPIKE: + case BTL_CAM_PARTNER_HIT_HAZARD: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 15; - BattleCam_BoomZOffset = -32; - D_8029F2A7 = 20; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; + BattleCam_BoomOffsetY = -32; + BattleCam_ExtraOffsetX = 20; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; BattleCam_BoomYaw = 0; - BattleCam_TargetActor = ACTOR_PARTNER; - preset = &CamPreset_I; + BattleCam_SubjectActor = ACTOR_PARTNER; + preset = &EVS_BattleCam_FocusActor; break; case BTL_CAM_ENEMY_APPROACH: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 27; + BattleCam_BoomOffsetY = 27; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_64: + case BTL_CAM_PRESET_UNUSED_40: BattleCam_BoomLength = 358; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 10; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_65: + case BTL_CAM_SLOWER_DEFAULT: BattleCam_MoveTimeLeft = 50; BattleCam_BoomLength = 500; - preset = &EVS_BattleCam_Default; + preset = &EVS_BattleCam_ResetNeutral; break; - case BTL_CAM_PRESET_66: + case BTL_CAM_ENEMY_DIVE: BattleCam_BoomLength = 267; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_67: + case BTL_CAM_PRESET_UNUSED_43: BattleCam_BoomLength = 214; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_68: + case BTL_CAM_PRESET_UNUSED_44: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 4; - BattleCam_BoomZOffset = 16; + BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = BTL_CAM_MODEY_1; - BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_F; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + preset = &EVS_BattleCam_UnkF_Skippable; break; } @@ -2198,29 +2212,29 @@ void btl_cam_use_preset(s32 preset) { void btl_cam_target_actor(s32 actorID) { if (!BattleCam_IsFrozen) { - BattleCam_TargetActor = actorID; + BattleCam_SubjectActor = actorID; } } void btl_cam_target_actor_part(s32 actorID, s32 actorPartIndex) { if (!BattleCam_IsFrozen) { - BattleCam_TargetActor = actorID; - BattleCam_TargetActorPart = actorPartIndex; + BattleCam_SubjectActor = actorID; + BattleCam_SubjectActorPart = actorPartIndex; } } -void btl_cam_set_params(s16 arg0, s16 boomLength, s16 arg2, s16 boomPitch, s32 boomYaw, s32 boomZOffset, s32 arg6, s32 zoomPercent) { +void btl_cam_set_params(b16 skipRecalc, s16 dist, s16 fovScale, s16 pitch, s32 yaw, s32 offsetY, s32 unkParam7, s32 zoomPercent) { Camera* camera = &gCameras[CAM_BATTLE]; if (!BattleCam_IsFrozen) { - camera->auxPitch = arg0; - camera->auxBoomLength = boomLength; - camera->lookAt_dist = arg2; - camera->auxBoomPitch = boomPitch; - camera->auxBoomYaw = boomYaw; - camera->auxBoomZOffset = boomZOffset * 256; - camera->unk_28 = arg6; - camera->zoomPercent = zoomPercent; + camera->params.basic.skipRecalc = skipRecalc; + camera->params.basic.dist = dist; + camera->params.basic.fovScale = fovScale; + camera->params.basic.pitch = pitch; + camera->params.basic.yaw = yaw; + camera->params.basic.offsetY = offsetY * 256; + camera->params.basic.camParam7 = unkParam7; + camera->params.basic.zoomPercent = zoomPercent; } } @@ -2271,7 +2285,7 @@ void btl_cam_add_zoom(s32 zoom) { void btl_cam_set_zoffset(s16 zOffset) { if (!BattleCam_IsFrozen) { - BattleCam_BoomZOffset = zOffset; + BattleCam_BoomOffsetY = zOffset; } } @@ -2279,8 +2293,8 @@ void btl_cam_unfreeze(void) { BattleCam_IsFrozen = FALSE; } -void func_8024E60C(void) { - D_8029F2A6 = FALSE; +void btl_cam_disable_clamp_x(void) { + BattleCam_ClampPosX = FALSE; } API_CALLABLE(UseBattleCamPreset) { @@ -2352,29 +2366,29 @@ API_CALLABLE(SetBattleCamParam) { val = evt_get_variable(script, *args++); switch (mode) { - case AUX_CAM_PARAM_1: - camera->auxPitch = val; + case CAM_PARAM_SKIP_RECALC: + camera->params.basic.skipRecalc = val; break; - case AUX_CAM_BOOM_LENGTH: - camera->auxBoomLength = val; + case CAM_PARAM_BOOM_LENGTH: + camera->params.basic.dist = val; break; - case AUX_CAM_PARAM_3: - camera->lookAt_dist = val; + case CAM_PARAM_FOV_SCALE: + camera->params.basic.fovScale = val; break; - case AUX_CAM_BOOM_PITCH: - camera->auxBoomPitch = val; + case CAM_PARAM_BOOM_PITCH: + camera->params.basic.pitch = val; break; - case AUX_CAM_BOOM_YAW: - camera->auxBoomYaw = val; + case CAM_PARAM_BOOM_YAW: + camera->params.basic.yaw = val; break; - case AUX_CAM_BOOM_ZOFFSET: - camera->auxBoomZOffset = val * 256; + case CAM_PARAM_BOOM_Y_OFFSET: + camera->params.basic.offsetY = val * 256; break; - case AUX_CAM_PARAM_7: - camera->unk_28 = val; + case CAM_PARAM_UNK_7: + camera->params.basic.camParam7 = val; break; - case AUX_CAM_ZOOM_PERCENT: - camera->zoomPercent = val; + case CAM_PARAM_ZOOM_PERCENT: + camera->params.basic.zoomPercent = val; break; } return ApiStatus_DONE2; @@ -2388,14 +2402,14 @@ API_CALLABLE(SetBattleCamParams) { return ApiStatus_DONE2; } - camera->auxPitch = evt_get_variable(script, *args++); - camera->auxBoomLength = evt_get_variable(script, *args++); - camera->lookAt_dist = evt_get_variable(script, *args++); - camera->auxBoomPitch = evt_get_variable(script, *args++); - camera->auxBoomYaw = evt_get_variable(script, *args++); - camera->auxBoomZOffset = evt_get_variable(script, *args++) * 256; - camera->unk_28 = evt_get_variable(script, *args++); - camera->zoomPercent = evt_get_variable(script, *args++); + camera->params.basic.skipRecalc = evt_get_variable(script, *args++); + camera->params.basic.dist = evt_get_variable(script, *args++); + camera->params.basic.fovScale = evt_get_variable(script, *args++); + camera->params.basic.pitch = evt_get_variable(script, *args++); + camera->params.basic.yaw = evt_get_variable(script, *args++); + camera->params.basic.offsetY = evt_get_variable(script, *args++) * 256; + camera->params.basic.camParam7 = evt_get_variable(script, *args++); + camera->params.basic.zoomPercent = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -2413,7 +2427,7 @@ API_CALLABLE(SetBattleCamTarget) { return ApiStatus_DONE2; } -API_CALLABLE(SetBattleCamPos) { +API_CALLABLE(ForceBattleCamTarget) { Bytecode* args = script->ptrReadPos; Camera* camera = &gCameras[CAM_BATTLE]; @@ -2428,25 +2442,25 @@ API_CALLABLE(SetBattleCamPos) { return ApiStatus_DONE2; } -API_CALLABLE(SetBattleCamOffsetZ) { +API_CALLABLE(SetBattleCamOffsetY) { Bytecode* args = script->ptrReadPos; if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - BattleCam_BoomZOffset = evt_get_variable(script, *args++); + BattleCam_BoomOffsetY = evt_get_variable(script, *args++); return ApiStatus_DONE2; } -API_CALLABLE(AddBattleCamOffsetZ) { +API_CALLABLE(AddBattleCamOffsetY) { Bytecode* args = script->ptrReadPos; if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - BattleCam_BoomZOffset += evt_get_variable(script, *args++); + BattleCam_BoomOffsetY += evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -2517,7 +2531,7 @@ API_CALLABLE(MoveBattleCamOver) { return ApiStatus_DONE2; } -API_CALLABLE(SetBattleCamZoom) { +API_CALLABLE(SetBattleCamDist) { Bytecode* args = script->ptrReadPos; if (BattleCam_IsFrozen) { @@ -2528,7 +2542,7 @@ API_CALLABLE(SetBattleCamZoom) { return ApiStatus_DONE2; } -API_CALLABLE(AddBattleCamZoom) { +API_CALLABLE(AddBattleCamDist) { Bytecode* args = script->ptrReadPos; if (BattleCam_IsFrozen) { @@ -2539,15 +2553,15 @@ API_CALLABLE(AddBattleCamZoom) { return ApiStatus_DONE2; } -API_CALLABLE(func_8024ECF8) { +API_CALLABLE(SetBattleCamTargetingModes) { Bytecode* args = script->ptrReadPos; if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - BattleCam_ModeY = evt_get_variable(script, *args++); - BattleCam_ModeX = evt_get_variable(script, *args++); + BattleCam_AdjustTargetYMode = evt_get_variable(script, *args++); + BattleCam_AdjustTargetXMode = evt_get_variable(script, *args++); BattleCam_UseLinearInterp = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -2557,7 +2571,7 @@ API_CALLABLE(FreezeBattleCam) { return ApiStatus_DONE2; } -API_CALLABLE(func_8024EDA4) { - D_8029F2A6 = FALSE; +API_CALLABLE(DisableBattleCamClampX) { + BattleCam_ClampPosX = FALSE; return ApiStatus_DONE2; } diff --git a/src/battle/common/actor/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index 238d3a9f738..e553a5ec1c0 100644 --- a/src/battle/common/actor/albino_dino.inc.c +++ b/src/battle/common/actor/albino_dino.inc.c @@ -260,7 +260,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) ExecGetTID(N(EVS_AddWalkQuakeFX), LVar9) Thread Loop(3) diff --git a/src/battle/common/actor/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index 45ba68d1f89..55c0aba0c07 100644 --- a/src/battle/common/actor/amazy_dayzee.inc.c +++ b/src/battle/common/actor/amazy_dayzee.inc.c @@ -239,7 +239,7 @@ EvtScript N(EVS_Attack_Sing) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 70) Set(LFlag0, FALSE) Label(0) @@ -333,9 +333,9 @@ EvtScript N(EVS_Attack_Sing) = { EvtScript N(EVS_Move_Flee) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 30) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 30) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 20) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index 978630ec76e..d680e521f1c 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -252,7 +252,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -347,7 +347,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09) Wait(20) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 0e1141c097c..9074c6eb4de 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -518,7 +518,7 @@ EvtScript N(EVS_TakeTurn) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index a16624f1db2..b5e690acc7f 100644 --- a/src/battle/common/actor/bob_omb.inc.c +++ b/src/battle/common/actor/bob_omb.inc.c @@ -514,7 +514,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) Call(SetGoalToTarget, ACTOR_SELF) @@ -577,7 +577,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Buildup) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorSize, ACTOR_SELF, LVar3, LVar4) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_SHOCK_HIT, LVar0, LVar1, LVar2, LVar4, LVar3, 0) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) Wait(20) ExecWait(N(EVS_Explode)) @@ -624,7 +624,7 @@ EvtScript N(EVS_Attack_Blast) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) diff --git a/src/battle/common/actor/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index 03d75cca0b2..bf4d0376ea2 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -423,13 +423,13 @@ EvtScript N(EVS_Attack_ShellToss) = { IfEq(LVar0, PHASE_FIRST_STRIKE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim16) Goto(100) EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim10) Wait(10) Thread @@ -660,14 +660,14 @@ EvtScript N(EVS_Attack_SpikeBounce) = { IfEq(LVar0, PHASE_FIRST_STRIKE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim17) Wait(10) Goto(100) EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim11) Wait(10) Thread @@ -704,7 +704,7 @@ EvtScript N(EVS_Attack_SpikeBounce) = { Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(SetActorSpeed, ACTOR_SELF, Float(24.0)) Call(RunToGoal, ACTOR_SELF, 0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Thread Call(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0) Set(LVar0, 0) @@ -1005,9 +1005,9 @@ EvtScript N(EVS_TryGettingUp_Smooth) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim06) Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 20) Call(BattleCamTargetActor, ACTOR_SELF) Call(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1C) @@ -1138,9 +1138,9 @@ EvtScript N(EVS_TryGettingUp_Spiky) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim07) Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 20) Call(BattleCamTargetActor, ACTOR_SELF) Call(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1D) diff --git a/src/battle/common/actor/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index c6163bf8e18..25bb2e0d6df 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -246,13 +246,13 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Fire) Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) Wait(1) Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) Wait(15) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) + Call(UseBattleCamPresetImmediately, BTL_CAM_REPOSITION) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) CaseOrEq(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 35c697b5c17..3015f4021ca 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -582,7 +582,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(HPBarToHome, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -604,11 +604,11 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_FALL_QUICK, 0) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 430) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 430) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -739,7 +739,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0C) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim06) @@ -771,7 +771,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 39cbcd16ea3..06b63fa8160 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -338,7 +338,7 @@ EvtScript N(EVS_Attack_Sting) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 52, 10, 0) @@ -439,9 +439,9 @@ EvtScript N(EVS_SummonSwarmPart) = { EndIf Call(SetPartYaw, ACTOR_SELF, LVar9, 0) IfEq(LVar9, 2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) - Call(SetBattleCamZoom, 400) - Call(SetBattleCamOffsetZ, 30) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) + Call(SetBattleCamDist, 400) + Call(SetBattleCamOffsetY, 30) Call(BattleCamTargetActor, ACTOR_PLAYER) Call(MoveBattleCamOver, 60) EndIf @@ -478,7 +478,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_1, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_2, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_3, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) diff --git a/src/battle/common/actor/cleft.inc.c b/src/battle/common/actor/cleft.inc.c index f5f7bb1dd73..d700af53376 100644 --- a/src/battle/common/actor/cleft.inc.c +++ b/src/battle/common/actor/cleft.inc.c @@ -448,7 +448,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Thread Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 532bf50c93d..ecf666d3f79 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -215,7 +215,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/crazee_dayzee.inc.c b/src/battle/common/actor/crazee_dayzee.inc.c index 9abaf488db7..5376c4eb52b 100644 --- a/src/battle/common/actor/crazee_dayzee.inc.c +++ b/src/battle/common/actor/crazee_dayzee.inc.c @@ -232,7 +232,7 @@ EvtScript N(EVS_Attack_Sing) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 70) Set(LFlag0, FALSE) Label(0) @@ -326,9 +326,9 @@ EvtScript N(EVS_Attack_Sing) = { EvtScript N(EVS_Move_Flee) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 30) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 30) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 20) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index c866ea7aade..7731e150545 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -613,7 +613,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index 8045bbfc4c3..a3f4de220d8 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -454,7 +454,7 @@ EvtScript N(EVS_TakeTurn_Flying) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Dark_Run) @@ -462,7 +462,7 @@ EvtScript N(EVS_TakeTurn_Flying) = { Call(AddGoalPos, ACTOR_SELF, 40, 30, 0) Call(SetActorSpeed, ACTOR_SELF, Float(7.0)) Call(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) + Call(UseBattleCamPresetImmediately, BTL_CAM_INTERRUPT) Wait(5) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -1171,7 +1171,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 6c0da07133c..59fcc5ea404 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -270,7 +270,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim07) Wait(20) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) @@ -596,7 +596,7 @@ API_CALLABLE(N(AdjustFormationPriority)) { EvtScript N(EVS_CopyPartner) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Wait(15) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) diff --git a/src/battle/common/actor/duplighost/ghost_bow.inc.c b/src/battle/common/actor/duplighost/ghost_bow.inc.c index f53e36ac2ac..6a67145987a 100644 --- a/src/battle/common/actor/duplighost/ghost_bow.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bow.inc.c @@ -238,7 +238,7 @@ EvtScript N(EVS_TakeTurn) = { EndLoop EndThread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Thread @@ -253,10 +253,10 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) EndThread Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH_A) Set(LVar0, 55) Loop(20) diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index d429f55645a..ae295d28c42 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -276,7 +276,7 @@ EvtScript N(EVS_HeadbonkFollowthrough) = { EvtScript N(EVS_ApproachPlayer) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -535,7 +535,7 @@ EvtScript N(EVS_Move_Tattle) = { Call(EnableBattleStatusBar, FALSE) Call(SetCamEnabled, CAM_TATTLE, TRUE) Call(SetCamNoDraw, CAM_TATTLE, FALSE) - Call(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024) + Call(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_NO_INTERP, 25, 16, 1024) Call(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -543,8 +543,8 @@ EvtScript N(EVS_Move_Tattle) = { Set(LVar1, 0) Call(N(CalculateTattleCamBoomLength)) Wait(1) - Call(func_802CAE50, CAM_TATTLE, LVar0, LVar1, LVar2) - Call(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) + Call(SetCamLookTarget, CAM_TATTLE, LVar0, LVar1, LVar2) + Call(SetInterpCamParams, CAM_TATTLE, 0, LVar3, 100, 4) Wait(2) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TATTLE_WINDOW_OPEN) Call(SetCamNoDraw, CAM_TATTLE, TRUE) diff --git a/src/battle/common/actor/duplighost/ghost_kooper.inc.c b/src/battle/common/actor/duplighost/ghost_kooper.inc.c index 1161040083e..42970db7da1 100644 --- a/src/battle/common/actor/duplighost/ghost_kooper.inc.c +++ b/src/battle/common/actor/duplighost/ghost_kooper.inc.c @@ -358,10 +358,10 @@ EvtScript N(EVS_TakeTurn) = { Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 75) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar0) Switch(LVar0) CaseEq(PARTNER_RANK_NORMAL) diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index 607bc95981a..cbf3c978a26 100644 --- a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c +++ b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c @@ -237,7 +237,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) diff --git a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c index e2485c7284b..e50ef335ddd 100644 --- a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c +++ b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c @@ -236,7 +236,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 20, 0, 0) @@ -244,7 +244,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Still) Wait(3) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) + Call(UseBattleCamPresetImmediately, BTL_CAM_INTERRUPT) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_PREDIVE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index 10714c2d19c..5625c37011c 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -215,7 +215,7 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -232,11 +232,11 @@ EvtScript N(EVS_TakeTurn) = { Call(RunToGoal, ACTOR_SELF, LVarA, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_08) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(AddBattleCamZoom, -50) + Call(AddBattleCamDist, -50) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense1) Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) diff --git a/src/battle/common/actor/duplighost/ghost_watt.inc.c b/src/battle/common/actor/duplighost/ghost_watt.inc.c index f5c489aa9ea..9d8b1e44c2b 100644 --- a/src/battle/common/actor/duplighost/ghost_watt.inc.c +++ b/src/battle/common/actor/duplighost/ghost_watt.inc.c @@ -338,13 +338,13 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 40) Call(MoveBattleCamOver, 80) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Run) @@ -390,9 +390,9 @@ EvtScript N(EVS_TakeTurn) = { EndSwitch Call(N(WattFXSetActive), 0) Set(LVarA, 40) - Call(AddBattleCamZoom, -75) + Call(AddBattleCamDist, -75) Call(MoveBattleCamOver, LVarA) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfFlag(LVar0, STATUS_FLAG_SHRINK) @@ -417,7 +417,7 @@ EvtScript N(EVS_TakeTurn) = { EndLoop Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Idle) Call(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_IDLE) - Call(AddBattleCamZoom, 75) + Call(AddBattleCamDist, 75) Call(MoveBattleCamOver, 5) Thread Wait(2) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index b90c279ff02..fad83525db5 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -468,7 +468,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -593,7 +593,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorVar, ACTOR_SELF, AVAR_StayNearGound, LVarA) IfEq(LVarA, TRUE) @@ -677,7 +677,7 @@ EvtScript N(EVS_Attack_AirSweep) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) diff --git a/src/battle/common/actor/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c index f1218f4f0ac..473c7896fe2 100644 --- a/src/battle/common/actor/forest_fuzzy.inc.c +++ b/src/battle/common/actor/forest_fuzzy.inc.c @@ -247,15 +247,15 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_Move_Clone) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 330) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 330) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 20) Wait(20) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Thread Wait(30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_RUMBLE) @@ -310,7 +310,7 @@ EvtScript N(EVS_Attack_Leech) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/frost_piranha.inc.c b/src/battle/common/actor/frost_piranha.inc.c index d5b775379a3..1afd330e1ba 100644 --- a/src/battle/common/actor/frost_piranha.inc.c +++ b/src/battle/common/actor/frost_piranha.inc.c @@ -280,10 +280,10 @@ EvtScript N(EVS_Attack_Bite) = { Div(LVar3, 2) Div(LVar4, 2) Div(LVar5, 2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar3, LVar4, LVar5) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 40) Wait(20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) Call(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -293,7 +293,7 @@ EvtScript N(EVS_Attack_Bite) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) @@ -407,7 +407,7 @@ EvtScript N(EVS_Attack_FrostBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index 5b381548902..c416ec1b2f5 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -241,7 +241,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/gloomba.inc.c b/src/battle/common/actor/gloomba.inc.c index 772229672c6..ac0bbfbc173 100644 --- a/src/battle/common/actor/gloomba.inc.c +++ b/src/battle/common/actor/gloomba.inc.c @@ -295,7 +295,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 1f167a946d9..60c6440dc92 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -304,7 +304,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index d23b0fb45b0..7e999aaa326 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -637,7 +637,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Gray_Anim02) @@ -741,11 +741,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -840,7 +840,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index ddda8e59bc2..789f5223bdd 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -639,7 +639,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Green_Anim02) @@ -743,11 +743,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -842,7 +842,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index bdf5e50579d..dc8794f6a11 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -265,7 +265,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim04) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -357,7 +357,7 @@ EvtScript N(EVS_Attack_SleepySpin) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim10) @@ -595,7 +595,7 @@ EvtScript N(EVS_TakeTurn) = { }; EvtScript N(EVS_RandomSummon) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_11) + Call(UseBattleCamPreset, BTL_CAM_MIDPOINT_NORMAL) Call(BattleCamTargetActor, ACTOR_SELF) Call(RandInt, 2, LVar1) Switch(LVar1) @@ -726,7 +726,7 @@ EvtScript N(EVS_SummonShyGuy) = { Set(LVar2, 0) Call(SetActorPos, LVarB, LVar0, LVar1, LVar2) Call(SetAnimation, LVarB, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetGoalToIndex, LVarB, LVarA) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) @@ -747,7 +747,7 @@ EvtScript N(EVS_SummonGrooveGuy) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) ExecWait(N(EVS_PerformSummonDance)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(BattleCamTargetActor, ACTOR_SELF) Call(SummonEnemy, Ref(N(GrooveGuyFormation)), FALSE) Set(LVarB, LVar0) @@ -813,7 +813,7 @@ EvtScript N(EVS_SummonMediGuy) = { Set(LVar2, LVar5) Call(SetActorPos, LVarB, LVar0, LVar1, LVar2) Call(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_SHY_GUY_FLY, SOUND_NONE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSpeed, LVarB, Float(4.0)) Call(RunToGoal, LVarB, 0, FALSE) diff --git a/src/battle/common/actor/gulpit.inc.c b/src/battle/common/actor/gulpit.inc.c index 29ef85dae62..b0af34f67f7 100644 --- a/src/battle/common/actor/gulpit.inc.c +++ b/src/battle/common/actor/gulpit.inc.c @@ -264,7 +264,7 @@ EvtScript N(EVS_Attack_Lick) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -336,7 +336,7 @@ EvtScript N(EVS_Attack_SpitRock) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorPos, LVarA, LVar0, LVar1, LVar2) Add(LVar0, 20) Sub(LVar2, 1) diff --git a/src/battle/common/actor/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index c2c3c02e756..0074e2facbb 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -268,7 +268,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 1) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -282,15 +282,15 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim04) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 27) Set(LVar1, 0) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 45) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 45) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 20) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/hyper_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index 45428f2c02d..fdd78b9f49f 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -153,7 +153,7 @@ EvtScript N(EVS_Move_Charge) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) IfEq(LVar0, AVAL_State_Normal) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -188,7 +188,7 @@ EvtScript N(EVS_Move_Charge) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -214,7 +214,7 @@ EvtScript N(EVS_Move_Charge) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf @@ -746,7 +746,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Thread Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index b8d3b9816b2..1da2768ca81 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Move_Charge) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_IsCharged, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -179,7 +179,7 @@ EvtScript N(EVS_Move_Charge) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) Wait(1) @@ -202,7 +202,7 @@ EvtScript N(EVS_Move_Charge) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf @@ -577,7 +577,7 @@ EvtScript N(EVS_Attack_Headbonk) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index da3ef351862..61387251e9e 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -221,7 +221,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetActorVar, ACTOR_SELF, AVAR_IsCharged, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -247,7 +247,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -288,7 +288,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { Call(SetActorJumpGravity, ACTOR_SELF, Float(0.01)) Call(SetActorSpeed, ACTOR_SELF, Float(15.0)) Call(JumpToGoal, ACTOR_SELF, 0, FALSE, FALSE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(ResetAllActorSounds, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, -60, 0, 0) Call(SetActorJumpGravity, ACTOR_SELF, Float(1.3)) @@ -674,7 +674,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Hyper_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -686,10 +686,10 @@ EvtScript N(EVS_Attack_SkyDive) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -736,10 +736,10 @@ EvtScript N(EVS_Attack_SkyDive) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -914,7 +914,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_IsCharged, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -947,7 +947,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) Wait(1) @@ -970,7 +970,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf @@ -1344,7 +1344,7 @@ EvtScript N(EVS_Attack_Headbonk) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c index 279d72d13ea..f258ee14bcd 100644 --- a/src/battle/common/actor/jungle_fuzzy.inc.c +++ b/src/battle/common/actor/jungle_fuzzy.inc.c @@ -251,15 +251,15 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_Move_Divide) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 330) - Call(SetBattleCamOffsetZ, 30) + Call(SetBattleCamDist, 330) + Call(SetBattleCamOffsetY, 30) Call(MoveBattleCamOver, 20) Wait(20) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Thread Wait(30) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_RUMBLE) @@ -314,7 +314,7 @@ EvtScript N(EVS_Attack_Leech) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index dada91fd35c..61ad81de2be 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -523,7 +523,7 @@ EvtScript N(EVS_TakeTurn) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) @@ -538,11 +538,11 @@ EvtScript N(EVS_TakeTurn) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ShellExit) Wait(8) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index c0a7ed94b34..e25b5192b5c 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -694,7 +694,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim07) Wait(10) @@ -710,7 +710,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim06) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) @@ -725,11 +725,11 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -813,7 +813,7 @@ EvtScript N(EVS_Attack_ChargedToss) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) IfEq(LVar0, AVAL_State_Normal) // charge for attack - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) @@ -852,7 +852,7 @@ EvtScript N(EVS_Attack_ChargedToss) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) Wait(1) @@ -877,7 +877,7 @@ EvtScript N(EVS_Attack_ChargedToss) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf @@ -1056,7 +1056,7 @@ Formation N(BackupFormation) = { EvtScript N(EVS_Move_SummonBackup) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) diff --git a/src/battle/common/actor/lakitu.inc.c b/src/battle/common/actor/lakitu.inc.c index ec9cbcb11a4..edad2282ffc 100644 --- a/src/battle/common/actor/lakitu.inc.c +++ b/src/battle/common/actor/lakitu.inc.c @@ -275,7 +275,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lakitu_Anim03) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -397,7 +397,7 @@ EvtScript N(EVS_Move_SummonSpiny) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(SummonEnemy, Ref(N(SpinyFormation)), FALSE) Call(CopyStatusEffects, ACTOR_SELF, LVar0) diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index 73311ec2ad2..b3482792825 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -366,7 +366,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -491,7 +491,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorVar, ACTOR_SELF, AVAR_CanTackle, LVarA) IfEq(LVarA, TRUE) @@ -575,7 +575,7 @@ EvtScript N(EVS_Attack_ShootPlayer) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) diff --git a/src/battle/common/actor/m_bush.inc.c b/src/battle/common/actor/m_bush.inc.c index cdeb40e7e41..72aa6f718fb 100644 --- a/src/battle/common/actor/m_bush.inc.c +++ b/src/battle/common/actor/m_bush.inc.c @@ -226,7 +226,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MBush_Anim04) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 4c8b22591d2..abfdd35d662 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -408,11 +408,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -818,7 +818,7 @@ EvtScript N(EVS_Move_HealOne) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -898,7 +898,7 @@ EvtScript N(EVS_Move_HealAll) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1453,7 +1453,7 @@ EvtScript N(EVS_Move_MakeClone) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, LVarA, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 25) Wait(25) @@ -1569,7 +1569,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1682,7 +1682,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1795,7 +1795,7 @@ EvtScript N(EVS_Move_TryElectrify) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1913,7 +1913,7 @@ EvtScript N(EVS_Move_TryTransparent) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index e4de6533374..0943aa5f718 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -259,7 +259,7 @@ EvtScript N(EVS_Attack_Swoop) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Thread SetF(LVar0, Float(0.0)) Loop(15) diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index 471d0dc0682..6933c54956d 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -388,7 +388,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -400,10 +400,10 @@ EvtScript N(EVS_Flying_TakeTurn) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -450,10 +450,10 @@ EvtScript N(EVS_Flying_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -771,7 +771,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index b9fe98b5cad..69994288916 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -385,7 +385,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -397,10 +397,10 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -447,10 +447,10 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(SetBattleCamZoom, 300) + Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE) + Call(SetBattleCamDist, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 438297e20e7..f53e7bf5707 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -444,7 +444,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Run) @@ -452,7 +452,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Call(AddGoalPos, ACTOR_SELF, 40, 30, 0) Call(SetActorSpeed, ACTOR_SELF, Float(7.0)) Call(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) + Call(UseBattleCamPresetImmediately, BTL_CAM_INTERRUPT) Wait(5) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -1080,7 +1080,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) @@ -1095,11 +1095,11 @@ EvtScript N(EVS_Downed_TakeTurn) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ShellExit) Wait(8) diff --git a/src/battle/common/actor/piranha_plant.inc.c b/src/battle/common/actor/piranha_plant.inc.c index b85eb875f1a..4c5ac600b6d 100644 --- a/src/battle/common/actor/piranha_plant.inc.c +++ b/src/battle/common/actor/piranha_plant.inc.c @@ -271,7 +271,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 1) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -285,15 +285,15 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SmallPiranha_Anim04) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 20) Set(LVar1, 0) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) - Call(SetBattleCamZoom, 350) - Call(SetBattleCamOffsetZ, 45) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamDist, 350) + Call(SetBattleCamOffsetY, 45) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 20) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 7b27ca6f962..c21533fa28a 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -496,7 +496,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_PartsThrown, LVar0) Switch(LVar0) @@ -918,7 +918,7 @@ EvtScript N(EVS_SummonBackup) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle4) @@ -1043,7 +1043,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1353,7 +1353,7 @@ EvtScript N(EVS_KnockPartAway) = { Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) Goto(1) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(SetPartJumpGravity, ACTOR_SELF, PRT_PROJECTILE, Float(0.1)) Call(SetPartMoveSpeed, ACTOR_SELF, PRT_PROJECTILE, Float(6.0)) Call(JumpPartTo, ACTOR_SELF, PRT_PROJECTILE, 296, 0, 0, 0, TRUE) diff --git a/src/battle/common/actor/pokey_mummy.inc.c b/src/battle/common/actor/pokey_mummy.inc.c index ff61c5c3528..593392da335 100644 --- a/src/battle/common/actor/pokey_mummy.inc.c +++ b/src/battle/common/actor/pokey_mummy.inc.c @@ -624,7 +624,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -931,7 +931,7 @@ EvtScript N(EVS_KnockPartAway) = { Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) Goto(1) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(SetPartJumpGravity, ACTOR_SELF, PRT_PROJECTILE, Float(0.1)) Call(SetPartMoveSpeed, ACTOR_SELF, PRT_PROJECTILE, Float(6.0)) Call(JumpPartTo, ACTOR_SELF, PRT_PROJECTILE, 296, 0, 0, 0, TRUE) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 4ba76fd23d4..2210df26142 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -273,10 +273,10 @@ EvtScript N(EVS_Attack_Bite) = { Div(LVar3, 2) Div(LVar4, 2) Div(LVar5, 2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, LVar3, LVar4, LVar5) - Call(SetBattleCamZoom, 300) - Call(SetBattleCamOffsetZ, 40) + Call(SetBattleCamDist, 300) + Call(SetBattleCamOffsetY, 40) Wait(20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) Call(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -286,7 +286,7 @@ EvtScript N(EVS_Attack_Bite) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) @@ -401,7 +401,7 @@ EvtScript N(EVS_Attack_BadBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) diff --git a/src/battle/common/actor/pyro_guy.inc.c b/src/battle/common/actor/pyro_guy.inc.c index a846fa957f3..935b179b285 100644 --- a/src/battle/common/actor/pyro_guy.inc.c +++ b/src/battle/common/actor/pyro_guy.inc.c @@ -246,7 +246,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PyroGuy_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 6ab80d121b9..85108556a11 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -638,7 +638,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Red_Anim02) @@ -742,11 +742,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -841,7 +841,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/ruff_puff.inc.c b/src/battle/common/actor/ruff_puff.inc.c index 060e508c0d7..5eb02178954 100644 --- a/src/battle/common/actor/ruff_puff.inc.c +++ b/src/battle/common/actor/ruff_puff.inc.c @@ -242,7 +242,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_RuffPuff_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/shy_guy_base.inc.c b/src/battle/common/actor/shy_guy_base.inc.c index 35e9341dd16..38b83c756db 100644 --- a/src/battle/common/actor/shy_guy_base.inc.c +++ b/src/battle/common/actor/shy_guy_base.inc.c @@ -239,7 +239,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SHYGUY_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -334,7 +334,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SHYGUY_Anim09) Wait(20) diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index 37eeee93557..830eb96a3b8 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -768,7 +768,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ShyGuy_Red_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -863,7 +863,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ShyGuy_Red_Anim09) Wait(20) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index b8b3e214ab2..a09c4c71998 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -342,10 +342,10 @@ EvtScript N(EVS_Idle) = { #if !VERSION_PAL Call(FreezeBattleState, TRUE) #endif - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 0, 100, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 340) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 340) Call(MoveBattleCamOver, 10) Switch(LVarA) CaseEq(SYM_SHYGUY) diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index f67e053a04f..b7b98fda08b 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -538,7 +538,7 @@ EvtScript N(EVS_Attack_SpearStab) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim06) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -611,11 +611,11 @@ EvtScript N(EVS_Attack_SpearStab) = { EvtScript N(EVS_Move_SummonBackup) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Call(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim05) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Thread @@ -1266,7 +1266,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_SHY_GUY, ANIM_ShyGuy_Red_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -1361,7 +1361,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_SHY_GUY, ANIM_ShyGuy_Red_Anim09) Wait(20) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 6dfcbca2375..7be7675ca03 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -583,7 +583,7 @@ EvtScript N(EVS_Ceiling_TakeTurn) = { Call(HPBarToHome, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -605,11 +605,11 @@ EvtScript N(EVS_Ceiling_TakeTurn) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_FALL_QUICK, 0) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_05) - Call(SetBattleCamZoom, 430) - Call(SetBattleCamOffsetZ, 20) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT) + Call(SetBattleCamDist, 430) + Call(SetBattleCamOffsetY, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -741,7 +741,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0B) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0F) @@ -773,7 +773,7 @@ EvtScript N(EVS_TakeTurn) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf diff --git a/src/battle/common/actor/spiked_gloomba.inc.c b/src/battle/common/actor/spiked_gloomba.inc.c index 9c168caef3d..316cd1195a3 100644 --- a/src/battle/common/actor/spiked_gloomba.inc.c +++ b/src/battle/common/actor/spiked_gloomba.inc.c @@ -311,7 +311,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 95fa6152ccd..17c7c99e4bb 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -313,7 +313,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 81cf5f9952f..fc2c86e0095 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -409,7 +409,7 @@ EvtScript N(EVS_TakeTurn) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetActorVar, ACTOR_SELF, AVAR_Toppled, LVar0) IfEq(LVar0, 0) @@ -451,7 +451,7 @@ EvtScript N(EVS_TakeTurn) = { EndIf Wait(1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EndIf diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index 5d765375912..7b4c014455d 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -481,7 +481,7 @@ EvtScript N(EVS_Attack_Mallet) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim07) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -499,7 +499,7 @@ EvtScript N(EVS_Attack_Mallet) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim03) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Thread Wait(4) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MALLET_SWING) diff --git a/src/battle/common/actor/stone_chomp.inc.c b/src/battle/common/actor/stone_chomp.inc.c index c0cefc0d703..28c3093bc00 100644 --- a/src/battle/common/actor/stone_chomp.inc.c +++ b/src/battle/common/actor/stone_chomp.inc.c @@ -648,7 +648,7 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.5)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Set(LVar1, 0) diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index da1c518eeee..2559f9d6ad2 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -445,7 +445,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Anim02) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -535,7 +535,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Anim02) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index 947a006b356..511f8d5e2df 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -451,7 +451,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -908,7 +908,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index dc491dccacc..b1e624cbd85 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -218,7 +218,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 9d8a0d4e59e..c66c0916dc9 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -670,7 +670,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_White_Anim02) @@ -774,11 +774,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -985,7 +985,7 @@ EvtScript N(EVS_Move_HealOne) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1071,7 +1071,7 @@ EvtScript N(EVS_Move_HealAll) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 9b17a5e3987..bef046fc879 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -637,7 +637,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Yellow_Anim02) @@ -741,11 +741,11 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) EndIf Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -842,7 +842,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index 798d5d30266..f41cf38ed6b 100644 --- a/src/battle/common/move/HammerSupport.inc.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -126,7 +126,7 @@ EvtScript N(EVS_HammerSupport_E) = { EvtScript N(EVS_HammerSupport_F) = { Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(SetBattleCamOffsetZ, 8) + Call(SetBattleCamOffsetY, 8) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) @@ -165,7 +165,7 @@ EvtScript N(EVS_HammerSupport_F) = { EvtScript N(EVS_Hammer_ReturnHome_A) = { Call(PlayerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(MoveBattleCamOver, 5) Call(func_802693F0) Wait(20) @@ -199,7 +199,7 @@ EvtScript N(EVS_Hammer_ReturnHome_B) = { EvtScript N(EVS_Hammer_ReturnHome_C) = { Call(PlayerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_29) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MISTAKE) Call(func_802693F0) Wait(20) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) @@ -223,7 +223,7 @@ EvtScript N(EVS_UseBasicHammer) = { ExecWait(N(EVS_HammerSupport_C)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, 16) Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(SetBattleCamOffsetZ, 8) + Call(SetBattleCamOffsetY, 8) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) @@ -309,7 +309,7 @@ EvtScript N(EVS_UseSuperHammer) = { ExecWait(N(EVS_HammerSupport_D)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(SetBattleCamOffsetZ, 8) + Call(SetBattleCamOffsetY, 8) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PullBack) @@ -378,7 +378,7 @@ EvtScript N(EVS_UseUltraHammer) = { ExecWait(N(EVS_HammerSupport_E)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(SetBattleCamOffsetZ, 8) + Call(SetBattleCamOffsetY, 8) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PullBack) @@ -447,7 +447,7 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { Call(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) ExecWait(N(EVS_HammerSupport_C)) Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(AddBattleCamZoom, 80) + Call(AddBattleCamDist, 80) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) @@ -505,7 +505,7 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = { Call(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) ExecWait(N(EVS_HammerSupport_D)) Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(AddBattleCamZoom, 80) + Call(AddBattleCamDist, 80) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PullBack) @@ -554,7 +554,7 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = { Call(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) ExecWait(N(EVS_HammerSupport_E)) Call(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - Call(AddBattleCamZoom, 80) + Call(AddBattleCamDist, 80) Call(InitTargetIterator) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PullBack) diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index 99313891989..94a6f5a043a 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -8,7 +8,7 @@ s32 N(D_802A10F0)[] = { 7, 3, 6, 2, 5, 2, 4, 2, }; -API_CALLABLE(N(UnkMoveFunc1)) { +API_CALLABLE(N(CalcJumpReboundTime)) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; f32 posX = playerActor->curPos.x; @@ -72,7 +72,7 @@ EvtScript N(EVS_JumpSupport_Approach) = { End }; -EvtScript N(EVS_JumpSupport_B) = { +EvtScript N(EVS_JumpSupport_CalcJumpTime) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) Call(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) @@ -90,7 +90,7 @@ EvtScript N(EVS_JumpSupport_B) = { End }; -EvtScript N(EVS_JumpSupport_C) = { +EvtScript N(EVS_JumpSupport_CalcJumpTime_Alt1) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) Call(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) @@ -108,7 +108,7 @@ EvtScript N(EVS_JumpSupport_C) = { End }; -EvtScript N(EVS_JumpSupport_D) = { +EvtScript N(EVS_JumpSupport_CalcJumpTime_Alt2) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) Call(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) @@ -126,10 +126,10 @@ EvtScript N(EVS_JumpSupport_D) = { End }; -EvtScript N(EVS_JumpSupport_E) = { +EvtScript N(EVS_JumpSupport_Rebound) = { Call(PlayerYieldTurn) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(func_802693F0) Call(SetGoalToHome, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -137,12 +137,12 @@ EvtScript N(EVS_JumpSupport_E) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.3)) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(N(UnkMoveFunc1)) - Call(func_80273444, LVar0, 0, 0) + Call(N(CalcJumpReboundTime)) + Call(PlayerHopToGoal, LVar0, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(1) Call(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - Call(func_80273444, 6, 0, 2) + Call(PlayerHopToGoal, 6, 0, 2) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(5) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) @@ -158,7 +158,7 @@ EvtScript N(EVS_JumpSupport_E) = { EvtScript N(EVS_JumpSupport_F) = { Call(PlayerYieldTurn) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(func_802693F0) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Sub(LVar0, 50) @@ -166,12 +166,12 @@ EvtScript N(EVS_JumpSupport_F) = { Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(0.8)) - Call(N(UnkMoveFunc1)) - Call(func_80273444, LVar0, 0, 0) + Call(N(CalcJumpReboundTime)) + Call(PlayerHopToGoal, LVar0, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(1) Call(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - Call(func_80273444, 6, 0, 2) + Call(PlayerHopToGoal, 6, 0, 2) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(2) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) @@ -187,7 +187,7 @@ EvtScript N(EVS_JumpSupport_F) = { EvtScript N(EVS_JumpSupport_G) = { Call(PlayerYieldTurn) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_29) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MISTAKE) Call(func_802693F0) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Sub(LVar0, 40) @@ -195,12 +195,12 @@ EvtScript N(EVS_JumpSupport_G) = { Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.0)) - Call(N(UnkMoveFunc1)) - Call(func_80273444, LVar0, 0, 0) + Call(N(CalcJumpReboundTime)) + Call(PlayerHopToGoal, LVar0, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(1) Call(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - Call(func_80273444, 6, 0, 2) + Call(PlayerHopToGoal, 6, 0, 2) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(2) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) @@ -213,10 +213,10 @@ EvtScript N(EVS_JumpSupport_G) = { End }; -EvtScript N(EVS_JumpSupport_H) = { +EvtScript N(EVS_JumpSupport_UnusedRebound) = { Call(PlayerYieldTurn) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(func_802693F0) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -224,12 +224,12 @@ EvtScript N(EVS_JumpSupport_H) = { Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(0.8)) - Call(N(UnkMoveFunc1)) - Call(func_80273444, LVar0, 0, 0) + Call(N(CalcJumpReboundTime)) + Call(PlayerHopToGoal, LVar0, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(1) Call(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - Call(func_80273444, 6, 0, 2) + Call(PlayerHopToGoal, 6, 0, 2) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(2) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) @@ -242,11 +242,11 @@ EvtScript N(EVS_JumpSupport_H) = { End }; -EvtScript N(EVS_JumpSupport_I) = { +EvtScript N(EVS_JumpSupport_BouncingRebound) = { Call(PlayerYieldTurn) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(func_802693F0) Call(SetGoalToHome, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -255,24 +255,24 @@ EvtScript N(EVS_JumpSupport_I) = { Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.0)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Land) - Call(N(UnkMoveFunc1)) - Call(func_80273444, LVar0, 0, 0) + Call(N(CalcJumpReboundTime)) + Call(PlayerHopToGoal, LVar0, 0, 0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 4, Float(1.0)) EndChildThread Call(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - Call(func_80273444, 8, 0, 2) + Call(PlayerHopToGoal, 8, 0, 2) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 4, Float(1.0)) EndChildThread Call(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 6, 0, 2) + Call(PlayerHopToGoal, 6, 0, 2) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 4, Float(1.0)) EndChildThread Call(SetGoalToHome, ACTOR_PLAYER) - Call(func_80273444, 4, 0, 2) + Call(PlayerHopToGoal, 4, 0, 2) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Return End @@ -292,7 +292,7 @@ EvtScript N(EVS_JumpSupport_Miss) = { Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) Wait(20) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(func_802693F0) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Call(PlayerYieldTurn) @@ -306,60 +306,60 @@ EvtScript N(EVS_JumpSupport_Miss) = { }; // load the action command -EvtScript N(EVS_JumpSupport_InitCommand) = { +EvtScript N(EVS_JumpSupport_ApproachAndJump) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Return End }; -EvtScript N(EVS_JumpSupport_L) = { +EvtScript N(EVS_JumpSupport_UnusedSuper) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) ExecWait(N(EVS_JumpSupport_Approach)) Call(InitTargetIterator) - ExecWait(N(EVS_JumpSupport_C)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime_Alt1)) Set(LVarB, LVarA) Add(LVarB, 14) Add(LVarB, -3) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_37) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, LVarA, 0) + Call(PlayerSuperJumpToGoal, LVarA, PLAYER_SUPER_JUMP_0) Wait(7) Call(GetPlayerActionSuccess, LVar0) Switch(LVar0) CaseGt(0) - Call(func_802752AC, 3, 1) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_1) CaseDefault - Call(func_802752AC, 5, 1) + Call(PlayerSuperJumpToGoal, 5, PLAYER_SUPER_JUMP_1) EndSwitch Return End }; -EvtScript N(EVS_JumpSupport_M) = { +EvtScript N(EVS_JumpSupport_UnusedUltra) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_D)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime_Alt2)) Call(SetActionDifficultyTable, Ref(N(D_802A10F0))) Set(LVarB, LVarA) Sub(LVarB, 4) Add(LVarB, -3) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_38) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioW2_Carried, ANIM_MarioB1_Stomp) - Call(func_80275F00, LVarA, 0) + Call(PlayerUltraJumpToGoal, LVarA, PLAYER_ULTRA_JUMP_0) Call(CloseActionCommandInfo) Set(LVar9, 0) Call(GetPlayerActionSuccess, LVar0) @@ -373,14 +373,14 @@ EvtScript N(EVS_JumpSupport_M) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) Call(action_command_jump_start, 13, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_39) - Call(func_80275F00, 15, 2) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP) + Call(PlayerUltraJumpToGoal, 15, PLAYER_ULTRA_JUMP_2) Goto(10) Else Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) Call(action_command_jump_start, 2, 3) - Call(func_80275F00, 4, 1) + Call(PlayerUltraJumpToGoal, 4, PLAYER_ULTRA_JUMP_1) Goto(10) EndIf Label(10) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index ed4b3eff2d1..bda149c4693 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -304,7 +304,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } } - btl_cam_use_preset(BTL_CAM_PRESET_03); + btl_cam_use_preset(BTL_CAM_VIEW_ENEMIES); btl_cam_move(30); script->functionTemp[FT_DELAY] = 15; script->functionTemp[FT_STATE] = PEACH_STAR_BEAM_MAKE_ADDITIONAL_EFFECTS; diff --git a/src/battle/common/move/StarPowerSupport.inc.c b/src/battle/common/move/StarPowerSupport.inc.c index 2912ab356aa..10100d03861 100644 --- a/src/battle/common/move/StarPowerSupport.inc.c +++ b/src/battle/common/move/StarPowerSupport.inc.c @@ -89,7 +89,7 @@ API_CALLABLE(N(SetStarSpiritSize)) { EvtScript N(EVS_StarPower_WishForSpirit) = { Call(GetOwnerID, LVarA) IfEq(LVarA, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -112,7 +112,7 @@ EvtScript N(EVS_StarPower_WishForSpirit) = { Wait(30) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_WALK) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -144,7 +144,7 @@ EvtScript N(EVS_StarPower_WishForSpirit) = { EvtScript N(EVS_StarPower_WishForBeam) = { Call(GetOwnerID, LVarA) IfEq(LVarA, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -167,7 +167,7 @@ EvtScript N(EVS_StarPower_WishForBeam) = { Wait(30) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_WALK) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -199,7 +199,7 @@ EvtScript N(EVS_StarPower_WishForBeam) = { EvtScript N(EVS_StarPower_SpiritSummoned) = { Wait(8) Call(SetForegroundModelsVisible, FALSE) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) + Call(UseBattleCamPresetImmediately, BTL_CAM_STAR_SPIRIT) Call(MoveBattleCamOver, 1) Call(PlaySound, SOUND_STAR_SPIRIT_APPEAR_A) Call(CreateNpc, NPC_BTL_SPIRIT, LVar0) @@ -220,7 +220,7 @@ EvtScript N(EVS_StarPower_SpiritSummoned) = { Call(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) Thread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) EndThread Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 50) diff --git a/src/battle/common/move/UseItem.inc.c b/src/battle/common/move/UseItem.inc.c index 8516eb746d7..2d5de428981 100644 --- a/src/battle/common/move/UseItem.inc.c +++ b/src/battle/common/move/UseItem.inc.c @@ -4,7 +4,7 @@ /// Provide arg `TRUE` on `LVar1` to disable refunding. EvtScript N(UseItemWithEffect) = { IfEq(LVar1, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) @@ -45,10 +45,10 @@ EvtScript N(UseItemWithEffect) = { }; EvtScript N(UseItem) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -85, 1, 0) - Call(SetBattleCamOffsetZ, 41) - Call(SetBattleCamZoom, 248) + Call(SetBattleCamOffsetY, 41) + Call(SetBattleCamDist, 248) Call(MoveBattleCamOver, 30) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) diff --git a/src/battle/dmg_player.c b/src/battle/dmg_player.c index 3717279cfcc..3939391832d 100644 --- a/src/battle/dmg_player.c +++ b/src/battle/dmg_player.c @@ -1148,7 +1148,7 @@ API_CALLABLE(GetMenuSelection) { return ApiStatus_DONE2; } -API_CALLABLE(func_80273444) { +API_CALLABLE(PlayerHopToGoal) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Actor* player = battleStatus->playerActor; @@ -1782,7 +1782,7 @@ API_CALLABLE(ForceDisablePlayerBlurImmediately) { return ApiStatus_DONE2; } -API_CALLABLE(func_80274A18) { +API_CALLABLE(PlayerBasicJumpToGoal) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Actor* player = battleStatus->playerActor; @@ -1796,17 +1796,24 @@ API_CALLABLE(func_80274A18) { f64 acc1, acc2; f64 acc3, acc4; + enum { + BASIC_STATE_00 = 0, + BASIC_STATE_01 = 1, + BASIC_STATE_02 = 2, + BASIC_STATE_03 = 3, + }; + if (isInitialCall) { player->state.moveTime = evt_get_variable(script, *args++); player->state.moveArcAmplitude = evt_get_variable(script, *args++); script->functionTemp[1] = 0; - script->functionTemp[0] = 0; + script->functionTemp[0] = BASIC_STATE_00; if (player->state.moveArcAmplitude == 1) { - script->functionTemp[0] = 2; + script->functionTemp[0] = BASIC_STATE_02; } } - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0] == BASIC_STATE_00) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -1870,11 +1877,11 @@ API_CALLABLE(func_80274A18) { } set_actor_anim(0, 0, playerState->animJumpRise); sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); - script->functionTemp[0] = 1; + script->functionTemp[0] = BASIC_STATE_01; } switch (script->functionTemp[0]) { - case 1: + case BASIC_STATE_01: if (playerState->vel > PI_S / 2) { set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpFall); } @@ -1909,7 +1916,7 @@ API_CALLABLE(func_80274A18) { return ApiStatus_DONE1; } break; - case 2: + case BASIC_STATE_02: if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED) { return ApiStatus_DONE2; } @@ -1922,9 +1929,9 @@ API_CALLABLE(func_80274A18) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; - script->functionTemp[0] = 3; + script->functionTemp[0] = BASIC_STATE_03; // fallthrough - case 3: + case BASIC_STATE_03: temp_f20_2 = playerState->curPos.x; playerState->curPos.x = temp_f20_2 + ((playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))) / 33.0); playerState->curPos.y -= (playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))); @@ -1946,7 +1953,7 @@ API_CALLABLE(func_80274A18) { return ApiStatus_BLOCK; } -API_CALLABLE(func_802752AC) { +API_CALLABLE(PlayerSuperJumpToGoal) { Bytecode* args = script->ptrReadPos; Actor* player = gBattleStatus.playerActor; ActorState* playerState = &player->state; @@ -1963,23 +1970,33 @@ API_CALLABLE(func_802752AC) { f64 acc5, acc6; f64 acc7, acc8; + enum { + SUPER_STATE_00 = 0, + SUPER_STATE_01 = 1, + SUPER_STATE_02 = 2, + SUPER_STATE_10 = 10, + SUPER_STATE_11 = 11, + SUPER_STATE_20 = 20, + SUPER_STATE_21 = 21, + }; + if (isInitialCall) { player->state.moveTime = evt_get_variable(script, *args++); player->state.moveArcAmplitude = evt_get_variable(script, *args++); - script->functionTemp[0] = 0; - if (player->state.moveArcAmplitude == 1 || - player->state.moveArcAmplitude == 5 || - player->state.moveArcAmplitude == 6) + script->functionTemp[0] = SUPER_STATE_00; + if (player->state.moveArcAmplitude == PLAYER_SUPER_JUMP_1 || + player->state.moveArcAmplitude == PLAYER_SUPER_JUMP_5 || + player->state.moveArcAmplitude == PLAYER_SUPER_JUMP_6) { - script->functionTemp[0] = 10; + script->functionTemp[0] = SUPER_STATE_10; } - if (playerState->moveArcAmplitude == 2) { - script->functionTemp[0] = 20; + if (playerState->moveArcAmplitude == PLAYER_SUPER_JUMP_2) { + script->functionTemp[0] = SUPER_STATE_20; } } switch (script->functionTemp[0]) { - case 0: + case SUPER_STATE_00: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2028,9 +2045,9 @@ API_CALLABLE(func_802752AC) { acc2 = playerState->acceleration; playerState->vel = (vel2 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.01 * acc2) + acc2)); } - script->functionTemp[0] = 1; + script->functionTemp[0] = SUPER_STATE_01; break; - case 10: + case SUPER_STATE_10: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2077,9 +2094,9 @@ API_CALLABLE(func_802752AC) { playerState->vel = (vel4 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.01 * acc4) + acc4)); } playerState->curPos.y = player->curPos.y - playerState->bounceDivisor; - script->functionTemp[0] = 11; + script->functionTemp[0] = SUPER_STATE_11; break; - case 20: + case SUPER_STATE_20: playerState->moveTime = 1; playerState->unk_24 = 90.0f; playerState->bounceDivisor = (fabsf(playerState->unk_18.x - playerState->unk_18.y) / 16.5); @@ -2087,12 +2104,12 @@ API_CALLABLE(func_802752AC) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; - script->functionTemp[0] = 21; + script->functionTemp[0] = SUPER_STATE_21; break; } switch (script->functionTemp[0]) { - case 1: + case SUPER_STATE_01: if (playerState->moveArcAmplitude == 0) { vel5 = playerState->vel; acc5 = playerState->acceleration; @@ -2119,10 +2136,10 @@ API_CALLABLE(func_802752AC) { player->rotPivotOffset.y = 14; player->rot.z -= 66.0f; playerState->moveTime = 7; - script->functionTemp[0] = 2; + script->functionTemp[0] = SUPER_STATE_02; } break; - case 2: + case SUPER_STATE_02: player->rotPivotOffset.y = 14; player->rot.z -= 66.0f; playerState->moveTime--; @@ -2133,7 +2150,7 @@ API_CALLABLE(func_802752AC) { return ApiStatus_DONE1; } break; - case 11: + case SUPER_STATE_11: playerState->curPos.x += playerState->velStep.x; playerState->curPos.y += playerState->velStep.y; playerState->curPos.z += playerState->velStep.z; @@ -2165,7 +2182,7 @@ API_CALLABLE(func_802752AC) { return ApiStatus_DONE1; } break; - case 21: + case SUPER_STATE_21: temp_f20 = playerState->curPos.x; temp_f20 += (playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))) / 33.0; playerState->curPos.x = temp_f20; @@ -2188,7 +2205,7 @@ API_CALLABLE(func_802752AC) { return ApiStatus_BLOCK; } -API_CALLABLE(func_80275F00) { +API_CALLABLE(PlayerUltraJumpToGoal) { Bytecode* args = script->ptrReadPos; Actor* player = gBattleStatus.playerActor; ActorState* playerState = &player->state; @@ -2212,24 +2229,35 @@ API_CALLABLE(func_80275F00) { f64 temp_f22_6; f64 temp_f22_7; + enum { + ULTRA_STATE_00 = 0, + ULTRA_STATE_01 = 1, + ULTRA_STATE_10 = 10, + ULTRA_STATE_11 = 11, + ULTRA_STATE_20 = 20, + ULTRA_STATE_21 = 21, + ULTRA_STATE_30 = 30, + ULTRA_STATE_31 = 31, + }; + if (isInitialCall) { player->state.moveTime = evt_get_variable(script, *args++); player->state.moveArcAmplitude = evt_get_variable(script, *args++); script->functionTemp[1] = 0; - script->functionTemp[0] = 0; - if (player->state.moveArcAmplitude == 1) { - script->functionTemp[0] = 11; + script->functionTemp[0] = ULTRA_STATE_00; + if (player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_1) { + script->functionTemp[0] = ULTRA_STATE_11; } - if (player->state.moveArcAmplitude == 3) { - script->functionTemp[0] = 20; + if (player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_3) { + script->functionTemp[0] = ULTRA_STATE_20; } - if (player->state.moveArcAmplitude == 2 || player->state.moveArcAmplitude == 4) { - script->functionTemp[0] = 30; + if (player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_2 || player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_4) { + script->functionTemp[0] = ULTRA_STATE_30; } } switch (script->functionTemp[0]) { - case 0: + case ULTRA_STATE_00: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2270,9 +2298,9 @@ API_CALLABLE(func_80275F00) { temp_f22 = playerState->acceleration; playerState->unk_28 = 360 / playerState->moveTime; playerState->vel = temp_f20 + (((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53) * temp_f22) + temp_f22); - script->functionTemp[0] = 1; + script->functionTemp[0] = ULTRA_STATE_01; break; - case 10: + case ULTRA_STATE_10: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2314,9 +2342,9 @@ API_CALLABLE(func_80275F00) { playerState->unk_28 = 360 / playerState->moveTime; playerState->vel = temp_f20_2 + (((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53) * temp_f22_2) + temp_f22_2); - script->functionTemp[0] = 11; + script->functionTemp[0] = ULTRA_STATE_11; break; - case 20: + case ULTRA_STATE_20: playerState->moveTime = 1; set_actor_anim(ACTOR_PLAYER, 1, ANIM_Mario1_SpinFall); player->rot.y = 0.0f; @@ -2326,9 +2354,9 @@ API_CALLABLE(func_80275F00) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; - script->functionTemp[0] = 21; + script->functionTemp[0] = ULTRA_STATE_21; break; - case 30: + case ULTRA_STATE_30: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2366,12 +2394,12 @@ API_CALLABLE(func_80275F00) { temp_f22_7 = playerState->vel; temp_f22_7 = temp_f22_7 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f22_3) + temp_f22_3); playerState->vel = temp_f22_7; - script->functionTemp[0] = 31; + script->functionTemp[0] = ULTRA_STATE_31; break; } switch (script->functionTemp[0]) { - case 1: + case ULTRA_STATE_01: temp_f22_4 = playerState->vel; temp_f20_4 = playerState->acceleration; playerState->vel = temp_f22_4 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f20_4) + temp_f20_4); @@ -2395,7 +2423,7 @@ API_CALLABLE(func_80275F00) { return ApiStatus_DONE1; } break; - case 11: + case ULTRA_STATE_11: temp_f22_6 = playerState->vel; temp_f20_7 = playerState->acceleration; playerState->vel = temp_f22_6 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f20_7) + temp_f20_7); @@ -2426,7 +2454,7 @@ API_CALLABLE(func_80275F00) { return ApiStatus_DONE1; } break; - case 21: + case ULTRA_STATE_21: temp_f20_5 = playerState->curPos.x; temp_f20_5 += (playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))) / 33.0; playerState->curPos.x = temp_f20_5; @@ -2444,7 +2472,7 @@ API_CALLABLE(func_80275F00) { return ApiStatus_DONE1; } break; - case 31: + case ULTRA_STATE_31: temp_f22_5 = playerState->vel; temp_f20_6 = playerState->acceleration; playerState->vel = temp_f22_5 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f20_6) + temp_f20_6); diff --git a/src/battle/level_up.c b/src/battle/level_up.c index 980b76aa1ea..d6fe1a4d2b2 100644 --- a/src/battle/level_up.c +++ b/src/battle/level_up.c @@ -1173,7 +1173,7 @@ void btl_state_update_celebration(void) { bgm_set_song(0, -1, 0, 1500, 8); } bFadeToBlackAmt = 0; - btl_cam_set_params(1, 270, 100, 8, 0, 0x2400, 0, 100); + btl_cam_set_params(TRUE, 270, 100, 8, 0, 0x2400, 0, 100); set_actor_anim(0, 0, ANIM_MarioB1_AdjustCap); if (partner != NULL) { set_actor_anim(ACTOR_PARTNER, 0, D_80284154[playerData->curPartner]); diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index 800e8f9b5f7..891cf02b054 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -215,7 +215,7 @@ EvtScript N(EVS_802A3948) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -266,7 +266,7 @@ EvtScript N(EVS_802A3C90) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -317,7 +317,7 @@ EvtScript N(EVS_802A3FD8) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index 66bb3585d9c..8506e059b82 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -224,7 +224,7 @@ EvtScript N(EVS_802A39C8) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -276,7 +276,7 @@ EvtScript N(EVS_802A3D1C) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -328,7 +328,7 @@ EvtScript N(EVS_802A4070) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index 3a8bdb7e029..33f6570675d 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -224,7 +224,7 @@ EvtScript N(EVS_802A39C8) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -274,7 +274,7 @@ EvtScript N(EVS_802A3CF4) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -324,7 +324,7 @@ EvtScript N(EVS_802A4020) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c index 1bff3443b78..efd1d531a08 100644 --- a/src/battle/move/hammer/hammer_throw.c +++ b/src/battle/move/hammer/hammer_throw.c @@ -175,7 +175,7 @@ EvtScript N(EVS_UseMove_Impl) = { EndSwitch Call(InitTargetIterator) Call(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) - Call(AddBattleCamZoom, 50) + Call(AddBattleCamDist, 50) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP) Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c index bd90792c08a..2dcddcf35d8 100644 --- a/src/battle/move/hammer/mega_quake.c +++ b/src/battle/move/hammer/mega_quake.c @@ -143,7 +143,7 @@ EvtScript N(EVS_802A3238) = { EndSwitch Call(GetPlayerActionSuccess, LVar0) IfGt(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(MoveBattleCamOver, 5) Wait(15) SetF(LVar6, Float(0.0)) @@ -158,7 +158,7 @@ EvtScript N(EVS_802A3238) = { EndLoop Wait(10) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(MoveBattleCamOver, 50) EndIf Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c index 9fd5b6de444..e07fcdccbc0 100644 --- a/src/battle/move/hammer/power_quake.c +++ b/src/battle/move/hammer/power_quake.c @@ -104,10 +104,10 @@ EvtScript N(EVS_802A3168) = { EndSwitch Call(GetPlayerActionSuccess, LVar0) IfGt(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(MoveBattleCamOver, 5) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(MoveBattleCamOver, 50) EndIf Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c index 7753559f7eb..27e720a3842 100644 --- a/src/battle/move/hammer/quake_hammer.c +++ b/src/battle/move/hammer/quake_hammer.c @@ -89,10 +89,10 @@ EvtScript N(EVS_802A3168) = { EndSwitch Call(GetPlayerActionSuccess, LVar0) IfGt(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(MoveBattleCamOver, 5) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(MoveBattleCamOver, 50) EndIf Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c index 07d4186a44d..1f6615f4c79 100644 --- a/src/battle/move/hammer/spin_smash.c +++ b/src/battle/move/hammer/spin_smash.c @@ -134,7 +134,7 @@ EvtScript N(EVS_UseMove1_Impl) = { Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Swing) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(StartRumble, BTL_RUMBLE_PLAYER_MIN) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_1) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) @@ -256,7 +256,7 @@ EvtScript N(EVS_UseMove2_Impl) = { Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Swing) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(StartRumble, BTL_RUMBLE_PLAYER_LIGHT) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_2) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) @@ -376,7 +376,7 @@ EvtScript N(EVS_UseMove3_Impl) = { Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Swing) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_QUAKE) Call(StartRumble, BTL_RUMBLE_PLAYER_HEAVY) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_3) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c index c25ec320eb0..706d78cf216 100644 --- a/src/battle/move/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -51,7 +51,7 @@ EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayLi EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_COCONUT) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) Call(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index 36ec27e4275..514b1795b15 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -25,19 +25,19 @@ API_CALLABLE(N(AnimateDizzyDialCameraFX)) { script->functionTemp[1] = 0; script->functionTemp[2] = 0; sfx_play_sound(SOUND_DIZZY_DIAL); - camera->auxPitch = 0; + camera->params.basic.skipRecalc = FALSE; ScreenBlurWorkerID = create_worker_frontUI(NULL, N(worker_render_screen_blur)); script->functionTemp[0] = 1; case 1: camera->flags |= CAMERA_FLAG_SHAKING; angle = script->functionTemp[1]; - guRotateF(camera->viewMtxShaking, angle, 0.0f, 0.0f, 1.0f); + guRotateF(camera->mtxViewShaking, angle, 0.0f, 0.0f, 1.0f); script->functionTemp[1] = 2.0 * ((1.0 - sin_rad(DEG_TO_RAD(script->functionTemp[2] + 90))) * 360.0); script->functionTemp[2]++; if (script->functionTemp[2] <= 90) { return ApiStatus_BLOCK; } - camera->auxPitch = 0; + camera->params.basic.skipRecalc = FALSE; camera->flags &= ~CAMERA_FLAG_SHAKING; free_worker(ScreenBlurWorkerID); return ApiStatus_DONE2; @@ -56,13 +56,13 @@ EvtScript N(EVS_UseItem) = { Wait(10) Thread Wait(5) - Call(AddBattleCamZoom, -250) + Call(AddBattleCamDist, -250) Call(MoveBattleCamOver, 80) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Wait(80) - Call(AddBattleCamZoom, 250) + Call(AddBattleCamDist, 250) Call(MoveBattleCamOver, 3) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) EndThread Call(N(AnimateDizzyDialCameraFX)) Thread @@ -74,9 +74,9 @@ EvtScript N(EVS_UseItem) = { Call(ShakeCam, CAM_BATTLE, 0, 2, Float(1.0)) Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.5)) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, FALSE) EndThread Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c index cca453f8503..98bd68dccc0 100644 --- a/src/battle/move/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -50,7 +50,7 @@ EntityModelScript N(EMS_DustyHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(DustyHamme EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_DUSTY_HAMMER) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) Call(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index a1701da99e9..79dd504741c 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -151,7 +151,7 @@ EntityModelScript unusedModelScript = STANDARD_ENTITY_MODEL_SCRIPT(N(Frame4Gfx), EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_EGG_MISSILE) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) Call(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index 67baa4edba0..a240cf8f682 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -63,7 +63,7 @@ EvtScript N(EVS_UseItem) = { EndLoop EndThread Wait(80) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/food.c b/src/battle/move/item/food.c index 90eefcdd066..c8a3fa916b7 100644 --- a/src/battle/move/item/food.c +++ b/src/battle/move/item/food.c @@ -145,13 +145,13 @@ EvtScript N(EVS_UseOnPartner) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, -125, 1, 0) - Call(SetBattleCamOffsetZ, 41) - Call(SetBattleCamZoom, 248) + Call(SetBattleCamOffsetY, 41) + Call(SetBattleCamDist, 248) Call(MoveBattleCamOver, 25) Call(SetVirtualEntityJumpGravity, LVarA, Float(0.4)) Add(LVar2, 5) Call(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 25) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 25) @@ -186,7 +186,7 @@ EvtScript N(EVS_UseItem) = { #define LV_IsDrink LVarD #define LV_NoRefund LVarE #define LV_IsHarmful LVarF - + Set(LV_NoRefund, LVar1) Call(GetMenuSelection, LVar0, LVar1, LVar2) Set(LV_ItemID, LVar1) diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index 8271aef1cad..8b7adb91d87 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -37,14 +37,14 @@ EvtScript N(EVS_UseItem) = { PlayEffect(EFFECT_FRIGHT_JAR, 0, LVar0, LVar1, LVar2, Float(1.5), 60, 0) Wait(20) Loop(4) - Call(AddBattleCamZoom, -100) + Call(AddBattleCamDist, -100) Call(MoveBattleCamOver, 2) Wait(2) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 2) Wait(2) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index a1664be98a1..49f090d9950 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -53,7 +53,7 @@ EvtScript N(EVS_UseItem) = { Call(N(func_802A123C_72619C)) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 20) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HUSTLE_WHISTLE) diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index 47a603e2ad6..538d63eeb50 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -96,7 +96,7 @@ EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayLi EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_INSECTICIDE_HERB) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) Call(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/life_shroom.c b/src/battle/move/item/life_shroom.c index 8f94f81cc3a..bd623f29902 100644 --- a/src/battle/move/item/life_shroom.c +++ b/src/battle/move/item/life_shroom.c @@ -135,13 +135,13 @@ EvtScript N(EVS_UseOnPartner) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, -125, 1, 0) - Call(SetBattleCamOffsetZ, 41) - Call(SetBattleCamZoom, 248) + Call(SetBattleCamOffsetY, 41) + Call(SetBattleCamDist, 248) Call(MoveBattleCamOver, 25) Call(SetVirtualEntityJumpGravity, LVarA, Float(0.4)) Add(LVar2, 5) Call(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 25) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 25) diff --git a/src/battle/move/item/mushroom.c b/src/battle/move/item/mushroom.c index 2fc9865e681..e1e46815183 100644 --- a/src/battle/move/item/mushroom.c +++ b/src/battle/move/item/mushroom.c @@ -134,13 +134,13 @@ EvtScript N(EVS_UseOnPartner) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, -125, 1, 0) - Call(SetBattleCamOffsetZ, 41) - Call(SetBattleCamZoom, 248) + Call(SetBattleCamOffsetY, 41) + Call(SetBattleCamDist, 248) Call(MoveBattleCamOver, 25) Call(SetVirtualEntityJumpGravity, LVarA, Float(0.4)) Add(LVar2, 5) Call(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 25) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 25) diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index d581dd97414..4c688eababe 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -50,7 +50,7 @@ EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayLi EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_PEBBLE) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) Call(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/please_come_back.c b/src/battle/move/item/please_come_back.c index 215bcc17c9e..6fd2c5a9401 100644 --- a/src/battle/move/item/please_come_back.c +++ b/src/battle/move/item/please_come_back.c @@ -14,7 +14,7 @@ EvtScript N(EVS_UseItem) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetActorSpeed, ACTOR_PLAYER, Float(4.0)) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.8)) - Call(func_80273444, 4, 0, 0) + Call(PlayerHopToGoal, 4, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioW2_PleaseComeBack) Wait(8) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 66ea5ccf0e9..68373c690b7 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -99,9 +99,9 @@ EvtScript N(EVS_UseItem) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(0.6)) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index 6ce6f48b148..2ada58df89e 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -116,7 +116,7 @@ EvtScript N(EVS_UseItem) = { EndLoop EndThread Wait(90) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index 147fea07832..8d04c7a96ea 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -290,10 +290,10 @@ EntityModelScript N(modelCommandList3) = { EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_SLEEPY_SHEEP) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -67, -15, -5) - Call(SetBattleCamOffsetZ, 45) - Call(SetBattleCamZoom, 169) + Call(SetBattleCamOffsetY, 45) + Call(SetBattleCamDist, 169) Call(MoveBattleCamOver, 50) Thread Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SHEEP_STAMPEDE) @@ -349,7 +349,7 @@ EvtScript N(EVS_UseItem) = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.8)) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 15, 0, 0) + Call(PlayerHopToGoal, 15, 0, 0) Thread Wait(5) Call(SetActorYaw, ACTOR_PLAYER, 150) @@ -413,7 +413,7 @@ EvtScript N(EVS_UseItem) = { Call(DeleteVirtualEntity, LVarA) EndThread Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index d0826652f38..8b6ac99a208 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -42,7 +42,7 @@ EvtScript N(EVS_UseItem) = { EndLoop EndThread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 50) Wait(50) PlayEffect(EFFECT_SNOWMAN_DOLL, 0, 0, 0, 20, Float(1.0), 160, 0) diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index 768e47b5049..7bd6396ace8 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UseItem) = { PlayEffect(EFFECT_STOP_WATCH, 0, 0, 0, 0, Float(1.0), 200, 0) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_TIME_OUT) Wait(200) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/super_soda.c b/src/battle/move/item/super_soda.c index fc1e7a75946..f5693f269af 100644 --- a/src/battle/move/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -138,13 +138,13 @@ EvtScript N(EVS_UseOnPartner) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, -125, 1, 0) - Call(SetBattleCamOffsetZ, 41) - Call(SetBattleCamZoom, 248) + Call(SetBattleCamOffsetY, 41) + Call(SetBattleCamDist, 248) Call(MoveBattleCamOver, 25) Call(SetVirtualEntityJumpGravity, LVarA, Float(0.4)) Add(LVar2, 5) Call(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 25) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 25) diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index 26c61df3f05..8026bc19337 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -66,7 +66,7 @@ EvtScript N(EVS_UseItem) = { Call(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) Label(1) Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Wait(30) diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index 9dcd693769c..a457e595aec 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -72,7 +72,7 @@ EvtScript N(EVS_UseItem) = { IfNe(LVar0, ITER_NO_MORE) Goto(0) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Wait(30) diff --git a/src/battle/move/item/ultra_shroom.c b/src/battle/move/item/ultra_shroom.c index 8dd8c155f7a..b2663513739 100644 --- a/src/battle/move/item/ultra_shroom.c +++ b/src/battle/move/item/ultra_shroom.c @@ -33,7 +33,7 @@ API_CALLABLE(N(HealPlayer10)) { EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_SUPER_SHROOM) ExecWait(N(UseItemWithEffect)) - Call(AddBattleCamZoom, 50) + Call(AddBattleCamDist, 50) Call(MoveBattleCamOver, 20) ExecWait(N(EatItem)) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index abb20d71491..bec60ece4c6 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -51,7 +51,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_Normal) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(GetActionCommandMode, LVar0) IfEq(LVar0, ACTION_COMMAND_MODE_TUTORIAL) Call(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) @@ -94,10 +94,10 @@ EvtScript N(EVS_UseMove_Normal) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -107,18 +107,18 @@ EvtScript N(EVS_UseMove_Normal) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_Super) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -146,10 +146,10 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -159,21 +159,21 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_Ultra) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -201,10 +201,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -214,13 +214,13 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; @@ -252,7 +252,7 @@ EvtScript N(EVS_FirstStrike_Normal) = { Call(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) + Call(UseBattleCamPresetImmediately, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) @@ -264,11 +264,11 @@ EvtScript N(EVS_FirstStrike_Normal) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.0)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(N(GetJumpDamage)) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; @@ -280,18 +280,18 @@ EvtScript N(EVS_FirstStrike_Super) = { Set(LVar4, 40) Call(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) Call(SetGoalToTarget, ACTOR_PLAYER) - ExecWait(N(EVS_JumpSupport_C)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_37) + ExecWait(N(EVS_JumpSupport_CalcJumpTime_Alt1)) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, LVarA, 0) + Call(PlayerSuperJumpToGoal, LVarA, PLAYER_SUPER_JUMP_0) Wait(7) - Call(func_802752AC, 3, 1) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_1) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) + Call(UseBattleCamPresetImmediately, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; @@ -303,16 +303,16 @@ EvtScript N(EVS_FirstStrike_Ultra) = { Set(LVar4, 40) Call(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) Call(SetGoalToTarget, ACTOR_PLAYER) - ExecWait(N(EVS_JumpSupport_D)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_38) + ExecWait(N(EVS_JumpSupport_CalcJumpTime_Alt2)) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp) - Call(func_80275F00, LVarA, 0) + Call(PlayerUltraJumpToGoal, LVarA, PLAYER_ULTRA_JUMP_0) Set(LVarA, 4) - Call(func_80275F00, LVarA, 1) + Call(PlayerUltraJumpToGoal, LVarA, PLAYER_ULTRA_JUMP_1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; @@ -337,7 +337,7 @@ EvtScript N(EVS_UseBerserker) = { }; EvtScript N(EVS_UseBerserker_Normal) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -364,10 +364,10 @@ EvtScript N(EVS_UseBerserker_Normal) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -377,18 +377,18 @@ EvtScript N(EVS_UseBerserker_Normal) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseBerserker_Super) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -416,10 +416,10 @@ EvtScript N(EVS_UseBerserker_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -429,15 +429,15 @@ EvtScript N(EVS_UseBerserker_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; @@ -445,7 +445,7 @@ EvtScript N(EVS_UseBerserker_Super) = { EvtScript N(EVS_UseBerserker_Ultra) = { Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PLAYER) - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -473,10 +473,10 @@ EvtScript N(EVS_UseBerserker_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -486,13 +486,13 @@ EvtScript N(EVS_UseBerserker_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; @@ -501,13 +501,13 @@ EvtScript N(EVS_UseMove_Tutorial) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(AddGoalPos, ACTOR_PLAYER, -5, 10, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(GetActionCommandMode, LVar0) IfEq(LVar0, 2) Call(SetActionCommandMode, 3) @@ -548,10 +548,10 @@ EvtScript N(EVS_UseMove_Tutorial) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -561,12 +561,12 @@ EvtScript N(EVS_UseMove_Tutorial) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index 44990e6f690..13b95855438 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -29,7 +29,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(GetActionCommandMode, LVar0) IfEq(LVar0, 2) Call(SetActionCommandMode, 3) @@ -67,10 +67,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -80,18 +80,18 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_ImplB) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -119,10 +119,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -132,21 +132,21 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_ImplC) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -174,10 +174,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -187,13 +187,13 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 7044c3007eb..2993498ff74 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -28,7 +28,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -59,7 +59,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -68,7 +68,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -77,7 +77,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Add(LVarF, 1) Set(LFlag0, FALSE) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE) Call(GetTargetListLength, LVar0) Sub(LVar0, 1) IfEq(LVarF, LVar0) @@ -91,15 +91,15 @@ EvtScript N(EVS_UseMove_ImplA) = { EndIf Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Add(LVarA, 5) Call(action_command_jump_start, LVarA, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(func_80274A18, LVarA, 3) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_3) Else - Call(func_80274A18, LVarA, 4) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) @@ -144,7 +144,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(FALSE) CaseOrEq(2) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -153,7 +153,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(TRUE) CaseOrEq(3) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -170,7 +170,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -201,7 +201,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -210,7 +210,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -231,7 +231,7 @@ EvtScript N(EVS_UseMove_ImplB) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE) Call(action_command_jump_start, 37, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) @@ -239,13 +239,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 1) - Call(func_802752AC, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(func_802752AC, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) @@ -291,7 +291,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(FALSE) CaseOrEq(2) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -300,7 +300,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(TRUE) CaseOrEq(3) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -317,7 +317,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -348,7 +348,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -357,7 +357,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -378,15 +378,15 @@ EvtScript N(EVS_UseMove_ImplC) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE) Call(action_command_jump_start, 25, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(func_80275F00, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) @@ -431,7 +431,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(FALSE) CaseOrEq(2) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -440,7 +440,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(TRUE) CaseOrEq(3) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index beadf330b47..74a3c75434b 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -44,7 +44,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -76,10 +76,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -89,7 +89,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) @@ -97,13 +97,13 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_ImplB) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -134,10 +134,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -147,9 +147,9 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) @@ -158,13 +158,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_ImplC) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -195,10 +195,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -208,7 +208,7 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) @@ -217,7 +217,7 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 40487e88bd5..e2f24065b58 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -65,12 +65,12 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -97,10 +97,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarE) Set(LVarD, 0) @@ -108,10 +108,10 @@ EvtScript N(EVS_UseMove_ImplA) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -134,9 +134,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) Call(SetGoalToTarget, ACTOR_PLAYER) IfEq(LVarF, 0) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Else - Call(func_80274A18, 24, 4) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_4) EndIf Call(GetCommandAutoSuccess, LVar1) IfEq(LVar1, 1) @@ -185,7 +185,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -201,12 +201,12 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -238,10 +238,10 @@ EvtScript N(EVS_UseMove_ImplB) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -265,13 +265,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 0) - Call(func_802752AC, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(func_802752AC, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) @@ -321,7 +321,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -337,12 +337,12 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -374,10 +374,10 @@ EvtScript N(EVS_UseMove_ImplC) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -401,9 +401,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 0) - Call(func_80275F00, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) @@ -453,7 +453,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index 0bbd17190d8..cf635bbf089 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -54,10 +54,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -67,18 +67,18 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_ImplB) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -106,10 +106,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -119,21 +119,21 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_ImplC) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -161,10 +161,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -174,13 +174,13 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index 359a01b73e2..01c932372bb 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -62,14 +62,14 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Call(SetGoalToTarget, ACTOR_PLAYER) Call(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Set(LVarB, LVarA) Add(LVarB, 2) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) @@ -123,20 +123,20 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarE) Set(LVarF, 0) Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -158,9 +158,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) IfEq(LVarF, 0) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Else - Call(func_80274A18, 24, 4) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_4) EndIf ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) @@ -237,7 +237,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -246,7 +246,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -282,14 +282,14 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) ExecWait(N(EVS_CheckForAPress)) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Set(LVarB, LVarA) Add(LVarB, 2) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) @@ -343,20 +343,20 @@ EvtScript N(EVS_UseMove_ImplB) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarE) Set(LVarF, 0) Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -379,13 +379,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 0) - Call(func_802752AC, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(func_802752AC, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) ChildThread @@ -463,7 +463,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -472,7 +472,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -508,14 +508,14 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) ExecWait(N(EVS_CheckForAPress)) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Set(LVarB, LVarA) Add(LVarB, 2) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) @@ -569,20 +569,20 @@ EvtScript N(EVS_UseMove_ImplC) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarE) Set(LVarF, 0) Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -605,9 +605,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 0) - Call(func_80275F00, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) ChildThread @@ -685,7 +685,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -694,7 +694,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c index c33b0054715..5b8da6720f3 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -80,7 +80,7 @@ EvtScript N(EVS_UseMove0) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index 7eab9900c86..b4d146f972a 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -89,7 +89,7 @@ EvtScript N(EVS_UseMove0) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index 27ca5cc3d69..5ce523afd32 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -89,7 +89,7 @@ EvtScript N(EVS_UseMove0) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c index 2ac4f09af64..36d434786a3 100644 --- a/src/battle/move/jump/mega_jump.c +++ b/src/battle/move/jump/mega_jump.c @@ -46,7 +46,7 @@ EvtScript N(EVS_PlayQuakeFX) = { }; EvtScript N(EVS_UseMove_Basic) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove_Basic) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch @@ -74,7 +74,7 @@ EvtScript N(EVS_UseMove_Basic) = { }; EvtScript N(EVS_UseMove_Super) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -93,7 +93,7 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch @@ -102,7 +102,7 @@ EvtScript N(EVS_UseMove_Super) = { }; EvtScript N(EVS_UseMove_Ultra) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -121,7 +121,7 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 97f8681a0ad..666c2de2008 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -36,12 +36,12 @@ EvtScript N(EVS_UseMove_Basic) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -72,7 +72,7 @@ EvtScript N(EVS_UseMove_Basic) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -81,7 +81,7 @@ EvtScript N(EVS_UseMove_Basic) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -90,7 +90,7 @@ EvtScript N(EVS_UseMove_Basic) = { Add(LVarF, 1) Set(LFlag0, FALSE) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE) Call(GetTargetListLength, LVar0) Sub(LVar0, 1) IfEq(LVarF, LVar0) @@ -104,15 +104,15 @@ EvtScript N(EVS_UseMove_Basic) = { EndIf Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Add(LVarA, 5) Call(action_command_jump_start, LVarA, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(func_80274A18, LVarA, 3) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_3) Else - Call(func_80274A18, LVarA, 4) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) @@ -157,7 +157,7 @@ EvtScript N(EVS_UseMove_Basic) = { CaseOrEq(FALSE) CaseOrEq(2) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -166,7 +166,7 @@ EvtScript N(EVS_UseMove_Basic) = { CaseOrEq(TRUE) CaseOrEq(3) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -187,12 +187,12 @@ EvtScript N(EVS_UseMove_Super) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -223,7 +223,7 @@ EvtScript N(EVS_UseMove_Super) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -232,7 +232,7 @@ EvtScript N(EVS_UseMove_Super) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -253,7 +253,7 @@ EvtScript N(EVS_UseMove_Super) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE) Call(action_command_jump_start, 37, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) @@ -261,13 +261,13 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 1) - Call(func_802752AC, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(func_802752AC, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) @@ -313,7 +313,7 @@ EvtScript N(EVS_UseMove_Super) = { CaseOrEq(FALSE) CaseOrEq(2) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -322,7 +322,7 @@ EvtScript N(EVS_UseMove_Super) = { CaseOrEq(TRUE) CaseOrEq(3) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -343,12 +343,12 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -379,7 +379,7 @@ EvtScript N(EVS_UseMove_Ultra) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -388,7 +388,7 @@ EvtScript N(EVS_UseMove_Ultra) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -409,15 +409,15 @@ EvtScript N(EVS_UseMove_Ultra) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE) Call(action_command_jump_start, 25, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(func_80275F00, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) @@ -462,7 +462,7 @@ EvtScript N(EVS_UseMove_Ultra) = { CaseOrEq(FALSE) CaseOrEq(2) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -471,7 +471,7 @@ EvtScript N(EVS_UseMove_Ultra) = { CaseOrEq(TRUE) CaseOrEq(3) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index 4836b11a51a..29751acc0c3 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -84,12 +84,12 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -116,10 +116,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarE) Call(N(IncrementHitCounter)) @@ -128,10 +128,10 @@ EvtScript N(EVS_UseMove_ImplA) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -154,9 +154,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) Call(SetGoalToTarget, ACTOR_PLAYER) IfEq(LVarF, 0) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Else - Call(func_80274A18, 24, 4) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_4) EndIf Call(GetCommandAutoSuccess, LVar1) IfEq(LVar1, 1) @@ -200,7 +200,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -209,7 +209,7 @@ EvtScript N(EVS_UseMove_ImplA) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -226,12 +226,12 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -264,10 +264,10 @@ EvtScript N(EVS_UseMove_ImplB) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -291,13 +291,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 0) - Call(func_802752AC, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(func_802752AC, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) @@ -342,7 +342,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -351,7 +351,7 @@ EvtScript N(EVS_UseMove_ImplB) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup @@ -368,12 +368,12 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) ExecWait(N(EVS_JumpSupport_Approach)) - ExecWait(N(EVS_JumpSupport_B)) + ExecWait(N(EVS_JumpSupport_CalcJumpTime)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(func_80274A18, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -406,10 +406,10 @@ EvtScript N(EVS_UseMove_ImplC) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -433,9 +433,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 0) - Call(func_80275F00, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) @@ -480,7 +480,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf ExecWait(N(EVS_JumpSupport_G)) @@ -489,7 +489,7 @@ EvtScript N(EVS_UseMove_ImplC) = { CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return EndIf EndCaseGroup diff --git a/src/battle/move/jump/power_jump.c b/src/battle/move/jump/power_jump.c index 66794cdc44b..b6f86a4a0ca 100644 --- a/src/battle/move/jump/power_jump.c +++ b/src/battle/move/jump/power_jump.c @@ -40,7 +40,7 @@ EvtScript N(EVS_802A26B4) = { }; EvtScript N(EVS_UseMove_ImplA) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -59,7 +59,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch @@ -68,7 +68,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -87,7 +87,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch @@ -96,7 +96,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -115,7 +115,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index df6de406b33..ec53c4ff2f7 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_Basic) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -54,10 +54,10 @@ EvtScript N(EVS_UseMove_Basic) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -67,18 +67,18 @@ EvtScript N(EVS_UseMove_Basic) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_1) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_Super) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -106,10 +106,10 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -119,21 +119,21 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_2) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_Ultra) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -161,10 +161,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -174,13 +174,13 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_3) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index abe4772eec2..4c79b3a801e 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_Basic) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -54,10 +54,10 @@ EvtScript N(EVS_UseMove_Basic) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -67,18 +67,18 @@ EvtScript N(EVS_UseMove_Basic) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(func_80274A18, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_Super) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -106,10 +106,10 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -119,21 +119,21 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(func_802752AC, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(func_802752AC, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; EvtScript N(EVS_UseMove_Ultra) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -161,10 +161,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_FINISH) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -174,13 +174,13 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(func_80275F00, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) Call(SetActionResult, LVarF) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) Return End }; diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c index 2a0b6e3424d..e1817707dc8 100644 --- a/src/battle/move/jump/super_jump.c +++ b/src/battle/move/jump/super_jump.c @@ -42,7 +42,7 @@ EvtScript N(EVS_802A26B4) = { }; EvtScript N(EVS_UseMove_ImplA) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -61,7 +61,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -89,7 +89,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch @@ -98,7 +98,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - ExecWait(N(EVS_JumpSupport_InitCommand)) + ExecWait(N(EVS_JumpSupport_ApproachAndJump)) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -116,7 +116,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Switch(LVar0) CaseGt(HIT_RESULT_HIT) - ExecWait(N(EVS_JumpSupport_E)) + ExecWait(N(EVS_JumpSupport_Rebound)) CaseDefault ExecWait(N(EVS_JumpSupport_F)) EndSwitch diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index c21b8baf25b..d40ef33c629 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -121,7 +121,7 @@ EvtScript N(EVS_UsePower) = { ExecWait(N(EVS_StarPower_SpiritSummoned)) Call(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMuskular_Shout) Wait(16) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(PlaySound, SOUND_CHILL_OUT) Call(InitTargetIterator) Label(10) diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index 96e45a5bf9b..ec9dadc21ea 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -40,7 +40,7 @@ EvtScript N(EVS_UsePower) = { ExecWait(N(EVS_StarPower_SpiritSummoned)) Call(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMamar_Shout) Wait(16) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Wait(15) Call(PlaySound, SOUND_LULLABY) Call(N(SpawnMusicNotesFX)) diff --git a/src/battle/move/star_power/peach_beam.c b/src/battle/move/star_power/peach_beam.c index c5ef19fd6d0..1aeb83b9c46 100644 --- a/src/battle/move/star_power/peach_beam.c +++ b/src/battle/move/star_power/peach_beam.c @@ -9,7 +9,7 @@ EvtScript N(EVS_UsePower) = { ExecWait(N(EVS_StarPower_WishForBeam)) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index 12e9dcf9853..26077b76e96 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -23,7 +23,7 @@ API_CALLABLE(N(IncreaseTwinkDefense)) { } EvtScript N(EVS_UsePower) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Run) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -43,9 +43,9 @@ EvtScript N(EVS_UsePower) = { Call(SetActorYaw, ACTOR_PLAYER, 150) Wait(1) Call(SetActorYaw, ACTOR_PLAYER, 180) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -105, -7, 0) - Call(SetBattleCamZoom, 213) + Call(SetBattleCamDist, 213) Call(MoveBattleCamOver, 60) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach3_Pray) diff --git a/src/battle/move/star_power/peach_focus_alt.c b/src/battle/move/star_power/peach_focus_alt.c index 391e81def3f..ffa4ec1d1db 100644 --- a/src/battle/move/star_power/peach_focus_alt.c +++ b/src/battle/move/star_power/peach_focus_alt.c @@ -27,7 +27,7 @@ API_CALLABLE(N(RestoreStarPower)) { } EvtScript N(EVS_UsePower) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_SpreadArms) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index 76cc50858ca..78e358be457 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -160,7 +160,7 @@ EvtScript N(EVS_UsePower) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) diff --git a/src/battle/move/star_power/star_beam.c b/src/battle/move/star_power/star_beam.c index 382a58e3868..2e0b37ac9bd 100644 --- a/src/battle/move/star_power/star_beam.c +++ b/src/battle/move/star_power/star_beam.c @@ -9,7 +9,7 @@ EvtScript N(EVS_UsePower) = { ExecWait(N(EVS_StarPower_WishForBeam)) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 20) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index 93ebe65dd66..3cb862eafc9 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -37,7 +37,7 @@ EvtScript N(EVS_UsePower) = { ExecWait(N(EVS_StarPower_SpiritSummoned)) Call(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleSkolar_Shout) Wait(16) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Thread Set(LVar0, 0) Loop(10) diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index 87fea12fa4e..0b49dd102d7 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -13,7 +13,7 @@ EvtScript N(EVS_UsePower) = { ExecWait(N(EVS_StarPower_SpiritSummoned)) Call(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKlevar_Shout) Wait(16) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(PlaySound, SOUND_TIME_OUT) PlayEffect(EFFECT_STOP_WATCH, 0, 0, 0, 0, Float(1.0), 200, 0) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_TIME_OUT) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index eb2601b1abd..6752d4e62a6 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -433,7 +433,7 @@ EvtScript N(EVS_HandleEvent) = { CaseEq(EVENT_BURN_CONTACT) Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_61) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_SPIKE) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) Add(LVar1, 40) @@ -505,7 +505,7 @@ EvtScript N(EVS_HandleEvent) = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -691,9 +691,9 @@ EvtScript N(EVS_HandlePhase) = { End }; -EvtScript N(returnHome2) = { +EvtScript N(EVS_ReturnHome_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(MoveBattleCamOver, 10) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Backfire2) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -733,9 +733,9 @@ EvtScript N(returnHome2) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Backfire2) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 40) @@ -809,7 +809,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(action_command_body_slam_init) Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_48) + Call(UseBattleCamPreset, BTL_CAM_CLOSER_PARTNER_APPROACH) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PARTNER) Call(AddGoalPos, ACTOR_PARTNER, -40, 0, 0) @@ -943,7 +943,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) Call(RunToGoal, ACTOR_PARTNER, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Thread Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 15, 0) Set(LVar0, 0) @@ -1006,11 +1006,11 @@ EvtScript N(EVS_Attack_BodySlam) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup EndSwitch Return @@ -1044,7 +1044,7 @@ EvtScript N(EVS_Attack_Bomb) = { Call(SetupMashMeter, 5, 35, 60, 80, 99, 100) EndSwitch Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_48) + Call(UseBattleCamPreset, BTL_CAM_CLOSER_PARTNER_APPROACH) Call(GetMenuSelection, LVar0, LVar1, LVar2) Switch(LVar2) CaseEq(MOVE_BOMB) @@ -1117,7 +1117,7 @@ EvtScript N(EVS_Attack_Bomb) = { Wait(1) EndLoop Call(SetActorDispOffset, ACTOR_PARTNER, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 8) Call(GetActionSuccessCopy, LVar0) Call(N(GetBombDamage), LVar0) @@ -1296,10 +1296,10 @@ EvtScript N(EVS_Attack_Bomb) = { EndIf EndSwitch IfGt(LF_MashEnded, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(MoveBattleCamOver, 10) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndIf Set(LVar0, 0) Switch(LVar0) @@ -1349,7 +1349,7 @@ EvtScript N(EVS_Attack_FirstStrike) = { Set(LVar1, 0) Call(SetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LRAW_BOMBETTE_FUSE) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_11) + Call(UseBattleCamPresetImmediately, BTL_CAM_MIDPOINT_NORMAL) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 1) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_AboutToExplode) @@ -1367,7 +1367,7 @@ EvtScript N(EVS_Attack_FirstStrike) = { Set(LVarA, 0) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Call(N(PlayExplosionFX), LVar0, LVar1, LVar2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 8) Thread Call(StartRumble, BTL_RUMBLE_HIT_HEAVY) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 8e04b46fb2b..5b58333d4b5 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -397,9 +397,9 @@ EvtScript N(EVS_ExecuteAction) = { End }; -EvtScript N(returnHome2) = { +EvtScript N(EVS_ReturnHome_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) Thread Set(LVar0, 200) @@ -426,9 +426,9 @@ EvtScript N(returnHome2) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) Thread Set(LVar0, 200) @@ -502,12 +502,12 @@ EvtScript N(smack) = { Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) + Call(SetBattleCamDist, 180) Call(MoveBattleCamOver, 30) - Call(SetBattleCamOffsetZ, 9) - Call(func_8024EDA4) + Call(SetBattleCamOffsetY, 9) + Call(DisableBattleCamClampX) Wait(15) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) Set(LVar0, 55) @@ -552,7 +552,7 @@ EvtScript N(smack) = { Call(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) Wait(10) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf Add(LVarE, 1) @@ -579,10 +579,10 @@ EvtScript N(smack) = { EndThread IfEq(LVarE, 1) Call(N(GetBowSize)) - Call(AddBattleCamZoom, LVar0) + Call(AddBattleCamDist, LVar0) Call(MoveBattleCamOver, 5) Else - Call(AddBattleCamZoom, 25) + Call(AddBattleCamDist, 25) Call(MoveBattleCamOver, 5) EndIf Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_BOW_SMACK, 0) @@ -609,10 +609,10 @@ EvtScript N(smack) = { Label(2) IfEq(LVarE, 1) Call(N(GetBowSize)) - Call(AddBattleCamZoom, LVar0) + Call(AddBattleCamDist, LVar0) Call(MoveBattleCamOver, 5) Else - Call(AddBattleCamZoom, 25) + Call(AddBattleCamDist, 25) Call(MoveBattleCamOver, 5) EndIf Call(SetActorScale, ACTOR_PARTNER, Float(1.4), Float(1.4), Float(1.0)) @@ -640,12 +640,12 @@ EvtScript N(smack) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup EndSwitch Return @@ -655,10 +655,10 @@ EvtScript N(smack) = { EvtScript N(outtaSight) = { Call(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_NO_INACTIVE_ANIM, TRUE) Call(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_USING_IDLE_ANIM, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -129, 28, 0) - Call(SetBattleCamOffsetZ, 15) - Call(SetBattleCamZoom, 260) + Call(SetBattleCamOffsetY, 15) + Call(SetBattleCamDist, 260) Call(MoveBattleCamOver, 40) Thread Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -758,12 +758,12 @@ EvtScript N(spook) = { Call(SetActionHudPrepareTime, 20) Wait(10) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 4) - Call(AddBattleCamZoom, -150) + Call(SetBattleCamOffsetY, 4) + Call(AddBattleCamDist, -150) Call(MoveBattleCamOver, 20) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) EndThread Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar0, 40) @@ -804,58 +804,58 @@ EvtScript N(spook) = { Switch(LVar1) CaseGt(80) IfEq(LVar2, 7) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 8) EndIf CaseGt(70) IfEq(LVar2, 6) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 7) EndIf CaseGt(60) IfEq(LVar2, 5) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 6) EndIf CaseGt(50) IfEq(LVar2, 4) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 5) EndIf CaseGt(40) IfEq(LVar2, 3) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 4) EndIf CaseGt(30) IfEq(LVar2, 2) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 3) EndIf CaseGt(20) IfEq(LVar2, 1) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 2) EndIf CaseGt(10) IfEq(LVar2, 0) - Call(AddBattleCamZoom, -20) + Call(AddBattleCamDist, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 1) EndIf EndSwitch @@ -869,7 +869,7 @@ EvtScript N(spook) = { Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(MoveBattleCamOver, 5) Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_01) + Call(UseBattleCamPreset, BTL_CAM_INTERRUPT) Loop(5) Call(SetBattleCamParam, 3, 110) Wait(2) @@ -950,9 +950,9 @@ EvtScript N(spook) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch Wait(30) Thread @@ -1013,12 +1013,12 @@ EvtScript N(fanSmack) = { Call(AddGoalPos, ACTOR_PARTNER, -25, -10, 0) Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamZoom, 180) + Call(SetBattleCamDist, 180) Call(MoveBattleCamOver, 30) - Call(SetBattleCamOffsetZ, 9) - Call(func_8024EDA4) + Call(SetBattleCamOffsetY, 9) + Call(DisableBattleCamClampX) Wait(15) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) Set(LVar0, 55) @@ -1069,7 +1069,7 @@ EvtScript N(fanSmack) = { Call(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) Wait(10) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf Add(LVarE, 1) @@ -1096,10 +1096,10 @@ EvtScript N(fanSmack) = { EndThread IfEq(LVarE, 1) Call(N(GetBowSize)) - Call(AddBattleCamZoom, LVar0) + Call(AddBattleCamDist, LVar0) Call(MoveBattleCamOver, 5) Else - Call(AddBattleCamZoom, 25) + Call(AddBattleCamDist, 25) Call(MoveBattleCamOver, 5) EndIf Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1149,10 +1149,10 @@ EvtScript N(fanSmack) = { EndThread IfEq(LVarE, 1) Call(N(GetBowSize)) - Call(AddBattleCamZoom, LVar0) + Call(AddBattleCamDist, LVar0) Call(MoveBattleCamOver, 5) Else - Call(AddBattleCamZoom, 25) + Call(AddBattleCamDist, 25) Call(MoveBattleCamOver, 5) EndIf Call(SetActorScale, ACTOR_PARTNER, Float(1.4), Float(1.4), Float(1.0)) @@ -1213,13 +1213,13 @@ EvtScript N(fanSmack) = { CaseOrEq(HIT_RESULT_NO_DAMAGE) Wait(10) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup CaseOrEq(1) CaseOrEq(3) Wait(10) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup EndSwitch Return diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 992e62e2aa9..942f2957b55 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -732,7 +732,7 @@ EvtScript N(EVS_HandlePhase) = { CaseEq(PHASE_PLAYER_BEGIN) IfFalse(GF_Tutorial_SwapTurnOrder) Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(10) @@ -769,9 +769,9 @@ EvtScript N(EVS_HandlePhase) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) Thread Wait(4) @@ -820,9 +820,9 @@ EvtScript N(EVS_ReturnHome) = { End }; -EvtScript N(returnHome2) = { +EvtScript N(EVS_ReturnHome_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) Call(SetGoalToHome, ACTOR_PARTNER) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -935,9 +935,9 @@ EvtScript N(EVS_Attack_Headbonk1) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -953,7 +953,7 @@ EvtScript N(EVS_Attack_Headbonk1) = { EndThread Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP) Wait(20) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf ChildThread @@ -979,7 +979,7 @@ EvtScript N(EVS_Attack_Headbonk1) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndCaseGroup CaseOrEq(HIT_RESULT_NICE) @@ -987,10 +987,10 @@ EvtScript N(EVS_Attack_Headbonk1) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2) EndThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -1025,7 +1025,7 @@ EvtScript N(EVS_Attack_Headbonk1) = { Call(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Call(SetActionResult, LVarF) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) Return End }; @@ -1040,9 +1040,9 @@ EvtScript N(EVS_Attack_Headbonk2) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1058,7 +1058,7 @@ EvtScript N(EVS_Attack_Headbonk2) = { EndThread Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP) Wait(20) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf ChildThread @@ -1084,7 +1084,7 @@ EvtScript N(EVS_Attack_Headbonk2) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndCaseGroup CaseOrEq(HIT_RESULT_NICE) @@ -1092,10 +1092,10 @@ EvtScript N(EVS_Attack_Headbonk2) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2) EndThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -1132,7 +1132,7 @@ EvtScript N(EVS_Attack_Headbonk2) = { Call(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Call(SetActionResult, LVarF) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) Return End }; @@ -1147,9 +1147,9 @@ EvtScript N(EVS_Attack_Headbonk3) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1165,7 +1165,7 @@ EvtScript N(EVS_Attack_Headbonk3) = { EndThread Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP) Wait(20) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf ChildThread @@ -1191,7 +1191,7 @@ EvtScript N(EVS_Attack_Headbonk3) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndCaseGroup CaseOrEq(HIT_RESULT_NICE) @@ -1199,10 +1199,10 @@ EvtScript N(EVS_Attack_Headbonk3) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2) EndThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -1248,7 +1248,7 @@ EvtScript N(EVS_Attack_Headbonk3) = { Call(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Call(SetActionResult, LVarF) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) Return End }; @@ -1267,9 +1267,9 @@ EvtScript N(EVS_Move_Multibonk) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1285,7 +1285,7 @@ EvtScript N(EVS_Move_Multibonk) = { EndThread Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP) Wait(20) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf ChildThread @@ -1311,7 +1311,7 @@ EvtScript N(EVS_Move_Multibonk) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndCaseGroup CaseOrEq(HIT_RESULT_NICE) @@ -1319,10 +1319,10 @@ EvtScript N(EVS_Move_Multibonk) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2) EndThread Call(GetActionResult, LVarF) Set(LVarD, 0) @@ -1330,10 +1330,10 @@ EvtScript N(EVS_Move_Multibonk) = { Set(LFlag0, FALSE) Label(10) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2) EndThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(actionCommandTable))) @@ -1412,13 +1412,13 @@ EvtScript N(EVS_Move_Multibonk) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) IfEq(LFlag0, TRUE) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) Return EndIf EndCaseGroup @@ -1444,15 +1444,15 @@ EvtScript N(EVS_Move_Tattle) = { Wait(12) Call(SetCamEnabled, CAM_TATTLE, TRUE) Call(SetCamNoDraw, CAM_TATTLE, FALSE) - Call(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_MODE_6, 25, 16, 1024) + Call(SetCamPerspective, CAM_TATTLE, CAM_UPDATE_NO_INTERP, 25, 16, 1024) Call(SetCamViewport, CAM_TATTLE, 137, 95, 138, 99) Call(GetOwnerTarget, LVarA, LVarB) Call(GetActorPos, LVarA, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Call(N(GetTattleCamPos)) Wait(1) - Call(func_802CAE50, CAM_TATTLE, LVar0, LVar1, LVar2) - Call(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) + Call(SetCamLookTarget, CAM_TATTLE, LVar0, LVar1, LVar2) + Call(SetInterpCamParams, CAM_TATTLE, 0, LVar3, 100, 4) Wait(2) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TATTLE_WINDOW_OPEN) Call(SetCamNoDraw, CAM_TATTLE, TRUE) @@ -1477,7 +1477,7 @@ EvtScript N(EVS_Move_Tattle) = { }; EvtScript N(EVS_Move_Charge) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA) Wait(10) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_PreHeadbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index aba4d6b805c..9ba25177cef 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -465,10 +465,10 @@ EvtScript N(firstStrike) = { End }; -EvtScript N(returnHomeOnMiss) = { +EvtScript N(EVS_ReturnHome_Miss) = { Call(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Wait(30) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) EndThread @@ -498,9 +498,9 @@ EvtScript N(returnHomeOnMiss) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_Success) = { Call(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(PartnerYieldTurn) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 30) @@ -571,7 +571,7 @@ EvtScript N(shellToss) = { Call(SetActionQuality, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP) Set(LVar9, 0) Set(LVar1, 0) Loop(50 * DT) @@ -633,7 +633,7 @@ EvtScript N(shellToss) = { Goto(0) EndIf Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_AIR_RAID_1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) ExecWait(N(getShellTossMoveTime)) Call(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) @@ -691,11 +691,11 @@ EvtScript N(shellToss) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(returnHomeOnMiss)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup EndSwitch Return @@ -736,7 +736,7 @@ EvtScript N(powerShell) = { BreakLoop EndIf EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP) Call(action_command_hammer_start, 0, 47, 3) Call(SetActionQuality, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) @@ -804,7 +804,7 @@ EvtScript N(powerShell) = { EndIf Call(SetActorVar, ACTOR_SELF, AVAR_Unk_0, 0) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_AIR_RAID_2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Set(LVarB, 260) DivF(LVarB, LVarA) @@ -836,9 +836,9 @@ EvtScript N(powerShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch EndIf Set(LFlag0, TRUE) @@ -859,9 +859,9 @@ EvtScript N(powerShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch EndIf Label(11) @@ -873,9 +873,9 @@ EvtScript N(powerShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(0) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Success)) CaseDefault - ExecWait(N(returnHomeOnMiss)) + ExecWait(N(EVS_ReturnHome_Miss)) EndSwitch Return End @@ -897,7 +897,7 @@ EvtScript N(dizzyShell) = { Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Wait(15) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP) Call(MoveBattleCamOver, 75 * DT) Set(LVarD, 75 * DT) Set(LVarA, LVarD) @@ -946,7 +946,7 @@ EvtScript N(dizzyShell) = { EndSwitch EndLoop Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_DIZZY_SHELL_LAUNCH) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Set(LVarB, 300) DivF(LVarB, LVarA) @@ -991,9 +991,9 @@ EvtScript N(dizzyShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch EndIf Set(LFlag0, TRUE) @@ -1028,9 +1028,9 @@ EvtScript N(dizzyShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch EndIf Label(11) @@ -1069,7 +1069,7 @@ EvtScript N(fireShell) = { Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Wait(15) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP) Call(MoveBattleCamOver, 75 * DT) Set(LVarD, 75 * DT) Set(LVarC, LVarD) @@ -1168,18 +1168,18 @@ EvtScript N(fireShell) = { Switch(LVarE) CaseOrEq(0) CaseOrEq(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 50) SetF(LVarA, Float(10.0)) EndCaseGroup CaseOrEq(2) CaseOrEq(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 30) SetF(LVarA, Float(10.0)) EndCaseGroup CaseEq(4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) SetF(LVarA, Float(16.0)) EndSwitch @@ -1237,9 +1237,9 @@ EvtScript N(fireShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch EndIf Set(LFlag0, TRUE) @@ -1261,9 +1261,9 @@ EvtScript N(fireShell) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch EndIf Label(11) @@ -1291,7 +1291,7 @@ EvtScript N(shellTossOnFirstStrike) = { Add(LVar0, 60) Call(SetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Call(InitTargetIterator) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 15) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1356,7 +1356,7 @@ EvtScript N(shellTossOnFirstStrike) = { CaseEq(MOVE_SHELL_TOSS3) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EndSwitch - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 40) Set(LVar1, 0) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index b0d7fb7c2ee..b760f50d9dd 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -342,9 +342,9 @@ EvtScript N(EVS_ExecuteAction) = { End }; -EvtScript N(returnHome2) = { +EvtScript N(EVS_ReturnHome_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) @@ -353,9 +353,9 @@ EvtScript N(returnHome2) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) @@ -603,7 +603,7 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { break; } - // show aim dot hud element in center of + // show aim dot hud element in center of switch (script->functionTemp[0]) { case SPINY_FLIP_DELAY: case SPINY_FLIP_AIMING: @@ -846,10 +846,10 @@ EvtScript N(EVS_Move_SpinyFlip) = { Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 47, 46, 12) - Call(SetBattleCamOffsetZ, 7) - Call(SetBattleCamZoom, 416) + Call(SetBattleCamOffsetY, 7) + Call(SetBattleCamDist, 416) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar0, 3) @@ -944,19 +944,19 @@ EvtScript N(EVS_Move_SpinyFlip) = { EndSwitch Switch(LVarF) CaseEq(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch Wait(15) Switch(LVar0) CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup EndSwitch Return @@ -976,10 +976,10 @@ EvtScript N(EVS_Move_SpinySurge) = { Call(SetupMashMeter, 4, 40, 70, 99, 100, 0) EndSwitch Call(SetActionHudPrepareTime, 10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 45, 60, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 400) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 400) Call(MoveBattleCamOver, 30) Call(InitTargetIterator) Call(SetGoalToHome, ACTOR_PARTNER) @@ -1089,9 +1089,9 @@ EvtScript N(EVS_Move_SpinySurge) = { EndSwitch Switch(LVar0) CaseGt(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch Wait(6) Label(12) @@ -1104,11 +1104,11 @@ EvtScript N(EVS_Move_SpinySurge) = { Switch(LVar0) CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup EndSwitch Return @@ -1124,12 +1124,12 @@ EvtScript N(cloudNine_normal) = { Call(SetActionHudPrepareTime, 50) Call(InitTargetIterator) Call(SetGoalToHome, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_10) + Call(UseBattleCamPreset, BTL_CAM_MIDPOINT_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 17) - Call(SetBattleCamZoom, 300) + Call(SetBattleCamOffsetY, 17) + Call(SetBattleCamDist, 300) Call(MoveBattleCamOver, 30) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) Wait(10) Thread Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1157,17 +1157,17 @@ EvtScript N(cloudNine_normal) = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.0)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_FightingStance) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 18, 0, 0) + Call(PlayerHopToGoal, 18, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Call(action_command_water_block_start, 0, 97, 3) - Call(AddBattleCamZoom, -75) + Call(AddBattleCamDist, -75) Call(MoveBattleCamOver, 100) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Wait(100) Wait(3) - Call(AddBattleCamZoom, 50) + Call(AddBattleCamDist, 50) Call(MoveBattleCamOver, 5) Call(GetPartnerActionSuccess, LVarA) IfGt(LVarA, 0) @@ -1244,12 +1244,12 @@ EvtScript N(cloudNine_immobile) = { Call(N(RemoveCloudNineFX)) Call(InitTargetIterator) Call(SetGoalToHome, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_10) + Call(UseBattleCamPreset, BTL_CAM_MIDPOINT_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 300) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 300) Call(MoveBattleCamOver, 30) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) Wait(10) Set(LVar0, 0) Loop(10) @@ -1277,12 +1277,12 @@ EvtScript N(cloudNine_immobile) = { Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Call(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) Call(action_command_water_block_start, 0, 97, 3) - Call(AddBattleCamZoom, -75) + Call(AddBattleCamDist, -75) Call(MoveBattleCamOver, 100) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Wait(100) Wait(3) - Call(AddBattleCamZoom, 50) + Call(AddBattleCamDist, 50) Call(MoveBattleCamOver, 5) Call(GetPartnerActionSuccess, LVarA) IfGt(LVarA, 0) @@ -1718,10 +1718,10 @@ EvtScript N(EVS_Move_Hurricane) = { Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Call(SetActionHudPrepareTime, 15) Call(SetDamageSource, DMG_SRC_HURRICANE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -45, 54, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 280) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 280) Call(MoveBattleCamOver, 40) Call(InitTargetIterator) Call(SetGoalToHome, ACTOR_PARTNER) @@ -1734,12 +1734,12 @@ EvtScript N(EVS_Move_Hurricane) = { Call(action_command_hurricane_start, 0, 147 * DT, 3, LVar0) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 20, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 35, 54, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 430) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 430) Call(MoveBattleCamOver, 150 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_HURRICANE_WIND) Thread Call(N(ProcessHurricane)) @@ -1760,9 +1760,9 @@ EvtScript N(EVS_Move_Hurricane) = { Call(GetActionSuccessCopy, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch Call(InitTargetIterator) Label(10) @@ -1788,7 +1788,7 @@ EvtScript N(EVS_Move_Hurricane) = { Wait(34) Call(SetActorRotation, ACTOR_PARTNER, 0, 0, 0) Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 0, 0) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) Call(N(AllEnemiesBlownAway)) Call(PartnerYieldTurn) diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index bb21a1b9c5d..ff7454eb2dc 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -878,9 +878,9 @@ EvtScript N(EVS_HandlePhase) = { End }; -EvtScript N(returnHome2) = { +EvtScript N(EVS_ReturnHome_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(SetActorJumpGravity, ACTOR_PARTNER, Float(1.4)) Call(AddGoalPos, ACTOR_PARTNER, -50, 0, 0) @@ -903,9 +903,9 @@ EvtScript N(returnHome2) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(SetActorJumpGravity, ACTOR_PARTNER, Float(1.0)) Call(AddGoalPos, ACTOR_PARTNER, -30, 0, 0) @@ -936,7 +936,7 @@ EvtScript N(skyDive) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(actionCommandTable))) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(BattleCamTargetActor, ACTOR_SELF) Call(InitTargetIterator) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) @@ -948,7 +948,7 @@ EvtScript N(skyDive) = { Wait(3) Call(action_command_jump_start, 32, 3) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_PREDIVE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_FlyFast) Call(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) Call(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) @@ -957,7 +957,7 @@ EvtScript N(skyDive) = { Wait(3) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_PreDive) EndChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(AddGoalPos, ACTOR_PARTNER, -26, 25, 0) Call(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_DIVE) @@ -999,12 +999,12 @@ EvtScript N(skyDive) = { CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) SetConst(LVarA, ANIM_BattleParakarry_Think) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) SetConst(LVarA, ANIM_BattleParakarry_Dive) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup EndSwitch Call(EnableIdleScript, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) @@ -1029,7 +1029,7 @@ EvtScript N(shellShot) = { EndIf Switch(LVar0) CaseEq(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1037,7 +1037,7 @@ EvtScript N(shellShot) = { Call(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) CaseEq(-1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1046,7 +1046,7 @@ EvtScript N(shellShot) = { Call(FlyToGoal, ACTOR_PARTNER, 7, 0, 0x00000064) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) CaseEq(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1055,7 +1055,7 @@ EvtScript N(shellShot) = { Call(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) CaseEq(-2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1082,12 +1082,12 @@ EvtScript N(shellShot) = { Else SetConst(LVarA, ANIM_BattleParakarry_Think) EndIf - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) SetConst(LVarA, ANIM_BattleParakarry_ShellFly) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup EndSwitch Return @@ -1105,8 +1105,8 @@ EvtScript N(airLift) = { Call(SetGoalToTarget, ACTOR_PARTNER) Call(GetDistanceToGoal, ACTOR_PARTNER, LVar0) Div(LVar0, 4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) - Call(SetBattleCamOffsetZ, 8) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) + Call(SetBattleCamOffsetY, 8) Call(MoveBattleCamOver, LVar0) Sub(LVar0, 12) IfLt(LVar0, 0) @@ -1118,8 +1118,8 @@ EvtScript N(airLift) = { Call(FlyToGoal, ACTOR_PARTNER, 0, -4, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Idle) Wait(15) - Call(SetBattleCamOffsetZ, 0) - Call(AddBattleCamZoom, -160) + Call(SetBattleCamOffsetY, 0) + Call(AddBattleCamDist, -160) Call(MoveBattleCamOver, 20) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_LiftLight) Call(SetAnimationRate, ACTOR_PARTNER, 0, Float(2.0)) @@ -1127,7 +1127,7 @@ EvtScript N(airLift) = { Call(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) IfEq(LVar0, HIT_RESULT_MISS) Call(CloseActionCommandInfo) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 20) Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1160,8 +1160,8 @@ EvtScript N(airLift) = { Set(LVar2, LVar1) Mul(LVar2, 10) IfGt(LVar0, LVar2) - Call(SetBattleCamOffsetZ, 0) - Call(AddBattleCamZoom, -2) + Call(SetBattleCamOffsetY, 0) + Call(AddBattleCamDist, -2) Call(MoveBattleCamOver, 10) Add(LVar1, 1) EndIf @@ -1176,7 +1176,7 @@ EvtScript N(airLift) = { EndIf Switch(LVar0) CaseEq(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(GetOwnerTarget, LVar0, LVar1) Call(DispatchEvent, LVar0, EVENT_BLOW_AWAY) Call(N(CarryAway), LVar0) @@ -1187,7 +1187,7 @@ EvtScript N(airLift) = { CaseDefault Call(GetOwnerTarget, LVar0, LVar1) Call(DispatchEvent, LVar0, EVENT_AIR_LIFT_FAILED) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 20) Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1212,7 +1212,7 @@ EvtScript N(airRaid) = { Call(action_command_air_raid_init) Call(SetupMashMeter, 4, 25, 50, 75, 100, 0) Call(SetActionHudPrepareTime, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_ACTOR) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1252,7 +1252,7 @@ EvtScript N(airRaid) = { Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) Call(N(FlyAround)) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(GetActionQuality, LVar0) Call(N(GetAirRaidDamage)) @@ -1281,9 +1281,9 @@ EvtScript N(airRaid) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) EndSwitch ChildThread Wait(10) diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index c9f0a3530be..57d2a8b81ef 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -19,10 +19,10 @@ extern EvtScript N(EVS_ExecuteAction); extern EvtScript N(EVS_Celebrate); extern EvtScript N(runAway); extern EvtScript N(runAwayFail); -extern EvtScript N(bellyFlop); -extern EvtScript N(squirt); -extern EvtScript N(waterBlock); -extern EvtScript N(tidalWave); +extern EvtScript N(EVS_Move_BellyFlop); +extern EvtScript N(EVS_Move_Squirt); +extern EvtScript N(EVS_Move_WaterBlock); +extern EvtScript N(EVS_Move_TidalWave); static EffectInstance* sEffect; @@ -67,7 +67,7 @@ API_CALLABLE(N(GetSquirtDamage)) { script->varTable[0] = 0; switch (partner->actorBlueprint->level) { - case 0: + case PARTNER_RANK_NORMAL: if (actionCmdResult <= 40) { damage = 3; } else if (actionCmdResult <= 75) { @@ -77,7 +77,7 @@ API_CALLABLE(N(GetSquirtDamage)) { script->varTable[0] = 1; } break; - case 1: + case PARTNER_RANK_SUPER: if (actionCmdResult <= 35) { damage = 3; } else if (actionCmdResult <= 60) { @@ -89,7 +89,7 @@ API_CALLABLE(N(GetSquirtDamage)) { script->varTable[0] = 1; } break; - case 2: + case PARTNER_RANK_ULTRA: if (actionCmdResult <= 20) { damage = 3; } else if (actionCmdResult <= 30) { @@ -610,25 +610,25 @@ EvtScript N(EVS_ExecuteAction) = { Call(GetMenuSelection, LVar0, LVar1, LVar2) Switch(LVar2) CaseEq(MOVE_BELLY_FLOP1) - ExecWait(N(bellyFlop)) + ExecWait(N(EVS_Move_BellyFlop)) CaseEq(MOVE_BELLY_FLOP2) - ExecWait(N(bellyFlop)) + ExecWait(N(EVS_Move_BellyFlop)) CaseEq(MOVE_BELLY_FLOP3) - ExecWait(N(bellyFlop)) + ExecWait(N(EVS_Move_BellyFlop)) CaseEq(MOVE_SQUIRT) - ExecWait(N(squirt)) + ExecWait(N(EVS_Move_Squirt)) CaseEq(MOVE_WATER_BLOCK) - ExecWait(N(waterBlock)) + ExecWait(N(EVS_Move_WaterBlock)) CaseEq(MOVE_TIDAL_WAVE) - ExecWait(N(tidalWave)) + ExecWait(N(EVS_Move_TidalWave)) EndSwitch Return End }; -EvtScript N(returnHome2) = { +EvtScript N(EVS_ReturnHome_BellyFlop_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Fall) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -655,9 +655,9 @@ EvtScript N(returnHome2) = { End }; -EvtScript N(EVS_ReturnHome) = { +EvtScript N(EVS_ReturnHome_BellyFlop_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Fall) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 15) @@ -679,9 +679,9 @@ EvtScript N(EVS_ReturnHome) = { End }; -EvtScript N(restoreFromSquirt2) = { +EvtScript N(EVS_ReturnHome_Squirt_Success) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -690,9 +690,9 @@ EvtScript N(restoreFromSquirt2) = { End }; -EvtScript N(restoreFromSquirt) = { +EvtScript N(EVS_ReturnHome_Squirt_Miss) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -732,7 +732,7 @@ EvtScript N(getJumpTime) = { End }; -EvtScript N(bellyFlop) = { +EvtScript N(EVS_Move_BellyFlop) = { Call(LoadActionCommand, ACTION_COMMAND_SMASH) Call(action_command_hammer_init) ExecWait(N(runToTarget)) @@ -747,7 +747,7 @@ EvtScript N(bellyFlop) = { Call(action_command_hammer_start, 0, 57, 3) Call(SetActionQuality, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Tense1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP) Set(LVar0, 30) Loop(60) Wait(1) @@ -762,7 +762,7 @@ EvtScript N(bellyFlop) = { EndLoop Thread Call(GetPartnerActionSuccess, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(MoveBattleCamOver, 20) EndThread Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Jump) @@ -920,21 +920,21 @@ EvtScript N(bellyFlop) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) - ExecWait(N(EVS_ReturnHome)) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) + ExecWait(N(EVS_ReturnHome_BellyFlop_Miss)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 8) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_BellyFlop_Success)) EndCaseGroup EndSwitch Return End }; -EvtScript N(squirt) = { +EvtScript N(EVS_Move_Squirt) = { Call(LoadActionCommand, ACTION_COMMAND_SQUIRT) Call(action_command_squirt_init) Call(GetActorLevel, ACTOR_PARTNER, LVar0) @@ -946,7 +946,7 @@ EvtScript N(squirt) = { CaseEq(2) Call(SetupMashMeter, 5, 20, 40, 60, 80, 100) EndSwitch - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(InitTargetIterator) @@ -961,7 +961,7 @@ EvtScript N(squirt) = { Call(JumpToGoal, ACTOR_PARTNER, 10, FALSE, TRUE, FALSE) Call(N(SetSquirtAngle)) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Inhale) - Call(AddBattleCamZoom, -80) + Call(AddBattleCamDist, -80) Call(MoveBattleCamOver, 90 * DT) Call(action_command_squirt_start, 0, 87 * DT, 3) Loop(90 * DT) @@ -983,7 +983,7 @@ EvtScript N(squirt) = { Wait(1) EndLoop Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_SUSHIE_SQUIRT) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 10) Call(PartnerTestEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) IfEq(LVar0, HIT_RESULT_MISS) @@ -996,7 +996,7 @@ EvtScript N(squirt) = { Call(N(GetSquirtTargetPos)) PlayEffect(EFFECT_SQUIRT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, LVarE, 10, 0) Wait(20) - ExecWait(N(restoreFromSquirt)) + ExecWait(N(EVS_ReturnHome_Squirt_Miss)) Return EndIf Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Squirt) @@ -1022,24 +1022,24 @@ EvtScript N(squirt) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(restoreFromSquirt)) + ExecWait(N(EVS_ReturnHome_Squirt_Miss)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(restoreFromSquirt2)) + ExecWait(N(EVS_ReturnHome_Squirt_Success)) EndCaseGroup EndSwitch Return End }; -EvtScript N(waterBlock) = { +EvtScript N(EVS_Move_WaterBlock) = { Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) Call(InitTargetIterator) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -95, 26, 10) - Call(SetBattleCamOffsetZ, 11) - Call(SetBattleCamZoom, 238) + Call(SetBattleCamOffsetY, 11) + Call(SetBattleCamDist, 238) Call(MoveBattleCamOver, 30) Wait(10) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Inhale) @@ -1067,10 +1067,10 @@ EvtScript N(waterBlock) = { Goto(10) EndIf Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_SpitArc) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -95, 27, 10) - Call(SetBattleCamOffsetZ, 11) - Call(SetBattleCamZoom, 277) + Call(SetBattleCamOffsetY, 11) + Call(SetBattleCamDist, 277) Call(MoveBattleCamOver, 10) Thread Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_SUSHIE_FOUNTAIN) @@ -1137,16 +1137,16 @@ EvtScript N(waterBlock) = { End }; -EvtScript N(tidalWave) = { +EvtScript N(EVS_Move_TidalWave) = { Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) Call(LoadActionCommand, ACTION_COMMAND_TIDAL_WAVE) Call(action_command_tidal_wave_init) Call(SetupMashMeter, 5, 20, 30, 60, 80, 100) Call(InitTargetIterator) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -65, 53, 10) - Call(SetBattleCamOffsetZ, 16) - Call(SetBattleCamZoom, 214) + Call(SetBattleCamOffsetY, 16) + Call(SetBattleCamDist, 214) Call(MoveBattleCamOver, 20) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) Call(SetActorJumpGravity, ACTOR_PARTNER, Float(0.5)) @@ -1195,7 +1195,7 @@ EvtScript N(tidalWave) = { Call(SetActorPos, ACTOR_PARTNER, -220, 0, 0) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 20) Call(GetActionSuccessCopy, LVar0) Set(LVarE, LVar0) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index f7af63f76ed..c51855caeab 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -232,7 +232,7 @@ EvtScript N(EVS_ExecuteAction) = { Call(EnableIdleScript, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_TWINK_FLY_A, SOUND_TWINK_FLY_B) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(BattleCamTargetActor, ACTOR_SELF) Call(InitTargetIterator) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) @@ -242,14 +242,14 @@ EvtScript N(EVS_ExecuteAction) = { Call(FlyToGoal, ACTOR_PARTNER, 0, -10, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Idle) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Cringe) Call(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) Call(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) Wait(2) Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_ACTOR_JUMP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR) Call(AddGoalPos, ACTOR_PARTNER, -40, 15, 0) Call(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) Call(GetActorVar, ACTOR_SELF, AVAR_Twink_PowerLevel, LVarF) @@ -267,7 +267,7 @@ EvtScript N(EVS_ExecuteAction) = { Else Call(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_03) + Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES) Call(MoveBattleCamOver, 10) Call(AddGoalPos, ACTOR_PARTNER, 150, 100, 0) Call(FlyToGoal, ACTOR_PARTNER, 15, 20, EASING_LINEAR) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index eb296c700fe..efca1319ccb 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -710,8 +710,8 @@ EvtScript N(EVS_ExecuteAction) = { End }; -EvtScript N(returnHome2) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) +EvtScript N(EVS_ReturnHome_Success) = { + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -720,8 +720,8 @@ EvtScript N(returnHome2) = { End }; -EvtScript N(EVS_ReturnHome) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) +EvtScript N(EVS_ReturnHome_Miss) = { + Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -775,7 +775,7 @@ EvtScript N(EVS_Attack_ElectroDash) = { Call(action_command_body_slam_init) Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_48) + Call(UseBattleCamPreset, BTL_CAM_CLOSER_PARTNER_APPROACH) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PARTNER) Call(AddGoalPos, ACTOR_PARTNER, -20, 0, 0) @@ -953,11 +953,11 @@ EvtScript N(EVS_Attack_ElectroDash) = { Switch(LVar0) CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup EndSwitch Return @@ -985,7 +985,7 @@ EvtScript N(EVS_Attack_PowerShock) = { Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) Call(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) - Call(AddBattleCamZoom, -100) + Call(AddBattleCamDist, -100) Call(MoveBattleCamOver, 80) Call(N(WattFXDisable)) Call(N(TargetParalyzeChance)) @@ -1024,7 +1024,7 @@ EvtScript N(EVS_Attack_PowerShock) = { Add(LVar2, 5) Call(N(PowerShockFX), LVar0, LVar1, LVar2) Call(UseBattleCamPreset, BTL_CAM_PARTNER_APPROACH) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 5) Thread Call(N(PowerShockDischargeFX), 20) @@ -1053,7 +1053,7 @@ EvtScript N(EVS_Attack_PowerShock) = { Call(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) IfEq(LVar0, HIT_RESULT_MISS) Wait(15) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) Return EndIf Call(GetActionQuality, LVarF) @@ -1076,11 +1076,11 @@ EvtScript N(EVS_Attack_PowerShock) = { Switch(LVar0) CaseOrEq(HIT_RESULT_NICE) CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) EndCaseGroup CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndCaseGroup EndSwitch Return @@ -1095,10 +1095,10 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -125, 42, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 340) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 340) Call(MoveBattleCamOver, 30) Call(SetActorYaw, ACTOR_PARTNER, 30) Wait(1) @@ -1113,9 +1113,9 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = { Call(SetActorYaw, ACTOR_PARTNER, 180) Wait(10) Call(action_command_water_block_start, 0, 100 * DT, 3) - Call(AddBattleCamZoom, -75) + Call(AddBattleCamDist, -75) Call(MoveBattleCamOver, 100 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Thread Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) @@ -1133,7 +1133,7 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = { Add(LVar1, 42) Call(N(TurboChargeFX), LVar0, LVar1, LVar2) Wait(59) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 5) Thread Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) @@ -1142,7 +1142,7 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = { Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -1178,10 +1178,10 @@ EvtScript N(EVS_TurboCharge_ImmobilePlayer) = { Call(SetActionHudPrepareTime, 0) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -125, 42, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 340) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 340) Call(MoveBattleCamOver, 30) Call(SetActorYaw, ACTOR_PARTNER, 30) Wait(1) @@ -1196,9 +1196,9 @@ EvtScript N(EVS_TurboCharge_ImmobilePlayer) = { Call(SetActorYaw, ACTOR_PARTNER, 180) Wait(10) Call(action_command_water_block_start, 0, 100 * DT, 3) - Call(AddBattleCamZoom, -100) + Call(AddBattleCamDist, -100) Call(MoveBattleCamOver, 100 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Thread Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) @@ -1216,7 +1216,7 @@ EvtScript N(EVS_TurboCharge_ImmobilePlayer) = { Add(LVar1, 42) Call(N(TurboChargeFX), LVar0, LVar1, LVar2) Wait(59) - Call(AddBattleCamZoom, 100) + Call(AddBattleCamDist, 100) Call(MoveBattleCamOver, 5) Wait(30) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -1261,10 +1261,10 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(action_command_mega_shock_init) Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Call(SetActionHudPrepareTime, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -54, 63, 10) - Call(SetBattleCamOffsetZ, 15) - Call(SetBattleCamZoom, 314) + Call(SetBattleCamOffsetY, 15) + Call(SetBattleCamDist, 314) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar0, 40) @@ -1291,9 +1291,9 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 12) PlayEffect(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, Float(1.3), 90 * DT, 0) - Call(AddBattleCamZoom, -100) + Call(AddBattleCamDist, -100) Call(MoveBattleCamOver, 90 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) Call(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_ATTACK) Call(N(WattFXDisable)) @@ -1314,10 +1314,10 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 12) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_MEGA_DISCHARGE) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_MEGA_SHOCK, LVar0, LVar1, LVar2, 0, 0, 0) Wait(10) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_MEGA_CHARGE_WAVE) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_MEGA_SHOCK, LVar0, LVar1, LVar2, 0, 0, 0) EndThread Thread Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBiggest) @@ -1327,7 +1327,7 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EndThread Thread - Call(SetBattleCamZoom, 420) + Call(SetBattleCamDist, 420) Call(SetBattleCamTarget, 6, 63, 10) Call(MoveBattleCamOver, 15) Wait(4) @@ -1370,9 +1370,9 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(GetPartnerActionSuccess, LVar0) Switch(LVar0) CaseGt(99) - ExecWait(N(returnHome2)) + ExecWait(N(EVS_ReturnHome_Success)) CaseDefault - ExecWait(N(EVS_ReturnHome)) + ExecWait(N(EVS_ReturnHome_Miss)) EndSwitch Return End diff --git a/src/battle/player_events.c b/src/battle/player_events.c index c0e2bc6a8f6..ba53ffb8c4a 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -77,7 +77,7 @@ API_CALLABLE(TryPlayerLucky) { show_action_rating(ACTION_RATING_LUCKY, player, player->curPos.x, player->curPos.y + 20.0f, player->curPos.z); sfx_play_sound(SOUND_LUCKY); - + script->varTable[0] = FALSE; if (player->debuff == STATUS_KEY_FEAR || player->debuff == STATUS_KEY_DIZZY @@ -241,7 +241,7 @@ API_CALLABLE(LifeShroomShroudWorld) { if (script->functionTemp[0] == 0) { return ApiStatus_DONE2; } - + return ApiStatus_BLOCK; } @@ -258,7 +258,7 @@ API_CALLABLE(LifeShroomRevealWorld) { mdl_set_shroud_tint_params(0, 0, 0, 0); return ApiStatus_DONE2; } - + return ApiStatus_BLOCK; } @@ -693,7 +693,7 @@ EvtScript EVS_MarioEnterStage = { Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetActorJumpGravity, ACTOR_SELF, Float(1.0)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_BeforeJump) - Call(func_80273444, 18, 0, 0) + Call(PlayerHopToGoal, 18, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) Wait(7) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -867,7 +867,7 @@ EvtScript EVS_Player_HandleEvent = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(0.1)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 5, 0, 1) + Call(PlayerHopToGoal, 5, 0, 1) SetConst(LVar1, ANIM_Mario1_HurtFoot) Set(LVar2, 0) ExecWait(EVS_Player_SimpleHit) @@ -878,13 +878,13 @@ EvtScript EVS_Player_HandleEvent = { Set(LVar1, 0) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.4)) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 10, 0, 2) + Call(PlayerHopToGoal, 10, 0, 2) Sub(LVar0, 20) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 7, 0, 2) + Call(PlayerHopToGoal, 7, 0, 2) Sub(LVar0, 10) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 4, 0, 2) + Call(PlayerHopToGoal, 4, 0, 2) IfEq(LVarF, 39) Return EndIf @@ -899,7 +899,7 @@ EvtScript EVS_Player_HandleEvent = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(0.1)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_BurnHurt, ANIM_MarioB3_BurnHurt, ANIM_MarioB3_BurnHurt) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 5, 0, 1) + Call(PlayerHopToGoal, 5, 0, 1) ChildThread Call(GetActorPos, ACTOR_PLAYER, LVar5, LVar6, LVar7) Add(LVar5, 5) @@ -923,13 +923,13 @@ EvtScript EVS_Player_HandleEvent = { Set(LVar1, 0) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.4)) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 10, 0, 2) + Call(PlayerHopToGoal, 10, 0, 2) Sub(LVar0, 20) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 7, 0, 2) + Call(PlayerHopToGoal, 7, 0, 2) Sub(LVar0, 10) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 4, 0, 2) + Call(PlayerHopToGoal, 4, 0, 2) IfEq(LVarF, 36) Return EndIf @@ -944,7 +944,7 @@ EvtScript EVS_Player_HandleEvent = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(0.1)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 5, 0, 1) + Call(PlayerHopToGoal, 5, 0, 1) Call(ShowShockEffect, ACTOR_SELF) SetConst(LVar1, ANIM_Mario1_HurtFoot) Set(LVar2, 0) @@ -956,13 +956,13 @@ EvtScript EVS_Player_HandleEvent = { Set(LVar1, 0) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.4)) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 10, 0, 2) + Call(PlayerHopToGoal, 10, 0, 2) Sub(LVar0, 20) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 7, 0, 2) + Call(PlayerHopToGoal, 7, 0, 2) Sub(LVar0, 10) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 4, 0, 2) + Call(PlayerHopToGoal, 4, 0, 2) IfEq(LVarF, 38) Return EndIf @@ -981,7 +981,7 @@ EvtScript EVS_Player_HandleEvent = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 15, 0, 0) + Call(PlayerHopToGoal, 15, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Call(SetGoalToHome, ACTOR_PLAYER) Call(SetActorSpeed, ACTOR_PLAYER, Float(4.0)) @@ -995,7 +995,7 @@ EvtScript EVS_Player_HandleEvent = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 15, 0, 0) + Call(PlayerHopToGoal, 15, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Call(SetGoalToHome, ACTOR_PLAYER) Call(SetActorSpeed, ACTOR_PLAYER, Float(4.0)) @@ -1044,7 +1044,7 @@ EvtScript EVS_Player_HandleEvent = { Call(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_BeforeJump) Call(SetGoalPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - Call(func_80273444, 15, 0, 0) + Call(PlayerHopToGoal, 15, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) CaseDefault EndSwitch @@ -1102,7 +1102,7 @@ EvtScript EVS_RunAwayNoCommand = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.8)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 8, 0, 0) + Call(PlayerHopToGoal, 8, 0, 0) Call(DetermineAutoRunAwaySuccess) IfEq(LVar0, 1) Call(SetFledBattleFlag) @@ -1215,7 +1215,7 @@ EvtScript EVS_RunAwayStart = { Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.8)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 8, 0, 0) + Call(PlayerHopToGoal, 8, 0, 0) Call(GetActionSuccess, LVar0) Call(DetermineAutoRunAwaySuccess) IfEq(LVar0, 1) @@ -1293,7 +1293,7 @@ EvtScript EVS_RunAwayFail = { EvtScript EVS_PlayerDies = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying) - Call(UseBattleCamPreset, BTL_CAM_PRESET_24) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_DIES) Wait(15) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_SPINNING) @@ -1339,7 +1339,7 @@ EvtScript EVS_PlayerDies = { EvtScript D_80287404 = { IfEq(LVar1, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_WISH) Wait(10) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) @@ -1380,10 +1380,10 @@ EvtScript D_80287404 = { }; EvtScript D_80287708 = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, -85, 1, 0) - Call(SetBattleCamOffsetZ, 41) - Call(SetBattleCamZoom, 248) + Call(SetBattleCamOffsetY, 41) + Call(SetBattleCamDist, 248) Call(MoveBattleCamOver, 30) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) @@ -1412,7 +1412,7 @@ EvtScript D_80287834 = { End }; -EvtScript EVS_PlayEatFX = { +EvtScript EVS_Unused_EatItem = { Thread Loop(4) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) @@ -1425,7 +1425,7 @@ EvtScript EVS_PlayEatFX = { End }; -EvtScript EVS_PlayDrinkFX = { +EvtScript EVS_Unused_DrinkItem = { Thread Loop(4) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) @@ -1568,7 +1568,7 @@ EvtScript EVS_UseLifeShroom = { Set(LVar1, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 20, 0, 0) + Call(PlayerHopToGoal, 20, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -1595,10 +1595,10 @@ EvtScript EVS_MerleeAttackBonus = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(BattleMerleeFadeStageToBlack) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 0, 80, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 246) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 246) Call(MoveBattleCamOver, 20) Wait(10) Call(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) @@ -1629,7 +1629,7 @@ EvtScript EVS_MerleeAttackBonus = { Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 18, 0, 0) + Call(PlayerHopToGoal, 18, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) @@ -1644,10 +1644,10 @@ EvtScript EVS_MerleeDefenseBonus = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(BattleMerleeFadeStageToBlack) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 0, 80, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 246) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 246) Call(MoveBattleCamOver, 20) Wait(10) Call(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) @@ -1682,7 +1682,7 @@ EvtScript EVS_MerleeDefenseBonus = { Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 18, 0, 0) + Call(PlayerHopToGoal, 18, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) @@ -1698,10 +1698,10 @@ EvtScript EVS_MerleeExpBonus = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(BattleMerleeFadeStageToBlack) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_REPOSITION) Call(SetBattleCamTarget, 0, 80, 0) - Call(SetBattleCamOffsetZ, 0) - Call(SetBattleCamZoom, 246) + Call(SetBattleCamOffsetY, 0) + Call(SetBattleCamDist, 246) Call(MoveBattleCamOver, 20) Wait(10) Call(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) @@ -1732,7 +1732,7 @@ EvtScript EVS_MerleeExpBonus = { Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - Call(func_80273444, 18, 0, 0) + Call(PlayerHopToGoal, 18, 0, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) Wait(4) Call(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) diff --git a/src/battle/standard_events.c b/src/battle/standard_events.c index dc997c23380..5534d0d0eff 100644 --- a/src/battle/standard_events.c +++ b/src/battle/standard_events.c @@ -125,7 +125,7 @@ EvtScript EVS_Partner_BurnContact = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -174,7 +174,7 @@ EvtScript EVS_Partner_SpikeContact = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_61) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_SPIKE) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -225,7 +225,7 @@ EvtScript EVS_Partner_BombetteSpikeContact = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_61) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_SPIKE) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -280,7 +280,7 @@ EvtScript EVS_Partner_ShockHit = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -333,7 +333,7 @@ EvtScript EVS_Partner_UnusedShockHit = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -1600,7 +1600,7 @@ EvtScript EVS_Enemy_ShockHit_Impl = { SetF(LVar5, LVar3) DivF(LVar5, Float(20.0)) AddF(LVar1, LVar5) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_SHOCK_HIT, LVar0, LVar1, LVar2, LVar4, LVar3) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) Call(HideHealthBar, ACTOR_SELF) Call(HPBarToCurrent, ACTOR_SELF) @@ -1848,7 +1848,7 @@ EvtScript EVS_Enemy_SpinSmash_HitNext = { Label(10) ChildThread Wait(20) - Call(UseBattleCamPreset, BTL_CAM_PRESET_04) + Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME) EndChildThread Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1)) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) diff --git a/src/bss/main_pre_bss.c b/src/bss/main_pre_bss.c index c52eb8f7152..9236be55ee7 100644 --- a/src/bss/main_pre_bss.c +++ b/src/bss/main_pre_bss.c @@ -35,7 +35,7 @@ BSS u16* nuGfxZBuffer; BSS u32 nuContDataLockKey; BSS u32 __osViIntrCount; BSS AuCallback BeginSoundUpdateCallback; -BSS f32 D_8009A5EC; +BSS f32 CamLengthScale; BSS u32 nuGfxCfbCounter; BSS ModelTreeInfoList* gCurrentModelTreeNodeInfo; BSS u32 nuGfxDisplay; diff --git a/src/cam_main.c b/src/cam_main.c index c56135aac43..2f3b2d7215a 100644 --- a/src/cam_main.c +++ b/src/cam_main.c @@ -8,7 +8,7 @@ void render_models(void); void execute_render_tasks(void); void render_item_entities(void); -f32 D_8009A5EC; +f32 CamLengthScale; s16 gCurrentCamID; u16* nuGfxCfb_ptr; Gfx* gMainGfxPos; @@ -34,50 +34,50 @@ void update_cameras(void) { case CAM_UPDATE_FROM_ZONE: update_camera_zone_interp(cam); break; - case CAM_UPDATE_MODE_INIT: - update_camera_mode_0(cam); + case CAM_UPDATE_MINIMAL: + update_camera_minimal(cam); break; - case CAM_UPDATE_UNUSED_1: - update_camera_mode_1(cam); + case CAM_UPDATE_UNUSED_RADIAL: + update_camera_unused_radial(cam); break; - case CAM_UPDATE_MODE_2: - update_camera_mode_2(cam); + case CAM_UPDATE_INTERP_POS: + update_camera_interp_pos(cam); break; - case CAM_UPDATE_UNUSED_4: - update_camera_mode_4(cam); + case CAM_UPDATE_UNUSED_CONFINED: + update_camera_unused_confined(cam); break; - case CAM_UPDATE_UNUSED_5: - update_camera_mode_5(cam); + case CAM_UPDATE_UNUSED_LEADING: + update_camera_unused_leading(cam); break; - case CAM_UPDATE_MODE_6: + case CAM_UPDATE_NO_INTERP: default: - update_camera_mode_6(cam); + update_camera_no_interp(cam); break; } - guLookAtReflectF(cam->viewMtxPlayer, &gDisplayContext->lookAt, cam->lookAt_eye.x, cam->lookAt_eye.y, cam->lookAt_eye.z, cam->lookAt_obj.x, cam->lookAt_obj.y, cam->lookAt_obj.z, 0, 1.0f, 0); + guLookAtReflectF(cam->mtxViewPlayer, &gDisplayContext->lookAt, cam->lookAt_eye.x, cam->lookAt_eye.y, cam->lookAt_eye.z, cam->lookAt_obj.x, cam->lookAt_obj.y, cam->lookAt_obj.z, 0, 1.0f, 0); if (!(cam->flags & CAMERA_FLAG_ORTHO)) { if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { create_camera_leadplayer_matrix(cam); } - guPerspectiveF(cam->perspectiveMatrix, &cam->perspNorm, cam->vfov, (f32) cam->viewportW / (f32) cam->viewportH, (f32) cam->nearClip, (f32) cam->farClip, 1.0f); + guPerspectiveF(cam->mtxPerspective, &cam->perspNorm, cam->vfov, (f32) cam->viewportW / (f32) cam->viewportH, (f32) cam->nearClip, (f32) cam->farClip, 1.0f); if (cam->flags & CAMERA_FLAG_SHAKING) { - guMtxCatF(cam->viewMtxShaking, cam->perspectiveMatrix, cam->perspectiveMatrix); + guMtxCatF(cam->mtxViewShaking, cam->mtxPerspective, cam->mtxPerspective); } if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { - guMtxCatF(cam->viewMtxLeading, cam->perspectiveMatrix, cam->perspectiveMatrix); + guMtxCatF(cam->mtxViewLeading, cam->mtxPerspective, cam->mtxPerspective); } - guMtxCatF(cam->viewMtxPlayer, cam->perspectiveMatrix, cam->perspectiveMatrix); + guMtxCatF(cam->mtxViewPlayer, cam->mtxPerspective, cam->mtxPerspective); } else { f32 w = cam->viewportW; f32 h = cam->viewportH; - guOrthoF(cam->perspectiveMatrix, -w * 0.5, w * 0.5, -h * 0.5, h * 0.5, -1000.0f, 1000.0f, 1.0f); + guOrthoF(cam->mtxPerspective, -w * 0.5, w * 0.5, -h * 0.5, h * 0.5, -1000.0f, 1000.0f, 1.0f); } get_screen_coords(CAM_DEFAULT, cam->targetPos.x, cam->targetPos.y, cam->targetPos.z, &sx, &sy, &sz); @@ -98,13 +98,13 @@ void render_frame(s32 isSecondPass) { } if (isSecondPass) { - camID = CAM_3; + camID = CAM_HUD; } else { camID = CAM_DEFAULT; } - // first pass: loop uses camIDs from CAM_DEFAULT to CAM_3 - 1 - // second pass: loop only uses CAM_3 + // first pass: loop uses camIDs from CAM_DEFAULT to CAM_HUD - 1 + // second pass: loop only uses CAM_HUD isSecondPass = 1 - isSecondPass; for (; camID < ARRAY_COUNT(gCameras) - isSecondPass; camID++) { @@ -184,19 +184,19 @@ void render_frame(s32 isSecondPass) { gSPPerspNormalize(gMainGfxPos++, camera->perspNorm); } - guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); + guMtxF2L(camera->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCamID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } - camera->unkMatrix = &gDisplayContext->matrixStack[gMatrixListPos]; + camera->mtxBillboard = &gDisplayContext->matrixStack[gMatrixListPos]; matrixListPos = gMatrixListPos++; - guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->trueRot.x, 0.0f, 1.0f, 0.0f); + guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->curBoomYaw, 0.0f, 1.0f, 0.0f); camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->altViewportOffset.x; camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->altViewportOffset.y; if (!(camera->flags & CAMERA_FLAG_ORTHO)) { - if (gCurrentCamID != CAM_3) { + if (gCurrentCamID != CAM_HUD) { if (!(camera->flags & CAMERA_FLAG_RENDER_ENTITIES)) { render_entities(); } @@ -210,9 +210,9 @@ void render_frame(s32 isSecondPass) { execute_render_tasks(); render_transformed_hud_elements(); } else { - guOrthoF(camera->perspectiveMatrix, 0.0f, SCREEN_WIDTH, -SCREEN_HEIGHT, 0.0f, -1000.0f, 1000.0f, + guOrthoF(camera->mtxPerspective, 0.0f, SCREEN_WIDTH, -SCREEN_HEIGHT, 0.0f, -1000.0f, 1000.0f, 1.0f); - guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); + guMtxF2L(camera->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCamID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); render_transformed_hud_elements(); @@ -234,19 +234,19 @@ void render_frame(s32 isSecondPass) { } } -void create_cameras_a(void) { +void create_cameras(void) { CameraInitData camData; CameraInitData* camDataPtr = &camData; s32 i; - D_8009A5EC = 1.0f; + CamLengthScale = 1.0f; for (i = 0; i < ARRAY_COUNT(gCameras); i++) { gCameras[i].flags = 0; } camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -257,7 +257,7 @@ void create_cameras_a(void) { initialize_next_camera(camDataPtr); camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -268,7 +268,7 @@ void create_cameras_a(void) { initialize_next_camera(camDataPtr); camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -279,7 +279,7 @@ void create_cameras_a(void) { initialize_next_camera(camDataPtr); camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -290,7 +290,7 @@ void create_cameras_a(void) { initialize_next_camera(camDataPtr); } -void create_cameras_b(void) { +void create_cameras_unused(void) { CameraInitData camData; CameraInitData* camDataPtr = &camData; s32 i; @@ -300,7 +300,7 @@ void create_cameras_b(void) { } camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -311,7 +311,7 @@ void create_cameras_b(void) { initialize_next_camera(camDataPtr); camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -322,7 +322,7 @@ void create_cameras_b(void) { initialize_next_camera(camDataPtr); camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -333,7 +333,7 @@ void create_cameras_b(void) { initialize_next_camera(camDataPtr); camDataPtr->flags = CAMERA_FLAG_DISABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; + camDataPtr->updateMode = CAM_UPDATE_MINIMAL; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -368,19 +368,19 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->lookAt_obj.z = -100.0f; camera->curYaw = 0; camera->curBoomLength = 0; - camera->curYOffset = 0; - camera->trueRot.x = 0.0f; - camera->trueRot.y = 0.0f; - camera->trueRot.z = 0.0f; + camera->targetOffsetY = 0; + camera->curBoomYaw = 0.0f; + camera->targetBoomYaw = 0.0f; + camera->unk_8C = 0.0f; camera->updateMode = initData->updateMode; camera->needsInit = TRUE; camera->nearClip = initData->nearClip; camera->farClip = initData->farClip; camera->vfov = initData->vfov; - camera->zoomPercent = 100; + camera->params.world.zoomPercent = 100; set_cam_viewport(camID, initData->viewStartX, initData->viewStartY, initData->viewWidth, initData->viewHeight); camera->unk_212 = -1; - camera->unk_530 = TRUE; + camera->needsInitialConstrainDir = TRUE; camera->bgColor[0] = 0; camera->bgColor[1] = 0; camera->bgColor[2] = 0; @@ -400,14 +400,14 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->leadInterpAlpha = 0.0f; camera->accumulatedStickLead = 0.0f; camera->increasingLeadInterp = FALSE; - camera->leadUnkX = 0.0f; - camera->leadUnkZ = 0.0f; - camera->unk_52C = 0; - camera->leadControlSettings = NULL; + camera->prevLeadPosX = 0.0f; + camera->prevLeadPosZ = 0.0f; + camera->leadConstrainDir = 0; + camera->prevLeadSettings = NULL; camera->panActive = FALSE; camera->followPlayer = FALSE; camera->unk_C4 = 1000.0f; - camera->unk_520 = 0.2f; + camera->leadAmtScale = 0.2f; camera->moveSpeed = 1.0f; return camera; } @@ -456,7 +456,7 @@ void get_screen_coords(s32 camID, f32 x, f32 y, f32 z, s32* screenX, s32* screen f32 tY; f32 tX; - transform_point(camera->perspectiveMatrix, x, y, z, 1.0f, &tX, &tY, &tZ, &tW); + transform_point(camera->mtxPerspective, x, y, z, 1.0f, &tX, &tY, &tZ, &tW); *screenZ = tZ + 5000.0f; if (*screenZ < 0) { @@ -476,7 +476,7 @@ void get_screen_coords(s32 camID, f32 x, f32 y, f32 z, s32* screenX, s32* screen } } -s32 func_8002E754(s32 camID, s32 x, s32 y) { +s32 is_outside_cam_viewport_bounds(s32 camID, s32 x, s32 y) { s32 startX = gCameras[camID].viewportStartX; s32 startY = gCameras[camID].viewportStartY; s32 endX = startX + gCameras[camID].viewportW; @@ -495,7 +495,7 @@ s32 func_8002E754(s32 camID, s32 x, s32 y) { } } -void func_8002E7CC(s32 camID, s32* x, s32* y, s32* width, s32* height) { +void get_cam_viewport_bounds(s32 camID, s32* x, s32* y, s32* width, s32* height) { *x = gCameras[camID].viewportStartX; *y = gCameras[camID].viewportStartY; *width = gCameras[camID].viewportStartX + gCameras[camID].viewportW; diff --git a/src/cam_math.c b/src/cam_math.c index 98fa50159a6..db9203195fe 100644 --- a/src/cam_math.c +++ b/src/cam_math.c @@ -259,7 +259,7 @@ void update_camera_lead_amount(Camera* camera, f32 candidateLeadAmount) { s32 flags = camera->flags & CAMERA_FLAG_SUPRESS_LEADING; s32 ignoreStickInput = flags != 0; - if (camera->curController != NULL && camera->curController->type == CAM_CONTROL_FIXED_POS_AND_ORIENTATION) { + if (camera->curSettings != NULL && camera->curSettings->type == CAM_CONTROL_FIXED_POS_AND_ORIENTATION) { ignoreStickInput = TRUE; } @@ -359,7 +359,7 @@ void update_camera_lead_amount(Camera* camera, f32 candidateLeadAmount) { } } -void func_80032C64(Camera* camera) { +void apply_constraints_to_lead_amount(Camera* camera) { s32 i; f32 rotationRad; f32 leadAmount; @@ -377,7 +377,7 @@ void func_80032C64(Camera* camera) { f32 deltaPosX, deltaPosZ; f32 f24, f22, cosYaw, sinYaw; - rotationRad = camera->trueRot.x / 180.0f * PI; + rotationRad = camera->curBoomYaw / 180.0f * PI; leadAmount = camera->leadAmount; newPosX = camera->targetPos.x + leadAmount * cos_rad(rotationRad); @@ -391,54 +391,54 @@ void func_80032C64(Camera* camera) { || settings->type == CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE || (s2 = func_800328A4(settings, camera->targetPos.x, camera->targetPos.z)) != 0 ) { - if (camera->unk_530) { - guPerspectiveF(camera->perspectiveMatrix, &camera->perspNorm, camera->vfov, + if (camera->needsInitialConstrainDir) { + guPerspectiveF(camera->mtxPerspective, &camera->perspNorm, camera->vfov, (f32)camera->viewportW / (f32)camera->viewportH, camera->nearClip, camera->farClip, 1.0f); - guMtxCatF(camera->viewMtxPlayer, camera->perspectiveMatrix, camera->perspectiveMatrix); - transform_point(camera->perspectiveMatrix, camera->targetPos.x, camera->targetPos.y, camera->targetPos.z, + guMtxCatF(camera->mtxViewPlayer, camera->mtxPerspective, camera->mtxPerspective); + transform_point(camera->mtxPerspective, camera->targetPos.x, camera->targetPos.y, camera->targetPos.z, 1.0f, &X, &Y, &Z, &W); if (W == 0.0f) { W = 1.0f; } W = 1.0f / W; X *= W; - camera->unk_52C = (X > 0.0f) ? 1 : (X < 0.0f) ? -1 : 0; - camera->unk_530 = FALSE; + camera->leadConstrainDir = (X > 0.0f) ? 1 : (X < 0.0f) ? -1 : 0; + camera->needsInitialConstrainDir = FALSE; } else { - CameraControlSettings* leadSettings = camera->leadControlSettings; + CameraControlSettings* leadSettings = camera->prevLeadSettings; if (leadSettings == NULL || !(leadSettings->type == CAM_CONTROL_CONSTRAIN_TO_LINE || leadSettings->type == CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE - || func_800328A4(settings, camera->leadUnkX, camera->leadUnkZ) != 0)) { + || func_800328A4(settings, camera->prevLeadPosX, camera->prevLeadPosZ) != 0)) { if (leadSettings != NULL && s2 != 0) { - camera->unk_52C = s2; + camera->leadConstrainDir = s2; } else { - f24 = cosYaw = camera->targetPos.x - camera->leadUnkX; - f22 = camera->targetPos.z - camera->leadUnkZ; + f24 = cosYaw = camera->targetPos.x - camera->prevLeadPosX; + f22 = camera->targetPos.z - camera->prevLeadPosZ; cosYaw = -cos_deg(camera->curYaw); sinYaw = -sin_deg(camera->curYaw); product = f24 * cosYaw + f22 * sinYaw; - camera->unk_52C = (product > 0) ? -1 : (product < 0) ? 1 : 0; + camera->leadConstrainDir = (product > 0) ? -1 : (product < 0) ? 1 : 0; } } } - if (leadAmount > 0.0f && camera->unk_52C > 0 || leadAmount < 0.0f && camera->unk_52C < 0) { + if (leadAmount > 0.0f && camera->leadConstrainDir > 0 || leadAmount < 0.0f && camera->leadConstrainDir < 0) { camera->leadInterpAlpha = 0.0f; camera->leadAmount = 0.0f; } - camera->leadControlSettings = settings3; - camera->leadUnkX = camera->targetPos.x; - camera->leadUnkZ = camera->targetPos.z; + camera->prevLeadSettings = settings3; + camera->prevLeadPosX = camera->targetPos.x; + camera->prevLeadPosZ = camera->targetPos.z; return; } } - camera->unk_52C = 0; - camera->leadControlSettings = settings3; - camera->leadUnkX = camera->targetPos.x; - camera->leadUnkZ = camera->targetPos.z; + camera->leadConstrainDir = 0; + camera->prevLeadSettings = settings3; + camera->prevLeadPosX = camera->targetPos.x; + camera->prevLeadPosZ = camera->targetPos.z; newPosX = camera->targetPos.x + leadAmount * cos_rad(rotationRad); newPosZ = camera->targetPos.z + leadAmount * sin_rad(rotationRad); newPosY = camera->targetPos.y + 10.0f; @@ -446,14 +446,14 @@ void func_80032C64(Camera* camera) { if (settings != NULL) { if (settings->type == CAM_CONTROL_CONSTRAIN_TO_LINE || settings->type == CAM_CONTROL_LOOK_AT_POINT_CONSTAIN_TO_LINE - || func_800328A4(camera->leadControlSettings, newPosX, newPosZ) != 0 + || func_800328A4(camera->prevLeadSettings, newPosX, newPosZ) != 0 ) { constrainToZoneTriangles = TRUE; minDistSq = SQ(1000.0f); // clamp lead amount to the points when using CAM_CONTROL_CONSTAIN_BETWEEN_POINTS - if (camera->leadControlSettings != NULL && camera->leadControlSettings->type == CAM_CONTROL_CONSTAIN_BETWEEN_POINTS) { - settings2 = camera->leadControlSettings; + if (camera->prevLeadSettings != NULL && camera->prevLeadSettings->type == CAM_CONTROL_CONSTAIN_BETWEEN_POINTS) { + settings2 = camera->prevLeadSettings; constrainToZoneTriangles = FALSE; deltaPosX = settings2->points.two.Bx - settings2->points.two.Ax; @@ -521,9 +521,9 @@ void create_camera_leadplayer_matrix(Camera* camera) { f32 distTanTheta = dist * sin_rad(theta); distTanTheta /= cos_rad(theta); - update_camera_lead_amount(camera, (distTanTheta * camera->viewportW / camera->viewportH) * camera->unk_520); - func_80032C64(camera); - guTranslateF(camera->viewMtxLeading, -camera->leadAmount, 0.0f, 0.0f); + update_camera_lead_amount(camera, (distTanTheta * camera->viewportW / camera->viewportH) * camera->leadAmtScale); + apply_constraints_to_lead_amount(camera); + guTranslateF(camera->mtxViewLeading, -camera->leadAmount, 0.0f, 0.0f); } void func_800334E8(void) { diff --git a/src/cam_mode_2.c b/src/cam_mode_interp.c similarity index 71% rename from src/cam_mode_2.c rename to src/cam_mode_interp.c index 8aea1b117d4..8b9917a7f4c 100644 --- a/src/cam_mode_2.c +++ b/src/cam_mode_interp.c @@ -1,8 +1,18 @@ #include "common.h" #include "camera.h" -// implementation for CAM_UPDATE_UNUSED_4 -void update_camera_mode_4(Camera* camera) { +// implements CAM_UPDATE_UNUSED_CONFINED +// this camera tracks targetPos, clamped within the rectangular region given by +/- xLimit and +/- zLimit +// y-position is drawn from lookAt_obj_target +// does not use easing or interpolation +// uses a boom arm, but pitch and yaw are always zero +// +// control parameters: +// dist -- length of the camera boom arm +// offsetY -- offset of the base of the boom arm above the target point +// xLimit -- confine x position of target from -xLimit to +xLimit +// zLimit -- confine z position of target from -zLimit to +zLimit +void update_camera_unused_confined(Camera* camera) { f32 sinBoom; f32 cosBoom; f32 deltaX; @@ -18,7 +28,7 @@ void update_camera_mode_4(Camera* camera) { f32 new_var; f0 = camera->targetPos.x; - deltaX = camera->auxPitch; + deltaX = camera->params.confined.xLimit; if (f0 > deltaX) { f0 = deltaX; } @@ -27,7 +37,7 @@ void update_camera_mode_4(Camera* camera) { } camera->lookAt_obj_target.x = f0; f4 = camera->targetPos.z; - deltaZ = camera->auxBoomLength; + deltaZ = camera->params.confined.zLimit; if (f4 > deltaZ) { f4 = deltaZ; } @@ -35,19 +45,19 @@ void update_camera_mode_4(Camera* camera) { f4 = -deltaZ; } camera->lookAt_obj_target.z = f4; - camera->unk_70 = 0.0f; - camera->curBoomYaw = 0.0f; - camera->trueRot.x = camera->unk_70; - camera->curBoomLength = camera->lookAt_dist * D_8009A5EC; - camera->curYOffset = camera->auxBoomPitch * D_8009A5EC; + camera->interpYaw = 0.0f; + camera->curBoomPitch = 0.0f; + camera->curBoomYaw = camera->interpYaw; + camera->curBoomLength = camera->params.confined.dist * CamLengthScale; + camera->targetOffsetY = camera->params.confined.offsetY * CamLengthScale; if (camera->needsInit) { camera->needsInit = FALSE; camera->unk_98 = 0.0f; camera->unk_9C = 0.0f; camera->lookAt_obj.x = camera->lookAt_obj_target.x; - camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->curYOffset; + camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetOffsetY; camera->lookAt_obj.z = camera->lookAt_obj_target.z; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaX = 0.0f; @@ -61,7 +71,7 @@ void update_camera_mode_4(Camera* camera) { deltaX = deltaX2; deltaY = cosBoom * deltaY2 + deltaZ2 * sinBoom; deltaZ = sinBoom * new_var + deltaZ2 * cosBoom; - boomYaw = DEG_TO_RAD(camera->unk_70); + boomYaw = DEG_TO_RAD(camera->interpYaw); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaX2 = cosBoom * deltaX - deltaZ * sinBoom; @@ -72,9 +82,9 @@ void update_camera_mode_4(Camera* camera) { camera->lookAt_eye.z = camera->lookAt_obj.z + deltaZ2; } camera->lookAt_obj.x = camera->lookAt_obj_target.x; - camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->curYOffset; + camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetOffsetY; camera->lookAt_obj.z = camera->lookAt_obj_target.z; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaX = 0.0f; @@ -88,7 +98,7 @@ void update_camera_mode_4(Camera* camera) { deltaX = deltaX2; deltaY = cosBoom * deltaY2 + deltaZ2 * sinBoom; deltaZ = sinBoom * new_var + deltaZ2 * cosBoom; - boomYaw = DEG_TO_RAD(camera->unk_70); + boomYaw = DEG_TO_RAD(camera->interpYaw); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaX2 = cosBoom * deltaX - deltaZ * sinBoom; @@ -101,12 +111,21 @@ void update_camera_mode_4(Camera* camera) { deltaX = camera->lookAt_obj.x - camera->lookAt_eye.x; deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y; deltaZ = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ); - camera->curPitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); + camera->lookAt_yaw = -atan2(0.0f, 0.0f, deltaX, deltaZ); + camera->lookAt_pitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); } -// implementation for CAM_UPDATE_MODE_2 -void update_camera_mode_2(Camera *camera) { +// implements CAM_UPDATE_INTERP_POS +// this camera uses a set of control parameters to calculate its target lookAt_obj and lookAt_eye positions, +// then interpolates current positions toward those targets, moving up to half the remaining distance each frame +// position of the camera is determined with a boom and the ultimate target is given by lookAt_obj_target +// +// control parameters: +// dist -- length of the camera boom arm +// pitch -- rising angle of the boom arm, up toward the y-axis +// yaw -- yaw angle for the boom arm in the xz-plane +// offsetY -- offset of the base of the boom arm above the target point +void update_camera_interp_pos(Camera *camera) { f32 cosBoom; f32 sinBoom; f32 boomYaw; @@ -121,21 +140,21 @@ void update_camera_mode_2(Camera *camera) { f32 deltaZ3; f32 tmp; - camera->unk_70 = camera->auxBoomLength; - camera->curBoomLength = camera->lookAt_dist * D_8009A5EC; - camera->curYOffset = camera->auxBoomPitch * D_8009A5EC; - camera->curBoomYaw = camera->auxPitch; - camera->trueRot.x = camera->unk_70; + camera->interpYaw = camera->params.interp.yaw; + camera->curBoomLength = camera->params.interp.dist * CamLengthScale; + camera->targetOffsetY = camera->params.interp.offsetY * CamLengthScale; + camera->curBoomPitch = camera->params.interp.pitch; + camera->curBoomYaw = camera->interpYaw; if (camera->needsInit) { camera->needsInit = FALSE; camera->unk_98 = 0.0f; camera->unk_9C = 0.0f; camera->lookAt_obj.x = camera->lookAt_obj_target.x; - camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->curYOffset; + camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetOffsetY; camera->lookAt_obj.z = camera->lookAt_obj_target.z; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); @@ -152,7 +171,7 @@ void update_camera_mode_2(Camera *camera) { deltaY = cosBoom * -deltaY3 + deltaZ3 * sinBoom; deltaZ = sinBoom * deltaY3 + deltaZ3 * cosBoom; - boomYaw = DEG_TO_RAD(camera->unk_70); + boomYaw = DEG_TO_RAD(camera->interpYaw); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); @@ -170,7 +189,7 @@ void update_camera_mode_2(Camera *camera) { } deltaX2 = camera->lookAt_obj_target.x - camera->lookAt_obj.x; - deltaY2 = (camera->lookAt_obj_target.y + camera->curYOffset) - camera->lookAt_obj.y; + deltaY2 = (camera->lookAt_obj_target.y + camera->targetOffsetY) - camera->lookAt_obj.y; deltaZ2 = camera->lookAt_obj_target.z - camera->lookAt_obj.z; if (fabsf(deltaX2) > 16.0f) { @@ -199,7 +218,7 @@ void update_camera_mode_2(Camera *camera) { camera->lookAt_obj.y += deltaY2 * 0.5f; camera->lookAt_obj.z += deltaZ2 * 0.5f; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); @@ -215,7 +234,7 @@ void update_camera_mode_2(Camera *camera) { deltaY = cosBoom * -deltaY3 + deltaZ3 * sinBoom; deltaZ = sinBoom * deltaY3 + deltaZ3 * cosBoom; - boomYaw = DEG_TO_RAD(camera->unk_70); + boomYaw = DEG_TO_RAD(camera->interpYaw); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); @@ -265,6 +284,6 @@ void update_camera_mode_2(Camera *camera) { deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y; deltaZ = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ); - camera->curPitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); + camera->lookAt_yaw = -atan2(0.0f, 0.0f, deltaX, deltaZ); + camera->lookAt_pitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); } diff --git a/src/cam_mode_0.c b/src/cam_mode_minimal.c similarity index 68% rename from src/cam_mode_0.c rename to src/cam_mode_minimal.c index 015203a4952..4cd7d6cd172 100644 --- a/src/cam_mode_0.c +++ b/src/cam_mode_minimal.c @@ -1,28 +1,32 @@ #include "common.h" #include "camera.h" -// implementation for CAM_UPDATE_MODE_INIT +// implements CAM_UPDATE_MINIMAL // simple camera based on lookAt_eye and lookAt_obj with no blending or interpolation -void update_camera_mode_0(Camera* camera) { - f32 dx; - f32 dy; - f32 dz; +// control this camera by directly setting these positions +// +// no control parameters +void update_camera_minimal(Camera* camera) { + f32 dx, dy, dz; if (camera->needsInit) { + camera->needsInit = FALSE; + camera->lookAt_obj.x = 0.0f; camera->lookAt_obj.y = 0.0f; camera->lookAt_obj.z = 0.0f; - camera->needsInit = FALSE; + camera->lookAt_eye.x = camera->lookAt_obj.x; camera->lookAt_eye.y = camera->lookAt_obj.y; - camera->lookAt_eye.z = camera->lookAt_obj.z - (1000.0f / D_8009A5EC); + camera->lookAt_eye.z = camera->lookAt_obj.z - (1000.0f / CamLengthScale); } camera->curYaw = atan2(camera->lookAt_eye.x, camera->lookAt_eye.z, camera->lookAt_obj.x, camera->lookAt_obj.z); dx = camera->lookAt_obj.x - camera->lookAt_eye.x; dy = camera->lookAt_obj.y - camera->lookAt_eye.y; dz = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, dx, dz); - dx = -sqrtf(SQ(dx) + SQ(dz)); - camera->curPitch = atan2(0.0f, 0.0f, dy, dx); + + camera->lookAt_yaw = -atan2(0.0f, 0.0f, dx, dz); + dx = sqrtf(SQ(dx) + SQ(dz)); + camera->lookAt_pitch = atan2(0.0f, 0.0f, dy, -dx); } diff --git a/src/cam_mode_6.c b/src/cam_mode_no_interp.c similarity index 56% rename from src/cam_mode_6.c rename to src/cam_mode_no_interp.c index 272e200f38f..7ba24026ac2 100644 --- a/src/cam_mode_6.c +++ b/src/cam_mode_no_interp.c @@ -1,7 +1,19 @@ #include "common.h" -// implementation for CAM_UPDATE_MODE_6 -void update_camera_mode_6(Camera* camera) { +// implements CAM_UPDATE_NO_INTERP +// this camera uses a set of control parameters to calculate its lookAt_obj and lookAt_eye positions, +// which are only updated if skipRecalc = FALSE +// the ultimate target is given by lookAt_obj_target, with an offset given by targetPos (?!) +// in practice, this is used for CAM_BATTLE and CAM_TATTLE, with skipRecalc almost always set to FALSE +// +// control parameters: +// dist -- length of the camera boom arm +// pitch -- rising angle of the boom arm, up toward the y-axis +// yaw -- yaw angle for the boom arm in the xz-plane +// offsetY -- offset of the base of the boom arm above the target point +// fovScale -- adjusts vertical fov, with 100 being normal (=25). scales as 1/x so larger values mean smaller vfov. +// skipRecalc -- do not calculate lookAt_obj and lookAt_eye from params +void update_camera_no_interp(Camera* camera) { f32 sinBoom; f32 cosBoom; f32 deltaX; @@ -14,15 +26,15 @@ void update_camera_mode_6(Camera* camera) { f32 new_var; f32 planarDist; - if (camera->needsInit || camera->isChangingMap) { + if (camera->needsInit || camera->needsReinit) { camera->needsInit = FALSE; - camera->isChangingMap = FALSE; - camera->auxPitch = 0; - camera->auxBoomLength = 100; - camera->lookAt_dist = 100; - camera->auxBoomPitch = 0; - camera->auxBoomYaw = 0; - camera->auxBoomZOffset = 0; + camera->needsReinit = FALSE; + camera->params.basic.skipRecalc = FALSE; + camera->params.basic.dist = 100; + camera->params.basic.fovScale = 100; + camera->params.basic.pitch = 0; + camera->params.basic.yaw = 0; + camera->params.basic.offsetY = 0; camera->targetPos.x = 0.0f; camera->targetPos.y = 0.0f; camera->targetPos.z = 0.0f; @@ -30,15 +42,16 @@ void update_camera_mode_6(Camera* camera) { camera->lookAt_obj.y = camera->lookAt_obj_target.y; camera->lookAt_obj.z = camera->lookAt_obj_target.z; } - if (camera->auxPitch == 0) { + + if (!camera->params.basic.skipRecalc) { camera->lookAt_obj.x = camera->lookAt_obj_target.x + camera->targetPos.x; - camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetPos.y + camera->auxBoomZOffset / 256.0; + camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetPos.y + camera->params.basic.offsetY / 256.0; camera->lookAt_obj.z = camera->lookAt_obj_target.z + camera->targetPos.z; - camera->trueRot.x = camera->auxBoomYaw; - camera->curBoomYaw = camera->auxBoomPitch; - camera->curBoomLength = camera->auxBoomLength; - camera->vfov = (10000 / camera->lookAt_dist) / 4; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + camera->curBoomYaw = camera->params.basic.yaw; + camera->curBoomPitch = camera->params.basic.pitch; + camera->curBoomLength = camera->params.basic.dist; + camera->vfov = (10000 / camera->params.basic.fovScale) / 4; + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaX = 0.0f; @@ -52,7 +65,7 @@ void update_camera_mode_6(Camera* camera) { deltaX = deltaX2; deltaY = cosBoom * deltaY2 + deltaZ2 * sinBoom; deltaZ = sinBoom * new_var + deltaZ2 * cosBoom; - boomYaw = DEG_TO_RAD(camera->trueRot.x); + boomYaw = DEG_TO_RAD(camera->curBoomYaw); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaZ2 = cosBoom * deltaX - deltaZ * sinBoom; @@ -63,13 +76,14 @@ void update_camera_mode_6(Camera* camera) { camera->lookAt_eye.y = camera->lookAt_obj.y + deltaY2; camera->lookAt_eye.z = camera->lookAt_obj.z + deltaZ2; } + camera->curYaw = atan2(camera->lookAt_eye.x, camera->lookAt_eye.z, camera->lookAt_obj.x, camera->lookAt_obj.z); deltaX = camera->lookAt_obj.x - camera->lookAt_eye.x; deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y; deltaZ = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ); + camera->lookAt_yaw = -atan2(0.0f, 0.0f, deltaX, deltaZ); planarDist = sqrtf(SQ(deltaX) + SQ(deltaZ)); - camera->curPitch = atan2(0.0f, 0.0f, deltaY, -planarDist); + camera->lookAt_pitch = atan2(0.0f, 0.0f, deltaY, -planarDist); gBattleStatus.camLookatObjPos.x = camera->lookAt_obj.x; gBattleStatus.camLookatObjPos.y = camera->lookAt_obj.y; gBattleStatus.camLookatObjPos.z = camera->lookAt_obj.z; diff --git a/src/cam_mode_unused.c b/src/cam_mode_unused_ahead.c similarity index 58% rename from src/cam_mode_unused.c rename to src/cam_mode_unused_ahead.c index 58add36d193..9eb3e088181 100644 --- a/src/cam_mode_unused.c +++ b/src/cam_mode_unused_ahead.c @@ -1,6 +1,17 @@ #include "common.h" -void update_camera_mode_unused(Camera* camera) { +// implements CAM_UPDATE_UNUSED_AHEAD +// this mode is completely unused in vanilla; it doesn't even have a case in update_cameras +// seems to be based on CAM_UPDATE_NO_INTERP (the one used for battle cam) +// tracks a point 400 units ahead of player position in the z-direction and 60 units above +// defaults to a relatively short boom length and no pitch angle, resulting in a head-on direct view +// +// control parameters: +// dist -- length of the camera boom arm +// pitch -- rising angle of the boom arm, up toward the y-axis +// yaw -- yaw angle for the boom arm in the xz-plane +// skipRecalc -- do not calculate lookAt_obj and lookAt_eye from params +void update_camera_unused_ahead(Camera* camera) { PlayerStatus* playerStatus = &gPlayerStatus; f32 sinBoom; f32 cosBoom; @@ -12,14 +23,14 @@ void update_camera_mode_unused(Camera* camera) { f32 deltaZ2; f32 boomYaw; - if (camera->needsInit || camera->isChangingMap) { + if (camera->needsInit || camera->needsReinit) { camera->needsInit = FALSE; - camera->isChangingMap = FALSE; - camera->auxPitch = 0; - camera->auxBoomLength = 100; - camera->lookAt_dist = 100; - camera->auxBoomPitch = 0; - camera->auxBoomYaw = 0; + camera->needsReinit = FALSE; + camera->params.basic.skipRecalc = FALSE; + camera->params.basic.dist = 100; + camera->params.basic.fovScale = 100; + camera->params.basic.pitch = 0; + camera->params.basic.yaw = 0; camera->lookAt_obj.x = camera->lookAt_obj_target.x; camera->lookAt_obj.y = camera->lookAt_obj_target.y; camera->lookAt_obj.z = camera->lookAt_obj_target.z; @@ -31,15 +42,15 @@ void update_camera_mode_unused(Camera* camera) { camera->lookAt_obj_target.x = playerStatus->pos.x; camera->lookAt_obj_target.z = playerStatus->pos.z + 400.0f; - if (camera->auxPitch == 0) { + if (!camera->params.basic.skipRecalc) { camera->lookAt_obj.x = camera->lookAt_obj_target.x; camera->lookAt_obj.y = camera->lookAt_obj_target.y; camera->lookAt_obj.z = camera->lookAt_obj_target.z; - camera->trueRot.x = camera->auxBoomYaw; - camera->curBoomYaw = camera->auxBoomPitch; - camera->curBoomLength = camera->auxBoomLength; - camera->vfov = (10000 / camera->lookAt_dist) / 4; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + camera->curBoomYaw = camera->params.basic.yaw; + camera->curBoomPitch = camera->params.basic.pitch; + camera->curBoomLength = camera->params.basic.dist; + camera->vfov = (10000 / camera->params.basic.fovScale) / 4; + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaX = 0.0f; @@ -52,7 +63,7 @@ void update_camera_mode_unused(Camera* camera) { deltaX = deltaX2; deltaY = cosBoom * deltaY2 + deltaZ2 * sinBoom; deltaZ = sinBoom * boomYaw + deltaZ2 * cosBoom; - boomYaw = DEG_TO_RAD(camera->trueRot.x); + boomYaw = DEG_TO_RAD(camera->curBoomYaw); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); deltaZ2 = cosBoom * deltaX - deltaZ * sinBoom; @@ -67,6 +78,6 @@ void update_camera_mode_unused(Camera* camera) { deltaX = camera->lookAt_obj.x - camera->lookAt_eye.x; deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y; deltaZ = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ); - camera->curPitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); + camera->lookAt_yaw = -atan2(0.0f, 0.0f, deltaX, deltaZ); + camera->lookAt_pitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); } diff --git a/src/cam_mode_5.c b/src/cam_mode_unused_leading.c similarity index 52% rename from src/cam_mode_5.c rename to src/cam_mode_unused_leading.c index 8b894cb45b1..664ab680804 100644 --- a/src/cam_mode_5.c +++ b/src/cam_mode_unused_leading.c @@ -1,41 +1,46 @@ #include "common.h" -void cam_interp_lookat_pos(Camera* camera, f32 arg1, f32 arg2, s16 arg3); -void func_8003034C(Camera* camera); +void interp_lookat_pos(Camera* camera, f32 arg1, f32 arg2, s16 arg3); +void update_unused_lead_amt(Camera* camera); -// implementation for CAM_UPDATE_UNUSED_5 -void update_camera_mode_5(Camera* camera) { +// implements CAM_UPDATE_UNUSED_LEADING +// this camera tracks player position and adds basic 'leading' in the x-direction only +// camera yaw is fixed at zero and the lead direction is determined by player world yaw +// thus, this only works for '2D' style maps where left is -x and right is +x +// +// no control parameters +void update_camera_unused_leading(Camera* camera) { PlayerStatus* playerStatus = &gPlayerStatus; f32 lookXDelta, lookYDelta, lookZDelta; - camera->curBoomYaw = 18.0f; + camera->curBoomPitch = 18.0f; camera->curBoomLength = 690.0f; - camera->curYOffset = 47.0f; + camera->targetOffsetY = 47.0f; if (camera->needsInit) { - camera->unk_550 = 0.0f; - camera->unk_70 = 0.0f; - camera->trueRot.x = 0.0f; + camera->unusedLeadAmt = 0.0f; + camera->interpYaw = 0.0f; + camera->curBoomYaw = 0.0f; camera->needsInit = FALSE; - camera->unk_554 = 0; + camera->unusedLeadCounter = 0; camera->lookAt_obj.x = camera->targetPos.x; - camera->lookAt_obj.y = camera->targetPos.y + camera->curYOffset; + camera->lookAt_obj.y = camera->targetPos.y + camera->targetOffsetY; camera->lookAt_obj.z = camera->targetPos.z; - cam_interp_lookat_pos(camera, 0.0f, 0.0f, FALSE); + interp_lookat_pos(camera, 0.0f, 0.0f, FALSE); } else { f32 maxInterpSpeed = (playerStatus->curSpeed * 1.5f) + 1.0f; f32 interpRate = (playerStatus->curSpeed * 0.05f) + 0.05f; - camera->lookAt_obj_target.x = camera->targetPos.x + camera->unk_550; - camera->lookAt_obj_target.y = camera->targetPos.y + camera->curYOffset; + camera->lookAt_obj_target.x = camera->targetPos.x + camera->unusedLeadAmt; + camera->lookAt_obj_target.y = camera->targetPos.y + camera->targetOffsetY; camera->lookAt_obj_target.z = camera->targetPos.z; - func_8003034C(camera); + update_unused_lead_amt(camera); if (!(camera->moveFlags & CAMERA_MOVE_IGNORE_PLAYER_Y)) { - cam_interp_lookat_pos(camera, interpRate, maxInterpSpeed, FALSE); + interp_lookat_pos(camera, interpRate, maxInterpSpeed, FALSE); } else { lookXDelta = maxInterpSpeed; // needed to match - cam_interp_lookat_pos(camera, interpRate, lookXDelta, TRUE); + interp_lookat_pos(camera, interpRate, lookXDelta, TRUE); } } @@ -43,11 +48,11 @@ void update_camera_mode_5(Camera* camera) { lookXDelta = camera->lookAt_obj.x - camera->lookAt_eye.x; lookYDelta = camera->lookAt_obj.y - camera->lookAt_eye.y; lookZDelta = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, lookXDelta, lookZDelta); - camera->curPitch = atan2(0.0f, 0.0f, lookYDelta, -sqrtf(SQ(lookXDelta) + SQ(lookZDelta))); + camera->lookAt_yaw = -atan2(0.0f, 0.0f, lookXDelta, lookZDelta); + camera->lookAt_pitch = atan2(0.0f, 0.0f, lookYDelta, -sqrtf(SQ(lookXDelta) + SQ(lookZDelta))); } -void cam_interp_lookat_pos(Camera* camera, f32 interpAmtXZ, f32 maxDeltaXZ, s16 lockPosY) { +void interp_lookat_pos(Camera* camera, f32 interpAmtXZ, f32 maxDeltaXZ, s16 lockPosY) { f32 xDelta = (camera->lookAt_obj_target.x - camera->lookAt_obj.x) * interpAmtXZ; f32 theta; f32 cosTheta; @@ -62,8 +67,8 @@ void cam_interp_lookat_pos(Camera* camera, f32 interpAmtXZ, f32 maxDeltaXZ, s16 camera->lookAt_obj.x = camera->lookAt_eye.x = camera->lookAt_obj.x + xDelta; - theta = DEG_TO_RAD(camera->curBoomYaw); - cosTheta = cos_rad(DEG_TO_RAD(camera->curBoomYaw)); + theta = DEG_TO_RAD(camera->curBoomPitch); + cosTheta = cos_rad(DEG_TO_RAD(camera->curBoomPitch)); camera->lookAt_obj.z += (camera->lookAt_obj_target.z - camera->lookAt_obj.z) * interpAmtXZ; camera->lookAt_eye.z = camera->lookAt_obj.z + (camera->curBoomLength * cosTheta); @@ -74,30 +79,32 @@ void cam_interp_lookat_pos(Camera* camera, f32 interpAmtXZ, f32 maxDeltaXZ, s16 } } -void func_8003034C(Camera* camera) { +void update_unused_lead_amt(Camera* camera) { PlayerStatus* playerStatus = &gPlayerStatus; + // moving left? (along +x axis) if (fabsf(get_clamped_angle_diff(playerStatus->curYaw, 90.0f)) < 45.0f) { - if (camera->unk_556 == 0) { - if (camera->unk_554 <= 0) { - camera->unk_550 = 35.0f; + if (camera->unusedLeadDir == 0) { + if (camera->unusedLeadCounter <= 0) { + camera->unusedLeadAmt = 35.0f; } else { - camera->unk_554--; + camera->unusedLeadCounter--; } } else { - camera->unk_554 = 15; - camera->unk_556 = 0; + camera->unusedLeadCounter = 15; + camera->unusedLeadDir = 0; } + // moving right? (along -x axis) } else if (fabsf(get_clamped_angle_diff(playerStatus->curYaw, 270.0f)) < 45.0f) { - if (camera->unk_556 == 1) { - if (camera->unk_554 <= 0) { - camera->unk_550 = -35.0f; + if (camera->unusedLeadDir == 1) { + if (camera->unusedLeadCounter <= 0) { + camera->unusedLeadAmt = -35.0f; } else { - camera->unk_554--; + camera->unusedLeadCounter--; } } else { - camera->unk_554 = 15; - camera->unk_556 = 1; + camera->unusedLeadCounter = 15; + camera->unusedLeadDir = 1; } } } diff --git a/src/cam_mode_1.c b/src/cam_mode_unused_radial.c similarity index 64% rename from src/cam_mode_1.c rename to src/cam_mode_unused_radial.c index 48c10273179..7d0b5f4084a 100644 --- a/src/cam_mode_1.c +++ b/src/cam_mode_unused_radial.c @@ -1,8 +1,16 @@ #include "common.h" #include "camera.h" -// implementation for CAM_UPDATE_UNUSED_1 -void update_camera_mode_1(Camera* camera) { +// implements CAM_UPDATE_UNUSED_RADIAL +// this camera tracks lookAt_obj_target in a circular region centered on targetPos. the camera does not update +// unless lookAt_obj_target is greater than a minimum distance from targetPos to prevent wild movements. +// +// control parameters: +// dist -- length of the camera boom arm +// pitch -- rising angle of the boom arm, up toward the y-axis +// offsetY -- offset of the base of the boom arm above the target point +// minRadius -- do not update camera if lookAt_obj_target is closer than this distance from targetPos +void update_camera_unused_radial(Camera* camera) { f32 sinBoom, cosBoom; f32 f20; f32 boomYaw; @@ -22,24 +30,24 @@ void update_camera_mode_1(Camera* camera) { deltaX2 = camera->targetPos.x; deltaZ = camera->targetPos.z; - camera->curBoomYaw = camera->auxPitch; - camera->curBoomLength = camera->lookAt_dist * 100 / D_8009A5EC; - camera->curYOffset = camera->auxBoomPitch * 20 / D_8009A5EC; + camera->curBoomPitch = camera->params.radial.pitch; + camera->curBoomLength = camera->params.radial.dist * 100 / CamLengthScale; + camera->targetOffsetY = camera->params.radial.offsetY * 20 / CamLengthScale; f20 = atan2(deltaX, deltaZ2, deltaX2, deltaZ); - if ((dist2D(deltaX, deltaZ2, deltaX2, deltaZ) < camera->auxBoomLength * 100 / D_8009A5EC)) { - f20 = camera->trueRot.x; - camera->trueRot.x = f20; + if ((dist2D(deltaX, deltaZ2, deltaX2, deltaZ) < camera->params.radial.minRadius * 100 / CamLengthScale)) { + f20 = camera->curBoomYaw; + camera->curBoomYaw = f20; } else { - camera->trueRot.x = f20; + camera->curBoomYaw = f20; } - camera->trueRot.y = f20; + camera->targetBoomYaw = f20; camera->lookAt_obj.x = camera->lookAt_obj_target.x; - camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->curYOffset; + camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetOffsetY; camera->lookAt_obj.z = camera->lookAt_obj_target.z; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); deltaX = 0.0f; @@ -76,11 +84,11 @@ void update_camera_mode_1(Camera* camera) { y3 = tmp1; z3 = camera->lookAt_obj_target.z; - camera->curBoomYaw = camera->auxPitch; - camera->curBoomLength = camera->lookAt_dist * 100 / D_8009A5EC; - camera->curYOffset = camera->auxBoomPitch * 20 / D_8009A5EC; + camera->curBoomPitch = camera->params.radial.pitch; + camera->curBoomLength = camera->params.radial.dist * 100 / CamLengthScale; + camera->targetOffsetY = camera->params.radial.offsetY * 20 / CamLengthScale; - y3 += camera->curYOffset; + y3 += camera->targetOffsetY; x3 -= camera->lookAt_obj.x; y3 -= camera->lookAt_obj.y; @@ -99,15 +107,15 @@ void update_camera_mode_1(Camera* camera) { camera->lookAt_obj.z += z3 * 0.5f; f20 = atan2(deltaX, deltaZ2, deltaX2, deltaZ); - if ((dist2D(deltaX, deltaZ2, deltaX2, deltaZ) < camera->auxBoomLength * 100 / D_8009A5EC)) { - f20 = camera->trueRot.x; + if ((dist2D(deltaX, deltaZ2, deltaX2, deltaZ) < camera->params.radial.minRadius * 100 / CamLengthScale)) { + f20 = camera->curBoomYaw; } else { - camera->trueRot.x = f20; + camera->curBoomYaw = f20; } - camera->trueRot.y -= get_clamped_angle_diff(f20, camera->trueRot.y) / 10.0f; - f20 = camera->trueRot.y; + camera->targetBoomYaw -= get_clamped_angle_diff(f20, camera->targetBoomYaw) / 10.0f; + f20 = camera->targetBoomYaw; - boomYaw = DEG_TO_RAD(camera->curBoomYaw); + boomYaw = DEG_TO_RAD(camera->curBoomPitch); sinBoom = sin_rad(boomYaw); cosBoom = cos_rad(boomYaw); @@ -143,6 +151,6 @@ void update_camera_mode_1(Camera* camera) { deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y; deltaZ2 = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->curBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ2); - camera->curPitch = atan2(0.0f, 0.0f, deltaY, -sqrtf((deltaX * deltaX) + (deltaZ2 * deltaZ2))); + camera->lookAt_yaw = -atan2(0.0f, 0.0f, deltaX, deltaZ2); + camera->lookAt_pitch = atan2(0.0f, 0.0f, deltaY, -sqrtf((deltaX * deltaX) + (deltaZ2 * deltaZ2))); } diff --git a/src/cam_mode_zone_interp.c b/src/cam_mode_zone_interp.c index 0b390dd620d..2189808bd76 100644 --- a/src/cam_mode_zone_interp.c +++ b/src/cam_mode_zone_interp.c @@ -1,14 +1,14 @@ #include "common.h" -BSS CamConfiguration gCurrentCamConfiguration; +BSS CameraRig CurrentCamRig; BSS f32 D_800A08DC; BSS f32 D_800A08E0; BSS f32 D_800A08E4; BSS f32 D_800A08E8; BSS f32 D_800A08EC; -void cam_interp_lookat_pos(Camera* camera, f32 arg1, f32 arg2, s16 arg3); -void func_8003034C(Camera* camera); +void interp_lookat_pos(Camera* camera, f32 arg1, f32 arg2, s16 arg3); +void update_unused_lead_amt(Camera* camera); void func_80030450(Camera* camera) { } @@ -34,15 +34,15 @@ enum CameraSettingsPtrType { void update_camera_from_controller( Camera* camera, - CamConfiguration* oldConfiguration, CameraControlSettings** prevController, - CamConfiguration* newConfiguration, CameraControlSettings** newController, + CameraRig* oldConfiguration, CameraControlSettings** prevController, + CameraRig* newConfiguration, CameraControlSettings** newController, f32 x1, f32 y1, f32 z1, f32 tX, f32 tY, f32 tZ, s32 changingMap, f32* interpAlpha, s32 changingZone) { CameraControlSettings* prevSettings; CameraControlSettings* controller; - CamConfiguration* configuration; + CameraRig* configuration; f32 boomLength; @@ -572,6 +572,16 @@ void update_camera_from_controller( } } +// implements CAM_UPDATE_FROM_ZONE +// this camera samples camera zones below its targetPos and derives control parameters from their settings, +// interpolating its control parameters when changing zones. these control parameters determine the camera +// position and orientation just like other camera modes. +// note that this code does NOT directly reference the player position in any manner, it is only concerned +// with the camera's targetPos, which must be assigned elsewhere. +// this is the camera used during world gameplay +// +// control parameters: +// zoomPercent -- boom length is adjusted by this factor, with 100 being no change, 50 being half distance, etc void update_camera_zone_interp(Camera* camera) { CameraControlSettings* currentController; CameraControlSettings* cs; @@ -615,9 +625,9 @@ void update_camera_zone_interp(Camera* camera) { targetZ = camera->targetPos.z; changingZone = FALSE; - if (camera->isChangingMap) { - camera->curController = NULL; - camera->prevController = NULL; + if (camera->needsReinit) { + camera->curSettings = NULL; + camera->prevSettings = NULL; camera->linearInterp = 0.0f; camera->yinterpGoal = 0.0f; camera->yinterpCur = targetY; @@ -628,12 +638,12 @@ void update_camera_zone_interp(Camera* camera) { camera->prevTargetPos.z = 0.0f; camera->prevPrevFollowPlayer = FALSE; camera->prevFollowPlayer = FALSE; - camera->panPhase = 0.0f; + camera->interpEasingParameter = 0.0f; D_800A08DC = 0.0f; D_800A08E0 = 0.0f; camera->interpAlpha = 1.0f; camera->yinterpAlpha = 1.0f; - camera->linearInterpScale = 1.0f; + camera->linearInterpRate = 1.0f; } tempX = targetX; if (camera->moveFlags & CAMERA_MOVE_IGNORE_PLAYER_Y) { @@ -671,7 +681,7 @@ void update_camera_zone_interp(Camera* camera) { || camera->prevTargetPos.x != targetX || camera->prevTargetPos.y != targetY || camera->prevTargetPos.z != targetZ - || camera->isChangingMap + || camera->needsReinit ) { if (camera->followPlayer) { @@ -682,7 +692,7 @@ void update_camera_zone_interp(Camera* camera) { cond2 = FALSE; cs2 = cs; - currentController = camera->curController; + currentController = camera->curSettings; if (cs != NULL && currentController != NULL && cs->type == currentController->type @@ -737,17 +747,17 @@ void update_camera_zone_interp(Camera* camera) { if (camera->panActive || (!cond2 && cs2 != currentController)) { if (camera->interpAlpha == 1.0f) { - camera->prevController = camera->curController; + camera->prevSettings = camera->curSettings; } else { - camera->prevController = (CameraControlSettings*) CAMERA_SETTINGS_PTR_MINUS_1; + camera->prevSettings = (CameraControlSettings*) CAMERA_SETTINGS_PTR_MINUS_1; } changingZone = TRUE; - camera->prevConfiguration = gCurrentCamConfiguration; - camera->curController = cs; + camera->prevRig = CurrentCamRig; + camera->curSettings = cs; camera->interpAlpha = 0.0f; camera->linearInterp = 0.0f; camera->panActive = FALSE; - camera->linearInterpScale = camera->moveSpeed; + camera->linearInterpRate = camera->moveSpeed; camera->prevPrevFollowPlayer = camera->prevFollowPlayer; camera->prevFollowPlayer = camera->followPlayer; camera->prevPrevMovePos.x = camera->prevMovePos.x; @@ -780,24 +790,24 @@ void update_camera_zone_interp(Camera* camera) { tZ = tempZ; } - update_camera_from_controller(camera, &camera->prevConfiguration, &camera->prevController, - &camera->goalConfiguration, &camera->curController, posX, posY, posZ, tX, tY, tZ, - camera->isChangingMap, &camera->interpAlpha, changingZone); + update_camera_from_controller(camera, &camera->prevRig, &camera->prevSettings, + &camera->nextRig, &camera->curSettings, posX, posY, posZ, tX, tY, tZ, + camera->needsReinit, &camera->interpAlpha, changingZone); - if (camera->isChangingMap) { - camera->prevConfiguration = camera->goalConfiguration; - camera->isChangingMap = FALSE; + if (camera->needsReinit) { + camera->prevRig = camera->nextRig; + camera->needsReinit = FALSE; camera->interpAlpha = 1.0f; } - if (camera->prevConfiguration.boomYaw - camera->goalConfiguration.boomYaw > 180.0f) { - camera->prevConfiguration.boomYaw -= 360.0f; + if (camera->prevRig.boomYaw - camera->nextRig.boomYaw > 180.0f) { + camera->prevRig.boomYaw -= 360.0f; } - if (camera->prevConfiguration.boomYaw - camera->goalConfiguration.boomYaw < -180.0f) { - camera->prevConfiguration.boomYaw += 360.0f; + if (camera->prevRig.boomYaw - camera->nextRig.boomYaw < -180.0f) { + camera->prevRig.boomYaw += 360.0f; } - delta = camera->prevConfiguration.boomYaw - camera->goalConfiguration.boomYaw; + delta = camera->prevRig.boomYaw - camera->nextRig.boomYaw; if (delta < 0.0f) { delta = -delta; } @@ -806,7 +816,7 @@ void update_camera_zone_interp(Camera* camera) { } maxDelta = delta; - delta = camera->prevConfiguration.boomPitch - camera->goalConfiguration.boomPitch; + delta = camera->prevRig.boomPitch - camera->nextRig.boomPitch; if (delta < 0.0f) { delta = -delta; } @@ -817,7 +827,7 @@ void update_camera_zone_interp(Camera* camera) { maxDelta = delta; } - delta = camera->prevConfiguration.viewPitch - camera->goalConfiguration.viewPitch; + delta = camera->prevRig.viewPitch - camera->nextRig.viewPitch; if (delta < 0.0f) { delta = -delta; } @@ -828,7 +838,7 @@ void update_camera_zone_interp(Camera* camera) { maxDelta = delta; } - delta = camera->prevConfiguration.boomLength - camera->goalConfiguration.boomLength; + delta = camera->prevRig.boomLength - camera->nextRig.boomLength; if (delta < 0.0f) { delta = -delta; } @@ -836,9 +846,9 @@ void update_camera_zone_interp(Camera* camera) { maxDelta = delta; } - deltaX = camera->prevConfiguration.targetPos.x - camera->goalConfiguration.targetPos.x; - deltaY = camera->prevConfiguration.targetPos.y - camera->goalConfiguration.targetPos.y; - deltaZ = camera->prevConfiguration.targetPos.z - camera->goalConfiguration.targetPos.z; + deltaX = camera->prevRig.targetPos.x - camera->nextRig.targetPos.x; + deltaY = camera->prevRig.targetPos.y - camera->nextRig.targetPos.y; + deltaZ = camera->prevRig.targetPos.z - camera->nextRig.targetPos.z; delta = SQ(deltaX); delta += SQ(deltaY); delta += SQ(deltaZ); @@ -860,14 +870,16 @@ void update_camera_zone_interp(Camera* camera) { } if (maxDelta != 0.0f) { - camera->linearInterp += (1.0f / maxDelta) * camera->linearInterpScale; + camera->linearInterp += (1.0f / maxDelta) * camera->linearInterpRate; if (camera->linearInterp > 1.0f) { camera->linearInterp = 1.0f; } } if (camera->interpAlpha < 1.0) { - panPhase = camera->panPhase; + // this parameter controls whether the easing will be cosine in/out or quadratic out + // in practice, only 0 and 0.5 are ever used, and 0.5 is extremely rare + panPhase = camera->interpEasingParameter; panRad = panPhase * PI_D; temp_f24 = 2.0f / (cos_rad(panRad) + 1.0f); temp_f22_2 = cos_rad((camera->linearInterp * PI_D * (1.0f - panPhase)) + panRad); @@ -887,52 +899,52 @@ void update_camera_zone_interp(Camera* camera) { interpAlpha = camera->interpAlpha; interpAlphaInv = 1.0f - interpAlpha; - gCurrentCamConfiguration.boomYaw = (camera->prevConfiguration.boomYaw * interpAlphaInv) + (camera->goalConfiguration.boomYaw * interpAlpha); - gCurrentCamConfiguration.boomLength = (camera->prevConfiguration.boomLength * interpAlphaInv) + (camera->goalConfiguration.boomLength * interpAlpha); - gCurrentCamConfiguration.boomPitch = (camera->prevConfiguration.boomPitch * interpAlphaInv) + (camera->goalConfiguration.boomPitch * interpAlpha); - gCurrentCamConfiguration.viewPitch = (camera->prevConfiguration.viewPitch * interpAlphaInv) + (camera->goalConfiguration.viewPitch * interpAlpha); - gCurrentCamConfiguration.targetPos.x = (camera->prevConfiguration.targetPos.x * interpAlphaInv) + (camera->goalConfiguration.targetPos.x * interpAlpha); - gCurrentCamConfiguration.targetPos.y = (camera->prevConfiguration.targetPos.y * interpAlphaInv) + (camera->goalConfiguration.targetPos.y * interpAlpha); - gCurrentCamConfiguration.targetPos.z = (camera->prevConfiguration.targetPos.z * interpAlphaInv) + (camera->goalConfiguration.targetPos.z * interpAlpha); - gCurrentCamConfiguration.boomLength *= camera->zoomPercent; - gCurrentCamConfiguration.boomLength *= 0.01; + CurrentCamRig.boomYaw = (camera->prevRig.boomYaw * interpAlphaInv) + (camera->nextRig.boomYaw * interpAlpha); + CurrentCamRig.boomLength = (camera->prevRig.boomLength * interpAlphaInv) + (camera->nextRig.boomLength * interpAlpha); + CurrentCamRig.boomPitch = (camera->prevRig.boomPitch * interpAlphaInv) + (camera->nextRig.boomPitch * interpAlpha); + CurrentCamRig.viewPitch = (camera->prevRig.viewPitch * interpAlphaInv) + (camera->nextRig.viewPitch * interpAlpha); + CurrentCamRig.targetPos.x = (camera->prevRig.targetPos.x * interpAlphaInv) + (camera->nextRig.targetPos.x * interpAlpha); + CurrentCamRig.targetPos.y = (camera->prevRig.targetPos.y * interpAlphaInv) + (camera->nextRig.targetPos.y * interpAlpha); + CurrentCamRig.targetPos.z = (camera->prevRig.targetPos.z * interpAlphaInv) + (camera->nextRig.targetPos.z * interpAlpha); + CurrentCamRig.boomLength *= camera->params.world.zoomPercent; + CurrentCamRig.boomLength *= 0.01; func_80030450(camera); - temp_f20_2 = gCurrentCamConfiguration.boomYaw + D_800A08E0; + temp_f20_2 = CurrentCamRig.boomYaw + D_800A08E0; temp_f26 = sin_deg(temp_f20_2); temp_f24_2 = -cos_deg(temp_f20_2); - cosAngle = cos_deg(gCurrentCamConfiguration.boomPitch + D_800A08DC); - sinAngle = sin_deg(gCurrentCamConfiguration.boomPitch + D_800A08DC); + cosAngle = cos_deg(CurrentCamRig.boomPitch + D_800A08DC); + sinAngle = sin_deg(CurrentCamRig.boomPitch + D_800A08DC); if (!(camera->moveFlags & CAMERA_MOVE_NO_INTERP_Y)) { - camera->lookAt_eye.y = gCurrentCamConfiguration.targetPos.y + (gCurrentCamConfiguration.boomLength * sinAngle); + camera->lookAt_eye.y = CurrentCamRig.targetPos.y + (CurrentCamRig.boomLength * sinAngle); } - camera->lookAt_eye.x = gCurrentCamConfiguration.targetPos.x - (temp_f26 * gCurrentCamConfiguration.boomLength * cosAngle); - camera->lookAt_eye.z = gCurrentCamConfiguration.targetPos.z - (temp_f24_2 * gCurrentCamConfiguration.boomLength * cosAngle); - cosAngle = cos_deg(-gCurrentCamConfiguration.viewPitch); - sinAngle = sin_deg(-gCurrentCamConfiguration.viewPitch); + camera->lookAt_eye.x = CurrentCamRig.targetPos.x - (temp_f26 * CurrentCamRig.boomLength * cosAngle); + camera->lookAt_eye.z = CurrentCamRig.targetPos.z - (temp_f24_2 * CurrentCamRig.boomLength * cosAngle); + cosAngle = cos_deg(-CurrentCamRig.viewPitch); + sinAngle = sin_deg(-CurrentCamRig.viewPitch); - if (camera->lookAt_eye.x == gCurrentCamConfiguration.targetPos.x && camera->lookAt_eye.z == gCurrentCamConfiguration.targetPos.z) { + if (camera->lookAt_eye.x == CurrentCamRig.targetPos.x && camera->lookAt_eye.z == CurrentCamRig.targetPos.z) { dist = 0.0f; } else { - dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, gCurrentCamConfiguration.targetPos.x, gCurrentCamConfiguration.targetPos.z); + dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, CurrentCamRig.targetPos.x, CurrentCamRig.targetPos.z); } - temp_f8_2 = gCurrentCamConfiguration.targetPos.y - camera->lookAt_eye.y; + temp_f8_2 = CurrentCamRig.targetPos.y - camera->lookAt_eye.y; if (!(camera->moveFlags & CAMERA_MOVE_NO_INTERP_Y)) { camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinAngle) + (temp_f8_2 * cosAngle)); } temp_f4_4 = (dist * cosAngle) - (temp_f8_2 * sinAngle); camera->lookAt_obj.x = camera->lookAt_eye.x + (temp_f26 * temp_f4_4); camera->lookAt_obj.z = camera->lookAt_eye.z + (temp_f24_2 * temp_f4_4); - camera->curYaw = gCurrentCamConfiguration.boomYaw + D_800A08E0; - camera->trueRot.x = camera->curYaw; - camera->curBoomLength = gCurrentCamConfiguration.boomLength; - camera->curBlendedYawNegated = -gCurrentCamConfiguration.boomYaw; - camera->curPitch = -gCurrentCamConfiguration.boomPitch - gCurrentCamConfiguration.viewPitch; + camera->curYaw = CurrentCamRig.boomYaw + D_800A08E0; + camera->curBoomYaw = camera->curYaw; + camera->curBoomLength = CurrentCamRig.boomLength; + camera->lookAt_yaw = -CurrentCamRig.boomYaw; + camera->lookAt_pitch = -CurrentCamRig.boomPitch - CurrentCamRig.viewPitch; camera->lookAt_obj_target.x = camera->lookAt_obj.x; camera->lookAt_obj_target.y = camera->lookAt_obj.y; camera->lookAt_obj_target.z = camera->lookAt_obj.z; - camera->curYOffset = 0.0f; + camera->targetOffsetY = 0.0f; } diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c index acaa20c8389..35efa7cfcc7 100644 --- a/src/effects/cold_breath.c +++ b/src/effects/cold_breath.c @@ -202,7 +202,7 @@ void cold_breath_appendGfx(void* effect) { guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, 0.5 * unk24); gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); gSPDisplayList(gMainGfxPos++, D_E00DE84C[unk00]); diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index 45e9b3cc843..e6088339212 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -252,7 +252,7 @@ void effect_63_appendGfx(void* effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); guScaleF(sp18, part->unk_70, part->unk_6C, 1.0f); guRotateF(sp58, part->unk_74, 0.0f, 0.0f, 1.0f); diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index 730477d5a45..144369b6710 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -162,7 +162,7 @@ void effect_75_render(EffectInstance* effect) { f32 outZ; f32 outS; - transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], + transform_point(&gCameras[gCurrentCameraID].mtxPerspective[0], data->pos.x, data->pos.y, data->pos.z, 1.0f, &outX, &outY, &outZ, &outS); @@ -213,7 +213,7 @@ void effect_75_appendGfx(void* effect) { guMtxF2L(mtxTransfrom, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, data->unk_34); gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, data->unk_24 * data->masterAlpha / 255); gSPDisplayList(gMainGfxPos++, D_E00EAA58[0]); diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c index 1faeb01b548..847911115ac 100644 --- a/src/effects/effect_86.c +++ b/src/effects/effect_86.c @@ -124,7 +124,7 @@ void effect_86_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, primAlpha); gDPSetEnvColor(gMainGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); gSPDisplayList(gMainGfxPos++, D_E01284B0[0]); diff --git a/src/effects/embers.c b/src/effects/embers.c index 5c8dc40926e..f57bc2d3029 100644 --- a/src/effects/embers.c +++ b/src/effects/embers.c @@ -202,7 +202,7 @@ void embers_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_20, part->unk_24, part->unk_28, unk_2C); gDPSetEnvColor(gMainGfxPos++, part->unk_30, part->unk_34, part->unk_38, part->unk_3C); gSPDisplayList(gMainGfxPos++, D_E00E0A40[1]); diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index e75c480b333..4cdbd9e57a2 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -242,7 +242,7 @@ void energy_orb_wave_appendGfx(void* effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_20, data->unk_24, data->unk_28, unk_2C); gDPSetColorDither(gMainGfxPos++, G_CD_BAYER); gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index 735618c119a..46e662f593c 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -255,22 +255,22 @@ void firework_rocket_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - mtx_0_0 = camera->perspectiveMatrix[0][0]; - mtx_0_1 = camera->perspectiveMatrix[0][1]; - mtx_0_2 = camera->perspectiveMatrix[0][2]; - mtx_0_3 = camera->perspectiveMatrix[0][3]; - mtx_1_0 = camera->perspectiveMatrix[1][0]; - mtx_1_1 = camera->perspectiveMatrix[1][1]; - mtx_1_2 = camera->perspectiveMatrix[1][2]; - mtx_1_3 = camera->perspectiveMatrix[1][3]; - mtx_2_0 = camera->perspectiveMatrix[2][0]; - mtx_2_1 = camera->perspectiveMatrix[2][1]; - mtx_2_2 = camera->perspectiveMatrix[2][2]; - mtx_2_3 = camera->perspectiveMatrix[2][3]; - mtx_3_0 = camera->perspectiveMatrix[3][0]; - mtx_3_1 = camera->perspectiveMatrix[3][1]; - mtx_3_2 = camera->perspectiveMatrix[3][2]; - mtx_3_3 = camera->perspectiveMatrix[3][3]; + mtx_0_0 = camera->mtxPerspective[0][0]; + mtx_0_1 = camera->mtxPerspective[0][1]; + mtx_0_2 = camera->mtxPerspective[0][2]; + mtx_0_3 = camera->mtxPerspective[0][3]; + mtx_1_0 = camera->mtxPerspective[1][0]; + mtx_1_1 = camera->mtxPerspective[1][1]; + mtx_1_2 = camera->mtxPerspective[1][2]; + mtx_1_3 = camera->mtxPerspective[1][3]; + mtx_2_0 = camera->mtxPerspective[2][0]; + mtx_2_1 = camera->mtxPerspective[2][1]; + mtx_2_2 = camera->mtxPerspective[2][2]; + mtx_2_3 = camera->mtxPerspective[2][3]; + mtx_3_0 = camera->mtxPerspective[3][0]; + mtx_3_1 = camera->mtxPerspective[3][1]; + mtx_3_2 = camera->mtxPerspective[3][2]; + mtx_3_3 = camera->mtxPerspective[3][3]; gSPDisplayList(gMainGfxPos++, D_E010ACCC[variation]); centerX = data->pos.x; diff --git a/src/effects/flame.c b/src/effects/flame.c index 7c5b76e1e77..12a764014fd 100644 --- a/src/effects/flame.c +++ b/src/effects/flame.c @@ -143,7 +143,7 @@ void flame_render(EffectInstance* effect) { f32 outZ; f32 outW; - transform_point(gCameras[gCurrentCameraID].perspectiveMatrix, data->pos.x, data->pos.y, data->pos.z, 1.0f, + transform_point(gCameras[gCurrentCameraID].mtxPerspective, data->pos.x, data->pos.y, data->pos.z, 1.0f, &outX, &outY, &outZ, &outW); outDist = outZ + 5000; diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c index 3aa7c372e1d..5ebdd3dcca8 100644 --- a/src/effects/flashing_box_shockwave.c +++ b/src/effects/flashing_box_shockwave.c @@ -12,16 +12,16 @@ void flashing_box_shockwave_render(EffectInstance* effect); void flashing_box_shockwave_appendGfx(void* effect); EffectInstance* flashing_box_shockwave_main( - s32 arg0, - f32 arg1, - f32 arg2, - f32 arg3, - f32 arg4, - f32 arg5 + s32 type, + f32 posX, + f32 posY, + f32 posZ, + f32 sizeX, + f32 sizeY ) { EffectBlueprint bp; EffectInstance* effect; - FlashingBoxShockwaveFXData* data; + ShockOverlayFXData* data; s32 numParts = 1; bp.init = flashing_box_shockwave_init; @@ -36,41 +36,44 @@ EffectInstance* flashing_box_shockwave_main( data = effect->data.flashingBoxShockwave = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.flashingBoxShockwave != NULL); - data->unk_1C = 30; + data->type = type; + data->timeLeft = 30; + data->lifetime = 0; + data->unk_10 = 255; data->unk_14 = 255; data->unk_18 = 255; - data->unk_00 = arg0; - data->unk_20 = 0; - data->pos.x = arg1; - data->pos.y = arg2; - data->pos.z = arg3; - if (arg0 == 2) { + + data->pos.x = posX; + data->pos.y = posY; + data->pos.z = posZ; + + if (type == FX_SHOCK_OVERLAY_MEGA_SHOCK) { data->unk_24 = 1.0f; } else { - data->unk_24 = 0; + data->unk_24 = 0.0f; } - data->unk_28 = arg4 * 0.5; - data->unk_2C = arg5 * 0.5; - - switch (arg0) { - case 0: - case 1: - case 3: - data->unk_30 = 255; - data->unk_34 = 255; - data->unk_38 = 0; - data->unk_3C = 255; - data->unk_40 = 255; - data->unk_44 = 255; + data->scaleX = sizeX * 0.5; + data->scaleY = sizeY * 0.5; + + switch (type) { + case FX_SHOCK_OVERLAY_SHOCK_HIT: + case FX_SHOCK_OVERLAY_LIGHTNING_WORLD: + case FX_SHOCK_OVERLAY_LIGHTNING_BATTLE: + data->primCol.r = 255; + data->primCol.g = 255; + data->primCol.b = 0; + data->envCol.r = 255; + data->envCol.g = 255; + data->envCol.b = 255; break; default: - data->unk_30 = 70; - data->unk_34 = 180; - data->unk_38 = 120; - data->unk_3C = 255; - data->unk_40 = 255; - data->unk_44 = 255; + data->primCol.r = 70; + data->primCol.g = 180; + data->primCol.b = 120; + data->envCol.r = 255; + data->envCol.g = 255; + data->envCol.b = 255; break; } @@ -81,40 +84,41 @@ void flashing_box_shockwave_init(EffectInstance* effect) { } void flashing_box_shockwave_update(EffectInstance* effect) { - FlashingBoxShockwaveFXData* data = effect->data.flashingBoxShockwave; - s32 unk_00 = data->unk_00; - s32 unk_1C; - s32 unk_20; + ShockOverlayFXData* data = effect->data.flashingBoxShockwave; + s32 type = data->type; + s32 left; + s32 time; - if (data->unk_1C < 100) { - data->unk_1C--; + if (data->timeLeft < 100) { + data->timeLeft--; } - data->unk_20++; + data->lifetime++; - if (data->unk_1C < 0) { + if (data->timeLeft < 0) { remove_effect(effect); return; } - unk_1C = data->unk_1C; - unk_20 = data->unk_20; + left = data->timeLeft; + time = data->lifetime; - if (unk_00 == 2) { - if (unk_20 < 21) { + if (type == FX_SHOCK_OVERLAY_MEGA_SHOCK) { + if (time < 21) { data->unk_24 *= 1.1; } } else { + // interp toward 8.0 data->unk_24 += (8.0 - data->unk_24) * 0.05; } data->unk_14 *= 0.9; - if (unk_1C < 5) { + if (left < 5) { data->unk_18 *= 0.8; } - if (unk_20 >= 7) { + if (time >= 7) { data->unk_10 -= 13; if (data->unk_10 < 0) { data->unk_10 = 0; @@ -135,46 +139,46 @@ void flashing_box_shockwave_render(EffectInstance* effect) { } void flashing_box_shockwave_appendGfx(void* effect) { - FlashingBoxShockwaveFXData* data = ((EffectInstance*)effect)->data.flashingBoxShockwave; - s32 unk_00 = data->unk_00; - s32 unk_20 = data->unk_20; - Matrix4f sp18; - Matrix4f sp58; - Matrix4f sp98; + ShockOverlayFXData* data = ((EffectInstance*)effect)->data.flashingBoxShockwave; + s32 type = data->type; + s32 time = data->lifetime; + Matrix4f mtxTransform; + Matrix4f mtxUnkScale; + Matrix4f mtxCamRot; - guRotateF(sp98, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); + guRotateF(mtxCamRot, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - guMtxCatF(sp98, sp18, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); + guMtxCatF(mtxCamRot, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, data->unk_18); - gDPSetEnvColor(gMainGfxPos++, data->unk_3C, data->unk_40, data->unk_44, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, data->unk_18); + gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, 0); - if ((unk_00 == 0 || unk_00 == 1) && unk_20 % 2) { - guScaleF(sp18, data->unk_28, data->unk_2C, 15.0f / 14); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + if ((type == FX_SHOCK_OVERLAY_SHOCK_HIT || type == FX_SHOCK_OVERLAY_LIGHTNING_WORLD) && time % 2) { + guScaleF(mtxTransform, data->scaleX, data->scaleY, 15.0f / 14); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000600_3936A0); - gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, unk_20 * 8, unk_20 * 8, unk_20 * 8 + 128, unk_20 * 8 + 128); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, time * 8, time * 8, time * 8 + 128, time * 8 + 128); gSPDisplayList(gMainGfxPos++, D_090008E8_393988); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - if (unk_00 >= 1 && unk_00 <= 3) { - if (unk_00 == 1) { + if (type == FX_SHOCK_OVERLAY_LIGHTNING_WORLD || type == FX_SHOCK_OVERLAY_MEGA_SHOCK || type == FX_SHOCK_OVERLAY_LIGHTNING_BATTLE) { + if (type == FX_SHOCK_OVERLAY_LIGHTNING_WORLD) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 0, data->unk_14); } - guTranslateF(sp18, 0.0f, data->unk_2C, 0.0f); - guScaleF(sp58, data->unk_24 * 0.25, data->unk_24 * 0.25, 1.0f); - guMtxCatF(sp58, sp18, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, 0.0f, data->scaleY, 0.0f); + guScaleF(mtxUnkScale, data->unk_24 * 0.25, data->unk_24 * 0.25, 1.0f); + guMtxCatF(mtxUnkScale, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000950_3939F0); diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index b565d0182af..f3732c5d255 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -130,7 +130,7 @@ void floating_cloud_puff_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); gSPDisplayList(gMainGfxPos++, D_09000080_3D4F10); diff --git a/src/effects/fright_jar.c b/src/effects/fright_jar.c index 3167811a79e..bdc8f8cadc5 100644 --- a/src/effects/fright_jar.c +++ b/src/effects/fright_jar.c @@ -132,7 +132,7 @@ void fright_jar_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09008BE0_3CA780); idx = 54 - unk_14; diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index d237905eb20..66184d0653f 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -117,7 +117,7 @@ void gather_energy_pink_update(EffectInstance* effect) { part->unk_1C += (part->unk_20 + sin_deg(unk_28 * 10) * 0.1 * part->unk_20 - part->unk_1C) * 0.3; } - transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], part->posA.x, part->posA.y, part->posA.z, 1.0f, &sp28, &sp2C, &sp30, &sp34); + transform_point(&gCameras[gCurrentCameraID].mtxPerspective[0], part->posA.x, part->posA.y, part->posA.z, 1.0f, &sp28, &sp2C, &sp30, &sp34); sp34 = 1.0f / sp34; sp28 *= sp34; diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c index fdcdfad22e9..5ed896773e1 100644 --- a/src/effects/hieroglyphs.c +++ b/src/effects/hieroglyphs.c @@ -131,7 +131,7 @@ void hieroglyphs_appendGfx(void* effect) { guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, data->unk_34); gSPDisplayList(gMainGfxPos++, D_E00E29F0[0]); diff --git a/src/effects/huff_puff_breath.c b/src/effects/huff_puff_breath.c index 6ff62dcf9b9..7c0a9cfb35f 100644 --- a/src/effects/huff_puff_breath.c +++ b/src/effects/huff_puff_breath.c @@ -145,7 +145,7 @@ void huff_puff_breath_appendGfx(void* effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, alpha); gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, data->envCol.a); gSPDisplayList(gMainGfxPos++, D_E00DC648[unk_00]); diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index d9b2452da42..9fa2e9375d9 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -168,7 +168,7 @@ void ice_pillar_appendGfx(void* effect) { gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->prim.r, data->prim.g, data->prim.b, alpha); gDPSetEnvColor(gMainGfxPos++, data->env.r, data->env.g, data->env.b, data->env.a); gSPDisplayList(gMainGfxPos++, D_E011E800[0]); diff --git a/src/effects/lightning.c b/src/effects/lightning.c index 57cc6e4ca0c..79115204605 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -102,9 +102,9 @@ EffectInstance* lightning_main( load_effect(EFFECT_FLASHING_BOX_SHOCKWAVE); if (gGameStatusPtr->isBattle == TRUE) { - effectArg0 = 3; + effectArg0 = FX_SHOCK_OVERLAY_LIGHTNING_BATTLE; } else { - effectArg0 = 1; + effectArg0 = FX_SHOCK_OVERLAY_LIGHTNING_WORLD; } flashing_box_shockwave_main(effectArg0, arg1, arg2, arg3, arg4, arg5); } diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c index 85c41cd46dc..0a6f7189e5f 100644 --- a/src/effects/moving_cloud.c +++ b/src/effects/moving_cloud.c @@ -192,7 +192,7 @@ void moving_cloud_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_24, data->unk_28, data->unk_2C, unk_30); gDPSetEnvColor(gMainGfxPos++, data->unk_34, data->unk_38, data->unk_3C, data->unk_40); gSPDisplayList(gMainGfxPos++, D_E00E8634[0]); diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c index 7f0563f1b9f..3ff1bd93e46 100644 --- a/src/effects/peach_star_beam.c +++ b/src/effects/peach_star_beam.c @@ -210,7 +210,7 @@ void peach_star_beam_appendGfx(void* effect) { gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, data->envA); gSPDisplayList(gMainGfxPos++, D_E010CA14[0]); diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c index cc8d9417a08..25b1c0277e9 100644 --- a/src/effects/radial_shimmer.c +++ b/src/effects/radial_shimmer.c @@ -241,7 +241,7 @@ void radial_shimmer_update(EffectInstance* effect) { part->unk_1C = part->unk_20; - transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], part->unk_04, part->unk_08, part->unk_0C, + transform_point(&gCameras[gCurrentCameraID].mtxPerspective[0], part->unk_04, part->unk_08, part->unk_0C, 1.0f, &outX, &outY, &outZ, &outS); outS = 1.0f / outS; diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index 1afeb0c38aa..42af6b70b5d 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -150,7 +150,7 @@ void radiating_energy_orb_appendGfx(void* effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 64, 64, unk_14); guRotateF(sp18, temp_s2 * 2 + unk_1C, 0.0f, 0.0f, 1.0f); diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c index 40708549704..4530d33331d 100644 --- a/src/effects/shiny_flare.c +++ b/src/effects/shiny_flare.c @@ -115,7 +115,7 @@ void shiny_flare_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000240_3D79B0); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c index 8b90c410302..c0fbe0bf89c 100644 --- a/src/effects/snaking_static.c +++ b/src/effects/snaking_static.c @@ -180,7 +180,7 @@ void snaking_static_appendGfx(void* effect) { gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, 0); gSPDisplayList(gMainGfxPos++, D_09001000_3B3D90); diff --git a/src/effects/static_status.c b/src/effects/static_status.c index 5acb44cbaee..dc0bd84173e 100644 --- a/src/effects/static_status.c +++ b/src/effects/static_status.c @@ -206,7 +206,7 @@ void static_status_appendGfx(void* effect) { guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E00E6888[unk_00]); part++; diff --git a/src/effects/stop_watch.c b/src/effects/stop_watch.c index 2d3121d7033..db630c1d105 100644 --- a/src/effects/stop_watch.c +++ b/src/effects/stop_watch.c @@ -197,7 +197,7 @@ void stop_watch_appendGfx(void* effect) { guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09001000_3CC890); gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, data->unk_2C); gSPBranchList(gMainGfxPos, &gMainGfxPos[65]); diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index 473fedabc85..a23437bb83a 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -176,7 +176,7 @@ void throw_spiny_appendGfx(void* effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, temp_s5); gSPDisplayList(gMainGfxPos++, D_E00C8710[temp_s6]); gSPDisplayList(gMainGfxPos++, D_090009F0_3D04E0); diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index efd247673f2..7eb5c963168 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -338,7 +338,7 @@ void tubba_heart_attack_appendGfx(void* effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000518_3D2A98); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/water_fountain.c b/src/effects/water_fountain.c index aa51b5dc406..f69da63b5ae 100644 --- a/src/effects/water_fountain.c +++ b/src/effects/water_fountain.c @@ -244,7 +244,7 @@ void water_fountain_appendGfx(void *effect) { guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000280_3B8AE0); guRotateF(sp18, data->unk_38, 0.0f, 0.0f, 1.0f); diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c index ce5bbeb0c4d..97658d1ae1d 100644 --- a/src/effects/water_splash.c +++ b/src/effects/water_splash.c @@ -183,7 +183,7 @@ void water_splash_appendGfx(void* effect) { guMtxCatF(sp50, sp10, sp10); guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, currentCamera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, currentCamera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000100_3BCB90); data++; diff --git a/src/effects/waterfall.c b/src/effects/waterfall.c index c1211b717d8..b4600fa97d6 100644 --- a/src/effects/waterfall.c +++ b/src/effects/waterfall.c @@ -138,7 +138,7 @@ void waterfall_appendGfx(void* effect) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->mtxBillboard, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); gSPDisplayList(gMainGfxPos++, D_09000200_3B7AD0); gSPBranchList(gMainGfxPos, &gMainGfxPos[49]); diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 61c417487e4..a9d1b91787a 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -23,7 +23,7 @@ EvtScript Entity_Chest_AdjustCam_ISK = { Call(SetCamDistance, 0, Float(290.0)) Call(SetCamPitch, 0, Float(20.0), Float(-10.0)) Call(SetCamSpeed, 0, Float(8.0)) - Call(PanToTarget, 0, 0, 1) + Call(PanToTarget, 0, 0, TRUE) Call(WaitForCam, 0, Float(1.0)) EndThread Return diff --git a/src/entity_model.c b/src/entity_model.c index e38ba822e12..d379bf005e9 100644 --- a/src/entity_model.c +++ b/src/entity_model.c @@ -66,7 +66,7 @@ void clear_entity_models(void) { entity_fog_red = 10; entity_fog_green = 10; entity_fog_blue = 10; - entity_fog_alpha = 10; + entity_fog_alpha = 10; entity_fog_dist_min = 800; entity_fog_dist_max = 1000; } @@ -105,7 +105,7 @@ s32 load_entity_model(EntityModelScript* cmdList) { (*gCurrentEntityModelList)[i] = newEntityModel = heap_malloc(sizeof(*newEntityModel)); entityModelCount = &gEntityModelCount; (*entityModelCount)++; - + ASSERT(newEntityModel != NULL); newEntityModel->flags = (ENTITY_MODEL_FLAG_CAM0 | ENTITY_MODEL_FLAG_CAM1 | ENTITY_MODEL_FLAG_CAM2 | ENTITY_MODEL_FLAG_ENABLED); @@ -427,7 +427,7 @@ void draw_entity_model_A(s32 modelIdx, Mtx* transformMtx) { inX = mtx[3][0]; inY = mtx[3][1]; inZ = mtx[3][2]; - transform_point(camera->perspectiveMatrix, inX, inY, inZ, 1.0f, &x, &y, &z, &w); + transform_point(camera->mtxPerspective, inX, inY, inZ, 1.0f, &x, &y, &z, &w); rtPtr->renderMode = model->renderMode; rtPtr->appendGfxArg = model; rtPtr->appendGfx = (void(*)(void*))appendGfx_entity_model; @@ -466,7 +466,7 @@ void draw_entity_model_B(s32 modelIdx, Mtx* transformMtx, s32 vertexSegment, Vec inX = mtx[3][0]; inY = mtx[3][1]; inZ = mtx[3][2]; - transform_point(camera->perspectiveMatrix, inX, inY, inZ, 1.0f, &x, &y, &z, &w); + transform_point(camera->mtxPerspective, inX, inY, inZ, 1.0f, &x, &y, &z, &w); rtPtr->renderMode = model->renderMode; rtPtr->appendGfxArg = model; rtPtr->appendGfx = (void(*)(void*))appendGfx_entity_model; diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 1794610a1a5..df1a28e2546 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -52,7 +52,7 @@ API_CALLABLE(SetCamPerspective) { camera->updateMode = mode; camera->needsInit = TRUE; - camera->isChangingMap = TRUE; + camera->needsReinit = TRUE; camera->vfov = vfov; camera->farClip = farClip; @@ -60,7 +60,7 @@ API_CALLABLE(SetCamPerspective) { return ApiStatus_DONE2; } -API_CALLABLE(func_802CA90C) { +API_CALLABLE(SetCamUpdateMode) { Bytecode* args = script->ptrReadPos; s32 id = evt_get_variable(script, *args++); s16 mode = evt_get_variable(script, *args++); @@ -71,7 +71,7 @@ API_CALLABLE(func_802CA90C) { return ApiStatus_DONE2; } -API_CALLABLE(func_802CA988) { +API_CALLABLE(GrabCamera) { Bytecode* args = script->ptrReadPos; Bytecode id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; @@ -80,25 +80,26 @@ API_CALLABLE(func_802CA988) { Bytecode outVar4 = *args++; f32 dx, dy, dz; - gCameras[id].updateMode = CAM_UPDATE_MODE_2; + gCameras[id].updateMode = CAM_UPDATE_INTERP_POS; gCameras[id].needsInit = FALSE; - gCameras[id].auxPitch = -round(gCameras[id].curPitch); - gCameras[id].auxBoomLength = -gCameras[id].curBlendedYawNegated; + gCameras[id].params.interp.pitch = -round(gCameras[id].lookAt_pitch); + gCameras[id].params.interp.yaw = -gCameras[id].lookAt_yaw; dx = gCameras[id].lookAt_obj.x - gCameras[id].lookAt_eye.x; dy = gCameras[id].lookAt_obj.y - gCameras[id].lookAt_eye.y; dz = gCameras[id].lookAt_obj.z - gCameras[id].lookAt_eye.z; - gCameras[id].lookAt_dist = round(sqrtf(SQ(dx) + SQ(dy) + SQ(dz))); - gCameras[id].auxBoomPitch = 0; + gCameras[id].params.interp.dist = round(sqrtf(SQ(dx) + SQ(dy) + SQ(dz))); + gCameras[id].params.interp.offsetY = 0; + gCameras[id].lookAt_obj_target.x = gCameras[id].lookAt_obj.x; gCameras[id].lookAt_obj_target.y = gCameras[id].lookAt_obj.y; gCameras[id].lookAt_obj_target.z = gCameras[id].lookAt_obj.z; - evt_set_variable(script, outVar1, gCameras[id].auxPitch); - evt_set_variable(script, outVar2, gCameras[id].auxBoomLength); - evt_set_variable(script, outVar3, gCameras[id].lookAt_dist); - evt_set_variable(script, outVar4, gCameras[id].auxBoomPitch); + evt_set_variable(script, outVar1, gCameras[id].params.interp.pitch); + evt_set_variable(script, outVar2, gCameras[id].params.interp.yaw); + evt_set_variable(script, outVar3, gCameras[id].params.interp.dist); + evt_set_variable(script, outVar4, gCameras[id].params.interp.offsetY); return ApiStatus_DONE2; } @@ -114,35 +115,35 @@ API_CALLABLE(SetCamViewport) { return ApiStatus_DONE2; } -API_CALLABLE(func_802CABE8) { +API_CALLABLE(SetInterpCamParams) { Bytecode* args = script->ptrReadPos; s32 id = evt_get_variable(script, *args++); - s16 pitch = evt_get_variable(script, *args++); - s32 boomLength = evt_get_variable(script, *args++); + s32 pitch = evt_get_variable(script, *args++); + s32 yaw = evt_get_variable(script, *args++); s32 dist = evt_get_variable(script, *args++); - s16 boomPitch = evt_get_variable(script, *args++); + s32 offsetY = evt_get_variable(script, *args++); Camera* camera = &gCameras[id]; - camera->auxPitch = pitch; - camera->auxBoomLength = boomLength; - camera->lookAt_dist = dist; - camera->auxBoomPitch = boomPitch; + camera->params.interp.pitch = pitch; + camera->params.interp.yaw = yaw; + camera->params.interp.dist = dist; + camera->params.interp.offsetY = offsetY; return ApiStatus_DONE2; } -API_CALLABLE(func_802CACC0) { +API_CALLABLE(SetNoInterpCamParams) { Bytecode* args = script->ptrReadPos; s32 id = evt_get_variable(script, *args++); - s16 value1 = evt_get_variable(script, *args++); - s32 value2 = evt_get_variable(script, *args++); - s32 value3 = evt_get_variable(script, *args++); + s16 yaw = evt_get_variable(script, *args++); + s32 offsetY = evt_get_variable(script, *args++); + s32 unkParam7 = evt_get_variable(script, *args++); s16 zoomPercent = evt_get_variable(script, *args++); Camera* camera = &gCameras[id]; - camera->zoomPercent = zoomPercent; - camera->auxBoomYaw = value1; - camera->auxBoomZOffset = value2; - camera->unk_28 = value3; + camera->params.basic.zoomPercent = zoomPercent; + camera->params.basic.yaw = yaw; + camera->params.basic.offsetY = offsetY; + camera->params.basic.camParam7 = unkParam7; return ApiStatus_DONE2; } @@ -160,7 +161,7 @@ API_CALLABLE(SetCamBGColor) { return ApiStatus_DONE2; } -API_CALLABLE(func_802CAE50) { +API_CALLABLE(SetCamLookTarget) { Bytecode* args = script->ptrReadPos; s32 id = evt_get_variable(script, *args++); s32 x = evt_get_variable(script, *args++); @@ -301,15 +302,15 @@ API_CALLABLE(ShakeCam) { scale = script->functionTempF[3]; switch (shakeMode) { case CAM_SHAKE_CONSTANT_VERTICAL: - guTranslateF(camera->viewMtxShaking, 0.0f, -scale * magnitude, 0.0f); + guTranslateF(camera->mtxViewShaking, 0.0f, -scale * magnitude, 0.0f); script->functionTempF[3] = -script->functionTempF[3]; break; case CAM_SHAKE_ANGULAR_HORIZONTAL: - guRotateF(camera->viewMtxShaking, scale * magnitude, 0.0f, 0.0f, 1.0f); + guRotateF(camera->mtxViewShaking, scale * magnitude, 0.0f, 0.0f, 1.0f); script->functionTempF[3] = -script->functionTempF[3]; break; case CAM_SHAKE_DECAYING_VERTICAL: - guTranslateF(camera->viewMtxShaking, 0.0f, -scale * magnitude, 0.0f); + guTranslateF(camera->mtxViewShaking, 0.0f, -scale * magnitude, 0.0f); if ((script->functionTemp[1] < (duration * 2)) && (duration < script->functionTemp[1])) { script->functionTempF[3] = script->functionTempF[3] * -0.8; } else { @@ -329,7 +330,7 @@ API_CALLABLE(ShakeCam) { void exec_ShakeCam1(s32 camID, s32 mode, s32 duration) { Evt* script; - script = start_script_in_group(&ShakeCam1, EVT_PRIORITY_1, 0, EVT_GROUP_04); + script = start_script_in_group(&ShakeCam1, EVT_PRIORITY_1, 0, EVT_GROUP_SHAKE_CAM); script->varTable[0] = camID; script->varTable[1] = mode; script->varTable[2] = duration; @@ -338,7 +339,7 @@ void exec_ShakeCam1(s32 camID, s32 mode, s32 duration) { void exec_ShakeCamX(s32 camID, s32 mode, s32 duration, f32 magnitude) { Evt* script; - script = start_script_in_group(&ShakeCamX, EVT_PRIORITY_1, 0, EVT_GROUP_04); + script = start_script_in_group(&ShakeCamX, EVT_PRIORITY_1, 0, EVT_GROUP_SHAKE_CAM); evt_set_variable(script, LVar0, camID); evt_set_variable(script, LVar1, mode); evt_set_variable(script, LVar2, duration); @@ -365,7 +366,7 @@ API_CALLABLE(func_802CB710) { f32 value = evt_get_variable(script, *args++); Camera* camera = &gCameras[id]; - camera->unk_520 = (value / 100.0f); + camera->leadAmtScale = (value / 100.0f); return ApiStatus_DONE2; } @@ -379,10 +380,10 @@ API_CALLABLE(PanToTarget) { camera->panActive = TRUE; if (targetType != 0) { camera->followPlayer = TRUE; - camera->panPhase = panPhase; + camera->interpEasingParameter = panPhase; } else { camera->followPlayer = FALSE; - camera->panPhase = 0.0f; + camera->interpEasingParameter = 0.0f; camera->moveSpeed = 1.0f; } return ApiStatus_DONE2; @@ -637,7 +638,7 @@ API_CALLABLE(SetCamProperties) { camera->moveSpeed = moveSpeed; camera->panActive = TRUE; camera->followPlayer = TRUE; - camera->panPhase = 0.0f; + camera->interpEasingParameter = 0.0f; return ApiStatus_BLOCK; } @@ -680,7 +681,7 @@ API_CALLABLE(AdjustCam) { camera->moveSpeed = moveSpeed; camera->panActive = TRUE; camera->followPlayer = TRUE; - camera->panPhase = 0.0f; + camera->interpEasingParameter = 0.0f; return ApiStatus_BLOCK; } @@ -720,7 +721,7 @@ API_CALLABLE(ResetCam) { camera->moveSpeed = moveSpeed; camera->panActive = TRUE; camera->followPlayer = TRUE; - camera->panPhase = 0.0f; + camera->interpEasingParameter = 0.0f; return ApiStatus_BLOCK; } @@ -728,7 +729,7 @@ API_CALLABLE(ResetCam) { camera->panActive = TRUE; camera->followPlayer = FALSE; camera->moveSpeed = 1.0f; - camera->panPhase = 0.0f; + camera->interpEasingParameter = 0.0f; return ApiStatus_DONE2; } diff --git a/src/hud_element.c b/src/hud_element.c index 2d263e5be06..435480a14cb 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -121,7 +121,7 @@ BSS HudCacheEntry gHudElementCacheTableRasterBattle[192]; BSS HudCacheEntry gHudElementCacheTablePaletteBattle[192]; BSS s32 D_80159180; -void func_801413F8(void); +void hud_element_setup_cam(void); void hud_element_load_script(HudElement* hudElement, HudScript* anim) { s32* pos = (s32*)anim; @@ -656,7 +656,7 @@ void hud_element_clear_cache(void) { gHudElementsNumber = 0; D_80159180 = 0; - func_801413F8(); + hud_element_setup_cam(); } #if VERSION_PAL @@ -693,24 +693,24 @@ void init_hud_element_list(void) { D_80159180 = 0; } -void func_801413F8(void) { - set_cam_viewport(CAM_3, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - gCameras[CAM_3].updateMode = CAM_UPDATE_MODE_2; - gCameras[CAM_3].needsInit = TRUE; - gCameras[CAM_3].lookAt_dist = 15551; - gCameras[CAM_3].nearClip = CAM_NEAR_CLIP; - gCameras[CAM_3].auxPitch = 0; - gCameras[CAM_3].auxBoomLength = 0; - gCameras[CAM_3].auxBoomPitch = 0; - gCameras[CAM_3].lookAt_obj_target.z = 0; - gCameras[CAM_3].farClip = 0x4000; - gCameras[CAM_3].bgColor[0] = 0; - gCameras[CAM_3].bgColor[1] = 0; - gCameras[CAM_3].bgColor[2] = 0; - gCameras[CAM_3].lookAt_obj_target.x = 160.0f; - gCameras[CAM_3].lookAt_obj_target.y = -120.0f; - gCameras[CAM_3].vfov = 1.0f; - gCameras[CAM_3].flags &= ~(CAMERA_FLAG_DISABLED | CAMERA_FLAG_LEAD_PLAYER); +void hud_element_setup_cam(void) { + set_cam_viewport(CAM_HUD, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gCameras[CAM_HUD].updateMode = CAM_UPDATE_INTERP_POS; + gCameras[CAM_HUD].needsInit = TRUE; + gCameras[CAM_HUD].params.interp.dist = 15551; + gCameras[CAM_HUD].nearClip = CAM_NEAR_CLIP; + gCameras[CAM_HUD].params.interp.pitch = 0; + gCameras[CAM_HUD].params.interp.yaw = 0; + gCameras[CAM_HUD].params.interp.offsetY = 0; + gCameras[CAM_HUD].lookAt_obj_target.z = 0; + gCameras[CAM_HUD].farClip = 0x4000; + gCameras[CAM_HUD].bgColor[0] = 0; + gCameras[CAM_HUD].bgColor[1] = 0; + gCameras[CAM_HUD].bgColor[2] = 0; + gCameras[CAM_HUD].lookAt_obj_target.x = 160.0f; + gCameras[CAM_HUD].lookAt_obj_target.y = -120.0f; + gCameras[CAM_HUD].vfov = 1.0f; + gCameras[CAM_HUD].flags &= ~(CAMERA_FLAG_DISABLED | CAMERA_FLAG_LEAD_PLAYER); } s32 hud_element_create(HudScript* anim) { @@ -1628,7 +1628,7 @@ void render_transformed_hud_elements(void) { do { do { count = 0; - if (gCurrentCamID == CAM_3) { + if (gCurrentCamID == CAM_HUD) { for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { hudElement = (*gHudElements)[i]; if (hudElement == NULL) { @@ -1710,7 +1710,7 @@ void render_transformed_hud_elements(void) { continue; } - // different from CAM_3 pass + // different from CAM_HUD pass if (!(flags & HUD_ELEMENT_FLAG_40000000)) { continue; } @@ -1788,8 +1788,8 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); gDPPipeSync(gMainGfxPos++); - guOrthoF(camera->perspectiveMatrix, 0.0f, 320.0f, -240.0f, 0.0f, -1000.0f, 1000.0f, 1.0f); - guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); + guOrthoF(camera->mtxPerspective, 0.0f, 320.0f, -240.0f, 0.0f, -1000.0f, 1000.0f, 1.0f); + guMtxF2L(camera->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCamID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); @@ -1841,11 +1841,11 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { } void func_80144218(s32 id) { - func_80143C48(id, 1, CAM_3); + func_80143C48(id, 1, CAM_HUD); } void func_80144238(s32 id) { - func_80143C48(id, 0, CAM_3); + func_80143C48(id, 0, CAM_HUD); } void func_80144258(s32 id) { @@ -2175,7 +2175,7 @@ void hud_element_create_transform_A(s32 id) { transform->scale.z = 1.0f; transform->pivot.x = 0; transform->pivot.y = 0; - func_801413F8(); + hud_element_setup_cam(); } void hud_element_create_transform_B(s32 id) { @@ -2195,7 +2195,7 @@ void hud_element_create_transform_B(s32 id) { transform->scale.x = 1.0f; transform->scale.y = 1.0f; transform->scale.z = 1.0f; - func_801413F8(); + hud_element_setup_cam(); } void hud_element_create_transform_C(s32 id) { @@ -2215,7 +2215,7 @@ void hud_element_create_transform_C(s32 id) { transform->scale.x = 1.0f; transform->scale.y = 1.0f; transform->scale.z = 1.0f; - func_801413F8(); + hud_element_setup_cam(); } void hud_element_free_transform(s32 id) { diff --git a/src/main_loop.c b/src/main_loop.c index b231f69ee39..f26cba09a78 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -283,7 +283,7 @@ void load_engine_data(void) { clear_render_tasks(); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); clear_player_status(); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); clear_entity_models(); diff --git a/src/model.c b/src/model.c index d88b52a475e..00a1ad4ead2 100644 --- a/src/model.c +++ b/src/model.c @@ -336,7 +336,7 @@ Gfx SolidCombineModes[][5] = { [TINT_COMBINE_DEPTH] gsDPSetCombineMode(PM_CC_ALT_INTERFERENCE, G_CC_MODULATEIA2), [TINT_COMBINE_REMAP] gsDPSetCombineMode(PM_CC_ALT_INTERFERENCE, PM_CC_TINT_REMAP_SHADE_ALPHA), }, - + // shaded color multiplied main/aux textures for alpha [TEX_COMBINE_3] { [TINT_COMBINE_NONE] gsDPSetCombineMode(PM_CC_26, PM_CC_27), @@ -1406,7 +1406,7 @@ void appendGfx_model(void* data) { renderMode = model->renderMode; tintCombineType = 0; - + if (textureHeader != NULL) { switch (extraTileType) { case EXTRA_TILE_NONE: @@ -1424,7 +1424,7 @@ void appendGfx_model(void* data) { } else { renderClass = RENDER_CLASS_1CYC; } - + if (textureHeader != NULL || renderMode <= RENDER_MODES_LAST_OPAQUE) { if (gFogSettings->enabled && !(flags & MODEL_FLAG_IGNORE_FOG)) { renderClass = RENDER_CLASS_FOG; @@ -1975,8 +1975,8 @@ void appendGfx_model(void* data) { } } - if (flags & MODEL_FLAG_USE_CAMERA_UNK_MATRIX) { - gSPMatrix((*gfxPos)++, gCameras[gCurrentCamID].unkMatrix, mtxLoadMode | mtxPushMode | G_MTX_MODELVIEW); + if (flags & MODEL_FLAG_BILLBOARD) { + gSPMatrix((*gfxPos)++, gCameras[gCurrentCamID].mtxBillboard, mtxLoadMode | mtxPushMode | G_MTX_MODELVIEW); if (mtxPushMode != G_MTX_NOPUSH) { mtxPushMode = G_MTX_NOPUSH; } @@ -2755,22 +2755,22 @@ void render_models(void) { break; \ } - m00 = camera->perspectiveMatrix[0][0]; - m01 = camera->perspectiveMatrix[0][1]; - m02 = camera->perspectiveMatrix[0][2]; - m03 = camera->perspectiveMatrix[0][3]; - m10 = camera->perspectiveMatrix[1][0]; - m11 = camera->perspectiveMatrix[1][1]; - m12 = camera->perspectiveMatrix[1][2]; - m13 = camera->perspectiveMatrix[1][3]; - m20 = camera->perspectiveMatrix[2][0]; - m21 = camera->perspectiveMatrix[2][1]; - m22 = camera->perspectiveMatrix[2][2]; - m23 = camera->perspectiveMatrix[2][3]; - m30 = camera->perspectiveMatrix[3][0]; - m31 = camera->perspectiveMatrix[3][1]; - m32 = camera->perspectiveMatrix[3][2]; - m33 = camera->perspectiveMatrix[3][3]; + m00 = camera->mtxPerspective[0][0]; + m01 = camera->mtxPerspective[0][1]; + m02 = camera->mtxPerspective[0][2]; + m03 = camera->mtxPerspective[0][3]; + m10 = camera->mtxPerspective[1][0]; + m11 = camera->mtxPerspective[1][1]; + m12 = camera->mtxPerspective[1][2]; + m13 = camera->mtxPerspective[1][3]; + m20 = camera->mtxPerspective[2][0]; + m21 = camera->mtxPerspective[2][1]; + m22 = camera->mtxPerspective[2][2]; + m23 = camera->mtxPerspective[2][3]; + m30 = camera->mtxPerspective[3][0]; + m31 = camera->mtxPerspective[3][1]; + m32 = camera->mtxPerspective[3][2]; + m33 = camera->mtxPerspective[3][3]; // enqueue all visible models not in transform groups for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { @@ -2873,7 +2873,7 @@ void render_models(void) { } // map all model depths to the interval [0, 10k] and submit render task - transform_point(camera->perspectiveMatrix, centerX, centerY, centerZ, 1.0f, &outX, &outY, &outZ, &outW); + transform_point(camera->mtxPerspective, centerX, centerY, centerZ, 1.0f, &outX, &outY, &outZ, &outW); distance = outZ + 5000.0f; if (distance < 0) { distance = 0; @@ -2912,7 +2912,7 @@ void render_models(void) { zComp = transformGroup->center.z; transform_point( - camera->perspectiveMatrix, + camera->mtxPerspective, xComp, yComp, zComp, 1.0f, &outX, &outY, &outZ, &outW ); @@ -4302,7 +4302,7 @@ s32 is_model_center_visible(u16 modelID, s32 depthQueryID, f32* screenX, f32* sc return FALSE; } // Transform the model's center into clip space. - transform_point(camera->perspectiveMatrix, model->center.x, model->center.y, model->center.z, 1.0f, &outX, &outY, &outZ, &outW); + transform_point(camera->mtxPerspective, model->center.x, model->center.y, model->center.z, 1.0f, &outX, &outY, &outZ, &outW); if (outW == 0.0f) { *screenX = 0.0f; *screenY = 0.0f; @@ -4412,7 +4412,7 @@ s32 is_point_visible(f32 x, f32 y, f32 z, s32 depthQueryID, f32* screenX, f32* s return FALSE; } // Transform the point into clip space. - transform_point(camera->perspectiveMatrix, x, y, z, 1.0f, &outX, &outY, &outZ, &outW); + transform_point(camera->mtxPerspective, x, y, z, 1.0f, &outX, &outY, &outZ, &outW); if (outW == 0.0f) { *screenX = 0.0f; *screenY = 0.0f; diff --git a/src/npc.c b/src/npc.c index 13aa6fa88f8..29a6988fbc2 100644 --- a/src/npc.c +++ b/src/npc.c @@ -974,7 +974,7 @@ void render_npcs(void) { && (npc->flags != 0) && !(npc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_HAS_NO_SPRITE | NPC_FLAG_INACTIVE | NPC_FLAG_INVISIBLE)) ) { - transform_point(cam->perspectiveMatrix, npc->pos.x, npc->pos.y, npc->pos.z, 1.0f, &x, &y, &z, &s); + transform_point(cam->mtxPerspective, npc->pos.x, npc->pos.y, npc->pos.z, 1.0f, &x, &y, &z, &s); if (!(s < 0.01) || !(s > -0.01)) { renderDist = ((z * 5000.0f) / s) + 5000.0f; if (renderDist < 0.0f) { diff --git a/src/screen_overlays.c b/src/screen_overlays.c index 797cb723238..1d16a24d664 100644 --- a/src/screen_overlays.c +++ b/src/screen_overlays.c @@ -417,7 +417,7 @@ void set_screen_overlay_center_worldpos(s32 layer, s32 posIdx, s32 worldPosX, s3 switch (layer) { case SCREEN_LAYER_FRONT: case SCREEN_LAYER_BACK: - transform_point(camera->perspectiveMatrix, worldPosX, worldPosY, worldPosZ, 1.0f, &tx, &ty, &tz, &tw); + transform_point(camera->mtxPerspective, worldPosX, worldPosY, worldPosZ, 1.0f, &tx, &ty, &tz, &tw); tw = 1.0f / tw; tx *= tw; ty *= -tw; diff --git a/src/sprite_shading.c b/src/sprite_shading.c index 6a826adac4f..4d3837585e6 100644 --- a/src/sprite_shading.c +++ b/src/sprite_shading.c @@ -118,8 +118,8 @@ void create_shading_palette(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s3 shadowColorG = gSpriteShadingProfile->ambientColor.g; shadowColorB = gSpriteShadingProfile->ambientColor.b; - Pxz = camera->perspectiveMatrix[0][2]; - Pzz = camera->perspectiveMatrix[2][2]; + Pxz = camera->mtxPerspective[0][2]; + Pzz = camera->mtxPerspective[2][2]; if ((-Mxz * Pxz + Mzz * Pzz) < 0.0f) { facingDir = 1.0f; @@ -313,7 +313,7 @@ void appendGfx_shading_palette( pm02 = var_f12; // TODO required to match shadowZ *= var_f12; - if (((-mtx[0][2] * camera->perspectiveMatrix[0][2]) + (mtx[2][2] * camera->perspectiveMatrix[2][2])) < 0.0f) { + if (((-mtx[0][2] * camera->mtxPerspective[0][2]) + (mtx[2][2] * camera->mtxPerspective[2][2])) < 0.0f) { facingDir = 1.0f; } else { facingDir = -1.0f; @@ -329,9 +329,9 @@ void appendGfx_shading_palette( ez = mtx[2][2]; } - pm02 = camera->perspectiveMatrix[0][2]; - pm12 = camera->perspectiveMatrix[1][2]; - pm22 = camera->perspectiveMatrix[2][2]; + pm02 = camera->mtxPerspective[0][2]; + pm12 = camera->mtxPerspective[1][2]; + pm22 = camera->mtxPerspective[2][2]; t1 = (ex * shadowX) + (ey * shadowY) + (ez * shadowZ); apMag = (shadowX * -pm22) + (shadowZ * pm02); diff --git a/src/state_demo.c b/src/state_demo.c index 22041b3c7cf..9ae697ce1eb 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -200,7 +200,7 @@ void state_step_demo(void) { clear_render_tasks(); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); clear_entity_models(); clear_animator_list(); diff --git a/src/state_file_select.c b/src/state_file_select.c index 010c9d3bfb3..e9e6eabfd13 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -63,7 +63,7 @@ void state_init_file_select(void) { hud_element_set_aux_cache(0, 0); hud_element_clear_cache(); mdl_load_all_textures(NULL, 0, 0); - gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6; + gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_NO_INTERP; gCameras[CAM_DEFAULT].needsInit = TRUE; gCameras[CAM_DEFAULT].nearClip = 16; gCameras[CAM_DEFAULT].farClip = 4096; @@ -71,10 +71,10 @@ void state_init_file_select(void) { gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_HUD].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_DEFAULT].vfov = 25.0f; set_cam_viewport(CAM_DEFAULT, 12, 28, 296, 184); - gCameras[CAM_DEFAULT].auxBoomLength = 40; + gCameras[CAM_DEFAULT].params.basic.dist = 40; gCameras[CAM_DEFAULT].lookAt_eye.x = 500.0f; gCameras[CAM_DEFAULT].lookAt_eye.y = 1000.0f; gCameras[CAM_DEFAULT].lookAt_eye.z = 1500.0f; @@ -84,9 +84,9 @@ void state_init_file_select(void) { gCameras[CAM_DEFAULT].bgColor[2] = 0; gCameras[CAM_DEFAULT].lookAt_obj_target.x = 25.0f; gCameras[CAM_DEFAULT].lookAt_obj_target.y = 25.0f; - gCameras[CAM_DEFAULT].auxPitch = 0; - gCameras[CAM_DEFAULT].lookAt_dist = 100; - gCameras[CAM_DEFAULT].auxBoomPitch = 0; + gCameras[CAM_DEFAULT].params.basic.skipRecalc = FALSE; + gCameras[CAM_DEFAULT].params.basic.fovScale = 100; + gCameras[CAM_DEFAULT].params.basic.pitch = 0; gOverrideFlags |= GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS; } diff --git a/src/state_intro.c b/src/state_intro.c index 427da196079..58d57fb41f4 100644 --- a/src/state_intro.c +++ b/src/state_intro.c @@ -166,7 +166,7 @@ void state_step_intro(void) { clear_render_tasks(); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); clear_entity_models(); clear_animator_list(); diff --git a/src/state_logos.c b/src/state_logos.c index f09e28e39e7..7ef125bcf4f 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -83,8 +83,8 @@ void state_init_logos(void) { gLogosImage2 = gLogosImages + 0x15000; nuContRmbForceStop(); - create_cameras_a(); - gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6; + create_cameras(); + gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_NO_INTERP; gCameras[CAM_DEFAULT].needsInit = TRUE; gCameras[CAM_DEFAULT].nearClip = 16; gCameras[CAM_DEFAULT].farClip = 4096; @@ -93,17 +93,17 @@ void state_init_logos(void) { gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_HUD].flags |= CAMERA_FLAG_DISABLED; set_cam_viewport(CAM_DEFAULT, 12, 28, 296, 184); - gCameras[CAM_DEFAULT].auxBoomLength = 40; + gCameras[CAM_DEFAULT].params.basic.dist = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; gCameras[CAM_DEFAULT].bgColor[1] = 0; gCameras[CAM_DEFAULT].bgColor[2] = 0; gCameras[CAM_DEFAULT].lookAt_obj_target.x = 25.0f; gCameras[CAM_DEFAULT].lookAt_obj_target.y = 25.0f; - gCameras[CAM_DEFAULT].auxPitch = 0; - gCameras[CAM_DEFAULT].lookAt_dist = 100; - gCameras[CAM_DEFAULT].auxBoomPitch = 0; + gCameras[CAM_DEFAULT].params.basic.skipRecalc = FALSE; + gCameras[CAM_DEFAULT].params.basic.fovScale = 100; + gCameras[CAM_DEFAULT].params.basic.pitch = 0; gCameras[CAM_DEFAULT].lookAt_eye.x = 500.0f; gCameras[CAM_DEFAULT].lookAt_eye.y = 1000.0f; gCameras[CAM_DEFAULT].lookAt_eye.z = 1500.0f; diff --git a/src/state_startup.c b/src/state_startup.c index faeef48878b..085607be42f 100644 --- a/src/state_startup.c +++ b/src/state_startup.c @@ -36,7 +36,7 @@ void state_step_startup(void) { clear_render_tasks(); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); clear_entity_models(); clear_animator_list(); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 18459bce4a9..7da37a898f7 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -57,7 +57,7 @@ s32 PressStart_Alpha = 0; // the opacity of "PRESS START" text b32 PressStart_IsVisible = FALSE; // toggles the visibility of "PRESS START" s32 PressStart_BlinkCounter = 0; // counts to 16, then toggles PressStart_IsVisible -// controls whether the intro story or the demo will player after TITLE_STATE_HOLD is done +// controls whether the intro story or the demo will player after TITLE_STATE_HOLD is done // since this state is reached for the first time after the intro has already played once or was skipped, // this is initially false and the demo is will play first. s32 PlayIntroNext = FALSE; @@ -141,8 +141,8 @@ void state_init_title_screen(void) { TitleScreen_ImgList_CopyrightPalette = (s32*)(TitleScreen_ImgList->copyrightPalette + (s32) TitleScreen_ImgList); #endif - create_cameras_a(); - gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6; + create_cameras(); + gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_NO_INTERP; gCameras[CAM_DEFAULT].needsInit = TRUE; gCameras[CAM_DEFAULT].nearClip = CAM_NEAR_CLIP; gCameras[CAM_DEFAULT].farClip = CAM_FAR_CLIP; @@ -151,17 +151,17 @@ void state_init_title_screen(void) { gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_HUD].flags |= CAMERA_FLAG_DISABLED; set_cam_viewport(CAM_DEFAULT, 12, 28, 296, 184); - gCameras[CAM_DEFAULT].auxBoomLength = 40; + gCameras[CAM_DEFAULT].params.basic.dist = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; gCameras[CAM_DEFAULT].bgColor[1] = 0; gCameras[CAM_DEFAULT].bgColor[2] = 0; gCameras[CAM_DEFAULT].lookAt_obj_target.x = 25.0f; gCameras[CAM_DEFAULT].lookAt_obj_target.y = 25.0f; - gCameras[CAM_DEFAULT].auxPitch = 0; - gCameras[CAM_DEFAULT].lookAt_dist = 100; - gCameras[CAM_DEFAULT].auxBoomPitch = 0; + gCameras[CAM_DEFAULT].params.basic.skipRecalc = FALSE; + gCameras[CAM_DEFAULT].params.basic.fovScale = 100; + gCameras[CAM_DEFAULT].params.basic.pitch = 0; gCameras[CAM_DEFAULT].lookAt_eye.x = 500.0f; gCameras[CAM_DEFAULT].lookAt_eye.y = 1000.0f; gCameras[CAM_DEFAULT].lookAt_eye.z = 1500.0f; @@ -288,7 +288,7 @@ void state_step_title_screen(void) { } general_heap_create(); clear_render_tasks(); - create_cameras_a(); + create_cameras(); clear_entity_models(); clear_animator_list(); clear_npcs(); diff --git a/src/world/area_arn/arn_03/npc.c b/src/world/area_arn/arn_03/npc.c index 292bcf20b8e..f18f73ef7fd 100644 --- a/src/world/area_arn/arn_03/npc.c +++ b/src/world/area_arn/arn_03/npc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_NpcIdle_Boo_01) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Thread Wait(20 * DT) @@ -100,9 +100,9 @@ EvtScript N(EVS_NpcIdle_Boo_01) = { #else Call(SetCamSpeed, CAM_DEFAULT, 3) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_arn/arn_05/npc.c b/src/world/area_arn/arn_05/npc.c index 22281c36090..c8c305a022b 100644 --- a/src/world/area_arn/arn_05/npc.c +++ b/src/world/area_arn/arn_05/npc.c @@ -347,7 +347,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00A0) Call(PlaySoundAt, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT, 450, 200, 160) @@ -427,7 +427,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(SetCamPosB, CAM_DEFAULT, 530, 206) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 426, 190, 194) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcFlagBits, NPC_Tubba, NPC_FLAG_GRAVITY, TRUE) Call(SetNpcSpeed, NPC_Tubba, Float(2.5 / DT)) @@ -465,7 +465,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(SetCamPosB, CAM_DEFAULT, 530, 206) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 426, 190, 194) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Set(MV_Unk_01, 0) Thread @@ -485,7 +485,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(SetCamPosB, CAM_DEFAULT, 530, 206) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 240, 169, 206) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Flail, ANIM_Boo_Tan_Flail, 0, MSG_CH3_00A4) Wait(15 * DT) @@ -515,7 +515,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(SetCamPosB, CAM_DEFAULT, 530, 206) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 280, 169, 206) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(50 * DT) Call(PlaySoundAtNpc, NPC_Tubba, SOUND_TUBBA_GULP, SOUND_SPACE_DEFAULT) @@ -531,7 +531,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(SetCamPosB, CAM_DEFAULT, 530, 206) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 240, 169, 206) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim06) Wait(15 * DT) @@ -579,9 +579,9 @@ EvtScript N(EVS_Scene_TubbaRaid) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SpeakToPlayer, NPC_Boo_05, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00A8) Call(DisablePlayerInput, FALSE) Return diff --git a/src/world/area_arn/arn_07/main.c b/src/world/area_arn/arn_07/main.c index 1cd712bbedf..97a0d7ed995 100644 --- a/src/world/area_arn/arn_07/main.c +++ b/src/world/area_arn/arn_07/main.c @@ -18,7 +18,7 @@ EvtScript N(EVS_SpawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, 145, 30, 0) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 2, 50, 100, 31, -6, 145, 65, 0, 30, 0) Thread Call(N(StarSpiritEffectFunc3)) @@ -53,7 +53,7 @@ EvtScript N(EVS_SpawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 2, 145, 30, 0, 0) @@ -80,7 +80,7 @@ EvtScript N(EVS_RespawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, 145, 30, 0) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 2, 50, 100, 31, -6, 145, 65, 0, 30, 0) Thread Call(N(StarSpiritEffectFunc3)) @@ -115,7 +115,7 @@ EvtScript N(EVS_RespawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 2, 145, 30, 0, 0) @@ -152,7 +152,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { Call(SetCamPosB, CAM_DEFAULT, 0, -500) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 5, 0, -147) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(RotateModel, MODEL_o39, 80, 0, -1, 0) Call(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_DEFAULT) Call(SetNpcJumpscale, NPC_TubbasHeart, Float(2.5)) @@ -214,7 +214,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { Call(SetCamPosB, CAM_DEFAULT, 0, -500) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 65, 0, -137) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim22) EndThread Call(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_DEFAULT) @@ -246,7 +246,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { Call(SetCamPitch, CAM_DEFAULT, Float(8.0), Float(-9.0)) Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetPanTarget, CAM_DEFAULT, 250, 0, -46) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) Call(SetPlayerPos, 0, 20, -195) diff --git a/src/world/area_arn/arn_07/npc.c b/src/world/area_arn/arn_07/npc.c index 885dd04008d..9b8fe5e03ef 100644 --- a/src/world/area_arn/arn_07/npc.c +++ b/src/world/area_arn/arn_07/npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_TubbaRelents) = { Call(UseSettingsFrom, CAM_DEFAULT, 236, 0, -46) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetPanTarget, CAM_DEFAULT, 250, 0, -46) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerAnimation, ANIM_Mario1_Idle) Call(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim08) Call(SetNpcYaw, NPC_SELF, 90) @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { Call(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 50) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(5 * DT) Call(SetPlayerAnimation, ANIM_Mario1_Still) Call(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim0F) @@ -428,7 +428,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { Call(SetCamDistance, CAM_DEFAULT, Float(475.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -8) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) @@ -437,7 +437,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -9) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR) Loop(0) @@ -479,7 +479,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { Call(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 512, MSG_CH3_00D4) @@ -489,7 +489,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 512, MSG_CH3_00D5) diff --git a/src/world/area_arn/arn_11/main.c b/src/world/area_arn/arn_11/main.c index bfa9642e331..cb7ec254a8d 100644 --- a/src/world/area_arn/arn_11/main.c +++ b/src/world/area_arn/arn_11/main.c @@ -8,7 +8,7 @@ EvtScript N(EVS_SetupCamera) = { Call(SetPanTarget, CAM_DEFAULT, 60, 30, 0) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-13.0)) Call(SetCamDistance, CAM_DEFAULT, 275) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End diff --git a/src/world/area_arn/arn_11/npc.c b/src/world/area_arn/arn_11/npc.c index 550608e28ee..0cb7c69aa38 100644 --- a/src/world/area_arn/arn_11/npc.c +++ b/src/world/area_arn/arn_11/npc.c @@ -18,7 +18,7 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 3000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(StartBossBattle, SONG_TUBBA_BLUBBA_BATTLE) @@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_HeartEscape) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(10 * DT) Call(PlayerFaceNpc, NPC_TubbasHeart, TRUE) @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_HeartEscape) = { Call(SetCamPosA, CAM_DEFAULT, -56, 70) Call(SetCamPosB, CAM_DEFAULT, -90, 40) Call(SetCamPosC, CAM_DEFAULT, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlayerFaceNpc, NPC_TubbasHeart, TRUE) UseBuf(Ref(N(HeartJumpPath))) @@ -129,9 +129,9 @@ EvtScript N(EVS_Scene_HeartEscape) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH3_HEART_FLED_FIRST_TUNNEL) Return End diff --git a/src/world/area_dgb/dgb_00/npc.c b/src/world/area_dgb/dgb_00/npc.c index 111d7030f1a..8cec8cfd499 100644 --- a/src/world/area_dgb/dgb_00/npc.c +++ b/src/world/area_dgb/dgb_00/npc.c @@ -232,7 +232,7 @@ EvtScript N(EVS_Scene_BoosApproachManor) = { Set(LVar2, -75) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(40 * DT) Call(SetNpcPos, NPC_Boo_01, -60, 10, -70) @@ -290,7 +290,7 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecGetTID(N(EVS_LeaderBooShivering), LVarA) Call(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00DF) @@ -322,9 +322,9 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(PlaySoundAt, SOUND_TUBBA_POUNDING, SOUND_SPACE_DEFAULT, 240, 10, -125) Call(ShakeCam, CAM_DEFAULT, 0, 20, Float(2.0)) Wait(5 * DT) @@ -526,7 +526,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { Call(SetPanTarget, CAM_DEFAULT, 175, 0, -35) Call(SetCamDistance, CAM_DEFAULT, Float(540.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Thread Set(LVar2, 1) @@ -579,7 +579,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { Call(SetCamDistance, CAM_DEFAULT, Float(320.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(65) Call(GetCurrentPartnerID, LVar0) @@ -634,9 +634,9 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_dgb/dgb_01/bridges.c b/src/world/area_dgb/dgb_01/bridges.c index 6b38608bd2e..327f8aa3544 100644 --- a/src/world/area_dgb/dgb_01/bridges.c +++ b/src/world/area_dgb/dgb_01/bridges.c @@ -46,7 +46,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-11.0)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(GB_ARN_Tubba_MapID, 1) Call(SetNpcVar, NPC_Tubba, 0, 1) @@ -147,7 +147,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) Call(SetGroupVisibility, MODEL_g240, MODEL_GROUP_VISIBLE) Call(DeleteAnimatedModel, 0) diff --git a/src/world/area_dgb/dgb_05/hole.c b/src/world/area_dgb/dgb_05/hole.c index 10fa0b4bb79..18a44857e4a 100644 --- a/src/world/area_dgb/dgb_05/hole.c +++ b/src/world/area_dgb/dgb_05/hole.c @@ -16,7 +16,7 @@ API_CALLABLE(N(AwaitFallDownHole)) { EvtScript N(EVS_SetupHole) = { Call(N(AwaitFallInHole)) - Call(func_802CA988, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) + Call(GrabCamera, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) Call(N(AwaitFallDownHole)) Set(GF_DGB05_BoardedFloor, TRUE) Call(GotoMap, Ref("dgb_06"), dgb_06_ENTRY_1) diff --git a/src/world/area_dgb/dgb_10/hole.c b/src/world/area_dgb/dgb_10/hole.c index ab38d174c5e..23440011ad5 100644 --- a/src/world/area_dgb/dgb_10/hole.c +++ b/src/world/area_dgb/dgb_10/hole.c @@ -32,7 +32,7 @@ API_CALLABLE(N(AwaitFallDownHole)) { EvtScript N(EVS_SetupHoles) = { Call(N(AwaitFallInHole)) - Call(func_802CA988, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) + Call(GrabCamera, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) Call(N(AwaitFallDownHole)) #if VERSION_PAL Call(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_dgb/dgb_10/main.c b/src/world/area_dgb/dgb_10/main.c index 3af757fff86..af35601659d 100644 --- a/src/world/area_dgb/dgb_10/main.c +++ b/src/world/area_dgb/dgb_10/main.c @@ -19,14 +19,14 @@ EvtScript N(EVS_EnterMap) = { Call(UseSettingsFrom, CAM_DEFAULT, 375, 0, -188) Call(SetPanTarget, CAM_DEFAULT, 375, 0, -188) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePlayerInput, TRUE) Call(DisablePlayerPhysics, TRUE) Call(SetPlayerActionState, ACTION_STATE_JUMP) Wait(1) Call(SetPlayerJumpscale, Float(0.7)) Call(PlayerJump, 375, 0, -188, 20) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Call(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_dgb/dgb_11/main.c b/src/world/area_dgb/dgb_11/main.c index 53e1549e814..9ec444b0b43 100644 --- a/src/world/area_dgb/dgb_11/main.c +++ b/src/world/area_dgb/dgb_11/main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_EnterMap) = { Call(DisablePlayerInput, TRUE) Call(InterpPlayerYaw, 180, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(0) Call(GetPlayerPos, LVar0, LVar1, LVar2) IfLe(LVar1, LVar3) @@ -51,7 +51,7 @@ EvtScript N(EVS_EnterMap) = { EndIf Wait(1) EndLoop - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_dgb/dgb_15/npc.c b/src/world/area_dgb/dgb_15/npc.c index c89ed07e592..30ebcaa08d9 100644 --- a/src/world/area_dgb/dgb_15/npc.c +++ b/src/world/area_dgb/dgb_15/npc.c @@ -44,7 +44,7 @@ EvtScript N(EVS_NpcIdle_Tubba) = { Call(UseSettingsFrom, CAM_DEFAULT, -50, 0, 180) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, -50, 0, 180) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Set(GB_ARN_Tubba_MapID, 15) Call(SetNpcPos, NPC_SELF, 0, 0, 88) @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_Tubba) = { Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) EndThread Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_Tubba))) diff --git a/src/world/area_dgb/dgb_18/npc.c b/src/world/area_dgb/dgb_18/npc.c index 8b5fbab268f..8e9aa804160 100644 --- a/src/world/area_dgb/dgb_18/npc.c +++ b/src/world/area_dgb/dgb_18/npc.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { Call(UseSettingsFrom, CAM_DEFAULT, -40, 0, 180) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetPanTarget, CAM_DEFAULT, -40, 0, 180) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPlayerPos, 740, 0, 180) Call(SetNpcPos, NPC_PARTNER, 765, 0, 180) @@ -255,7 +255,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH3_TUBBA_BEGAN_NAPPING) Call(DisablePlayerInput, FALSE) Return @@ -386,7 +386,7 @@ EvtScript N(EVS_Scene_YakkeyShouts) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPosB, CAM_DEFAULT, 800, 245) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SpeakToPlayer, NPC_SELF, ANIM_Yakkey_Talk, ANIM_Yakkey_Idle, 5, MSG_CH3_00F6) Wait(15) Call(SpeakToPlayer, NPC_SELF, ANIM_Yakkey_Talk, ANIM_Yakkey_Idle, 5, MSG_CH3_00F7) @@ -467,7 +467,7 @@ EvtScript N(EVS_Scene_YakkeyShouts) = { Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetNpcJumpscale, NPC_SELF, Float(1.0)) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) diff --git a/src/world/area_dro/dro_01/main.c b/src/world/area_dro/dro_01/main.c index 5ec3a6183e6..5d3934130e3 100644 --- a/src/world/area_dro/dro_01/main.c +++ b/src/world/area_dro/dro_01/main.c @@ -29,7 +29,7 @@ EvtScript N(EVS_Scene_RuinsRising) = { Call(UseSettingsFrom, CAM_DEFAULT, 175, 0, -201) Call(SetPanTarget, CAM_DEFAULT, 175, 0, -201) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(SetModelTintMode), APPLY_TINT_BG, NULL, ENV_TINT_REMAP) Call(N(SetModelTintMode), APPLY_TINT_GROUPS, -1, ENV_TINT_REMAP) Call(N(SetModelTintParams), ENV_TINT_REMAP, 44, 32, 177, 0, 0, 0, 0, 0, 0) diff --git a/src/world/area_dro/dro_01/npc_hint_dryite.c b/src/world/area_dro/dro_01/npc_hint_dryite.c index 73132b37a48..3eb3f1249f4 100644 --- a/src/world/area_dro/dro_01/npc_hint_dryite.c +++ b/src/world/area_dro/dro_01/npc_hint_dryite.c @@ -46,7 +46,7 @@ EvtScript N(EVS_Scene_TreeOrbitReaction) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(-300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPlayerAnimation, ANIM_Mario1_Idle) Call(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0079) @@ -57,9 +57,9 @@ EvtScript N(EVS_Scene_TreeOrbitReaction) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(N(SaveSpinningRoofHintTime)) Set(GF_DRO01_HeardHintAboutSpinningRoof, TRUE) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c index 98374480c95..3751d6e641d 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -33,7 +33,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { Call(SetCamDistance, CAM_DEFAULT, -210) Call(SetCamPitch, CAM_DEFAULT, 20, -12) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) Call(SetCamDistance, CAM_DEFAULT, -350) @@ -42,7 +42,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { #else Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) Call(NpcMoveTo, NPC_SELF, -23, -105, 20) Wait(10 * DT) @@ -53,7 +53,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { Call(NpcMoveTo, NPC_SELF, 37, -27, 20 * DT) Call(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) Call(SetPanTarget, CAM_DEFAULT, 142, 0, -67) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(NpcMoveTo, NPC_SELF, 62, -6, 20 * DT) Call(NpcMoveTo, NPC_SELF, 103, 11, 20 * DT) Call(NpcMoveTo, NPC_SELF, 150, 18, 20 * DT) @@ -66,9 +66,9 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Set(GB_StoryProgress, STORY_CH2_SHADY_MOUSE_LEFT_SHOP) CaseLt(STORY_CH2_SPOKE_WITH_SHEEK) diff --git a/src/world/area_dro/dro_02/main.c b/src/world/area_dro/dro_02/main.c index 592c3b0a5e1..bc607e6822f 100644 --- a/src/world/area_dro/dro_02/main.c +++ b/src/world/area_dro/dro_02/main.c @@ -25,7 +25,7 @@ EvtScript N(EVS_EnterScene) = { Call(SetCamDistance, CAM_DEFAULT, Float(200.0)) Call(SetCamPitch, CAM_DEFAULT, Float(13.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(SetModelTintMode), APPLY_TINT_BG, NULL, ENV_TINT_REMAP) Call(N(SetModelTintMode), APPLY_TINT_GROUPS, -1, ENV_TINT_REMAP) Call(N(SetModelTintParams), ENV_TINT_REMAP, 44, 32, 177, 0, 0, 0, 0, 0, 0) diff --git a/src/world/area_dro/dro_02/npc.c b/src/world/area_dro/dro_02/npc.c index 5bbd20ec71d..1e52ee03b76 100644 --- a/src/world/area_dro/dro_02/npc.c +++ b/src/world/area_dro/dro_02/npc.c @@ -313,7 +313,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, -89, -141) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlayerMoveTo, -187, -267, 0) Call(InterpPlayerYaw, 230, 1) @@ -332,7 +332,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index 332c5542817..6012337f884 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -748,14 +748,14 @@ EvtScript N(EVS_BeginMerleeCamera) = { Call(SetPanTarget, 0, LVar0, LVar1, LVar2) Call(SetCamSpeed, 0, Float(8.0)) Call(SetCamPitch, 0, 20, -15) - Call(PanToTarget, 0, 0, 1) + Call(PanToTarget, 0, 0, TRUE) Call(WaitForCam, 0, Float(1.0)) Return End }; EvtScript N(EVS_EndMerleeCamera) = { - Call(PanToTarget, 0, 0, 0) + Call(PanToTarget, 0, 0, FALSE) Call(SetCamSpeed, 0, Float(3.0)) Call(WaitForCam, 0, Float(1.0)) Return diff --git a/src/world/area_dro/dro_02/npc_moustafa.c b/src/world/area_dro/dro_02/npc_moustafa.c index 3a35824c3aa..f76c029bec1 100644 --- a/src/world/area_dro/dro_02/npc_moustafa.c +++ b/src/world/area_dro/dro_02/npc_moustafa.c @@ -25,14 +25,14 @@ EvtScript N(EVS_Moustafa_SetCamBetween) = { Add(LVar1, 15) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(8.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End }; EvtScript N(EVS_Moustafa_ResetCam) = { - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return diff --git a/src/world/area_dro/dro_02/rooms.c b/src/world/area_dro/dro_02/rooms.c index 908bdd910f2..ab14184a4a7 100644 --- a/src/world/area_dro/dro_02/rooms.c +++ b/src/world/area_dro/dro_02/rooms.c @@ -112,7 +112,7 @@ EvtScript N(EVS_RoomListener_Hideout) = { Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -395, 140, -150) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) CaseEq(ROOM_UPDATE_EXIT_BEGIN) Call(SetPanTarget, CAM_DEFAULT, -365, 140, -145) Call(SetCamPitch, CAM_DEFAULT, 20, -7) @@ -121,7 +121,7 @@ EvtScript N(EVS_RoomListener_Hideout) = { Call(WaitForCam, CAM_DEFAULT, Float(1.0)) CaseEq(ROOM_UPDATE_EXIT_END) Call(SetGroupVisibility, MODEL_ie5_naka, MODEL_GROUP_HIDDEN) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(1.334)) EndSwitch Return diff --git a/src/world/area_end/end_00/parade_setup.c b/src/world/area_end/end_00/parade_setup.c index a917d828532..57b4a908801 100644 --- a/src/world/area_end/end_00/parade_setup.c +++ b/src/world/area_end/end_00/parade_setup.c @@ -101,7 +101,7 @@ EvtScript N(EVS_SetupInitialCamera) = { Call(UseSettingsFrom, CAM_DEFAULT, PARADE_START, 0, 0) Call(SetPanTarget, CAM_DEFAULT, PARADE_START, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; diff --git a/src/world/area_end/end_01/parade_setup.c b/src/world/area_end/end_01/parade_setup.c index 667c2fca051..1ef08bdef4e 100644 --- a/src/world/area_end/end_01/parade_setup.c +++ b/src/world/area_end/end_01/parade_setup.c @@ -97,7 +97,7 @@ EvtScript N(EVS_SetupInitialCamera) = { Call(UseSettingsFrom, CAM_DEFAULT, PARADE_START, 0, 0) Call(SetPanTarget, CAM_DEFAULT, PARADE_START, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; diff --git a/src/world/area_flo/flo_00/beanstalk.c b/src/world/area_flo/flo_00/beanstalk.c index 5e861706191..369b7350ecb 100644 --- a/src/world/area_flo/flo_00/beanstalk.c +++ b/src/world/area_flo/flo_00/beanstalk.c @@ -308,7 +308,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVar9, Float(-59.0)) Set(LVarA, Float(22.0)) Set(LVarB, Float(125.0)) @@ -397,7 +397,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { Call(SetCamDistance, CAM_DEFAULT, 800) Call(SetCamPosA, CAM_DEFAULT, -200, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) CaseDefault EndSwitch @@ -436,7 +436,7 @@ EvtScript N(EVS_Scene_BeanstalkGrewRemark) = { Call(SetCamDistance, CAM_DEFAULT, 800) Call(SetCamPosA, CAM_DEFAULT, -200, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVarF, 0) Loop(5) @@ -577,7 +577,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, 250) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_Scene_BeanstalkGrowing)) EndSwitch diff --git a/src/world/area_flo/flo_00/epilogue.c b/src/world/area_flo/flo_00/epilogue.c index 0390dae9b57..89f8bf162c5 100644 --- a/src/world/area_flo/flo_00/epilogue.c +++ b/src/world/area_flo/flo_00/epilogue.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPosA, CAM_DEFAULT, Float(17.5), Float(35.0)) Call(SetCamPosB, CAM_DEFAULT, 0, -50) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(70) Call(InterpNpcYaw, NPC_Lakilester_Epilogue, 90, 0) diff --git a/src/world/area_flo/flo_00/npc.c b/src/world/area_flo/flo_00/npc.c index c724c9725a0..9c3ee3d1667 100644 --- a/src/world/area_flo/flo_00/npc.c +++ b/src/world/area_flo/flo_00/npc.c @@ -29,7 +29,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamPosA, CAM_DEFAULT, -27, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(ShowMessageAtWorldPos, MSG_CH6_00C4, 0, 50, -200) @@ -47,7 +47,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(75 * DT) Call(ShowMessageAtScreenPos, MSG_CH6_0000, 160, 40) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -64,7 +64,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamDistance, CAM_DEFAULT, 800) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-5.8)) Call(SetCamPosA, CAM_DEFAULT, -2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(15 * DT) Call(SpeakToPlayer, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0001) Call(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -75,7 +75,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamDistance, CAM_DEFAULT, 333) Call(SetCamPitch, CAM_DEFAULT, Float(9.0), Float(-22.0)) Call(SetCamPosA, CAM_DEFAULT, -2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnablePartnerAI) Call(func_802D2C14, 1) @@ -84,7 +84,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamPitch, CAM_DEFAULT, Float(16.5), Float(-11.8)) Call(SetCamDistance, CAM_DEFAULT, 525) Call(SetCamPosA, CAM_DEFAULT, -14, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) @@ -94,7 +94,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamPitch, CAM_DEFAULT, Float(9.0), Float(-22.0)) Call(SetCamDistance, CAM_DEFAULT, 333) Call(SetCamPosA, CAM_DEFAULT, -2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(ShowMessageAtWorldPos, MSG_CH6_0005, 0, 70, -200) @@ -186,7 +186,7 @@ EvtScript N(EVS_Wisterwood_Farewell) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, -30) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-25.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(ShowMessageAtWorldPos, MSG_CH6_000C, 0, 50, -200) @@ -454,7 +454,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(SetCamDistance, CAM_DEFAULT, Float(475.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -8) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) @@ -463,7 +463,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -9) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR) Loop(0) @@ -505,7 +505,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00D9) @@ -515,7 +515,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00DA) diff --git a/src/world/area_flo/flo_03/npc.c b/src/world/area_flo/flo_03/npc.c index b42b820b70d..3027018f0f7 100644 --- a/src/world/area_flo/flo_03/npc.c +++ b/src/world/area_flo/flo_03/npc.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamPosA, CAM_DEFAULT, -27, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Petunia, ANIM_Petunia_Talk, ANIM_Petunia_Idle, 0, MSG_CH6_00C8) @@ -165,7 +165,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) Call(SetCamDistance, CAM_DEFAULT, 200) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20 * DT) Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) @@ -181,7 +181,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim00) Wait(20 * DT) @@ -196,7 +196,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20 * DT) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim14) @@ -207,7 +207,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim06) Wait(20 * DT) @@ -223,7 +223,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) Call(PlaySoundAtNpc, NPC_Dayzee, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) diff --git a/src/world/area_flo/flo_07/npc.c b/src/world/area_flo/flo_07/npc.c index d7244955f78..227fdaa1a40 100644 --- a/src/world/area_flo/flo_07/npc.c +++ b/src/world/area_flo/flo_07/npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(11.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_00C5) @@ -45,7 +45,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlaySound, SOUND_LOOP_RUMBLE) ExecGetTID(N(EVS_ShakeGround), MV_GroundShakingScript) @@ -54,7 +54,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(8.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -178,7 +178,7 @@ EvtScript N(EVS_OnHit_CrystalTree) = { Call(UseSettingsFrom, CAM_DEFAULT, -250, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -250, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) ExecWait(N(EVS_MakeCrystalBerry)) Call(ResetCam, CAM_DEFAULT, Float(4.0)) EndIf diff --git a/src/world/area_flo/flo_08/npc.c b/src/world/area_flo/flo_08/npc.c index 2c740151b9b..0625168eaa7 100644 --- a/src/world/area_flo/flo_08/npc.c +++ b/src/world/area_flo/flo_08/npc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0042) Call(SetPlayerAnimation, ANIM_Mario1_Thinking) diff --git a/src/world/area_flo/flo_10/fountain.c b/src/world/area_flo/flo_10/fountain.c index f1fc5c2bbfd..05836f31c49 100644 --- a/src/world/area_flo/flo_10/fountain.c +++ b/src/world/area_flo/flo_10/fountain.c @@ -117,7 +117,7 @@ EvtScript N(EVS_RaiseCamera) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.7)) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-22.0)) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -181,7 +181,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) Call(SetCamDistance, CAM_DEFAULT, 600) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnableGroup, MODEL_g22, TRUE) Call(TranslateGroup, MODEL_g22, 0, -50, 0) diff --git a/src/world/area_flo/flo_10/npc.c b/src/world/area_flo/flo_10/npc.c index c396e7605ff..d1b9e3aa01d 100644 --- a/src/world/area_flo/flo_10/npc.c +++ b/src/world/area_flo/flo_10/npc.c @@ -12,7 +12,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Lily, ANIM_Lily_Talk, ANIM_Lily_Idle, 0, MSG_CH6_00C6) @@ -117,7 +117,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamPitch, CAM_DEFAULT, Float(23.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0078) @@ -131,7 +131,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamPitch, CAM_DEFAULT, Float(23.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079) diff --git a/src/world/area_flo/flo_10/waterfx.c b/src/world/area_flo/flo_10/waterfx.c index b23e736b3c8..1787efef666 100644 --- a/src/world/area_flo/flo_10/waterfx.c +++ b/src/world/area_flo/flo_10/waterfx.c @@ -107,7 +107,7 @@ void N(UnkModelFunc001)(void) { f32 temp_f20; f32 temp_f22; - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x - bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); @@ -123,7 +123,7 @@ void N(UnkModelFunc001)(void) { temp_f20 = outX; temp_f22 = outY; - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x - bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); @@ -155,7 +155,7 @@ void N(UnkModelFunc001)(void) { temp_f22 = outY; } - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x + bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); @@ -185,7 +185,7 @@ void N(UnkModelFunc001)(void) { temp_f22 = outY; } - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x + bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); diff --git a/src/world/area_flo/flo_11/npc.c b/src/world/area_flo/flo_11/npc.c index 4e0e562d7eb..a3042d8e716 100644 --- a/src/world/area_flo/flo_11/npc.c +++ b/src/world/area_flo/flo_11/npc.c @@ -220,7 +220,7 @@ EvtScript N(EVS_Scene_LakituAmbush) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-7.0)) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Set(LVar0, 270) @@ -233,12 +233,12 @@ EvtScript N(EVS_Scene_LakituAmbush) = { Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamPosC, CAM_DEFAULT, 87, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Call(SetCamDistance, CAM_DEFAULT, 150) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-16.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(0) Wait(1) IfEq(MV_LakituSearchSync, 1) @@ -265,7 +265,7 @@ EvtScript N(EVS_Scene_LakituAmbush) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPosA, CAM_DEFAULT, 87, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_LakitusFlying_Attack)) Call(SetNpcVar, NPC_Lakitu_01, 0, 1) @@ -306,7 +306,7 @@ EvtScript N(EVS_NpcDefeat_Lakitu_01) = { Call(SetCamPosA, CAM_DEFAULT, Float(-95.0), Float(0.0)) Call(SetCamPosB, CAM_DEFAULT, Float(0.0), Float(-50.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_LakitusFlying_Flee)) Call(ResetCam, CAM_DEFAULT, Float(4.0)) diff --git a/src/world/area_flo/flo_12/npc.c b/src/world/area_flo/flo_12/npc.c index f0fbd6ca573..a8d6d1a2922 100644 --- a/src/world/area_flo/flo_12/npc.c +++ b/src/world/area_flo/flo_12/npc.c @@ -25,7 +25,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Rosie, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_00C7) diff --git a/src/world/area_flo/flo_13/npc.c b/src/world/area_flo/flo_13/npc.c index 222d2d0a2c8..0b4787277dd 100644 --- a/src/world/area_flo/flo_13/npc.c +++ b/src/world/area_flo/flo_13/npc.c @@ -264,7 +264,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = { Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(PlayerMoveTo, -75, 65, 10 * DT) @@ -278,7 +278,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = { Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(DisablePlayerInput, FALSE) @@ -297,7 +297,7 @@ EvtScript N(EVS_Lakilulu_FlyAway) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(5.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(NpcFaceNpc, NPC_Lakilulu, NPC_Lakilester, 1) Call(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_Talk, ANIM_Lakilulu_Idle, 0, MSG_CH6_00B4) @@ -308,7 +308,7 @@ EvtScript N(EVS_Lakilulu_FlyAway) = { Call(SetCamPosB, CAM_DEFAULT, 130, -200) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(N(PlayLakiluluFlightSounds), 55 * DT) @@ -368,13 +368,13 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetCamPosB, CAM_DEFAULT, 130, -200) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Thread Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPosB, CAM_DEFAULT, 130, 60) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Thread @@ -400,7 +400,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(5.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, MSG_CH6_00A4) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -408,7 +408,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_Shout, ANIM_Lakilulu_Shout, 0, MSG_CH6_00A5) Call(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2) @@ -416,7 +416,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00A6) Call(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Idle) @@ -426,7 +426,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Label(10) Call(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_ConcernedTalk, ANIM_Lakilulu_ConcernedNod, 0, MSG_CH6_00A7) @@ -447,7 +447,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00AA) Call(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Idle) @@ -457,7 +457,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00AB) @@ -497,7 +497,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(ShowMessageAtScreenPos, MSG_Menus_0190, 160, 40) Exec(N(EVS_PopSong)) Wait(10 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH6_LAKILESTER_JOINED_PARTY) Call(EnablePartnerAI) Call(DisablePlayerInput, FALSE) @@ -521,7 +521,7 @@ EvtScript N(EVS_NpcDefeat_Lakilester) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_Scene_LakilesterDefeated)) CaseEq(OUTCOME_PLAYER_LOST) diff --git a/src/world/area_flo/flo_15/npc.c b/src/world/area_flo/flo_15/npc.c index 6c955de56cc..3fc66c3afe2 100644 --- a/src/world/area_flo/flo_15/npc.c +++ b/src/world/area_flo/flo_15/npc.c @@ -45,19 +45,19 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamDistance, CAM_DEFAULT, 1050) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(4.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(6.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Sun_01, ANIM_Sun_TalkJoy, ANIM_Sun_TalkJoy, SPEECH_FLAG_200 | 5, MSG_CH6_00C3) Call(SetNpcAnimation, NPC_Sun_01, ANIM_Sun_TalkJoy) Thread Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Wait(15) diff --git a/src/world/area_flo/flo_15/stairs.c b/src/world/area_flo/flo_15/stairs.c index 1a6e165e3b2..4b98824e3e8 100644 --- a/src/world/area_flo/flo_15/stairs.c +++ b/src/world/area_flo/flo_15/stairs.c @@ -35,7 +35,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-9.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-50.0), Float(25.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(100) diff --git a/src/world/area_flo/flo_18/machine.c b/src/world/area_flo/flo_18/machine.c index 22b35d02bbc..4c76ee36e77 100644 --- a/src/world/area_flo/flo_18/machine.c +++ b/src/world/area_flo/flo_18/machine.c @@ -561,7 +561,7 @@ EvtScript N(EVS_DamageMachine) = { Call(UseSettingsFrom, CAM_DEFAULT, 40, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 40, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(GB_FLO18_MachineDamage_Right, 3) ExecWait(N(EVS_ShakeMachine)) ExecWait(N(EVS_ShakeMachine)) diff --git a/src/world/area_flo/flo_18/npc.c b/src/world/area_flo/flo_18/npc.c index b86444fff53..f9b113b321e 100644 --- a/src/world/area_flo/flo_18/npc.c +++ b/src/world/area_flo/flo_18/npc.c @@ -247,7 +247,7 @@ EvtScript N(EVS_NpcIdle_Magikoopa) = { Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePlayerInput, FALSE) Call(StartBossBattle, SONG_SPECIAL_BATTLE) Return @@ -406,7 +406,7 @@ EvtScript N(EVS_GenericBombReaction) = { Call(SetCamSpeed, CAM_DEFAULT, Float(8.0 / DT)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_ReactionFacePlayer)) IfEq(AB_FLO_GuardedMachineHitCount, 0) diff --git a/src/world/area_flo/flo_19/beanstalk.c b/src/world/area_flo/flo_19/beanstalk.c index e7472fbf3f5..a302c9d1773 100644 --- a/src/world/area_flo/flo_19/beanstalk.c +++ b/src/world/area_flo/flo_19/beanstalk.c @@ -118,7 +118,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableGroup, MODEL_g16, FALSE) Call(EnableGroup, MODEL_g2, FALSE) Call(EnableGroup, MODEL_g3, FALSE) @@ -166,7 +166,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_FadeInFromBlack)) Wait(20) @@ -266,7 +266,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(AF_FLO_BeanstalkFadedOut, FALSE) ExecWait(N(EVS_FadeInFromBlack)) @@ -329,7 +329,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVarF, 100) Set(MV_BeanstalkGrowthProgress, LVarF) Set(AF_FLO_BeanstalkGrowing, FALSE) @@ -350,7 +350,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVarF, 150) Thread Wait(5) diff --git a/src/world/area_flo/flo_19/clouds.c b/src/world/area_flo/flo_19/clouds.c index 805d15db2bf..8f15c319181 100644 --- a/src/world/area_flo/flo_19/clouds.c +++ b/src/world/area_flo/flo_19/clouds.c @@ -157,10 +157,10 @@ EvtScript N(EVS_SetupClouds) = { Call(ParentColliderToModel, COLLIDER_o78, MODEL_g21) Call(ParentColliderToModel, COLLIDER_o76, MODEL_g22) Call(ParentColliderToModel, COLLIDER_o79, MODEL_g23) - Call(SetModelFlags, MODEL_g17, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_g21, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_g22, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_g23, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_g17, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_g21, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_g22, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_g23, MODEL_FLAG_BILLBOARD, TRUE) Exec(N(EVS_AnimatePlatforms)) BindTrigger(Ref(N(EVS_AddPlayerWeight_Platform_01)), TRIGGER_FLOOR_TOUCH, COLLIDER_o77, 1, 0) BindTrigger(Ref(N(EVS_AddPlayerWeight_Platform_02)), TRIGGER_FLOOR_TOUCH, COLLIDER_o78, 1, 0) diff --git a/src/world/area_flo/flo_21/main.c b/src/world/area_flo/flo_21/main.c index 58f56aa91ee..8591b55c3d3 100644 --- a/src/world/area_flo/flo_21/main.c +++ b/src/world/area_flo/flo_21/main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, 650, 150, 0) EVT_SPIRIT_ADJUST_CAM(Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 5, 180, 650, 170, 0, 650, 205, 0, 150, 120) Thread Call(N(StarSpiritEffectFunc3)) @@ -65,7 +65,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 5, 650, 150, 0, 120) diff --git a/src/world/area_flo/flo_21/npc.c b/src/world/area_flo/flo_21/npc.c index 17a61c82076..d4307213294 100644 --- a/src/world/area_flo/flo_21/npc.c +++ b/src/world/area_flo/flo_21/npc.c @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(MakeLerp, LVar2, 600, 20, EASING_LINEAR) Set(LVar2, LVar3) Set(LVar5, LVar3) @@ -128,19 +128,19 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(ShowMessageAtWorldPos, MSG_CH6_00CA, 630, 120, 0) Call(SetCamDistance, CAM_DEFAULT, Float(600.0)) Call(SetCamPitch, CAM_DEFAULT, Float(30.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(ShowMessageAtWorldPos, MSG_CH6_00CB, 630, 120, 0) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(func_802D2C14, 0) Wait(10) Call(GetCurrentPartnerID, LVar0) @@ -450,7 +450,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_HuffNPuff_01, ANIM_HuffNPuff_Anim30, ANIM_HuffNPuff_Anim05, 256, -30, 30, MSG_CH6_00CE) Call(FadeOutMusic, 0, 1500) diff --git a/src/world/area_flo/flo_23/npc.c b/src/world/area_flo/flo_23/npc.c index 23747b68290..5d27852054a 100644 --- a/src/world/area_flo/flo_23/npc.c +++ b/src/world/area_flo/flo_23/npc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Talk, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_0049) Call(SetPlayerAnimation, ANIM_Mario1_Thinking) diff --git a/src/world/area_flo/flo_24/water.c b/src/world/area_flo/flo_24/water.c index 42894671ba8..28b6f8557d0 100644 --- a/src/world/area_flo/flo_24/water.c +++ b/src/world/area_flo/flo_24/water.c @@ -12,7 +12,7 @@ EvtScript N(EVS_Scene_FillWithWater) = { Call(SetCamPosA, CAM_DEFAULT, Float(-300.0), Float(200.0)) Call(SetCamPosB, CAM_DEFAULT, Float(300.0), Float(-150.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(PlaySound, SOUND_LOOP_FLO_FILL_WATER_POOL) //@bug thread is never terminated Thread diff --git a/src/world/area_flo/flo_25/npc.c b/src/world/area_flo/flo_25/npc.c index 177f7e60ad3..709bc023019 100644 --- a/src/world/area_flo/flo_25/npc.c +++ b/src/world/area_flo/flo_25/npc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Talk, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003B) Call(SetPlayerAnimation, ANIM_Mario1_Thinking) diff --git a/src/world/area_gv/gv_01/main.c b/src/world/area_gv/gv_01/main.c index 237988a96dd..728b4ea84a0 100644 --- a/src/world/area_gv/gv_01/main.c +++ b/src/world/area_gv/gv_01/main.c @@ -255,7 +255,7 @@ EvtScript N(EVS_Main) = { Call(UseSettingsFrom, CAM_DEFAULT, 0, 10, 0) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(0.3)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(94) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 1000) EndThread @@ -291,7 +291,7 @@ API_CALLABLE(N(ChangeStateToTitleScreen)) { clear_render_tasks(); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); clear_entity_models(); clear_animator_list(); diff --git a/src/world/area_hos/hos_00/npc.c b/src/world/area_hos/hos_00/npc.c index dc66cabd8c9..a90720b9eba 100644 --- a/src/world/area_hos/hos_00/npc.c +++ b/src/world/area_hos/hos_00/npc.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Scene_Wishing) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPitch, CAM_DEFAULT, Float(9.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Call(SpeakToPlayer, NPC_ToadKid, ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Disappointed, 0, MSG_HOS_006C) diff --git a/src/world/area_hos/hos_00/scenes.c b/src/world/area_hos/hos_00/scenes.c index f7cf5812d9f..2ec8b94dc22 100644 --- a/src/world/area_hos/hos_00/scenes.c +++ b/src/world/area_hos/hos_00/scenes.c @@ -249,7 +249,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcSpeed, NPC_Twink, Float(3.0 / DT)) Call(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) Add(LVar0, 40) @@ -376,7 +376,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(20 * DT) @@ -385,12 +385,12 @@ EvtScript N(EVS_Scene_MeetingTwink) = { Div(LVar0, 2) Call(SetPanTarget, CAM_DEFAULT, -250, 53, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.4 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread ExecGetTID(N(EVS_UpdateFacingMagikoopa), LVarA) @@ -439,7 +439,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { Call(SetCamDistance, CAM_DEFAULT, Float(260.0)) Call(SetCamPitch, CAM_DEFAULT, Float(13.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SpeakToPlayer, NPC_FlyingMagikoopa, ANIM_FlyingMagikoopa_Anim09, ANIM_FlyingMagikoopa_Anim00, 512, MSG_HOS_0033) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -448,7 +448,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, 0) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcVar, NPC_FlyingMagikoopa, 0, 1) Call(EnablePartnerAI) Unbind @@ -469,7 +469,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(InterpNpcYaw, NPC_Twink, 90, 0) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0034) @@ -483,7 +483,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(700.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.3 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) Call(LoadPath, 85 * DT, Ref(N(TwinkDepartPath1)), ARRAY_COUNT(N(TwinkDepartPath1)), EASING_LINEAR) Label(0) @@ -519,7 +519,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0036) Thread @@ -543,7 +543,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Call(SetNpcFlagBits, NPC_Twink, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) SetF(LVar0, Float(0.0)) @@ -562,7 +562,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(13.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(DisablePartnerAI, 0) Call(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_HOS_0037) diff --git a/src/world/area_hos/hos_01/main.c b/src/world/area_hos/hos_01/main.c index 1d3ef882034..d793d795c80 100644 --- a/src/world/area_hos/hos_01/main.c +++ b/src/world/area_hos/hos_01/main.c @@ -60,7 +60,7 @@ EvtScript N(EVS_EnterStarBeam) = { Call(UseSettingsFrom, CAM_DEFAULT, -30, 250, -160) Call(SetPanTarget, CAM_DEFAULT, -30, 250, -160) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVar2, 360) Call(MakeLerp, 500, 250, 60, EASING_QUADRATIC_OUT) @@ -98,7 +98,7 @@ EvtScript N(EVS_EnterStarBeam) = { Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, 8) Call(DisablePlayerInput, FALSE) Label(20) diff --git a/src/world/area_hos/hos_01/npc.c b/src/world/area_hos/hos_01/npc.c index b407dfe13ec..83affe92d54 100644 --- a/src/world/area_hos/hos_01/npc.c +++ b/src/world/area_hos/hos_01/npc.c @@ -59,7 +59,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-5.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(func_802D2C14, 2) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) Thread @@ -128,7 +128,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { Call(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-6.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_HOS_0002) Call(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) diff --git a/src/world/area_hos/hos_01/star_way.c b/src/world/area_hos/hos_01/star_way.c index bb3466240a0..455a5c67a80 100644 --- a/src/world/area_hos/hos_01/star_way.c +++ b/src/world/area_hos/hos_01/star_way.c @@ -27,7 +27,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, 3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(ShowMessageAtScreenPos, MSG_HOS_005D, 160, 40) @@ -49,7 +49,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = { Call(SetCamDistance, CAM_DEFAULT, 600) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) PlayEffect(EFFECT_75, 0, -30, 250, -160, 1, -1) Set(MV_StarBeamFXPtr, LVarF) @@ -72,7 +72,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(ShowMessageAtScreenPos, MSG_HOS_005E, 160, 40) @@ -90,7 +90,7 @@ EvtScript N(EVS_AscendStarBeam) = { Call(UseSettingsFrom, CAM_DEFAULT, -30, 250, -160) Call(SetPanTarget, CAM_DEFAULT, -30, 250, -160) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerSpeed, Float(3.0)) Call(PlayerMoveTo, -30, -160, 0) Call(InterpPlayerYaw, 90, 0) diff --git a/src/world/area_hos/hos_02/main.c b/src/world/area_hos/hos_02/main.c index 2aa824a1fd3..9d51d953c12 100644 --- a/src/world/area_hos/hos_02/main.c +++ b/src/world/area_hos/hos_02/main.c @@ -45,7 +45,7 @@ EvtScript N(EVS_EnterStarBeam) = { Call(SetPanTarget, CAM_DEFAULT, -1105, -171, 225) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVar2, 360) Call(MakeLerp, -400, -171, 60, EASING_QUADRATIC_OUT) @@ -83,7 +83,7 @@ EvtScript N(EVS_EnterStarBeam) = { Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, 3, 8) Call(DisablePlayerInput, FALSE) Call(AwaitPlayerLeave, -1105, 225, 40) diff --git a/src/world/area_hos/hos_02/model_fx.c b/src/world/area_hos/hos_02/model_fx.c index 80b31bbfc03..cd18a938d40 100644 --- a/src/world/area_hos/hos_02/model_fx.c +++ b/src/world/area_hos/hos_02/model_fx.c @@ -165,21 +165,21 @@ EvtScript N(EVS_SetupModelFX) = { Call(SetModelCustomGfx, MODEL_o347, CUSTOM_GFX_0, ENV_TINT_UNCHANGED) Call(SetModelCustomGfx, MODEL_o348, CUSTOM_GFX_0, ENV_TINT_UNCHANGED) Call(SetCustomGfxBuilders, CUSTOM_GFX_0, Ref(N(build_gfx_lamp_halos)), NULL) - Call(SetModelFlags, MODEL_o414, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o415, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o399, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o398, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o347, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o348, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o407, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o408, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o413, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o446, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o447, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o448, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o456, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o457, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o458, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_o414, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o415, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o399, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o398, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o347, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o348, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o407, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o408, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o413, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o446, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o447, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o448, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o456, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o457, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o458, MODEL_FLAG_BILLBOARD, TRUE) // yellow stars Call(MakeLocalVertexCopy, VTX_COPY_0, MODEL_o466, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(build_gfx_yellow_stars)), NULL) diff --git a/src/world/area_hos/hos_03/npc.c b/src/world/area_hos/hos_03/npc.c index 8867ad1e25b..642568706be 100644 --- a/src/world/area_hos/hos_03/npc.c +++ b/src/world/area_hos/hos_03/npc.c @@ -83,7 +83,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, Float(410.0), Float(150.0)) Call(SetCamPosC, CAM_DEFAULT, 0, 25) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(func_802D1270, 442, 140, Float(3.0)) Call(InterpPlayerYaw, 191, 1) @@ -100,7 +100,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_hos/hos_04/intro.c b/src/world/area_hos/hos_04/intro.c index 89693c069fc..3d342b3f6c8 100644 --- a/src/world/area_hos/hos_04/intro.c +++ b/src/world/area_hos/hos_04/intro.c @@ -121,7 +121,7 @@ EvtScript N(EVS_Intro_PostHeist) = { Call(N(SetCamVfov), CAM_DEFAULT, 75) Call(SetPanTarget, CAM_DEFAULT, 0, 30, 0) Call(LoadSettings, CAM_DEFAULT, Ref(N(CamSettings_PostHeist))) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Thread Exec(N(EVS_ControlTwink)) @@ -176,7 +176,7 @@ EvtScript N(EVS_Intro_PreHeist_Unused) = { Call(N(SetCamVfov), CAM_DEFAULT, 75) Call(SetPanTarget, CAM_DEFAULT, 0, 30, 0) Call(LoadSettings, CAM_DEFAULT, Ref(N(CamSettings_PreHeist))) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Thread Call(N(AnimateBoomLengthPreHeist)) diff --git a/src/world/area_hos/hos_04/main.c b/src/world/area_hos/hos_04/main.c index 9c7dfc61477..cc6182fa21e 100644 --- a/src/world/area_hos/hos_04/main.c +++ b/src/world/area_hos/hos_04/main.c @@ -34,12 +34,12 @@ EvtScript N(EVS_EnterMap) = { Call(SetCamPosA, CAM_DEFAULT, Float(-15.0), Float(-100.0)) Call(SetCamPosB, CAM_DEFAULT, Float(87.5), Float(50.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SetCamPitch, CAM_DEFAULT, Float(4.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.15)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Set(LVar0, Ref(N(EVS_BindExitTriggers))) @@ -50,9 +50,9 @@ EvtScript N(EVS_EnterMap) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(AF_HOS_B5, TRUE) Call(DisablePlayerInput, FALSE) EndThread diff --git a/src/world/area_hos/hos_04/starship.c b/src/world/area_hos/hos_04/starship.c index f09ffd66ab1..92dc1d17c3a 100644 --- a/src/world/area_hos/hos_04/starship.c +++ b/src/world/area_hos/hos_04/starship.c @@ -35,7 +35,7 @@ EvtScript N(EVS_Starship_FlyingAway) = { Call(SetCamPosB, CAM_DEFAULT, Float(-544.0), Float(50.0)) Call(SetCamPitch, CAM_DEFAULT, Float(2.0), Float(-20.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Thread @@ -101,7 +101,7 @@ EvtScript N(EVS_BetaStarship_Flight1) = { Call(SetCamPosB, CAM_DEFAULT, 5000, 50) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_Starship_Yaw, 0) Set(MV_Starship_PosX, -5000) Set(MV_Starship_PosY, -525) @@ -140,7 +140,7 @@ EvtScript N(EVS_BetaStarship_Flight1) = { Loop(0) Add(LVar0, 45) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop EndThread @@ -181,7 +181,7 @@ EvtScript N(EVS_BetaStarship_Flight2) = { Call(SetCamPosB, CAM_DEFAULT, 5000, 50) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_Starship_Yaw, 0) Set(MV_Starship_PosX, -4673) Set(MV_Starship_PosY, -525) @@ -205,7 +205,7 @@ EvtScript N(EVS_BetaStarship_Flight2) = { Loop(0) Add(LVar0, 45) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) IfGt(LVar0, 0) Set(MV_Starship_Yaw, 1) @@ -246,7 +246,7 @@ EvtScript N(EVS_BetaStarship_Return) = { Call(SetCamPosB, CAM_DEFAULT, 5000, 50) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_Starship_Yaw, 0) Set(MV_Starship_PosX, 5000) Set(MV_Starship_PosY, -525) @@ -278,7 +278,7 @@ EvtScript N(EVS_BetaStarship_Return) = { Loop(0) Add(LVar0, -45) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) IfLt(LVar0, -1000) Set(MV_Starship_Yaw, 1) diff --git a/src/world/area_hos/hos_05/intro.c b/src/world/area_hos/hos_05/intro.c index 20c30fa9301..57127f91321 100644 --- a/src/world/area_hos/hos_05/intro.c +++ b/src/world/area_hos/hos_05/intro.c @@ -419,7 +419,7 @@ API_CALLABLE(N(StoryCameraShake1)) { if (isInitialCall) { camera->flags |= CAMERA_FLAG_SHAKING; } - guTranslateF(camera->viewMtxShaking, + guTranslateF(camera->mtxViewShaking, N(StoryCameraShake1Scale) * sin_deg(N(StoryCameraShake1Angle) * 486), N(StoryCameraShake1Scale) * cos_deg(N(StoryCameraShake1Angle) * 254), 0.0f @@ -427,7 +427,7 @@ API_CALLABLE(N(StoryCameraShake1)) { N(StoryCameraShake1Angle)++; N(StoryCameraShake1Scale) += (12.0f - N(StoryCameraShake1Scale)) * 0.2; if (N(StoryCameraShake1Angle) > 20) { - guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f); + guTranslateF(camera->mtxViewShaking, 0.0f, 0.0f, 0.0f); camera->flags &= ~CAMERA_FLAG_SHAKING; return ApiStatus_DONE1; } @@ -448,13 +448,13 @@ API_CALLABLE(N(StoryCameraShake2)) { } x = N(StoryCameraShake2Scale) * sin_deg(N(StoryCameraShake2Angle) * 486); y = N(StoryCameraShake2Scale) * cos_deg(N(StoryCameraShake2Angle) * 254); - guTranslateF(camera->viewMtxShaking, x, y, 0.0f); - guTranslateF(camera->viewMtxShaking, x, y, 0.0f); + guTranslateF(camera->mtxViewShaking, x, y, 0.0f); + guTranslateF(camera->mtxViewShaking, x, y, 0.0f); guRotateF(sp18, 20.0f, 0.0f, 0.0f, 1.0f); - guMtxCatF(sp18, camera->viewMtxShaking, camera->viewMtxShaking); + guMtxCatF(sp18, camera->mtxViewShaking, camera->mtxViewShaking); camera->panActive = TRUE; if (N(StoryCameraShake2Angle) >= 10) { - guRotateF(camera->viewMtxShaking, 20.0f, 0.0f, 0.0f, 1.0f); + guRotateF(camera->mtxViewShaking, 20.0f, 0.0f, 0.0f, 1.0f); return ApiStatus_DONE1; } N(StoryCameraShake2Angle)++; @@ -568,7 +568,7 @@ API_CALLABLE(N(StoryCameraShakeEnd)) { if (isInitialCall) { camera->flags &= ~CAMERA_FLAG_SHAKING; } - guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f); + guTranslateF(camera->mtxViewShaking, 0.0f, 0.0f, 0.0f); return ApiStatus_DONE2; } @@ -1888,7 +1888,7 @@ EvtScript N(EVS_Intro_Main) = { Call(N(AdjustCamVfov), 0, 62) Call(SetPanTarget, CAM_DEFAULT, 0, 157, 0) Call(LoadSettings, CAM_DEFAULT, Ref(N(IntroCamSettings1))) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(N(InitializeStoryGraphicsData)) Thread diff --git a/src/world/area_hos/hos_05/npc.c b/src/world/area_hos/hos_05/npc.c index 7f73c7080fe..d8b408b42be 100644 --- a/src/world/area_hos/hos_05/npc.c +++ b/src/world/area_hos/hos_05/npc.c @@ -112,14 +112,14 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(-2.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Call(SetPanTarget, CAM_DEFAULT, 0, 220, -275) Call(SetCamDistance, CAM_DEFAULT, Float(1.0)) Call(SetCamPitch, CAM_DEFAULT, Float(-4.5), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_HOS_0069) Call(func_802D2C14, 0) @@ -131,7 +131,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(-2.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 25, EASING_QUADRATIC_IN) Loop(0) @@ -249,7 +249,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { Call(SetCamDistance, CAM_DEFAULT, Float(1.0)) Call(SetCamPitch, CAM_DEFAULT, Float(-4.5), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_HOS_006A) @@ -260,7 +260,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamPitch, CAM_DEFAULT, Float(8.0), Float(-7.9)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Set(GB_StoryProgress, STORY_CH8_STAR_SHIP_ACTIVATED) @@ -269,7 +269,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { Call(SetCamDistance, CAM_DEFAULT, Float(1.0)) Call(SetCamPitch, CAM_DEFAULT, Float(-4.5), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_HOS_006B) @@ -281,7 +281,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { Call(SetZoneEnabled, ZONE_o622, FALSE) Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5)) Call(EnableModel, MODEL_o362, FALSE) Call(EnableModel, MODEL_o397, FALSE) diff --git a/src/world/area_hos/hos_05/star_ship.c b/src/world/area_hos/hos_05/star_ship.c index f1a09c2adee..babc7a6575d 100644 --- a/src/world/area_hos/hos_05/star_ship.c +++ b/src/world/area_hos/hos_05/star_ship.c @@ -9,10 +9,10 @@ API_CALLABLE(N(SwingCameraPitchUpward)) { script->functionTemp[0] = 40; } script->functionTemp[0]--; - if (camera->curController != NULL) { - camera->curController->viewPitch -= 1.0 - ((f32) (40 - script->functionTemp[0]) * 0.01); - } else if (camera->prevController != NULL) { - camera->prevController->viewPitch -= 1.0 - ((f32) (40 - script->functionTemp[0]) * 0.01); + if (camera->curSettings != NULL) { + camera->curSettings->viewPitch -= 1.0 - ((f32) (40 - script->functionTemp[0]) * 0.01); + } else if (camera->prevSettings != NULL) { + camera->prevSettings->viewPitch -= 1.0 - ((f32) (40 - script->functionTemp[0]) * 0.01); } if (script->functionTemp[0] == 0) { @@ -139,7 +139,7 @@ EvtScript N(EVS_EnterStarship) = { Call(SetCamDistance, CAM_DEFAULT, Float(550.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-35.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_PlayerOnBoard, TRUE) Set(MV_PartnerOnBoard, TRUE) ExecGetTID(N(EVS_UpdatePassengers), LVar9) @@ -152,7 +152,7 @@ EvtScript N(EVS_EnterStarship) = { DivF(LVar2, 10) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) IfEq(LVar1, 0) BreakLoop diff --git a/src/world/area_hos/hos_06/merluvlee.c b/src/world/area_hos/hos_06/merluvlee.c index 50481a57988..159a9e63695 100644 --- a/src/world/area_hos/hos_06/merluvlee.c +++ b/src/world/area_hos/hos_06/merluvlee.c @@ -594,7 +594,7 @@ EvtScript N(EVS_PerformHintRitual) = { Call(GetCamPitch, CAM_DEFAULT, LVar0, LVar1) SetF(LVar1, Float(-11.0)) Call(SetCamPitch, CAM_DEFAULT, LVar0, LVar1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) PlayEffect(EFFECT_MERLIN_HOUSE_STARS, 0, -298, 21, -330) Set(ArrayVar(2), LVarF) diff --git a/src/world/area_hos/hos_10/ending.c b/src/world/area_hos/hos_10/ending.c index 56ee0c65dc8..5d3c6e67835 100644 --- a/src/world/area_hos/hos_10/ending.c +++ b/src/world/area_hos/hos_10/ending.c @@ -211,7 +211,7 @@ EvtScript N(EVS_Scene_CastleDescending) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(0.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread SetF(LVar0, -2250) Loop(1500) @@ -405,7 +405,7 @@ EvtScript N(EVS_Scene_SpiritsFlyingAway) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Set(LVar0, NPC_Eldstar) Exec(N(EVS_MakeNpcSparkleTrail)) diff --git a/src/world/area_hos/hos_10/intro.c b/src/world/area_hos/hos_10/intro.c index 33f694c6b45..0836e8a0efd 100644 --- a/src/world/area_hos/hos_10/intro.c +++ b/src/world/area_hos/hos_10/intro.c @@ -164,7 +164,7 @@ EvtScript N(EVS_Scene_UnusedWhiteScreen) = { Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(EnableModel, MODEL_nagare, FALSE) Exec(N(EVS_Scene_Unused_Impl)) @@ -178,7 +178,7 @@ EvtScript N(EVS_Scene_RisingAboveClouds) = { Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Exec(N(EVS_Scene_Rising_Impl)) Return diff --git a/src/world/area_hos/hos_10/pre_title.c b/src/world/area_hos/hos_10/pre_title.c index 1a25853c585..181dd265979 100644 --- a/src/world/area_hos/hos_10/pre_title.c +++ b/src/world/area_hos/hos_10/pre_title.c @@ -17,7 +17,7 @@ EvtScript N(EVS_Scene_PreTitle) = { Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_2) TEX_PAN_PARAMS_STEP( 400, 0, 0, 0) diff --git a/src/world/area_hos/hos_20/starship.c b/src/world/area_hos/hos_20/starship.c index 6736e5729c9..cec33b7d827 100644 --- a/src/world/area_hos/hos_20/starship.c +++ b/src/world/area_hos/hos_20/starship.c @@ -76,7 +76,7 @@ EvtScript N(EVS_Starship_Flight1) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_Starship_PosX, -300) Set(MV_Starship_Yaw, 0) Exec(N(EVS_AnimateStarship)) @@ -148,7 +148,7 @@ EvtScript N(EVS_Starship_Flight2) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(PlaySound, SOUND_STARSHIP_ENGINE_LOOP) Set(MV_Starship_PosX, 0) Set(MV_Starship_Yaw, 0) @@ -184,7 +184,7 @@ EvtScript N(EVS_Starship_Return) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_Starship_PosX, 300) Set(MV_Starship_Yaw, 180) Exec(N(EVS_AnimateStarship)) diff --git a/src/world/area_isk/isk_03/sand.c b/src/world/area_isk/isk_03/sand.c index fcb47fd288f..e80c0dbfa40 100644 --- a/src/world/area_isk/isk_03/sand.c +++ b/src/world/area_isk/isk_03/sand.c @@ -26,7 +26,7 @@ EvtScript N(EVS_Camera_LookAtDrain) = { Call(SetCamPosB, CAM_DEFAULT, 566, -50) Call(SetCamPitch, CAM_DEFAULT, Float(13.6), Float(-1.5)) Call(SetPanTarget, CAM_DEFAULT, 429, 35, 278) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -46,7 +46,7 @@ EvtScript N(EVS_Camera_Reset) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_isk/isk_04/demo.c b/src/world/area_isk/isk_04/demo.c index 97dc933f770..bbeaa53b2bd 100644 --- a/src/world/area_isk/isk_04/demo.c +++ b/src/world/area_isk/isk_04/demo.c @@ -143,7 +143,7 @@ EvtScript N(EVS_SetupDemo) = { Call(SetCamPitch, CAM_DEFAULT, 12, -3) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, 25, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(1) Loop(0) diff --git a/src/world/area_isk/isk_05/npc.c b/src/world/area_isk/isk_05/npc.c index 96f49ca0794..ab375588b70 100644 --- a/src/world/area_isk/isk_05/npc.c +++ b/src/world/area_isk/isk_05/npc.c @@ -30,7 +30,7 @@ void N(func_80241610_97F0E0)(void) { if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } - guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); + guMtxF2L(cam->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/world/area_isk/isk_06/sand.c b/src/world/area_isk/isk_06/sand.c index 13a3a6da925..db92a6c614c 100644 --- a/src/world/area_isk/isk_06/sand.c +++ b/src/world/area_isk/isk_06/sand.c @@ -26,7 +26,7 @@ EvtScript N(EVS_Camera_LookAtDrain) = { Call(SetCamPosB, CAM_DEFAULT, 566, 0) Call(SetCamPitch, CAM_DEFAULT, Float(13.6), Float(-1.5)) Call(SetPanTarget, CAM_DEFAULT, 356, -95, -373) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -46,7 +46,7 @@ EvtScript N(EVS_Camera_Reset) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_isk/isk_07/ambush.c b/src/world/area_isk/isk_07/ambush.c index a96473bdc83..ab6f747c71d 100644 --- a/src/world/area_isk/isk_07/ambush.c +++ b/src/world/area_isk/isk_07/ambush.c @@ -39,7 +39,7 @@ EvtScript N(EVS_SetupSarcophagi) = { Call(UseSettingsFrom, CAM_DEFAULT, -151, -390, 576) Call(SetPanTarget, CAM_DEFAULT, -151, -390, 576) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_OpenSarcophagus1)) Wait(15) @@ -60,7 +60,7 @@ EvtScript N(EVS_SetupSarcophagi) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(AF_ISK07_MummiesReleased, TRUE) Call(DisablePlayerInput, FALSE) Else diff --git a/src/world/area_isk/isk_07/npc.c b/src/world/area_isk/isk_07/npc.c index 758d5338f59..01b058289da 100644 --- a/src/world/area_isk/isk_07/npc.c +++ b/src/world/area_isk/isk_07/npc.c @@ -49,7 +49,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { Call(UseSettingsFrom, CAM_DEFAULT, -251, -390, 553) Call(SetPanTarget, CAM_DEFAULT, -251, -390, 553) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(45) Call(MakeItemEntity, ITEM_RUINS_KEY, -250, -240, 545, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_ISK07_Item_RuinsKey) @@ -61,7 +61,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) Call(DisablePlayerInput, FALSE) EndIf diff --git a/src/world/area_isk/isk_07/stairs.c b/src/world/area_isk/isk_07/stairs.c index 0d6c3db9b01..80b35a99215 100644 --- a/src/world/area_isk/isk_07/stairs.c +++ b/src/world/area_isk/isk_07/stairs.c @@ -40,7 +40,7 @@ EvtScript N(EVS_FlipRedStairs) = { Call(UseSettingsFrom, CAM_DEFAULT, 369, -349, 369) Call(SetPanTarget, CAM_DEFAULT, 369, -349, 369) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) IfEq(MF_StairsFlipped, FALSE) ExecWait(N(EVS_RedStairs_FlipCCW)) @@ -53,7 +53,7 @@ EvtScript N(EVS_FlipRedStairs) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Set(AF_ISK07_FlippingRedStairs, FALSE) Return diff --git a/src/world/area_isk/isk_09/stairs.c b/src/world/area_isk/isk_09/stairs.c index 71b28eb5d41..806832bf8e6 100644 --- a/src/world/area_isk/isk_09/stairs.c +++ b/src/world/area_isk/isk_09/stairs.c @@ -121,7 +121,7 @@ EvtScript N(EVS_BlueStairs_FlipCCW) = { Call(UseSettingsFrom, CAM_DEFAULT, -522, -310, -95) Call(SetPanTarget, CAM_DEFAULT, -522, -377, -92) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_FlipStairsCCW_BottomBlue)) Call(ShakeCam, CAM_DEFAULT, 0, 3, Float(0.1)) @@ -132,7 +132,7 @@ EvtScript N(EVS_BlueStairs_FlipCCW) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End @@ -144,7 +144,7 @@ EvtScript N(EVS_BlueStairs_FlipCW) = { Call(UseSettingsFrom, CAM_DEFAULT, -522, -310, -95) Call(SetPanTarget, CAM_DEFAULT, -522, -377, -92) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_FlipStairsCW_BottomBlue)) Call(ShakeCam, CAM_DEFAULT, 0, 3, Float(0.1)) @@ -155,7 +155,7 @@ EvtScript N(EVS_BlueStairs_FlipCW) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End @@ -167,7 +167,7 @@ EvtScript N(EVS_RedStairs_FlipCCW) = { Call(UseSettingsFrom, CAM_DEFAULT, -408, -310, -347) Call(SetPanTarget, CAM_DEFAULT, -408, -377, -347) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_FlipStairsCCW_BottomRed)) Call(ShakeCam, CAM_DEFAULT, 0, 3, Float(0.1)) @@ -178,7 +178,7 @@ EvtScript N(EVS_RedStairs_FlipCCW) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End @@ -190,7 +190,7 @@ EvtScript N(EVS_RedStairs_FlipCW) = { Call(UseSettingsFrom, CAM_DEFAULT, -408, -310, -347) Call(SetPanTarget, CAM_DEFAULT, -408, -377, -347) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_FlipStairsCW_BottomRed)) Call(ShakeCam, CAM_DEFAULT, 0, 3, Float(0.1)) @@ -201,7 +201,7 @@ EvtScript N(EVS_RedStairs_FlipCW) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_isk/isk_10/entity.c b/src/world/area_isk/isk_10/entity.c index 6d1b4c01431..fc77a826ca4 100644 --- a/src/world/area_isk/isk_10/entity.c +++ b/src/world/area_isk/isk_10/entity.c @@ -33,10 +33,10 @@ EvtScript N(EVS_UseSpring) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPosC, CAM_DEFAULT, 0, -520) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerJumpscale, Float(1.4)) Call(PlayerJump, -561, -520, 23, 30) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.8)) EndIf Call(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_isk/isk_11/scene.c b/src/world/area_isk/isk_11/scene.c index 563787bab07..377b77ee7e3 100644 --- a/src/world/area_isk/isk_11/scene.c +++ b/src/world/area_isk/isk_11/scene.c @@ -174,7 +174,7 @@ EvtScript N(EVS_ManageSecretPassage) = { Call(SetCamDistance, CAM_DEFAULT, 140) Call(SetCamPitch, CAM_DEFAULT, Float(22.7), Float(-22.7)) Call(SetPanTarget, CAM_DEFAULT, 0, -520, 530) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableGroup, MODEL_15, TRUE) Call(EnableGroup, MODEL_g377, FALSE) Call(EnableModel, MODEL_o2205, FALSE) @@ -194,7 +194,7 @@ EvtScript N(EVS_ManageSecretPassage) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2186, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_isk/isk_12/sand.c b/src/world/area_isk/isk_12/sand.c index 0b1fbff736b..a09038a3466 100644 --- a/src/world/area_isk/isk_12/sand.c +++ b/src/world/area_isk/isk_12/sand.c @@ -26,7 +26,7 @@ EvtScript N(EVS_Camera_LookAtDrain) = { Call(SetCamPosB, CAM_DEFAULT, 566, 0) Call(SetCamPitch, CAM_DEFAULT, Float(13.6), Float(-1.5)) Call(SetPanTarget, CAM_DEFAULT, 525, -485, 152) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -46,7 +46,7 @@ EvtScript N(EVS_Camera_Reset) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_isk/isk_13/npc.c b/src/world/area_isk/isk_13/npc.c index 0f61985434c..aa9eb56f257 100644 --- a/src/world/area_isk/isk_13/npc.c +++ b/src/world/area_isk/isk_13/npc.c @@ -30,7 +30,7 @@ void N(func_80241610_990DF0)(void) { if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } - guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); + guMtxF2L(cam->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/world/area_isk/isk_14/npc.c b/src/world/area_isk/isk_14/npc.c index 7156e36a00c..ba7b56ec79a 100644 --- a/src/world/area_isk/isk_14/npc.c +++ b/src/world/area_isk/isk_14/npc.c @@ -30,7 +30,7 @@ void N(func_80241610_993D40)(void) { if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } - guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); + guMtxF2L(cam->mtxPerspective, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/world/area_isk/isk_16/boss.c b/src/world/area_isk/isk_16/boss.c index 1c4ca554816..6779f317946 100644 --- a/src/world/area_isk/isk_16/boss.c +++ b/src/world/area_isk/isk_16/boss.c @@ -13,7 +13,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetPanTarget, CAM_DEFAULT, 336, -910, 467) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerPos, 279, -910, 520) Call(GetCurrentPartnerID, LVar0) IfEq(LVar0, PARTNER_PARAKARRY) @@ -75,7 +75,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { Call(N(SetModelTintParams), ENV_TINT_SHROUD, 0, 0, 0, 0, 0, 0, 0, 0, 0) Call(SetCamDistance, CAM_DEFAULT, Float(530.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(30 * DT) Call(SetPlayerAnimation, ANIM_Mario1_LookUp) @@ -128,10 +128,10 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { Call(SetCamDistance, CAM_DEFAULT, Float(225.0)) Call(SetCamPitch, CAM_DEFAULT, Float(-7.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Talk, ANIM_Tutankoopa_Idle, 0, MSG_CH2_00E3) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(DisablePlayerInput, FALSE) Call(EnablePartnerAI) @@ -170,7 +170,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { Call(SetPanTarget, CAM_DEFAULT, 490, -910, 327) Call(SetCamDistance, CAM_DEFAULT, Float(200.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnableModel, MODEL_o2359, FALSE) ExecGetTID(N(EVS_PlayChompSounds), LVarA) @@ -183,7 +183,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableModel, MODEL_o2359, TRUE) Call(NpcFaceNpc, NPC_Tutankoopa_01, NPC_ChainChomp, 0) Call(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Hurt) @@ -192,7 +192,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { Call(NpcJump0, NPC_Tutankoopa_01, LVar0, LVar1, LVar2, 20 * DT) Call(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Idle) Call(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Talk, ANIM_Tutankoopa_Idle, 5, MSG_CH2_00E9) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Thread Call(SetNpcAnimation, NPC_ChainChomp, ANIM_ChainChomp_QuickBite) Call(SetNpcSpeed, NPC_ChainChomp, Float(8.0 / DT)) diff --git a/src/world/area_isk/isk_16/main.c b/src/world/area_isk/isk_16/main.c index 0d69908de13..7ec694ff8d1 100644 --- a/src/world/area_isk/isk_16/main.c +++ b/src/world/area_isk/isk_16/main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_SpawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, 408, -880, 414) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 1, 180, 408, -900, 414, 408, -825, 414, -880, -910) Thread Call(N(StarSpiritEffectFunc3)) @@ -55,7 +55,7 @@ EvtScript N(EVS_SpawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 1, 408, -880, 414, -910) diff --git a/src/world/area_iwa/iwa_04/npc.c b/src/world/area_iwa/iwa_04/npc.c index 70537ffed87..f02b13d77ca 100644 --- a/src/world/area_iwa/iwa_04/npc.c +++ b/src/world/area_iwa/iwa_04/npc.c @@ -94,12 +94,12 @@ EvtScript N(EVS_NpcAI_Buzzar) = { Call(UseSettingsFrom, CAM_DEFAULT, 430, 0, -25) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetPanTarget, CAM_DEFAULT, 30, 180, -600) Call(SetCamDistance, CAM_DEFAULT, Float(100.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_Buzzar_Anim05, ANIM_Buzzar_Anim05, 5, MSG_CH2_0031) Call(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim02) @@ -126,7 +126,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { Call(SetCamPosB, CAM_DEFAULT, 100, -100) Call(SetCamDistance, CAM_DEFAULT, 600) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -173,7 +173,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SpeakToPlayer, NPC_SELF, ANIM_Buzzar_Anim03, ANIM_Buzzar_Anim01, 0, MSG_CH2_0032) Call(AdjustCam, CAM_DEFAULT, Float(90.0), 50, 350, Float(15.0), Float(-12.0)) @@ -198,7 +198,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_SELF, LVarC, ANIM_Buzzar_Anim01, 0, LVarB) @@ -207,7 +207,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { Call(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim06) Wait(30 * DT) Call(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim02) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Call(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) Set(LVar5, LVar3) @@ -229,7 +229,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { Call(SetPlayerAnimation, ANIM_Mario1_Idle) Call(DisablePlayerInput, FALSE) Else - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Wait(5 * DT) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_iwa/iwa_10/train.c b/src/world/area_iwa/iwa_10/train.c index 2f76830ef6a..a53976fb7a2 100644 --- a/src/world/area_iwa/iwa_10/train.c +++ b/src/world/area_iwa/iwa_10/train.c @@ -408,7 +408,7 @@ EvtScript N(EVS_ArriveFromToadTown) = { Wait(20) Call(UseSettingsFrom, CAM_DEFAULT, -420, 20, 97) Call(SetPanTarget, CAM_DEFAULT, -420, 20, 97) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitk, COLLIDER_FLAGS_UPPER_MASK) Call(SetPlayerJumpscale, Float(1.0)) Call(SetPlayerActionState, ACTION_STATE_JUMP) @@ -430,7 +430,7 @@ EvtScript N(EVS_ArriveFromToadTown) = { Wait(20) Call(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_CH2_0000) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End @@ -503,11 +503,11 @@ EvtScript N(EVS_DepartForToadTown) = { Call(SetCamPosA, CAM_DEFAULT, Float(-538.5), Float(-60.0)) Call(SetCamPitch, CAM_DEFAULT, Float(0.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Sub(LVar0, 150) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_TrainToad_02, ANIM_TrainToad_Talk, ANIM_TrainToad_Still, 5, MSG_CH2_0003) Call(PlaySound, SOUND_TRAIN_DEPARTURE) @@ -521,7 +521,7 @@ EvtScript N(EVS_DepartForToadTown) = { EndLoop EndThread Wait(90) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) ExecGetTID(N(EVS_FollowTrainCamera), LVar9) Wait(130) Wait(100) @@ -533,7 +533,7 @@ EvtScript N(EVS_DepartForToadTown) = { EvtScript N(EVS_InitializeTrainScene) = { Call(EnableModel, MODEL_km, FALSE) - Call(SetModelFlags, MODEL_km, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_km, MODEL_FLAG_BILLBOARD, TRUE) Call(CloneModel, MODEL_km, CLONED_MODEL(0)) Call(CloneModel, MODEL_km, CLONED_MODEL(1)) Call(CloneModel, MODEL_km, CLONED_MODEL(2)) diff --git a/src/world/area_iwa/iwa_11/main.c b/src/world/area_iwa/iwa_11/main.c index 7ec61d11932..011550dce58 100644 --- a/src/world/area_iwa/iwa_11/main.c +++ b/src/world/area_iwa/iwa_11/main.c @@ -37,7 +37,7 @@ EvtScript N(EVS_Main) = { Call(SetCamPosB, CAM_DEFAULT, 5700, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliti, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitm, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_iwa/iwa_11/train.c b/src/world/area_iwa/iwa_11/train.c index d92145fd165..cf77229977d 100644 --- a/src/world/area_iwa/iwa_11/train.c +++ b/src/world/area_iwa/iwa_11/train.c @@ -386,7 +386,7 @@ EvtScript N(EVS_TravelToMtRugged) = { EvtScript N(EVS_InitializeTrainScene) = { Call(EnableModel, MODEL_km, FALSE) - Call(SetModelFlags, MODEL_km, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_km, MODEL_FLAG_BILLBOARD, TRUE) Call(CloneModel, MODEL_km, CLONED_MODEL(0)) Call(CloneModel, MODEL_km, CLONED_MODEL(1)) Call(CloneModel, MODEL_km, CLONED_MODEL(2)) diff --git a/src/world/area_jan/jan_00/npc.c b/src/world/area_jan/jan_00/npc.c index 52d3057b365..0d3bcae2d26 100644 --- a/src/world/area_jan/jan_00/npc.c +++ b/src/world/area_jan/jan_00/npc.c @@ -235,14 +235,14 @@ EvtScript N(D_80242DB0_B232F0) = { Call(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) IfEq(LVar0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Else Call(SetCamSpeed, CAM_DEFAULT, 1) EndIf Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, 1) Label(0) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -270,14 +270,14 @@ EvtScript N(D_80242FA8_B234E8) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.5)) Call(SetCamPosA, CAM_DEFAULT, Float(5.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60) Call(SetPanTarget, CAM_DEFAULT, 180, 0, 0) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.5)) Call(SetCamPosA, CAM_DEFAULT, Float(0.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.4)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Set(LVar0, 0) ExecGetTID(N(D_80242D90_B232D0), LVar3) @@ -388,7 +388,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_01) = { Call(SetPanTarget, CAM_DEFAULT, 250, 0, 200) Call(SetCamPosA, CAM_DEFAULT, Float(20.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(D_80242FA8_B234E8)) Return @@ -571,7 +571,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(SetCamPitch, CAM_DEFAULT, Float(22.5), Float(-12.5)) Call(SetCamPosA, CAM_DEFAULT, Float(23.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) Call(SetNpcSpeed, NPC_SELF, Float(4.0)) Call(NpcMoveTo, NPC_SELF, 80, 90, 0) @@ -579,7 +579,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(14.5), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.7)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) Call(SetNpcJumpscale, NPC_SELF, Float(1.0)) Call(StopSound, SOUND_LOOP_JR_TROOPA_SWIM) @@ -613,7 +613,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-10.0)) Call(SetCamPosA, CAM_DEFAULT, Float(24.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcJumpscale, NPC_SELF, Float(1.5)) Call(NpcJump0, NPC_SELF, 80, -50, 90, 20) Call(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, SOUND_SPACE_DEFAULT) diff --git a/src/world/area_jan/jan_01/npc.c b/src/world/area_jan/jan_01/npc.c index 8d2e3e2bd1b..a95c587e2e2 100644 --- a/src/world/area_jan/jan_01/npc.c +++ b/src/world/area_jan/jan_01/npc.c @@ -81,7 +81,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(DisableCameraLeadingPlayer)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) @@ -236,7 +236,7 @@ EvtScript N(EVS_NpcDefeat_JungleFuzzyBoss) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) Call(N(DisableCameraLeadingPlayer)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) Call(SetNpcSpeed, NPC_Kolorado, Float(3.0)) diff --git a/src/world/area_jan/jan_02/npc.c b/src/world/area_jan/jan_02/npc.c index b3c15973315..f767c29f9d8 100644 --- a/src/world/area_jan/jan_02/npc.c +++ b/src/world/area_jan/jan_02/npc.c @@ -42,7 +42,7 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(5 * DT) Call(PlayerMoveTo, 58, -140, 25) Call(PlayerFaceNpc, NPC_SELF, FALSE) @@ -63,7 +63,7 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { Add(LVar3, 25) Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) Call(func_802D2C14, 0) diff --git a/src/world/area_jan/jan_03/main.c b/src/world/area_jan/jan_03/main.c index 8891ffb32a1..9348c463c39 100644 --- a/src/world/area_jan/jan_03/main.c +++ b/src/world/area_jan/jan_03/main.c @@ -103,10 +103,10 @@ EvtScript N(EVS_Main) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread - Call(SetModelFlags, MODEL_o189, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o186, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o192, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_o195, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_o189, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o186, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o192, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_o195, MODEL_FLAG_BILLBOARD, TRUE) Exec(N(EVS_SetupShop)) Return End diff --git a/src/world/area_jan/jan_03/npc.c b/src/world/area_jan/jan_03/npc.c index ea3c19fe45a..8b91ed28335 100644 --- a/src/world/area_jan/jan_03/npc.c +++ b/src/world/area_jan/jan_03/npc.c @@ -168,7 +168,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, 361, -190) Call(SetCamPosC, CAM_DEFAULT, 0, -1) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetPlayerSpeed, Float(3.0)) Call(PlayerMoveTo, 361, -194, 0) @@ -189,7 +189,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_jan/jan_04/npc.c b/src/world/area_jan/jan_04/npc.c index e32d0c0310f..4de5e796e78 100644 --- a/src/world/area_jan/jan_04/npc.c +++ b/src/world/area_jan/jan_04/npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_ShakeTree_Sushie) = { #else Call(SetCamSpeed, CAM_DEFAULT, 3) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Sushie, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A1) Call(ResetCam, CAM_DEFAULT, Float(90.0)) @@ -102,13 +102,13 @@ EvtScript N(EVS_Sushie_ShoutAtChildren) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, 30, 140, -60) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, 16, Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Hurt, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A0) #if VERSION_PAL diff --git a/src/world/area_jan/jan_04/scenes.c b/src/world/area_jan/jan_04/scenes.c index 34657d24397..a804f4d2793 100644 --- a/src/world/area_jan/jan_04/scenes.c +++ b/src/world/area_jan/jan_04/scenes.c @@ -47,7 +47,7 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(90) Thread Call(SetNpcPos, NPC_YoshiKid_01, -350, 0, 15) diff --git a/src/world/area_jan/jan_04/treasure.c b/src/world/area_jan/jan_04/treasure.c index 04a5fed918b..c468d6204f2 100644 --- a/src/world/area_jan/jan_04/treasure.c +++ b/src/world/area_jan/jan_04/treasure.c @@ -74,7 +74,7 @@ EvtScript N(EVS_Scene_TreasureChest) = { Call(SetPanTarget, CAM_DEFAULT, -350, 300, 0) Call(SetCamPitch, CAM_DEFAULT, 10, Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeEntity, Ref(Entity_Chest), 0, 2650, 0, 148, MAKE_ENTITY_END) Set(LVarA, LVar0) @@ -102,12 +102,12 @@ EvtScript N(EVS_Scene_TreasureChest) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, 16, Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeEntity, Ref(Entity_Chest), 0, 2650, 0, 0, MAKE_ENTITY_END) Set(LVarA, LVar0) diff --git a/src/world/area_jan/jan_05/npc.c b/src/world/area_jan/jan_05/npc.c index 6b964a05ba1..97dfaaa3044 100644 --- a/src/world/area_jan/jan_05/npc.c +++ b/src/world/area_jan/jan_05/npc.c @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15) Call(GetCurrentPartnerID, LVar0) diff --git a/src/world/area_jan/jan_07/npc.c b/src/world/area_jan/jan_07/npc.c index 247c7a2b4e1..e0bcd3140b1 100644 --- a/src/world/area_jan/jan_07/npc.c +++ b/src/world/area_jan/jan_07/npc.c @@ -40,7 +40,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { Call(SetCamDistance, CAM_DEFAULT, 500) Call(SetCamPitch, CAM_DEFAULT, 16, Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, 3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Yellow_Cry, ANIM_YoshiKid_Yellow_Cry, 5, MSG_CH5_00B5) Wait(10) @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { Call(SetPanTarget, CAM_DEFAULT, -20, 0, 20) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(DisablePartnerAI, 0) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) @@ -175,7 +175,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { Call(UseSettingsFrom, CAM_DEFAULT, -60, 0, 20) Call(SetPanTarget, CAM_DEFAULT, -50, 0, 20) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Thread Call(InterpNpcYaw, NPC_PutridPiranha_01, 270, 0) @@ -258,7 +258,7 @@ EvtScript N(EVS_NpcDefeat_PutridPiranha) = { Call(SetPanTarget, CAM_DEFAULT, -20, 0, 20) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) diff --git a/src/world/area_jan/jan_09/bushes.c b/src/world/area_jan/jan_09/bushes.c index 2b22f60e6c1..b4ffb7645fa 100644 --- a/src/world/area_jan/jan_09/bushes.c +++ b/src/world/area_jan/jan_09/bushes.c @@ -157,14 +157,14 @@ EvtScript N(EVS_802440C0) = { EndLoop Call(UseSettingsFrom, CAM_DEFAULT, -25, 90, -330) Call(SetPanTarget, CAM_DEFAULT, -25, 90, -330) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerJumpscale, Float(0.296875)) Call(PlayerJump, -25, 90, -330, 60) Call(SetPlayerPos, -25, 90, -330) Call(SetCamTarget, CAM_DEFAULT, -25, 90, -330) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(100) Return End diff --git a/src/world/area_jan/jan_13/puzzle.c b/src/world/area_jan/jan_13/puzzle.c index a8929613214..16979969427 100644 --- a/src/world/area_jan/jan_13/puzzle.c +++ b/src/world/area_jan/jan_13/puzzle.c @@ -358,7 +358,7 @@ EvtScript N(EVS_ManagePuzzle) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Loop(3) Exec(N(EVS_BoulderTremble)) diff --git a/src/world/area_jan/jan_16/main.c b/src/world/area_jan/jan_16/main.c index 0012d3122e7..93f7ff0f489 100644 --- a/src/world/area_jan/jan_16/main.c +++ b/src/world/area_jan/jan_16/main.c @@ -61,7 +61,7 @@ EvtScript N(EVS_EnterFalling) = { Call(UseSettingsFrom, CAM_DEFAULT, 35, 100, 330) Call(SetPanTarget, CAM_DEFAULT, 35, 100, 330) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(GetPartnerInUse, LVar0) IfNe(LVar0, PARTNER_NONE) @@ -72,7 +72,7 @@ EvtScript N(EVS_EnterFalling) = { Wait(30) Call(SetPanTarget, CAM_DEFAULT, 35, 0, 330) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(DisablePlayerPhysics, FALSE) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) @@ -91,7 +91,7 @@ EvtScript N(EVS_EnterFalling) = { AddF(MV_Unk_0A, Float(-7.5)) Call(SetPanTarget, CAM_DEFAULT, 0, 190, 350) Call(SetCamSpeed, CAM_DEFAULT, Float(1.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetPlayerJumpscale, Float(2.0)) Call(PlaySoundAtPlayer, SOUND_SHAKE_TREE_LEAVES, SOUND_SPACE_DEFAULT) @@ -110,7 +110,7 @@ EvtScript N(EVS_EnterFalling) = { AddF(MV_Unk_0A, Float(-7.5)) Call(SetPanTarget, CAM_DEFAULT, -35, 0, 385) Call(SetCamSpeed, CAM_DEFAULT, Float(1.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcJumpscale, NPC_PARTNER, Float(2.0)) Call(NpcJump0, NPC_PARTNER, -10, 0, 395, 20) Call(EnablePartnerAI) diff --git a/src/world/area_jan/jan_16/npc.c b/src/world/area_jan/jan_16/npc.c index ca1d0905df1..1f1319ac056 100644 --- a/src/world/area_jan/jan_16/npc.c +++ b/src/world/area_jan/jan_16/npc.c @@ -26,7 +26,7 @@ EvtScript N(D_802412D4_B812D4) = { IfLt(GB_StoryProgress, STORY_CH5_REACHED_RAPHAELS_TREE) Call(EnableGroup, MODEL_g38, FALSE) Call(EnableGroup, MODEL_g54, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamType, CAM_DEFAULT, 1, FALSE) Call(UseSettingsFrom, CAM_DEFAULT, -269, 94, -8) Call(SetPanTarget, CAM_DEFAULT, -269, 94, -8) @@ -34,7 +34,7 @@ EvtScript N(D_802412D4_B812D4) = { Call(SetCamPitch, CAM_DEFAULT, 20, 0) Call(SetCamPosA, CAM_DEFAULT, -410, -85) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SetCamDistance, CAM_DEFAULT, 400) diff --git a/src/world/area_jan/jan_22/npc.c b/src/world/area_jan/jan_22/npc.c index df1acf7b24b..8edea24749b 100644 --- a/src/world/area_jan/jan_22/npc.c +++ b/src/world/area_jan/jan_22/npc.c @@ -217,7 +217,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(DisableCameraLeadingPlayer)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) @@ -342,7 +342,7 @@ EvtScript N(EVS_ManageRavens) = { Call(UseSettingsFrom, CAM_DEFAULT, 300, 250, 150) Call(SetPanTarget, CAM_DEFAULT, 300, 250, 150) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) // repeat the action with a time delay across the sudden camera cut Exec(N(EVS_GatherRavensNearRaphael)) Wait(10 * DT) @@ -386,7 +386,7 @@ EvtScript N(EVS_ManageRavens) = { Call(SetPanTarget, CAM_DEFAULT, 165, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, FALSE) Call(NpcMoveTo, NPC_Raven_04, 260, -20, 0) @@ -437,7 +437,7 @@ EvtScript N(EVS_ManageRavens) = { Call(UseSettingsFrom, CAM_DEFAULT, 300, 250, 150) Call(SetPanTarget, CAM_DEFAULT, 300, 250, 150) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(15 * DT) Call(PlaySoundAtNpc, NPC_Raven_05, SOUND_RAVEN_LEAP_A, SOUND_SPACE_DEFAULT) Call(SetNpcPos, NPC_Raven_05, 350, 0, 100) @@ -470,7 +470,7 @@ EvtScript N(EVS_ManageRavens) = { Call(SetPanTarget, CAM_DEFAULT, 165, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00CE) @@ -523,13 +523,13 @@ EvtScript N(EVS_ManageRavens) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EVT_GIVE_KEY_REWARD(ITEM_ULTRA_STONE) Wait(20 * DT) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-11.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00D1) Set(LVar0, NPC_Raven_02) @@ -739,7 +739,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(DisableCameraLeadingPlayer)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) @@ -945,7 +945,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_Before) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-11.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(40 * DT) Call(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_00C3) @@ -1134,7 +1134,7 @@ EvtScript N(EVS_NpcDefeat_SpearGuy) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(N(DisableCameraLeadingPlayer)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcFlagBits, NPC_Kolorado_01, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) Call(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Run) Call(SetNpcSpeed, NPC_Kolorado_01, Float(2.5 / DT)) @@ -1259,7 +1259,7 @@ EvtScript N(EVS_Scene_Misstar) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-11.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 0, MSG_CH5_00D4) Call(NpcFaceNpc, NPC_SELF, NPC_Kolorado_02, 1) Wait(10 * DT) @@ -1283,7 +1283,7 @@ EvtScript N(EVS_Scene_Misstar) = { Add(LVar0, 30) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpNpcYaw, NPC_Kolorado_02, 90, 10) ExecGetTID(N(EVS_PartnerFaceMisstar), LVar8) Call(SetNpcJumpscale, NPC_SELF, Float(0.5)) @@ -1412,7 +1412,7 @@ EvtScript N(EVS_NpcInit_Misstar) = { Call(SetPanTarget, CAM_DEFAULT, 700, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 500) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_Scene_Misstar))) Else Call(RemoveNpc, NPC_SELF) diff --git a/src/world/area_jan/jan_23/main.c b/src/world/area_jan/jan_23/main.c index 446146d30b2..aac73ec39cd 100644 --- a/src/world/area_jan/jan_23/main.c +++ b/src/world/area_jan/jan_23/main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_ExitFall_jan_16_4) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, 250, 100) Call(SetPanTarget, CAM_DEFAULT, LVar0, -100, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_Unk_05, -1) CaseDefault Wait(10) @@ -78,7 +78,7 @@ EvtScript N(EVS_ExitFall_jan_16_4) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, 250, 100) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndIf Wait(30) Call(GotoMap, Ref("jan_16"), jan_16_ENTRY_4) diff --git a/src/world/area_jan/jan_23/npc.c b/src/world/area_jan/jan_23/npc.c index 90a6f8afd5c..4646a7fd14f 100644 --- a/src/world/area_jan/jan_23/npc.c +++ b/src/world/area_jan/jan_23/npc.c @@ -236,7 +236,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { Call(SetCamDistance, CAM_DEFAULT, 460) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 0, MSG_CH5_00DA) @@ -259,11 +259,11 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { Loop(5) Call(PlaySoundAtNpc, NPC_SELF, SOUND_BIG_DRUM_A, SOUND_SPACE_DEFAULT) Call(SetCamDistance, CAM_DEFAULT, 310) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_BIG_DRUM_B, SOUND_SPACE_DEFAULT) Call(SetCamDistance, CAM_DEFAULT, 460) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndLoop Call(SetMotionBlurParams, 0, 0, 0, 320, 240, 0, 10) @@ -281,7 +281,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 580) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(InterpNpcYaw, NPC_SELF, 90, 1) Call(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Flail) @@ -381,7 +381,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, 535, 200, 215) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Thread Wait(20 * DT) @@ -534,7 +534,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { Call(SetCamDistance, CAM_DEFAULT, 580) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-4.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.8 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15 * DT) Call(ResetCam, CAM_DEFAULT, Float(2.0 * DT)) diff --git a/src/world/area_kgr/kgr_02/npc.c b/src/world/area_kgr/kgr_02/npc.c index 4c2b3b68395..861503a7135 100644 --- a/src/world/area_kgr/kgr_02/npc.c +++ b/src/world/area_kgr/kgr_02/npc.c @@ -194,7 +194,7 @@ EvtScript N(EVS_NpcDefeat_Fuzzipede) = { Call(UseSettingsFrom, CAM_DEFAULT, -5, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -5, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SpeakToPlayer, NPC_SELF, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04, 0, MSG_MAC_Port_009D) Wait(10) diff --git a/src/world/area_kkj/kkj_00/scene_ending.c b/src/world/area_kkj/kkj_00/scene_ending.c index 2ab6e731e91..3df695a34a4 100644 --- a/src/world/area_kkj/kkj_00/scene_ending.c +++ b/src/world/area_kkj/kkj_00/scene_ending.c @@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(UseSettingsFrom, CAM_DEFAULT, 50, 0, 250) Call(SetPanTarget, CAM_DEFAULT, 50, 0, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Exec(N(EVS_OpenAndCloseFrontDoor_Ending)) Call(func_802D1270, 0, 300, Float(4.0)) @@ -95,7 +95,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetPanTarget, CAM_DEFAULT, 0, 100, -290) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPitch, CAM_DEFAULT, 10, -7) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Call(SpeakToPlayer, NPC_ToadGuard_03, ANIM_ToadGuard_Red_Talk, ANIM_ToadGuard_Red_Idle, 5, MSG_Outro_0065) Call(InterpPlayerYaw, 0, 0) @@ -120,14 +120,14 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetCamDistance, CAM_DEFAULT, 550) Call(SetCamPitch, CAM_DEFAULT, 10, -7) Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(UseSettingsFrom, CAM_DEFAULT, 0, 100, -200) Call(SetPanTarget, CAM_DEFAULT, 0, 100, -200) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, 3, -11) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Call(SetMusicTrack, 0, SONG_PEACH_APPEARS, 1, 8) Call(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms) @@ -138,7 +138,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetPanTarget, CAM_DEFAULT, 50, 0, 250) Call(SetCamDistance, CAM_DEFAULT, 500) Call(SetCamPitch, CAM_DEFAULT, 3, -10) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Outro_0067) Wait(10) @@ -146,7 +146,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetPanTarget, CAM_DEFAULT, 0, 100, -200) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, 25, Float(-9.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpPlayerYaw, 90, 0) Wait(10) Call(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Outro_0068) @@ -158,7 +158,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetCamDistance, CAM_DEFAULT, Float(252.7)) Call(SetCamPitch, CAM_DEFAULT, 5, Float(-9.5)) Call(SetCamPosA, CAM_DEFAULT, 500, 100) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Call(ShowMessageAtWorldPos, MSG_Outro_0069, 0, 100, -200) Call(UseSettingsFrom, CAM_DEFAULT, 250, 0, 100) @@ -166,14 +166,14 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPitch, CAM_DEFAULT, 15, -1) Call(SetCamPosA, CAM_DEFAULT, -100, 100) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(ShowMessageAtWorldPos, MSG_Outro_006A, 0, 100, -200) Call(UseSettingsFrom, CAM_DEFAULT, -250, 0, 50) Call(SetPanTarget, CAM_DEFAULT, -250, 0, 50) Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, 15, -7) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(ShowMessageAtWorldPos, MSG_Outro_006B, 0, 100, -200) Call(UseSettingsFrom, CAM_DEFAULT, -150, 0, 360) @@ -181,7 +181,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, 25, -13) Call(SetCamPosA, CAM_DEFAULT, 820, -100) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(ShowMessageAtWorldPos, MSG_Outro_006C, 0, 100, -200) Wait(10) @@ -190,7 +190,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, 5, -10) Call(SetCamPosA, CAM_DEFAULT, -500, -1400) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms) Wait(10) @@ -210,7 +210,7 @@ EvtScript N(EVS_Scene_Ending) = { Call(SetCamPitch, CAM_DEFAULT, 30, -7) Call(SetCamPosA, CAM_DEFAULT, -120, 75) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(120) Call(N(FadeScreenToWhite)) Wait(60) diff --git a/src/world/area_kkj/kkj_03/scenes.c b/src/world/area_kkj/kkj_03/scenes.c index efb94f329e1..f4115db0411 100644 --- a/src/world/area_kkj/kkj_03/scenes.c +++ b/src/world/area_kkj/kkj_03/scenes.c @@ -109,7 +109,7 @@ EvtScript N(EVS_Scene_Ascending) = { Call(UseSettingsFrom, CAM_DEFAULT, 600, 0, -15) Call(SetPanTarget, CAM_DEFAULT, 600, 0, -15) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetPlayerJumpscale, 0) Loop(0) diff --git a/src/world/area_kkj/kkj_11/scene.c b/src/world/area_kkj/kkj_11/scene.c index ede3f18e3fd..4f7c1bc2b9d 100644 --- a/src/world/area_kkj/kkj_11/scene.c +++ b/src/world/area_kkj/kkj_11/scene.c @@ -34,14 +34,14 @@ EvtScript N(EVS_FirstTimeEnterHall) = { Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 444) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 444) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(1) Wait(30) Call(UseSettingsFrom, CAM_DEFAULT, -430, 0, 50) Call(SetPanTarget, CAM_DEFAULT, -430, 0, 50) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Set(AF_KKJ_06, TRUE) @@ -53,7 +53,7 @@ EvtScript N(EVS_FirstTimeEnterHall) = { EndThread Call(PlayerMoveTo, -430, 50, 30) Call(SetPlayerPos, -430, 0, 50) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(5) Call(EnablePartnerAI) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_13/intro_scenes.c b/src/world/area_kkj/kkj_13/intro_scenes.c index 97158678f41..b2d8b70e9f5 100644 --- a/src/world/area_kkj/kkj_13/intro_scenes.c +++ b/src/world/area_kkj/kkj_13/intro_scenes.c @@ -159,7 +159,7 @@ EvtScript N(EVS_FocusCam_Everyone) = { Call(UseSettingsFrom, CAM_DEFAULT, 720, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 720, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, LVar0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -171,7 +171,7 @@ EvtScript N(EVS_FocusCam_OnPeach) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -184,7 +184,7 @@ EvtScript N(EVS_FocusCam_OnBowser) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, LVar0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -199,7 +199,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(PlaySound, SOUND_LOOP_KKJ_RUMBLING) #if VERSION_PAL @@ -261,7 +261,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { Call(UseSettingsFrom, CAM_DEFAULT, 600, 0, -15) Call(SetPanTarget, CAM_DEFAULT, 600, 0, -15) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 * DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, 5, MSG_Intro_004F) Wait(30 * DT) @@ -351,7 +351,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SpeakToNpc, NPC_Peach, ANIM_Peach2_Shout, ANIM_Peach2_EndShout, 0, NPC_Bowser_Body, MSG_Intro_0051) Set(LVar0, Float(1.0)) ExecWait(N(EVS_FocusCam_OnBowser)) @@ -411,7 +411,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 5, MSG_Intro_005E) Wait(10 * DT) diff --git a/src/world/area_kkj/kkj_13/npcs_finale.c b/src/world/area_kkj/kkj_13/npcs_finale.c index 0da8b71604e..c2537df5e54 100644 --- a/src/world/area_kkj/kkj_13/npcs_finale.c +++ b/src/world/area_kkj/kkj_13/npcs_finale.c @@ -45,7 +45,7 @@ EvtScript N(EVS_MoveToBattlePositions) = { Call(UseSettingsFrom, CAM_DEFAULT, 600, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 600, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Thread Wait(20) @@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_MarioConfrontsBowser) = { Call(SetCamDistance, CAM_DEFAULT, 600) Call(SetCamPosA, CAM_DEFAULT, Float(85.0), Float(-3.5)) Call(SetCamPosB, CAM_DEFAULT, Float(210.0), Float(240.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60) Call(EnableNpcShadow, NPC_Bowser_Body, TRUE) Thread @@ -109,7 +109,7 @@ EvtScript N(EVS_Scene_MarioConfrontsBowser) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPosA, CAM_DEFAULT, Float(72.5), Float(-25.0)) Call(SetCamPosB, CAM_DEFAULT, Float(210.0), Float(240.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarTalk, ANIM_WorldBowser_ClownCarIdle, 0, MSG_CH8_0070) @@ -122,7 +122,7 @@ EvtScript N(EVS_Scene_MarioConfrontsBowser) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamPosA, CAM_DEFAULT, Float(72.0), Float(0.0)) Call(SetCamPosB, CAM_DEFAULT, Float(170.0), Float(240.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Call(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach2_TiedHangStruggle, ANIM_Peach2_TiedHangIdle, 0, MSG_CH8_0071) Wait(20) diff --git a/src/world/area_kkj/kkj_14/chapter0.c b/src/world/area_kkj/kkj_14/chapter0.c index 709f9de9ba1..5e07f6994ab 100644 --- a/src/world/area_kkj/kkj_14/chapter0.c +++ b/src/world/area_kkj/kkj_14/chapter0.c @@ -215,7 +215,7 @@ EvtScript N(EVS_Scene_Chapter0) = { Call(SetCamPosA, CAM_DEFAULT, 338, 44) Call(SetCamPosB, CAM_DEFAULT, 413, -66) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Wait(10 * DT) @@ -277,14 +277,14 @@ EvtScript N(EVS_Scene_Chapter0) = { Call(func_802D1270, 420, 0, Float(2.0 / DT)) EndThread Wait(10 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(30 * DT) Call(UseSettingsFrom, CAM_DEFAULT, 370, 30, 0) Call(SetPanTarget, CAM_DEFAULT, 370, 30, 0) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPosB, CAM_DEFAULT, Float(370.0), Float(32.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Loop(0) Wait(1) @@ -374,7 +374,7 @@ EvtScript N(EVS_Scene_Chapter0) = { Call(SetCamDistance, CAM_DEFAULT, Float(200.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-12.5)) Call(SetPanTarget, CAM_DEFAULT, 365, 30, 17) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(NpcFlyTo, NPC_PARTNER, 350, 50, -2, 30 * DT, -5, EASING_LINEAR) EndThread diff --git a/src/world/area_kkj/kkj_14/chapter1.c b/src/world/area_kkj/kkj_14/chapter1.c index a83405f2251..b235da0f4f1 100644 --- a/src/world/area_kkj/kkj_14/chapter1.c +++ b/src/world/area_kkj/kkj_14/chapter1.c @@ -40,7 +40,7 @@ EvtScript N(EVS_Scene_Chapter1) = { Wait(10 * DT) Call(SetPlayerAnimation, ANIM_Peach1_Idle) Call(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0038) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_14/chapter2.c b/src/world/area_kkj/kkj_14/chapter2.c index 5cdae201b79..637628d9110 100644 --- a/src/world/area_kkj/kkj_14/chapter2.c +++ b/src/world/area_kkj/kkj_14/chapter2.c @@ -73,7 +73,7 @@ EvtScript N(EVS_FocusCam_Door_Ch2) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-310.0), Float(32.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; diff --git a/src/world/area_kkj/kkj_14/chapter5.c b/src/world/area_kkj/kkj_14/chapter5.c index ba0aa02d478..64430fadc33 100644 --- a/src/world/area_kkj/kkj_14/chapter5.c +++ b/src/world/area_kkj/kkj_14/chapter5.c @@ -10,13 +10,13 @@ EvtScript N(EVS_Scene_Chapter5) = { Call(UseSettingsFrom, CAM_DEFAULT, -140, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -140, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.6 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Loop(2) diff --git a/src/world/area_kkj/kkj_14/chapter6.c b/src/world/area_kkj/kkj_14/chapter6.c index d5852c91c3e..8dcb25daada 100644 --- a/src/world/area_kkj/kkj_14/chapter6.c +++ b/src/world/area_kkj/kkj_14/chapter6.c @@ -10,7 +10,7 @@ EvtScript N(EVS_Scene_Chapter6) = { Call(UseSettingsFrom, CAM_DEFAULT, -100, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -100, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) diff --git a/src/world/area_kkj/kkj_14/chapter7.c b/src/world/area_kkj/kkj_14/chapter7.c index c2186cdfe10..276a9717d56 100644 --- a/src/world/area_kkj/kkj_14/chapter7.c +++ b/src/world/area_kkj/kkj_14/chapter7.c @@ -237,7 +237,7 @@ EvtScript N(EVS_FocusCam_Door_Ch7) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-13.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-310.0), Float(32.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -248,7 +248,7 @@ EvtScript N(EVS_FocusCam_Bed) = { Call(SetPanTarget, CAM_DEFAULT, 380, 30, 10) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -296,7 +296,7 @@ EvtScript N(EVS_Scene_Chapter7) = { Call(SetCamDistance, CAM_DEFAULT, Float(325.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0162) Call(InterpPlayerYaw, 90, 5) @@ -328,7 +328,7 @@ EvtScript N(EVS_Scene_Chapter7) = { Call(SetPanTarget, CAM_DEFAULT, 250, 30, 10) Call(SetCamDistance, CAM_DEFAULT, Float(325.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SetNpcPos, NPC_Ch7_Kammy, 50, 0, -10) Call(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim03) @@ -348,7 +348,7 @@ EvtScript N(EVS_Scene_Chapter7) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(InterpNpcYaw, NPC_Ch7_Bowser, 270, 10) @@ -430,7 +430,7 @@ EvtScript N(EVS_Scene_Chapter7) = { ExecWait(N(EVS_CarryPeachAway)) Wait(30 * DT) ExecWait(N(EVS_EndPeachChapter7)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_14/interactables.c b/src/world/area_kkj/kkj_14/interactables.c index 413efa0486b..ab84e63a68f 100644 --- a/src/world/area_kkj/kkj_14/interactables.c +++ b/src/world/area_kkj/kkj_14/interactables.c @@ -371,7 +371,7 @@ EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = { Call(SetPanTarget, CAM_DEFAULT, -120, 25, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndIf ExecWait(N(EVS_OpenHiddenPassage)) diff --git a/src/world/area_kkj/kkj_14/npc_guards.c b/src/world/area_kkj/kkj_14/npc_guards.c index 0fa8f42ebac..18a0b6aa398 100644 --- a/src/world/area_kkj/kkj_14/npc_guards.c +++ b/src/world/area_kkj/kkj_14/npc_guards.c @@ -38,7 +38,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { Call(UseSettingsFrom, CAM_DEFAULT, -300, 0, -30) Call(SetPanTarget, CAM_DEFAULT, -300, 0, -30) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_kkj/kkj_15/chapter0.c b/src/world/area_kkj/kkj_15/chapter0.c index df0ddcd3b50..e696de65706 100644 --- a/src/world/area_kkj/kkj_15/chapter0.c +++ b/src/world/area_kkj/kkj_15/chapter0.c @@ -33,7 +33,7 @@ EvtScript N(EVS_FocusCam_WholeRoom) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -45,7 +45,7 @@ EvtScript N(EVS_FocusCam_BowserWide) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-13.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -57,7 +57,7 @@ EvtScript N(EVS_FocusCam_KoopaBros) = { Call(SetCamDistance, CAM_DEFAULT, Float(240.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -102,7 +102,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { Call(UseSettingsFrom, CAM_DEFAULT, 237, 0, -74) Call(SetPanTarget, CAM_DEFAULT, 237, 0, -74) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Exec(N(EVS_OpenDoor_Ch0)) @@ -237,7 +237,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { Call(SetCamDistance, CAM_DEFAULT, Float(240.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(15) Thread Call(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) @@ -304,7 +304,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { Call(SetCamDistance, CAM_DEFAULT, Float(200.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-18.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.2 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(40 * DT) ExecGetTID(N(EVS_PlaySounds_KoopaBrosShowOff), LVarB) Call(N(SetLightSourcePos), 100, 0, -40) @@ -405,7 +405,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EndThread Wait(30 * DT) ExecWait(N(EVS_EndPeachChapter0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Return diff --git a/src/world/area_kkj/kkj_15/chapter1.c b/src/world/area_kkj/kkj_15/chapter1.c index 3375dbde50c..67559fe7639 100644 --- a/src/world/area_kkj/kkj_15/chapter1.c +++ b/src/world/area_kkj/kkj_15/chapter1.c @@ -154,7 +154,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPosA, CAM_DEFAULT, -180, -20) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) Call(SetPlayerPos, -164, 0, -53) @@ -251,7 +251,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { Call(SetPanTarget, CAM_DEFAULT, 240, 0, 37) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPosB, CAM_DEFAULT, 134, -20) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(5 * DT) Call(SetNpcPos, NPC_Bowser, -100, 0, -70) Call(SetNpcYaw, NPC_Bowser, 90) @@ -329,7 +329,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { Wait(30 * DT) Call(FadeOutMusic, 0, 1000 * DT) ExecWait(N(EVS_EndPeachChapter1)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_15/chapter3.c b/src/world/area_kkj/kkj_15/chapter3.c index 73f03703047..00eacf59a44 100644 --- a/src/world/area_kkj/kkj_15/chapter3.c +++ b/src/world/area_kkj/kkj_15/chapter3.c @@ -162,13 +162,13 @@ EvtScript N(EVS_Scene_Chapter3) = { Call(SetPanTarget, CAM_DEFAULT, -50, 0, -20) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Call(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0082) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetPanTarget, CAM_DEFAULT, -50, 0, -20) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0083) Thread @@ -337,7 +337,7 @@ EvtScript N(EVS_Scene_Chapter3) = { Wait(30 * DT) Call(FadeOutMusic, 0, 1000 * DT) ExecWait(N(EVS_EndPeachChapter3)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_15/rotating_wall.c b/src/world/area_kkj/kkj_15/rotating_wall.c index dfe436e4c27..9ca83bd54d9 100644 --- a/src/world/area_kkj/kkj_15/rotating_wall.c +++ b/src/world/area_kkj/kkj_15/rotating_wall.c @@ -82,9 +82,9 @@ EvtScript N(EVS_RotatingWall_Default) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetPanTarget, CAM_DEFAULT, 50, 10, -35) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) ExecWait(N(EVS_AnimateRotatingWall_Default)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; @@ -95,7 +95,7 @@ EvtScript N(EVS_RotatingWall_FirstTime) = { Call(SetPanTarget, CAM_DEFAULT, 50, 35, -35) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetPanTarget, CAM_DEFAULT, 50, 10, -35) @@ -109,7 +109,7 @@ EvtScript N(EVS_RotatingWall_FirstTime) = { EndThread ExecWait(N(EVS_AnimateRotatingWall_Default)) Call(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0049) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_kkj/kkj_16/stealth.c b/src/world/area_kkj/kkj_16/stealth.c index 8d72ee358d5..60a65b619d1 100644 --- a/src/world/area_kkj/kkj_16/stealth.c +++ b/src/world/area_kkj/kkj_16/stealth.c @@ -189,7 +189,7 @@ EvtScript N(EVS_ManageSneakingScenes) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-10.5)) Call(SetCamPosA, CAM_DEFAULT, -775, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_PLAYER, ANIM_BattleBow_Talk, ANIM_Peach1_Idle, 5, MSG_Peach_0077) Call(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_0078) diff --git a/src/world/area_kkj/kkj_18/gourmet.c b/src/world/area_kkj/kkj_18/gourmet.c index 0795d04c497..2ae5170dfd1 100644 --- a/src/world/area_kkj/kkj_18/gourmet.c +++ b/src/world/area_kkj/kkj_18/gourmet.c @@ -24,7 +24,7 @@ API_CALLABLE(N(SpinCameraAround)) { } script->functionTempF[0] += 10.0f; - guRotateF(camera->viewMtxShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f); + guRotateF(camera->mtxViewShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f); if (script->functionTempF[0] >= 360.0) { return ApiStatus_DONE2; @@ -251,19 +251,19 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { Call(SetCamPitch, CAM_DEFAULT, 12, Float(-2.5)) Call(SetCamPosB, CAM_DEFAULT, Float(110.0), Float(45.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(20.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_SHOCK_1, SOUND_SPACE_DEFAULT) Wait(33 * DT) Call(SetCamDistance, CAM_DEFAULT, Float(65.0)) Call(SetCamPitch, CAM_DEFAULT, Float(7.5), Float(-1.3)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_SHOCK_2, SOUND_SPACE_DEFAULT) Wait(33 * DT) Call(SetCamDistance, CAM_DEFAULT, Float(1.0)) Call(SetCamPitch, CAM_DEFAULT, Float(3.5), 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_SHOCK_3, SOUND_SPACE_DEFAULT) Wait(18 * DT) @@ -273,10 +273,10 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { Call(SetCamSpeed, CAM_DEFAULT, Float(12.0)) Loop(7) Call(SetCamDistance, CAM_DEFAULT, 65) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, 1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndLoop Call(N(SpinCameraAround)) @@ -286,7 +286,7 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { Call(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) Call(SetPanTarget, CAM_DEFAULT, 120, 0, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -384,7 +384,7 @@ EvtScript N(EVS_RejectCake) = { Call(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) Call(SetPanTarget, CAM_DEFAULT, 120, 0, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Switch(AB_KKJ_CompletedBakeStep) CaseEq(CAKE_TYPE_BAKED) @@ -483,7 +483,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { Call(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) Call(SetPanTarget, CAM_DEFAULT, 120, 0, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A3) Call(ResetCam, CAM_DEFAULT, Float(90.0)) @@ -512,7 +512,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { Call(SetCamPitch, CAM_DEFAULT, 17, -14) Call(SetCamPosB, CAM_DEFAULT, Float(110.0), Float(45.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(GetNpcVar, NPC_GourmetGuy, 7, LVarA) Call(RemoveItemEntity, LVarA) @@ -600,7 +600,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-110.0), Float(45.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) Call(MakeLerp, 0, -120, 14, EASING_QUADRATIC_OUT) diff --git a/src/world/area_kkj/kkj_19/baking.c b/src/world/area_kkj/kkj_19/baking.c index 4888d649cab..e4797ebc4dd 100644 --- a/src/world/area_kkj/kkj_19/baking.c +++ b/src/world/area_kkj/kkj_19/baking.c @@ -692,7 +692,7 @@ EvtScript N(EVS_FocusCam_Twink) = { Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-4.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -710,7 +710,7 @@ EvtScript N(EVS_FocusCam_PeachAndTwink) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -722,7 +722,7 @@ EvtScript N(EVS_FocusCam_Oven) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-13.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -733,7 +733,7 @@ EvtScript N(EVS_FocusCam_Table) = { Call(SetPanTarget, CAM_DEFAULT, 330, 0, -80) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End diff --git a/src/world/area_kkj/kkj_20/npc.c b/src/world/area_kkj/kkj_20/npc.c index 8cf91ae8291..984fd0cf700 100644 --- a/src/world/area_kkj/kkj_20/npc.c +++ b/src/world/area_kkj/kkj_20/npc.c @@ -145,7 +145,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, Float(30.0), Float(-85.0)) Call(SetCamPosC, CAM_DEFAULT, 0, Float(-50.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlayerMoveTo, 95, -87, 0) Call(InterpPlayerYaw, 229, 1) @@ -164,7 +164,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndThread Return @@ -269,7 +269,7 @@ EvtScript N(EVS_Inspect_Dresser_Mario) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(func_802D1270, -50, 0, Float(2.5)) Call(InterpPlayerYaw, 90, 5) Call(func_802CF56C, 2) diff --git a/src/world/area_kkj/kkj_23/scene.c b/src/world/area_kkj/kkj_23/scene.c index 4b422c73f70..7d0d2f1cf10 100644 --- a/src/world/area_kkj/kkj_23/scene.c +++ b/src/world/area_kkj/kkj_23/scene.c @@ -244,7 +244,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_014F) diff --git a/src/world/area_kkj/kkj_25/arena.c b/src/world/area_kkj/kkj_25/arena.c index 8a1057c8925..edc977aeb11 100644 --- a/src/world/area_kkj/kkj_25/arena.c +++ b/src/world/area_kkj/kkj_25/arena.c @@ -169,7 +169,7 @@ EvtScript N(EVS_Scene_BowserTrapsMario) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_007D) @@ -181,7 +181,7 @@ EvtScript N(EVS_Scene_BowserTrapsMario) = { Call(SetCamPosA, CAM_DEFAULT, -480, -480) Call(SetCamPosB, CAM_DEFAULT, 0, 480) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -299,7 +299,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { Call(SetCamPosA, CAM_DEFAULT, -480, -480) Call(SetCamPosB, CAM_DEFAULT, 0, 480) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Thread Call(InterpPlayerYaw, 270, 0) @@ -326,7 +326,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { Call(SetCamDistance, CAM_DEFAULT, 330) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 0, MSG_CH8_007E) Thread @@ -348,7 +348,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle) Wait(10) @@ -389,7 +389,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Shock) Call(GetNpcPos, NPC_Bowser_01, LVar3, LVar4, LVar5) @@ -430,7 +430,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { Call(SetCamDistance, CAM_DEFAULT, 500) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(8) Loop(4) diff --git a/src/world/area_kkj/kkj_25/bowser_defeated.c b/src/world/area_kkj/kkj_25/bowser_defeated.c index c9da3a254fd..22073acc071 100644 --- a/src/world/area_kkj/kkj_25/bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/bowser_defeated.c @@ -286,14 +286,14 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamPosA, CAM_DEFAULT, 0, 30) Call(SetCamPosB, CAM_DEFAULT, 0, 20) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Thread Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVar0, MV_OrbitingEffectAIdx) Call(N(DismissStarsOrbitingBowser)) @@ -364,7 +364,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(NpcMoveTo, NPC_Twink_02, 230, 30, 85) Wait(10) @@ -389,7 +389,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(3.0), Float(-1.5)) Call(SetCamDistance, CAM_DEFAULT, 750) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(40) Call(PlaySoundAt, SOUND_KPA_ARENA_EXPLODING, SOUND_SPACE_DEFAULT, 220, -43, 350) PlayEffect(EFFECT_RING_BLAST, 0, 220, -43, 350, Float(8.0), 40) @@ -402,7 +402,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-10.5)) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Peach_02, ANIM_Peach2_GaspStill) Call(SetNpcAnimation, NPC_Twink_02, ANIM_Twink_Cringe) Call(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock) @@ -431,7 +431,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(6.0), Float(5.0)) Call(SetCamDistance, CAM_DEFAULT, 1100) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(10) Call(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Walk) @@ -447,7 +447,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-10.5)) Call(SetCamDistance, CAM_DEFAULT, 350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToNpc, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, NPC_Kammy_05, MSG_CH8_00AE) Wait(5) @@ -497,7 +497,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(0.0), Float(-7.0)) Call(SetCamDistance, CAM_DEFAULT, 1100) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Idle) Call(InterpNpcYaw, NPC_Kammy_05, 90, 0) Wait(5) diff --git a/src/world/area_kkj/kkj_25/kammy_defeated.c b/src/world/area_kkj/kkj_25/kammy_defeated.c index 0128cade533..9853e6dc1cc 100644 --- a/src/world/area_kkj/kkj_25/kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kammy_defeated.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.5)) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetNpcPos, NPC_Kammy_04, LVar0, LVar1, LVar2) Add(LVar1, 30) Set(LVar3, 20) @@ -121,7 +121,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 245) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) Add(LVar1, 10) @@ -141,7 +141,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVar0, MV_OrbitingEffectBIdx) Call(N(DismissStarsOrbitingKammy2)) Wait(20) @@ -261,7 +261,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_00A2) Wait(10) @@ -272,7 +272,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A4) @@ -384,7 +384,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SpeakToPlayer, NPC_Bowser_02, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_00A5) EndThread diff --git a/src/world/area_kkj/kkj_25/npc_initial.c b/src/world/area_kkj/kkj_25/npc_initial.c index a60a7e1159a..f0398f3ac6a 100644 --- a/src/world/area_kkj/kkj_25/npc_initial.c +++ b/src/world/area_kkj/kkj_25/npc_initial.c @@ -27,7 +27,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE) Call(StopSound, SOUND_LRAW_KPA_ARENA_TURN_ON) diff --git a/src/world/area_kkj/kkj_25/npc_midpoint.c b/src/world/area_kkj/kkj_25/npc_midpoint.c index 309660592df..f2d497ad5c4 100644 --- a/src/world/area_kkj/kkj_25/npc_midpoint.c +++ b/src/world/area_kkj/kkj_25/npc_midpoint.c @@ -29,7 +29,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamDistance, CAM_DEFAULT, 1000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(StartBossBattle, SONG_FINAL_BOWSER_BATTLE) Goto(0) diff --git a/src/world/area_kkj/kkj_25/peach_free.c b/src/world/area_kkj/kkj_25/peach_free.c index e5492999c89..eb1fde80247 100644 --- a/src/world/area_kkj/kkj_25/peach_free.c +++ b/src/world/area_kkj/kkj_25/peach_free.c @@ -87,19 +87,19 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = { Call(SetCamPosA, CAM_DEFAULT, 0, 30) Call(SetCamPosB, CAM_DEFAULT, 0, 20) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30) Call(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Peach_01, ANIM_Peach3_TiedShout, ANIM_Peach2_TiedIdle, 0, MSG_CH8_008E) @@ -111,7 +111,7 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(NpcMoveTo, NPC_Kammy_01, 520, -50, 15) Thread Wait(10) diff --git a/src/world/area_kkj/kkj_26/demo.c b/src/world/area_kkj/kkj_26/demo.c index d42f833f4ca..bd92b9d8ab2 100644 --- a/src/world/area_kkj/kkj_26/demo.c +++ b/src/world/area_kkj/kkj_26/demo.c @@ -8,7 +8,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.5), Float(-10.0)) Call(SetCamPosB, CAM_DEFAULT, Float(570.0), 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60) Call(DemoJoystickXY, 10, 0) Wait(40) diff --git a/src/world/area_kkj/kkj_26/scenes.c b/src/world/area_kkj/kkj_26/scenes.c index b531ecb4c9e..a907c6c773f 100644 --- a/src/world/area_kkj/kkj_26/scenes.c +++ b/src/world/area_kkj/kkj_26/scenes.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Scene_WhereIsMario) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.5), Float(-10.0)) Call(SetCamPosB, CAM_DEFAULT, Float(570.0), 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(50) Call(func_802D1270, 550, -20, Float(2.0)) Wait(30) @@ -46,7 +46,7 @@ EvtScript N(EVS_Scene_AfterAllSpiritsRescued) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPlayerAnimation, ANIM_Peach2_RaiseArms) Wait(10 * DT) diff --git a/src/world/area_kkj/kkj_29/quiz.c b/src/world/area_kkj/kkj_29/quiz.c index c6eb73bc7b7..7b8d63e4b60 100644 --- a/src/world/area_kkj/kkj_29/quiz.c +++ b/src/world/area_kkj/kkj_29/quiz.c @@ -48,7 +48,7 @@ EvtScript N(EVS_SetCam_Contestants) = { Call(SetPanTarget, CAM_DEFAULT, -265, 0, -140) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -128,7 +128,7 @@ EvtScript N(EVS_WaitForBuzzIn) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-12.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -936,7 +936,7 @@ EvtScript N(EVS_ManageQuizGame) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_01, MSG_Peach_00F0) Call(InterpNpcYaw, NPC_Koopatrol_01, 270, 0) @@ -984,7 +984,7 @@ EvtScript N(EVS_ManageQuizGame) = { #else Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Angry) Call(LoadPath, 100 * DT, Ref(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) ExecWait(N(EVS_TwinkFollowPath)) @@ -1021,7 +1021,7 @@ EvtScript N(EVS_ManageQuizGame) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-370.0), Float(40.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 1, 8) Call(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F8) @@ -1161,7 +1161,7 @@ EvtScript N(EVS_ManageQuizGame) = { EndLoop Call(SetPanTarget, CAM_DEFAULT, -190, 0, 70) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(InterpPlayerYaw, 270, 0) Call(InterpNpcYaw, NPC_PARTNER, 270, 0) diff --git a/src/world/area_kmr/kmr_00/revival.c b/src/world/area_kmr/kmr_00/revival.c index ce1d9776efb..33d947ca5d9 100644 --- a/src/world/area_kmr/kmr_00/revival.c +++ b/src/world/area_kmr/kmr_00/revival.c @@ -272,7 +272,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { Call(SetCamDistance, CAM_DEFAULT, -540) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetPanTarget, CAM_DEFAULT, 0, 15, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(func_802D4D14, 180) Call(SetPlayerPos, 0, 2, 0) @@ -280,7 +280,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { Wait(60 * DT) Call(SetCamSpeed, CAM_DEFAULT, Float(0.7 / DT)) Call(SetCamDistance, CAM_DEFAULT, -350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(2) SetF(LVar0, 0) @@ -385,7 +385,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { #endif Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(SetCamDistance, CAM_DEFAULT, -200) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeft) Call(NpcFlyTo, NPC_Kalmar, 20, 10, -5, 25 * DT, -10, EASING_QUADRATIC_OUT) @@ -433,7 +433,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { Wait(40 * DT) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(SetCamDistance, CAM_DEFAULT, -350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(3) Call(N(func_80240530_8AC4C0), NPC_Kalmar) Wait(4) diff --git a/src/world/area_kmr/kmr_02/kammy.c b/src/world/area_kmr/kmr_02/kammy.c index 9f6388fc6b6..5f495bf8c20 100644 --- a/src/world/area_kmr/kmr_02/kammy.c +++ b/src/world/area_kmr/kmr_02/kammy.c @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosC, CAM_DEFAULT, 0, Float(109.7)) Call(SetCamDistance, CAM_DEFAULT, 1220) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerAnimation, ANIM_Mario1_LookUp) Call(LoadPath, 120 * DT, Ref(N(FlightPath_ToGate1)), ARRAY_COUNT(N(FlightPath_ToGate1)), EASING_LINEAR) Label(20) @@ -130,7 +130,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 440) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(PlayerFaceNpc, NPC_Kammy, FALSE) Call(GetAngleBetweenNPCs, NPC_Goompapa, NPC_Kammy, LVar0) Call(InterpNpcYaw, NPC_Goompapa, LVar0, 0) @@ -191,7 +191,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_LookUpTalk, ANIM_Goombaria_LookUp, 5, MSG_CH0_005B) Call(SetCamType, CAM_DEFAULT, 4, FALSE) Call(SetCamPitch, CAM_DEFAULT, Float(6.0), Float(-6.0)) @@ -200,7 +200,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosC, CAM_DEFAULT, 0, Float(60.0)) Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005C) Call(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LookUp) @@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosB, CAM_DEFAULT, Float(398.9), Float(242.7)) Call(SetCamPosC, CAM_DEFAULT, 0, Float(10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) Wait(10 * DT) Call(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) @@ -260,7 +260,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosC, CAM_DEFAULT, 0, Float(60.0)) Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(5 * DT) Call(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005D) Call(SetCamType, CAM_DEFAULT, 4, FALSE) @@ -270,7 +270,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { Call(SetCamPosC, CAM_DEFAULT, 0, Float(109.7)) Call(SetCamDistance, CAM_DEFAULT, 1220) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Loop(150 * DT) Call(PlayerFaceNpc, NPC_Kammy, FALSE) diff --git a/src/world/area_kmr/kmr_02/npc.c b/src/world/area_kmr/kmr_02/npc.c index c0bc0645354..43d72871967 100644 --- a/src/world/area_kmr/kmr_02/npc.c +++ b/src/world/area_kmr/kmr_02/npc.c @@ -431,7 +431,7 @@ EvtScript N(EVS_ReturnToVillage) = { Call(SetPanTarget, CAM_DEFAULT, -189, 0, -40) Call(SetCamDistance, CAM_DEFAULT, -350) Call(SetCamSpeed, CAM_DEFAULT, Float(1.3 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetNpcSpeed, NPC_Goombario, Float(4.0 / DT)) Call(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) @@ -466,7 +466,7 @@ EvtScript N(EVS_ReturnToVillage) = { Call(SetCamDistance, CAM_DEFAULT, -350) Call(SetCamSpeed, CAM_DEFAULT, Float(0.4 / DT)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-6.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(30 * DT) Call(SetPlayerSpeed, Float(3.0 / DT)) @@ -525,7 +525,7 @@ EvtScript N(EVS_ReturnToVillage) = { Call(SetCamDistance, CAM_DEFAULT, Float(-350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Wait(30 * DT) @@ -774,7 +774,7 @@ EvtScript N(EVS_KootFavorCheck_Goompa) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2)) Call(SetPanTarget, CAM_DEFAULT, 297, LVar1, -84) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(GetNpcPos, NPC_Goompa, LVar0, LVar1, LVar2) Call(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -789,9 +789,9 @@ EvtScript N(EVS_KootFavorCheck_Goompa) = { Wait(20) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Call(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Walk) Call(NpcMoveTo, NPC_Goompa, 344, -113, 0) @@ -860,7 +860,7 @@ EvtScript N(EVS_NpcInteract_Goompa) = { Call(SetPanTarget, CAM_DEFAULT, 499, 70, -378) Call(SetCamDistance, CAM_DEFAULT, 370) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 * DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(GF_KMR02_Met_Goompa, TRUE) Set(GB_StoryProgress, STORY_CH0_MET_GOOMPA) Call(SetNpcPos, NPC_Goombaria, 215, 0, 215) @@ -1434,7 +1434,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { Call(SetCamDistance, CAM_DEFAULT, Float(-375.0)) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(func_80242BA8_8B2C18)) Call(N(func_8024295C_8B29CC), 0, 0, 0, 255, 0) Call(N(func_80242F08_8B2F78)) @@ -1493,7 +1493,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { Call(SetCamPitch, CAM_DEFAULT, Float(30.0), Float(-22.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) Call(SetCamPosB, CAM_DEFAULT, Float(-160.0), Float(-310.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Eldstar_02, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_CH0_0009) Call(MakeLerp, 120, 60, 20 * DT, EASING_LINEAR) @@ -1512,7 +1512,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPosB, CAM_DEFAULT, Float(-190.0), Float(-310.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Thread @@ -1639,7 +1639,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { Call(SetCamDistance, CAM_DEFAULT, Float(-375.0)) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPlayerAnimation, ANIM_Mario1_Jump) Call(SetPlayerJumpscale, Float(2.0)) @@ -2107,7 +2107,7 @@ EvtScript N(EVS_NpcIdle_Eldstar_Epilogue) = { Call(SetCamDistance, CAM_DEFAULT, Float(-300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-6.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(30) Call(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_Outro_0010) @@ -2148,7 +2148,7 @@ EvtScript N(EVS_NpcIdle_Eldstar_Epilogue) = { Call(SetCamDistance, CAM_DEFAULT, Float(-300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-6.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) IfEq(LVar1, 1) Goto(10) @@ -2175,7 +2175,7 @@ EvtScript N(EVS_NpcInit_Eldstar_Epilogue) = { Call(UseSettingsFrom, CAM_DEFAULT, 60, 0, 10) Call(SetPanTarget, CAM_DEFAULT, 60, 0, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcPos, NPC_Goombario, 11, 0, 63) Call(SetNpcPos, NPC_Goombaria, 84, 0, 69) Call(SetNpcPos, NPC_Parakarry, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_kmr/kmr_02/rooms_1.c b/src/world/area_kmr/kmr_02/rooms_1.c index 4f72835768f..883ffc5874c 100644 --- a/src/world/area_kmr/kmr_02/rooms_1.c +++ b/src/world/area_kmr/kmr_02/rooms_1.c @@ -101,7 +101,7 @@ EvtScript N(EVS_SetWallRot_Verdana) = { EvtScript N(EVS_RoomListener_Verdana) = { Switch(LVar0) CaseEq(ROOM_UPDATE_ENTER_BEGIN) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) CaseEq(ROOM_UPDATE_ENTER_DONE) Wait(30 * DT) Call(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) @@ -118,7 +118,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { Call(SetPanTarget, CAM_DEFAULT, 499, 70, -378) Call(SetCamDistance, CAM_DEFAULT, 370) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Switch(GB_StoryProgress) CaseLt(STORY_CH0_GATE_CRUSHED) CaseLt(STORY_CH0_FELL_OFF_CLIFF) @@ -267,7 +267,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, Float(-262.4), Float(-324.6)) Call(SetCamPosC, CAM_DEFAULT, 1, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetPlayerSpeed, Float(3.0)) Call(PlayerMoveTo, -212, -376, 0) @@ -287,7 +287,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_kmr/kmr_02/rooms_2.c b/src/world/area_kmr/kmr_02/rooms_2.c index 1c1d049dc95..ae2f37400a9 100644 --- a/src/world/area_kmr/kmr_02/rooms_2.c +++ b/src/world/area_kmr/kmr_02/rooms_2.c @@ -31,7 +31,7 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) CaseEq(ROOM_UPDATE_EXIT_END) Call(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_o422, TRUE) diff --git a/src/world/area_kmr/kmr_03/fall_down.c b/src/world/area_kmr/kmr_03/fall_down.c index 9f71d1fd159..b48a38926c8 100644 --- a/src/world/area_kmr/kmr_03/fall_down.c +++ b/src/world/area_kmr/kmr_03/fall_down.c @@ -6,7 +6,7 @@ EvtScript N(EVS_Scene_FallingDown) = { Call(SetPanTarget, CAM_DEFAULT, -270, 20, -80) Call(SetCamDistance, CAM_DEFAULT, Float(700.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) IfGe(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) Call(SetPlayerPos, NPC_DISPOSE_LOCATION) Call(DisablePlayerInput, TRUE) @@ -17,9 +17,9 @@ EvtScript N(EVS_Scene_FallingDown) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return EndIf @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_FallingDown) = { Wait(30 * DT) Call(SetCamDistance, CAM_DEFAULT, 220) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(18 * DT) @@ -61,7 +61,7 @@ EvtScript N(EVS_Scene_FallingDown) = { Wait(20 * DT) Call(SetPanTarget, CAM_DEFAULT, -310, 20, -80) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetPlayerImgFXFlags, IMGFX_FLAG_2000 | IMGFX_FLAG_800) Call(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_FLUTTER_DOWN, 1, 1, 0) @@ -81,9 +81,9 @@ EvtScript N(EVS_Scene_FallingDown) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Wait(30 * DT) Call(DisablePlayerPhysics, FALSE) diff --git a/src/world/area_kmr/kmr_03/npc.c b/src/world/area_kmr/kmr_03/npc.c index 52192d303ec..d4931f654e1 100644 --- a/src/world/area_kmr/kmr_03/npc.c +++ b/src/world/area_kmr/kmr_03/npc.c @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcAI_Goompa) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.5)) Call(SetCamDistance, CAM_DEFAULT, 275) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(20 * DT) Call(SetPlayerSpeed, Float(2.0)) @@ -99,9 +99,9 @@ EvtScript N(EVS_NpcAI_Goompa) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerInput, FALSE) Wait(1) diff --git a/src/world/area_kmr/kmr_04/npc.c b/src/world/area_kmr/kmr_04/npc.c index 25bed3bad42..dad9b7f797a 100644 --- a/src/world/area_kmr/kmr_04/npc.c +++ b/src/world/area_kmr/kmr_04/npc.c @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(SetNpcPos, NPC_JrTroopa, 630, 0, 0) @@ -181,9 +181,9 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, 430, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Call(StartBossBattle, SONG_JR_TROOPA_BATTLE) EndSwitch @@ -209,7 +209,7 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_SELF, FALSE) Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Hurt) diff --git a/src/world/area_kmr/kmr_07/npc.c b/src/world/area_kmr/kmr_07/npc.c index 5cec3017234..893fb43ffc4 100644 --- a/src/world/area_kmr/kmr_07/npc.c +++ b/src/world/area_kmr/kmr_07/npc.c @@ -48,7 +48,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Thread Call(SetNpcSpeed, NPC_GoombaBros_Red, Float(6.0 / DT)) @@ -76,7 +76,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-3.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Talk, ANIM_GoombaBros_Red_Idle, 0, MSG_CH0_00BD) Wait(10 * DT) @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { Wait(15 * DT) Call(SetPlayerAnimation, ANIM_Mario1_Idle) Wait(5 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(StartBossBattle, SONG_SPECIAL_BATTLE) Return diff --git a/src/world/area_kmr/kmr_11/kammy.c b/src/world/area_kmr/kmr_11/kammy.c index 0851de833b3..b56dc3e44ab 100644 --- a/src/world/area_kmr/kmr_11/kammy.c +++ b/src/world/area_kmr/kmr_11/kammy.c @@ -18,19 +18,19 @@ EvtScript N(EVS_Scene_KammyWatching) = { Call(SetCamPosB, CAM_DEFAULT, -24, -256) Call(SetCamPitch, CAM_DEFAULT, 8, -5) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60 * DT) Call(UseSettingsFrom, CAM_DEFAULT, 100, 0, -220) Call(SetPanTarget, CAM_DEFAULT, 100, 190, -353) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Call(UseSettingsFrom, CAM_DEFAULT, 100, 0, -220) Call(SetPanTarget, CAM_DEFAULT, 100, 190, -353) Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamSpeed, CAM_DEFAULT, Float(0.65 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Thread Call(GetNpcPos, NPC_Kammy, LVar7, LVar8, LVar9) diff --git a/src/world/area_kmr/kmr_11/npc.c b/src/world/area_kmr/kmr_11/npc.c index 62d2789116e..40c51fd2aec 100644 --- a/src/world/area_kmr/kmr_11/npc.c +++ b/src/world/area_kmr/kmr_11/npc.c @@ -70,7 +70,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(N(SetCameraVFov), 25) Call(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Walk, ANIM_GoombaKing_Idle, 0, MSG_CH0_00D1) diff --git a/src/world/area_kmr/kmr_11/scenes.c b/src/world/area_kmr/kmr_11/scenes.c index 191495ecfe7..60a1d9d9c22 100644 --- a/src/world/area_kmr/kmr_11/scenes.c +++ b/src/world/area_kmr/kmr_11/scenes.c @@ -44,7 +44,7 @@ EvtScript N(EVS_GoombaKingBlastoff) = { }; EvtScript N(EVS_FocusCam_FortressExterior) = { - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamType, CAM_DEFAULT, 4, FALSE) Call(SetCamPitch, CAM_DEFAULT, -7, 0) Call(SetCamPosA, CAM_DEFAULT, -1208, 881) @@ -56,7 +56,7 @@ EvtScript N(EVS_FocusCam_FortressExterior) = { }; EvtScript N(EVS_FocusCam_BesidePlayer) = { - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamType, CAM_DEFAULT, 4, FALSE) Call(SetCamPitch, CAM_DEFAULT, -15, 25) Call(SetCamPosA, CAM_DEFAULT, -1208, 881) @@ -68,7 +68,7 @@ EvtScript N(EVS_FocusCam_BesidePlayer) = { }; EvtScript N(EVS_FocusCam_Battlement) = { - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamType, CAM_DEFAULT, 4, FALSE) Call(SetCamPitch, CAM_DEFAULT, -7, 2) Call(SetCamPosA, CAM_DEFAULT, -1681, 511) @@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { Call(SetCamPosB, CAM_DEFAULT, -469, 156) Call(SetPanTarget, CAM_DEFAULT, -389, 120, -12) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 * DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcPos, NPC_GoombaKing, -380, 0, -42) Wait(20 * DT) @@ -230,7 +230,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { ExecGetTID(N(EVS_RandomQuaking), LVarA) Call(SetCamSpeed, CAM_DEFAULT, Float(0.7)) Call(UseSettingsFrom, CAM_DEFAULT, 0, -100, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60 * DT) Call(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Idle, ANIM_GoombaKing_Idle, 0, MSG_CH0_00D9) Loop(100) @@ -265,9 +265,9 @@ EvtScript N(EVS_Scene_SelfDestruct) = { Exec(N(EVS_FortressCollapse_PlayFX)) Exec(N(EVS_FortressCollapse_PlayerReactions)) Wait(380) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(UseSettingsFrom, CAM_DEFAULT, 0, -150, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Exec(N(EVS_GoombaKingBlastoff)) Exec(N(EVS_PlayBridgeAnimation)) @@ -278,7 +278,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { Call(EnableModel, MODEL_eye_mask, FALSE) Call(DeleteAnimatedModel, 1) Call(DeleteAnimatedModel, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_SetupMusic)) Call(DisablePartnerAI, 0) @@ -431,24 +431,24 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EndThread ExecWait(N(EVS_FocusCam_Battlement)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(55 * DT) Call(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Idle, ANIM_GoombaKing_Idle, 0, MSG_CH0_00C6) Call(SpeakToPlayer, NPC_RedGoombaBro, ANIM_GoombaBros_Red_Walk, ANIM_GoombaBros_Red_Idle, 0, MSG_CH0_00C7) Call(SpeakToPlayer, NPC_BlueGoombaBro, ANIM_GoombaBros_Blue_Walk, ANIM_GoombaBros_Blue_Idle, 0, MSG_CH0_00C8) ExecWait(N(EVS_FocusCam_BesidePlayer)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePartnerAI, 0) Wait(5 * DT) Call(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_00C9) Call(DisablePartnerAI, 0) ExecWait(N(EVS_FocusCam_Battlement)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(5 * DT) Call(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Idle, ANIM_GoombaKing_Idle, 0, MSG_CH0_00CA) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(30 * DT) Call(SetNpcVar, NPC_GoombaKing, 0, 1) Return @@ -459,7 +459,7 @@ EvtScript N(EVS_Scene_MeetGoombaKing) = { Call(N(SetCameraVFov), 32) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Exec(N(EVS_Scene_MeetGoombaKing_Impl)) Return End diff --git a/src/world/area_kmr/kmr_20/bed.c b/src/world/area_kmr/kmr_20/bed.c index 8a3acb38ac7..269bd250c70 100644 --- a/src/world/area_kmr/kmr_20/bed.c +++ b/src/world/area_kmr/kmr_20/bed.c @@ -43,7 +43,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, -109, -76) Call(SetCamPosC, CAM_DEFAULT, 0, 120) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableGroup, MODEL_o170, FALSE) Call(EnableGroup, MODEL_o172, FALSE) Call(EnableGroup, MODEL_o175, FALSE) @@ -79,7 +79,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnableGroup, MODEL_o170, TRUE) Call(EnableGroup, MODEL_o172, TRUE) Call(EnableGroup, MODEL_o175, TRUE) diff --git a/src/world/area_kmr/kmr_20/npc.c b/src/world/area_kmr/kmr_20/npc.c index 60c4fb890d9..10ef2d759ff 100644 --- a/src/world/area_kmr/kmr_20/npc.c +++ b/src/world/area_kmr/kmr_20/npc.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { Call(SetPanTarget, CAM_DEFAULT, 495, 0, -115) Call(SetCamDistance, CAM_DEFAULT, Float(620.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) Add(LVar1, 25) @@ -106,7 +106,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(80) Call(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 5, MSG_CH0_00DB) Wait(20) @@ -118,7 +118,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { Call(SetPanTarget, CAM_DEFAULT, 495, 0, -115) Call(SetCamDistance, CAM_DEFAULT, Float(620.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(20) Set(MF_ReadyForPlayerEntry, TRUE) @@ -162,13 +162,13 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { Call(SetPanTarget, CAM_DEFAULT, 495, 0, -115) Call(SetCamDistance, CAM_DEFAULT, Float(620.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(15) Call(UseSettingsFrom, CAM_DEFAULT, 564, 0, -176) Call(SetPanTarget, CAM_DEFAULT, 556, 0, -158) Call(SetCamDistance, CAM_DEFAULT, Float(270.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(40) Call(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DD) Call(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) @@ -213,7 +213,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { Call(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_FLYING, TRUE) Call(EnablePartnerAI) Call(SetCamSpeed, CAM_DEFAULT, Float(3.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(15) Call(DisablePlayerInput, FALSE) Return @@ -340,7 +340,7 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(25) Call(SpeakToPlayer, NPC_Luigi_0, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00E9) @@ -386,9 +386,9 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_kmr/kmr_20/npc_epilogue.c b/src/world/area_kmr/kmr_20/npc_epilogue.c index 9d3950d91ea..b7f64838842 100644 --- a/src/world/area_kmr/kmr_20/npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/npc_epilogue.c @@ -196,7 +196,7 @@ EvtScript N(EVS_Scene_BeginEpilogue) = { Call(SetPanTarget, CAM_DEFAULT, 150, 44, -40) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30) Call(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_000D) Call(SetPlayerAnimation, ANIM_MarioW2_SitNodYes) @@ -218,7 +218,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { Call(SetPanTarget, CAM_DEFAULT, 150, 44, -40) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(35) Call(PlaySoundAt, SOUNC_CHECK_MAILBOX, SOUND_SPACE_DEFAULT, 430, 0, -185) Wait(25) @@ -280,7 +280,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { Call(UseSettingsFrom, CAM_DEFAULT, 340, 30, -70) Call(SetPanTarget, CAM_DEFAULT, 340, 30, -70) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerPos, 240, 30, -75) Call(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) Call(SetNpcPos, NPC_Luigi_1, 200, 30, -75) @@ -302,7 +302,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { KillThread(LVarA) EndThread Call(func_802D1270, 320, -70, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(func_802D1270, 460, -70, Float(3.0)) Call(func_802D1270, 570, -170, Float(3.0)) Call(SetPlayerJumpscale, Float(1.0)) diff --git a/src/world/area_kmr/kmr_20/npc_intro.c b/src/world/area_kmr/kmr_20/npc_intro.c index 7d1355f51f1..c35635f6abe 100644 --- a/src/world/area_kmr/kmr_20/npc_intro.c +++ b/src/world/area_kmr/kmr_20/npc_intro.c @@ -117,7 +117,7 @@ EvtScript N(EVS_Luigi_EnterPipe_Intro) = { EvtScript N(EVS_FocusCam_Unused) = { Call(UseSettingsFrom, CAM_DEFAULT, 250, 30, -80) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(func_80241CF0_8EDB10), Float(1.8)) Call(InterpCamTargetPos, 0, 1, 250, 30, -80, 10) Call(N(func_80241CF0_8EDB10), 1) @@ -211,11 +211,11 @@ EvtScript N(EVS_Scene_BeginGame) = { Call(SetCamDistance, CAM_DEFAULT, 550) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-14.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamSpeed, CAM_DEFAULT, Float(0.7)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(10 * DT) Call(MakeLerp, 0, 70, 60 * DT, EASING_LINEAR) @@ -350,7 +350,7 @@ EvtScript N(EVS_Scene_BeginGame) = { Call(UseSettingsFrom, CAM_DEFAULT, 250, 30, -80) Call(SetPanTarget, CAM_DEFAULT, 250, 30, -80) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(SetAmbienceVolumeHalf_Intro)) Exec(N(EVS_OpenAndCloseDoor_Intro_Impl)) Wait(10) @@ -401,7 +401,7 @@ EvtScript N(EVS_Scene_SettingOff) = { Call(UseSettingsFrom, CAM_DEFAULT, 320, 30, -70) Call(SetPanTarget, CAM_DEFAULT, 320, 30, -70) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60 * DT) Call(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 8) Exec(N(EVS_OpenAndCloseDoor_Intro)) @@ -417,7 +417,7 @@ EvtScript N(EVS_Scene_SettingOff) = { KillThread(LVarA) EndThread Call(func_802D1270, 320, -70, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(func_802D1270, 460, -70, Float(3.0 / DT)) Call(func_802D1270, 570, -170, Float(3.0 / DT)) Call(SetPlayerJumpscale, Float(1.0)) diff --git a/src/world/area_kmr/kmr_20/records.c b/src/world/area_kmr/kmr_20/records.c index f7af7ed0ca2..fff70ba9494 100644 --- a/src/world/area_kmr/kmr_20/records.c +++ b/src/world/area_kmr/kmr_20/records.c @@ -309,14 +309,14 @@ EvtScript N(EVS_Inspect_Records) = { Call(SetPanTarget, CAM_DEFAULT, LVarA, 30, LVarC) Call(SetCamDistance, CAM_DEFAULT, Float(320.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(N(ShowGameRecords)) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(DisablePlayerPhysics, FALSE) Return diff --git a/src/world/area_kmr/kmr_21/main.c b/src/world/area_kmr/kmr_21/main.c index dd03ec989fc..022a3b89487 100644 --- a/src/world/area_kmr/kmr_21/main.c +++ b/src/world/area_kmr/kmr_21/main.c @@ -175,7 +175,7 @@ EvtScript N(EVS_Main) = { Call(SetCamPosC, CAM_DEFAULT, 0, 65) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePlayerInput, TRUE) Call(DisablePlayerPhysics, TRUE) Wait(1) diff --git a/src/world/area_kmr/kmr_22/main.c b/src/world/area_kmr/kmr_22/main.c index f28bf6483cb..476fc4985dd 100644 --- a/src/world/area_kmr/kmr_22/main.c +++ b/src/world/area_kmr/kmr_22/main.c @@ -170,7 +170,7 @@ EvtScript N(EVS_Main) = { Call(SetCamPosC, CAM_DEFAULT, 0, 65) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(kmr_22_ENTRY_1) diff --git a/src/world/area_kmr/kmr_23/main.c b/src/world/area_kmr/kmr_23/main.c index 444fb13bac5..5c39ace49cd 100644 --- a/src/world/area_kmr/kmr_23/main.c +++ b/src/world/area_kmr/kmr_23/main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Main) = { Call(SetCamPosC, CAM_DEFAULT, 0, 65) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(kmr_23_ENTRY_0) diff --git a/src/world/area_kmr/kmr_24/main.c b/src/world/area_kmr/kmr_24/main.c index 0b2c4366954..25a4bc70e0d 100644 --- a/src/world/area_kmr/kmr_24/main.c +++ b/src/world/area_kmr/kmr_24/main.c @@ -86,7 +86,7 @@ EvtScript N(EVS_Main) = { Call(SetCamPosC, CAM_DEFAULT, 0, 65) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePlayerInput, TRUE) Call(DisablePlayerPhysics, TRUE) Wait(1) diff --git a/src/world/area_kmr/kmr_30/the_end.c b/src/world/area_kmr/kmr_30/the_end.c index 2594a96bf10..9283df7e956 100644 --- a/src/world/area_kmr/kmr_30/the_end.c +++ b/src/world/area_kmr/kmr_30/the_end.c @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_TheEnd) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(8.0), Float(-11.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetNpcSpeed, NPC_ParadePeach, Float(2.0)) Call(SetNpcFlagBits, NPC_ParadePeach, NPC_FLAG_GRAVITY, TRUE) diff --git a/src/world/area_kpa/kpa_134/chains.c b/src/world/area_kpa/kpa_134/chains.c index 190ff0ff1d1..8882937bc5d 100644 --- a/src/world/area_kpa/kpa_134/chains.c +++ b/src/world/area_kpa/kpa_134/chains.c @@ -127,11 +127,11 @@ EvtScript N(EVS_LowerWaterLevel0) = { Call(ShakeCam, CAM_DEFAULT, 0, 120, Float(1.0)) EndThread Thread - Call(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) + Call(GrabCamera, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) Call(MakeLerp, LVar6, 600, 20, EASING_LINEAR) Label(10) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) Wait(1) IfEq(LVar1, 1) Goto(10) @@ -141,7 +141,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { Call(MakeLerp, LVar7, -20, 20, EASING_LINEAR) Label(15) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) Wait(1) IfEq(LVar1, 1) Goto(15) @@ -170,7 +170,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { Wait(10) Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Thread @@ -192,11 +192,11 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EndThread Thread Wait(60) - Call(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) + Call(GrabCamera, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) Call(MakeLerp, LVar6, 600, 20, EASING_LINEAR) Label(10) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) Wait(1) IfEq(LVar1, 1) Goto(10) @@ -206,7 +206,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { Call(MakeLerp, LVar7, -20, 20, EASING_LINEAR) Label(15) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) Wait(1) IfEq(LVar1, 1) Goto(15) @@ -274,7 +274,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { Wait(230) Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) @@ -376,11 +376,11 @@ EvtScript N(EVS_LowerWaterLevel1) = { Call(EnableModel, MODEL_s_sui, FALSE) Call(EnableModel, MODEL_o385, TRUE) Thread - Call(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) + Call(GrabCamera, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) Call(MakeLerp, LVar6, 600, 20, EASING_LINEAR) Label(10) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) Wait(1) IfEq(LVar1, 1) Goto(10) @@ -390,7 +390,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { Call(MakeLerp, LVar7, -20, 20, EASING_LINEAR) Label(15) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) Wait(1) IfEq(LVar1, 1) Goto(15) @@ -412,7 +412,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { Wait(10) Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Thread @@ -436,11 +436,11 @@ EvtScript N(EVS_RaiseWaterLevel2) = { Call(EnableModel, MODEL_o385, FALSE) Thread Wait(60) - Call(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) + Call(GrabCamera, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) Call(MakeLerp, LVar6, 600, 20, EASING_LINEAR) Label(10) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar0, LVar7) Wait(1) IfEq(LVar1, 1) Goto(10) @@ -450,7 +450,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { Call(MakeLerp, LVar7, -20, 20, EASING_LINEAR) Label(15) Call(UpdateLerp) - Call(func_802CABE8, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) + Call(SetInterpCamParams, CAM_DEFAULT, LVar4, LVar5, LVar2, LVar0) Wait(1) IfEq(LVar1, 1) Goto(15) @@ -517,7 +517,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { Wait(230) Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Thread diff --git a/src/world/area_kpa/kpa_134/panels.c b/src/world/area_kpa/kpa_134/panels.c index a9b71c1dabc..564ed96c0af 100644 --- a/src/world/area_kpa/kpa_134/panels.c +++ b/src/world/area_kpa/kpa_134/panels.c @@ -24,7 +24,7 @@ EvtScript N(EVS_FocusCam_Wall) = { Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.5), Float(-8.0)) Call(SetPanTarget, CAM_DEFAULT, LVar6, LVar7, LVar8) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -78,7 +78,7 @@ EvtScript N(EVS_FlipWallPanels) = { Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GF_KPA134_BlueSwitch, TRUE) Call(DisablePlayerInput, FALSE) Unbind diff --git a/src/world/area_kpa/kpa_14/main.c b/src/world/area_kpa/kpa_14/main.c index 91a821a5726..02bff3e8132 100644 --- a/src/world/area_kpa/kpa_14/main.c +++ b/src/world/area_kpa/kpa_14/main.c @@ -156,7 +156,7 @@ EvtScript N(EVS_SetupLavaFall) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar5, 30, -135) Call(SetPanTarget, CAM_DEFAULT, LVar5, 30, -135) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(MakeLerp, LVar0, LVar5, 30, EASING_LINEAR) Loop(0) Call(UpdateLerp) @@ -198,7 +198,7 @@ EvtScript N(EVS_SetupLavaFall) = { Wait(5) Call(SetPlayerAnimation, ANIM_Mario1_Idle) Call(DisablePlayerPhysics, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Wait(1) Set(MV_TakingLavaFallDamage, FALSE) diff --git a/src/world/area_kpa/kpa_16/npc.c b/src/world/area_kpa/kpa_16/npc.c index d695e46621d..4612bf97910 100644 --- a/src/world/area_kpa/kpa_16/npc.c +++ b/src/world/area_kpa/kpa_16/npc.c @@ -44,7 +44,7 @@ EvtScript N(EVS_Scene_LavaShutoff) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) Call(SetPanTarget, CAM_DEFAULT, 330, 230, -150) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetPanTarget, CAM_DEFAULT, 330, 170, -150) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) @@ -178,7 +178,7 @@ EvtScript N(EVS_NpcIdle_Guards) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetPlayerSpeed, Float(3.0 / DT)) diff --git a/src/world/area_kpa/kpa_17/npc.c b/src/world/area_kpa/kpa_17/npc.c index 8fbacd97e11..948f9e2d069 100644 --- a/src/world/area_kpa/kpa_17/npc.c +++ b/src/world/area_kpa/kpa_17/npc.c @@ -8,7 +8,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { Call(UseSettingsFrom, CAM_DEFAULT, 1042, 30, -496) Call(SetPanTarget, CAM_DEFAULT, 1042, 30, -496) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(DisablePlayerInput, TRUE) Call(DisablePlayerPhysics, TRUE) @@ -54,7 +54,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { Call(SetPlayerAnimation, ANIM_Mario1_Idle) Wait(10) Call(DisablePlayerPhysics, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(ClearPartnerMoveHistory, NPC_PARTNER) Call(func_802CF56C, 0) diff --git a/src/world/area_kpa/kpa_60/scenes.c b/src/world/area_kpa/kpa_60/scenes.c index 520ea9c64ef..20b38aef584 100644 --- a/src/world/area_kpa/kpa_60/scenes.c +++ b/src/world/area_kpa/kpa_60/scenes.c @@ -36,7 +36,7 @@ EvtScript N(EVS_Scene_Arrival) = { Call(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0) Call(SetPanTarget, CAM_DEFAULT, 0, -70, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(PlaySound, SOUND_STARSHIP_FLY_AWAY) Call(LoadPath, 45, Ref(N(FlightPath_Arrival)), ARRAY_COUNT(N(FlightPath_Arrival)), EASING_LINEAR) Label(90) @@ -86,7 +86,7 @@ EvtScript N(EVS_Scene_Departure) = { Call(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0) Call(SetPanTarget, CAM_DEFAULT, 0, -70, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(PlaySound, SOUND_STARSHIP_FLY_TOWARD) Call(LoadPath, 45, Ref(N(FlightPath_Departure)), ARRAY_COUNT(N(FlightPath_Departure)), EASING_LINEAR) diff --git a/src/world/area_kpa/kpa_63/scenes.c b/src/world/area_kpa/kpa_63/scenes.c index 107b7f157ad..dcaa3c52a5c 100644 --- a/src/world/area_kpa/kpa_63/scenes.c +++ b/src/world/area_kpa/kpa_63/scenes.c @@ -180,7 +180,7 @@ EvtScript N(EVS_Starship_Arrive) = { Call(UseSettingsFrom, CAM_DEFAULT, -120, 0, 230) Call(SetPanTarget, CAM_DEFAULT, -120, 0, 230) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(HidePlayerShadow, FALSE) Call(EnableNpcShadow, NPC_PARTNER, TRUE) ExecGetTID(N(EVS_UpdatePassengers), LVar9) @@ -224,7 +224,7 @@ EvtScript N(EVS_Starship_Arrive) = { EndIf Call(EnableNpcShadow, NPC_PARTNER, TRUE) Call(EnablePartnerAI) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(10) IfLt(GB_StoryProgress, STORY_CH8_REACHED_BOWSERS_CASTLE) Set(GB_StoryProgress, STORY_CH8_REACHED_BOWSERS_CASTLE) diff --git a/src/world/area_kpa/kpa_81/npc.c b/src/world/area_kpa/kpa_81/npc.c index 3ad41e78af7..e0abc0c74bf 100644 --- a/src/world/area_kpa/kpa_81/npc.c +++ b/src/world/area_kpa/kpa_81/npc.c @@ -44,7 +44,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosA, CAM_DEFAULT, Float(133.0), Float(100.0)) Call(SetCamPosB, CAM_DEFAULT, Float(216.0), Float(230.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) @@ -56,7 +56,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Call(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0008) Exec(N(EVS_SetupMusic)) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return EndIf @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosA, CAM_DEFAULT, Float(133.0), Float(100.0)) Call(SetCamPosB, CAM_DEFAULT, Float(216.0), Float(230.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) @@ -88,7 +88,7 @@ EvtScript N(EVS_NpcIdle_Door) = { IfEq(LVar0, 0) Call(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0003) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Label(100) Wait(1) @@ -109,7 +109,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Else Call(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0002) Call(ResetCam, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(AwaitPlayerApproach, 120, 150, 30) EndIf @@ -157,7 +157,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosA, CAM_DEFAULT, Float(133.0), Float(100.0)) Call(SetCamPosB, CAM_DEFAULT, Float(216.0), Float(230.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnableModel, MODEL_o166, TRUE) Thread diff --git a/src/world/area_kpa/kpa_82/npc.c b/src/world/area_kpa/kpa_82/npc.c index 66a69eaee69..8bca4ae9f01 100644 --- a/src/world/area_kpa/kpa_82/npc.c +++ b/src/world/area_kpa/kpa_82/npc.c @@ -100,7 +100,7 @@ EvtScript N(EVS_SetCam_MeetingDoor) = { Call(SetCamPosA, CAM_DEFAULT, Float(88.0), Float(256.6)) Call(SetCamPosB, CAM_DEFAULT, Float(195.0), Float(142.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -114,7 +114,7 @@ EvtScript N(EVS_SetCam_AfterBattle) = { Call(SetCamPosA, CAM_DEFAULT, Float(88.0), Float(256.6)) Call(SetCamPosB, CAM_DEFAULT, Float(195.0), Float(142.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -128,7 +128,7 @@ EvtScript N(EVS_SetCam_AfterResult) = { Call(SetCamPosA, CAM_DEFAULT, Float(88.0), Float(256.6)) Call(SetCamPosB, CAM_DEFAULT, Float(195.0), Float(142.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -141,7 +141,7 @@ EvtScript N(EVS_SetCam_AskQuestion) = { Call(SetCamPosA, CAM_DEFAULT, Float(88.0), Float(256.6)) Call(SetCamPosB, CAM_DEFAULT, Float(195.0), Float(142.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -155,7 +155,7 @@ EvtScript N(EVS_SetCam_ViewRoom) = { Call(SetCamPosA, CAM_DEFAULT, Float(-2.5), Float(300.0)) Call(SetCamPosB, CAM_DEFAULT, Float(-2.5), Float(200.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -169,7 +169,7 @@ EvtScript N(EVS_SetCam_BeforeBattle) = { Call(SetCamPosA, CAM_DEFAULT, Float(50.0), Float(300.0)) Call(SetCamPosB, CAM_DEFAULT, Float(50.0), Float(200.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -1049,7 +1049,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Else Call(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0030) Call(ResetCam, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GF_KPA82_PassedThroughDoor, FALSE) Call(DisablePlayerInput, FALSE) Goto(1) @@ -1186,7 +1186,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Call(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003F) Label(40) Call(EnablePartnerAI) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_KPA82_BowserDoorState, 1) Call(DisablePlayerInput, FALSE) BindTrigger(Ref(N(EVS_ExitDoors_kpa_61_0)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) diff --git a/src/world/area_kpa/kpa_83/npc.c b/src/world/area_kpa/kpa_83/npc.c index 1e5ad8c277c..23ec0e131d8 100644 --- a/src/world/area_kpa/kpa_83/npc.c +++ b/src/world/area_kpa/kpa_83/npc.c @@ -32,7 +32,7 @@ EvtScript N(EVS_FocusCam_LookAtDoor) = { Call(SetCamPosA, CAM_DEFAULT, Float(88.0), Float(256.6)) Call(SetCamPosB, CAM_DEFAULT, Float(195.0), Float(142.0)) Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -453,7 +453,7 @@ EvtScript N(EVS_NpcIdle_Door) = { Set(LVar6, Float(3.0 / DT)) ExecWait(N(EVS_FocusCam_LookAtDoor)) Call(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0063) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_KPA83_BowserDoorState, 1) Call(DisablePlayerInput, FALSE) Return diff --git a/src/world/area_kpa/kpa_91/npc.c b/src/world/area_kpa/kpa_91/npc.c index 9f4113aff3f..9aeead3cf74 100644 --- a/src/world/area_kpa/kpa_91/npc.c +++ b/src/world/area_kpa/kpa_91/npc.c @@ -31,7 +31,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, Float(-150.0), Float(-56.0)) Call(SetCamPosC, CAM_DEFAULT, 1, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(SetPlayerSpeed, Float(3.0)) @@ -51,7 +51,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Return @@ -75,7 +75,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EvtScript N(EVS_NpcInteract_Toad_01) = { Call(GetPlayerPos, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) ExecWait(N(EVS_NpcInteract_ToadHouseKeeper)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_kpa/kpa_95/npc.c b/src/world/area_kpa/kpa_95/npc.c index 7eca9add476..5aebdabf316 100644 --- a/src/world/area_kpa/kpa_95/npc.c +++ b/src/world/area_kpa/kpa_95/npc.c @@ -32,7 +32,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, Float(-150.0), Float(-56.0)) Call(SetCamPosC, CAM_DEFAULT, 1, 10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(SetPlayerSpeed, Float(3.0)) @@ -52,7 +52,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Return @@ -76,7 +76,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EvtScript N(EVS_NpcInteract_Toad_01) = { Call(GetPlayerPos, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) ExecWait(N(EVS_NpcInteract_ToadHouseKeeper)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_kzn/kzn_01/npc.c b/src/world/area_kzn/kzn_01/npc.c index a9a9ca8d0d5..1ebf1b4bf63 100644 --- a/src/world/area_kzn/kzn_01/npc.c +++ b/src/world/area_kzn/kzn_01/npc.c @@ -14,7 +14,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { Call(SetPanTarget, CAM_DEFAULT, 270, -200, 0) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SetNpcPos, NPC_SELF, 320, -220, 0) diff --git a/src/world/area_kzn/kzn_02/npc.c b/src/world/area_kzn/kzn_02/npc.c index 24c20f8189a..90a38f7ea06 100644 --- a/src/world/area_kzn/kzn_02/npc.c +++ b/src/world/area_kzn/kzn_02/npc.c @@ -45,7 +45,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(NpcMoveTo, NPC_SELF, -740, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -650, 20, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown) Call(SetNpcJumpscale, NPC_SELF, Float(1.0)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) diff --git a/src/world/area_kzn/kzn_06/extra.c b/src/world/area_kzn/kzn_06/extra.c index 360030eec60..3271869ea06 100644 --- a/src/world/area_kzn/kzn_06/extra.c +++ b/src/world/area_kzn/kzn_06/extra.c @@ -95,7 +95,7 @@ EvtScript N(EVS_LowerMainLavaLevel) = { Call(SetCamDistance, CAM_DEFAULT, Float(600.0)) Call(SetCamPitch, CAM_DEFAULT, Float(5.0), Float(8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15) Thread diff --git a/src/world/area_kzn/kzn_09/npc.c b/src/world/area_kzn/kzn_09/npc.c index d15edac47f4..f985af72049 100644 --- a/src/world/area_kzn/kzn_09/npc.c +++ b/src/world/area_kzn/kzn_09/npc.c @@ -101,7 +101,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { Call(UseSettingsFrom, CAM_DEFAULT, -310, 870, -15) Call(SetPanTarget, CAM_DEFAULT, -310, 870, -15) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcSpeed, NPC_SELF, Float(4.0 / DT)) Call(NpcMoveTo, NPC_SELF, -390, -15, 0) Call(SetNpcJumpscale, NPC_SELF, Float(1.5)) diff --git a/src/world/area_kzn/kzn_10/main.c b/src/world/area_kzn/kzn_10/main.c index 1271115cd45..d347bdefa9c 100644 --- a/src/world/area_kzn/kzn_10/main.c +++ b/src/world/area_kzn/kzn_10/main.c @@ -34,10 +34,10 @@ EvtScript N(EVS_Main) = { Call(SetPanTarget, CAM_DEFAULT, 425, -246, 0) EndIf Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(2) Call(N(func_8024030C_C7E48C)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Set(LVar0, N(EVS_BindExitTriggers)) Exec(EnterWalk) diff --git a/src/world/area_kzn/kzn_10/tromp.c b/src/world/area_kzn/kzn_10/tromp.c index 73bd764f4e9..970bf161a8d 100644 --- a/src/world/area_kzn/kzn_10/tromp.c +++ b/src/world/area_kzn/kzn_10/tromp.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(0) IfEq(AF_KZN_TrompHitPlayer, FALSE) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -43,7 +43,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { Call(N(UnkFunc46)) Sub(LVar2, 55) Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop Return diff --git a/src/world/area_kzn/kzn_17/tromp.c b/src/world/area_kzn/kzn_17/tromp.c index 593d1d28979..2e86db95e9c 100644 --- a/src/world/area_kzn/kzn_17/tromp.c +++ b/src/world/area_kzn/kzn_17/tromp.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamDistance, CAM_DEFAULT, 500) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(0) IfEq(AF_KZN_Tromp2_ShakingDone, FALSE) IfLt(MV_TrompPosX, 550) @@ -28,7 +28,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { Call(N(UnkFunc46)) Sub(LVar2, 55) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar2, 30) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndIf EndIf Wait(1) diff --git a/src/world/area_kzn/kzn_18/npc.c b/src/world/area_kzn/kzn_18/npc.c index 8acb1785ae7..f85c8dd46a0 100644 --- a/src/world/area_kzn/kzn_18/npc.c +++ b/src/world/area_kzn/kzn_18/npc.c @@ -49,7 +49,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00FD) Wait(15 * DT) @@ -72,7 +72,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetPanTarget, CAM_DEFAULT, 420, 250, -350) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) Call(SetNpcSpeed, NPC_SELF, Float(5.0 / DT)) Call(NpcMoveTo, NPC_SELF, 530, -360, 0) @@ -111,7 +111,7 @@ EvtScript N(EVS_NpcIdle_Piranha) = { Call(SetPanTarget, CAM_DEFAULT, 285, 25, 35) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SetNpcPos, NPC_SELF, 285, 25, 35) diff --git a/src/world/area_kzn/kzn_19/eruption.c b/src/world/area_kzn/kzn_19/eruption.c index 645ef13a296..22e88b51c6b 100644 --- a/src/world/area_kzn/kzn_19/eruption.c +++ b/src/world/area_kzn/kzn_19/eruption.c @@ -63,7 +63,7 @@ EvtScript N(EVS_UpdateEruption) = { Call(ShakeCam, CAM_DEFAULT, 0, 5, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, 170, 25, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(ShakeCam, CAM_DEFAULT, 0, 25, Float(2.0)) Call(InterpPlayerYaw, 270, 0) Call(InterpNpcYaw, NPC_PARTNER, 270, 0) diff --git a/src/world/area_kzn/kzn_19/main.c b/src/world/area_kzn/kzn_19/main.c index f0021c9f3b3..817f4cf19da 100644 --- a/src/world/area_kzn/kzn_19/main.c +++ b/src/world/area_kzn/kzn_19/main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.44)) Call(SetPanTarget, CAM_DEFAULT, 185, 55, -30) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 4, 180, 304, 15, -54, 185, 110, -30, 55, 25) Thread Call(N(StarSpiritEffectFunc3)) @@ -66,7 +66,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else // just make the card spawn diff --git a/src/world/area_kzn/kzn_19/npc.c b/src/world/area_kzn/kzn_19/npc.c index 252e875faef..2fd69f94ed4 100644 --- a/src/world/area_kzn/kzn_19/npc.c +++ b/src/world/area_kzn/kzn_19/npc.c @@ -74,12 +74,12 @@ EvtScript N(EVS_Kolorado_Escape) = { Call(UseSettingsFrom, CAM_DEFAULT, 450, 25, -20) Call(SetPanTarget, CAM_DEFAULT, 450, 25, -20) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(NpcMoveTo, NPC_SELF, 535, -60, 0) Wait(20 * DT) Call(SetPanTarget, CAM_DEFAULT, 304, 25, -35) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAux, NPC_LavaPiranhaHead, 0) Wait(10 * DT) @@ -134,7 +134,7 @@ EvtScript N(EVS_Misstar_Escape) = { Call(SetCamDistance, CAM_DEFAULT, 380) Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Set(AF_KZN_BossRoomFloorBroken, TRUE) @@ -151,13 +151,13 @@ EvtScript N(EVS_Misstar_Escape) = { Call(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(SpeakToPlayer, NPC_Misstar, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 0, MSG_CH5_0109) Wait(10) Call(SetPanTarget, CAM_DEFAULT, 370, 25, 70) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpNpcYaw, NPC_Misstar, 90, 0) Call(LoadPath, 45, Ref(N(FlightPath)), ARRAY_COUNT(N(FlightPath)), EASING_LINEAR) Loop(0) @@ -287,7 +287,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(MakeLerp, 0, 40, 80, EASING_QUADRATIC_OUT) Loop(0) @@ -324,7 +324,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { Call(SetCamDistance, CAM_DEFAULT, Float(420.0)) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(-10.7)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_PlayVinesAnim_Talk)) Call(SpeakToPlayer, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30, MSG_CH5_0102) @@ -348,12 +348,12 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { Loop(3) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, LVar0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Sub(LVar0, 2) Call(SetCamDistance, CAM_DEFAULT, Float(440.0)) Call(SetCamSpeed, CAM_DEFAULT, LVar0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Sub(LVar0, 2) EndLoop @@ -553,7 +553,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { Call(SetCamDistance, CAM_DEFAULT, 470) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableGroup, MODEL_ato, TRUE) Call(EnableGroup, MODEL_naka, TRUE) Call(EnableGroup, MODEL_mae, FALSE) diff --git a/src/world/area_kzn/kzn_20/npc.c b/src/world/area_kzn/kzn_20/npc.c index 0b34250ade7..5fbe05be071 100644 --- a/src/world/area_kzn/kzn_20/npc.c +++ b/src/world/area_kzn/kzn_20/npc.c @@ -203,7 +203,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpNpcYaw, NPC_SELF, 270, 4) Wait(10) Call(InterpNpcYaw, NPC_SELF, 90, 4) @@ -290,7 +290,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Panic, ANIM_Kolorado_Panic, 0, MSG_CH5_0110) Call(ResetCam, CAM_DEFAULT, Float(90.0)) @@ -404,7 +404,7 @@ EvtScript N(EVS_Scene_Misstar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(AF_KZN_RumblingIntensified, FALSE) Set(MV_SceneState, SCENE_STATE_BEGIN) Label(10) @@ -423,7 +423,7 @@ EvtScript N(EVS_Scene_Misstar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(MV_SceneState, SCENE_STATE_KOLORADO_CAM_SYNC) EndThread diff --git a/src/world/area_kzn/kzn_22/npc.c b/src/world/area_kzn/kzn_22/npc.c index 700b4939daa..7ff099ec393 100644 --- a/src/world/area_kzn/kzn_22/npc.c +++ b/src/world/area_kzn/kzn_22/npc.c @@ -65,7 +65,7 @@ EndIf //@bug unmatched endif Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-4.0)) Call(SetCamPosB, CAM_DEFAULT, Float(480.0), Float(299.6)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetPlayerSpeed, Float(3.0)) @@ -124,7 +124,7 @@ EvtScript N(EVS_ControlCamera) = { Call(SetCamDistance, CAM_DEFAULT, Float(390.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Label(10) Wait(1) IfEq(AF_KZN23_GrabbedKolorado, FALSE) @@ -134,7 +134,7 @@ EvtScript N(EVS_ControlCamera) = { Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.3)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Label(20) Wait(1) IfEq(AF_KZN22_FlewAway, FALSE) @@ -142,7 +142,7 @@ EvtScript N(EVS_ControlCamera) = { EndIf Call(SetPanTarget, CAM_DEFAULT, 368, 310, 170) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End diff --git a/src/world/area_mac/mac_00/epilogue.c b/src/world/area_mac/mac_00/epilogue.c index ddecf3b4b15..63637b41d56 100644 --- a/src/world/area_mac/mac_00/epilogue.c +++ b/src/world/area_mac/mac_00/epilogue.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_BeginEpilogue) = { Call(SetPanTarget, CAM_DEFAULT, -100, 30, -370) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread ExecWait(N(EVS_PlayerExitPipe_Epilogue)) Wait(10) @@ -72,7 +72,7 @@ EvtScript N(EVS_Scene_BeginEpilogue) = { Call(UseSettingsFrom, CAM_DEFAULT, -60, 0, -320) Call(SetPanTarget, CAM_DEFAULT, -60, 0, -320) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(80) Call(SpeakToPlayer, NPC_Luigi_Epilogue, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_Outro_0023) Wait(10) @@ -87,7 +87,7 @@ EvtScript N(EVS_Scene_BeginEpilogue) = { Call(SetNpcFlagBits, NPC_Luigi_Epilogue, NPC_FLAG_GRAVITY, FALSE) Call(SetNpcPos, NPC_Luigi_Epilogue, NPC_DISPOSE_LOCATION) Exec(N(EVS_BlockExitToGoomaRoad)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_mac/mac_00/intro.c b/src/world/area_mac/mac_00/intro.c index 77b6f9b08d1..05cf6d6466c 100644 --- a/src/world/area_mac/mac_00/intro.c +++ b/src/world/area_mac/mac_00/intro.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_Intro) = { Call(SetPanTarget, CAM_DEFAULT, -100, 30, -370) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread ExecWait(N(EVS_PlayerExitPipe_Intro)) Wait(10 * DT) @@ -77,13 +77,13 @@ EvtScript N(EVS_Scene_Intro) = { Call(SetPanTarget, CAM_DEFAULT, -60, 0, -320) Call(SetCamDistance, CAM_DEFAULT, Float(600.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(UseSettingsFrom, CAM_DEFAULT, 400, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 400, 0, 0) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(GotoMap, Ref("mac_01"), mac_01_ENTRY_4) Wait(100 * DT) diff --git a/src/world/area_mac/mac_00/shared_npc.c b/src/world/area_mac/mac_00/shared_npc.c index 7b0936d5378..081f4194a39 100644 --- a/src/world/area_mac/mac_00/shared_npc.c +++ b/src/world/area_mac/mac_00/shared_npc.c @@ -30,13 +30,13 @@ EvtScript N(EVS_Scene_ToadTownGreeting) = { Call(SetPanTarget, CAM_DEFAULT, -225, 0, -300) Call(SetCamDistance, CAM_DEFAULT, Float(800.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(35 * DT) Call(SetCamSpeed, CAM_DEFAULT, Float(2.1 / DT)) Call(UseSettingsFrom, CAM_DEFAULT, -225, 0, -300) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(InterpNpcYaw, NPC_Toad_04, 230, 0) @@ -60,9 +60,9 @@ EvtScript N(EVS_Scene_ToadTownGreeting) = { Call(DisablePlayerInput, FALSE) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_mac/mac_01/crystal_ball_gfx.c b/src/world/area_mac/mac_01/crystal_ball_gfx.c index 0d614928298..43708da3e28 100644 --- a/src/world/area_mac/mac_01/crystal_ball_gfx.c +++ b/src/world/area_mac/mac_01/crystal_ball_gfx.c @@ -39,7 +39,7 @@ void N(gfx_build_inside_crystal_ball)(void) { Camera* camera = &gCameras[gCurrentCameraID]; Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_tama)); - transform_point(camera->perspectiveMatrix, model->center.x, model->center.y, model->center.z, 1.0f, &x, &y, &z, &s); + transform_point(camera->mtxPerspective, model->center.x, model->center.y, model->center.z, 1.0f, &x, &y, &z, &s); s = 1.0f / s; x *= s; y *= -s; @@ -130,8 +130,8 @@ EvtScript N(EVS_SetupCrystalBallGfx) = { Call(EnableModel, MODEL_mirrorball, FALSE) Call(SetCustomGfxBuilders, CUSTOM_GFX_3, Ref(N(gfx_build_inside_crystal_ball)), NULL) Call(SetModelCustomGfx, MODEL_tama, CUSTOM_GFX_3, -1) - Call(SetModelFlags, MODEL_tama, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) - Call(SetModelFlags, MODEL_ohosi, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_tama, MODEL_FLAG_BILLBOARD, TRUE) + Call(SetModelFlags, MODEL_ohosi, MODEL_FLAG_BILLBOARD, TRUE) Return End }; diff --git a/src/world/area_mac/mac_01/intro.c b/src/world/area_mac/mac_01/intro.c index cfa445a2531..4d9bced8bbc 100644 --- a/src/world/area_mac/mac_01/intro.c +++ b/src/world/area_mac/mac_01/intro.c @@ -21,7 +21,7 @@ EvtScript N(EVS_Scene_IntroWalking) = { Call(SetPanTarget, CAM_DEFAULT, -560, 0, 0) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcPos, NPC_Luigi, -460, 0, 0) Call(SetNpcYaw, NPC_Luigi, 90) @@ -53,7 +53,7 @@ EvtScript N(EVS_Scene_IntroWalking) = { BreakLoop EndIf EndLoop - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(75 * DT) Call(GotoMap, Ref("osr_00"), osr_00_ENTRY_4) Wait(100 * DT) diff --git a/src/world/area_mac/mac_01/npc.c b/src/world/area_mac/mac_01/npc.c index f733935cf34..936da2403e9 100644 --- a/src/world/area_mac/mac_01/npc.c +++ b/src/world/area_mac/mac_01/npc.c @@ -333,14 +333,14 @@ EvtScript N(EVS_QuickChange_CheckForPound) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, 15, -8) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Merlon, FALSE) Call(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 5, MSG_MAC_Plaza_0041) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0042) Set(GF_MAC01_QuickChangeDropped, TRUE) Call(DisablePlayerInput, FALSE) @@ -484,7 +484,7 @@ EvtScript N(EVS_MerlonBargeOut) = { Call(DisablePlayerPhysics, FALSE) Call(UseSettingsFrom, CAM_DEFAULT, -250, 20, -280) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Call(N(func_80244848_8050C8)) Call(InterpNpcYaw, NPC_Merlon, 135, 5) @@ -566,7 +566,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { Call(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_002B) Call(SetPanTarget, CAM_DEFAULT, 480, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(5 * DT) @@ -576,14 +576,14 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { Call(SpeakToPlayer, NPC_DarkToad_04, ANIM_DarkToad_Green_Dismiss, ANIM_DarkToad_Green_Idle, 0, MSG_MAC_Plaza_002D) Call(SetPanTarget, CAM_DEFAULT, 410, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(5 * DT) Call(PlayerFaceNpc, NPC_Merlon, FALSE) EndThread Call(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_002E) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_Merlon, SOUND_MERLON_GATHER, SOUND_SPACE_DEFAULT) @@ -716,7 +716,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { Call(PopSong) Call(SetPanTarget, CAM_DEFAULT, 410, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(3) @@ -843,7 +843,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_003F) Thread @@ -879,7 +879,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return Else IfEq(GF_MAC01_QuickChangeDropped, FALSE) @@ -1790,7 +1790,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, 507, -19) Call(SetCamPosC, CAM_DEFAULT, 0, 20) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlayerMoveTo, 580, -210, 20) Call(InterpPlayerYaw, 263, 1) @@ -1809,7 +1809,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End @@ -2020,7 +2020,7 @@ EvtScript N(EVS_NpcIdle_Twink) = { Call(AdjustCam, CAM_DEFAULT, Float(3.0 / DT), -40, -200, 15, -15) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DE) Wait(5 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(InterpNpcYaw, NPC_Twink, 270, 0) Call(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) Call(LoadPath, 35 * DT, Ref(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index a02006a09e4..f24d205b8d5 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -347,7 +347,7 @@ EvtScript N(EVS_MinhT_PlantSeed) = { #else Call(SetCamSpeed, CAM_DEFAULT, 1) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpNpcYaw, NPC_SELF, 90, 1) Call(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Run) Call(NpcMoveTo, NPC_SELF, 175, 444, 0) @@ -387,9 +387,9 @@ EvtScript N(EVS_MinhT_PlantSeed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread EndIf Call(InterpNpcYaw, NPC_SELF, 270, 1) diff --git a/src/world/area_mac/mac_01/npc/read_fortune.inc.c b/src/world/area_mac/mac_01/npc/read_fortune.inc.c index 326bb0bfad9..add541062f7 100644 --- a/src/world/area_mac/mac_01/npc/read_fortune.inc.c +++ b/src/world/area_mac/mac_01/npc/read_fortune.inc.c @@ -229,7 +229,7 @@ EvtScript N(EVS_Merlon_ReadFortuneFX) = { Call(GetCamPitch, CAM_DEFAULT, LVar0, LVar1) SetF(LVar1, Float(-11.0)) Call(SetCamPitch, CAM_DEFAULT, LVar0, LVar1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(ArrayVar(6), 1) PlayEffect(EFFECT_MERLIN_HOUSE_STARS, 0, -298, 21, -330) diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index 6136f271c8b..7a118f5ad40 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-10.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPlayerSpeed, Float(4.0 / DT)) Call(PlayerMoveTo, 430, -40, 0) diff --git a/src/world/area_mac/mac_03/demo.c b/src/world/area_mac/mac_03/demo.c index 347965ddf46..d2f9b6310a7 100644 --- a/src/world/area_mac/mac_03/demo.c +++ b/src/world/area_mac/mac_03/demo.c @@ -94,12 +94,12 @@ EvtScript N(EVS_DemoDepartForMtRugged) = { Call(SetCamPosB, CAM_DEFAULT, Float(-100.0), Float(-50.0)) Call(SetCamPitch, CAM_DEFAULT, Float(-2.5), Float(-3.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(GetPlayerPos, LVar0, LVar1, LVar2) Add(LVar0, 100) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Loop(1000) @@ -111,7 +111,7 @@ EvtScript N(EVS_DemoDepartForMtRugged) = { EndLoop EndThread Wait(40) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) ExecGetTID(N(EVS_DemoFollowTrainCamera), LVar9) Wait(180) IfEq(GF_DemoSceneDone, TRUE) diff --git a/src/world/area_mac/mac_03/foliage.c b/src/world/area_mac/mac_03/foliage.c index 4161f15346a..f3a3ce9e5e4 100644 --- a/src/world/area_mac/mac_03/foliage.c +++ b/src/world/area_mac/mac_03/foliage.c @@ -13,7 +13,7 @@ EvtScript N(EVS_OnShakeTree3) = { Call(SetPanTarget, CAM_DEFAULT, -128, 20, -555) Call(SetCamDistance, CAM_DEFAULT, Float(330.0)) Call(SetCamSpeed, CAM_DEFAULT, 3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5) Call(PlaySoundWithVolume, SOUND_GROW, 0) @@ -33,9 +33,9 @@ EvtScript N(EVS_OnShakeTree3) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_mac/mac_03/oinks.c b/src/world/area_mac/mac_03/oinks.c index 21c0fc96f07..63d2b07a904 100644 --- a/src/world/area_mac/mac_03/oinks.c +++ b/src/world/area_mac/mac_03/oinks.c @@ -188,7 +188,7 @@ EvtScript N(EVS_TurnCrank) = { Call(SetPanTarget, CAM_DEFAULT, 138, 25, -406) Call(SetCamPitch, CAM_DEFAULT, 15, -13) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Thread @@ -275,7 +275,7 @@ EvtScript N(EVS_TurnCrank) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) Return @@ -448,7 +448,7 @@ EvtScript N(EVS_OpenCapsule) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(EnableNpcAI, NPC_LilOink_01, FALSE) Call(NpcFaceNpc, NPC_LilOink_01, NPC_Capsule, 0) @@ -478,7 +478,7 @@ EvtScript N(EVS_OpenCapsule) = { Call(UseSettingsFrom, CAM_DEFAULT, 360, 20, -165) Call(SetPanTarget, CAM_DEFAULT, 360, 20, -165) Call(SetCamSpeed, CAM_DEFAULT, 3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(N(SetLilOinkAnim), 10, LIL_OINK_ANIM_2) @@ -501,7 +501,7 @@ EvtScript N(EVS_OpenCapsule) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) Return diff --git a/src/world/area_mac/mac_03/train.c b/src/world/area_mac/mac_03/train.c index 17032169f31..a78e729848a 100644 --- a/src/world/area_mac/mac_03/train.c +++ b/src/world/area_mac/mac_03/train.c @@ -435,7 +435,7 @@ EvtScript N(EVS_ArriveFromMtRugged) = { Wait(20) Call(UseSettingsFrom, CAM_DEFAULT, -420, 20, 97) Call(SetPanTarget, CAM_DEFAULT, -420, 20, 97) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerJumpscale, Float(1.0)) Call(SetPlayerActionState, ACTION_STATE_JUMP) Call(PlayerJump, -420, 20, 97, 15) @@ -455,7 +455,7 @@ EvtScript N(EVS_ArriveFromMtRugged) = { Wait(20) Call(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_MAC_Station_0005) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End @@ -535,12 +535,12 @@ EvtScript N(EVS_DepartForMtRugged) = { Call(SetCamPosB, CAM_DEFAULT, Float(-100.0), Float(-50.0)) Call(SetCamPitch, CAM_DEFAULT, Float(-2.5), Float(-3.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(GetPlayerPos, LVar0, LVar1, LVar2) Add(LVar0, 100) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_TrainToad_02, ANIM_TrainToad_Talk, ANIM_TrainToad_Still, 5, MSG_MAC_Station_0009) Call(PlaySound, SOUND_TRAIN_DEPARTURE) @@ -554,7 +554,7 @@ EvtScript N(EVS_DepartForMtRugged) = { EndLoop EndThread Wait(40) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) ExecGetTID(N(EVS_FollowTrainCamera), LVar9) Wait(170) Wait(100) @@ -564,7 +564,7 @@ EvtScript N(EVS_DepartForMtRugged) = { }; EvtScript N(EVS_InitializeTrainScene) = { - Call(SetModelFlags, MODEL_km, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + Call(SetModelFlags, MODEL_km, MODEL_FLAG_BILLBOARD, TRUE) Call(EnableModel, MODEL_km, FALSE) Call(CloneModel, MODEL_km, CLONED_MODEL(0)) Call(CloneModel, MODEL_km, CLONED_MODEL(1)) diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index d92757e7bbf..3a9e46c6450 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -38,7 +38,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { Call(UseSettingsFrom, CAM_DEFAULT, -420, 20, 235) Call(SetPanTarget, CAM_DEFAULT, -470, 20, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) Wait(40 * DT) @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { #else Call(SetCamSpeed, CAM_DEFAULT, 3) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C6) @@ -123,7 +123,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { Call(SetCamDistance, CAM_DEFAULT, -300) Call(SetCamPitch, CAM_DEFAULT, Float(17.5), -9) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToNpc, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, NPC_Twink, MSG_MAC_Housing_00CF) @@ -199,7 +199,7 @@ Call(SetNpcSpeed, NPC_Twink, 4) Call(SetPlayerAnimation, ANIM_Mario1_NodYes) Wait(30 * DT) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D3) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(NpcFlyTo, NPC_Twink, -600, 200, 350, 0, -10, EASING_LINEAR) Call(SetNpcPos, NPC_Twink, NPC_DISPOSE_LOCATION) Set(GB_StoryProgress, STORY_CH4_STAR_SPRIT_DEPARTED) diff --git a/src/world/area_mac/mac_04/npc_twink.inc.c b/src/world/area_mac/mac_04/npc_twink.inc.c index e857dae6c71..15b303e5a31 100644 --- a/src/world/area_mac/mac_04/npc_twink.inc.c +++ b/src/world/area_mac/mac_04/npc_twink.inc.c @@ -64,7 +64,7 @@ EvtScript N(EVS_NpcIdle_TwinkStartCh4) = { Call(AdjustCam, CAM_DEFAULT, Float(3.0 / DT), -40, -200, 15, -15) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0093) Wait(5 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(InterpNpcYaw, NPC_Twink, 270, 0) Call(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) Call(LoadPath, 35 * DT, Ref(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) diff --git a/src/world/area_mac/mac_04/wish_scene.c b/src/world/area_mac/mac_04/wish_scene.c index 36b32901d0c..bc116f4e066 100644 --- a/src/world/area_mac/mac_04/wish_scene.c +++ b/src/world/area_mac/mac_04/wish_scene.c @@ -17,7 +17,7 @@ EvtScript N(EVS_Scene_WishingToadKid) = { Call(SetCamDistance, CAM_DEFAULT, Float(-400.0)) Call(SetCamPitch, CAM_DEFAULT, Float(6.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_WishingToadKid, ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Disappointed, 0, MSG_HOS_0070) diff --git a/src/world/area_mac/mac_05/npc.c b/src/world/area_mac/mac_05/npc.c index ffe3ac56159..8e02f8ad165 100644 --- a/src/world/area_mac/mac_05/npc.c +++ b/src/world/area_mac/mac_05/npc.c @@ -324,14 +324,14 @@ EvtScript N(D_802484F8_85A668) = { Call(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) IfEq(LVar0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Else Call(SetCamSpeed, CAM_DEFAULT, 1) EndIf Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, 1) Loop(0) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -388,7 +388,7 @@ EvtScript N(EVS_80248878) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 400) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Wait(20) Call(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_009F) @@ -556,7 +556,7 @@ EvtScript N(EVS_80248878) = { Call(PlayerFaceNpc, NPC_Whale, FALSE) EndThread Call(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00AB) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) Thread Wait(100) @@ -634,9 +634,9 @@ EvtScript N(EVS_802496FC) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_FLYING | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, FALSE) Switch(GB_StoryProgress) CaseRange(STORY_CH5_SUSHIE_JOINED_PARTY, STORY_CH5_STAR_SPRIT_DEPARTED) @@ -847,7 +847,7 @@ EvtScript N(D_8024A1F8_85C368) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Thread Wait(5) @@ -942,9 +942,9 @@ EvtScript N(D_8024A1F8_85C368) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Return @@ -1266,7 +1266,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { Call(SetCamDistance, CAM_DEFAULT, 700) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) Call(SetNpcSpeed, NPC_SELF, Float(2.0)) @@ -1285,18 +1285,18 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { Wait(10) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-7.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_MAC_Port_00B5) Call(SetCamDistance, CAM_DEFAULT, 225) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_MAC_Port_00B6) Call(SetPanTarget, CAM_DEFAULT, -250, -10, 490) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Walk) Call(NpcMoveTo, NPC_SELF, -255, 490, 75) Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_OutOfBreath) @@ -1310,7 +1310,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { Call(N(func_80243254_8553C4), -1, LVar0, LVar2) Call(NpcMoveTo, NPC_SELF, LVar0, LVar2, 45) EndThread - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(StartBossBattle, SONG_JR_TROOPA_BATTLE) Return @@ -1905,7 +1905,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { Call(SetPanTarget, CAM_DEFAULT, 112, 0, -511) Call(SetCamDistance, CAM_DEFAULT, Float(320.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(InterpNpcYaw, NPC_Toad_02, 90, 0) Call(InterpNpcYaw, NPC_ArtistToad, 270, 0) @@ -1952,7 +1952,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { Call(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EndThread Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(60) Call(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_007F) Call(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_0080) diff --git a/src/world/area_mgm/mgm_00/npc.c b/src/world/area_mgm/mgm_00/npc.c index 8e33cf369aa..d5426886829 100644 --- a/src/world/area_mgm/mgm_00/npc.c +++ b/src/world/area_mgm/mgm_00/npc.c @@ -21,7 +21,7 @@ EvtScript N(EVS_RaisePipe_JumpAttack) = { Call(SetPanTarget, CAM_DEFAULT, -25, 0, -155) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5) Call(PlaySoundWithVolume, SOUND_GROW, 0) @@ -46,7 +46,7 @@ EvtScript N(EVS_RaisePipe_SmashAttack) = { Call(SetPanTarget, CAM_DEFAULT, 95, 0, -155) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5) Call(PlaySoundWithVolume, SOUND_GROW, 0) @@ -73,9 +73,9 @@ EvtScript N(EVS_SetCamera_RaisePipe) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_mgm/mgm_02/main.c b/src/world/area_mgm/mgm_02/main.c index d64c3a696cd..39a458f14f9 100644 --- a/src/world/area_mgm/mgm_02/main.c +++ b/src/world/area_mgm/mgm_02/main.c @@ -4,7 +4,7 @@ EvtScript N(EVS_SetupCamera) = { Call(UseSettingsFrom, CAM_DEFAULT, -300, -20, 200) Call(SetPanTarget, CAM_DEFAULT, 250, -20, 220) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePlayerInput, TRUE) Call(SetPlayerPos, 250, 200, 220) Call(SetNpcPos, NPC_PARTNER, 250, 200, 220) @@ -15,7 +15,7 @@ EvtScript N(EVS_SetupCamera) = { Wait(1) Goto(10) EndIf - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_mgm/mgm_02/npc.c b/src/world/area_mgm/mgm_02/npc.c index 121e38d647f..5065bbd4f31 100644 --- a/src/world/area_mgm/mgm_02/npc.c +++ b/src/world/area_mgm/mgm_02/npc.c @@ -1633,7 +1633,7 @@ EvtScript N(EVS_Toad_GovernGame) = { Call(SetPanTarget, CAM_DEFAULT, 358, -20, 185) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(SetNpcFlagBits, NPC_Toad, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -1694,9 +1694,9 @@ EvtScript N(EVS_Toad_GovernGame) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_mim/common/SetupGates.inc.c b/src/world/area_mim/common/SetupGates.inc.c index a88a4351ccd..005089763ac 100644 --- a/src/world/area_mim/common/SetupGates.inc.c +++ b/src/world/area_mim/common/SetupGates.inc.c @@ -18,9 +18,9 @@ EvtScript N(EVS_SetupGates) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) BindTrigger(Ref(N(EVS_UseGate_North)), TRIGGER_WALL_PRESS_A, COLLIDER_monn, 1, 0) BindTrigger(Ref(N(EVS_UseGate_South)), TRIGGER_WALL_PRESS_A, COLLIDER_mons, 1, 0) BindTrigger(Ref(N(EVS_UseGate_West)), TRIGGER_WALL_PRESS_A, COLLIDER_monw, 1, 0) diff --git a/src/world/area_mim/mim_02/gate.c b/src/world/area_mim/mim_02/gate.c index 6e3139b0e21..1eb365a9055 100644 --- a/src/world/area_mim/mim_02/gate.c +++ b/src/world/area_mim/mim_02/gate.c @@ -70,9 +70,9 @@ EvtScript N(EVS_SetupGates) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) BindTrigger(Ref(N(EVS_UseGate_North)), TRIGGER_WALL_PRESS_A, COLLIDER_monn, 1, 0) BindTrigger(Ref(N(EVS_UseGate_South)), TRIGGER_WALL_PRESS_A, COLLIDER_mons, 1, 0) BindTrigger(Ref(N(EVS_UseGate_East)), TRIGGER_WALL_PRESS_A, COLLIDER_mone, 1, 0) diff --git a/src/world/area_mim/mim_02/npc.c b/src/world/area_mim/mim_02/npc.c index 2e9048ba1c5..799755c778c 100644 --- a/src/world/area_mim/mim_02/npc.c +++ b/src/world/area_mim/mim_02/npc.c @@ -36,7 +36,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { Call(SetCamPitch, CAM_DEFAULT, Float(6.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) EndThread Thread @@ -110,7 +110,7 @@ EvtScript N(EVS_NpcIdle_Oaklie) = { Call(SetCamPitch, CAM_DEFAULT, Float(6.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0003) Wait(10 * DT) @@ -124,7 +124,7 @@ EvtScript N(EVS_NpcIdle_Oaklie) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) EndThread Call(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) diff --git a/src/world/area_mim/mim_07/gate.c b/src/world/area_mim/mim_07/gate.c index b6df93ba835..39841425b89 100644 --- a/src/world/area_mim/mim_07/gate.c +++ b/src/world/area_mim/mim_07/gate.c @@ -252,9 +252,9 @@ EvtScript N(EVS_SetupGates) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) BindTrigger(Ref(N(EVS_UseGate_North)), TRIGGER_WALL_PRESS_A, COLLIDER_monn, 1, 0) BindTrigger(Ref(N(EVS_UseGate_South)), TRIGGER_WALL_PRESS_A, COLLIDER_mons, 1, 0) BindTrigger(Ref(N(EVS_UseGate_West)), TRIGGER_WALL_PRESS_A, COLLIDER_monw, 1, 0) diff --git a/src/world/area_mim/mim_07/main.c b/src/world/area_mim/mim_07/main.c index 135d909c763..67e9bd4a638 100644 --- a/src/world/area_mim/mim_07/main.c +++ b/src/world/area_mim/mim_07/main.c @@ -39,10 +39,10 @@ EvtScript N(EVS_Main) = { Call(UseSettingsFrom, CAM_DEFAULT, 500, -100, 0) Call(SetPanTarget, CAM_DEFAULT, 530, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Thread - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) EndThread Else diff --git a/src/world/area_mim/mim_07/npc.c b/src/world/area_mim/mim_07/npc.c index 9e72ba6630b..b0bc67d2212 100644 --- a/src/world/area_mim/mim_07/npc.c +++ b/src/world/area_mim/mim_07/npc.c @@ -110,7 +110,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(20.0), Float(-6.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Run) Call(NpcMoveTo, NPC_SELF, LVar4, LVar5, 30) diff --git a/src/world/area_mim/mim_10/npc.c b/src/world/area_mim/mim_10/npc.c index d640e333140..00887e95c1a 100644 --- a/src/world/area_mim/mim_10/npc.c +++ b/src/world/area_mim/mim_10/npc.c @@ -81,10 +81,10 @@ EvtScript N(EVS_Bootler_SpookPlayer) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Loop(0) Call(SetCamDistance, CAM_DEFAULT, 400) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop EndChildThread @@ -142,7 +142,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { Call(SetCamDistance, CAM_DEFAULT, 270) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0000) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -150,7 +150,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamLeadPlayer, CAM_DEFAULT, TRUE) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(30 * DT) Call(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0001) Call(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR_A, SOUND_SPACE_DEFAULT) @@ -177,9 +177,9 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { Call(PlaySoundAtNpc, NPC_Bootler, SOUND_BOOTLER_SPOOK, SOUND_SPACE_DEFAULT) ExecWait(N(EVS_Bootler_SpookPlayer)) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) SetF(LVar0, Float(240.0)) Loop(20 * DT) SubF(LVar0, Float(VAR_1)) diff --git a/src/world/area_mim/mim_11/gate.c b/src/world/area_mim/mim_11/gate.c index 5045ecac54e..ad3a038da3a 100644 --- a/src/world/area_mim/mim_11/gate.c +++ b/src/world/area_mim/mim_11/gate.c @@ -39,7 +39,7 @@ EvtScript N(D_80242560_BB95D0) = { Call(SetCamPosB, CAM_DEFAULT, 23, -109) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 23, 0, -109) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) Call(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH_A, SOUND_SPACE_DEFAULT) @@ -54,7 +54,7 @@ EvtScript N(D_80242560_BB95D0) = { Wait(10 * DT) Call(SetCamPitch, CAM_DEFAULT, Float(0.0), Float(-25.0)) Call(SetCamDistance, CAM_DEFAULT, 550) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(ShowMessageAtScreenPos, MSG_CH3_0029, 160, 40) @@ -62,7 +62,7 @@ EvtScript N(D_80242560_BB95D0) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(19.5), Float(-14.9)) Call(SetCamDistance, CAM_DEFAULT, 350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_002A) Call(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR_A, SOUND_SPACE_DEFAULT) @@ -77,9 +77,9 @@ EvtScript N(D_80242560_BB95D0) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_mim/mim_11/main.c b/src/world/area_mim/mim_11/main.c index 779a4761afc..1861243c603 100644 --- a/src/world/area_mim/mim_11/main.c +++ b/src/world/area_mim/mim_11/main.c @@ -85,7 +85,7 @@ EvtScript N(EVS_Scene_ReachedMansion) = { Call(SetCamPosB, CAM_DEFAULT, 89, 84) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 75, 0, 309) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(func_8024066C_BB76DC)) Wait(30) ChildThread @@ -194,7 +194,7 @@ EvtScript N(EVS_EnterMap) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Exec(N(EVS_BindExitTriggers)) Else Set(LVar0, Ref(N(EVS_BindExitTriggers))) diff --git a/src/world/area_nok/nok_01/npc.c b/src/world/area_nok/nok_01/npc.c index 8aa875957af..02959e61462 100644 --- a/src/world/area_nok/nok_01/npc.c +++ b/src/world/area_nok/nok_01/npc.c @@ -326,7 +326,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, -401, 50) Call(SetCamPosC, CAM_DEFAULT, 0, -2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(func_802D1270, -334, 70, Float(3.0)) Call(func_802D1270, -385, -6, Float(3.0)) @@ -347,7 +347,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index ca798e2c609..9866308b99d 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -171,7 +171,7 @@ EvtScript N(EVS_Scene_KooverGetsMugged) = { Call(NpcJump0, NPC_FuzzyWithShell, LVar0, LVar1, LVar2, 20) PlayEffect(EFFECT_DAMAGE_STARS, FX_DAMAGE_STARS_3, LVar0, LVar1, LVar2, 0, -1, 0, 3) Thread - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, 4) Wait(60) Call(SetCamSpeed, CAM_DEFAULT, 1) @@ -281,7 +281,7 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { MulF(LVarA, Float(0.7)) Call(SetCamDistance, CAM_DEFAULT, LVarA) Call(SetCamSpeed, CAM_DEFAULT, 4) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(NpcMoveTo, NPC_Koover, -280, 301, 30) Call(SetNpcAnimation, NPC_Koover, ANIM_Koopa_Idle) Wait(7) diff --git a/src/world/area_nok/nok_02/epilogue.c b/src/world/area_nok/nok_02/epilogue.c index b4e28c77914..37b7657efcb 100644 --- a/src/world/area_nok/nok_02/epilogue.c +++ b/src/world/area_nok/nok_02/epilogue.c @@ -8,7 +8,7 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(50) Call(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Talk) Wait(15) diff --git a/src/world/area_nok/nok_02/npc.c b/src/world/area_nok/nok_02/npc.c index 95c69401d13..369929684b2 100644 --- a/src/world/area_nok/nok_02/npc.c +++ b/src/world/area_nok/nok_02/npc.c @@ -67,7 +67,7 @@ EvtScript N(EVS_NpcInteract_Kooper) = { #else Call(SetCamSpeed, CAM_DEFAULT, 4) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetGroupVisibility, MODEL_g111, MODEL_GROUP_VISIBLE) Thread Wait(10 * DT) diff --git a/src/world/area_nok/nok_04/npc.c b/src/world/area_nok/nok_04/npc.c index c2560b2c8fd..b7163499216 100644 --- a/src/world/area_nok/nok_04/npc.c +++ b/src/world/area_nok/nok_04/npc.c @@ -359,7 +359,7 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { #else Call(SetCamSpeed, CAM_DEFAULT, 3) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(60 * DT) Call(SetPlayerAnimation, ANIM_Mario1_LookUp) Call(SetNpcJumpscale, NPC_BossFuzzy, 3) @@ -540,7 +540,7 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { Call(SetPlayerAnimation, ANIM_Mario1_Idle) Wait(30) Call(GetPlayerPos, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) #if VERSION_PAL Call(SetCamSpeed, CAM_DEFAULT, Float(3 / DT)) #else @@ -887,7 +887,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { #else Call(SetCamSpeed, CAM_DEFAULT, 3) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(20 * DT) Call(PlayerMoveTo, -205, 267, 40) @@ -992,7 +992,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { Exec(N(EVS_PopSong)) Wait(10 * DT) Call(EnablePartnerAI) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) #if VERSION_PAL Call(SetCamSpeed, CAM_DEFAULT, Float(3 / DT)) #else @@ -1010,7 +1010,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { #else Call(SetCamSpeed, CAM_DEFAULT, 3) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Walk) Call(SetNpcPos, NPC_BossFuzzy, 63, 0, 212) @@ -1077,7 +1077,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EndThread Call(UseSettingsFrom, CAM_DEFAULT, -260, 0, 284) Call(SetPanTarget, CAM_DEFAULT, -260, 0, 284) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) #if VERSION_PAL Call(SetCamSpeed, CAM_DEFAULT, Float(2 / DT)) #else @@ -1207,9 +1207,9 @@ EvtScript N(EVS_Scene_KooperArrives) = { Call(UseSettingsFrom, CAM_DEFAULT, -260, 0, 284) Call(SetPanTarget, CAM_DEFAULT, -260, 0, 284) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(15 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(AF_NOK04_CamPanDone, TRUE) Wait(30 * DT) Call(DisablePlayerInput, FALSE) @@ -1229,7 +1229,7 @@ EvtScript N(EVS_HitTree_Correct) = { Call(SetPanTarget, CAM_DEFAULT, LVarA, LVarB, LVarC) Call(SetCamPitch, CAM_DEFAULT, 15, -11) Call(SetCamSpeed, CAM_DEFAULT, 3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(N(GetTreeHidingSpotPos), LVar0, LVar0, LVar1, LVar2) Call(GetNpcPointer, NPC_BossFuzzy, LVarE) @@ -1364,7 +1364,7 @@ EvtScript N(EVS_HitTree_Correct) = { Set(AF_NOK04_PlayingGame, FALSE) Exec(N(EVS_Scene_KooperArrives)) EndSwitch - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) #if VERSION_PAL Call(SetCamSpeed, CAM_DEFAULT, Float(3 / DT)) #else @@ -1386,7 +1386,7 @@ EvtScript N(EVS_HitTree_Wrong) = { Call(SetPanTarget, CAM_DEFAULT, LVarA, LVarB, LVarC) Call(SetCamPitch, CAM_DEFAULT, 15, -11) Call(SetCamSpeed, CAM_DEFAULT, 3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(15) Set(MV_LastWrongTreeIndex, LVar0) diff --git a/src/world/area_obk/obk_01/chandelier.c b/src/world/area_obk/obk_01/chandelier.c index 5cdd6a42f10..62ea3a9a47d 100644 --- a/src/world/area_obk/obk_01/chandelier.c +++ b/src/world/area_obk/obk_01/chandelier.c @@ -437,7 +437,7 @@ EvtScript N(EVS_LaunchFromCouch_GrabChandelier) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, -420, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) Call(SetCamDistance, CAM_DEFAULT, 750) @@ -495,9 +495,9 @@ EvtScript N(EVS_LaunchFromCouch_GrabChandelier) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, -420, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) @@ -515,7 +515,7 @@ EvtScript N(EVS_LaunchFromCouch_GrabChandelier) = { Call(MakeItemEntity, LVar0, 447, -350, 278, ITEM_SPAWN_MODE_DECORATION, 0) Set(GB_StoryProgress, STORY_CH3_WEIGHED_DOWN_CHANDELIER) Call(CloseChoicePopup) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) BindTrigger(Ref(N(EVS_LaunchFromCouch_Crash)), TRIGGER_FLOOR_TOUCH, COLLIDER_o567, 1, 0) @@ -533,7 +533,7 @@ EvtScript N(EVS_TetherCameraToPlayer) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop Return @@ -584,7 +584,7 @@ EvtScript N(EVS_LaunchFromCouch_Crash) = { Call(SetPlayerActionState, ACTION_STATE_IDLE) KillThread(LVarA) Call(DisablePlayerPhysics, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(1) Call(EnablePartnerAI) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_obk/obk_01/portrait.c b/src/world/area_obk/obk_01/portrait.c index 7191a770604..d52980ba4d6 100644 --- a/src/world/area_obk/obk_01/portrait.c +++ b/src/world/area_obk/obk_01/portrait.c @@ -110,7 +110,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { Call(UseSettingsFrom, CAM_DEFAULT, 812, 0, 28) Call(SetPanTarget, CAM_DEFAULT, 812, 0, 28) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SetPlayerAnimation, ANIM_Mario1_Jump) @@ -131,7 +131,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EndIf Call(DisablePlayerPhysics, FALSE) Wait(2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndSwitch Call(DisablePlayerInput, FALSE) Return @@ -153,7 +153,7 @@ EvtScript N(EVS_Interact_UpperPortrait) = { Call(UseSettingsFrom, CAM_DEFAULT, 812, -210, 28) Call(SetPanTarget, CAM_DEFAULT, 812, -210, 28) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SetPlayerAnimation, ANIM_Mario1_Jump) @@ -164,7 +164,7 @@ EvtScript N(EVS_Interact_UpperPortrait) = { Call(SetPlayerActionState, ACTION_STATE_LAND) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnablePartnerAI) Call(DisablePlayerPhysics, FALSE) Wait(2) diff --git a/src/world/area_obk/obk_03/stairs.c b/src/world/area_obk/obk_03/stairs.c index f2392937a4c..3f0afd0b710 100644 --- a/src/world/area_obk/obk_03/stairs.c +++ b/src/world/area_obk/obk_03/stairs.c @@ -40,7 +40,7 @@ EvtScript N(EVS_Cam_FocusOnStairs) = { Sub(LVar1, 15) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -50,9 +50,9 @@ EvtScript N(EVS_Cam_ResetFocus) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; diff --git a/src/world/area_obk/obk_04/game.c b/src/world/area_obk/obk_04/game.c index a5c089ac42e..05860156822 100644 --- a/src/world/area_obk/obk_04/game.c +++ b/src/world/area_obk/obk_04/game.c @@ -386,7 +386,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EndLoop Call(SpeakToPlayer, NPC_LeaderBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 5, MSG_CH3_003C) Call(DisablePlayerInput, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Loop(0) Wait(1) IfNe(MV_KeepAwayResult, KEEP_AWAY_WAITING) @@ -466,14 +466,14 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_LeaderBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_003D) Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Thread @@ -509,9 +509,9 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(20) Set(GB_StoryProgress, STORY_CH3_GOT_SUPER_BOOTS) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_obk/obk_07/phonograph.c b/src/world/area_obk/obk_07/phonograph.c index 7a8b7c1b6d4..680af654f7e 100644 --- a/src/world/area_obk/obk_07/phonograph.c +++ b/src/world/area_obk/obk_07/phonograph.c @@ -842,7 +842,7 @@ EvtScript N(EVS_PlayPhonograph) = { EndIf EndLoop KillThread(MV_UpdateGuardScript) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) IfEq(MV_GuardDeparted, FALSE) IfEq(MV_GuardDancing, TRUE) @@ -1128,7 +1128,7 @@ EvtScript N(EVS_Scene_PlayerGotChestItem) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_GuardBoo, ANIM_Boo_Cower, ANIM_Boo_Cower, 0, MSG_CH3_0039) Call(SetNpcAnimation, NPC_GuardBoo, ANIM_Boo_Idle) @@ -1138,9 +1138,9 @@ EvtScript N(EVS_Scene_PlayerGotChestItem) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_obk/obk_08/game.c b/src/world/area_obk/obk_08/game.c index 84b304fc15a..dd574518da3 100644 --- a/src/world/area_obk/obk_08/game.c +++ b/src/world/area_obk/obk_08/game.c @@ -297,7 +297,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EndIf EndLoop Call(SpeakToPlayer, NPC_LeaderBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_0032) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(10) Set(MV_KeepAwayResult, KEEP_AWAY_WAITING) Call(DisablePlayerInput, FALSE) @@ -327,7 +327,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_LeaderBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_0033) Wait(20) @@ -343,7 +343,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Thread @@ -374,9 +374,9 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Else Call(SetCamProperties, CAM_DEFAULT, Float(2.0), 0, 0, 0, Float(450.0), Float(15.0), Float(-7.0)) Wait(30) diff --git a/src/world/area_obk/obk_09/epilogue.c b/src/world/area_obk/obk_09/epilogue.c index c70ed14447a..d7edbe6adcc 100644 --- a/src/world/area_obk/obk_09/epilogue.c +++ b/src/world/area_obk/obk_09/epilogue.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(SetCamPosA, CAM_DEFAULT, -280, 234) Call(SetCamPosB, CAM_DEFAULT, -135, 105) Call(SetCamPosC, CAM_DEFAULT, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) Call(NpcMoveTo, NPC_Bootler, -159, 158, 50) Call(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Idle) diff --git a/src/world/area_obk/obk_09/meet_bow.c b/src/world/area_obk/obk_09/meet_bow.c index b2dc97039ee..311dfd7ac86 100644 --- a/src/world/area_obk/obk_09/meet_bow.c +++ b/src/world/area_obk/obk_09/meet_bow.c @@ -26,7 +26,7 @@ EvtScript N(EVS_Scene_MeetBow) = { Call(SetCamPosA, CAM_DEFAULT, 200, 280) Call(SetCamPosB, CAM_DEFAULT, 0, 110) Call(SetCamPosC, CAM_DEFAULT, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(48 * DT) Call(ShowMessageAtScreenPos, MSG_CH3_0042, 160, 40) KillThread(LVarA) @@ -38,7 +38,7 @@ EvtScript N(EVS_Scene_MeetBow) = { Call(SetCamPosA, CAM_DEFAULT, 200, 300) Call(SetCamPosB, CAM_DEFAULT, -20, 10) Call(SetCamPosC, CAM_DEFAULT, 0, 60) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20 * DT) Call(SetNpcPos, NPC_Bow, -10, 80, -35) @@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_MeetBow) = { Call(SetCamPosA, CAM_DEFAULT, 200, 300) Call(SetCamPosB, CAM_DEFAULT, 0, 80) Call(SetCamPosC, CAM_DEFAULT, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Dejected, ANIM_Bootler_Quaver, 0, MSG_CH3_0048) Call(UseSettingsFrom, CAM_DEFAULT, 0, 50, -70) @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_MeetBow) = { Call(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 5, MSG_CH3_004B) Call(SetCamDistance, CAM_DEFAULT, 550) Call(SetCamPitch, CAM_DEFAULT, Float(3.0), Float(-12.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10 * DT) Call(EnableGroup, MODEL_ori, TRUE) Call(SetNpcPos, NPC_Skolar, 1, 650, 80) @@ -126,7 +126,7 @@ EvtScript N(EVS_Scene_MeetBow) = { Call(SetCamPosA, CAM_DEFAULT, 0, 350) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamPosC, CAM_DEFAULT, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkRelaxed, ANIM_WorldSkolar_IdleSad, 0, MSG_CH3_004C) Call(UseSettingsFrom, CAM_DEFAULT, 0, 50, -70) @@ -164,9 +164,9 @@ EvtScript N(EVS_Scene_MeetBow) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetNpcJumpscale, NPC_Bow, 0) Call(GetNpcPos, NPC_Bow, LVar0, LVar1, LVar2) Sub(LVar1, 40) diff --git a/src/world/area_omo/omo_02/barricade.c b/src/world/area_omo/omo_02/barricade.c index a6ae7fc0d94..fb8a282bdba 100644 --- a/src/world/area_omo/omo_02/barricade.c +++ b/src/world/area_omo/omo_02/barricade.c @@ -211,12 +211,12 @@ EvtScript N(EVS_Scene_BreakBarricade) = { Thread Wait(30) KillThread(MV_RestrictCamScript) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(1) Call(UseSettingsFrom, CAM_DEFAULT, -380, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -380, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Thread @@ -364,7 +364,7 @@ EvtScript N(EVS_Scene_BreakBarricade) = { Call(UseSettingsFrom, CAM_DEFAULT, -125, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -125, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(165) Call(PlaySound, SOUND_LRAW_SHY_GUY_CROWD_2 | SOUND_ID_TRIGGER_CHANGE_SOUND) Call(StopTrackingSoundPos, SOUND_LRAW_SHY_GUY_CROWD_2) @@ -413,7 +413,7 @@ EvtScript N(EVS_Scene_BreakBarricade) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GF_OMO02_BombedWall, TRUE) Call(DisablePlayerInput, FALSE) Unbind diff --git a/src/world/area_omo/omo_02/npc.c b/src/world/area_omo/omo_02/npc.c index 7f3f3f1f9cf..c991cf59862 100644 --- a/src/world/area_omo/omo_02/npc.c +++ b/src/world/area_omo/omo_02/npc.c @@ -13,7 +13,7 @@ EvtScript N(EVS_RestrictCamFromBarricade) = { Call(GetCamPosB, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, Float(-600.0), LVar1) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Goto(0) Return @@ -39,7 +39,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { Call(UseSettingsFrom, CAM_DEFAULT, -570, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -570, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) ExecGetTID(N(EVS_PlayShyGuyRunSounds), LVarA) Call(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) Call(SetNpcSpeed, NPC_SELF, Float(6.0 / DT)) @@ -47,7 +47,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { KillThread(LVarA) Call(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) Call(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecGetTID(N(EVS_RestrictCamFromBarricade), MV_RestrictCamScript) Set(GF_OMO02_ShyGuyFledBehindWall, TRUE) diff --git a/src/world/area_omo/omo_03/epilogue.c b/src/world/area_omo/omo_03/epilogue.c index 9bb68625723..95ee3781da9 100644 --- a/src/world/area_omo/omo_03/epilogue.c +++ b/src/world/area_omo/omo_03/epilogue.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim11) Call(SetNpcAnimation, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim11) Call(SetNpcAnimation, NPC_ShyGuy_03, ANIM_ShyGuy_Red_Anim11) diff --git a/src/world/area_omo/omo_03/gizmos.c b/src/world/area_omo/omo_03/gizmos.c index c1437723ca4..7c99aac10db 100644 --- a/src/world/area_omo/omo_03/gizmos.c +++ b/src/world/area_omo/omo_03/gizmos.c @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_PullBlueSwitch) = { Call(SetCamDistance, CAM_DEFAULT, Float(517.4)) Call(SetCamPosA, CAM_DEFAULT, Float(-180.0), Float(-322.0)) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-6.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(PlaySoundAt, SOUND_OMO_FLIP_TRAIN_TRACK, SOUND_SPACE_DEFAULT, -130, 0, -215) diff --git a/src/world/area_omo/omo_04/scenes.c b/src/world/area_omo/omo_04/scenes.c index ad15b4361e8..5497b60bc1b 100644 --- a/src/world/area_omo/omo_04/scenes.c +++ b/src/world/area_omo/omo_04/scenes.c @@ -120,7 +120,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(60 * DT) ExecGetTID(N(EVS_PlayKammyFlightSounds), MV_FlightSoundsScriptID) @@ -133,7 +133,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { #else Call(SetCamSpeed, CAM_DEFAULT, 2) #endif - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(LoadPath, 150 * DT, Ref(N(FlightPath_Kammy1)), ARRAY_COUNT(N(FlightPath_Kammy1)), EASING_LINEAR) Loop(0) @@ -220,7 +220,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { Call(SetNpcVar, NPC_Kammy, 0, 0) Wait(5 * DT) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) ExecGetTID(N(EVS_PlayKammyFlightSounds), MV_FlightSoundsScriptID) Set(MF_KammyFlying, TRUE) Thread diff --git a/src/world/area_omo/omo_05/npc.c b/src/world/area_omo/omo_05/npc.c index a3bed591752..c25a652fd65 100644 --- a/src/world/area_omo/omo_05/npc.c +++ b/src/world/area_omo/omo_05/npc.c @@ -32,7 +32,7 @@ API_CALLABLE(N(SpinCameraAround)) { script->functionTempF[0] = 0.0f; } script->functionTempF[0] += 10.0f; - guRotateF(camera->viewMtxShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f); + guRotateF(camera->mtxViewShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f); if (script->functionTempF[0] >= 360.0) { return ApiStatus_DONE2; @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(17.5), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(N(MakeAllConsumablesItemList)) Call(NpcFacePlayer, NPC_SELF, 1) @@ -229,21 +229,21 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { Call(SetCamDistance, CAM_DEFAULT, Float(420.0)) Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-1.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(25.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_SHOCK_1, SOUND_SPACE_DEFAULT) Wait(33 * DT) Call(SetCamDistance, CAM_DEFAULT, Float(320.0)) Call(SetCamPitch, CAM_DEFAULT, Float(13.0), Float(-0.8)) Call(SetCamSpeed, CAM_DEFAULT, Float(25.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_SHOCK_2, SOUND_SPACE_DEFAULT) Wait(33 * DT) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(14.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(25.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_SHOCK_3, SOUND_SPACE_DEFAULT) Wait(18 * DT) @@ -254,12 +254,12 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { Call(SetCamDistance, CAM_DEFAULT, Float(320.0)) Call(SetCamPitch, CAM_DEFAULT, Float(14.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(15.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(14.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(15.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndLoop Call(RotateModel, MODEL_o331, 105, 0, 1, 0) @@ -276,7 +276,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { Call(UseSettingsFrom, CAM_DEFAULT, -250, 0, 100) Call(SetPanTarget, CAM_DEFAULT, -250, 0, 100) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetSelfVar, 0, 1) Thread Label(19) @@ -330,7 +330,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { Wait(15 * DT) Call(SetCamPitch, CAM_DEFAULT, Float(-2.5), Float(-24.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Thread Wait(15 * DT) diff --git a/src/world/area_omo/omo_06/gizmos.c b/src/world/area_omo/omo_06/gizmos.c index 3a6743675a4..9038c251100 100644 --- a/src/world/area_omo/omo_06/gizmos.c +++ b/src/world/area_omo/omo_06/gizmos.c @@ -67,7 +67,7 @@ EvtScript N(EVS_Scene_PullPinkSwitch) = { Call(SetPanTarget, CAM_DEFAULT, 223, 10, -165) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-500.0), Float(-200.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20 * DT) Call(PlaySoundAt, SOUND_OMO_FLIP_TRAIN_TRACK, SOUND_SPACE_DEFAULT, 265, 0, -235) diff --git a/src/world/area_omo/omo_07/npc.c b/src/world/area_omo/omo_07/npc.c index a31c87c6489..54d00af8ce7 100644 --- a/src/world/area_omo/omo_07/npc.c +++ b/src/world/area_omo/omo_07/npc.c @@ -47,7 +47,7 @@ API_CALLABLE(N(SetShyGuyPoolState)) { base = AF_OMO07_NpcPool0; do { - npcID = evt_get_variable(script, *(args++)); + npcID = evt_get_variable(script, *args++); } while (0); // TODO required to match npcID += base; value = evt_get_variable(script, *args++); diff --git a/src/world/area_omo/omo_07/scenes.c b/src/world/area_omo/omo_07/scenes.c index c032b7a2bf2..7be38d39471 100644 --- a/src/world/area_omo/omo_07/scenes.c +++ b/src/world/area_omo/omo_07/scenes.c @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5 * DT) Call(SetNpcVar, NPC_Kammy, 0, 1) diff --git a/src/world/area_omo/omo_08/boxes.c b/src/world/area_omo/omo_08/boxes.c index 45fb8a79dec..d777dcace7e 100644 --- a/src/world/area_omo/omo_08/boxes.c +++ b/src/world/area_omo/omo_08/boxes.c @@ -333,7 +333,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { Call(SetCamDistance, CAM_DEFAULT, 700) Call(SetCamPitch, CAM_DEFAULT, 40, Float(-4.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30) Thread Call(MakeLerp, 0, 90, 40, EASING_CUBIC_IN) @@ -404,7 +404,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { Call(SetCamDistance, CAM_DEFAULT, -450) Call(SetCamPitch, CAM_DEFAULT, 16, Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Thread Call(GetModelCenter, MODEL_b1_1) @@ -669,7 +669,7 @@ EvtScript N(EVS_HitBox) = { Call(SetCamDistance, CAM_DEFAULT, -450) Call(SetCamPitch, CAM_DEFAULT, 16, Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, 1) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30) Switch(MV_BoxHitSequence) CaseEq(BOX_SEQUENCE(BOX_COLOR_GREEN, BOX_COLOR_YELLOW, BOX_COLOR_RED, BOX_COLOR_BLUE)) diff --git a/src/world/area_omo/omo_09/scenes.c b/src/world/area_omo/omo_09/scenes.c index dc8f115c066..38b9c43e61a 100644 --- a/src/world/area_omo/omo_09/scenes.c +++ b/src/world/area_omo/omo_09/scenes.c @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5 * DT) Call(SetNpcVar, NPC_Kammy, 0, 1) diff --git a/src/world/area_omo/omo_09/slot_machine.c b/src/world/area_omo/omo_09/slot_machine.c index acfbdff1291..69909bf6c0d 100644 --- a/src/world/area_omo/omo_09/slot_machine.c +++ b/src/world/area_omo/omo_09/slot_machine.c @@ -26,7 +26,7 @@ EvtScript N(EVS_SetCam_ViewReels) = { Call(UseSettingsFrom, CAM_DEFAULT, 535, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 535, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Return End }; @@ -37,7 +37,7 @@ EvtScript N(EVS_SetCam_ViewPayout) = { Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-30.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End diff --git a/src/world/area_omo/omo_12/npc.c b/src/world/area_omo/omo_12/npc.c index 4f235068324..0f08d225311 100644 --- a/src/world/area_omo/omo_12/npc.c +++ b/src/world/area_omo/omo_12/npc.c @@ -114,7 +114,7 @@ EvtScript N(EVS_EnterScene) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20 * DT) Call(GetNpcPos, NPC_BigLanternGhost, LVar2, LVar3, LVar4) @@ -132,7 +132,7 @@ EvtScript N(EVS_EnterScene) = { Call(SpeakToPlayer, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01, 0, MSG_CH4_004F) Call(SetPanTarget, CAM_DEFAULT, 50, 0, 20) Call(SetCamSpeed, CAM_DEFAULT, Float(0.7 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(AB_OMO12_LightSource, LIGHT_FROM_GHOST) Set(AB_OMO12_LightPowerMod, -28) Call(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim06) @@ -288,7 +288,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) IfEq(LVarA, -1) Call(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0, MSG_CH4_0058) @@ -346,7 +346,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { Add(LVar0, LVar4) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Label(30) Call(GetNextPathPos) Add(LVar1, LVar7) diff --git a/src/world/area_omo/omo_15/main.c b/src/world/area_omo/omo_15/main.c index 8fbb6472ec0..62b4e1a494e 100644 --- a/src/world/area_omo/omo_15/main.c +++ b/src/world/area_omo/omo_15/main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) Call(SetPanTarget, CAM_DEFAULT, -100, 30, 0) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 3, 180, 215, 60, 0, -100, 85, 0, 30, 0) Thread Call(N(StarSpiritEffectFunc3)) @@ -57,7 +57,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else // just make the card spawn diff --git a/src/world/area_omo/omo_15/npc.c b/src/world/area_omo/omo_15/npc.c index d1a2751ff36..25134be223f 100644 --- a/src/world/area_omo/omo_15/npc.c +++ b/src/world/area_omo/omo_15/npc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = { Call(SetPanTarget, CAM_DEFAULT, 250, -50, 10) Call(SetCamPosB, CAM_DEFAULT, Float(205.0), Float(11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0060) Wait(20 * DT) @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = { Call(InterpPlayerYaw, 90, 0) Call(SetPanTarget, CAM_DEFAULT, 150, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(FadeOutMusic, 0, 3000 * DT) Exec(N(EVS_TrySpawningStarCard)) diff --git a/src/world/area_osr/osr_00/scenes.c b/src/world/area_osr/osr_00/scenes.c index 4dbd562808f..8ce752ce866 100644 --- a/src/world/area_osr/osr_00/scenes.c +++ b/src/world/area_osr/osr_00/scenes.c @@ -48,7 +48,7 @@ EvtScript N(EVS_Scene_ShowInvitation) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamDistance, CAM_DEFAULT, 775) Call(SetCamPitch, CAM_DEFAULT, 20, -19) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(SetModelTintMode), APPLY_TINT_BG, NULL, ENV_TINT_REMAP) Call(N(SetModelTintMode), APPLY_TINT_GROUPS, -1, ENV_TINT_REMAP) Call(N(func_80240678_AACEA8), 200, 200, 200, 40, 40, 40) @@ -72,7 +72,7 @@ EvtScript N(EVS_Scene_ApproachParty) = { Call(SetCamPitch, CAM_DEFAULT, Float(3.5), Float(-6.0)) Call(SetCamPosA, CAM_DEFAULT, Float(60.0), 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(PlayerMoveTo, 0, -250, 150 * DT) EndThread diff --git a/src/world/area_osr/osr_01/npc.c b/src/world/area_osr/osr_01/npc.c index 67dd4ca8e58..4f71e0b6b3d 100644 --- a/src/world/area_osr/osr_01/npc.c +++ b/src/world/area_osr/osr_01/npc.c @@ -15,7 +15,7 @@ EvtScript N(EVS_Scene_Wishing) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPitch, CAM_DEFAULT, Float(3.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Call(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_HOS_006F) diff --git a/src/world/area_osr/osr_02/npc.c b/src/world/area_osr/osr_02/npc.c index 1c2d41694c7..f00c0c7f132 100644 --- a/src/world/area_osr/osr_02/npc.c +++ b/src/world/area_osr/osr_02/npc.c @@ -135,11 +135,11 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.0)) Call(SetCamDistance, CAM_DEFAULT, Float(700.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SetPlayerAnimation, ANIM_MarioW1_TakeItem) @@ -184,7 +184,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) @@ -193,7 +193,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 0, MSG_Outro_0001) Call(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) @@ -201,7 +201,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 0, MSG_Outro_0002) Call(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) @@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 0, MSG_Outro_0003) Call(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) @@ -217,7 +217,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Misstar, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 0, MSG_Outro_0004) Call(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) @@ -225,7 +225,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, 0, MSG_Outro_0005) Call(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) @@ -233,7 +233,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 0, MSG_Outro_0006) Call(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) @@ -241,7 +241,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-5.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_Outro_0007) Call(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) @@ -250,7 +250,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-2.0)) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Outro_0008) @@ -260,7 +260,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, Float(275.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_Outro_0009) Wait(20) @@ -326,7 +326,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-4.0)) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Outro_000A) Wait(10) diff --git a/src/world/area_osr/osr_03/ending.c b/src/world/area_osr/osr_03/ending.c index 963d4975702..230709f8bd2 100644 --- a/src/world/area_osr/osr_03/ending.c +++ b/src/world/area_osr/osr_03/ending.c @@ -130,12 +130,12 @@ EvtScript N(EVS_Scene_CastleDestruction) = { Call(SetCamPitch, CAM_DEFAULT, Float(-20.0), Float(-4.0)) Call(SetCamPosA, CAM_DEFAULT, 0, -40) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20) Call(SetPanTarget, CAM_DEFAULT, 0, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(-13.0), Float(15.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.3)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Loop(6) diff --git a/src/world/area_osr/osr_03/interlude.c b/src/world/area_osr/osr_03/interlude.c index be5ca45c615..784e3be9c6f 100644 --- a/src/world/area_osr/osr_03/interlude.c +++ b/src/world/area_osr/osr_03/interlude.c @@ -123,7 +123,7 @@ EvtScript N(EVS_Scene_BeginInterlude) = { Call(SetPanTarget, CAM_DEFAULT, 0, -1, 0) Call(SetCamPitch, CAM_DEFAULT, Float(-13.0), Float(18.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(MV_CastleLiftDist, 0) Exec(N(EVS_AnimateSwingingChains)) Exec(N(EVS_AnimateSpinningRing)) diff --git a/src/world/area_osr/osr_03/intro.c b/src/world/area_osr/osr_03/intro.c index 4d821a60267..e77274568c8 100644 --- a/src/world/area_osr/osr_03/intro.c +++ b/src/world/area_osr/osr_03/intro.c @@ -217,7 +217,7 @@ EvtScript N(MV_Scene_CastleAscending) = { Call(SetPanTarget, CAM_DEFAULT, -150, 0, 0) Call(SetCamPitch, CAM_DEFAULT, Float(-13.0), Float(18.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Exec(N(EVS_AnimateCastle)) Wait(1) Call(SetPanTarget, CAM_DEFAULT, -50, 200, 0) @@ -255,7 +255,7 @@ EvtScript N(MV_Scene_PlayerTossedOut) = { Call(SetPanTarget, CAM_DEFAULT, 0, -1, 0) Call(SetCamPitch, CAM_DEFAULT, Float(-13.0), Float(18.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Set(MV_CastleLiftDist, 0) Exec(N(EVS_AnimateSwingingChains)) @@ -307,7 +307,7 @@ EvtScript N(EVS_Scene_UnusedTossOut) = { Call(SetCamPosB, CAM_DEFAULT, 300, 80) Call(SetCamPitch, CAM_DEFAULT, Float(-30.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(DisablePlayerPhysics, TRUE) Wait(15) diff --git a/src/world/area_osr/osr_03/starship.c b/src/world/area_osr/osr_03/starship.c index a0ff79cc041..06e1af31018 100644 --- a/src/world/area_osr/osr_03/starship.c +++ b/src/world/area_osr/osr_03/starship.c @@ -50,7 +50,7 @@ EvtScript N(EVS_Scene_Starship) = { Call(SetPanTarget, CAM_DEFAULT, 0, -1, 0) Call(SetCamPitch, CAM_DEFAULT, Float(-13.0), Float(18.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(PlaySound, SOUND_STARSHIP_NEAR_FLYBY) Call(MakeLerp, 50, 10, 10, EASING_LINEAR) diff --git a/src/world/area_pra/pra_01/npc.c b/src/world/area_pra/pra_01/npc.c index 6c58a419123..d2212b3f42a 100644 --- a/src/world/area_pra/pra_01/npc.c +++ b/src/world/area_pra/pra_01/npc.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { Call(SetCamDistance, CAM_DEFAULT, Float(575.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -5) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) @@ -61,7 +61,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -6) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR) Loop(0) @@ -103,7 +103,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { Call(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016E) @@ -113,7 +113,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016F) diff --git a/src/world/area_pra/pra_09/npc.c b/src/world/area_pra/pra_09/npc.c index f91113077ed..71ac9da8879 100644 --- a/src/world/area_pra/pra_09/npc.c +++ b/src/world/area_pra/pra_09/npc.c @@ -102,7 +102,7 @@ EvtScript N(EVS_FocusCam_OnPosition) = { Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-5.5)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(20.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -115,9 +115,9 @@ EvtScript N(EVS_FocusCam_StartBattle) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosB, CAM_DEFAULT, Float(386.0), Float(20.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; @@ -132,9 +132,9 @@ EvtScript N(EVS_FocusCam_OnPlayer) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(20.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; @@ -159,7 +159,7 @@ EvtScript N(EVS_Imposter_Unmask) = { EndIf Call(EndSpeech, LVar4, ANIM_Duplighost_Anim05, ANIM_Duplighost_Anim02, 0) ExecWait(N(EVS_FocusCam_OnPlayer)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Thread Call(SetNpcAnimation, LVar4, ANIM_Duplighost_Anim04) Call(InterpNpcYaw, LVar4, 90, 0) @@ -309,10 +309,10 @@ EvtScript N(EVS_PreventPlayerLeaving) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Thread Loop(30) @@ -406,7 +406,7 @@ EvtScript N(EVS_ManageImpostersScene) = { Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-7.0)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(20.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Set(LVar0, NPC_Bombette_04) @@ -504,7 +504,7 @@ EvtScript N(EVS_ManageImpostersScene) = { ExecWait(N(EVS_FocusCam_OnPosition)) Call(SpeakToPlayer, NPC_Bombette_04, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH7_0143) Call(ResetCam, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) Loop(0) diff --git a/src/world/area_pra/pra_13/npc.c b/src/world/area_pra/pra_13/npc.c index 9860e56ce6e..0177962464d 100644 --- a/src/world/area_pra/pra_13/npc.c +++ b/src/world/area_pra/pra_13/npc.c @@ -94,7 +94,7 @@ EvtScript N(EVS_Scene_ImpostersCaught) = { Call(SpeakToPlayer, NPC_FakeMario, ANIM_Mario1_Flail, ANIM_Mario1_Flail, 0, MSG_CH7_0139) Call(SpeakToPlayer, NPC_FakeBombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH7_013A) Call(ResetCam, CAM_DEFAULT, Float(6.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Thread Call(GetNpcPos, NPC_FakeMario, LVar0, LVar1, LVar2) Call(SetNpcPos, NPC_FakeMario, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_pra/pra_19/npc.c b/src/world/area_pra/pra_19/npc.c index 6a2f6f52bcc..a39ff283571 100644 --- a/src/world/area_pra/pra_19/npc.c +++ b/src/world/area_pra/pra_19/npc.c @@ -212,7 +212,7 @@ EvtScript N(EVS_FocusCam_OnPosition) = { Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-5.5)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(20.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -225,9 +225,9 @@ EvtScript N(EVS_FocusCam_StartBattle) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosB, CAM_DEFAULT, Float(386.0), Float(20.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; @@ -242,9 +242,9 @@ EvtScript N(EVS_FocusCam_OnPlayer) = { Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(20.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; @@ -269,7 +269,7 @@ EvtScript N(EVS_Imposter_Unmask) = { EndIf Call(EndSpeech, LVar4, ANIM_Duplighost_Anim05, ANIM_Duplighost_Anim02, 0) ExecWait(N(EVS_FocusCam_OnPlayer)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Thread Call(SetNpcAnimation, LVar4, ANIM_Duplighost_Anim04) Call(InterpNpcYaw, LVar4, 90, 0) @@ -420,10 +420,10 @@ EvtScript N(EVS_PreventPlayerLeaving) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Thread Loop(30) @@ -736,7 +736,7 @@ EvtScript N(EVS_ManageImpostersScene) = { ExecWait(N(EVS_FocusCam_OnPosition)) Call(SpeakToPlayer, NPC_FakeLuigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH7_015A) Call(ResetCam, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) Loop(0) diff --git a/src/world/area_pra/pra_31/puzzle.c b/src/world/area_pra/pra_31/puzzle.c index 2558210e417..20403972221 100644 --- a/src/world/area_pra/pra_31/puzzle.c +++ b/src/world/area_pra/pra_31/puzzle.c @@ -327,7 +327,7 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPosA, CAM_DEFAULT, Float(323.3), Float(-66.5)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(296.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(45) @@ -391,7 +391,7 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { Call(PlayModelAnimation, MDL_ANIMATOR_0, Ref(N(AS_Stairs_Unfold))) Wait(200) Set(GB_StoryProgress, STORY_CH7_SOLVED_ALBINO_DINO_PUZZLE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_pra/pra_32/main.c b/src/world/area_pra/pra_32/main.c index 7998e6ecf36..8a680560666 100644 --- a/src/world/area_pra/pra_32/main.c +++ b/src/world/area_pra/pra_32/main.c @@ -17,7 +17,7 @@ EvtScript N(EVS_SpawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, 595, 130, 116) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 6, 180, 590, 120, 116, 595, 185, 116, 130, 100) Thread Call(N(StarSpiritEffectFunc3)) @@ -52,7 +52,7 @@ EvtScript N(EVS_SpawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 6, 595, 130, 116, 100) @@ -79,7 +79,7 @@ EvtScript N(EVS_RespawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, 595, 130, 116) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 6, 180, 590, 120, 116, 595, 185, 116, 130, 100) Thread Call(N(StarSpiritEffectFunc3)) @@ -114,7 +114,7 @@ EvtScript N(EVS_RespawnStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 6, 595, 130, 116, 100) diff --git a/src/world/area_pra/pra_32/npc.c b/src/world/area_pra/pra_32/npc.c index a14efdfe47b..9f316aefdb3 100644 --- a/src/world/area_pra/pra_32/npc.c +++ b/src/world/area_pra/pra_32/npc.c @@ -28,7 +28,7 @@ EvtScript N(EVS_AnimateCam_CrystalKing) = { Call(SetPanTarget, CAM_DEFAULT, 588, LVar5, 116) Call(SetCamDistance, CAM_DEFAULT, MV_CamDistance) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndIf Wait(1) IfEq(LVar1, 0) @@ -60,7 +60,7 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = { Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-10.0)) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(30 * DT) Call(SetPlayerAnimation, ANIM_Mario1_BeforeJump) Call(SetPlayerPos, 475, 100, 116) @@ -114,7 +114,7 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_CrystalKing_01, ANIM_CrystalKing_Anim09, ANIM_CrystalKing_Anim09, 0, MSG_CH7_016B) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetPlayerAnimation, ANIM_Mario1_Run) Call(SetPlayerSpeed, Float(2.5 / DT)) Thread @@ -141,7 +141,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-10.0)) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_CrystalKing_01, ANIM_CrystalKing_Anim09, ANIM_CrystalKing_Anim09, 0, MSG_CH7_016C) Thread @@ -200,7 +200,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { Call(SetNpcPos, NPC_CrystalKing_01, NPC_DISPOSE_LOCATION) Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Wait(75 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1309, SURFACE_TYPE_SNOW) Wait(25) Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_sam/sam_01/npc.c b/src/world/area_sam/sam_01/npc.c index 2a310dd14f7..bfef7037ad9 100644 --- a/src/world/area_sam/sam_01/npc.c +++ b/src/world/area_sam/sam_01/npc.c @@ -155,10 +155,10 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SpeakToPlayer, NPC_SELF, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_003D) Call(ResetCam, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) Set(GB_StoryProgress, STORY_CH7_GOT_SNOWMAN_BUCKET) CaseLt(STORY_CH7_UNLOCKED_SHIVER_MOUNTAIN) diff --git a/src/world/area_sam/sam_01/scenes.c b/src/world/area_sam/sam_01/scenes.c index 8a7c03005fc..119d21656c1 100644 --- a/src/world/area_sam/sam_01/scenes.c +++ b/src/world/area_sam/sam_01/scenes.c @@ -86,7 +86,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetCamPosA, CAM_DEFAULT, Float(-300.0), Float(-53.7)) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) ExecWait(N(EVS_OpenMayorsOfficeDoor)) Thread @@ -103,7 +103,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetPanTarget, CAM_DEFAULT, -255, 0, -150) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.4 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePartnerAI, 0) Call(SetPlayerPos, -284, 0, -165) Call(InterpPlayerYaw, 180, 0) @@ -139,14 +139,14 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(210.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(GetNpcPos, NPC_MayorPenguinWife, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndLoop Call(SetMotionBlurParams, 0, 0, 0, 320, 240, 0, 10) @@ -178,7 +178,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetCamDistance, CAM_DEFAULT, Float(600.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.6 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpPlayerYaw, 180, 5) Wait(20 * DT) Call(InterpPlayerYaw, 0, 5) @@ -195,7 +195,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetNpcPos, NPC_PARTNER, -306, 0, -116) Call(SetNpcYaw, NPC_PARTNER, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Call(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Horror, ANIM_MayorPenguinWife_Horror, 5, MSG_CH7_0008) @@ -231,7 +231,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetPanTarget, CAM_DEFAULT, -255, 0, -150) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.4 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(30 * DT) Call(PlayerMoveTo, -315, -150, 20 * DT) @@ -267,7 +267,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(SetCamPitch, CAM_DEFAULT, Float(17.5), Float(-8.0)) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetAngleToPlayer, NPC_PenguinPatrol, LVar0) Call(InterpNpcYaw, NPC_PenguinPatrol, LVar0, 0) Call(PlayerFaceNpc, NPC_PenguinPatrol, FALSE) @@ -314,9 +314,9 @@ EvtScript N(EVS_Scene_MysteryBegins) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_TalkThink, ANIM_PenguinPatrol_StillThink, 0, MSG_CH7_0019) Call(SetPlayerAnimation, ANIM_Mario1_NodYes) Wait(20 * DT) @@ -368,7 +368,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerPos, -255, 0, -135) Call(PlayerFaceNpc, NPC_PenguinPatrol, FALSE) Wait(10 * DT) @@ -419,7 +419,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { DivF(LVar2, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Herringway, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_0021) @@ -428,7 +428,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(GetAngleBetweenNPCs, NPC_MayorPenguinWife, NPC_PenguinPatrol, LVar0) Call(InterpNpcYaw, NPC_MayorPenguinWife, LVar0, 0) Call(GetAngleBetweenNPCs, NPC_Herringway, NPC_PenguinPatrol, LVar0) @@ -465,7 +465,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetAngleBetweenNPCs, NPC_MayorPenguinWife, NPC_PenguinPatrol, LVar0) Call(InterpNpcYaw, NPC_MayorPenguinWife, LVar0, 0) Call(GetAngleBetweenNPCs, NPC_Herringway, NPC_PenguinPatrol, LVar0) @@ -492,7 +492,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(FadeOutMusic, 0, 500) Call(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch, ANIM_MayorPenguin_Twitch, 0, MSG_CH7_0026) @@ -551,7 +551,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SpeakToNpc, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, NPC_MayorPenguin, MSG_CH7_002A) Wait(10 * DT) Call(SpeakToNpc, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, NPC_PenguinPatrol, MSG_CH7_002B) @@ -559,7 +559,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(280.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_CarryTalk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_002C) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread @@ -610,7 +610,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPosA, CAM_DEFAULT, Float(-300.0), Float(0.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.3 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Carry) Call(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2) Add(LVar2, -35) @@ -642,7 +642,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(InterpNpcYaw, NPC_MayorPenguin, 0, 0) Call(InterpNpcYaw, NPC_MayorPenguinWife, 0, 0) @@ -652,7 +652,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(0.3 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Wait(10 * DT) Call(SetNpcSpeed, NPC_MayorPenguin, Float(3.0 / DT)) @@ -703,7 +703,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30 * DT) Call(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0033) @@ -718,7 +718,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { Call(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_INACTIVE, TRUE) Call(EnableNpcShadow, NPC_Herringway, FALSE) Call(ResetCam, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(MV_DialogueState_Penguin1, 0) Set(MV_DialogueState_Penguin2, 0) Set(MV_DialogueState_Penguin3, 0) diff --git a/src/world/area_sam/sam_02/npc.c b/src/world/area_sam/sam_02/npc.c index 9f2f2c77d44..50cafeeaf58 100644 --- a/src/world/area_sam/sam_02/npc.c +++ b/src/world/area_sam/sam_02/npc.c @@ -68,7 +68,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, 315, -171) Call(SetCamPosC, CAM_DEFAULT, 0, 23) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlayerMoveTo, 274, -270, 0) Call(InterpPlayerYaw, 229, 1) @@ -87,7 +87,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_sam/sam_03/npc1.c b/src/world/area_sam/sam_03/npc1.c index 41a57a8b247..e050f50ff6f 100644 --- a/src/world/area_sam/sam_03/npc1.c +++ b/src/world/area_sam/sam_03/npc1.c @@ -34,7 +34,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(SetCamDistance, CAM_DEFAULT, Float(225.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_Idle, 0, MSG_CH7_00D9) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -42,7 +42,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH7_00DA) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Call(NpcMoveTo, NPC_JrTroopa, LVar3, LVar5, 0) EndThread Call(StartBossBattle, SONG_JR_TROOPA_BATTLE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Return End }; @@ -96,11 +96,11 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(200.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(5 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) diff --git a/src/world/area_sam/sam_04/snowmen.c b/src/world/area_sam/sam_04/snowmen.c index c75cfa1f019..afd6af27d68 100644 --- a/src/world/area_sam/sam_04/snowmen.c +++ b/src/world/area_sam/sam_04/snowmen.c @@ -120,13 +120,13 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Snowman_03, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011B) Call(GetNpcPos, NPC_Snowman_06, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15 * DT) Call(SpeakToPlayer, NPC_Snowman_06, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011C) @@ -137,13 +137,13 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Snowman_06, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011C) Call(GetNpcPos, NPC_Snowman_03, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15 * DT) Call(SpeakToPlayer, NPC_Snowman_03, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011B) @@ -151,7 +151,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { Call(UseSettingsFrom, CAM_DEFAULT, 0, 0, -140) Call(SetPanTarget, CAM_DEFAULT, 0, 0, -100) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(ShowMessageAtScreenPos, MSG_CH7_011D, 160, 40) Call(SetNpcFlagBits, NPC_Snowman_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -261,7 +261,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, -240) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlaySoundAt, SOUND_SAM_SNOWMEN_RAISE_WALL, SOUND_SPACE_DEFAULT, 0, 0, -300) Call(MakeLerp, 0, 100, 200 * DT, EASING_COS_IN_OUT) @@ -297,7 +297,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { Goto(1) EndIf Wait(60 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) diff --git a/src/world/area_sam/sam_05/scenes.c b/src/world/area_sam/sam_05/scenes.c index 5a564cc8a98..84eb1a5f470 100644 --- a/src/world/area_sam/sam_05/scenes.c +++ b/src/world/area_sam/sam_05/scenes.c @@ -24,7 +24,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = { Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) Add(LVar0, -25) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) IfEq(LFlag0, FALSE) Call(SetNpcPos, NPC_Monstar, 615, 85, 0) @@ -46,7 +46,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = { Call(SetCamDistance, CAM_DEFAULT, Float(425.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5 * DT) Call(SpeakToPlayer, NPC_Monstar, ANIM_Monstar_Talk, ANIM_Monstar_Idle1, 256, 0, 100, MSG_CH7_00E2) @@ -60,7 +60,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-5.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetNpcAnimation, NPC_SELF, ANIM_Monstar_Idle1) Exec(N(EVS_SetupMusic)) @@ -90,7 +90,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-12.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Monstar, ANIM_Monstar_RearUp, ANIM_Monstar_RearUp, 256, 0, 200, MSG_CH7_00E4) Call(SetNpcVar, NPC_Monstar, 0, 1) @@ -258,7 +258,7 @@ EvtScript N(EVS_Scene_MonstarDefeated) = { Call(SetCamDistance, CAM_DEFAULT, Float(375.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Monstar, ANIM_Monstar_Flail, ANIM_Monstar_Flail, 256, 170, 150, MSG_CH7_00E8) ExecWait(N(EVS_StarKidsFlee)) @@ -270,7 +270,7 @@ EvtScript N(EVS_Scene_MonstarDefeated) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-5.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Exec(N(EVS_SetupMusic)) Call(DisablePlayerInput, FALSE) Return diff --git a/src/world/area_sam/sam_06/npc.c b/src/world/area_sam/sam_06/npc.c index d5895677ad4..2e7a8eead66 100644 --- a/src/world/area_sam/sam_06/npc.c +++ b/src/world/area_sam/sam_06/npc.c @@ -180,13 +180,13 @@ EvtScript N(EVS_Scene_Merle_Greeting) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00EA) Call(UseSettingsFrom, CAM_DEFAULT, -250, 0, 300) Call(SetPanTarget, CAM_DEFAULT, -250, 0, 300) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk) Call(SetNpcSpeed, NPC_Merle, Float(3.0 / DT)) @@ -195,7 +195,7 @@ EvtScript N(EVS_Scene_Merle_Greeting) = { Call(GetAngleToPlayer, NPC_Merle, LVar0) Call(InterpNpcYaw, NPC_Merle, LVar0, 0) Call(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00EB) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(AF_SAM_05, TRUE) Set(GB_StoryProgress, STORY_CH7_ARRIVED_AT_STARBORN_VALLEY) @@ -401,11 +401,11 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { Call(SetCamPosB, CAM_DEFAULT, Float(0.7), Float(-321.0)) Call(SetCamPitch, CAM_DEFAULT, Float(21.0), Float(-14.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5 * DT) Call(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00EF) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F0) @@ -417,7 +417,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { Call(SetCamPosB, CAM_DEFAULT, Float(0.7), Float(-250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(21.0), Float(-14.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcSpeed, NPC_Merle, Float(2.0 / DT)) Call(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk) ExecGetTID(N(EVS_Merle_CarryScarf), LVarA) @@ -435,7 +435,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { Call(SetCamPosA, CAM_DEFAULT, Float(200.7), Float(-321.0)) Call(SetCamPosB, CAM_DEFAULT, Float(0.7), Float(-321.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.7)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcSpeed, NPC_Merle, Float(2.0 / DT)) Call(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk) Call(NpcMoveTo, NPC_Merle, 0, -330, 0) @@ -449,9 +449,9 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(BindNpcInteract, NPC_Merle, Ref(N(EVS_NpcInteract_Merle))) Call(SetNpcFlagBits, NPC_Merle, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) Call(DisablePlayerInput, FALSE) @@ -530,7 +530,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F3) Call(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE) @@ -564,9 +564,9 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Set(AF_SAM_05, FALSE) Set(GB_StoryProgress, STORY_CH7_GOT_SNOWMAN_SCARF) @@ -757,7 +757,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(SetCamPosB, CAM_DEFAULT, Float(-318.1), Float(-35.5)) Call(SetCamPosC, CAM_DEFAULT, Float(-641.0), Float(122.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlayerMoveTo, -347, -114, 0) Call(InterpPlayerYaw, 229, 1) @@ -776,7 +776,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread Return End diff --git a/src/world/area_sam/sam_08/scenes.c b/src/world/area_sam/sam_08/scenes.c index 3c46945343a..6f39fc12c3f 100644 --- a/src/world/area_sam/sam_08/scenes.c +++ b/src/world/area_sam/sam_08/scenes.c @@ -137,7 +137,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Kooper_01A, FALSE) Call(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_0121) @@ -178,7 +178,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Kooper_02A, FALSE) Call(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_0128) @@ -220,7 +220,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_TalkSad, ANIM_WorldKooper_StillSad, 0, MSG_CH7_012C) Call(GetNpcPos, NPC_Kooper_02A, LVar0, LVar1, LVar2) @@ -284,7 +284,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecGetTID(N(EVS_TwoKoopesFightingFX), MV_KoopersFightingScript) Thread @@ -310,7 +310,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Add(LVar2, -30) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetNpcJumpscale, NPC_Kooper_01A, Float(1.0)) Call(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20 * DT) @@ -334,7 +334,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Add(LVar0, 55) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Thread Call(SetNpcJumpscale, NPC_Kooper_01A, Float(0.0)) Call(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20 * DT) @@ -429,7 +429,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Call(SetCamDistance, CAM_DEFAULT, Float(205.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Kooper_01A, FALSE) Call(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0125) @@ -451,7 +451,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Kooper_01A, FALSE) Call(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0129) @@ -463,7 +463,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Call(SetCamDistance, CAM_DEFAULT, Float(205.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Kooper_02A, FALSE) Call(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0124) @@ -485,7 +485,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PlayerFaceNpc, NPC_Kooper_02A, FALSE) Call(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0128) @@ -508,7 +508,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = { Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Hurt) Wait(20 * DT) Call(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_GHOST_TRANSFORM, SOUND_SPACE_DEFAULT) @@ -558,7 +558,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2) Call(SetNpcPos, NPC_Kooper_01A, NPC_DISPOSE_LOCATION) Call(EnableNpcShadow, NPC_Kooper_01A, FALSE) diff --git a/src/world/area_sam/sam_10/stairs.c b/src/world/area_sam/sam_10/stairs.c index 3666e14a5ab..d4086e70771 100644 --- a/src/world/area_sam/sam_10/stairs.c +++ b/src/world/area_sam/sam_10/stairs.c @@ -95,7 +95,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { Call(N(GetCamPointsNearPlayer)) Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Call(PlaySound, SOUND_SAM_STAIRS_LOUD_THUD) @@ -167,7 +167,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { Call(SetPanTarget, CAM_DEFAULT, 140, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(MakeLerp, 150, 1050, 200, EASING_LINEAR) @@ -190,7 +190,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_m1_kabe, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_m2_kabe, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_m2_yuka, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_sam/sam_11/entity.c b/src/world/area_sam/sam_11/entity.c index c20bb9986a2..2c610fa550d 100644 --- a/src/world/area_sam/sam_11/entity.c +++ b/src/world/area_sam/sam_11/entity.c @@ -300,12 +300,12 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { Call(SetCamPosA, CAM_DEFAULT, Float(-165.0), Float(-140.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-12.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(40) IfGe(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY) Call(SetPlayerAnimation, ANIM_Mario1_Idle) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Call(EnablePartnerAI) @@ -321,7 +321,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Herringway, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH7_00CD) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -330,7 +330,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Wait(1) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Call(DisablePlayerPhysics, FALSE) Call(EnablePartnerAI) diff --git a/src/world/area_sam/sam_11/npc.c b/src/world/area_sam/sam_11/npc.c index e11a25afcab..d33567776d5 100644 --- a/src/world/area_sam/sam_11/npc.c +++ b/src/world/area_sam/sam_11/npc.c @@ -163,7 +163,7 @@ EvtScript N(EVS_NpcInteract_Herringway) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-224.0), Float(-132.0)) Call(SetCamPosB, CAM_DEFAULT, Float(-127.0), Float(-314.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerPos, -137, 150, -340) Call(PlayerFaceNpc, NPC_SELF, FALSE) Call(SetNpcPos, NPC_PARTNER, -170, 150, -350) @@ -186,7 +186,7 @@ EvtScript N(EVS_NpcInteract_Herringway) = { Wait(1) EndLoop EndThread - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) Call(SetNpcSpeed, NPC_SELF, Float(3.0 / DT)) Call(SetNpcAnimation, NPC_SELF, ANIM_Herringway_Walk) @@ -823,7 +823,7 @@ EvtScript N(EVS_Scene_EpilogueDelivery) = { Call(SetCamDistance, CAM_DEFAULT, Float(-300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) Call(NpcFlyTo, NPC_Parakarry, 270, 15, 26, 50, 0, EASING_LINEAR) @@ -896,7 +896,7 @@ EvtScript N(EVS_Scene_EpilogueDelivery) = { Call(SetCamDistance, CAM_DEFAULT, Float(-450.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Thread Call(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) diff --git a/src/world/area_sam/sam_11/pond.c b/src/world/area_sam/sam_11/pond.c index 665a35e6bf3..f01d8eeed9b 100644 --- a/src/world/area_sam/sam_11/pond.c +++ b/src/world/area_sam/sam_11/pond.c @@ -328,14 +328,14 @@ EvtScript N(EVS_DamageFrozenPond_After) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar1, LVar5) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar1, LVar5) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) EndLoop Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndThread EndIf Call(PlaySoundAt, SOUND_SAM_POND_SHATTER, SOUND_SPACE_DEFAULT, 0, 60, 220) diff --git a/src/world/area_sam/sam_12/scenes.c b/src/world/area_sam/sam_12/scenes.c index 3cdadd03ddd..9123a1b18d1 100644 --- a/src/world/area_sam/sam_12/scenes.c +++ b/src/world/area_sam/sam_12/scenes.c @@ -132,7 +132,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EndIf Call(UseSettingsFrom, CAM_DEFAULT, 160, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 160, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerSpeed, Float(3.0 / DT)) Call(PlayerMoveTo, 90, 0, 0) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) @@ -158,7 +158,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(60.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Merlar, ANIM_Merlar_Talk, ANIM_Merlar_Hover, 0, MSG_CH7_0134) Call(SetPanTarget, CAM_DEFAULT, 160, 0, 0) @@ -208,14 +208,14 @@ EvtScript N(EVS_Scene_MeetMerlar) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.5)) Call(SetCamPosB, CAM_DEFAULT, Float(500.0), Float(60.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Merlar, ANIM_Merlar_Talk, ANIM_Merlar_Hover, 0, MSG_CH7_0137) Wait(30 * DT) Call(SetPanTarget, CAM_DEFAULT, 230, 0, 0) Call(SetCamPosB, CAM_DEFAULT, Float(230.0), Float(60.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Loop(5) @@ -254,7 +254,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EndLoop Call(SetNpcPos, NPC_Merlar, NPC_DISPOSE_LOCATION) Set(GB_StoryProgress, STORY_CH7_GOT_STAR_STONE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_sbk/sbk_02/npc.c b/src/world/area_sbk/sbk_02/npc.c index 426470b54ce..7b315ecaf49 100644 --- a/src/world/area_sbk/sbk_02/npc.c +++ b/src/world/area_sbk/sbk_02/npc.c @@ -52,19 +52,19 @@ EvtScript N(EVS_Scene_RescuedMamar) = { Call(SetCamDistance, CAM_DEFAULT, 600) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00EB) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -9) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR) Loop(0) @@ -106,7 +106,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { Call(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00EC) @@ -118,7 +118,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00ED) @@ -165,7 +165,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { Wait(10 * DT) Call(SetPlayerAnimation, ANIM_Mario1_LookUp) Wait(90 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(20 * DT) Call(SetPlayerAnimation, ANIM_Mario1_Idle) Set(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) diff --git a/src/world/area_sbk/sbk_02/ruins.c b/src/world/area_sbk/sbk_02/ruins.c index 61fabc90496..643346500fa 100644 --- a/src/world/area_sbk/sbk_02/ruins.c +++ b/src/world/area_sbk/sbk_02/ruins.c @@ -601,7 +601,7 @@ EvtScript N(EVS_OnInteract_Pedestal) = { Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Set(LVar0, 180) ExecWait(N(EVS_SetChompStatueRotation)) @@ -640,7 +640,7 @@ EvtScript N(EVS_OnInteract_Pedestal) = { Wait(100) Call(SetCamPitch, CAM_DEFAULT, Float(8.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(80) Exec(N(EVS_InterpChompStatueRotation)) Wait(60) @@ -694,7 +694,7 @@ EvtScript N(EVS_Ruins_Arise_Continued) = { Call(SetCamPitch, CAM_DEFAULT, Float(8.0), Float(-9.0)) Call(SetCamDistance, CAM_DEFAULT, Float(500.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(SetModelTintMode), APPLY_TINT_BG, NULL, ENV_TINT_REMAP) Call(N(SetModelTintMode), APPLY_TINT_GROUPS, -1, ENV_TINT_REMAP) Call(N(SetModelTintMode), APPLY_TINT_GROUPS, Ref(N(ModelList_Solid)), ENV_TINT_NONE) @@ -714,7 +714,7 @@ EvtScript N(EVS_Ruins_Arise_Continued) = { Call(SetCamPitch, CAM_DEFAULT, Float(4.0), Float(-6.5)) Call(SetCamDistance, CAM_DEFAULT, Float(790.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(100) Exec(N(EVS_Doors_Open)) Wait(100) @@ -727,7 +727,7 @@ EvtScript N(EVS_Ruins_Arise_Continued) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(func_802CF56C, 0) Call(DisablePlayerInput, FALSE) Return diff --git a/src/world/area_sbk/sbk_30/main.c b/src/world/area_sbk/sbk_30/main.c index 57f483e5be6..a95ef76d3cd 100644 --- a/src/world/area_sbk/sbk_30/main.c +++ b/src/world/area_sbk/sbk_30/main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_Scene_RuinsRising) = { Call(UseSettingsFrom, CAM_DEFAULT, 193, 0, -237) Call(SetPanTarget, CAM_DEFAULT, 193, 0, -237) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(SetModelTintMode), APPLY_TINT_BG, NULL, ENV_TINT_REMAP) Call(N(SetModelTintMode), APPLY_TINT_GROUPS, -1, ENV_TINT_REMAP) Call(N(SetModelTintParams), ENV_TINT_REMAP, 44, 32, 177, 0, 0, 0, 0, 0, 0) diff --git a/src/world/area_tik/tik_02/npc.c b/src/world/area_tik/tik_02/npc.c index 44a8526601f..476a4dbed87 100644 --- a/src/world/area_tik/tik_02/npc.c +++ b/src/world/area_tik/tik_02/npc.c @@ -21,7 +21,7 @@ EvtScript N(EVS_NpcIdle_Blooper) = { Call(UseSettingsFrom, CAM_DEFAULT, -25, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, -25, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Thread @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { Set(GF_TIK_DefeatedTwoBloopers, TRUE) EndIf Set(GF_TIK02_Defeated_Blooper, TRUE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Exec(N(EVS_SetupMusic)) Call(DisablePlayerInput, FALSE) Call(RemoveNpc, NPC_SELF) diff --git a/src/world/area_tik/tik_06/entity.c b/src/world/area_tik/tik_06/entity.c index 4847bb056d2..e75959567ce 100644 --- a/src/world/area_tik/tik_06/entity.c +++ b/src/world/area_tik/tik_06/entity.c @@ -11,7 +11,7 @@ EvtScript N(EVS_MonitorPlayerFallDown) = { IfGe(LVar1, -10) Goto(0) EndIf - Call(func_802CA988, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) + Call(GrabCamera, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) Label(1) Call(GetPlayerPos, LVar0, LVar1, LVar2) Wait(1) diff --git a/src/world/area_tik/tik_08/npc.c b/src/world/area_tik/tik_08/npc.c index 4dbe74015f5..458f29c3682 100644 --- a/src/world/area_tik/tik_08/npc.c +++ b/src/world/area_tik/tik_08/npc.c @@ -22,7 +22,7 @@ EvtScript N(EVS_NpcIdle_Blooper) = { Call(UseSettingsFrom, CAM_DEFAULT, -25, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, -25, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(InterpPlayerYaw, 270, 0) Wait(20) diff --git a/src/world/area_trd/trd_00/main.c b/src/world/area_trd/trd_00/main.c index 3666418cf5b..1f2f1d7a279 100644 --- a/src/world/area_trd/trd_00/main.c +++ b/src/world/area_trd/trd_00/main.c @@ -35,13 +35,13 @@ EvtScript N(D_80240B34_99A7A4) = { Call(SetCamDistance, CAM_DEFAULT, -1000) Call(SetCamPitch, CAM_DEFAULT, 18, Float(-20.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, -480, 0, 400) Call(SetCamDistance, CAM_DEFAULT, -1300) Call(SetCamPitch, CAM_DEFAULT, 18, Float(-11.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(5) Call(ResetCam, CAM_DEFAULT, Float(4.0)) diff --git a/src/world/area_trd/trd_00/npc.c b/src/world/area_trd/trd_00/npc.c index 6024a0ef5bc..9c442490d3c 100644 --- a/src/world/area_trd/trd_00/npc.c +++ b/src/world/area_trd/trd_00/npc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetPanTarget, CAM_DEFAULT, -570, 0, 173) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) @@ -91,7 +91,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EndIf Call(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_DEFAULT) Wait(10 * DT) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(3.5 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(DisablePlayerInput, FALSE) @@ -145,7 +145,7 @@ EvtScript N(D_80241DA4_99BA14) = { Call(SetPanTarget, CAM_DEFAULT, -527, 0, 216) Call(SetCamDistance, CAM_DEFAULT, Float(475.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) @@ -154,7 +154,7 @@ EvtScript N(D_80241DA4_99BA14) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR) Loop(0) @@ -221,7 +221,7 @@ EvtScript N(D_80241DA4_99BA14) = { Call(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0112) Wait(10 * DT) @@ -229,7 +229,7 @@ EvtScript N(D_80241DA4_99BA14) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0113) diff --git a/src/world/area_trd/trd_01/entity.c b/src/world/area_trd/trd_01/entity.c index cf42a368458..84f7229cd34 100644 --- a/src/world/area_trd/trd_01/entity.c +++ b/src/world/area_trd/trd_01/entity.c @@ -13,9 +13,9 @@ EvtScript N(EVS_FocusCamOnLock) = { Call(GetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosA, CAM_DEFAULT, Float(-64.0), LVar1) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(AwaitPlayerLeave, 320, 0, 60) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) EndIf Wait(1) Goto(0) @@ -49,7 +49,7 @@ EvtScript N(EVS_UnlockDoors) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Padlock_EntityIndex) Call(N(RemovePadlock)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) ResumeGroup(EVT_GROUP_01) Unbind Return diff --git a/src/world/area_trd/trd_01/main.c b/src/world/area_trd/trd_01/main.c index 265cb01a1aa..f558fe7b0f1 100644 --- a/src/world/area_trd/trd_01/main.c +++ b/src/world/area_trd/trd_01/main.c @@ -55,7 +55,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamPitch, CAM_DEFAULT, 18, 12) Call(SetCamSpeed, CAM_DEFAULT, Float(0.4 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10 * DT) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) @@ -266,7 +266,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { Call(EnableModel, MODEL_sui2, FALSE) EndThread Call(UseSettingsFrom, CAM_DEFAULT, 0, 220, 255) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(ResetCam, CAM_DEFAULT, Float(1.5 / DT)) Call(StopSound, SOUND_LOOP_TRD_FLOWING_WATER) diff --git a/src/world/area_trd/trd_03/npc.c b/src/world/area_trd/trd_03/npc.c index 00e4711bf8c..93e8327a3fb 100644 --- a/src/world/area_trd/trd_03/npc.c +++ b/src/world/area_trd/trd_03/npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { Call(SetCamDistance, CAM_DEFAULT, 320) Call(SetPanTarget, CAM_DEFAULT, -607, 0, 80) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Wait(10 * DT) Call(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Idle) @@ -72,7 +72,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { Wait(15 * DT) Wait(10 * DT) Call(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Talk, ANIM_KoopaBros_Green_Idle, 5, MSG_CH1_00D3) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Wait(10 * DT) Call(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_DEFAULT) diff --git a/src/world/area_trd/trd_03/puzzle.c b/src/world/area_trd/trd_03/puzzle.c index 75ac08b5f30..841a6b13ed5 100644 --- a/src/world/area_trd/trd_03/puzzle.c +++ b/src/world/area_trd/trd_03/puzzle.c @@ -82,7 +82,7 @@ EvtScript N(EVS_TogglePlatforms_LeftSwitch) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15 * DT) IfEq(MV_PlatformsExtended, FALSE) @@ -161,7 +161,7 @@ EvtScript N(EVS_TogglePlatforms_LeftSwitch) = { Set(MV_PlatformsExtended, FALSE) EndIf Wait(10) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) @@ -184,7 +184,7 @@ EvtScript N(EVS_TogglePlatforms_RightSwitch) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(15 * DT) IfEq(MV_PlatformsExtended, FALSE) @@ -263,7 +263,7 @@ EvtScript N(EVS_TogglePlatforms_RightSwitch) = { Set(MV_PlatformsExtended, FALSE) EndIf Wait(10) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) diff --git a/src/world/area_trd/trd_04/entity.c b/src/world/area_trd/trd_04/entity.c index caf7d8e34f4..d41cba43ba0 100644 --- a/src/world/area_trd/trd_04/entity.c +++ b/src/world/area_trd/trd_04/entity.c @@ -107,7 +107,7 @@ EvtScript N(EVS_DropSwitch) = { Call(SetPanTarget, CAM_DEFAULT, -188, 0, -43) Call(SetCamDistance, CAM_DEFAULT, Float(510.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(3 * DT) Call(PlaySoundAt, SOUND_FALL_QUICK, SOUND_SPACE_DEFAULT, -180, 175, -35) Call(MakeLerp, 175, 0, 20 * DT, EASING_QUADRATIC_IN) @@ -128,9 +128,9 @@ EvtScript N(EVS_DropSwitch) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_trd/trd_04/main.c b/src/world/area_trd/trd_04/main.c index 724dedf5d98..eb6dcd77563 100644 --- a/src/world/area_trd/trd_04/main.c +++ b/src/world/area_trd/trd_04/main.c @@ -121,7 +121,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { Call(SetCamPitch, CAM_DEFAULT, 15, -6) Call(SetCamPosA, CAM_DEFAULT, -30, -60) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetPlayerPos, -185, 0, -36) Call(InterpPlayerYaw, 90, 0) Call(SetNpcPos, NPC_PARTNER, -163, 0, -12) @@ -205,7 +205,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { Call(SetCamSpeed, CAM_DEFAULT, Float(4.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(2) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(EnableModel, MODEL_o6, TRUE) Call(EnableModel, MODEL_o7, TRUE) Call(EnableModel, MODEL_bero2, TRUE) diff --git a/src/world/area_trd/trd_05/npc.c b/src/world/area_trd/trd_05/npc.c index 7d950004b16..86b77bf4b24 100644 --- a/src/world/area_trd/trd_05/npc.c +++ b/src/world/area_trd/trd_05/npc.c @@ -27,7 +27,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { Call(UseSettingsFrom, CAM_DEFAULT, -70, 240, -10) Call(SetPanTarget, CAM_DEFAULT, -70, 240, -10) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) Thread Loop(8) @@ -169,7 +169,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { Call(UseSettingsFrom, CAM_DEFAULT, -270, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -270, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) Call(PlaySound, SOUND_METAL_DOOR_OPEN) @@ -186,7 +186,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { Call(EnablePartnerAI) Call(SetPlayerPos, -310, 0, 0) ExecWait(N(EVS_EnterMap)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH1_KOOPA_BROS_SET_TRAP) Return End diff --git a/src/world/area_trd/trd_05/trap.c b/src/world/area_trd/trd_05/trap.c index bf2c389a478..06bcd3ae34e 100644 --- a/src/world/area_trd/trd_05/trap.c +++ b/src/world/area_trd/trd_05/trap.c @@ -339,7 +339,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { Call(WaitForCam, CAM_DEFAULT, Float(1.0)) IfLt(GB_StoryProgress, STORY_CH1_MARIO_ACTIVATED_TRAP) Wait(60) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(N(DeleteFallingSprite)) Call(SetNpcPos, NPC_KoopaBros_01, -250, 240, -25) diff --git a/src/world/area_trd/trd_06/falling.c b/src/world/area_trd/trd_06/falling.c index b9a3eb4d6f5..2a3bf8e6c99 100644 --- a/src/world/area_trd/trd_06/falling.c +++ b/src/world/area_trd/trd_06/falling.c @@ -288,7 +288,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { Call(SetCamPosA, CAM_DEFAULT, 300, -500) Call(SetCamPosB, CAM_DEFAULT, -100, 0) Call(SetCamDistance, CAM_DEFAULT, 360) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePartnerAI, 0) Call(DisablePlayerInput, TRUE) Call(DisablePlayerPhysics, TRUE) @@ -347,7 +347,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { Call(SetPlayerAnimation, ANIM_Mario1_Idle) EndThread Call(EndSpeech, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcVar, NPC_Bombette, 0, 1) diff --git a/src/world/area_trd/trd_06/npc_prisoners.c b/src/world/area_trd/trd_06/npc_prisoners.c index aae678cb871..b9dbd1260f6 100644 --- a/src/world/area_trd/trd_06/npc_prisoners.c +++ b/src/world/area_trd/trd_06/npc_prisoners.c @@ -175,13 +175,13 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { Call(SetPanTarget, CAM_DEFAULT, -260, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Idle) Call(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Idle) Call(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 0, MSG_CH1_00F0) Call(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Run) Call(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Run) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Thread Wait(60) Call(MakeLerp, 90, 0, 15, EASING_COS_IN_OUT) diff --git a/src/world/area_trd/trd_07/magic_doors.c b/src/world/area_trd/trd_07/magic_doors.c index 108e24974d4..f3a86e237a7 100644 --- a/src/world/area_trd/trd_07/magic_doors.c +++ b/src/world/area_trd/trd_07/magic_doors.c @@ -216,12 +216,12 @@ EvtScript N(EVS_RaiseMagicDoors) = { Call(N(GetPointsWithCamRelativeOffset), LVar0, LVar2, Float(30.0)) Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnableModel, MODEL_o44, TRUE) Set(LVar0, MODEL_migi) ExecWait(N(EVS_AnimateDoorRaising)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(1) Call(GetPlayerPos, LVar0, LVar1, LVar2) Sub(LVar0, 400) @@ -231,12 +231,12 @@ EvtScript N(EVS_RaiseMagicDoors) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnableModel, MODEL_o43, TRUE) Set(LVar0, MODEL_hidari) ExecWait(N(EVS_AnimateDoorRaising)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) @@ -263,11 +263,11 @@ EvtScript N(EVS_LowerMagicDoors) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVar0, MODEL_migi) ExecWait(N(EVS_AnimateDoorLowering)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Wait(1) EVT_VEC3I_SET(LVar0, 220, 0, 0) Sub(LVar0, 400) @@ -277,11 +277,11 @@ EvtScript N(EVS_LowerMagicDoors) = { Call(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) Call(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVar0, MODEL_hidari) ExecWait(N(EVS_AnimateDoorLowering)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_trd/trd_09/npc.c b/src/world/area_trd/trd_09/npc.c index 68504bcd08a..d2862b75a2e 100644 --- a/src/world/area_trd/trd_09/npc.c +++ b/src/world/area_trd/trd_09/npc.c @@ -176,7 +176,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { Call(SetPanTarget, CAM_DEFAULT, 1490, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 1466, Float(41.6)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20 * DT) Call(SetCamPosB, CAM_DEFAULT, 1466, Float(41.6)) @@ -184,7 +184,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, 25, -9) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(20 * DT) Call(PlaySound, SOUND_METAL_DOOR_OPEN) Call(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 0, 8) @@ -211,7 +211,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { Call(SetCamPosB, CAM_DEFAULT, 1466, Float(41.6)) Call(SetPanTarget, CAM_DEFAULT, 1250, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Land) Call(NpcJump0, NPC_SELF, 1440, 30, 0, 20 * DT) Call(NpcJump0, NPC_SELF, 1380, 0, 0, 20 * DT) @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { Call(SetMusicTrack, 0, SONG_BULLET_BILL_ASSAULT, 0, 8) Wait(60 * DT) Call(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5 / DT)) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0 / DT)) diff --git a/src/world/area_trd/trd_10/main.c b/src/world/area_trd/trd_10/main.c index 778fbc1277a..f02fb160f4e 100644 --- a/src/world/area_trd/trd_10/main.c +++ b/src/world/area_trd/trd_10/main.c @@ -36,7 +36,7 @@ EvtScript N(EVS_BossDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.6)) Call(SetPanTarget, CAM_DEFAULT, -135, 30, 0) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 0, 180, -135, 10, 0, -135, 85, 0, 30, 0) Thread Call(N(StarSpiritEffectFunc3)) @@ -71,7 +71,7 @@ EvtScript N(EVS_BossDefeated) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else Call(N(StarSpiritEffectFunc5), 0, -135, 30, 0, 0) diff --git a/src/world/area_trd/trd_10/npc.c b/src/world/area_trd/trd_10/npc.c index e0c67755c34..7df101c940c 100644 --- a/src/world/area_trd/trd_10/npc.c +++ b/src/world/area_trd/trd_10/npc.c @@ -33,14 +33,14 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { Call(SetPanTarget, CAM_DEFAULT, -240, -170, 0) Call(SetCamPitch, CAM_DEFAULT, 18, -3) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(UseSettingsFrom, CAM_DEFAULT, -240, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -240, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2 / DT)) Call(PanToTarget, CAM_DEFAULT, Float(0.5), 1) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(PlaySound, SOUND_METAL_DOOR_OPEN) Call(MakeLerp, 0, 80, 10, EASING_LINEAR) Label(10) @@ -101,7 +101,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { Call(UseSettingsFrom, CAM_DEFAULT, -160, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -160, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(0.2 / DT)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(AF_TRD_FakeBowserRevealed, TRUE) Wait(60 * DT) Call(DisablePlayerInput, FALSE) @@ -131,7 +131,7 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(EnableGroup, MODEL_nise_koppa, FALSE) Call(SetNpcPos, NPC_KoopaBros_01, -170, 30, -55) diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index b1f13540091..f00df018e21 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -595,7 +595,7 @@ EvtScript N(EVS_Quizmo_SetQuizCamera) = { SetF(LVar0, Float(13.0)) SetF(LVar1, Float(-10.0)) Call(SetCamPitch, 0, LVar0, LVar1) - Call(PanToTarget, 0, 0, 1) + Call(PanToTarget, 0, 0, TRUE) Call(SetCamLeadPlayer, 0, 0) Return End @@ -621,7 +621,7 @@ EvtScript N(EVS_Quizmo_OtherCamScript) = { EvtScript N(EVS_Quizmo_ResetCamera) = { Call(N(Quizmo_SetCamVfov), 0, QUIZ_ARRAY_SAVED_FOV) - Call(PanToTarget, 0, 0, 0) + Call(PanToTarget, 0, 0, FALSE) Return End }; diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index 39ebd3df86f..9751a1dfca0 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -283,7 +283,7 @@ void N(CleftAI_PostDisguise)(Evt* script, MobileAISettings* aiSettings, EnemyDet } } -s32 N(CleftAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CleftAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c index 65f1e294755..45049e06afc 100644 --- a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c +++ b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c @@ -288,7 +288,7 @@ void N(PiranhaPlantAI_LosePlayer)(Evt* script, MobileAISettings* aiSettings, Ene void func_8004D8E0(Enemy*); #endif -s32 N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PiranhaPlantAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index 5d7485eb894..d9d57b9062e 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -189,7 +189,7 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar5, LVar6, LVar7) Call(SetPanTarget, CAM_DEFAULT, LVar5, LVar6, LVar7) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(GetCurrentPartnerID, LVar0) IfNe(LVar0, PARTNER_NONE) Call(DisablePartnerAI, 0) @@ -225,7 +225,7 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { Call(ModifyColliderFlags, 1, LVarB, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) Call(DisablePlayerPhysics, FALSE) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Exec(LVarA) Return End diff --git a/src/world/dead/area_flo/flo_00/beanstalk.c b/src/world/dead/area_flo/flo_00/beanstalk.c index 5e861706191..369b7350ecb 100644 --- a/src/world/dead/area_flo/flo_00/beanstalk.c +++ b/src/world/dead/area_flo/flo_00/beanstalk.c @@ -308,7 +308,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVar9, Float(-59.0)) Set(LVarA, Float(22.0)) Set(LVarB, Float(125.0)) @@ -397,7 +397,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { Call(SetCamDistance, CAM_DEFAULT, 800) Call(SetCamPosA, CAM_DEFAULT, -200, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) CaseDefault EndSwitch @@ -436,7 +436,7 @@ EvtScript N(EVS_Scene_BeanstalkGrewRemark) = { Call(SetCamDistance, CAM_DEFAULT, 800) Call(SetCamPosA, CAM_DEFAULT, -200, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(LVarF, 0) Loop(5) @@ -577,7 +577,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, 250) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_Scene_BeanstalkGrowing)) EndSwitch diff --git a/src/world/dead/area_flo/flo_00/epilogue.c b/src/world/dead/area_flo/flo_00/epilogue.c index 0390dae9b57..89f8bf162c5 100644 --- a/src/world/dead/area_flo/flo_00/epilogue.c +++ b/src/world/dead/area_flo/flo_00/epilogue.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPosA, CAM_DEFAULT, Float(17.5), Float(35.0)) Call(SetCamPosB, CAM_DEFAULT, 0, -50) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(70) Call(InterpNpcYaw, NPC_Lakilester_Epilogue, 90, 0) diff --git a/src/world/dead/area_flo/flo_00/npc.c b/src/world/dead/area_flo/flo_00/npc.c index dcc93bc419f..879d8151f3e 100644 --- a/src/world/dead/area_flo/flo_00/npc.c +++ b/src/world/dead/area_flo/flo_00/npc.c @@ -29,7 +29,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamPosA, CAM_DEFAULT, -27, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(ShowMessageAtWorldPos, MSG_CH6_00C4, 0, 50, -200) @@ -47,7 +47,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(75) Call(ShowMessageAtScreenPos, MSG_CH6_0000, 160, 40) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -64,7 +64,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamDistance, CAM_DEFAULT, 800) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-5.8)) Call(SetCamPosA, CAM_DEFAULT, -2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(15) Call(SpeakToPlayer, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0001) Call(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -75,7 +75,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamDistance, CAM_DEFAULT, 333) Call(SetCamPitch, CAM_DEFAULT, Float(9.0), Float(-22.0)) Call(SetCamPosA, CAM_DEFAULT, -2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnablePartnerAI) Call(func_802D2C14, 1) @@ -84,7 +84,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamPitch, CAM_DEFAULT, Float(16.5), Float(-11.8)) Call(SetCamDistance, CAM_DEFAULT, 525) Call(SetCamPosA, CAM_DEFAULT, -14, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) @@ -94,7 +94,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { Call(SetCamPitch, CAM_DEFAULT, Float(9.0), Float(-22.0)) Call(SetCamDistance, CAM_DEFAULT, 333) Call(SetCamPosA, CAM_DEFAULT, -2, 0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(ShowMessageAtWorldPos, MSG_CH6_0005, 0, 70, -200) @@ -186,7 +186,7 @@ EvtScript N(EVS_Wisterwood_Farewell) = { Call(SetPanTarget, CAM_DEFAULT, 0, 0, -30) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-25.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(ShowMessageAtWorldPos, MSG_CH6_000C, 0, 50, -200) @@ -454,7 +454,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(SetCamDistance, CAM_DEFAULT, Float(475.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -8) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Call(WaitForPlayerInputEnabled) Call(DisablePlayerInput, TRUE) @@ -463,7 +463,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamPitch, CAM_DEFAULT, 18, -9) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(MakeLerp, 0, 360, 10, EASING_LINEAR) Loop(0) @@ -505,7 +505,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00D9) @@ -515,7 +515,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(300.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00DA) diff --git a/src/world/dead/area_flo/flo_03/npc.c b/src/world/dead/area_flo/flo_03/npc.c index 9557efe04d6..0bda4303c2a 100644 --- a/src/world/dead/area_flo/flo_03/npc.c +++ b/src/world/dead/area_flo/flo_03/npc.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamPosA, CAM_DEFAULT, -27, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Petunia, ANIM_Petunia_Talk, ANIM_Petunia_Idle, 0, MSG_CH6_00C8) @@ -167,7 +167,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) Call(SetCamDistance, CAM_DEFAULT, 200) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) @@ -183,7 +183,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim00) Wait(20) @@ -198,7 +198,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-8.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim14) @@ -209,7 +209,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim06) Wait(20) @@ -225,7 +225,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-9.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) Call(PlaySoundAtNpc, NPC_Dayzee, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) diff --git a/src/world/dead/area_flo/flo_07/npc.c b/src/world/dead/area_flo/flo_07/npc.c index eafe6202ee0..b6ade4c5d10 100644 --- a/src/world/dead/area_flo/flo_07/npc.c +++ b/src/world/dead/area_flo/flo_07/npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(11.0), Float(-11.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_00C5) @@ -45,7 +45,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(PlaySound, SOUND_LOOP_RUMBLE) ExecGetTID(N(EVS_ShakeGround), MV_GroundShakingScript) @@ -54,7 +54,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(8.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -178,7 +178,7 @@ EvtScript N(EVS_OnHit_CrystalTree) = { Call(UseSettingsFrom, CAM_DEFAULT, -250, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -250, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 350) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) ExecWait(N(EVS_MakeCrystalBerry)) Call(ResetCam, CAM_DEFAULT, Float(4.0)) EndIf diff --git a/src/world/dead/area_flo/flo_08/npc.c b/src/world/dead/area_flo/flo_08/npc.c index 62c07e089da..23c431a32ce 100644 --- a/src/world/dead/area_flo/flo_08/npc.c +++ b/src/world/dead/area_flo/flo_08/npc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(18.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0042) Call(SetPlayerAnimation, ANIM_Mario1_Thinking) diff --git a/src/world/dead/area_flo/flo_10/fountain.c b/src/world/dead/area_flo/flo_10/fountain.c index a33f53ae99e..b212e9c1f4c 100644 --- a/src/world/dead/area_flo/flo_10/fountain.c +++ b/src/world/dead/area_flo/flo_10/fountain.c @@ -117,7 +117,7 @@ EvtScript N(EVS_RaiseCamera) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.7)) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-22.0)) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End @@ -181,7 +181,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, 600) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(EnableGroup, MODEL_g22, TRUE) Call(TranslateGroup, MODEL_g22, 0, -50, 0) diff --git a/src/world/dead/area_flo/flo_10/npc.c b/src/world/dead/area_flo/flo_10/npc.c index d5137a68abb..ab4d32d70bc 100644 --- a/src/world/dead/area_flo/flo_10/npc.c +++ b/src/world/dead/area_flo/flo_10/npc.c @@ -12,7 +12,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Lily, ANIM_Lily_Talk, ANIM_Lily_Idle, 0, MSG_CH6_00C6) @@ -117,7 +117,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamPitch, CAM_DEFAULT, Float(23.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0078) @@ -131,7 +131,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { Call(SetCamDistance, CAM_DEFAULT, 325) Call(SetCamPitch, CAM_DEFAULT, Float(23.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079) diff --git a/src/world/dead/area_flo/flo_10/waterfx.c b/src/world/dead/area_flo/flo_10/waterfx.c index 5786268c336..81c09c55a39 100644 --- a/src/world/dead/area_flo/flo_10/waterfx.c +++ b/src/world/dead/area_flo/flo_10/waterfx.c @@ -178,7 +178,7 @@ void N(UnkModelFunc001)(void) { f32 temp_f20; f32 temp_f22; - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x - bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); @@ -194,7 +194,7 @@ void N(UnkModelFunc001)(void) { temp_f20 = outX; temp_f22 = outY; - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x - bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); @@ -226,7 +226,7 @@ void N(UnkModelFunc001)(void) { temp_f22 = outY; } - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x + bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); @@ -256,7 +256,7 @@ void N(UnkModelFunc001)(void) { temp_f22 = outY; } - transform_point(camera->perspectiveMatrix, + transform_point(camera->mtxPerspective, model->center.x + bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, &outX, &outY, &outZ, &outW); diff --git a/src/world/dead/area_flo/flo_11/npc.c b/src/world/dead/area_flo/flo_11/npc.c index 0645202e0dc..8e096abb7d7 100644 --- a/src/world/dead/area_flo/flo_11/npc.c +++ b/src/world/dead/area_flo/flo_11/npc.c @@ -220,7 +220,7 @@ EvtScript N(EVS_Scene_LakituAmbush) = { Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-7.0)) Call(SetCamDistance, CAM_DEFAULT, 450) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Set(LVar0, 270) @@ -233,12 +233,12 @@ EvtScript N(EVS_Scene_LakituAmbush) = { Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamPosC, CAM_DEFAULT, 87, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Call(SetCamDistance, CAM_DEFAULT, 150) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-16.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(0) Wait(1) IfEq(MV_LakituSearchSync, 1) @@ -265,7 +265,7 @@ EvtScript N(EVS_Scene_LakituAmbush) = { Call(SetCamDistance, CAM_DEFAULT, 450) Call(SetCamPosA, CAM_DEFAULT, 87, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_LakitusFlying_Attack)) Call(SetNpcVar, NPC_Lakitu_01, 0, 1) @@ -306,7 +306,7 @@ EvtScript N(EVS_NpcDefeat_Lakitu_01) = { Call(SetCamPosA, CAM_DEFAULT, Float(-95.0), Float(0.0)) Call(SetCamPosB, CAM_DEFAULT, Float(0.0), Float(-50.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_LakitusFlying_Flee)) Call(ResetCam, CAM_DEFAULT, Float(4.0)) diff --git a/src/world/dead/area_flo/flo_12/npc.c b/src/world/dead/area_flo/flo_12/npc.c index e169ccbf2a5..384b6c03436 100644 --- a/src/world/dead/area_flo/flo_12/npc.c +++ b/src/world/dead/area_flo/flo_12/npc.c @@ -25,7 +25,7 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, -50) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(20) Call(SpeakToPlayer, NPC_Rosie, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_00C7) diff --git a/src/world/dead/area_flo/flo_13/npc.c b/src/world/dead/area_flo/flo_13/npc.c index cab0222f1db..990155394cb 100644 --- a/src/world/dead/area_flo/flo_13/npc.c +++ b/src/world/dead/area_flo/flo_13/npc.c @@ -265,7 +265,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = { Call(SetCamDistance, CAM_DEFAULT, 200) Call(SetCamPitch, CAM_DEFAULT, Float(18.0), Float(-8.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(PlayerMoveTo, -75, 65, 10) @@ -279,7 +279,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = { Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Call(DisablePlayerInput, FALSE) @@ -298,7 +298,7 @@ EvtScript N(EVS_Lakilulu_FlyAway) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(5.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(NpcFaceNpc, NPC_Lakilulu, NPC_Lakilester, 1) Call(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_Talk, ANIM_Lakilulu_Idle, 0, MSG_CH6_00B4) @@ -309,7 +309,7 @@ EvtScript N(EVS_Lakilulu_FlyAway) = { Call(SetCamPosB, CAM_DEFAULT, 130, -200) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(N(PlayLakiluluFlightSounds), 55) @@ -369,13 +369,13 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetCamPosB, CAM_DEFAULT, 130, -200) Call(SetCamPosC, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(1) Thread Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamPosB, CAM_DEFAULT, 130, 60) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Thread @@ -401,7 +401,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamPitch, CAM_DEFAULT, Float(5.5), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, MSG_CH6_00A4) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -409,7 +409,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_Shout, ANIM_Lakilulu_Shout, 0, MSG_CH6_00A5) Call(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2) @@ -417,7 +417,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00A6) Call(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Idle) @@ -427,7 +427,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Label(10) Call(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_ConcernedTalk, ANIM_Lakilulu_ConcernedNod, 0, MSG_CH6_00A7) @@ -448,7 +448,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 250) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00AA) Call(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Idle) @@ -458,7 +458,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00AB) @@ -498,7 +498,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { Call(ShowMessageAtScreenPos, MSG_Menus_0190, 160, 40) Exec(N(EVS_PopSong)) Wait(10) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Set(GB_StoryProgress, STORY_CH6_LAKILESTER_JOINED_PARTY) Call(EnablePartnerAI) Call(DisablePlayerInput, FALSE) @@ -522,7 +522,7 @@ EvtScript N(EVS_NpcDefeat_Lakilester) = { Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-7.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_Scene_LakilesterDefeated)) CaseEq(OUTCOME_PLAYER_LOST) diff --git a/src/world/dead/area_flo/flo_15/npc.c b/src/world/dead/area_flo/flo_15/npc.c index 6c955de56cc..3fc66c3afe2 100644 --- a/src/world/dead/area_flo/flo_15/npc.c +++ b/src/world/dead/area_flo/flo_15/npc.c @@ -45,19 +45,19 @@ EvtScript N(EVS_Scene_SunReturns) = { Call(SetCamDistance, CAM_DEFAULT, 1050) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(4.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetCamDistance, CAM_DEFAULT, 300) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-10.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(6.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_Sun_01, ANIM_Sun_TalkJoy, ANIM_Sun_TalkJoy, SPEECH_FLAG_200 | 5, MSG_CH6_00C3) Call(SetNpcAnimation, NPC_Sun_01, ANIM_Sun_TalkJoy) Thread Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) EndThread Wait(15) diff --git a/src/world/dead/area_flo/flo_15/stairs.c b/src/world/dead/area_flo/flo_15/stairs.c index 1a6e165e3b2..4b98824e3e8 100644 --- a/src/world/dead/area_flo/flo_15/stairs.c +++ b/src/world/dead/area_flo/flo_15/stairs.c @@ -35,7 +35,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { Call(SetCamPitch, CAM_DEFAULT, Float(25.0), Float(-9.0)) Call(SetCamPosA, CAM_DEFAULT, Float(-50.0), Float(25.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Wait(100) diff --git a/src/world/dead/area_flo/flo_18/machine.c b/src/world/dead/area_flo/flo_18/machine.c index 96b1c77e908..e3d1b97785b 100644 --- a/src/world/dead/area_flo/flo_18/machine.c +++ b/src/world/dead/area_flo/flo_18/machine.c @@ -564,7 +564,7 @@ EvtScript N(EVS_DamageMachine) = { Call(UseSettingsFrom, CAM_DEFAULT, 40, 0, 0) Call(SetPanTarget, CAM_DEFAULT, 40, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(GB_FLO18_MachineDamage_Right, 3) ExecWait(N(EVS_ShakeMachine)) ExecWait(N(EVS_ShakeMachine)) diff --git a/src/world/dead/area_flo/flo_18/npc.c b/src/world/dead/area_flo/flo_18/npc.c index 3ba8201a528..4e6ff06bcce 100644 --- a/src/world/dead/area_flo/flo_18/npc.c +++ b/src/world/dead/area_flo/flo_18/npc.c @@ -247,7 +247,7 @@ EvtScript N(EVS_NpcIdle_Magikoopa) = { Call(SetCamDistance, CAM_DEFAULT, 1000) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(DisablePlayerInput, FALSE) Call(StartBossBattle, SONG_SPECIAL_BATTLE) Return @@ -406,7 +406,7 @@ EvtScript N(EVS_GenericBombReaction) = { Call(SetCamSpeed, CAM_DEFAULT, Float(8.0)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-6.0)) Call(SetCamDistance, CAM_DEFAULT, 300) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_ReactionFacePlayer)) IfEq(AB_FLO_GuardedMachineHitCount, 0) diff --git a/src/world/dead/area_flo/flo_19/beanstalk.c b/src/world/dead/area_flo/flo_19/beanstalk.c index 417a9c0cbb7..d6ef5f0e02d 100644 --- a/src/world/dead/area_flo/flo_19/beanstalk.c +++ b/src/world/dead/area_flo/flo_19/beanstalk.c @@ -120,7 +120,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableGroup, MODEL_g16, FALSE) Call(EnableGroup, MODEL_g2, FALSE) Call(EnableGroup, MODEL_g3, FALSE) @@ -168,7 +168,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) ExecWait(N(EVS_FadeInFromBlack)) Wait(20) @@ -268,7 +268,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { Call(SetCamDistance, CAM_DEFAULT, 350) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(AF_FLO_BeanstalkFadedOut, FALSE) ExecWait(N(EVS_FadeInFromBlack)) @@ -331,7 +331,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVarF, 100) Set(MV_BeanstalkGrowthProgress, LVarF) Set(AF_FLO_BeanstalkGrowing, FALSE) @@ -352,7 +352,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { Call(SetCamPosA, CAM_DEFAULT, 0, 0) Call(SetCamPosB, CAM_DEFAULT, 0, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(LVarF, 150) Thread Wait(5) diff --git a/src/world/dead/area_kzn/kzn_17/tromp.c b/src/world/dead/area_kzn/kzn_17/tromp.c index 387956e3f93..0073638ba2f 100644 --- a/src/world/dead/area_kzn/kzn_17/tromp.c +++ b/src/world/dead/area_kzn/kzn_17/tromp.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamDistance, CAM_DEFAULT, 500) Call(SetCamSpeed, CAM_DEFAULT, Float(10.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Loop(0) IfEq(AF_KZN_Tromp2_ShakingDone, FALSE) IfLt(MV_TrompPosX, 550) @@ -28,7 +28,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { Call(N(UnkFunc46)) Sub(LVar2, 55) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar2, 30) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndIf EndIf Wait(1) diff --git a/src/world/dead/area_kzn/kzn_18/npc.c b/src/world/dead/area_kzn/kzn_18/npc.c index a2277210dcf..a572f5aa3ef 100644 --- a/src/world/dead/area_kzn/kzn_18/npc.c +++ b/src/world/dead/area_kzn/kzn_18/npc.c @@ -49,7 +49,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetCamDistance, CAM_DEFAULT, Float(400.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00FD) Wait(15) @@ -72,7 +72,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetPanTarget, CAM_DEFAULT, 420, 250, -350) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) Call(SetNpcSpeed, NPC_SELF, Float(5.0)) Call(NpcMoveTo, NPC_SELF, 530, -360, 0) @@ -111,7 +111,7 @@ EvtScript N(EVS_NpcIdle_Piranha) = { Call(SetPanTarget, CAM_DEFAULT, 285, 25, 35) Call(SetCamDistance, CAM_DEFAULT, 400) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(10) Call(SetNpcPos, NPC_SELF, 285, 25, 35) diff --git a/src/world/dead/area_kzn/kzn_19/eruption.c b/src/world/dead/area_kzn/kzn_19/eruption.c index 645ef13a296..22e88b51c6b 100644 --- a/src/world/dead/area_kzn/kzn_19/eruption.c +++ b/src/world/dead/area_kzn/kzn_19/eruption.c @@ -63,7 +63,7 @@ EvtScript N(EVS_UpdateEruption) = { Call(ShakeCam, CAM_DEFAULT, 0, 5, Float(2.0)) Call(SetPanTarget, CAM_DEFAULT, 170, 25, 0) Call(SetCamSpeed, CAM_DEFAULT, Float(0.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(ShakeCam, CAM_DEFAULT, 0, 25, Float(2.0)) Call(InterpPlayerYaw, 270, 0) Call(InterpNpcYaw, NPC_PARTNER, 270, 0) diff --git a/src/world/dead/area_kzn/kzn_19/main.c b/src/world/dead/area_kzn/kzn_19/main.c index fbf65322fea..694a2b16540 100644 --- a/src/world/dead/area_kzn/kzn_19/main.c +++ b/src/world/dead/area_kzn/kzn_19/main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(0.44)) Call(SetPanTarget, CAM_DEFAULT, 185, 55, -30) EVT_SPIRIT_ADJUST_CAM(10000) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(N(StarSpiritEffectFunc2), 4, 180, 304, 15, -54, 185, 110, -30, 55, 25) Thread Call(N(StarSpiritEffectFunc3)) @@ -66,7 +66,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) Call(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 0) + Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) Else // just make the card spawn diff --git a/src/world/dead/area_kzn/kzn_19/npc.c b/src/world/dead/area_kzn/kzn_19/npc.c index 05ca63e6eea..e1bb2be6124 100644 --- a/src/world/dead/area_kzn/kzn_19/npc.c +++ b/src/world/dead/area_kzn/kzn_19/npc.c @@ -395,12 +395,12 @@ EvtScript N(EVS_Kolorado_Escape) = { Call(UseSettingsFrom, CAM_DEFAULT, 450, 25, -20) Call(SetPanTarget, CAM_DEFAULT, 450, 25, -20) Call(SetCamSpeed, CAM_DEFAULT, Float(1.5)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(NpcMoveTo, NPC_SELF, 535, -60, 0) Wait(20) Call(SetPanTarget, CAM_DEFAULT, 304, 25, -35) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SetNpcAux, NPC_LavaPiranhaHead, 0) Wait(10) @@ -455,7 +455,7 @@ EvtScript N(EVS_Misstar_Escape) = { Call(SetCamDistance, CAM_DEFAULT, 380) Call(SetCamPitch, CAM_DEFAULT, Float(12.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Wait(30) Set(AF_KZN_BossRoomFloorBroken, TRUE) @@ -472,13 +472,13 @@ EvtScript N(EVS_Misstar_Escape) = { Call(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Wait(10) Call(SpeakToPlayer, NPC_Misstar, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 0, MSG_CH5_0109) Wait(10) Call(SetPanTarget, CAM_DEFAULT, 370, 25, 70) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpNpcYaw, NPC_Misstar, 90, 0) Call(LoadPath, 45, Ref(N(FlightPath)), ARRAY_COUNT(N(FlightPath)), EASING_LINEAR) Loop(0) @@ -640,7 +640,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) EndThread Call(MakeLerp, 0, 40, 80, EASING_QUADRATIC_OUT) Loop(0) @@ -677,7 +677,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { Call(SetCamDistance, CAM_DEFAULT, Float(420.0)) Call(SetCamPitch, CAM_DEFAULT, Float(10.0), Float(-10.7)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Exec(N(EVS_PlayVinesAnim_Talk)) Call(SpeakToPlayer, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30, MSG_CH5_0102) @@ -701,12 +701,12 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { Loop(3) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, LVar0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Sub(LVar0, 2) Call(SetCamDistance, CAM_DEFAULT, Float(440.0)) Call(SetCamSpeed, CAM_DEFAULT, LVar0) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Sub(LVar0, 2) EndLoop @@ -906,7 +906,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { Call(SetCamDistance, CAM_DEFAULT, 470) Call(SetCamPitch, CAM_DEFAULT, Float(16.0), Float(-8.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(EnableGroup, MODEL_ato, TRUE) Call(EnableGroup, MODEL_naka, TRUE) Call(EnableGroup, MODEL_mae, FALSE) diff --git a/src/world/dead/area_kzn/kzn_20/npc.c b/src/world/dead/area_kzn/kzn_20/npc.c index 0b34250ade7..5fbe05be071 100644 --- a/src/world/dead/area_kzn/kzn_20/npc.c +++ b/src/world/dead/area_kzn/kzn_20/npc.c @@ -203,7 +203,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) Call(SetCamDistance, CAM_DEFAULT, Float(250.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(InterpNpcYaw, NPC_SELF, 270, 4) Wait(10) Call(InterpNpcYaw, NPC_SELF, 90, 4) @@ -290,7 +290,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Panic, ANIM_Kolorado_Panic, 0, MSG_CH5_0110) Call(ResetCam, CAM_DEFAULT, Float(90.0)) @@ -404,7 +404,7 @@ EvtScript N(EVS_Scene_Misstar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(3.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Set(AF_KZN_RumblingIntensified, FALSE) Set(MV_SceneState, SCENE_STATE_BEGIN) Label(10) @@ -423,7 +423,7 @@ EvtScript N(EVS_Scene_Misstar) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Call(SetCamDistance, CAM_DEFAULT, Float(350.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(4.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Set(MV_SceneState, SCENE_STATE_KOLORADO_CAM_SYNC) EndThread diff --git a/src/world/dead/area_kzn/kzn_22/npc.c b/src/world/dead/area_kzn/kzn_22/npc.c index 700b4939daa..7ff099ec393 100644 --- a/src/world/dead/area_kzn/kzn_22/npc.c +++ b/src/world/dead/area_kzn/kzn_22/npc.c @@ -65,7 +65,7 @@ EndIf //@bug unmatched endif Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-4.0)) Call(SetCamPosB, CAM_DEFAULT, Float(480.0), Float(299.6)) Call(SetCamSpeed, CAM_DEFAULT, Float(5.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Thread Call(SetPlayerSpeed, Float(3.0)) @@ -124,7 +124,7 @@ EvtScript N(EVS_ControlCamera) = { Call(SetCamDistance, CAM_DEFAULT, Float(390.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-9.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.0)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Label(10) Wait(1) IfEq(AF_KZN23_GrabbedKolorado, FALSE) @@ -134,7 +134,7 @@ EvtScript N(EVS_ControlCamera) = { Call(SetCamDistance, CAM_DEFAULT, Float(450.0)) Call(SetCamPitch, CAM_DEFAULT, Float(15.0), Float(-7.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(1.3)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Label(20) Wait(1) IfEq(AF_KZN22_FlewAway, FALSE) @@ -142,7 +142,7 @@ EvtScript N(EVS_ControlCamera) = { EndIf Call(SetPanTarget, CAM_DEFAULT, 368, 310, 170) Call(SetCamSpeed, CAM_DEFAULT, Float(0.8)) - Call(PanToTarget, CAM_DEFAULT, 0, 1) + Call(PanToTarget, CAM_DEFAULT, 0, TRUE) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Return End diff --git a/src/world/partners.c b/src/world/partners.c index 23ebf56efc2..6fc611b3e63 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -2475,10 +2475,10 @@ void partner_do_player_collision(Npc* partner) { f32 partnerScreenZ; f32 W; - transform_point(gCameras[CAM_DEFAULT].perspectiveMatrix, + transform_point(gCameras[CAM_DEFAULT].mtxPerspective, playerStatus->pos.x, playerStatus->pos.y, playerStatus->pos.z, 1.0f, &playerScreenX, &playerScreenY, &playerScreenZ, &W); - transform_point(gCameras[CAM_DEFAULT].perspectiveMatrix, partner->pos.x, partner->pos.y, partner->pos.z, 1.0f, + transform_point(gCameras[CAM_DEFAULT].mtxPerspective, partner->pos.x, partner->pos.y, partner->pos.z, 1.0f, &partnerScreenX, &partnerScreenY, &partnerScreenZ, &W); playerScreenX = fabsf(playerScreenX - partnerScreenX); playerScreenY = fabsf(playerScreenY - partnerScreenY); diff --git a/src/world/script_api/enter_exit.c b/src/world/script_api/enter_exit.c index 6354061a2a6..1fae7993bfc 100644 --- a/src/world/script_api/enter_exit.c +++ b/src/world/script_api/enter_exit.c @@ -61,7 +61,7 @@ API_CALLABLE(SetPlayerPositionFromSaveData) { enable_partner_ai(); } - camera->isChangingMap = TRUE; + camera->needsReinit = TRUE; return ApiStatus_DONE2; } diff --git a/src/world/script_api/shops.c b/src/world/script_api/shops.c index 5518c4d1bb7..5adbc19526a 100644 --- a/src/world/script_api/shops.c +++ b/src/world/script_api/shops.c @@ -827,7 +827,7 @@ void draw_shop_items(void) { inY = shopItemEntities->pos.y + 30.0f; inZ = shopItemEntities->pos.z; - transform_point(camera->perspectiveMatrix, inX, inY, inZ, 1.0f, &x, &y, &z, &s); + transform_point(camera->mtxPerspective, inX, inY, inZ, 1.0f, &x, &y, &z, &s); s = 1.0f / s; diff --git a/src/world/world.c b/src/world/world.c index d5b092893fc..efc4661281e 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -168,7 +168,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { sfx_clear_env_sounds(0); clear_worker_list(); clear_script_list(); - create_cameras_a(); + create_cameras(); spr_init_sprites(gGameStatusPtr->playerSpriteSet); clear_animator_list(); clear_entity_models(); @@ -221,7 +221,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_HUD].flags |= CAMERA_FLAG_DISABLED; if (gGameStatusPtr->introPart == INTRO_PART_NONE) { set_cam_viewport(CAM_DEFAULT, 12, 20, 296, 200); diff --git a/tools/renames/2_battle_camera_presets.txt b/tools/renames/2_battle_camera_presets.txt new file mode 100644 index 00000000000..a29828784ca --- /dev/null +++ b/tools/renames/2_battle_camera_presets.txt @@ -0,0 +1,74 @@ +BTL_CAM_PRESET_00 BTL_CAM_RESET +BTL_CAM_PRESET_01 BTL_CAM_INTERRUPT +BTL_CAM_DEFAULT BTL_CAM_DEFAULT +BTL_CAM_PRESET_03 BTL_CAM_VIEW_ENEMIES +BTL_CAM_PRESET_04 BTL_CAM_RETURN_HOME +BTL_CAM_PRESET_05 BTL_CAM_ACTOR_TARGET_MIDPOINT +BTL_CAM_PRESET_06 BTL_CAM_ACTOR_PART +BTL_CAM_PRESET_07 BTL_CAM_ACTOR_GOAL_SIMPLE +BTL_CAM_PRESET_08 BTL_CAM_ACTOR_SIMPLE +BTL_CAM_PRESET_09 BTL_CAM_SLOW_DEFAULT +BTL_CAM_PRESET_10 BTL_CAM_MIDPOINT_CLOSE +BTL_CAM_PRESET_11 BTL_CAM_MIDPOINT_NORMAL +BTL_CAM_PRESET_12 BTL_CAM_MIDPOINT_FAR +BTL_CAM_PRESET_13 BTL_CAM_ACTOR_CLOSE +BTL_CAM_PRESET_14 BTL_CAM_ACTOR +BTL_CAM_PRESET_15 BTL_CAM_ACTOR_FAR +BTL_CAM_PRESET_16 BTL_CAM_ACTOR_GOAL_NEAR +BTL_CAM_PRESET_17 BTL_CAM_ACTOR_GOAL +BTL_CAM_PRESET_18 BTL_CAM_ACTOR_GOAL_FAR +BTL_CAM_PRESET_19 BTL_CAM_REPOSITION +BTL_CAM_PRESET_20 BTL_CAM_FOLLOW_ACTOR_Y +BTL_CAM_PRESET_21 BTL_CAM_FOLLOW_ACTOR_POS +BTL_CAM_PLAYER_ENTRY BTL_CAM_PLAYER_ENTRY +BTL_CAM_VICTORY BTL_CAM_VICTORY +BTL_CAM_PRESET_24 BTL_CAM_PLAYER_DIES +BTL_CAM_PRESET_25 BTL_CAM_PLAYER_FLEE +BTL_CAM_PLAYER_ATTACK_APPROACH BTL_CAM_PLAYER_ATTACK_APPROACH +BTL_CAM_PRESET_27 BTL_CAM_PLAYER_PRE_JUMP_FINISH +BTL_CAM_PRESET_28 BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH +BTL_CAM_PRESET_29 BTL_CAM_PLAYER_MISTAKE +BTL_CAM_PLAYER_HIT_SPIKE BTL_CAM_PLAYER_HIT_SPIKE +BTL_CAM_PLAYER_HIT_HAZARD BTL_CAM_PLAYER_HIT_HAZARD +BTL_CAM_PLAYER_CHARGE_UP BTL_CAM_PLAYER_CHARGE_UP +BTL_CAM_PLAYER_STATUS_AFFLICTED BTL_CAM_PLAYER_STATUS_AFFLICTED +BTL_CAM_PRESET_34 BTL_CAM_PLAYER_JUMP_MIDAIR +BTL_CAM_PRESET_35 BTL_CAM_PLAYER_JUMP_FINISH +BTL_CAM_PRESET_36 BTL_CAM_PLAYER_JUMP_FINISH_CLOSE +BTL_CAM_PRESET_37 BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR +BTL_CAM_PRESET_38 BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR +BTL_CAM_PRESET_39 BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP +BTL_CAM_PRESET_40 BTL_CAM_PLAYER_MULTIBOUNCE +BTL_CAM_PRESET_41 BTL_CAM_PRESET_UNUSED_29 +BTL_CAM_PRESET_42 BTL_CAM_PRESET_UNUSED_2A +BTL_CAM_PLAYER_AIM_HAMMER BTL_CAM_PLAYER_AIM_HAMMER +BTL_CAM_PLAYER_HAMMER_STRIKE BTL_CAM_PLAYER_HAMMER_STRIKE +BTL_CAM_PRESET_45 BTL_CAM_PRESET_UNUSED_2D +BTL_CAM_PRESET_46 BTL_CAM_PLAYER_HAMMER_QUAKE +BTL_CAM_PARTNER_APPROACH BTL_CAM_PARTNER_APPROACH +BTL_CAM_PRESET_48 BTL_CAM_CLOSER_PARTNER_APPROACH +BTL_CAM_PRESET_49 BTL_CAM_PRESET_UNUSED_31 +BTL_CAM_PRESET_50 BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1 +BTL_CAM_PRESET_51 BTL_CAM_PARTNER_MISTAKE +BTL_CAM_PRESET_52 BTL_CAM_PARTNER_MIDAIR +BTL_CAM_PRESET_53 BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2 +BTL_CAM_PARTNER_INJURED BTL_CAM_PARTNER_INJURED +BTL_CAM_PRESET_55 BTL_CAM_PARTNER_GOOMPA +BTL_CAM_PRESET_56 BTL_CAM_PRESET_UNUSED_38 +BTL_CAM_PRESET_57 BTL_CAM_PRESET_UNUSED_39 +BTL_CAM_PRESET_58 BTL_CAM_PRESET_UNUSED_3A +BTL_CAM_PRESET_59 BTL_CAM_PARTNER_CLOSE_UP +BTL_CAM_PRESET_60 BTL_CAM_PRESET_UNUSED_3C +BTL_CAM_PRESET_61 BTL_CAM_PARTNER_HIT_SPIKE +BTL_CAM_PRESET_62 BTL_CAM_PARTNER_HIT_HAZARD +BTL_CAM_ENEMY_APPROACH BTL_CAM_ENEMY_APPROACH +BTL_CAM_PRESET_64 BTL_CAM_PRESET_UNUSED_40 +BTL_CAM_PRESET_65 BTL_CAM_SLOWER_DEFAULT +BTL_CAM_PRESET_66 BTL_CAM_ENEMY_DIVE +BTL_CAM_PRESET_67 BTL_CAM_PRESET_UNUSED_43 +BTL_CAM_PRESET_68 BTL_CAM_PRESET_UNUSED_44 +BTL_CAM_PRESET_69 BTL_CAM_PLAYER_WISH +BTL_CAM_PRESET_70 BTL_CAM_PRESET_UNUSED_46 +BTL_CAM_PRESET_71 BTL_CAM_PRESET_UNUSED_47 +BTL_CAM_PRESET_72 BTL_CAM_PRESET_UNUSED_48 +BTL_CAM_PRESET_73 BTL_CAM_STAR_SPIRIT \ No newline at end of file diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml index 9e8a7760e9f..fd56752881f 100644 --- a/ver/ique/splat.yaml +++ b/ver/ique/splat.yaml @@ -56,12 +56,12 @@ segments: - [auto, c, crash_screen] - [auto, c, os/nusys/nugfxtaskmgr, -fforce-addr] - [auto, c, cam_main] - - [auto, c, cam_mode_2] - - [auto, c, cam_mode_1] - - [auto, c, cam_mode_0] - - [auto, c, cam_mode_6] - - [auto, c, cam_mode_unused] - - [auto, c, cam_mode_5] + - [auto, c, cam_mode_interp] + - [auto, c, cam_mode_unused_radial] + - [auto, c, cam_mode_minimal] + - [auto, c, cam_mode_no_interp] + - [auto, c, cam_mode_unused_ahead] + - [auto, c, cam_mode_unused_leading] - [auto, c, cam_mode_zone_interp] - [auto, c, cam_math] - [auto, c, game_modes] diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index 8230a4fa460..add3e95f43e 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -1,8 +1,8 @@ -update_camera_mode_4 = 0x8002dfc0; -update_camera_mode_2 = 0x8002e3a8; -update_camera_mode_1 = 0x8002e940; -update_camera_mode_0 = 0x8002ef00; -update_camera_mode_unused = 0x8002f390; +update_camera_unused_confined = 0x8002dfc0; +update_camera_interp_pos = 0x8002e3a8; +update_camera_unused_radial = 0x8002e940; +update_camera_minimal = 0x8002ef00; +update_camera_unused_ahead = 0x8002f390; update_camera_from_controller = 0x8002fbac; calculate_segment_intersection = 0x8003198c; calculate_line_segment_intersection = 0x80031c94; @@ -43,7 +43,7 @@ atan2 = 0x80029950; dist2D = 0x80029ba4; sin_rad = 0x80029e3c; cos_rad = 0x80029ea0; -D_8009A5EC = 0x800991b8; +CamLengthScale = 0x800991b8; __osEepromTimerQ = 0x800d8e20; TitleScreen_ImgList_Copyright = 0x8009d38c; @@ -3623,12 +3623,12 @@ D_09000000_398BC0 = 0x09000000; // rom:0x3E1610 D_09003F80_3FE430 = 0x09003F80; // rom:0x446E80 ActorSpeak = 0x80252EF0; -AddBattleCamZoom = 0x8024ECAC; +AddBattleCamDist = 0x8024ECAC; btl_cam_use_preset = 0x8024E40C; ChooseNextTarget = 0x8026E3D4; dispatch_damage_event_actor_0 = 0x802788B8; btl_cam_move = 0x8024E4D8; -func_80273444 = 0x80273404; +PlayerHopToGoal = 0x80273404; get_actor = 0x80269D2C; EMS_StarIcon = 0x80283EA8; DispatchEvent = 0x8027D224; @@ -3663,7 +3663,7 @@ SetAnimation = 0x8026B170; SetBattleCamTarget = 0x8024E90C; SetActorYaw = 0x8026B318; SetBattleFlagBits = 0x8026CCFC; -SetBattleCamZoom = 0x8024EC6C; +SetBattleCamDist = 0x8024EC6C; SetGoalPos = 0x8026A4D0; SetGoalToHome = 0x80269E84; SetForegroundModelsVisible = 0x80253AAC; @@ -3682,10 +3682,10 @@ CheckButtonDown = 0x8026E0C8; EnablePlayerBlur = 0x80274938; CloseActionCommandInfo = 0x802693D0; EnableBattleStatusBar = 0x80253574; -func_80274A18 = 0x802749D8; +PlayerBasicJumpToGoal = 0x802749D8; func_802693F0 = 0x802693B0; -func_802752AC = 0x8027526C; -func_80275F00 = 0x80275EC0; +PlayerSuperJumpToGoal = 0x8027526C; +PlayerUltraJumpToGoal = 0x80275EC0; GetActionCommandMode = 0x802692D8; GetActionQuality = 0x80269568; GetActionResult = 0x802694E4; @@ -3708,7 +3708,7 @@ SetActionResult = 0x80269510; SetActorDispOffset = 0x8026B9C4; SetActorRotation = 0x8026C36C; SetActorSounds = 0x8026F700; -SetBattleCamOffsetZ = 0x8024EA58; +SetBattleCamOffsetY = 0x8024EA58; SetDamageSource = 0x80269E6C; SetGoalToFirstTarget = 0x8026A45C; ShowActionHud = 0x80269464; @@ -3724,7 +3724,7 @@ BattleCamTargetActor = 0x8024EB24; DispatchDamagePlayerEvent = 0x802748DC; dispatch_event_actor = 0x80277120; EVS_UseMystery = 0x80293E00; -func_8024ECF8 = 0x8024ECF8; +SetBattleCamTargetingModes = 0x8024ECF8; ItemAfflictEnemy = 0x80252AFC; ItemSpookEnemy = 0x802528E4; MultiplyByActorScale = 0x80253F9C; @@ -3763,7 +3763,7 @@ EVS_Partner_ShockHit = 0x80295704; EVS_Partner_SpikeContact = 0x80294FA4; FallToGoal = 0x80279BAC; FlyToGoal = 0x8027B5E4; -func_8024EDA4 = 0x8024EDA4; +DisableBattleCamClampX = 0x8024EDA4; func_80269118 = 0x802690D8; func_80269160 = 0x80269120; func_80269600 = 0x802695C0; diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index c4cda72a16a..2b9aeafb9de 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -62,12 +62,12 @@ segments: - [auto, c, load_obfuscation_shims] - [auto, c, os/nusys/nugfxtaskmgr, -fforce-addr] - [auto, c, cam_main] - - [auto, c, cam_mode_2] - - [auto, c, cam_mode_1] - - [auto, c, cam_mode_0] - - [auto, c, cam_mode_6] - - [auto, c, cam_mode_unused] - - [auto, c, cam_mode_5] + - [auto, c, cam_mode_interp] + - [auto, c, cam_mode_unused_radial] + - [auto, c, cam_mode_minimal] + - [auto, c, cam_mode_no_interp] + - [auto, c, cam_mode_unused_ahead] + - [auto, c, cam_mode_unused_leading] - [auto, c, cam_mode_zone_interp] - [auto, c, cam_math] - [auto, c, game_modes] diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 6468fd2d4a4..e850a1686b8 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -34,14 +34,14 @@ crash_screen_set_draw_info = 0x8002C850; load_obfuscation_shims = 0x8002CA00; // type:func rom:0x7E00 nuGfxTaskStart = 0x8002CF24; // type:func rom:0x8324 render_frame = 0x8002D3CC; -create_cameras_a = 0x8002DB84; -update_camera_mode_4 = 0x8002E5A0; -update_camera_mode_2 = 0x8002E988; -update_camera_mode_1 = 0x8002EF20; -update_camera_mode_0 = 0x8002F4E0; -update_camera_mode_6 = 0x8002F620; -update_camera_mode_unused = 0x8002F970; -update_camera_mode_5 = 0x8002FC90; +create_cameras = 0x8002DB84; +update_camera_unused_confined = 0x8002E5A0; +update_camera_interp_pos = 0x8002E988; +update_camera_unused_radial = 0x8002EF20; +update_camera_minimal = 0x8002F4E0; +update_camera_no_interp = 0x8002F620; +update_camera_unused_ahead = 0x8002F970; +update_camera_unused_leading = 0x8002FC90; update_camera_from_controller = 0x8003018C; // type:func rom:0xB58C update_camera_zone_interp = 0x80031124; calculate_segment_intersection = 0x80031F6C; // type:func @@ -194,7 +194,7 @@ main_BSS_START = 0x8009A590; D_8009A5B8 = 0x8009A598; timeFreezeMode = 0x8009A5B8; nuGfxZBuffer = 0x8009A5BC; -D_8009A5EC = 0x8009A5CC; +CamLengthScale = 0x8009A5CC; nuGfxCfbCounter = 0x8009A5D0; nuGfxDisplay = 0x8009A5D8; nuGfxUcode = 0x8009A5F0; @@ -1278,13 +1278,13 @@ ShakeCamX = 0x802D9CE8; // rom:0x101E88 SetCamEnabled = 0x802CA6C0; // type:func rom:0xF2860 SetCamNoDraw = 0x802CA774; // type:func rom:0xF2914 SetCamPerspective = 0x802CA828; // type:func rom:0xF29C8 -func_802CA90C = 0x802CA90C; // type:func rom:0xF2AAC -func_802CA988 = 0x802CA988; // type:func rom:0xF2B28 +SetCamUpdateMode = 0x802CA90C; // type:func rom:0xF2AAC +GrabCamera = 0x802CA988; // type:func rom:0xF2B28 SetCamViewport = 0x802CAB18; // type:func rom:0xF2CB8 -func_802CABE8 = 0x802CABE8; // type:func rom:0xF2D88 -func_802CACC0 = 0x802CACC0; // type:func rom:0xF2E60 +SetInterpCamParams = 0x802CABE8; // type:func rom:0xF2D88 +SetNoInterpCamParams = 0x802CACC0; // type:func rom:0xF2E60 SetCamBGColor = 0x802CAD98; // type:func rom:0xF2F38 -func_802CAE50 = 0x802CAE50; // type:func rom:0xF2FF0 +SetCamLookTarget = 0x802CAE50; // type:func rom:0xF2FF0 SetCamTarget = 0x802CAF2C; // type:func rom:0xF30CC InterpCamTargetPos = 0x802CB008; // type:func rom:0xF31A8 exec_ShakeCam1 = 0x802CB56C; // type:func rom:0xF370C @@ -2582,7 +2582,7 @@ D_8014F0C8 = 0x80154168; // rom:0xE8FF8 HudElementLights = 0x801541A8; // rom:0xE9038 hud_element_load_script = 0x80144400; // type:func rom:0xD9290 hud_element_draw_rect = 0x801447B4; // type:func rom:0xD9644 -func_801413F8 = 0x801464A8; // type:func rom:0xDB338 +hud_element_setup_cam = 0x801464A8; // type:func rom:0xDB338 init_hud_element_list = 0x801463B0; // type:func rom:0xDB240 hud_element_update = 0x801467B4; // type:func rom:0xDB644 render_hud_element = 0x80147CAC; // type:func rom:0xDCB3C diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 881854150f3..7cf5637248d 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -52,7 +52,7 @@ func_PAL_8002B574 = 0x8002B574; set_curtain_scale_goal = 0x8002C1EC; set_curtain_draw_callback = 0x8002C214; set_curtain_fade = 0x8002C234; -create_cameras_a = 0x8002E214; +create_cameras = 0x8002E214; set_cam_viewport = 0x8002E634; get_screen_coords = 0x8002E858; set_game_mode = 0x80033810; @@ -328,16 +328,16 @@ UseBattleCamPreset = 0x8024E5BC; UseBattleCamPresetImmediately = 0x8024E604; SetBattleCamParam = 0x8024E6E8; SetBattleCamTarget = 0x8024E8AC; -SetBattleCamOffsetZ = 0x8024E9F8; +SetBattleCamOffsetY = 0x8024E9F8; SetBattleCamYaw = 0x8024EA84; BattleCamTargetActor = 0x8024EAC4; BattleCamTargetActorPart = 0x8024EB24; MoveBattleCamOver = 0x8024EBA8; -SetBattleCamZoom = 0x8024EC0C; -AddBattleCamZoom = 0x8024EC4C; -func_8024ECF8 = 0x8024EC98; +SetBattleCamDist = 0x8024EC0C; +AddBattleCamDist = 0x8024EC4C; +SetBattleCamTargetingModes = 0x8024EC98; FreezeBattleCam = 0x8024ED18; -func_8024EDA4 = 0x8024ED44; +DisableBattleCamClampX = 0x8024ED44; btl_set_popup_duration = 0x8024FA64; ShowMessageBox = 0x80251474; ShowVariableMessageBox = 0x802514CC; @@ -528,7 +528,7 @@ HealActor = 0x80271094; WaitForBuffDone = 0x8027153C; CopyBuffs = 0x80271550; GetMenuSelection = 0x802737B4; -func_80273444 = 0x80273834; +PlayerHopToGoal = 0x80273834; PlayerFallToGoal = 0x80273C84; PlayerRunToGoal = 0x80274054; GetPlayerHP = 0x80274624; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 4cee7d0b319..a3c99bb084e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -106,12 +106,12 @@ segments: - [auto, c, os/nusys/nusimgr] - [auto, c, load_obfuscation_shims] - [auto, c, cam_main] - - [auto, c, cam_mode_2] - - [auto, c, cam_mode_1] - - [auto, c, cam_mode_0] - - [auto, c, cam_mode_6] - - [auto, c, cam_mode_unused] - - [auto, c, cam_mode_5] + - [auto, c, cam_mode_interp] + - [auto, c, cam_mode_unused_radial] + - [auto, c, cam_mode_minimal] + - [auto, c, cam_mode_no_interp] + - [auto, c, cam_mode_unused_ahead] + - [auto, c, cam_mode_unused_leading] - [auto, c, cam_mode_zone_interp] - [auto, c, cam_math] - [auto, c, game_modes] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index fcbdff7e528..2c0a0b5cbd6 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -139,24 +139,24 @@ nuSiMgrThread = 0x8002CFD0; // type:func rom:0x83D0 load_obfuscation_shims = 0x8002D160; // type:func rom:0x8560 update_cameras = 0x8002D400; // type:func rom:0x8800 render_frame = 0x8002D73C; // type:func rom:0x8B3C -create_cameras_a = 0x8002DEF4; // type:func rom:0x92F4 -create_cameras_b = 0x8002E038; // type:func rom:0x9438 +create_cameras = 0x8002DEF4; // type:func rom:0x92F4 +create_cameras_unused = 0x8002E038; // type:func rom:0x9438 initialize_next_camera = 0x8002E16C; // type:func rom:0x956C set_cam_viewport = 0x8002E314; // type:func rom:0x9714 get_cam_viewport = 0x8002E4E8; // type:func rom:0x98E8 get_screen_coords = 0x8002E538; // type:func rom:0x9938 -func_8002E754 = 0x8002E754; // type:func rom:0x9B54 -func_8002E7CC = 0x8002E7CC; // type:func rom:0x9BCC +is_outside_cam_viewport_bounds = 0x8002E754; // type:func rom:0x9B54 +get_cam_viewport_bounds = 0x8002E7CC; // type:func rom:0x9BCC func_8002E82C = 0x8002E82C; // type:func rom:0x9C2C -update_camera_mode_4 = 0x8002E910; // type:func rom:0x9D10 -update_camera_mode_2 = 0x8002ECF8; // type:func rom:0xA0F8 -update_camera_mode_1 = 0x8002F290; // type:func rom:0xA690 -update_camera_mode_0 = 0x8002F850; // type:func rom:0xAC50 -update_camera_mode_6 = 0x8002F990; // type:func rom:0xAD90 -update_camera_mode_unused = 0x8002FCE0; // type:func rom:0xB0E0 -update_camera_mode_5 = 0x80030000; // type:func rom:0xB400 -cam_interp_lookat_pos = 0x80030210; // type:func rom:0xB610 -func_8003034C = 0x8003034C; // type:func rom:0xB74C +update_camera_unused_confined = 0x8002E910; // type:func rom:0x9D10 +update_camera_interp_pos = 0x8002ECF8; // type:func rom:0xA0F8 +update_camera_unused_radial = 0x8002F290; // type:func rom:0xA690 +update_camera_minimal = 0x8002F850; // type:func rom:0xAC50 +update_camera_no_interp = 0x8002F990; // type:func rom:0xAD90 +update_camera_unused_ahead = 0x8002FCE0; // type:func rom:0xB0E0 +update_camera_unused_leading = 0x80030000; // type:func rom:0xB400 +interp_lookat_pos = 0x80030210; // type:func rom:0xB610 +update_unused_lead_amt = 0x8003034C; // type:func rom:0xB74C func_80030450 = 0x80030450; // type:func rom:0xB850 test_ray_zone_aabb = 0x80030458; // type:func rom:0xB858 update_camera_from_controller = 0x800304FC; // type:func rom:0xB8FC @@ -166,7 +166,7 @@ calculate_segment_intersection = 0x800322DC; // type:func rom:0xD6DC calculate_line_segment_intersection = 0x800325E4; // type:func rom:0xD9E4 func_800328A4 = 0x800328A4; // type:func rom:0xDCA4 update_camera_lead_amount = 0x80032970; // type:func rom:0xDD70 -func_80032C64 = 0x80032C64; // type:func rom:0xE064 +apply_constraints_to_lead_amount = 0x80032C64; // type:func rom:0xE064 create_camera_leadplayer_matrix = 0x80033394; // type:func rom:0xE794 func_800334E8 = 0x800334E8; // type:func rom:0xE8E8 set_game_mode = 0x800334F0; // type:func rom:0xE8F0 @@ -2560,7 +2560,7 @@ nuGfxZBuffer = 0x8009A5DC; // rom:0x759DC nuContDataLockKey = 0x8009A5E0; // rom:0x759E0 __osViIntrCount = 0x8009A5E4; // rom:0x759E4 BeginSoundUpdateCallback = 0x8009A5E8; // rom:0x759E8 -D_8009A5EC = 0x8009A5EC; // rom:0x759EC +CamLengthScale = 0x8009A5EC; // rom:0x759EC nuGfxCfbCounter = 0x8009A5F0; // rom:0x759F0 gCurrentModelTreeNodeInfo = 0x8009A5F4; // rom:0x759F4 nuGfxDisplay = 0x8009A5F8; // rom:0x759F8 @@ -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 -gCurrentCamConfiguration = 0x800A08C0; // rom:0x7BCC0 +CurrentCamRig = 0x800A08C0; // rom:0x7BCC0 D_800A08DC = 0x800A08DC; // rom:0x7BCDC D_800A08E0 = 0x800A08E0; // rom:0x7BCE0 D_800A08E4 = 0x800A08E4; // rom:0x7BCE4 @@ -4305,7 +4305,7 @@ hud_element_load_script = 0x8013F350; // type:func rom:0xD5A50 hud_element_draw_rect = 0x8013F704; // type:func rom:0xD5E04 hud_element_clear_cache = 0x80141100; // type:func rom:0xD7800 init_hud_element_list = 0x80141300; // type:func rom:0xD7A00 -func_801413F8 = 0x801413F8; // type:func rom:0xD7AF8 +hud_element_setup_cam = 0x801413F8; // type:func rom:0xD7AF8 hud_element_create = 0x801414A4; // type:func rom:0xD7BA4 update_hud_elements = 0x80141610; // type:func rom:0xD7D10 hud_element_update = 0x80141704; // type:func rom:0xD7E04 @@ -5151,13 +5151,13 @@ SetCamEnabled = 0x802CA6C0; // type:func rom:0xEF070 SetCamNoDraw = 0x802CA774; // type:func rom:0xEF124 SetCamPerspective = 0x802CA828; // type:func rom:0xEF1D8 gHudElementCacheTablePaletteBattle = 0x80158B80; // rom:0xEF280 -func_802CA90C = 0x802CA90C; // type:func rom:0xEF2BC -func_802CA988 = 0x802CA988; // type:func rom:0xEF338 +SetCamUpdateMode = 0x802CA90C; // type:func rom:0xEF2BC +GrabCamera = 0x802CA988; // type:func rom:0xEF338 SetCamViewport = 0x802CAB18; // type:func rom:0xEF4C8 -func_802CABE8 = 0x802CABE8; // type:func rom:0xEF598 -func_802CACC0 = 0x802CACC0; // type:func rom:0xEF670 +SetInterpCamParams = 0x802CABE8; // type:func rom:0xEF598 +SetNoInterpCamParams = 0x802CACC0; // type:func rom:0xEF670 SetCamBGColor = 0x802CAD98; // type:func rom:0xEF748 -func_802CAE50 = 0x802CAE50; // type:func rom:0xEF800 +SetCamLookTarget = 0x802CAE50; // type:func rom:0xEF800 D_80159180 = 0x80159180; // rom:0xEF880 wTriggerList = 0x80159190; // rom:0xEF890 SetCamTarget = 0x802CAF2C; // type:func rom:0xEF8DC @@ -6508,20 +6508,20 @@ btl_state_update_enemy_striking_first = 0x80248660; // type:func rom:0x176F40 btl_state_draw_enemy_striking_first = 0x80248AA4; // type:func rom:0x177384 btl_state_update_end_demo_battle = 0x80248B08; // type:func rom:0x1773E8 btl_state_draw_end_demo_battle = 0x80248D78; // type:func rom:0x177658 -CamPresetUpdate_B = 0x80248DD0; // type:func rom:0x1776B0 -CamPresetUpdate_F = 0x80248DE4; // type:func rom:0x1776C4 -CamPresetUpdate_M = 0x80249804; // type:func rom:0x1780E4 -CamPresetUpdate_G = 0x8024A214; // type:func rom:0x178AF4 -CamPresetUpdate_I = 0x8024A990; // type:func rom:0x179270 -CamPresetUpdate_H = 0x8024AFE4; // type:func rom:0x1798C4 -CamPresetUpdate_N = 0x8024B5FC; // type:func rom:0x179EDC -BattleCamImpl_Default = 0x8024B9A0; // type:func rom:0x17A280 -CamPresetUpdate_D = 0x8024BDA4; // type:func rom:0x17A684 -CamPresetUpdate_E = 0x8024C180; // type:func rom:0x17AA60 -CamPresetUpdate_J = 0x8024C570; // type:func rom:0x17AE50 -CamPresetUpdate_K = 0x8024C944; // type:func rom:0x17B224 -CamPresetUpdate_L = 0x8024CB68; // type:func rom:0x17B448 -func_8024CE9C = 0x8024CE9C; // type:func rom:0x17B77C +BattleCam_Update_Interrupt = 0x80248DD0; // type:func rom:0x1776B0 +BattleCam_Update_FocusMidpointA = 0x80248DE4; // type:func rom:0x1776C4 +BattleCam_Update_FocusMidpointB = 0x80249804; // type:func rom:0x1780E4 +BattleCam_Update_FocusActorPart = 0x8024A214; // type:func rom:0x178AF4 +BattleCam_Update_FocusActor = 0x8024A990; // type:func rom:0x179270 +BattleCam_Update_FocusGoal = 0x8024AFE4; // type:func rom:0x1798C4 +BattleCam_Update_SimpleLerp_Unskippable = 0x8024B5FC; // type:func rom:0x179EDC +BattleCam_Update_ResetToNeutral_Skippable = 0x8024B9A0; // type:func rom:0x17A280 +BattleCam_Update_ViewAllEnemies = 0x8024BDA4; // type:func rom:0x17A684 +BattleCam_Update_ViewAllEnemies_MaintainY = 0x8024C180; // type:func rom:0x17AA60 +BattleCam_Update_SimpleLerp_Skippable = 0x8024C570; // type:func rom:0x17AE50 +BattleCam_Update_FollowActorY = 0x8024C944; // type:func rom:0x17B224 +BattleCam_Update_FollowActorPos = 0x8024CB68; // type:func rom:0x17B448 +BattleCam_Init = 0x8024CE9C; // type:func rom:0x17B77C btl_cam_use_preset_impl = 0x8024CF34; // type:func rom:0x17B814 btl_cam_use_preset_immediately = 0x8024E3D8; // type:func rom:0x17CCB8 btl_cam_use_preset = 0x8024E40C; // type:func rom:0x17CCEC @@ -6536,25 +6536,25 @@ btl_cam_set_zoom = 0x8024E594; // type:func rom:0x17CE74 btl_cam_add_zoom = 0x8024E5B4; // type:func rom:0x17CE94 btl_cam_set_zoffset = 0x8024E5E0; // type:func rom:0x17CEC0 btl_cam_unfreeze = 0x8024E600; // type:func rom:0x17CEE0 -func_8024E60C = 0x8024E60C; // type:func rom:0x17CEEC +btl_cam_disable_clamp_x = 0x8024E60C; // type:func rom:0x17CEEC UseBattleCamPreset = 0x8024E61C; // type:func rom:0x17CEFC UseBattleCamPresetImmediately = 0x8024E664; // type:func rom:0x17CF44 UseBattleCamPresetWait = 0x8024E6B4; // type:func rom:0x17CF94 SetBattleCamParam = 0x8024E748; // type:func rom:0x17D028 SetBattleCamParams = 0x8024E820; // type:func rom:0x17D100 SetBattleCamTarget = 0x8024E90C; // type:func rom:0x17D1EC -SetBattleCamPos = 0x8024E9B0; // type:func rom:0x17D290 -SetBattleCamOffsetZ = 0x8024EA58; // type:func rom:0x17D338 -AddBattleCamOffsetZ = 0x8024EA98; // type:func rom:0x17D378 +ForceBattleCamTarget = 0x8024E9B0; // type:func rom:0x17D290 +SetBattleCamOffsetY = 0x8024EA58; // type:func rom:0x17D338 +AddBattleCamOffsetY = 0x8024EA98; // type:func rom:0x17D378 SetBattleCamYaw = 0x8024EAE4; // type:func rom:0x17D3C4 BattleCamTargetActor = 0x8024EB24; // type:func rom:0x17D404 BattleCamTargetActorPart = 0x8024EB84; // type:func rom:0x17D464 MoveBattleCamOver = 0x8024EC08; // type:func rom:0x17D4E8 -SetBattleCamZoom = 0x8024EC6C; // type:func rom:0x17D54C -AddBattleCamZoom = 0x8024ECAC; // type:func rom:0x17D58C -func_8024ECF8 = 0x8024ECF8; // type:func rom:0x17D5D8 +SetBattleCamDist = 0x8024EC6C; // type:func rom:0x17D54C +AddBattleCamDist = 0x8024ECAC; // type:func rom:0x17D58C +SetBattleCamTargetingModes = 0x8024ECF8; // type:func rom:0x17D5D8 FreezeBattleCam = 0x8024ED78; // type:func rom:0x17D658 -func_8024EDA4 = 0x8024EDA4; // type:func rom:0x17D684 +DisableBattleCamClampX = 0x8024EDA4; // type:func rom:0x17D684 btl_popup_messages_init = 0x8024EDC0; // type:func rom:0x17D6A0 btl_popup_messages_delete = 0x8024EDEC; // type:func rom:0x17D6CC btl_popup_messages_update = 0x8024EE48; // type:func rom:0x17D728 @@ -6774,7 +6774,7 @@ btl_init_menu_partner = 0x80263914; // type:func rom:0x1921F4 count_power_plus = 0x80263B10; // type:func rom:0x1923F0 deduct_current_move_fp = 0x80263BC8; // type:func rom:0x1924A8 reset_actor_turn_info = 0x80263C60; // type:func rom:0x192540 -func_80263CC4 = 0x80263CC4; // type:func rom:0x1925A4 +shake_battle_cam_pitch = 0x80263CC4; // type:func rom:0x1925A4 set_actor_anim = 0x80263CFC; // type:func rom:0x1925DC set_actor_anim_by_ref = 0x80263E08; // type:func rom:0x1926E8 set_actor_anim_rate = 0x80263EB8; // type:func rom:0x192798 @@ -7057,7 +7057,7 @@ dispatch_damage_event_player = 0x802731BC; // type:func rom:0x1A1A9C dispatch_damage_tick_event_player = 0x8027337C; // type:func rom:0x1A1C5C dispatch_hazard_event_player = 0x802733A8; // type:func rom:0x1A1C88 GetMenuSelection = 0x802733C4; // type:func rom:0x1A1CA4 -func_80273444 = 0x80273444; // type:func rom:0x1A1D24 +PlayerHopToGoal = 0x80273444; // type:func rom:0x1A1D24 PlayerFallToGoal = 0x80273894; // type:func rom:0x1A2174 PlayerLandJump = 0x80273B04; // type:func rom:0x1A23E4 PlayerRunToGoal = 0x80273C64; // type:func rom:0x1A2544 @@ -7070,9 +7070,9 @@ DispatchDamagePlayerEvent = 0x8027491C; // type:func rom:0x1A31FC EnablePlayerBlur = 0x80274978; // type:func rom:0x1A3258 ForceDisablePlayerBlur = 0x802749D8; // type:func rom:0x1A32B8 ForceDisablePlayerBlurImmediately = 0x802749F8; // type:func rom:0x1A32D8 -func_80274A18 = 0x80274A18; // type:func rom:0x1A32F8 -func_802752AC = 0x802752AC; // type:func rom:0x1A3B8C -func_80275F00 = 0x80275F00; // type:func rom:0x1A47E0 +PlayerBasicJumpToGoal = 0x80274A18; // type:func rom:0x1A32F8 +PlayerSuperJumpToGoal = 0x802752AC; // type:func rom:0x1A3B8C +PlayerUltraJumpToGoal = 0x80275F00; // type:func rom:0x1A47E0 GetPlayerActionSuccess = 0x80276EB4; // type:func rom:0x1A5794 PlayerYieldTurn = 0x80276EFC; // type:func rom:0x1A57DC DispatchEventPlayer = 0x80276F1C; // type:func rom:0x1A57FC @@ -7178,20 +7178,20 @@ BtlPutPartnerAway = 0x80280A34; // rom:0x1AF314 BtlBringPartnerOut = 0x80280B6C; // rom:0x1AF44C BattleCam_IsFrozen = 0x80280CE0; // rom:0x1AF5C0 BattleCam_CurrentPresetID = 0x80280CE4; // rom:0x1AF5C4 -CamPreset_B = 0x80280CE8; // rom:0x1AF5C8 -CamPreset_F = 0x80280D04; // rom:0x1AF5E4 -CamPreset_M = 0x80280D20; // rom:0x1AF600 -CamPreset_G = 0x80280D3C; // rom:0x1AF61C -CamPreset_I = 0x80280D58; // rom:0x1AF638 -CamPreset_H = 0x80280D74; // rom:0x1AF654 -CamPreset_N = 0x80280D90; // rom:0x1AF670 -EVS_BattleCam_Default = 0x80280DAC; // rom:0x1AF68C -CamPreset_D = 0x80280DC8; // rom:0x1AF6A8 -CamPreset_E = 0x80280DE4; // rom:0x1AF6C4 -CamPreset_J = 0x80280E00; // rom:0x1AF6E0 -CamPreset_K = 0x80280E1C; // rom:0x1AF6FC -CamPreset_L = 0x80280E38; // rom:0x1AF718 -CamPreset_A = 0x80280E54; // rom:0x1AF734 +EVS_BattleCam_Interrupt = 0x80280CE8; // rom:0x1AF5C8 +EVS_BattleCam_UnkF_Skippable = 0x80280D04; // rom:0x1AF5E4 +EVS_BattleCam_UnkM_Skippable = 0x80280D20; // rom:0x1AF600 +EVS_BattleCam_UnkG_Skippable = 0x80280D3C; // rom:0x1AF61C +EVS_BattleCam_FocusActor = 0x80280D58; // rom:0x1AF638 +EVS_BattleCam_FocusGoal = 0x80280D74; // rom:0x1AF654 +EVS_BattleCam_SimpleLerp_Unskippable = 0x80280D90; // rom:0x1AF670 +EVS_BattleCam_ResetNeutral = 0x80280DAC; // rom:0x1AF68C +EVS_BattleCam_ViewEnemies = 0x80280DC8; // rom:0x1AF6A8 +EVS_BattleCam_ViewEnemies_MaintainY = 0x80280DE4; // rom:0x1AF6C4 +EVS_BattleCam_SimpleLerp_Skippable = 0x80280E00; // rom:0x1AF6E0 +EVS_BattleCam_FollowActorY = 0x80280E1C; // rom:0x1AF6FC +EVS_BattleCam_FollowActorPos = 0x80280E38; // rom:0x1AF718 +EVS_BattleCam_Reset = 0x80280E54; // rom:0x1AF734 EVS_OnBattleInit = 0x80280EB8; // rom:0x1AF798 bPlayerCelebrations = 0x80280FC0; // rom:0x1AF8A0 bActorNames = 0x80281104; // rom:0x1AF9E4 @@ -14418,7 +14418,7 @@ D_802A2AFC_0073C9CC = 0x802A2AFC; // rom:0x73C9CC D_802A2DA0_0073CC70 = 0x802A2DA0; // rom:0x73CC70 battle_move_quake_hammer_main = 0x802A3044; // rom:0x73CF14 D_802A3168_0073D038 = 0x802A3168; // rom:0x73D038 -battle_move_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x73D860 +battle_move_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x73D860 battle_move_jump_GetJumpDamage = 0x802A10E4; // type:func rom:0x73D944 D_802A1140_73D9A0 = 0x802A1140; // rom:0x73D9A0 battle_move_jump_CheckForAPress = 0x802A1180; // rom:0x73D9E0 @@ -14448,7 +14448,7 @@ D_802A36D8_73FF38 = 0x802A36D8; // rom:0x73FF38 D_802A39C4_740224 = 0x802A39C4; // rom:0x740224 D_802A3CF0_740550 = 0x802A3CF0; // rom:0x740550 D_802A4018_740878 = 0x802A4018; // rom:0x740878 -battle_move_multibounce_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x740CC0 +battle_move_multibounce_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x740CC0 D_802A10F0_740DB0 = 0x802A10F0; // rom:0x740DB0 battle_move_multibounce_CheckForAPress = 0x802A1130; // rom:0x740DF0 battle_move_multibounce_D_802A11AC = 0x802A11AC; // rom:0x740E6C @@ -14458,27 +14458,27 @@ battle_move_multibounce_D_802A14F0 = 0x802A14F0; // rom:0x7411B0 battle_move_multibounce_D_802A15D8 = 0x802A15D8; // rom:0x741298 battle_move_multibounce_D_802A17C4 = 0x802A17C4; // rom:0x741484 battle_move_multibounce_D_802A19B0 = 0x802A19B0; // rom:0x741670 -battle_move_multibounce_EVS_JumpSupport_H = 0x802A1B9C; // rom:0x74185C -battle_move_multibounce_EVS_JumpSupport_I = 0x802A1D88; // rom:0x741A48 +battle_move_multibounce_EVS_JumpSupport_UnusedRebound = 0x802A1B9C; // rom:0x74185C +battle_move_multibounce_EVS_JumpSupport_BouncingRebound = 0x802A1D88; // rom:0x741A48 battle_move_multibounce_D_802A1FEC = 0x802A1FEC; // rom:0x741CAC battle_move_multibounce_D_802A2184 = 0x802A2184; // rom:0x741E44 -battle_move_multibounce_EVS_JumpSupport_L = 0x802A2230; // rom:0x741EF0 -battle_move_multibounce_EVS_JumpSupport_M = 0x802A2384; // rom:0x742044 +battle_move_multibounce_EVS_JumpSupport_UnusedSuper = 0x802A2230; // rom:0x741EF0 +battle_move_multibounce_EVS_JumpSupport_UnusedUltra = 0x802A2384; // rom:0x742044 battle_move_multibounce_D_802A2600 = 0x802A2600; // rom:0x7422C0 D_802A26C8_742388 = 0x802A26B0; // rom:0x742370 D_802A2F80_742C40 = 0x802A2F68; // rom:0x742C28 D_802A388C_74354C = 0x802A3874; // rom:0x743534 -battle_move_power_bounce_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x743DF0 +battle_move_power_bounce_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x743DF0 func_802A10E4_743ED4 = 0x802A10E4; // type:func rom:0x743ED4 func_802A1194_743F84 = 0x802A1194; // type:func rom:0x743F84 func_802A11A4_743F94 = 0x802A11A4; // type:func rom:0x743F94 func_802A11C0_743FB0 = 0x802A11C0; // type:func rom:0x743FB0 -battle_move_sleep_stomp_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x746E10 -battle_move_dizzy_stomp_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x748DD0 +battle_move_sleep_stomp_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x746E10 +battle_move_dizzy_stomp_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x748DD0 battle_move_d_down_pound_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x74AD90 battle_move_d_down_pound_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x74ADE0 func_802A10A4_74AE34 = 0x802A10A4; // type:func rom:0x74AE34 -battle_move_jump_charge_0_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x74D570 +battle_move_jump_charge_0_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x74D570 battle_move_jump_charge_0_IsJumpMaxCharged = 0x802A10E4; // type:func rom:0x74D654 func_802A1108_74D678 = 0x802A1108; // type:func rom:0x74D678 func_802A120C_74D77C = 0x802A120C; // type:func rom:0x74D77C @@ -14498,7 +14498,7 @@ battle_move_hammer_charge_1_IsHammerMaxCharged = 0x802A10A4; // type:func rom:0x func_802A10C8_759678 = 0x802A10C8; // type:func rom:0x759678 battle_move_hammer_charge_1_UnkMoveFunc2 = 0x802A11E8; // type:func rom:0x759798 func_802A12FC_7598AC = 0x802A12FC; // type:func rom:0x7598AC -battle_move_jump_charge_1_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x75C980 +battle_move_jump_charge_1_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x75C980 battle_move_jump_charge_1_IsJumpMaxCharged = 0x802A10E4; // type:func rom:0x75CA64 func_802A1108_75CA88 = 0x802A1108; // type:func rom:0x75CA88 battle_move_jump_charge_1_UnkMoveFunc2 = 0x802A1228; // type:func rom:0x75CBA8 @@ -14509,35 +14509,35 @@ battle_move_hammer_charge_2_IsHammerMaxCharged = 0x802A10A4; // type:func rom:0x func_802A10C8_75E698 = 0x802A10C8; // type:func rom:0x75E698 battle_move_hammer_charge_2_UnkMoveFunc3 = 0x802A11E8; // type:func rom:0x75E7B8 func_802A12FC_75E8CC = 0x802A12FC; // type:func rom:0x75E8CC -battle_move_jump_charge_2_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x761920 +battle_move_jump_charge_2_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x761920 battle_move_jump_charge_2_IsJumpMaxCharged = 0x802A10E4; // type:func rom:0x761A04 func_802A1108_761A28 = 0x802A1108; // type:func rom:0x761A28 battle_move_jump_charge_2_UnkMoveFunc3 = 0x802A1228; // type:func rom:0x761B48 func_802A133C_761C5C = 0x802A133C; // type:func rom:0x761C5C battle_move_auto_smash_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x763540 battle_move_auto_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x763590 -battle_move_auto_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x765C20 +battle_move_auto_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x765C20 battle_move_auto_jump_D_802A10F0 = 0x802A10F0; // rom:0x765D10 battle_move_auto_jump_CheckForAPress = 0x802A1130; // rom:0x765D50 EVS_JumpSupport_Approach = 0x802A11AC; // rom:0x765DCC -EVS_JumpSupport_B = 0x802A1320; // rom:0x765F40 -EVS_JumpSupport_C = 0x802A1408; // rom:0x766028 -EVS_JumpSupport_D = 0x802A14F0; // rom:0x766110 -EVS_JumpSupport_E = 0x802A15D8; // rom:0x7661F8 +EVS_JumpSupport_CalcJumpTime = 0x802A1320; // rom:0x765F40 +EVS_JumpSupport_CalcJumpTime_Alt1 = 0x802A1408; // rom:0x766028 +EVS_JumpSupport_CalcJumpTime_Alt2 = 0x802A14F0; // rom:0x766110 +EVS_JumpSupport_Rebound = 0x802A15D8; // rom:0x7661F8 D_802A17C4 = 0x802A17C4; // rom:0x7663E4 -EVS_JumpSupport_H = 0x802A1B9C; // rom:0x7667BC -EVS_JumpSupport_I = 0x802A1D88; // rom:0x7669A8 +EVS_JumpSupport_UnusedRebound = 0x802A1B9C; // rom:0x7667BC +EVS_JumpSupport_BouncingRebound = 0x802A1D88; // rom:0x7669A8 EVS_JumpSupport_Miss = 0x802A1FEC; // rom:0x766C0C -EVS_JumpSupport_InitCommand = 0x802A2184; // rom:0x766DA4 -EVS_JumpSupport_L = 0x802A2230; // rom:0x766E50 -EVS_JumpSupport_M = 0x802A2384; // rom:0x766FA4 +EVS_JumpSupport_ApproachAndJump = 0x802A2184; // rom:0x766DA4 +EVS_JumpSupport_UnusedSuper = 0x802A2230; // rom:0x766E50 +EVS_JumpSupport_UnusedUltra = 0x802A2384; // rom:0x766FA4 D_802A2600 = 0x802A2600; // rom:0x767220 D_802A26BC_7672DC = 0x802A26BC; // rom:0x7672DC D_802A2A30_767650 = 0x802A2A30; // rom:0x767650 D_802A2D5C_76797C = 0x802A2D5C; // rom:0x76797C battle_move_power_quake_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x767C90 battle_move_power_quake_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x767CE0 -battle_move_auto_multibounce_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x76A830 +battle_move_auto_multibounce_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x76A830 battle_move_auto_multibounce_D_802A10F0 = 0x802A10F0; // rom:0x76A920 battle_move_auto_multibounce_CheckForAPress = 0x802A1130; // rom:0x76A960 battle_move_auto_multibounce_D_802A11AC = 0x802A11AC; // rom:0x76A9DC @@ -14547,36 +14547,36 @@ battle_move_auto_multibounce_D_802A14F0 = 0x802A14F0; // rom:0x76AD20 battle_move_auto_multibounce_D_802A15D8 = 0x802A15D8; // rom:0x76AE08 battle_move_auto_multibounce_D_802A17C4 = 0x802A17C4; // rom:0x76AFF4 battle_move_auto_multibounce_D_802A19B0 = 0x802A19B0; // rom:0x76B1E0 -battle_move_auto_multibounce_EVS_JumpSupport_H = 0x802A1B9C; // rom:0x76B3CC -battle_move_auto_multibounce_EVS_JumpSupport_I = 0x802A1D88; // rom:0x76B5B8 +battle_move_auto_multibounce_EVS_JumpSupport_UnusedRebound = 0x802A1B9C; // rom:0x76B3CC +battle_move_auto_multibounce_EVS_JumpSupport_BouncingRebound = 0x802A1D88; // rom:0x76B5B8 battle_move_auto_multibounce_D_802A1FEC = 0x802A1FEC; // rom:0x76B81C battle_move_auto_multibounce_D_802A2184 = 0x802A2184; // rom:0x76B9B4 -battle_move_auto_multibounce_EVS_JumpSupport_L = 0x802A2230; // rom:0x76BA60 -battle_move_auto_multibounce_EVS_JumpSupport_M = 0x802A2384; // rom:0x76BBB4 +battle_move_auto_multibounce_EVS_JumpSupport_UnusedSuper = 0x802A2230; // rom:0x76BA60 +battle_move_auto_multibounce_EVS_JumpSupport_UnusedUltra = 0x802A2384; // rom:0x76BBB4 battle_move_auto_multibounce_main = 0x802A2600; // rom:0x76BE30 battle_move_auto_multibounce_D_802A26A8 = 0x802A26A8; // rom:0x76BED8 battle_move_auto_multibounce_D_802A2EC0 = 0x802A2EC0; // rom:0x76C6F0 battle_move_auto_multibounce_D_802A372C = 0x802A372C; // rom:0x76CF5C -battle_move_power_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x76D760 -battle_move_super_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x76F330 -battle_move_mega_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x770F30 +battle_move_power_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x76D760 +battle_move_super_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x76F330 +battle_move_mega_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x770F30 battle_move_power_smash_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x772BA0 battle_move_power_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x772BF0 battle_move_super_smash_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x775100 battle_move_super_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x775150 battle_move_mega_smash_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x777690 battle_move_mega_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x7776E0 -battle_move_unknown_move_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x779C90 +battle_move_unknown_move_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x779C90 func_802A10E4_779D74 = 0x802A10E4; // type:func rom:0x779D74 battle_move_shrink_smash_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x77CB80 battle_move_shrink_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x77CBD0 battle_move_shell_crack_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x77F240 battle_move_shell_crack_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x77F290 func_802A10A4_77F2E4 = 0x802A10A4; // type:func rom:0x77F2E4 -battle_move_d_down_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x781920 +battle_move_d_down_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x781920 func_802A10E4_781A04 = 0x802A10E4; // type:func rom:0x781A04 -battle_move_shrink_stomp_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x783BA0 -battle_move_earthquake_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x785B20 +battle_move_shrink_stomp_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x783BA0 +battle_move_earthquake_jump_CalcJumpReboundTime = 0x802A1000; // type:func rom:0x785B20 func_802A10E4_785C04 = 0x802A10E4; // type:func rom:0x785C04 battle_star_focus_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x789E60 battle_star_focus_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x789F0C @@ -25904,8 +25904,8 @@ ShopOwnerPrintState = 0x80286538; // EVS_RunAwayStart = 0x802868BC; // EVS_RunAwayFail = 0x80287078; // EVS_PlayerDies = 0x80287128; // -EVS_PlayEatFX = 0x802878D0; // -EVS_PlayDrinkFX = 0x80287948; // +EVS_Unused_EatItem = 0x802878D0; // +EVS_Unused_DrinkItem = 0x80287948; // EVS_UseLifeShroom = 0x802879C0; // EVS_MerleeRunOut = 0x80288398; // EVS_MerleeAttackBonus = 0x80288400; // @@ -25965,26 +25965,26 @@ D_8029F264 = 0x8029F264; // BattleCam_PosX = 0x8029F270; // BattleCam_PosY = 0x8029F274; // BattleCam_PosZ = 0x8029F278; // -BattleCam_TargetActor = 0x8029F27C; // -BattleCam_TargetActorPart = 0x8029F27E; // +BattleCam_SubjectActor = 0x8029F27C; // +BattleCam_SubjectActorPart = 0x8029F27E; // BattleCam_BoomLength = 0x8029F280; // BattleCam_BoomYaw = 0x8029F282; // BattleCam_BoomPitch = 0x8029F284; // -BattleCam_BoomZOffset = 0x8029F286; // +BattleCam_BoomOffsetY = 0x8029F286; // D_8029F288 = 0x8029F288; // BattleCam_InitialBoomLength = 0x8029F28C; // BattleCam_InitialBoomYaw = 0x8029F290; // BattleCam_InitialBoomPitch = 0x8029F294; // -BattleCam_InitialBoomZOffset = 0x8029F298; // +BattleCam_InitialBoomOffsetY = 0x8029F298; // BattleCam_DoneMoving = 0x8029F29C; // BattleCam_MoveTimeLeft = 0x8029F29E; // BattleCam_MoveTimeTotal = 0x8029F2A0; // -BattleCam_ModeY = 0x8029F2A2; // -BattleCam_ModeX = 0x8029F2A3; // +BattleCam_AdjustTargetYMode = 0x8029F2A2; // +BattleCam_AdjustTargetXMode = 0x8029F2A3; // BattleCam_SetImmediately = 0x8029F2A4; // BattleCam_UseLinearInterp = 0x8029F2A5; // -D_8029F2A6 = 0x8029F2A6; // -D_8029F2A7 = 0x8029F2A7; // +BattleCam_ClampPosX = 0x8029F2A6; // +BattleCam_ExtraOffsetX = 0x8029F2A7; // BattleCam_InitialPosX = 0x8029F2A8; // BattleCam_InitialPosY = 0x8029F2AC; // BattleCam_InitialPosZ = 0x8029F2B0; //