pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-10-18 10:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

dx camera upstreams (#1207)

Browse Source
This commit is contained in:
z64a 2024-09-23 14:42:15 -04:00 committed by GitHub
parent ee8217d432
commit 5e2487fde2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
607 changed files with 4850 additions and 4581 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/camera.h
View File

@ -1,14 +1,14 @@
#ifndef _CAMERA_H_ #ifndef _CAMERA_H_
#define _CAMERA_H_ #define _CAMERA_H_
extern f32 D_8009A5EC; extern f32 CamLengthScale;
void update_camera_mode_0(Camera*); void update_camera_minimal(Camera*);
void update_camera_mode_1(Camera*); void update_camera_unused_radial(Camera*);
void update_camera_mode_2(Camera*); void update_camera_interp_pos(Camera*);
void update_camera_mode_4(Camera*); void update_camera_unused_confined(Camera*);
void update_camera_mode_5(Camera*); void update_camera_unused_leading(Camera*);
void update_camera_mode_6(Camera*); void update_camera_no_interp(Camera*);
void create_camera_leadplayer_matrix(Camera*); void create_camera_leadplayer_matrix(Camera*);
void update_camera_zone_interp(Camera* camera); void update_camera_zone_interp(Camera* camera);

122
include/common_structs.h
View File

@ -136,13 +136,13 @@ typedef struct Matrix4s {
/* 0x20 */ s16 frac[4][4]; /* 0x20 */ s16 frac[4][4];
} Matrix4s; // size = 0x40 } Matrix4s; // size = 0x40
typedef struct CamConfiguration { typedef struct CameraRig {
/* 0x00 */ f32 boomYaw; /* 0x00 */ f32 boomYaw;
/* 0x04 */ f32 boomLength; /* 0x04 */ f32 boomLength;
/* 0x08 */ f32 boomPitch; /* 0x08 */ f32 boomPitch;
/* 0x0C */ f32 viewPitch; /* 0x0C */ f32 viewPitch;
/* 0x10 */ Vec3f targetPos; /* 0x10 */ Vec3f targetPos;
} CamConfiguration; // size = 0x1C } CameraRig; // size = 0x1C
typedef struct DmaTable { typedef struct DmaTable {
/* 0x00 */ u8* start; /* 0x00 */ u8* start;
@ -752,15 +752,15 @@ typedef struct CameraControlSettings {
} three; } three;
} points; } points;
/* 0x24 */ f32 viewPitch; /* 0x24 */ f32 viewPitch;
/* 0x28 */ s32 flag; /* 0x28 */ b32 flag;
} CameraControlSettings; // size = 0x2C } CameraControlSettings; // size = 0x2C
typedef struct Camera { typedef struct Camera {
/* 0x000 */ u16 flags; /* 0x000 */ u16 flags;
/* 0x002 */ s16 moveFlags; /* 0x002 */ s16 moveFlags;
/* 0x004 */ s16 updateMode; /* 0x004 */ s16 updateMode;
/* 0x006 */ s16 needsInit; /* 0x006 */ b16 needsInit;
/* 0x008 */ b16 isChangingMap; /* 0x008 */ b16 needsReinit; // used when loading from a save point or calling SetCamPerspective
/* 0x00A */ s16 viewportW; /* 0x00A */ s16 viewportW;
/* 0x00C */ s16 viewportH; /* 0x00C */ s16 viewportH;
/* 0x00E */ s16 viewportStartX; /* 0x00E */ s16 viewportStartX;
@ -769,31 +769,65 @@ typedef struct Camera {
/* 0x014 */ s16 farClip; /* 0x014 */ s16 farClip;
/* 0x016 */ char unk_16[2]; /* 0x016 */ char unk_16[2];
/* 0x018 */ f32 vfov; /* 0x018 */ f32 vfov;
/* 0x01C */ s16 auxPitch; union {
/* 0x01E */ s16 auxBoomLength; struct {
/* 0x020 */ s16 lookAt_dist; /* 0x01C */ s16 camParam1;
/* 0x022 */ s16 auxBoomPitch; /* 0x01E */ s16 camParam2;
/* 0x024 */ s16 auxBoomYaw; /* 0x020 */ s16 camParam3;
/* 0x026 */ s16 auxBoomZOffset; /* 0x022 */ s16 camParam4;
/* 0x028 */ s16 unk_28; /* 0x024 */ s16 camParam5;
/* 0x02A */ s16 zoomPercent; /* 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]; /* 0x02C */ s16 bgColor[3];
/* 0x032 */ Vec3s targetScreenCoords; /* 0x032 */ Vec3s targetScreenCoords; // screen coords corresponding to targetPos
/* 0x038 */ u16 perspNorm; /* 0x038 */ u16 perspNorm;
/* 0x03A */ char unk_3A[2]; /* 0x03A */ char unk_3A[2];
/* 0x03C */ Vec3f lookAt_eye; /* 0x03C */ Vec3f lookAt_eye; // used to construct the view matrix
/* 0x048 */ Vec3f lookAt_obj; /* 0x048 */ Vec3f lookAt_obj; // used to construct the view matrix
/* 0x054 */ Vec3f lookAt_obj_target; /* 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; /* 0x06C */ f32 curYaw;
/* 0x070 */ f32 unk_70; /* 0x070 */ f32 interpYaw; // no camera mode actually uses this for interpolation
/* 0x074 */ f32 curBoomYaw; /* 0x074 */ f32 curBoomPitch;
/* 0x078 */ f32 curBoomLength; /* 0x078 */ f32 curBoomLength;
/* 0x07C */ f32 curYOffset; /* 0x07C */ f32 targetOffsetY;
/* 0x080 */ char unk_80[4]; /* 0x080 */ char unk_80[4];
/* 0x084 */ Vec3f trueRot; /* 0x084 */ f32 curBoomYaw;
/* 0x090 */ f32 curBlendedYawNegated; /* 0x088 */ f32 targetBoomYaw; // only used by CAM_UPDATE_UNUSED_RADIAL
/* 0x094 */ f32 curPitch; /* 0x08C */ f32 unk_8C;
/* 0x090 */ f32 lookAt_yaw;
/* 0x094 */ f32 lookAt_pitch;
/* 0x098 */ f32 unk_98; /* 0x098 */ f32 unk_98;
/* 0x09C */ f32 unk_9C; /* 0x09C */ f32 unk_9C;
/* 0x0A0 */ Vp vp; /* 0x0A0 */ Vp vp;
@ -801,26 +835,26 @@ typedef struct Camera {
/* 0x0C0 */ s32 unk_C0; /* 0x0C0 */ s32 unk_C0;
/* 0x0C4 */ f32 unk_C4; /* 0x0C4 */ f32 unk_C4;
/* 0x0C8 */ char unk_C8[0xC]; /* 0x0C8 */ char unk_C8[0xC];
/* 0x0D4 */ Matrix4f perspectiveMatrix; /* 0x0D4 */ Matrix4f mtxPerspective;
/* 0x114 */ Matrix4f viewMtxPlayer; /* centers on player */ /* 0x114 */ Matrix4f mtxViewPlayer; // centers on player
/* 0x154 */ Matrix4f viewMtxLeading; /* leads player slightly */ /* 0x154 */ Matrix4f mtxViewLeading; // leads player slightly
/* 0x194 */ Matrix4f viewMtxShaking; /* used while ShakeCam is active */ /* 0x194 */ Matrix4f mtxViewShaking; // used while ShakeCam is active
/* 0x1D4 */ char unk_1D4[0x28]; /* 0x1D4 */ char unk_1D4[0x28];
/* 0x1FC */ void (*fpDoPreRender)(struct Camera*); /* 0x1FC */ void (*fpDoPreRender)(struct Camera*);
/* 0x200 */ void (*fpDoPostRender)(struct Camera*); /* 0x200 */ void (*fpDoPostRender)(struct Camera*);
/* 0x204 */ Mtx* unkMatrix; /* 0x204 */ Mtx* mtxBillboard; // rotation matrix created from -curBoomYaw
/* 0x208 */ s32 unk_208; /* 0x208 */ s32 unk_208;
/* 0x20C */ Matrix4s* unkEffectMatrix; /* 0x20C */ Matrix4s* unkEffectMatrix;
/* 0x210 */ char unk_210[0x2]; /* 0x210 */ char unk_210[0x2];
/* 0x212 */ s16 unk_212; /* 0x212 */ s16 unk_212;
/* 0x214 */ CameraUnk unk_214[4]; /* 0x214 */ CameraUnk unk_214[4];
/* 0x444 */ CameraControlSettings* prevController; /* 0x444 */ CameraControlSettings* prevSettings;
/* 0x448 */ CameraControlSettings* curController; /* 0x448 */ CameraControlSettings* curSettings;
/* 0x44C */ CamConfiguration prevConfiguration; /* 0x44C */ CameraRig prevRig;
/* 0x468 */ CamConfiguration goalConfiguration; /* 0x468 */ CameraRig nextRig;
/* 0x484 */ f32 interpAlpha; /* 0x484 */ f32 interpAlpha;
/* 0x488 */ f32 linearInterp; /* 0x488 */ f32 linearInterp;
/* 0x48C */ f32 linearInterpScale; /* 3.0? */ /* 0x48C */ f32 linearInterpRate;
/* 0x490 */ f32 moveSpeed; /* 0x490 */ f32 moveSpeed;
/* 0x494 */ f32 yinterpGoal; /* 0x494 */ f32 yinterpGoal;
/* 0x498 */ f32 yinterpAlpha; /* 0x498 */ f32 yinterpAlpha;
@ -835,22 +869,22 @@ typedef struct Camera {
/* 0x4D8 */ CameraControlSettings controlSettings; /* 0x4D8 */ CameraControlSettings controlSettings;
/* 0x504 */ u16 followPlayer; /* 0x504 */ u16 followPlayer;
/* 0x506 */ u16 panActive; /* 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; /* 0x50C */ f32 leadAmount;
/* 0x510 */ f32 targetLeadAmount; /* 0x510 */ f32 targetLeadAmount;
/* 0x514 */ f32 leadInterpAlpha; /* 0x514 */ f32 leadInterpAlpha;
/* 0x518 */ f32 accumulatedStickLead; /* 0x518 */ f32 accumulatedStickLead;
/* 0x51C */ s32 increasingLeadInterp; /* 0x51C */ s32 increasingLeadInterp;
/* 0x520 */ f32 unk_520; /* 0x520 */ f32 leadAmtScale;
/* 0x524 */ f32 leadUnkX; /* 0x524 */ f32 prevLeadPosX;
/* 0x528 */ f32 leadUnkZ; /* 0x528 */ f32 prevLeadPosZ;
/* 0x52C */ s32 unk_52C; /* 0x52C */ s32 leadConstrainDir;
/* 0x530 */ s32 unk_530; /* 0x530 */ b32 needsInitialConstrainDir;
/* 0x534 */ CameraControlSettings* leadControlSettings; /* 0x534 */ CameraControlSettings* prevLeadSettings;
/* 0x538 */ char unk_538[0x18]; /* 0x538 */ char unk_538[0x18];
/* 0x550 */ f32 unk_550; /* 0x550 */ f32 unusedLeadAmt;
/* 0x554 */ s16 unk_554; /* 0x554 */ s16 unusedLeadCounter;
/* 0x556 */ s16 unk_556; /* 0x556 */ s16 unusedLeadDir;
} Camera; // size = 0x558 } Camera; // size = 0x558
typedef struct BattleStatus { typedef struct BattleStatus {
@ -2007,7 +2041,7 @@ typedef struct PlayerStatus {
/* 0x06C */ f32 maxJumpSpeed; /* 0x06C */ f32 maxJumpSpeed;
/* 0x070 */ f32 gravityIntegrator[4]; // derivatives of y; 0 = velocity, 1 = accel, etc /* 0x070 */ f32 gravityIntegrator[4]; // derivatives of y; 0 = velocity, 1 = accel, etc
/* 0x080 */ f32 targetYaw; /* 0x080 */ f32 targetYaw;
/* 0x084 */ f32 curYaw; /* 0x084 */ f32 curYaw; // the direction of player input in world-space (not camera-relative)
/* 0x088 */ f32 overlapPushYaw; /* 0x088 */ f32 overlapPushYaw;
/* 0x08C */ f32 pitch; /* 0x08C */ f32 pitch;
/* 0x090 */ f32 flipYaw[4]; /* 0x090 */ f32 flipYaw[4];

31
include/effects.h
View File

@ -1269,24 +1269,27 @@ typedef struct SmallGoldSparkleFXData {
/* 0x20 */ s32 unk_20; /* 0x20 */ s32 unk_20;
} SmallGoldSparkleFXData; // size = 0x24 } SmallGoldSparkleFXData; // size = 0x24
typedef struct FlashingBoxShockwaveFXData { enum ShockOverlayFXTypes {
/* 0x00 */ s32 unk_00; 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; /* 0x04 */ Vec3f pos;
/* 0x10 */ s32 unk_10; /* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14; /* 0x14 */ s32 unk_14;
/* 0x18 */ s32 unk_18; /* 0x18 */ s32 unk_18;
/* 0x1C */ s32 unk_1C; /* 0x1C */ s32 timeLeft;
/* 0x20 */ s32 unk_20; /* 0x20 */ s32 lifetime;
/* 0x24 */ f32 unk_24; /* 0x24 */ f32 unk_24;
/* 0x28 */ f32 unk_28; /* 0x28 */ f32 scaleX;
/* 0x2C */ f32 unk_2C; /* 0x2C */ f32 scaleY;
/* 0x30 */ s32 unk_30; /* 0x30 */ Color3i primCol;
/* 0x34 */ s32 unk_34; /* 0x3C */ Color3i envCol;
/* 0x38 */ s32 unk_38; } ShockOverlayFXData; // size = 0x48
/* 0x3C */ s32 unk_3C;
/* 0x40 */ s32 unk_40;
/* 0x44 */ s32 unk_44;
} FlashingBoxShockwaveFXData; // size = 0x48
typedef struct BalloonFXData { typedef struct BalloonFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
@ -2542,7 +2545,7 @@ typedef union {
struct GatherMagicFXData* gatherMagic; struct GatherMagicFXData* gatherMagic;
struct AttackResultTextFXData* attackResultText; struct AttackResultTextFXData* attackResultText;
struct SmallGoldSparkleFXData* smallGoldSparkle; struct SmallGoldSparkleFXData* smallGoldSparkle;
struct FlashingBoxShockwaveFXData* flashingBoxShockwave; struct ShockOverlayFXData* flashingBoxShockwave;
struct BalloonFXData* balloon; struct BalloonFXData* balloon;
struct FloatingRockFXData* floatingRock; struct FloatingRockFXData* floatingRock;
struct ChompDropFXData* chompDrop; struct ChompDropFXData* chompDrop;

269
include/enums.h
View File

@ -1800,25 +1800,25 @@ enum Cams {
CAM_DEFAULT = 0, CAM_DEFAULT = 0,
CAM_BATTLE = 1, CAM_BATTLE = 1,
CAM_TATTLE = 2, CAM_TATTLE = 2,
CAM_3 = 3, CAM_HUD = 3,
}; };
enum CamShakeModes { enum CamShakeModes {
CAM_SHAKE_CONSTANT_VERTICAL = 0, CAM_SHAKE_CONSTANT_VERTICAL = 0,
CAM_SHAKE_ANGULAR_HORIZONTAL = 1, CAM_SHAKE_ANGULAR_HORIZONTAL = 1,
CAM_SHAKE_DECAYING_VERTICAL = 2 CAM_SHAKE_DECAYING_VERTICAL = 2,
}; };
// for use with SetBattleCamParam // for use with SetBattleCamParam
enum AuxCameraParams { enum BasicCameraParams {
AUX_CAM_PARAM_1 = 1, CAM_PARAM_SKIP_RECALC = 1,
AUX_CAM_BOOM_LENGTH = 2, CAM_PARAM_BOOM_LENGTH = 2,
AUX_CAM_PARAM_3 = 3, CAM_PARAM_FOV_SCALE = 3,
AUX_CAM_BOOM_PITCH = 4, CAM_PARAM_BOOM_PITCH = 4,
AUX_CAM_BOOM_YAW = 5, CAM_PARAM_BOOM_YAW = 5,
AUX_CAM_BOOM_ZOFFSET = 6, CAM_PARAM_BOOM_Y_OFFSET = 6,
AUX_CAM_PARAM_7 = 7, CAM_PARAM_UNK_7 = 7,
AUX_CAM_ZOOM_PERCENT = 8 CAM_PARAM_ZOOM_PERCENT = 8,
}; };
#include "item_enum.h" #include "item_enum.h"
@ -4286,6 +4286,32 @@ enum DebuffTypes {
DEBUFF_TYPE_INVISIBLE = 0x04000000, 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 { enum GlobalOverrides {
GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD = 0x00000002, GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD = 0x00000002,
GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME = 0x00000008, GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME = 0x00000008,
@ -4313,7 +4339,7 @@ enum GlobalOverrides {
| MODEL_FLAG_20 \ | MODEL_FLAG_20 \
| MODEL_FLAG_IGNORE_FOG \ | MODEL_FLAG_IGNORE_FOG \
| MODEL_FLAG_HAS_LOCAL_VERTEX_COPY \ | MODEL_FLAG_HAS_LOCAL_VERTEX_COPY \
| MODEL_FLAG_USE_CAMERA_UNK_MATRIX \ | MODEL_FLAG_BILLBOARD \
| MODEL_FLAG_DO_BOUNDS_CULLING \ | MODEL_FLAG_DO_BOUNDS_CULLING \
| MODEL_FLAG_HAS_TRANSFORM \ | MODEL_FLAG_HAS_TRANSFORM \
| MODEL_FLAG_HAS_TEX_PANNER \ | MODEL_FLAG_HAS_TEX_PANNER \
@ -4331,7 +4357,7 @@ enum ModelFlags {
MODEL_FLAG_20 = 0x0020, MODEL_FLAG_20 = 0x0020,
MODEL_FLAG_IGNORE_FOG = 0x0040, MODEL_FLAG_IGNORE_FOG = 0x0040,
MODEL_FLAG_HAS_LOCAL_VERTEX_COPY = 0x0080, 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_DO_BOUNDS_CULLING = 0x0200,
MODEL_FLAG_HAS_TRANSFORM = 0x0400, MODEL_FLAG_HAS_TRANSFORM = 0x0400,
MODEL_FLAG_HAS_TEX_PANNER = 0x0800, MODEL_FLAG_HAS_TEX_PANNER = 0x0800,
@ -4698,14 +4724,51 @@ enum CameraMoveFlags {
CAMERA_MOVE_ACCEL_INTERP_Y = 0x00000004, CAMERA_MOVE_ACCEL_INTERP_Y = 0x00000004,
}; };
enum CameraUpdateType { enum CameraUpdateMode {
CAM_UPDATE_MODE_INIT = 0, // simple camera based on lookAt_eye and lookAt_obj with no blending or interpolation
CAM_UPDATE_UNUSED_1 = 1, // control this camera by directly setting these positions
CAM_UPDATE_MODE_2 = 2, // 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_FROM_ZONE = 3,
CAM_UPDATE_UNUSED_4 = 4,
CAM_UPDATE_UNUSED_5 = 5, // this camera uses a set of control parameters to calculate its lookAt_obj and lookAt_eye positions,
CAM_UPDATE_MODE_6 = 6, // 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 { enum CameraControlType {
@ -4745,93 +4808,93 @@ enum CameraControlType {
CAM_CONTROL_CONSTAIN_BETWEEN_POINTS = 6, CAM_CONTROL_CONSTAIN_BETWEEN_POINTS = 6,
}; };
enum BtlCameraPreset { enum BattleCamPreset {
BTL_CAM_PRESET_00 = 0, // unused? BTL_CAM_RESET = 0x00,
BTL_CAM_PRESET_01 = 1, // STOP BTL_CAM_INTERRUPT = 0x01, // forces camera motion to end
BTL_CAM_DEFAULT = 2, BTL_CAM_DEFAULT = 0x02, // wide shot of the entire arena
BTL_CAM_PRESET_03 = 3, BTL_CAM_VIEW_ENEMIES = 0x03, // broad focus on enemy side of the field
BTL_CAM_PRESET_04 = 4, BTL_CAM_RETURN_HOME = 0x04,
BTL_CAM_PRESET_05 = 5, BTL_CAM_ACTOR_TARGET_MIDPOINT = 0x05, // focus on midpoint between subject actor and its target
BTL_CAM_PRESET_06 = 6, // unused? BTL_CAM_ACTOR_PART = 0x06, // unused
BTL_CAM_PRESET_07 = 7, BTL_CAM_ACTOR_GOAL_SIMPLE = 0x07,
BTL_CAM_PRESET_08 = 8, BTL_CAM_ACTOR_SIMPLE = 0x08, // same as BTL_CAM_ACTOR, but does not change boom pitch, yaw, or y-offset
BTL_CAM_PRESET_09 = 9, // unused? BTL_CAM_SLOW_DEFAULT = 0x09, // unused, same as BTL_CAM_DEFAULT but takes 4x as long
BTL_CAM_PRESET_10 = 10, BTL_CAM_MIDPOINT_CLOSE = 0x0A,
BTL_CAM_PRESET_11 = 11, BTL_CAM_MIDPOINT_NORMAL = 0x0B,
BTL_CAM_PRESET_12 = 12, // unused? BTL_CAM_MIDPOINT_FAR = 0x0C, // unused
BTL_CAM_PRESET_13 = 13, BTL_CAM_ACTOR_CLOSE = 0x0D, // focus on a targeted actor, closer than normal
BTL_CAM_PRESET_14 = 14, // FOCUS_ON_TARGET? BTL_CAM_ACTOR = 0x0E, // focus on a targeted actor using typical distance
BTL_CAM_PRESET_15 = 15, BTL_CAM_ACTOR_FAR = 0x0F, // focus on a targeted actor, further away than normal
BTL_CAM_PRESET_16 = 16, // unused? BTL_CAM_ACTOR_GOAL_NEAR = 0x10, // unused, focus on a targeted actor's goal, closer than normal
BTL_CAM_PRESET_17 = 17, // unused? BTL_CAM_ACTOR_GOAL = 0x11, // unused, focus on a targeted actor's goal, using typical distance
BTL_CAM_PRESET_18 = 18, // unused? BTL_CAM_ACTOR_GOAL_FAR = 0x12, // unused, focus on a targeted actor's goal, further away than normal
BTL_CAM_PRESET_19 = 19, BTL_CAM_REPOSITION = 0x13, // generic reposition, lerp to target parameters over the next 20 frames
BTL_CAM_PRESET_20 = 20, // unused? BTL_CAM_FOLLOW_ACTOR_Y = 0x14, // unused
BTL_CAM_PRESET_21 = 21, // unused? BTL_CAM_FOLLOW_ACTOR_POS = 0x15, // unused
BTL_CAM_PLAYER_ENTRY = 22, BTL_CAM_PLAYER_ENTRY = 0x16,
BTL_CAM_VICTORY = 23, // closeup on party while star points are tallied BTL_CAM_VICTORY = 0x17, // closeup on party while star points are tallied
BTL_CAM_PRESET_24 = 24, BTL_CAM_PLAYER_DIES = 0x18, // closeup on player dying
BTL_CAM_PRESET_25 = 25, // closeup on player used when running away or being defeated BTL_CAM_PLAYER_FLEE = 0x19, // closeup on player while running away
BTL_CAM_PLAYER_ATTACK_APPROACH = 26, BTL_CAM_PLAYER_ATTACK_APPROACH = 0x1A,
BTL_CAM_PRESET_27 = 27, BTL_CAM_PLAYER_PRE_JUMP_FINISH = 0x1B,
BTL_CAM_PRESET_28 = 28, BTL_CAM_PLAYER_PRE_ULTRA_JUMP_FINISH = 0x1C,
BTL_CAM_PRESET_29 = 29, BTL_CAM_PLAYER_MISTAKE = 0x1D, // player missed a jump or hammer acion command
BTL_CAM_PLAYER_HIT_SPIKE = 30, // player hurt via spike contact BTL_CAM_PLAYER_HIT_SPIKE = 0x1E, // player hurt via spike contact
BTL_CAM_PLAYER_HIT_HAZARD = 31, // player hurt via burn or shock contact BTL_CAM_PLAYER_HIT_HAZARD = 0x1F, // player hurt via burn or shock contact
BTL_CAM_PLAYER_CHARGE_UP = 32, BTL_CAM_PLAYER_CHARGE_UP = 0x20,
BTL_CAM_PLAYER_STATUS_AFFLICTED = 33, BTL_CAM_PLAYER_STATUS_AFFLICTED = 0x21,
BTL_CAM_PRESET_34 = 34, BTL_CAM_PLAYER_JUMP_MIDAIR = 0x22, // move through the air with the player mid-jump
BTL_CAM_PRESET_35 = 35, BTL_CAM_PLAYER_JUMP_FINISH = 0x23, // after a sucessful action command
BTL_CAM_PRESET_36 = 36, // unused? BTL_CAM_PLAYER_JUMP_FINISH_CLOSE = 0x24, // unused
BTL_CAM_PRESET_37 = 37, BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR = 0x25, // alternate BTL_CAM_PLAYER_JUMP_MIDAIR associated with an unused script for Super Jump
BTL_CAM_PRESET_38 = 38, BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR = 0x26, // alternate BTL_CAM_PLAYER_JUMP_MIDAIR associated with an unused script for Ultra Jump
BTL_CAM_PRESET_39 = 39, BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP = 0x27, // unused camera for followup hit of unused script for Ultra Jump
BTL_CAM_PRESET_40 = 40, BTL_CAM_PLAYER_MULTIBOUNCE = 0x28,
BTL_CAM_PRESET_41 = 41, // unused? BTL_CAM_PRESET_UNUSED_29 = 0x29, // unused
BTL_CAM_PRESET_42 = 42, // unused? BTL_CAM_PRESET_UNUSED_2A = 0x2A, // unused
BTL_CAM_PLAYER_AIM_HAMMER = 43, BTL_CAM_PLAYER_AIM_HAMMER = 0x2B,
BTL_CAM_PLAYER_HAMMER_STRIKE = 44, BTL_CAM_PLAYER_HAMMER_STRIKE = 0x2C,
BTL_CAM_PRESET_45 = 45, // unused? BTL_CAM_PRESET_UNUSED_2D = 0x2D, // unused, alterative to BTL_CAM_PLAYER_HAMMER_QUAKE
BTL_CAM_PRESET_46 = 46, BTL_CAM_PLAYER_HAMMER_QUAKE = 0x2E, // slowly pan over the enemy side
BTL_CAM_PARTNER_APPROACH = 47, // used by Goombario and Watt (power shock only) BTL_CAM_PARTNER_APPROACH = 0x2F, // used by Goombario and Watt (power shock only)
BTL_CAM_PRESET_48 = 48, BTL_CAM_CLOSER_PARTNER_APPROACH = 0x30,
BTL_CAM_PRESET_49 = 49, // unused? BTL_CAM_PRESET_UNUSED_31 = 0x31, // unused
BTL_CAM_PRESET_50 = 50, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_1 = 0x32, // goombario pre-jump 1
BTL_CAM_PRESET_51 = 51, BTL_CAM_PARTNER_MISTAKE = 0x33,
BTL_CAM_PRESET_52 = 52, BTL_CAM_PARTNER_MIDAIR = 0x34,
BTL_CAM_PRESET_53 = 53, BTL_CAM_GOOMBARIO_BONK_FOLLOWUP_2 = 0x35, // goombario pre-jump 2
BTL_CAM_PARTNER_INJURED = 54, // closeup on partner after being injured BTL_CAM_PARTNER_INJURED = 0x36, // closeup on partner after being injured
BTL_CAM_PRESET_55 = 55, BTL_CAM_PARTNER_GOOMPA = 0x37, // focus on Goompa speaking or Goombario charging
BTL_CAM_PRESET_56 = 56, // unused? BTL_CAM_PRESET_UNUSED_38 = 0x38, // unused
BTL_CAM_PRESET_57 = 57, // unused? BTL_CAM_PRESET_UNUSED_39 = 0x39, // unused
BTL_CAM_PRESET_58 = 58, // unused? BTL_CAM_PRESET_UNUSED_3A = 0x3A, // unused
BTL_CAM_PRESET_59 = 59, BTL_CAM_PARTNER_CLOSE_UP = 0x3B, // close focus on partner, used when kooper or sushie are charging an attack
BTL_CAM_PRESET_60 = 60, // unused? BTL_CAM_PRESET_UNUSED_3C = 0x3C, // unused
BTL_CAM_PRESET_61 = 61, BTL_CAM_PARTNER_HIT_SPIKE = 0x3D, // partner hurt via spike contact
BTL_CAM_PRESET_62 = 62, BTL_CAM_PARTNER_HIT_HAZARD = 0x3E, // partner hurt via burn or shock contact
BTL_CAM_ENEMY_APPROACH = 63, // (very common) BTL_CAM_ENEMY_APPROACH = 0x3F, // (very common)
BTL_CAM_PRESET_64 = 64, // unused? BTL_CAM_PRESET_UNUSED_40 = 0x40, // unused
BTL_CAM_PRESET_65 = 65, // unused? BTL_CAM_SLOWER_DEFAULT = 0x41, // unused, same as BTL_CAM_DEFAULT but takes slightly longer
BTL_CAM_PRESET_66 = 66, BTL_CAM_ENEMY_DIVE = 0x42, // used just before contact from dive attacks (paragoomba, para jr troopa, etc)
BTL_CAM_PRESET_67 = 67, // unused? BTL_CAM_PRESET_UNUSED_43 = 0x43, // unused
BTL_CAM_PRESET_68 = 68, // unused? BTL_CAM_PRESET_UNUSED_44 = 0x44, // unused
BTL_CAM_PRESET_69 = 69, BTL_CAM_PLAYER_WISH = 0x45, // used for Focus and Star Spirit wishing
BTL_CAM_PRESET_70 = 70, // unused? BTL_CAM_PRESET_UNUSED_46 = 0x46, // unused
BTL_CAM_PRESET_71 = 71, // unused? BTL_CAM_PRESET_UNUSED_47 = 0x47, // unused
BTL_CAM_PRESET_72 = 72, // unused? BTL_CAM_PRESET_UNUSED_48 = 0x48, // unused
BTL_CAM_PRESET_73 = 73, BTL_CAM_STAR_SPIRIT = 0x49,
}; };
enum BattleCamXModes { enum BattleCamTargetAdjustX {
BTL_CAM_MODEX_0 = 0, BTL_CAM_XADJ_NONE = 0, // use actor X
BTL_CAM_MODEX_1 = 1, BTL_CAM_XADJ_AVG = 1, // use average
}; };
enum BattleCamYModes { enum BattleCamTargetAdjustY {
BTL_CAM_MODEY_MINUS_2 = -2, BTL_CAM_YADJ_SLIGHT = -2, // target y position is weighted 75% actor and 25% target:
BTL_CAM_MODEY_MINUS_1 = -1, BTL_CAM_YADJ_TARGET = -1, // use target Y
BTL_CAM_MODEY_0 = 0, BTL_CAM_YADJ_NONE = 0, // use actor Y
BTL_CAM_MODEY_1 = 1, BTL_CAM_YADJ_AVG = 1, // target y position is weighted 66% actor and 33% target:
}; };
enum ModelAnimatorFlags { enum ModelAnimatorFlags {

2
include/evt.h
View File

@ -133,7 +133,7 @@ enum EventGroupFlags {
EVT_GROUP_EF = 0xEF, // ~10 EVT_GROUP_EF = 0xEF, // ~10
EVT_GROUP_01 = 0x01, EVT_GROUP_01 = 0x01,
EVT_GROUP_02 = 0x02, EVT_GROUP_02 = 0x02,
EVT_GROUP_04 = 0x04, EVT_GROUP_SHAKE_CAM = 0x04,
EVT_GROUP_08 = 0x08, EVT_GROUP_08 = 0x08,
EVT_GROUP_10 = 0x10, EVT_GROUP_10 = 0x10,
}; };

6
include/functions.h
View File

@ -881,12 +881,12 @@ void draw_entity_model_D(s32, Mtx*, s32, Vec3s*);
void draw_entity_model_E(s32, Mtx*); void draw_entity_model_E(s32, Mtx*);
void free_entity_model_by_index(s32 idx); void free_entity_model_by_index(s32 idx);
void btl_cam_use_preset(s32); 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_set_zoffset(s16);
void btl_cam_target_actor(s32); void btl_cam_target_actor(s32);
void btl_cam_set_zoom(s16); void btl_cam_set_zoom(s16);
void btl_cam_move(s16); void btl_cam_move(s16);
void func_8024E60C(void); void btl_cam_disable_clamp_x(void);
void initialize_battle(void); void initialize_battle(void);
@ -1035,7 +1035,7 @@ void set_background_size(s16, s16, s16, s16);
void set_background(BackgroundHeader*); void set_background(BackgroundHeader*);
void set_max_star_power(s8); void set_max_star_power(s8);
void sync_status_bar(void); void sync_status_bar(void);
void create_cameras_a(void); void create_cameras(void);
void func_80045AC0(void); void func_80045AC0(void);
void func_8005AF84(void); void func_8005AF84(void);
void npc_follow_init(Npc*, s32, FollowAnims*, f32, f32, s32, s32); void npc_follow_init(Npc*, s32, FollowAnims*, f32, f32, s32, s32);

57
include/script_api/battle.h
View File

@ -13,15 +13,15 @@ API_CALLABLE(EnablePartnerBlur);
API_CALLABLE(DisablePartnerBlur); API_CALLABLE(DisablePartnerBlur);
API_CALLABLE(UseBattleCamPreset); API_CALLABLE(UseBattleCamPreset);
API_CALLABLE(SetBattleCamTarget); API_CALLABLE(SetBattleCamTarget);
API_CALLABLE(SetBattleCamOffsetZ); API_CALLABLE(SetBattleCamOffsetY);
API_CALLABLE(AddBattleCamOffsetZ); API_CALLABLE(AddBattleCamOffsetY);
API_CALLABLE(SetBattleCamYaw); API_CALLABLE(SetBattleCamYaw);
API_CALLABLE(BattleCamTargetActor); API_CALLABLE(BattleCamTargetActor);
API_CALLABLE(MoveBattleCamOver); API_CALLABLE(MoveBattleCamOver);
API_CALLABLE(SetBattleCamZoom); API_CALLABLE(SetBattleCamDist);
API_CALLABLE(AddBattleCamZoom); API_CALLABLE(AddBattleCamDist);
API_CALLABLE(FreezeBattleCam); API_CALLABLE(FreezeBattleCam);
API_CALLABLE(func_8024EDA4); API_CALLABLE(DisableBattleCamClampX);
API_CALLABLE(ShowMessageBox); API_CALLABLE(ShowMessageBox);
API_CALLABLE(ShowVariableMessageBox); API_CALLABLE(ShowVariableMessageBox);
API_CALLABLE(IsMessageBoxDisplayed); API_CALLABLE(IsMessageBoxDisplayed);
@ -203,9 +203,9 @@ API_CALLABLE(PlayerPowerBounceEnemy);
API_CALLABLE(PlayerTestEnemy); API_CALLABLE(PlayerTestEnemy);
API_CALLABLE(DispatchDamagePlayerEvent); API_CALLABLE(DispatchDamagePlayerEvent);
API_CALLABLE(EnablePlayerBlur); API_CALLABLE(EnablePlayerBlur);
API_CALLABLE(func_80274A18); API_CALLABLE(PlayerBasicJumpToGoal);
API_CALLABLE(func_802752AC); API_CALLABLE(PlayerSuperJumpToGoal);
API_CALLABLE(func_80275F00); API_CALLABLE(PlayerUltraJumpToGoal);
API_CALLABLE(GetPlayerActionSuccess); API_CALLABLE(GetPlayerActionSuccess);
API_CALLABLE(BindTakeTurn); API_CALLABLE(BindTakeTurn);
API_CALLABLE(PauseTakeTurn); API_CALLABLE(PauseTakeTurn);
@ -271,28 +271,15 @@ API_CALLABLE(DeletePartner);
API_CALLABLE(GetDamageIntensity); API_CALLABLE(GetDamageIntensity);
API_CALLABLE(AddEffectOffset); API_CALLABLE(AddEffectOffset);
API_CALLABLE(LoadStarPowerScript); API_CALLABLE(LoadStarPowerScript);
API_CALLABLE(CamPresetUpdate_B); API_CALLABLE(ForceBattleCamTarget);
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(SetBattleCamParam); API_CALLABLE(SetBattleCamParam);
API_CALLABLE(GetPartAnimNotify); API_CALLABLE(GetPartAnimNotify);
API_CALLABLE(InitAnimatedModels); API_CALLABLE(InitAnimatedModels);
API_CALLABLE(func_8024CE9C); API_CALLABLE(BattleCam_Init);
API_CALLABLE(func_802CAE50); API_CALLABLE(SetCamLookTarget);
API_CALLABLE(func_802807D0); API_CALLABLE(func_802807D0);
API_CALLABLE(PartnerYieldTurn); ///< YieldTurn copy API_CALLABLE(PartnerYieldTurn); ///< YieldTurn copy
API_CALLABLE(func_8024ECF8); API_CALLABLE(SetBattleCamTargetingModes);
API_CALLABLE(UseBattleCamPresetImmediately); API_CALLABLE(UseBattleCamPresetImmediately);
API_CALLABLE(UseBattleCamPresetWait); API_CALLABLE(UseBattleCamPresetWait);
API_CALLABLE(HideHealthBar); API_CALLABLE(HideHealthBar);
@ -302,7 +289,7 @@ API_CALLABLE(EnableBattleStatusBar);
API_CALLABLE(PlayerYieldTurn); API_CALLABLE(PlayerYieldTurn);
API_CALLABLE(ShowStartRecoveryShimmer); API_CALLABLE(ShowStartRecoveryShimmer);
API_CALLABLE(ShowRecoveryShimmer); API_CALLABLE(ShowRecoveryShimmer);
API_CALLABLE(func_80273444); API_CALLABLE(PlayerHopToGoal);
API_CALLABLE(WaitForState); API_CALLABLE(WaitForState);
API_CALLABLE(SetBattleMenuEnabledFlags); API_CALLABLE(SetBattleMenuEnabledFlags);
API_CALLABLE(SetBattleState); API_CALLABLE(SetBattleState);
@ -333,8 +320,8 @@ extern EvtScript EVS_StartDefend;
extern EvtScript EVS_RunAwayStart; extern EvtScript EVS_RunAwayStart;
extern EvtScript EVS_RunAwayFail; extern EvtScript EVS_RunAwayFail;
extern EvtScript EVS_PlayerDies; extern EvtScript EVS_PlayerDies;
extern EvtScript EVS_PlayEatFX; extern EvtScript EVS_Unused_EatItem;
extern EvtScript EVS_PlayDrinkFX; extern EvtScript EVS_Unused_DrinkItem;
extern EvtScript EVS_UseLifeShroom; extern EvtScript EVS_UseLifeShroom;
extern EvtScript EVS_MerleeRunOut; extern EvtScript EVS_MerleeRunOut;
extern EvtScript EVS_MerleeAttackBonus; extern EvtScript EVS_MerleeAttackBonus;
@ -392,19 +379,5 @@ extern EvtScript Rumble_Unused_1;
extern EvtScript Rumble_Unused_2; extern EvtScript Rumble_Unused_2;
extern EvtScript Rumble_Unused_3; extern EvtScript Rumble_Unused_3;
extern EvtScript Rumble_Unused_4; 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 #endif

10
include/script_api/common.h
View File

@ -214,25 +214,25 @@ API_CALLABLE(SetCamNoDraw);
API_CALLABLE(SetCamPerspective); API_CALLABLE(SetCamPerspective);
/// @evtapi /// @evtapi
API_CALLABLE(func_802CA90C); API_CALLABLE(SetCamUpdateMode);
/// @evtapi /// @evtapi
API_CALLABLE(func_802CA988); API_CALLABLE(GrabCamera);
/// @evtapi /// @evtapi
API_CALLABLE(SetCamViewport); API_CALLABLE(SetCamViewport);
/// @evtapi /// @evtapi
API_CALLABLE(func_802CABE8); API_CALLABLE(SetInterpCamParams);
/// @evtapi /// @evtapi
API_CALLABLE(func_802CACC0); API_CALLABLE(SetNoInterpCamParams);
/// @evtapi /// @evtapi
API_CALLABLE(SetCamBGColor); API_CALLABLE(SetCamBGColor);
/// @evtapi /// @evtapi
API_CALLABLE(func_802CAE50); API_CALLABLE(SetCamLookTarget);
/// @evtapi /// @evtapi
API_CALLABLE(SetCamTarget); API_CALLABLE(SetCamTarget);

20
src/43F0.c
View File

@ -611,23 +611,23 @@ f32 get_clamped_angle_diff(f32 a, f32 b) {
} }
f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ) { f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ) {
f32 xDiff = endX - startX; f32 dx = endX - startX;
f32 zDiff = endZ - startZ; f32 dz = endZ - startZ;
f32 absXDiff = fabsf(xDiff); f32 absXDiff = fabsf(dx);
f32 absZDiff = fabsf(zDiff); f32 absZDiff = fabsf(dz);
f32 ret; f32 ret;
if (absZDiff < absXDiff) { if (absZDiff < absXDiff) {
ret = (absZDiff / absXDiff) * 45.0f; ret = (absZDiff / absXDiff) * 45.0f;
ret *= sAtanFactors[round(2.0f * ret)]; ret *= sAtanFactors[round(2.0f * ret)];
if (xDiff >= 0.0f) { if (dx >= 0.0f) {
if (zDiff >= 0.0f) { if (dz >= 0.0f) {
return ret + 90.0f; return ret + 90.0f;
} else { } else {
return 90.0f - ret; return 90.0f - ret;
} }
} }
if (zDiff >= 0.0f) { if (dz >= 0.0f) {
return 270.0f - ret; return 270.0f - ret;
} else { } else {
return ret + 270.0f; return ret + 270.0f;
@ -638,13 +638,13 @@ f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ) {
} }
ret = (absXDiff / absZDiff) * 45.0f; ret = (absXDiff / absZDiff) * 45.0f;
ret *= sAtanFactors[round(2.0f * ret)]; ret *= sAtanFactors[round(2.0f * ret)];
if (zDiff >= 0.0f) { if (dz >= 0.0f) {
if (xDiff >= 0.0f) { if (dx >= 0.0f) {
return 180.0f - ret; return 180.0f - ret;
} else { } else {
return ret + 180.0f; return ret + 180.0f;
} }
} else if (!(xDiff >= 0.0f)) { } else if (!(dx >= 0.0f)) {
return 360.0f - ret; return 360.0f - ret;
} }
} }

2
src/7B440.c
View File

@ -111,7 +111,7 @@ void reset_player_status(void) {
playerStatus->flipYaw[CAM_DEFAULT] = 0.0f; playerStatus->flipYaw[CAM_DEFAULT] = 0.0f;
playerStatus->flipYaw[CAM_BATTLE] = 0.0f; playerStatus->flipYaw[CAM_BATTLE] = 0.0f;
playerStatus->flipYaw[CAM_TATTLE] = 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; mapSettings = gAreas[gGameStatusPtr->areaID].maps[gGameStatusPtr->mapID].settings;

2
src/background.c
View File

@ -190,7 +190,7 @@ void appendGfx_background_texture(void) {
} }
} }
theta = clamp_angle(-cam->trueRot.x); theta = clamp_angle(-cam->curBoomYaw);
sinTheta = sin_deg(theta); sinTheta = sin_deg(theta);
cosTheta = cos_deg(theta); cosTheta = cos_deg(theta);
f5 = cosTheta * cam->lookAt_obj.x - sinTheta * cam->lookAt_obj.z + cam->leadAmount; f5 = cosTheta * cam->lookAt_obj.x - sinTheta * cam->lookAt_obj.z + cam->leadAmount;

2
src/battle/16C8E0.c
View File

@ -854,7 +854,7 @@ void tattle_cam_pre_render(Camera* camera) {
gDPPipeSync(gMainGfxPos++); gDPPipeSync(gMainGfxPos++);
gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); 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); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
} }

6
src/battle/190B20.c
View File

@ -6,7 +6,7 @@
#include "model.h" #include "model.h"
#include "sprite.h" #include "sprite.h"
EvtScript D_80293820 = { EvtScript EVS_ShakeBattleCamPitch = {
Wait(LVar0) Wait(LVar0)
Loop(4) Loop(4)
Call(SetBattleCamParam, 4, 11) Call(SetBattleCamParam, 4, 11)
@ -1054,8 +1054,8 @@ void reset_actor_turn_info(void) {
} }
} }
void func_80263CC4(s32 arg0) { void shake_battle_cam_pitch(s32 initialDelay) {
start_script(&D_80293820, EVT_PRIORITY_A, 0)->varTable[0] = arg0; start_script(&EVS_ShakeBattleCamPitch, EVT_PRIORITY_A, 0)->varTable[0] = initialDelay;
} }
void set_actor_anim(s32 actorID, s32 partID, AnimID animID) { void set_actor_anim(s32 actorID, s32 partID, AnimID animID) {

6
src/battle/action_cmd/air_raid.c
View File

@ -162,7 +162,7 @@ void N(update)(void) {
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionQuality * 12); sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionQuality * 12);
switch (partner->actorBlueprint->level) { switch (partner->actorBlueprint->level) {
case 0: case PARTNER_RANK_NORMAL:
if (battleStatus->actionQuality >= D_802A9984_429CA4[battleStatus->unk_85]) { if (battleStatus->actionQuality >= D_802A9984_429CA4[battleStatus->unk_85]) {
battleStatus->unk_85++; battleStatus->unk_85++;
} }
@ -171,7 +171,7 @@ void N(update)(void) {
battleStatus->unk_85--; battleStatus->unk_85--;
} }
break; break;
case 1: case PARTNER_RANK_SUPER:
if (battleStatus->actionQuality >= D_802A9994_429CB4[battleStatus->unk_85]) { if (battleStatus->actionQuality >= D_802A9994_429CB4[battleStatus->unk_85]) {
battleStatus->unk_85++; battleStatus->unk_85++;
} }
@ -179,7 +179,7 @@ void N(update)(void) {
battleStatus->unk_85--; battleStatus->unk_85--;
} }
break; break;
case 2: case PARTNER_RANK_ULTRA:
if (battleStatus->actionQuality >= D_802A99A8_429CC8[battleStatus->unk_85]) { if (battleStatus->actionQuality >= D_802A99A8_429CC8[battleStatus->unk_85]) {
battleStatus->unk_85++; battleStatus->unk_85++;
} }

6
src/battle/action_cmd/fire_shell.c
View File

@ -148,7 +148,7 @@ void N(update)(void) {
battleStatus->actionQuality = actionCommandStatus->barFillLevel / 100; battleStatus->actionQuality = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionQuality * 12); sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionQuality * 12);
switch (partner->actorBlueprint->level) { switch (partner->actorBlueprint->level) {
case 0: case PARTNER_RANK_NORMAL:
if (battleStatus->actionQuality >= D_802A9964_427334[battleStatus->unk_85]) { if (battleStatus->actionQuality >= D_802A9964_427334[battleStatus->unk_85]) {
battleStatus->unk_85++; battleStatus->unk_85++;
} }
@ -156,7 +156,7 @@ void N(update)(void) {
battleStatus->unk_85--; battleStatus->unk_85--;
} }
break; break;
case 1: case PARTNER_RANK_SUPER:
if (battleStatus->actionQuality >= D_802A9974_427344[battleStatus->unk_85]) { if (battleStatus->actionQuality >= D_802A9974_427344[battleStatus->unk_85]) {
battleStatus->unk_85++; battleStatus->unk_85++;
} }
@ -164,7 +164,7 @@ void N(update)(void) {
battleStatus->unk_85--; battleStatus->unk_85--;
} }
break; break;
case 2: case PARTNER_RANK_ULTRA:
if (battleStatus->actionQuality >= D_802A9988_427358[battleStatus->unk_85]) { if (battleStatus->actionQuality >= D_802A9988_427358[battleStatus->unk_85]) {
battleStatus->unk_85++; battleStatus->unk_85++;
} }

32
src/battle/actor_api.c
View File

@ -2436,7 +2436,7 @@ API_CALLABLE(ChooseNextTarget) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
s32 func_8026E558(Evt* script, s32 isInitialCall) { API_CALLABLE(func_8026E558) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
SelectableTarget* target; SelectableTarget* target;
s32 mode; s32 mode;
@ -3015,7 +3015,7 @@ API_CALLABLE(ResetAllActorSounds) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
s32 SetActorSounds(Evt* script, s32 isInitialCall) { API_CALLABLE(SetActorSounds) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++); s32 actorID = evt_get_variable(script, *args++);
Actor* actor; Actor* actor;
@ -3230,12 +3230,12 @@ API_CALLABLE(BoostAttack) {
script->functionTempPtr[1] = actor; script->functionTempPtr[1] = actor;
script->functionTemp[2] = attackBoost; 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_set_zoffset(12);
btl_cam_target_actor(actor->actorID); btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250); btl_cam_set_zoom(250);
btl_cam_move(10); btl_cam_move(10);
func_8024E60C(); btl_cam_disable_clamp_x();
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0); btl_cam_set_zoffset(0);
} }
@ -3273,7 +3273,7 @@ API_CALLABLE(BoostAttack) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30); 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[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
} else { } else {
@ -3353,12 +3353,12 @@ API_CALLABLE(BoostDefense) {
script->functionTempPtr[1] = actor; script->functionTempPtr[1] = actor;
script->functionTemp[2] = defenseBoost; 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_set_zoffset(12);
btl_cam_target_actor(actor->actorID); btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250); btl_cam_set_zoom(250);
btl_cam_move(10); btl_cam_move(10);
func_8024E60C(); btl_cam_disable_clamp_x();
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0); btl_cam_set_zoffset(0);
} }
@ -3397,7 +3397,7 @@ API_CALLABLE(BoostDefense) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30); 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[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
} else { } else {
@ -3475,12 +3475,12 @@ API_CALLABLE(VanishActor) {
script->functionTemp[1] = (s32) actor; script->functionTemp[1] = (s32) actor;
script->functionTemp[2] = vanished; 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_set_zoffset(12);
btl_cam_target_actor(actor->actorID); btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250); btl_cam_set_zoom(250);
btl_cam_move(10); btl_cam_move(10);
func_8024E60C(); btl_cam_disable_clamp_x();
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0); btl_cam_set_zoffset(0);
} }
@ -3508,7 +3508,7 @@ API_CALLABLE(VanishActor) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
fx_radial_shimmer(3, x, y, z, 1.0f, 30); 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[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
} else { } else {
@ -3581,12 +3581,12 @@ API_CALLABLE(ElectrifyActor) {
script->functionTempPtr[1] = actor; script->functionTempPtr[1] = actor;
script->functionTemp[2] = electrified; 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_set_zoffset(12);
btl_cam_target_actor(actor->actorID); btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250); btl_cam_set_zoom(250);
btl_cam_move(10); btl_cam_move(10);
func_8024E60C(); btl_cam_disable_clamp_x();
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) { if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0); btl_cam_set_zoffset(0);
} }
@ -3614,7 +3614,7 @@ API_CALLABLE(ElectrifyActor) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
fx_snaking_static(8, x, y, z, 1.0f, 30); 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[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
} else { } else {
@ -3691,11 +3691,11 @@ API_CALLABLE(HealActor) {
script->functionTempPtr[1] = actor; script->functionTempPtr[1] = actor;
script->functionTemp[2] = hpBoost; 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_set_zoffset(12);
btl_cam_target_actor(actor->actorID); btl_cam_target_actor(actor->actorID);
btl_cam_move(10); btl_cam_move(10);
func_8024E60C(); btl_cam_disable_clamp_x();
ApplyingBuff = TRUE; ApplyingBuff = TRUE;
script->functionTemp[3] = 5; script->functionTemp[3] = 5;

16
src/battle/area/arn/actor/tubba_blubba.c
View File

@ -274,9 +274,9 @@ EvtScript N(EVS_TakeTurn) = {
EvtScript N(EVS_Attack_SlamFist) = { EvtScript N(EVS_Attack_SlamFist) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Set(LVar1, ANIM_BattleTubba_Anim06)
ExecWait(N(EVS_DummyCheck)) ExecWait(N(EVS_DummyCheck))
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
@ -340,9 +340,9 @@ EvtScript N(EVS_Attack_SlamFist) = {
EndIf EndIf
Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 30)
Switch(LVarF) Switch(LVarF)
CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_HIT)
@ -364,9 +364,9 @@ EvtScript N(EVS_Attack_SlamFist) = {
EvtScript N(EVS_Attack_BodySlam) = { EvtScript N(EVS_Attack_BodySlam) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Set(LVar1, ANIM_BattleTubba_Anim06)
ExecWait(N(EVS_DummyCheck)) ExecWait(N(EVS_DummyCheck))
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
@ -447,9 +447,9 @@ EvtScript N(EVS_Attack_BodySlam) = {
EndIf EndIf
Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 30)
Switch(LVarF) Switch(LVarF)
CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_HIT)

28
src/battle/area/arn/actor/tubbas_heart.c
View File

@ -293,7 +293,7 @@ EvtScript N(EVS_HandleEvent) = {
}; };
EvtScript N(EVS_FleeFromBattle) = { EvtScript N(EVS_FleeFromBattle) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
@ -336,12 +336,12 @@ EvtScript N(EVS_TakeTurn) = {
//@bug -- meant to OR 3 with value of AVAR_Flags, not PARTNER_BOW //@bug -- meant to OR 3 with value of AVAR_Flags, not PARTNER_BOW
BitwiseOrConst(LVar0, AVAL_Flag_TauntBow | AVAL_Flag_HidStatusBar) BitwiseOrConst(LVar0, AVAL_Flag_TauntBow | AVAL_Flag_HidStatusBar)
Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Call(ActorSpeak, MSG_CH3_00C3, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01) 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(BattleCamTargetActor, ACTOR_PARTNER)
Call(MoveBattleCamOver, 25) Call(MoveBattleCamOver, 25)
Wait(25) Wait(25)
@ -371,7 +371,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(GetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, LVar0)
IfEq(LVar0, 0) IfEq(LVar0, 0)
Call(SetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, TRUE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
@ -412,7 +412,7 @@ EvtScript N(EVS_Attack_Leap) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim03)
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8)) Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8))
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -507,10 +507,10 @@ EvtScript N(EVS_Attack_Leap) = {
}; };
EvtScript N(EVS_Move_Charge) = { EvtScript N(EVS_Move_Charge) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 85, 50, 0) Call(SetBattleCamTarget, 85, 50, 0)
Call(SetBattleCamZoom, 280) Call(SetBattleCamDist, 280)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim0B) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim0B)
@ -553,10 +553,10 @@ EvtScript N(EVS_Move_Charge) = {
EvtScript N(EVS_Attack_DarkSwarm) = { EvtScript N(EVS_Attack_DarkSwarm) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 85, 50, 0) Call(SetBattleCamTarget, 85, 50, 0)
Call(SetBattleCamZoom, 280) Call(SetBattleCamDist, 280)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1)
@ -616,11 +616,11 @@ EvtScript N(EVS_Attack_DarkSwarm) = {
Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail)
Wait(30) Wait(30)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Wait(56) Wait(56)
Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SQUEEZE) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SQUEEZE)

28
src/battle/area/dgb/actor/tubba_blubba.c
View File

@ -168,12 +168,12 @@ EvtScript N(EVS_HandlePhase) = {
IfEq(LVar0, 0) IfEq(LVar0, 0)
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(SetActorVar, ACTOR_SELF, AVAR_CaughtYouTaunt, TRUE) 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) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar1, 75) Add(LVar1, 75)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 380) Call(SetBattleCamDist, 380)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(ActorSpeak, MSG_CH3_0102, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim09, ANIM_BattleTubba_Anim02) Call(ActorSpeak, MSG_CH3_0102, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim09, ANIM_BattleTubba_Anim02)
Thread Thread
@ -364,12 +364,12 @@ EvtScript N(EVS_TakeTurn) = {
IfEq(LVar0, AVAL_Taunt_Ready) IfEq(LVar0, AVAL_Taunt_Ready)
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(SetActorVar, ACTOR_SELF, AVAR_InvunerableTaunt, AVAL_Taunt_Done) 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) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar1, 75) Add(LVar1, 75)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 380) Call(SetBattleCamDist, 380)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Call(ActorSpeak, MSG_CH3_0103, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim09, ANIM_BattleTubba_Anim02) 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) = { EvtScript N(EVS_Attack_SlamFist) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
IfNotFlag(LVar5, STATUS_FLAG_SHRINK) IfNotFlag(LVar5, STATUS_FLAG_SHRINK)
@ -463,9 +463,9 @@ EvtScript N(EVS_Attack_SlamFist) = {
EndIf EndIf
Call(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 30)
Switch(LVarF) Switch(LVarF)
CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_HIT)
@ -489,9 +489,9 @@ EvtScript N(EVS_Attack_SlamFist) = {
EvtScript N(EVS_Attack_BodySlam) = { EvtScript N(EVS_Attack_BodySlam) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -570,9 +570,9 @@ EvtScript N(EVS_Attack_BodySlam) = {
EndIf EndIf
Call(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 30)
Set(LVarF, LVar0) Set(LVarF, LVar0)
Switch(LVarF) Switch(LVarF)

8
src/battle/area/dig/actor/tubba_blubba.c
View File

@ -259,9 +259,9 @@ EvtScript N(EVS_TakeTurn) = {
EvtScript N(EVS_Attack_SlamFist) = { EvtScript N(EVS_Attack_SlamFist) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
IfNotFlag(LVar5, STATUS_FLAG_SHRINK) IfNotFlag(LVar5, STATUS_FLAG_SHRINK)
@ -338,9 +338,9 @@ EvtScript N(EVS_Attack_SlamFist) = {
EvtScript N(EVS_Attack_BodySlam) = { EvtScript N(EVS_Attack_BodySlam) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0)

100
src/battle/area/flo2/actor/huff_n_puff.c
View File

@ -1010,10 +1010,10 @@ EvtScript N(EVS_Dialogue_PummelPermission) = {
Goto(1) Goto(1)
// found a Tuff Puff to speak // found a Tuff Puff to speak
Label(0) Label(0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, LVar0) Call(BattleCamTargetActor, LVar0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, LVar0, FALSE) Call(UseIdleAnimation, LVar0, FALSE)
@ -1028,10 +1028,10 @@ EvtScript N(EVS_Dialogue_PummelPermission) = {
Wait(20) Wait(20)
// Huff N Puff replies // Huff N Puff replies
Label(1) Label(1)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -1048,10 +1048,10 @@ EvtScript N(EVS_Dialogue_PummelPermission) = {
EvtScript N(EVS_Dialogue_FullPower) = { EvtScript N(EVS_Dialogue_FullPower) = {
UseArray(N(RuffPuffDataBuffer)) UseArray(N(RuffPuffDataBuffer))
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -1076,8 +1076,8 @@ EvtScript N(EVS_Dialogue_FullPower) = {
// found a Tuff Puff to speak // found a Tuff Puff to speak
Label(0) Label(0)
Call(BattleCamTargetActor, LVar0) Call(BattleCamTargetActor, LVar0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(GetActorPos, LVar0, LVar1, LVar2, LVar3) Call(GetActorPos, LVar0, LVar1, LVar2, LVar3)
@ -1118,10 +1118,10 @@ EvtScript N(EVS_Dialogue_FullPower) = {
EvtScript N(EVS_Dialogue_PraiseHuff) = { EvtScript N(EVS_Dialogue_PraiseHuff) = {
UseArray(N(RuffPuffDataBuffer)) UseArray(N(RuffPuffDataBuffer))
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -1146,8 +1146,8 @@ EvtScript N(EVS_Dialogue_PraiseHuff) = {
// found a Tuff Puff to speak // found a Tuff Puff to speak
Label(0) Label(0)
Call(BattleCamTargetActor, LVar0) Call(BattleCamTargetActor, LVar0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(GetActorPos, LVar0, LVar1, LVar2, LVar3) Call(GetActorPos, LVar0, LVar1, LVar2, LVar3)
@ -1187,10 +1187,10 @@ EvtScript N(EVS_Dialogue_PraiseHuff) = {
EvtScript N(EVS_Dialogue_Concerned) = { EvtScript N(EVS_Dialogue_Concerned) = {
UseArray(N(RuffPuffDataBuffer)) UseArray(N(RuffPuffDataBuffer))
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -1215,8 +1215,8 @@ EvtScript N(EVS_Dialogue_Concerned) = {
// found a Tuff Puff to speak // found a Tuff Puff to speak
Label(0) Label(0)
Call(BattleCamTargetActor, LVar0) Call(BattleCamTargetActor, LVar0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, LVar0, FALSE) Call(UseIdleAnimation, LVar0, FALSE)
@ -1229,10 +1229,10 @@ EvtScript N(EVS_Dialogue_Concerned) = {
Call(UseIdleAnimation, LVar0, TRUE) Call(UseIdleAnimation, LVar0, TRUE)
// Huff N Puff replies // Huff N Puff replies
Label(1) Label(1)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -1371,8 +1371,8 @@ EvtScript N(EVS_Attack_BodySlam) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(AddBattleCamZoom, -200) Call(AddBattleCamDist, -200)
Call(SetBattleCamOffsetZ, -30) Call(SetBattleCamOffsetY, -30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0)
@ -1392,7 +1392,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
Switch(LVar0) Switch(LVar0)
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)
CaseOrEq(HIT_RESULT_LUCKY) 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_MAIN, ANIM_HuffNPuff_Anim0B)
Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim0C) Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim0C)
Call(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim0D) Call(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim0D)
@ -1720,12 +1720,12 @@ EvtScript N(EVS_Move_HurricaneBreath) = {
Wait(15) Wait(15)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
EndThread EndThread
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 20) Sub(LVar0, 20)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(MoveBattleCamOver, 180) Call(MoveBattleCamOver, 180)
Wait(90) Wait(90)
Call(StopSound, SOUND_HUFF_N_PUFF_INHALE) Call(StopSound, SOUND_HUFF_N_PUFF_INHALE)
@ -1992,11 +1992,11 @@ EvtScript N(EVS_Move_ChargeForGround) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
ExecGetTID(N(EVS_UpdateChargedJitter), LVarA) ExecGetTID(N(EVS_UpdateChargedJitter), LVarA)
Call(SetActorVar, ACTOR_SELF, AVAR_ChargedJitterScriptID, 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim11) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim11)
Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim12) Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim12)
@ -2027,11 +2027,11 @@ EvtScript N(EVS_Move_ChargeForGround) = {
EvtScript N(EVS_Attack_GroundLightning) = { EvtScript N(EVS_Attack_GroundLightning) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(N(StartRumbleWithParams), 70, 100) Call(N(StartRumbleWithParams), 70, 100)
Thread Thread
@ -2136,11 +2136,11 @@ EvtScript N(EVS_Move_ChargeForDirect) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
ExecGetTID(N(EVS_UpdateChargedJitter), LVarA) ExecGetTID(N(EVS_UpdateChargedJitter), LVarA)
Call(SetActorVar, ACTOR_SELF, AVAR_ChargedJitterScriptID, 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim11) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim11)
Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim12) Call(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim12)
@ -2173,10 +2173,10 @@ EvtScript N(EVS_Attack_DirectLightning) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(AddBattleCamZoom, -100) Call(AddBattleCamDist, -100)
Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamOffsetY, 50)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(N(StartRumbleWithParams), 70, 80)
Thread Thread
Call(ShakeCam, CAM_BATTLE, 0, 40, Float(0.3)) Call(ShakeCam, CAM_BATTLE, 0, 40, Float(0.3))
@ -2373,11 +2373,11 @@ EvtScript N(EVS_Attack_GroupSlam) = {
UseArray(N(RuffPuffDataBuffer)) UseArray(N(RuffPuffDataBuffer))
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_REAR_UP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_REAR_UP)
@ -2790,11 +2790,11 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = {
DivF(LVarB, LVarA) DivF(LVarB, LVarA)
Thread Thread
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
EndThread EndThread
Set(LVarA, 0) Set(LVarA, 0)
@ -2840,7 +2840,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = {
FOR_CHILDREN_SCATTERED(HNP_SWARM_SURROUND_PLAYER) FOR_CHILDREN_SCATTERED(HNP_SWARM_SURROUND_PLAYER)
Wait(30) Wait(30)
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
Set(LVar9, 0) Set(LVar9, 0)
Call(GetActorVar, ACTOR_SELF, AVAR_ChildBits, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_ChildBits, LVar0)
@ -3081,7 +3081,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = {
Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.5)) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.5))
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(func_80273444, 20, 0, 1) Call(PlayerHopToGoal, 20, 0, 1)
Else Else
Wait(20) Wait(20)
EndIf EndIf

2
src/battle/area/flo2/actor/spike.c
View File

@ -246,7 +246,7 @@ EvtScript N(EVS_Attack_SpinyToss) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2)

12
src/battle/area/hos/actor/goombario_tutor.c
View File

@ -168,8 +168,8 @@ EvtScript N(EVS_TakeTurn) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Run) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -183,10 +183,10 @@ EvtScript N(EVS_TakeTurn) = {
Wait(5) Wait(5)
Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, -10, 0, 0) Call(AddGoalPos, ACTOR_SELF, -10, 0, 0)

18
src/battle/area/hos/actor/magikoopa.c
View File

@ -378,11 +378,11 @@ EvtScript N(EVS_Flee) = {
Call(HideHealthBar, ACTOR_SELF) Call(HideHealthBar, ACTOR_SELF)
Call(GetLastEvent, ACTOR_SELF, LVar0) Call(GetLastEvent, ACTOR_SELF, LVar0)
IfNe(LVar0, EVENT_SCARE_AWAY) IfNe(LVar0, EVENT_SCARE_AWAY)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
EndIf EndIf
Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(SetActorSpeed, ACTOR_SELF, Float(1.0))
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -788,7 +788,7 @@ EvtScript N(EVS_Move_HealOne) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -868,7 +868,7 @@ EvtScript N(EVS_Move_HealAll) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -1423,7 +1423,7 @@ EvtScript N(EVS_Move_MakeClone) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(UseIdleAnimation, LVarA, FALSE) Call(UseIdleAnimation, LVarA, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 25) Call(MoveBattleCamOver, 25)
Wait(25) Wait(25)
@ -1539,7 +1539,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -1652,7 +1652,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -1765,7 +1765,7 @@ EvtScript N(EVS_Move_TryElectrify) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -1883,7 +1883,7 @@ EvtScript N(EVS_Move_TryTransparent) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)

2
src/battle/area/isk_part_2/actor/chain_chomp.c
View File

@ -683,7 +683,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetActorJumpGravity, ACTOR_SELF, Float(0.5))
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Set(LVar1, 0) Set(LVar1, 0)

50
src/battle/area/isk_part_2/actor/tutankoopa.c
View File

@ -609,9 +609,9 @@ EvtScript N(EVS_Attack_ThrowShell) = {
Sub(LVar0, 1) Sub(LVar0, 1)
Call(SetActorVar, ACTOR_SELF, AVAR_ShellsLeft, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_ShellsLeft, LVar0)
// begin the attack // begin the attack
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActorPart, ACTOR_SELF, LVar9) Call(BattleCamTargetActorPart, ACTOR_SELF, LVar9)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Run) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Run)
Call(GetPartOffset, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2) Call(GetPartOffset, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2)
@ -696,9 +696,9 @@ EvtScript N(EVS_Attack_ThrowShell) = {
}; };
EvtScript N(EVS_Attack_DropDebris) = { EvtScript N(EVS_Attack_DropDebris) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
@ -706,7 +706,7 @@ EvtScript N(EVS_Attack_DropDebris) = {
Call(GetActorVar, ACTOR_SELF, AVAR_DebrisDropState, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_DebrisDropState, LVar0)
IfEq(LVar0, 0) IfEq(LVar0, 0)
// first use only // first use only
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -961,14 +961,14 @@ EvtScript N(EVS_Move_SummonChomp) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar0)
IfFalse(LVar0) IfFalse(LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout)
Call(ActorSpeak, MSG_CH2_00E6, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout, ANIM_Tutankoopa_Shout) Call(ActorSpeak, MSG_CH2_00E6, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout, ANIM_Tutankoopa_Shout)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -978,16 +978,16 @@ EvtScript N(EVS_Move_SummonChomp) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Idle)
Call(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0)
IfEq(LVar0, 0) IfEq(LVar0, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
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(SetBattleCamZoom, 225) Call(SetBattleCamDist, 225)
Call(SetBattleCamOffsetZ, -30) Call(SetBattleCamOffsetY, -30)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
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(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
// open the gate // open the gate
@ -1036,21 +1036,21 @@ EvtScript N(EVS_Move_SummonChomp) = {
ExecWait(N(EVS_SummonedChompHop)) ExecWait(N(EVS_SummonedChompHop))
Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar5) Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar5)
IfFalse(LVar5) IfFalse(LVar5)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 160) Call(SetBattleCamDist, 160)
Call(GetActorPos, LVarB, LVar0, LVar1, LVar2) Call(GetActorPos, LVarB, LVar0, LVar1, LVar2)
Set(LVar1, 60) Set(LVar1, 60)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(MoveBattleCamOver, 8) Call(MoveBattleCamOver, 8)
Loop(3) Loop(3)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(MoveBattleCamOver, 5) Call(MoveBattleCamOver, 5)
Wait(4) Wait(4)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_BITE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_BITE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(MoveBattleCamOver, 5) Call(MoveBattleCamOver, 5)
Wait(4) Wait(4)
@ -1150,7 +1150,7 @@ EvtScript N(EVS_SummonedChompHop) = {
EvtScript N(EVS_LevitateToHomePos) = { EvtScript N(EVS_LevitateToHomePos) = {
Call(SetActorVar, ACTOR_SELF, AVAR_Unknown, 0) Call(SetActorVar, ACTOR_SELF, AVAR_Unknown, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_MAGIC) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_MAGIC)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Levitate) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Levitate)
@ -1194,7 +1194,7 @@ EvtScript N(EVS_GetBackUp) = {
Wait(10) Wait(10)
Call(GetActorVar, ACTOR_SELF, AVAR_Dialogue_Recover, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Dialogue_Recover, LVar0)
IfFalse(LVar0) IfFalse(LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)

62
src/battle/area/iwa/actor/buzzar.c
View File

@ -319,8 +319,8 @@ EvtScript N(EVS_TakeTurn) = {
EvtScript N(EVS_Attack_WindBlast) = { EvtScript N(EVS_Attack_WindBlast) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 120) Call(MoveBattleCamOver, 120)
Call(SetActorSpeed, ACTOR_SELF, Float(1.0)) Call(SetActorSpeed, ACTOR_SELF, Float(1.0))
@ -396,10 +396,10 @@ EvtScript N(EVS_Attack_WindBlast) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_whirlwind_start, 0, 88 * DT, 3) 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(SetBattleCamTarget, -25, 60, 0)
Call(SetBattleCamZoom, 460) Call(SetBattleCamDist, 460)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Call(N(StartRumbleWithParams), 70, 130) Call(N(StartRumbleWithParams), 70, 130)
Thread Thread
@ -461,10 +461,10 @@ EvtScript N(EVS_Attack_WindBlast) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_whirlwind_start, 0, 88 * DT, 3) 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(SetBattleCamTarget, -25, 60, 0)
Call(SetBattleCamZoom, 460) Call(SetBattleCamDist, 460)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Call(N(StartRumbleWithParams), 70, 130) Call(N(StartRumbleWithParams), 70, 130)
Thread Thread
@ -539,9 +539,9 @@ EvtScript N(EVS_Attack_FeatherFling) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_05) Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT)
Call(SetBattleCamZoom, 180) Call(SetBattleCamDist, 180)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) 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) Call(SetPartFlagBits, ACTOR_SELF, PRT_FEATHER_3, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EndThread EndThread
Wait(10) 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) Wait(10)
IfEq(LVarA, HIT_RESULT_LUCKY) IfEq(LVarA, HIT_RESULT_LUCKY)
Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -661,7 +661,7 @@ EvtScript N(EVS_Attack_FeatherFling) = {
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
EndSwitch 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) Call(SetGoalToTarget, ACTOR_SELF)
Thread Thread
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -791,7 +791,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetActorSpeed, ACTOR_SELF, Float(4.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -819,9 +819,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)
CaseOrEq(HIT_RESULT_LUCKY) CaseOrEq(HIT_RESULT_LUCKY)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -848,9 +848,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
Return Return
EndCaseGroup EndCaseGroup
CaseEq(HIT_RESULT_IMMUNE) CaseEq(HIT_RESULT_IMMUNE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -898,13 +898,13 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
CaseDefault CaseDefault
EndSwitch EndSwitch
Wait(10) Wait(10)
Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) Call(UseBattleCamPresetImmediately, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Thread Thread
Wait(5) Wait(5)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Set(LVar1, 27) Set(LVar1, 27)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
@ -945,9 +945,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
Call(SetupMashMeter, 1, 30, 0, 0, 0, 0) Call(SetupMashMeter, 1, 30, 0, 0, 0, 0)
Wait(10) Wait(10)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim17) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim17)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, -10) Call(SetBattleCamOffsetY, -10)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
@ -977,8 +977,8 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
Call(UseIdleAnimation, ACTOR_SELF, TRUE) Call(UseIdleAnimation, ACTOR_SELF, TRUE)
Return Return
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Set(LVar1, 50) Set(LVar1, 50)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
@ -1040,9 +1040,9 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetActorSpeed, ACTOR_SELF, Float(4.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 60, 15, 0) Call(AddGoalPos, ACTOR_SELF, 60, 15, 0)

14
src/battle/area/kgr/actor/fuzzipede.c
View File

@ -164,10 +164,10 @@ EvtScript N(EVS_HandlePhase) = {
Call(GetActorVar, ACTOR_SELF, AVAR_Taunted, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Taunted, LVar0)
IfFalse(LVar0) IfFalse(LVar0)
Call(SetActorVar, ACTOR_SELF, AVAR_Taunted, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_Taunted, TRUE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 10) Call(SetBattleCamOffsetY, 10)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(ActorSpeak, MSG_MAC_Port_009C, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04) 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) ExecWait(EVS_Enemy_Recover)
CaseEq(EVENT_RECEIVE_BUFF) CaseEq(EVENT_RECEIVE_BUFF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim19) 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(SetActorJumpGravity, ACTOR_SELF, Float(1.0))
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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)) ExecWait(N(EVS_LeaveHome))
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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)) ExecWait(N(EVS_LeaveHome))
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A)
@ -938,7 +938,7 @@ EvtScript N(EVS_Attack_DisableTackle) = {
EvtScript N(EVS_Recover) = { EvtScript N(EVS_Recover) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)

58
src/battle/area/kkj/actor/kammy_koopa.c
View File

@ -265,7 +265,7 @@ API_CALLABLE(N(DropBlock)) {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Wait(30) Wait(30)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim07) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim07)
@ -276,9 +276,9 @@ EvtScript N(EVS_TakeTurn) = {
Add(LVar1, 40) Add(LVar1, 40)
PlayEffect(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 100, 0) PlayEffect(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 100, 0)
Wait(20) Wait(20)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 80, 95, 15) Call(SetBattleCamTarget, 80, 95, 15)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_SUMMON_BLOCK) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_SUMMON_BLOCK)
Sub(LVar0, 15) Sub(LVar0, 15)
@ -314,15 +314,15 @@ EvtScript N(EVS_TakeTurn) = {
Wait(20) Wait(20)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim08) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim08)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -80, 37, 5) Call(SetBattleCamTarget, -80, 37, 5)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 1) Call(MoveBattleCamOver, 1)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
ChildThread ChildThread
Wait(10) Wait(10)
Call(AddBattleCamZoom, 100) Call(AddBattleCamDist, 100)
Call(MoveBattleCamOver, 10) Call(MoveBattleCamOver, 10)
Wait(5) Wait(5)
Call(N(FadeOutScreenBlur)) Call(N(FadeOutScreenBlur))
@ -368,10 +368,10 @@ EvtScript N(EVS_TakeTurn) = {
EndSwitch EndSwitch
Call(GetLastDamage, ACTOR_PARTNER, LVar0) Call(GetLastDamage, ACTOR_PARTNER, LVar0)
IfEq(LVar0, 0) IfEq(LVar0, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamTarget, 69, 14, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(FreezeBattleCam, TRUE) Call(FreezeBattleCam, TRUE)
Wait(20) Wait(20)
@ -399,26 +399,26 @@ EvtScript N(EVS_HandlePhase) = {
Call(GetActorVar, ACTOR_SELF, AVAR_PlayerTurnCount, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_PlayerTurnCount, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(0) CaseEq(0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamTarget, 69, 14, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Call(ActorSpeak, MSG_CH8_0093, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05) Call(ActorSpeak, MSG_CH8_0093, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -56, -9, -18) Call(SetBattleCamTarget, -56, -9, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 1) Call(MoveBattleCamOver, 1)
Wait(10) Wait(10)
Call(ActorSpeak, MSG_CH8_0094, ACTOR_PARTNER, 1, ANIM_Twink_ShoutAngry, ANIM_Twink_Angry) Call(ActorSpeak, MSG_CH8_0094, ACTOR_PARTNER, 1, ANIM_Twink_ShoutAngry, ANIM_Twink_Angry)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -66, -9, -18) Call(SetBattleCamTarget, -66, -9, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 10) Call(MoveBattleCamOver, 10)
Wait(10) Wait(10)
Call(ActorSpeak, MSG_CH8_0095, ACTOR_PLAYER, 1, ANIM_BattleParakarry_EnterShell, ANIM_BattleParakarry_ShellFly) 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) Call(GetActorHP, ACTOR_SELF, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(10) CaseEq(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamTarget, 69, 14, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(FreezeBattleCam, TRUE) Call(FreezeBattleCam, TRUE)
Wait(20) Wait(20)
@ -454,10 +454,10 @@ EvtScript N(EVS_CommentOnHit) = {
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
CaseOrEq(9) CaseOrEq(9)
CaseOrEq(8) CaseOrEq(8)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamTarget, 69, 14, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(FreezeBattleCam, TRUE) Call(FreezeBattleCam, TRUE)
Wait(20) Wait(20)
@ -477,10 +477,10 @@ EvtScript N(EVS_CommentOnHit) = {
IfEq(LVar0, 2) IfEq(LVar0, 2)
BreakSwitch BreakSwitch
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamTarget, 69, 14, -18)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(SetBattleCamOffsetZ, 62) Call(SetBattleCamOffsetY, 62)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(FreezeBattleCam, TRUE) Call(FreezeBattleCam, TRUE)
Wait(20) Wait(20)
@ -501,7 +501,7 @@ EvtScript N(EVS_CommentOnHit) = {
EvtScript N(EVS_Death) = { EvtScript N(EVS_Death) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(HideHealthBar, ACTOR_SELF) Call(HideHealthBar, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Wait(10) Wait(10)
@ -517,7 +517,7 @@ EvtScript N(EVS_Death) = {
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) 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(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

6
src/battle/area/kmr_part_2/actor/blue_goomba_1.c
View File

@ -305,7 +305,7 @@ EvtScript N(EVS_TakeTurn_Inner) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -483,7 +483,7 @@ EvtScript N(EVS_Init) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
Call(GetActorVar, ACTOR_SELF, AVAR_UsedTaunt, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_UsedTaunt, LVar0)
IfEq(LVar0, FALSE) IfEq(LVar0, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
@ -525,7 +525,7 @@ EvtScript N(EVS_GoombaBros_Death) = {
Call(GetActorHP, ACTOR_RED_GOOMBA, LVar0) Call(GetActorHP, ACTOR_RED_GOOMBA, LVar0)
EndIf EndIf
IfNe(LVar0, 0) IfNe(LVar0, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_RED_GOOMBA) Call(BattleCamTargetActor, ACTOR_RED_GOOMBA)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)

2
src/battle/area/kmr_part_2/actor/blue_goomba_2.c
View File

@ -296,7 +296,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)

22
src/battle/area/kmr_part_2/actor/goomba_king.c
View File

@ -387,17 +387,17 @@ EvtScript N(EVS_Attack_SpinSwipe) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(AddBattleCamZoom, -100) Call(AddBattleCamDist, -100)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(AddBattleCamZoom, -100) Call(AddBattleCamDist, -100)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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 EndIf
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
@ -480,11 +480,11 @@ EvtScript N(EVS_Attack_SpinSwipe) = {
}; };
EvtScript N(EVS_Attack_GroundStomp) = { EvtScript N(EVS_Attack_GroundStomp) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(15) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Angry)
Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8)) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8))
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -661,7 +661,7 @@ EvtScript N(EVS_HandlePhase) = {
Call(GetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, LVar0)
IfEq(LVar0, FALSE) IfEq(LVar0, FALSE)
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_RED_GOOMBA) Call(BattleCamTargetActor, ACTOR_RED_GOOMBA)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(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(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(EnableIdleScript, ACTOR_RED_GOOMBA, IDLE_SCRIPT_ENABLE)
Call(UseIdleAnimation, ACTOR_RED_GOOMBA, TRUE) Call(UseIdleAnimation, ACTOR_RED_GOOMBA, TRUE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA) Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA)
Call(MoveBattleCamOver, 10) Call(MoveBattleCamOver, 10)
Wait(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(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(EnableIdleScript, ACTOR_BLUE_GOOMBA, IDLE_SCRIPT_ENABLE)
Call(UseIdleAnimation, ACTOR_BLUE_GOOMBA, TRUE) Call(UseIdleAnimation, ACTOR_BLUE_GOOMBA, TRUE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_KING) Call(BattleCamTargetActor, ACTOR_KING)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Call(ActorSpeak, MSG_CH0_00CD, ACTOR_KING, PRT_MAIN, ANIM_GoombaKing_Angry, ANIM_GoombaKing_Angry) Call(ActorSpeak, MSG_CH0_00CD, ACTOR_KING, PRT_MAIN, ANIM_GoombaKing_Angry, ANIM_GoombaKing_Angry)
Call(SetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, TRUE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_PLAYER) Call(BattleCamTargetActor, ACTOR_PLAYER)
Call(MoveBattleCamOver, 10) Call(MoveBattleCamOver, 10)
Wait(10) Wait(10)

2
src/battle/area/kmr_part_2/actor/goomnut_tree.c
View File

@ -358,7 +358,7 @@ EvtScript N(EVS_DropNutOnGoombas) = {
IfNe(LVar0, FALSE) IfNe(LVar0, FALSE)
Return Return
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(BattleCamTargetActor, ACTOR_KING) Call(BattleCamTargetActor, ACTOR_KING)
Wait(20) Wait(20)
Call(SetActorVar, ACTOR_SELF, AVAR_BigNutDropped, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_BigNutDropped, TRUE)

4
src/battle/area/kmr_part_2/actor/red_goomba_1.c
View File

@ -303,7 +303,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -507,7 +507,7 @@ EvtScript N(EVS_GoombaBros_Death) = {
Call(GetActorHP, ACTOR_BLUE_GOOMBA, LVar0) Call(GetActorHP, ACTOR_BLUE_GOOMBA, LVar0)
EndIf EndIf
IfNe(LVar0, 0) IfNe(LVar0, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA) Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)

2
src/battle/area/kmr_part_2/actor/red_goomba_2.c
View File

@ -296,7 +296,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)

16
src/battle/area/kmr_part_3/actor/egg_jr_troopa.c
View File

@ -126,10 +126,10 @@ ActorBlueprint NAMESPACE = {
EvtScript N(EVS_Cam_FocusOnJrTroopa) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 38) Call(SetBattleCamOffsetY, 38)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Return Return
End End
@ -146,7 +146,7 @@ EvtScript N(EVS_Cam_ResetFocus) = {
EvtScript N(EVS_Cam_FocusOnGoompa) = { EvtScript N(EVS_Cam_FocusOnGoompa) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_55) Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Return Return
@ -193,9 +193,9 @@ EvtScript N(EVS_JrTroopa_Death) = {
Call(PlaySound, SOUND_ACTOR_DEATH) Call(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)
@ -399,7 +399,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run)
Call(SetActorSpeed, ACTOR_SELF, Float(8.0)) Call(SetActorSpeed, ACTOR_SELF, Float(8.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)

50
src/battle/area/kmr_part_3/actor/final_jr_troopa.c
View File

@ -320,10 +320,10 @@ EvtScript N(EVS_TransformFX) = {
EvtScript N(EVS_Cam_FocusOnJrTroopa) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 38) Call(SetBattleCamOffsetY, 38)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Return Return
End End
@ -340,7 +340,7 @@ EvtScript N(EVS_Cam_ResetFocus) = {
EvtScript N(EVS_Cam_FocusOnGoompa) = { EvtScript N(EVS_Cam_FocusOnGoompa) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_55) Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Return Return
@ -387,9 +387,9 @@ EvtScript N(EVS_JrTroopa_BaseDeath) = {
Call(PlaySound, SOUND_ACTOR_DEATH) Call(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)
@ -596,7 +596,7 @@ EvtScript N(EVS_TakeTurn) = {
IfNotFlag(LVar0, AVAL_Dialogue_LowHP) IfNotFlag(LVar0, AVAL_Dialogue_LowHP)
BitwiseOrConst(LVar0, AVAL_Dialogue_LowHP) BitwiseOrConst(LVar0, AVAL_Dialogue_LowHP)
Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(GetActorVar, ACTOR_SELF, AVAR_Form, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Form, LVar0)
@ -653,7 +653,7 @@ EvtScript N(EVS_TakeTurn) = {
EvtScript N(EVS_Transform_Flying) = { EvtScript N(EVS_Transform_Flying) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(ActorSpeak, MSG_CH8_005E, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_TiredTalk) 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) = { EvtScript N(EVS_Transform_Mage) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(ActorSpeak, MSG_CH8_005F, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_Talk, ANIM_SpikedParaJrTroopa_Talk) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Run)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -861,7 +861,7 @@ EvtScript N(EVS_Attack_Swoop) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_FlyFast)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -872,8 +872,8 @@ EvtScript N(EVS_Attack_Swoop) = {
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)
CaseOrEq(HIT_RESULT_LUCKY) CaseOrEq(HIT_RESULT_LUCKY)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -912,8 +912,8 @@ EvtScript N(EVS_Attack_Swoop) = {
CaseDefault CaseDefault
EndSwitch EndSwitch
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -954,7 +954,7 @@ EvtScript N(EVS_Attack_SpikeDive) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -1323,7 +1323,7 @@ EvtScript N(EVS_Move_HealSelf) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
@ -1390,7 +1390,7 @@ EvtScript N(EVS_HandlePhase) = {
IfNotFlag(LVar0, AVAL_Dialogue_Begin) IfNotFlag(LVar0, AVAL_Dialogue_Begin)
BitwiseOrConst(LVar0, AVAL_Dialogue_Begin) BitwiseOrConst(LVar0, AVAL_Dialogue_Begin)
Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(ActorSpeak, MSG_CH8_005D, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTalk) 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(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)
@ -1562,9 +1562,9 @@ EvtScript N(EVS_JrTroopa_Death) = {
Call(PlaySound, SOUND_ACTOR_DEATH) Call(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)

16
src/battle/area/kmr_part_3/actor/jr_troopa.c
View File

@ -114,10 +114,10 @@ ActorBlueprint NAMESPACE = {
EvtScript N(EVS_Cam_FocusOnJrTroopa) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 38) Call(SetBattleCamOffsetY, 38)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Return Return
End End
@ -134,7 +134,7 @@ EvtScript N(EVS_Cam_ResetFocus) = {
EvtScript N(EVS_Cam_FocusOnGoompa) = { EvtScript N(EVS_Cam_FocusOnGoompa) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_55) Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Return Return
@ -181,9 +181,9 @@ EvtScript N(EVS_JrTroopa_Death) = {
Call(PlaySound, SOUND_ACTOR_DEATH) Call(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)
@ -314,7 +314,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run)
Call(SetActorSpeed, ACTOR_SELF, Float(8.0)) Call(SetActorSpeed, ACTOR_SELF, Float(8.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)

14
src/battle/area/kmr_part_3/actor/mage_jr_troopa.c
View File

@ -215,10 +215,10 @@ EvtScript N(EVS_Transform) = {
EvtScript N(EVS_Cam_FocusOnJrTroopa) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 38) Call(SetBattleCamOffsetY, 38)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Return Return
End End
@ -235,7 +235,7 @@ EvtScript N(EVS_Cam_ResetFocus) = {
EvtScript N(EVS_Cam_FocusOnGoompa) = { EvtScript N(EVS_Cam_FocusOnGoompa) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_55) Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Return Return
@ -589,9 +589,9 @@ EvtScript N(EVS_JrTroopa_Death) = {
Call(PlaySound, SOUND_ACTOR_DEATH) Call(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)

28
src/battle/area/kmr_part_3/actor/para_jr_troopa.c
View File

@ -194,10 +194,10 @@ EvtScript N(EVS_Transform) = {
EvtScript N(EVS_Cam_FocusOnJrTroopa) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 38) Call(SetBattleCamOffsetY, 38)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Return Return
End End
@ -214,7 +214,7 @@ EvtScript N(EVS_Cam_ResetFocus) = {
EvtScript N(EVS_Cam_FocusOnGoompa) = { EvtScript N(EVS_Cam_FocusOnGoompa) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_55) Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Return Return
@ -406,7 +406,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ParaJrTroopa_FlyFast) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ParaJrTroopa_FlyFast)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -418,8 +418,8 @@ EvtScript N(EVS_TakeTurn) = {
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)
CaseOrEq(HIT_RESULT_LUCKY) CaseOrEq(HIT_RESULT_LUCKY)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -457,8 +457,8 @@ EvtScript N(EVS_TakeTurn) = {
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -514,9 +514,9 @@ EvtScript N(EVS_HandlePhase) = {
IfFalse(LVar0) IfFalse(LVar0)
Call(SetActorVar, ACTOR_SELF, AVAR_Transformed, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_Transformed, TRUE)
Wait(15) Wait(15)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(ActorSpeak, MSG_CH3_0020, ACTOR_SELF, PRT_FLYING, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)

28
src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c
View File

@ -193,10 +193,10 @@ EvtScript N(EVS_Transform) = {
EvtScript N(EVS_Cam_FocusOnJrTroopa) = { EvtScript N(EVS_Cam_FocusOnJrTroopa) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 38) Call(SetBattleCamOffsetY, 38)
Call(SetBattleCamZoom, 256) Call(SetBattleCamDist, 256)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Return Return
End End
@ -213,7 +213,7 @@ EvtScript N(EVS_Cam_ResetFocus) = {
EvtScript N(EVS_Cam_FocusOnGoompa) = { EvtScript N(EVS_Cam_FocusOnGoompa) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_55) Call(UseBattleCamPreset, BTL_CAM_PARTNER_GOOMPA)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Return Return
@ -459,7 +459,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_SpikedParaJrTroopa_FlyFast) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_SpikedParaJrTroopa_FlyFast)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -471,8 +471,8 @@ EvtScript N(EVS_TakeTurn) = {
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)
CaseOrEq(HIT_RESULT_LUCKY) CaseOrEq(HIT_RESULT_LUCKY)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -510,8 +510,8 @@ EvtScript N(EVS_TakeTurn) = {
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
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(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -589,9 +589,9 @@ EvtScript N(EVS_HandlePhase) = {
IfFalse(LVar0) IfFalse(LVar0)
Call(SetActorVar, ACTOR_SELF, AVAR_LostHalfHP, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_LostHalfHP, TRUE)
Wait(15) Wait(15)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(20) Wait(20)
Call(ActorSpeak, MSG_MAC_Port_00B8, ACTOR_SELF, PRT_FLYING, ANIM_JrTroopa_OutOfBreath, ANIM_JrTroopa_OutOfBreath) 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(PlaySound, SOUND_ACTOR_DEATH)
Call(DropStarPoints, ACTOR_SELF) Call(DropStarPoints, ACTOR_SELF)
Call(SetActorYaw, ACTOR_SELF, 0) Call(SetActorYaw, ACTOR_SELF, 0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamOffsetY, 15)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING)

14
src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c
View File

@ -383,7 +383,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -395,10 +395,10 @@ EvtScript N(EVS_TakeTurn) = {
CaseOrEq(HIT_RESULT_LUCKY) CaseOrEq(HIT_RESULT_LUCKY)
Set(LVarA, LVar0) Set(LVarA, LVar0)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(BattleCamTargetActor, ACTOR_SELF) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))
@ -445,10 +445,10 @@ EvtScript N(EVS_TakeTurn) = {
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_66) Call(UseBattleCamPreset, BTL_CAM_ENEMY_DIVE)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(BattleCamTargetActor, ACTOR_SELF) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetActorSpeed, ACTOR_SELF, Float(5.0))

2
src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c
View File

@ -311,7 +311,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)

82
src/battle/area/kpa2/actor/final_bowser_1.c
View File

@ -337,17 +337,17 @@ EvtScript N(EVS_HandleEvent) = {
PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.5), 20, 0) PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.5), 20, 0)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh)
Wait(30) Wait(30)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, LVar4) Add(LVar1, LVar4)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(ActorSpeak, MSG_CH8_0085, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock, ANIM_BattleBowser_Mock) 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(BattleCamTargetActor, ACTOR_PLAYER)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -608,22 +608,22 @@ EvtScript N(EVS_Recover) = {
Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 97) Add(LVar1, 97)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 39) Add(LVar1, 39)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 294) Call(SetBattleCamDist, 294)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
@ -683,22 +683,22 @@ EvtScript N(EVS_TakeTurn_Inner) = {
IfEq(LVar0, 2) IfEq(LVar0, 2)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 90) Add(LVar1, 90)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 36) Add(LVar1, 36)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
EndIf EndIf
Call(ActorSpeak, MSG_CH8_0084, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock, ANIM_BattleBowser_Mock) 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) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 54) Call(SetBattleCamOffsetY, 54)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, 21) Call(SetBattleCamOffsetY, 21)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1097,17 +1097,17 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 160) Call(SetBattleCamDist, 160)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1182,22 +1182,22 @@ EvtScript N(EVS_UseDrainingShockwave) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 24) Sub(LVar0, 24)
Add(LVar1, 97) Add(LVar1, 97)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 9) Sub(LVar0, 9)
Add(LVar1, 39) Add(LVar1, 39)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 375) Call(SetBattleCamDist, 375)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) 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) PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, Float(0.4), LVarE, 0)
EndIf EndIf
Wait(25) Wait(25)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamTarget, -45, 60, 0)
Call(SetBattleCamZoom, 530) Call(SetBattleCamDist, 530)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 80) Call(MoveBattleCamOver, 80)
Wait(10) Wait(10)
Call(RemoveEffect, LVarF) Call(RemoveEffect, LVarF)
@ -1329,20 +1329,20 @@ EvtScript N(EVS_Attack_FireBreath) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 81) Add(LVar1, 81)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 56) Add(LVar1, 56)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath)
@ -1541,7 +1541,7 @@ EvtScript N(EVS_BurnHit) = {
EvtScript N(EVS_Attack_LightningBlast) = { EvtScript N(EVS_Attack_LightningBlast) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)

116
src/battle/area/kpa2/actor/final_bowser_2.c
View File

@ -298,22 +298,22 @@ EvtScript N(EVS_HandlePhase) = {
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 90) Add(LVar1, 90)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 36) Add(LVar1, 36)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
EndIf EndIf
Call(ActorSpeak, MSG_CH8_00A6, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) 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(EnableBattleStatusBar, FALSE)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 90) Add(LVar1, 90)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 36) Add(LVar1, 36)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
EndIf EndIf
Call(ActorSpeak, MSG_CH8_00A8, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) Call(ActorSpeak, MSG_CH8_00A8, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle)
@ -500,13 +500,13 @@ EvtScript N(EVS_HandleEvent) = {
Else Else
Set(LVar3, 36) Set(LVar3, 36)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, LVar3) Add(LVar1, LVar3)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(ActorSpeak, MSG_CH8_00A7, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt) Call(ActorSpeak, MSG_CH8_00A7, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -542,22 +542,22 @@ EvtScript N(EVS_Death) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 67) Add(LVar1, 67)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 27) Add(LVar1, 27)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
EndIf EndIf
Wait(30) Wait(30)
@ -642,22 +642,22 @@ EvtScript N(EVS_Death) = {
Call(SetActorSize, ACTOR_SELF, 52, 115) Call(SetActorSize, ACTOR_SELF, 52, 115)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 45) Add(LVar1, 45)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 18) Add(LVar1, 18)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(ActorSpeak, MSG_CH8_00A9, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_DefeatedTalk, ANIM_BattleBowser_DefeatedIdle) 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(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 97) Add(LVar1, 97)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 39) Add(LVar1, 39)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 294) Call(SetBattleCamDist, 294)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
@ -1111,18 +1111,18 @@ EvtScript N(EVS_Attack_BodySlam) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 54) Call(SetBattleCamOffsetY, 54)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, 21) Call(SetBattleCamOffsetY, 21)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1331,17 +1331,17 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 160) Call(SetBattleCamDist, 160)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1416,22 +1416,22 @@ EvtScript N(EVS_UseDrainingShockwave) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 24) Sub(LVar0, 24)
Add(LVar1, 97) Add(LVar1, 97)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 9) Sub(LVar0, 9)
Add(LVar1, 39) Add(LVar1, 39)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 375) Call(SetBattleCamDist, 375)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) 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) PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, Float(0.4), LVarE, 0)
EndIf EndIf
Wait(25) Wait(25)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamTarget, -45, 60, 0)
Call(SetBattleCamZoom, 530) Call(SetBattleCamDist, 530)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 80) Call(MoveBattleCamOver, 80)
Wait(10) Wait(10)
Call(RemoveEffect, LVarF) Call(RemoveEffect, LVarF)
@ -1563,20 +1563,20 @@ EvtScript N(EVS_Attack_FireBreath) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 81) Add(LVar1, 81)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 56) Add(LVar1, 56)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath)
@ -1775,7 +1775,7 @@ EvtScript N(EVS_BurnHit) = {
EvtScript N(EVS_Attack_LightningBlast) = { EvtScript N(EVS_Attack_LightningBlast) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)

82
src/battle/area/kpa2/actor/hallway_bowser.c
View File

@ -246,7 +246,7 @@ EvtScript N(EVS_HandlePhase) = {
BitwiseOrConst(LVar0, AVAL_Flag_InitialTaunt) BitwiseOrConst(LVar0, AVAL_Flag_InitialTaunt)
Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0)
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -300,7 +300,7 @@ EvtScript N(EVS_HandleEvent) = {
Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) 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(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) 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_StarBeamRemark)
BitwiseOrConst(LVar0, AVAL_Flag_HasBeenDisenchanted) BitwiseOrConst(LVar0, AVAL_Flag_HasBeenDisenchanted)
Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(ActorSpeak, MSG_CH8_0075, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt) 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) IfNotFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP)
Call(FreezeBattleCam, TRUE) Call(FreezeBattleCam, TRUE)
ExecWait(N(EVS_Hit)) ExecWait(N(EVS_Hit))
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) 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) IfNotFlag(LVar0, AVAL_Flag_UsedStarRod)
BitwiseOrConst(LVar0, AVAL_Flag_UsedStarRod) BitwiseOrConst(LVar0, AVAL_Flag_UsedStarRod)
Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -762,22 +762,22 @@ EvtScript N(EVS_Recover) = {
Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 26) Add(LVar1, 26)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 294) Call(SetBattleCamDist, 294)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
@ -837,22 +837,22 @@ EvtScript N(EVS_TakeTurn_Inner) = {
IfEq(LVar0, 2) IfEq(LVar0, 2)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 60) Add(LVar1, 60)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 6) Sub(LVar0, 6)
Add(LVar1, 24) Add(LVar1, 24)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
EndIf EndIf
ExecWait(N(EVS_Move_UseStarRod)) ExecWait(N(EVS_Move_UseStarRod))
@ -1029,18 +1029,18 @@ EvtScript N(EVS_Attack_BodySlam) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 36) Call(SetBattleCamOffsetY, 36)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, 14) Call(SetBattleCamOffsetY, 14)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1249,17 +1249,17 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 160) Call(SetBattleCamDist, 160)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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 EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1336,22 +1336,22 @@ EvtScript N(EVS_UseDrainingShockwave) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetStatusFlags, ACTOR_SELF, LVar3) Call(GetStatusFlags, ACTOR_SELF, LVar3)
IfNotFlag(LVar3, STATUS_FLAG_SHRINK) IfNotFlag(LVar3, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 24) Sub(LVar0, 24)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 420) Call(SetBattleCamDist, 420)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 9) Sub(LVar0, 9)
Add(LVar1, 26) Add(LVar1, 26)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 250) Call(SetBattleCamDist, 250)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) 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) PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, Float(0.4), LVarE, 0)
EndIf EndIf
Wait(25) Wait(25)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamTarget, -45, 60, 0)
Call(SetBattleCamZoom, 530) Call(SetBattleCamDist, 530)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 80) Call(MoveBattleCamOver, 80)
Wait(10) Wait(10)
Call(RemoveEffect, LVarF) Call(RemoveEffect, LVarF)
@ -1483,20 +1483,20 @@ EvtScript N(EVS_Attack_FireBreath) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 45) Add(LVar1, 45)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
EndIf EndIf
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath)

38
src/battle/area/kpa2/actor/intro_bowser.c
View File

@ -199,10 +199,10 @@ EvtScript N(EVS_HandlePhase) = {
IfEq(LVar0, FALSE) IfEq(LVar0, FALSE)
Call(SetActorVar, ACTOR_SELF, AVAR_PeachSpoke, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_PeachSpoke, TRUE)
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -115, 0, 0) Call(SetBattleCamTarget, -115, 0, 0)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamOffsetY, 50)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE)
@ -328,7 +328,7 @@ EvtScript N(EVS_TakeTurn) = {
CaseEq(4) CaseEq(4)
ExecWait(N(EVS_Attack_ClawSwipe)) ExecWait(N(EVS_Attack_ClawSwipe))
CaseEq(5) CaseEq(5)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
@ -342,10 +342,10 @@ EvtScript N(EVS_TakeTurn) = {
EvtScript N(EVS_Attack_ClawSwipe) = { EvtScript N(EVS_Attack_ClawSwipe) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 40, 0, 0) Call(AddGoalPos, ACTOR_SELF, 40, 0, 0)
@ -401,13 +401,13 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
EvtScript N(EVS_Attack_FireBreath) = { EvtScript N(EVS_Attack_FireBreath) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 30) Sub(LVar0, 30)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath)
Wait(35) Wait(35)
@ -466,18 +466,18 @@ EvtScript N(EVS_Attack_FireBreath) = {
}; };
EvtScript N(EVS_UseStarRod) = { EvtScript N(EVS_UseStarRod) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(ActorSpeak, MSG_Intro_0058, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) 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) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Thread Thread
@ -494,13 +494,13 @@ EvtScript N(EVS_UseStarRod) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
ExecWait(N(EVS_StarRodCast)) ExecWait(N(EVS_StarRodCast))
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 25) Call(MoveBattleCamOver, 25)
Call(ActorSpeak, MSG_Intro_005A, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock, ANIM_BattleBowser_RearUpStill) Call(ActorSpeak, MSG_Intro_005A, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock, ANIM_BattleBowser_RearUpStill)
Call(SetDefenseTable, ACTOR_SELF, PRT_MAIN, Ref(N(BoostedDefense))) Call(SetDefenseTable, ACTOR_SELF, PRT_MAIN, Ref(N(BoostedDefense)))
@ -618,13 +618,13 @@ EvtScript N(EVS_StarRodCast) = {
EndIf EndIf
PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.0), 15, 0) PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.0), 15, 0)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) 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) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 15) Sub(LVar0, 15)
Add(LVar1, 65) Add(LVar1, 65)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 32) Call(MoveBattleCamOver, 32)
Wait(32) Wait(32)
Return Return

18
src/battle/area/kpa2/actor/unused_bowser.c
View File

@ -279,8 +279,8 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) 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(RunToGoal, ACTOR_SELF, 0, FALSE)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock)
Wait(25) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe)
Wait(3) Wait(3)
Call(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) 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(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) 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(AddGoalPos, ACTOR_SELF, 80, 0, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(3.0)) Call(SetActorSpeed, ACTOR_SELF, Float(3.0))
Call(RunToGoal, ACTOR_SELF, 0, FALSE) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle)
Wait(15) Wait(15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreJump) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreFireBreath)
@ -504,7 +504,7 @@ EvtScript N(EVS_UseDrainingShockwave) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)

4
src/battle/area/kpa4/actor/bombshell_bill.c
View File

@ -246,13 +246,13 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Fire)
Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0)
Wait(1) Wait(1)
Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0)
Wait(15) 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) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS)
Switch(LVar0) Switch(LVar0)
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)

24
src/battle/area/kzn2/actor/lava_bud.c
View File

@ -402,16 +402,16 @@ EvtScript N(EVS_TakeTurn) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0)
IfEq(LVar0, VINE_1) IfEq(LVar0, VINE_1)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 40, 30, 0) Call(SetBattleCamTarget, 40, 30, 0)
Call(SetBattleCamZoom, 270) Call(SetBattleCamDist, 270)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 110, 35, 0) Call(SetBattleCamTarget, 110, 35, 0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
EndIf EndIf
Wait(30) Wait(30)
@ -480,10 +480,10 @@ EvtScript N(EVS_Move_SummonPetit) = {
Thread Thread
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Wait(8) Wait(8)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(45) Wait(45)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -811,10 +811,10 @@ EvtScript N(EVS_Attack_SpitPetit) = {
Wait(8) Wait(8)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar1, 25) Sub(LVar1, 25)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(45) Wait(45)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)

60
src/battle/area/kzn2/actor/lava_piranha.c
View File

@ -1140,10 +1140,10 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetActorVar, ACTOR_SELF, AVAR_Common_StunTurnsLeft, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Common_StunTurnsLeft, LVar0)
IfLe(LVar0, 0) IfLe(LVar0, 0)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 80, 70, 0) Call(SetBattleCamTarget, 80, 70, 0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Loop(10) Loop(10)
@ -1188,10 +1188,10 @@ EvtScript N(EVS_Attack_SpitFire) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Thread Thread
Wait(8) Wait(8)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 80, 70, 0) Call(SetBattleCamTarget, 80, 70, 0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(MoveBattleCamOver, 45) Call(MoveBattleCamOver, 45)
Wait(57) Wait(57)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -1270,10 +1270,10 @@ EvtScript N(EVS_Attack_FireBreath) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Thread Thread
Wait(8) Wait(8)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 80, 70, 0) Call(SetBattleCamTarget, 80, 70, 0)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(MoveBattleCamOver, 45) Call(MoveBattleCamOver, 45)
Wait(54) Wait(54)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -1415,10 +1415,10 @@ EvtScript N(EVS_Death) = {
Call(GetActorVar, ACTOR_BUD_2, AVAR_Bud_WhichVine, LVar0) Call(GetActorVar, ACTOR_BUD_2, AVAR_Bud_WhichVine, LVar0)
Call(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) Call(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0)
Call(CancelEnemyTurn, 1) Call(CancelEnemyTurn, 1)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamTarget, 90, 90, 0)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 240) Call(MoveBattleCamOver, 240)
Call(OverrideBattleDmaDest, VINE_0_BASE) Call(OverrideBattleDmaDest, VINE_0_BASE)
Call(LoadBattleDmaData, VINE_ANIM_BOSS_DEATH_BEGIN) Call(LoadBattleDmaData, VINE_ANIM_BOSS_DEATH_BEGIN)
@ -1508,10 +1508,10 @@ EvtScript N(EVS_Death) = {
EndLoop EndLoop
EndThread EndThread
Wait(35) Wait(35)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamTarget, 90, 90, 0)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(SetBattleCamOffsetZ, -45) Call(SetBattleCamOffsetY, -45)
Call(MoveBattleCamOver, 110) Call(MoveBattleCamOver, 110)
Wait(60) Wait(60)
Call(SetAnimatedModelRootPosition, VINE_0, 0, -250, 0) Call(SetAnimatedModelRootPosition, VINE_0, 0, -250, 0)
@ -1522,11 +1522,11 @@ EvtScript N(EVS_Death) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
Call(ForceHomePos, ACTOR_SELF, 61, 61, 0) Call(ForceHomePos, ACTOR_SELF, 61, 61, 0)
Wait(65) Wait(65)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
Thread Thread
@ -1550,16 +1550,16 @@ EvtScript N(EVS_Death) = {
Add(LVar1, 10) Add(LVar1, 10)
PlayEffect(EFFECT_EMOTE, EMOTE_QUESTION, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) PlayEffect(EFFECT_EMOTE, EMOTE_QUESTION, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0)
Wait(50) Wait(50)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamTarget, 90, 90, 0)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(SetBattleCamOffsetZ, -60) Call(SetBattleCamOffsetY, -60)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(40) Wait(40)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamTarget, 90, 90, 0)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, -60) Call(SetBattleCamOffsetY, -60)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Thread Thread
@ -1568,10 +1568,10 @@ EvtScript N(EVS_Death) = {
Wait(40) Wait(40)
Call(UseIdleAnimation, ACTOR_PLAYER, TRUE) Call(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EndThread EndThread
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 30, 90, 0) Call(SetBattleCamTarget, 30, 90, 0)
Call(SetBattleCamZoom, 460) Call(SetBattleCamDist, 460)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(N(StartRumbleWithParams), 180, 16) Call(N(StartRumbleWithParams), 180, 16)
Thread Thread
@ -1580,10 +1580,10 @@ EvtScript N(EVS_Death) = {
EndThread EndThread
ChildThread ChildThread
Wait(50) Wait(50)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamTarget, 90, 90, 0)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(85) Wait(85)
EndChildThread EndChildThread

12
src/battle/area/kzn2/actor/petit_piranha.c
View File

@ -260,9 +260,9 @@ EvtScript N(EVS_TakeTurn) = {
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
IfGe(LVar1, 41) IfGe(LVar1, 41)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 380) Call(SetBattleCamDist, 380)
Call(SetBattleCamOffsetZ, -20) Call(SetBattleCamOffsetY, -20)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -275,9 +275,9 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(FlyToGoal, ACTOR_SELF, 20, -12, EASING_LINEAR) Call(FlyToGoal, ACTOR_SELF, 20, -12, EASING_LINEAR)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 380) Call(SetBattleCamDist, 380)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)

14
src/battle/area/mac/actor/chan.c
View File

@ -585,7 +585,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = {
Call(HPBarToHome, ACTOR_SELF) Call(HPBarToHome, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(GetBattlePhase, LVar0)
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(SetGoalToTarget, ACTOR_SELF) 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(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_FALL_QUICK, 0)
Call(GetBattlePhase, LVar0) Call(GetBattlePhase, LVar0)
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_05) Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT)
Call(SetBattleCamZoom, 430) Call(SetBattleCamDist, 430)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(MoveBattleCamOver, 10) 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 EndIf
Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS)
Switch(LVar0) Switch(LVar0)
@ -742,7 +742,7 @@ EvtScript N(EVS_TakeTurn_Ground) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_EnterShell)
Wait(10) Wait(10)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ShellStill) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ShellStill)
@ -774,7 +774,7 @@ EvtScript N(EVS_TakeTurn_Ground) = {
EndIf EndIf
Wait(1) Wait(1)
EndLoop EndLoop
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
IfEq(LVarA, HIT_RESULT_LUCKY) IfEq(LVarA, HIT_RESULT_LUCKY)
Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EndIf EndIf

4
src/battle/area/mac/actor/lee.c
View File

@ -355,7 +355,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch)
Wait(20) Wait(20)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0)
@ -601,7 +601,7 @@ API_CALLABLE(N(AdjustFormationPriority)) {
EvtScript N(EVS_Move_CopyPartner) = { EvtScript N(EVS_Move_CopyPartner) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)

4
src/battle/area/mac/actor/lee_bow.inc.c
View File

@ -250,7 +250,7 @@ EvtScript N(EVS_TakeTurn) = {
EndLoop EndLoop
EndThread EndThread
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Thread Thread
@ -265,7 +265,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle)
EndThread EndThread
Wait(15) Wait(15)
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Set(LVar0, 55) Set(LVar0, 55)

8
src/battle/area/mac/actor/lee_goombario.inc.c
View File

@ -271,7 +271,7 @@ EvtScript N(EVS_HeadbonkFollowthrough) = {
EvtScript N(EVS_ApproachPlayer) = { EvtScript N(EVS_ApproachPlayer) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -525,7 +525,7 @@ EvtScript N(EVS_Move_Tattle) = {
// enable the tattle viewport // enable the tattle viewport
Call(SetCamEnabled, CAM_TATTLE, TRUE) Call(SetCamEnabled, CAM_TATTLE, TRUE)
Call(SetCamNoDraw, CAM_TATTLE, FALSE) 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(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -533,8 +533,8 @@ EvtScript N(EVS_Move_Tattle) = {
Set(LVar1, 0) Set(LVar1, 0)
Call(N(CalculateTattleCamBoomLength)) Call(N(CalculateTattleCamBoomLength))
Wait(1) Wait(1)
Call(func_802CAE50, CAM_TATTLE, LVar0, LVar1, LVar2) Call(SetCamLookTarget, CAM_TATTLE, LVar0, LVar1, LVar2)
Call(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) Call(SetInterpCamParams, CAM_TATTLE, 0, LVar3, 100, 4)
Wait(2) Wait(2)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TATTLE_WINDOW_OPEN) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TATTLE_WINDOW_OPEN)
Call(SetCamNoDraw, CAM_TATTLE, TRUE) Call(SetCamNoDraw, CAM_TATTLE, TRUE)

4
src/battle/area/mac/actor/lee_kooper.inc.c
View File

@ -349,10 +349,10 @@ EvtScript N(EVS_TakeTurn) = {
Wait(15) Wait(15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 75) 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) Call(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(PARTNER_RANK_NORMAL) CaseEq(PARTNER_RANK_NORMAL)

2
src/battle/area/mac/actor/lee_lakilester.inc.c
View File

@ -228,7 +228,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2)

4
src/battle/area/mac/actor/lee_parakarry.inc.c
View File

@ -231,7 +231,7 @@ EvtScript N(EVS_Attack_SkyDive) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 20, 0, 0) 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(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Still) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Still)
Wait(3) 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(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_PREDIVE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_PREDIVE)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast)

8
src/battle/area/mac/actor/lee_sushie.inc.c
View File

@ -210,7 +210,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -227,11 +227,11 @@ EvtScript N(EVS_TakeTurn) = {
Call(RunToGoal, ACTOR_SELF, LVarA, FALSE) Call(RunToGoal, ACTOR_SELF, LVarA, FALSE)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle)
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(AddBattleCamZoom, -50) Call(AddBattleCamDist, -50)
Call(MoveBattleCamOver, 30) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense1)
Wait(15) Wait(15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2)

14
src/battle/area/mac/actor/lee_watt.inc.c
View File

@ -338,13 +338,13 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(MoveBattleCamOver, 80) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Run) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Run)
@ -390,9 +390,9 @@ EvtScript N(EVS_TakeTurn) = {
EndSwitch EndSwitch
Call(N(WattFXSetActive), 0) Call(N(WattFXSetActive), 0)
Set(LVarA, 40) Set(LVarA, 40)
Call(AddBattleCamZoom, -75) Call(AddBattleCamDist, -75)
Call(MoveBattleCamOver, LVarA) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE)
Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0)
IfFlag(LVar0, STATUS_FLAG_SHRINK) IfFlag(LVar0, STATUS_FLAG_SHRINK)
@ -417,7 +417,7 @@ EvtScript N(EVS_TakeTurn) = {
EndLoop EndLoop
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Idle)
Call(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_IDLE) Call(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_IDLE)
Call(AddBattleCamZoom, 75) Call(AddBattleCamDist, 75)
Call(MoveBattleCamOver, 5) Call(MoveBattleCamOver, 5)
Thread Thread
Wait(2) Wait(2)

2
src/battle/area/mac/actor/master1.c
View File

@ -236,7 +236,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0)

12
src/battle/area/mac/actor/master2.c
View File

@ -248,7 +248,7 @@ EvtScript N(EVS_Attack_StrikeOnce) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -349,15 +349,15 @@ EvtScript N(EVS_Attack_StrikeOnce) = {
EvtScript N(EVS_Attack_StrikeTwice) = { EvtScript N(EVS_Attack_StrikeTwice) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 13) Call(SetBattleCamOffsetY, 13)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
Wait(40) Wait(40)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_07) Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 1) Call(MoveBattleCamOver, 1)
Wait(10) Wait(10)
@ -501,7 +501,7 @@ EvtScript N(EVS_HandlePhase) = {
CaseEq(PHASE_PLAYER_BEGIN) CaseEq(PHASE_PLAYER_BEGIN)
Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0)
IfEq(LVar0, FALSE) IfEq(LVar0, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Wait(10) Wait(10)

40
src/battle/area/mac/actor/master3.c
View File

@ -280,7 +280,7 @@ EvtScript N(EVS_Attack_StrikeOnce) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -381,15 +381,15 @@ EvtScript N(EVS_Attack_StrikeOnce) = {
EvtScript N(EVS_Attack_StrikeTwice) = { EvtScript N(EVS_Attack_StrikeTwice) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 13) Call(SetBattleCamOffsetY, 13)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
Wait(40) Wait(40)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_07) Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 1) Call(MoveBattleCamOver, 1)
Wait(10) Wait(10)
@ -511,16 +511,16 @@ EvtScript N(EVS_Attack_StrikeTwice) = {
EvtScript N(EVS_Attack_StrikeThrice) = { EvtScript N(EVS_Attack_StrikeThrice) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 13) Call(SetBattleCamOffsetY, 13)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
Wait(20) Wait(20)
Call(ActorSpeak, MSG_MAC_Gate_003C, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedTalk, ANIM_TheMaster_AscendedWalk) Call(ActorSpeak, MSG_MAC_Gate_003C, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedTalk, ANIM_TheMaster_AscendedWalk)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_07) Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 1) Call(MoveBattleCamOver, 1)
Wait(10) Wait(10)
@ -598,7 +598,7 @@ EvtScript N(EVS_Attack_StrikeThrice) = {
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt)
Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Call(func_80273444, 50, 0, 0) Call(PlayerHopToGoal, 50, 0, 0)
Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE)
EndThread EndThread
Wait(15) 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 // Unused final phase of the battle, the Master rises into the air and becomes an airborne enemy
EvtScript N(EVS_AscendToFinalForm) = { EvtScript N(EVS_AscendToFinalForm) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 13) Call(SetBattleCamOffsetY, 13)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
Wait(20) 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. // The Master flies over to the player and waits an inordinately long time before dealing damage.
EvtScript N(EVS_Attack_SpiritStrike) = { EvtScript N(EVS_Attack_SpiritStrike) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 13) Call(SetBattleCamOffsetY, 13)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
Set(LVar0, 80) 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. // The Master flies over to the player and waits an inordinately long time before dealing damage.
EvtScript N(EVS_Attack_FlyingGrab) = { EvtScript N(EVS_Attack_FlyingGrab) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 13) Call(SetBattleCamOffsetY, 13)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
Set(LVar0, 80) Set(LVar0, 80)
@ -892,7 +892,7 @@ EvtScript N(EVS_HandlePhase) = {
Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0)
IfEq(LVar0, FALSE) IfEq(LVar0, FALSE)
// 'To battle!' // 'To battle!'
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Wait(10) Wait(10)

34
src/battle/area/nok/actor/kent_c_koopa.c
View File

@ -514,9 +514,9 @@ EvtScript N(EVS_TakeTurn) = {
IfEq(LVar0, 1) IfEq(LVar0, 1)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 25) Call(MoveBattleCamOver, 25)
Call(GetActorVar, ACTOR_SELF, AVAR_FlippedTurns, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_FlippedTurns, LVar0)
@ -613,9 +613,9 @@ EvtScript N(EVS_Attack_ShellToss) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 200) Call(SetBattleCamDist, 200)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 25) Call(MoveBattleCamOver, 25)
Wait(20) Wait(20)
@ -669,10 +669,10 @@ EvtScript N(EVS_Attack_ShellToss) = {
Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -25, 60, 0) Call(SetBattleCamTarget, -25, 60, 0)
Call(SetBattleCamZoom, 460) Call(SetBattleCamDist, 460)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -694,10 +694,10 @@ EvtScript N(EVS_Attack_ShellToss) = {
EndSwitch EndSwitch
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -25, 60, 0) Call(SetBattleCamTarget, -25, 60, 0)
Call(SetBattleCamZoom, 460) Call(SetBattleCamDist, 460)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE)
Call(GetStatusFlags, ACTOR_PLAYER, LVar0) Call(GetStatusFlags, ACTOR_PLAYER, LVar0)
@ -765,10 +765,10 @@ EvtScript N(EVS_Attack_ShellToss) = {
Call(UseIdleAnimation, ACTOR_SELF, TRUE) Call(UseIdleAnimation, ACTOR_SELF, TRUE)
Return Return
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamTarget, -45, 60, 0)
Call(SetBattleCamZoom, 460) Call(SetBattleCamDist, 460)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
EndIf EndIf
EndIf EndIf
@ -827,10 +827,10 @@ EvtScript N(EVS_Attack_HeavyStomp) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 280) Call(SetBattleCamDist, 280)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetGoalToTarget, ACTOR_SELF)
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar0, 50) Add(LVar0, 50)

8
src/battle/area/omo2/actor/general_guy.c
View File

@ -306,7 +306,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Thread Thread
@ -426,11 +426,11 @@ EvtScript N(EVS_Attack_ShootLightning) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Call(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_OPEN_HATCH) Call(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_OPEN_HATCH)

46
src/battle/area/omo2/actor/toy_tank.c
View File

@ -318,8 +318,8 @@ EvtScript N(EVS_Hit) = {
IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainElectric) IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainElectric)
BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainElectric | AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainElectric | AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric)
Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamTarget, 85, 80, 0) Call(SetBattleCamTarget, 85, 80, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -332,8 +332,8 @@ EvtScript N(EVS_Hit) = {
IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainUnfair) IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainUnfair)
BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric)
Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamTarget, 85, 80, 0) Call(SetBattleCamTarget, 85, 80, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -346,8 +346,8 @@ EvtScript N(EVS_Hit) = {
IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainGeneric) IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainGeneric)
BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric)
Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(SetBattleCamTarget, 85, 80, 0) Call(SetBattleCamTarget, 85, 80, 0)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)
@ -538,7 +538,7 @@ EvtScript N(EVS_BeginWave_StiltGuys) = {
EvtScript N(EVS_BeginWave_ShyStacks) = { EvtScript N(EVS_BeginWave_ShyStacks) = {
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_GENERAL) Call(BattleCamTargetActor, ACTOR_GENERAL)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
@ -562,11 +562,11 @@ EvtScript N(EVS_BeginWave_ShyStacks) = {
Wait(1) Wait(1)
Goto(0) Goto(0)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_WAVE_B, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_WAVE_B, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 60) Call(SetBattleCamOffsetY, 60)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Call(ActorSpeak, MSG_CH4_006F, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) 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) = { EvtScript N(EVS_SummonStiltGuys) = {
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_GENERAL) Call(BattleCamTargetActor, ACTOR_GENERAL)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(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) Call(GetActorVar, ACTOR_GENERAL, AVAR_General_WavesDefeated, LVar0)
IfEq(LVar0, 1) IfEq(LVar0, 1)
Call(ActorSpeak, MSG_CH4_006B, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) 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) Wait(1)
Goto(1) Goto(1)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 50, 1, 0) Call(SetBattleCamTarget, 50, 1, 0)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(SetBattleCamOffsetZ, 60) Call(SetBattleCamOffsetY, 60)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Call(ActorSpeak, MSG_CH4_006C, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) 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) Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ModulateDarkness, TRUE)
Exec(N(EVS_ManageDarkness)) Exec(N(EVS_ManageDarkness))
Wait(30) Wait(30)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_GENERAL) Call(BattleCamTargetActor, ACTOR_GENERAL)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(20) 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(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1)
Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02)
Call(SetActorYaw, ACTOR_GENERAL, 0) Call(SetActorYaw, ACTOR_GENERAL, 0)
@ -691,15 +691,15 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = {
Call(LoadBattleSection, BTL_AREA_OMO2_5) Call(LoadBattleSection, BTL_AREA_OMO2_5)
Call(SummonEnemy, Ref(N(ShySquadReduxFormation)), TRUE) Call(SummonEnemy, Ref(N(ShySquadReduxFormation)), TRUE)
Wait(155) Wait(155)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(BattleCamTargetActor, ACTOR_GENERAL) Call(BattleCamTargetActor, ACTOR_GENERAL)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(40) Wait(40)
Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim03) Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim03)
Call(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1) Call(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(BattleCamTargetActor, ACTOR_WAVE_A) Call(BattleCamTargetActor, ACTOR_WAVE_A)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(20) Wait(20)
@ -736,7 +736,7 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = {
EvtScript N(EVS_BeginWave_Tank) = { EvtScript N(EVS_BeginWave_Tank) = {
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_GENERAL) Call(BattleCamTargetActor, ACTOR_GENERAL)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Wait(60) Wait(60)
@ -779,7 +779,7 @@ EvtScript N(EVS_Death) = {
Wait(15) Wait(15)
PlayEffect(EFFECT_EXPLOSION, 2, 102, 40, 0, 0) PlayEffect(EFFECT_EXPLOSION, 2, 102, 40, 0, 0)
Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ShouldTetherGeneral, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ShouldTetherGeneral, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_GENERAL) Call(BattleCamTargetActor, ACTOR_GENERAL)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Call(PlaySoundAtActor, ACTOR_TANK, SOUND_TOY_TANK_EXPLODE) Call(PlaySoundAtActor, ACTOR_TANK, SOUND_TOY_TANK_EXPLODE)

12
src/battle/area/omo2_1/actor/shy_squad.c
View File

@ -494,8 +494,8 @@ EvtScript N(EVS_HandlePhase) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS1) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS1)
ExecWait(N(EVS_MoveSquadHome)) ExecWait(N(EVS_MoveSquadHome))
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 360) Call(SetBattleCamDist, 360)
Call(SetBattleCamTarget, 72, 45, 0) Call(SetBattleCamTarget, 72, 45, 0)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
@ -1126,12 +1126,12 @@ EvtScript N(EVS_Attack_Swarm) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 20) Add(LVar1, 20)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 34) Call(SetBattleCamOffsetY, 34)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Set(LVar0, 15) Set(LVar0, 15)
Call(GetActorVar, ACTOR_SELF, AVAR_NumDefeated, LVar1) Call(GetActorVar, ACTOR_SELF, AVAR_NumDefeated, LVar1)
@ -1300,7 +1300,7 @@ EvtScript N(EVS_Flee) = {
Call(SetAnimation, ACTOR_SELF, LVar0, ANIM_ShySquadGuy_Anim08) Call(SetAnimation, ACTOR_SELF, LVar0, ANIM_ShySquadGuy_Anim08)
Add(LVar0, 1) Add(LVar0, 1)
EndLoop EndLoop
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)

10
src/battle/area/omo2_2/actor/stilt_guy.c
View File

@ -670,10 +670,10 @@ EvtScript N(EVS_Attack_Leap) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetAnimation, ACTOR_SELF, PRT_STILTS, ANIM_StiltGuy_Anim03)
Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetActorSpeed, ACTOR_SELF, Float(4.0))
Call(SetGoalToTarget, ACTOR_SELF) 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) Call(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_TRIGGER_EVENTS)
Goto(1) Goto(1)
Label(10) Label(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_03) Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES)
Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1)) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1))
Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetActorSpeed, ACTOR_SELF, Float(6.0))
Call(GetActorSize, ACTOR_SELF, LVar0, LVar3) Call(GetActorSize, ACTOR_SELF, LVar0, LVar3)
@ -1083,7 +1083,7 @@ EvtScript N(EVS_ShyGuy_Attack_Tackle) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim03)
Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetActorSpeed, ACTOR_SELF, Float(4.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -1178,7 +1178,7 @@ EvtScript N(EVS_ShyGuy_Attack_Vault) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
Call(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim09) Call(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim09)
Wait(20) Wait(20)

6
src/battle/area/omo2_3/actor/shy_stack.c
View File

@ -956,7 +956,7 @@ EvtScript N(EVS_SpinSmashHit_Top) = {
Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT)
Goto(1) Goto(1)
Label(10) Label(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_03) Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES)
Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1)) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.1))
Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetActorSpeed, ACTOR_SELF, Float(6.0))
Call(GetActorSize, ACTOR_SELF, LVar0, LVar3) Call(GetActorSize, ACTOR_SELF, LVar0, LVar3)
@ -1158,7 +1158,7 @@ EvtScript N(EVS_SpinSmashHit_Stack) = {
Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) Call(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT)
Goto(1) Goto(1)
Label(10) Label(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_03) Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES)
Call(SetPartJumpGravity, ACTOR_SELF, PRT_KNOCKOFF, Float(0.1)) Call(SetPartJumpGravity, ACTOR_SELF, PRT_KNOCKOFF, Float(0.1))
Call(SetPartMoveSpeed, ACTOR_SELF, PRT_KNOCKOFF, Float(6.0)) Call(SetPartMoveSpeed, ACTOR_SELF, PRT_KNOCKOFF, Float(6.0))
Call(GetActorSize, ACTOR_SELF, LVar0, LVar3) Call(GetActorSize, ACTOR_SELF, LVar0, LVar3)
@ -1288,7 +1288,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(GetActorVar, ACTOR_SELF, AVAR_Anim_Attack, LVar0)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0)
Wait(20) Wait(20)

4
src/battle/area/omo2_5/actor/shy_squad_redux.c
View File

@ -721,7 +721,7 @@ EvtScript N(EVS_MemberShockReaction) = {
Call(SetAnimation, ACTOR_SELF, LVar0, LVar1) Call(SetAnimation, ACTOR_SELF, LVar0, LVar1)
Call(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) Call(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3)
Call(GetActorSize, ACTOR_SELF, LVar4, LVar5) 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, 0, 0)
Call(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 1, 0) Call(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 1, 0)
Wait(1) Wait(1)
@ -1103,7 +1103,7 @@ EvtScript N(EVS_Attack_Swarm) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Set(LVar0, PRT_MEMBER_01) Set(LVar0, PRT_MEMBER_01)

34
src/battle/area/omo3/actor/big_lantern_ghost.c
View File

@ -312,9 +312,9 @@ EvtScript N(EVS_HandlePhase) = {
IfNotFlag(LVar0, 1) IfNotFlag(LVar0, 1)
BitwiseOrConst(LVar0, 1) BitwiseOrConst(LVar0, 1)
Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(ActorSpeak, MSG_CH4_0051, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01) 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(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 260) Call(SetBattleCamDist, 260)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetGoalToTarget, ACTOR_SELF)
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar0, 50) Add(LVar0, 50)
@ -604,10 +604,10 @@ EvtScript N(attackHeavyJump) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP)
Call(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) Call(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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 Thread
Wait(5) Wait(5)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim10)
@ -642,11 +642,11 @@ EvtScript N(attackLightBeam) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetGoalToTarget, ACTOR_SELF)
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar0, 80) Add(LVar0, 80)
@ -657,9 +657,9 @@ EvtScript N(attackLightBeam) = {
Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(RunToGoal, ACTOR_SELF, 0, FALSE)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01)
Wait(20) Wait(20)
Call(UseBattleCamPreset, BTL_CAM_PRESET_05) Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 8) Call(MoveBattleCamOver, 8)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_LIGHT) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_LIGHT)
@ -750,8 +750,8 @@ EvtScript N(extinguish) = {
IfNotFlag(LVar0, 2) IfNotFlag(LVar0, 2)
BitwiseOrConst(LVar0, 2) BitwiseOrConst(LVar0, 2)
Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
@ -764,9 +764,9 @@ EvtScript N(extinguish) = {
EndIf EndIf
EndIf EndIf
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(SetBattleCamZoom, 230) Call(SetBattleCamDist, 230)
Call(SetBattleCamOffsetZ, 25) Call(SetBattleCamOffsetY, 25)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(20) Wait(20)

24
src/battle/area/pra2/actor/crystal_king.c
View File

@ -936,7 +936,7 @@ EvtScript N(EVS_Attack_IcyBreath) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13)
Wait(10) Wait(10)
@ -1033,7 +1033,7 @@ EvtScript N(EVS_Attack_IceBolt) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13)
Wait(10) Wait(10)
@ -1225,7 +1225,7 @@ Formation N(CloneFormation) = {
EvtScript N(EVS_Move_MakeClones) = { EvtScript N(EVS_Move_MakeClones) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -1268,7 +1268,7 @@ EvtScript N(EVS_Move_MakeClones) = {
ExecGetTID(N(EVS_UpdateHovering), LVar0) ExecGetTID(N(EVS_UpdateHovering), LVar0)
Call(SetActorVar, ACTOR_SELF, AVAR_HoveringScriptID, LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_HoveringScriptID, LVar0)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(GetActorVar, ACTOR_SELF, AVAR_Clone1_ID, LVarA) Call(GetActorVar, ACTOR_SELF, AVAR_Clone1_ID, LVarA)
Call(SetActorPos, LVarA, LVar0, LVar1, LVar2) Call(SetActorPos, LVarA, LVar0, LVar1, LVar2)
@ -1486,7 +1486,7 @@ EvtScript N(EVS_SummonBit) = {
EvtScript N(EVS_Move_SummonBits) = { EvtScript N(EVS_Move_SummonBits) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
@ -1556,9 +1556,9 @@ EvtScript N(EVS_Attack_CloneBreath) = {
BitwiseOrConst(LVar0, AVAL_Flag_SuspendHover) BitwiseOrConst(LVar0, AVAL_Flag_SuspendHover)
Call(SetActorVar, ACTOR_KING, AVAR_Flags, LVar0) Call(SetActorVar, ACTOR_KING, AVAR_Flags, LVar0)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 35) Call(SetBattleCamOffsetY, 35)
Call(GetActorFlags, ACTOR_SELF, LVar0) Call(GetActorFlags, ACTOR_SELF, LVar0)
IfFlag(LVar0, ACTOR_FLAG_FLYING) IfFlag(LVar0, ACTOR_FLAG_FLYING)
Call(SetBattleCamTarget, 70, 41, 5) Call(SetBattleCamTarget, 70, 41, 5)
@ -1853,7 +1853,7 @@ EvtScript N(EVS_Attack_SpitBits) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C)
Wait(20) Wait(20)
@ -1997,9 +1997,9 @@ EvtScript N(EVS_Move_Recover) = {
Call(UseIdleAnimation, LVarB, FALSE) Call(UseIdleAnimation, LVarB, FALSE)
Call(EnableIdleScript, LVarB, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, LVarB, IDLE_SCRIPT_DISABLE)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamOffsetY, 50)
Call(GetActorFlags, ACTOR_SELF, LVar0) Call(GetActorFlags, ACTOR_SELF, LVar0)
IfFlag(LVar0, ACTOR_FLAG_FLYING) IfFlag(LVar0, ACTOR_FLAG_FLYING)
Call(SetBattleCamTarget, 70, 41, 5) Call(SetBattleCamTarget, 70, 41, 5)

22
src/battle/area/sam2/actor/monstar.c
View File

@ -336,9 +336,9 @@ EvtScript N(EVS_ChargeUp) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(UseBattleCamPreset, BTL_CAM_ACTOR_CLOSE)
Call(SetBattleCamZoom, 10) Call(SetBattleCamDist, 10)
Call(SetBattleCamOffsetZ, 5) Call(SetBattleCamOffsetY, 5)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Monstar_GatherStrength1) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Monstar_GatherStrength1)
@ -360,11 +360,11 @@ EvtScript N(EVS_Attack_StarStorm) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE) Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 250) Call(SetBattleCamDist, 250)
Call(SetBattleCamOffsetZ, 55) Call(SetBattleCamOffsetY, 55)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
@ -388,11 +388,11 @@ EvtScript N(EVS_Attack_StarStorm) = {
EndThread EndThread
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
Call(N(StartRumbleWithParams), 80, 120) Call(N(StartRumbleWithParams), 80, 120)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 100) Call(SetBattleCamDist, 100)
Call(SetBattleCamOffsetZ, 60) Call(SetBattleCamOffsetY, 60)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
Wait(60) Wait(60)
@ -491,11 +491,11 @@ EvtScript N(EVS_HandlePhase) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
ExecWait(N(EVS_Attack_StarStorm)) ExecWait(N(EVS_Attack_StarStorm))
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar1, 72) Add(LVar1, 72)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(GetActorVar, ACTOR_SELF, AVAR_TurnCount, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_TurnCount, LVar0)

12
src/battle/area/tik2/actor/blooper.c
View File

@ -399,16 +399,16 @@ EvtScript N(EVS_Attack_SpinDrop) = {
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 95) Add(LVar1, 95)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(MoveBattleCamOver, 130) Call(MoveBattleCamOver, 130)
Else Else
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 72) Add(LVar1, 72)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 340) Call(SetBattleCamDist, 340)
Call(MoveBattleCamOver, 130) Call(MoveBattleCamOver, 130)
EndIf EndIf
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
@ -512,10 +512,10 @@ EvtScript N(EVS_Attack_InkBlast) = {
Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
Call(FallToGoal, ACTOR_SELF, 8) Call(FallToGoal, ACTOR_SELF, 8)
Thread Thread
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Sub(LVar0, 30) Sub(LVar0, 30)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
EndThread EndThread
Call(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) Call(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)

4
src/battle/area/tik2/actor/blooper_baby.c
View File

@ -466,9 +466,9 @@ EvtScript N(EVS_TakeTurn) = {
EndSwitch EndSwitch
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 50) Add(LVar1, 50)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 325) Call(SetBattleCamDist, 325)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim02) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim02)
Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8)) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8))

24
src/battle/area/tik2/actor/electro_blooper.c
View File

@ -532,9 +532,9 @@ EvtScript N(EVS_Move_ChargeUp) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Add(LVar1, 65) Add(LVar1, 65)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 320) Call(SetBattleCamDist, 320)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Wait(20) Wait(20)
Call(N(FadeBackgroundDarken)) Call(N(FadeBackgroundDarken))
@ -568,16 +568,16 @@ EvtScript N(EVS_Attack_SpinDrop) = {
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 112) Add(LVar1, 112)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 500) Call(SetBattleCamDist, 500)
Call(MoveBattleCamOver, 130) Call(MoveBattleCamOver, 130)
Else Else
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 82) Add(LVar1, 82)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 385) Call(SetBattleCamDist, 385)
Call(MoveBattleCamOver, 130) Call(MoveBattleCamOver, 130)
EndIf EndIf
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
@ -666,16 +666,16 @@ EvtScript N(EVS_Attack_ChargedDrop) = {
IfNotFlag(LVar0, STATUS_FLAG_SHRINK) IfNotFlag(LVar0, STATUS_FLAG_SHRINK)
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 112) Add(LVar1, 112)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 500) Call(SetBattleCamDist, 500)
Call(MoveBattleCamOver, 130) Call(MoveBattleCamOver, 130)
Else Else
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
Add(LVar1, 82) Add(LVar1, 82)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 385) Call(SetBattleCamDist, 385)
Call(MoveBattleCamOver, 130) Call(MoveBattleCamOver, 130)
EndIf EndIf
Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
@ -778,10 +778,10 @@ EvtScript N(EVS_Attack_InkBlast) = {
Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
Call(FallToGoal, ACTOR_SELF, 8) Call(FallToGoal, ACTOR_SELF, 8)
Thread Thread
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Sub(LVar0, 30) Sub(LVar0, 30)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(MoveBattleCamOver, 80) Call(MoveBattleCamOver, 80)
EndThread EndThread
Call(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) Call(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)

30
src/battle/area/tik2/actor/super_blooper.c
View File

@ -687,10 +687,10 @@ EvtScript N(EVS_Move_MakeBabies) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamOffsetY, 50)
Call(SetBattleCamZoom, 330) Call(SetBattleCamDist, 330)
Call(MoveBattleCamOver, 40) Call(MoveBattleCamOver, 40)
Wait(20) Wait(20)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
@ -699,10 +699,10 @@ EvtScript N(EVS_Move_MakeBabies) = {
Thread Thread
Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.3)) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.3))
EndThread EndThread
Call(UseBattleCamPreset, BTL_CAM_PRESET_07) Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 65) Call(SetBattleCamOffsetY, 65)
Call(SetBattleCamZoom, 240) Call(SetBattleCamDist, 240)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim09) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim09)
Wait(15) Wait(15)
@ -710,10 +710,10 @@ EvtScript N(EVS_Move_MakeBabies) = {
Thread Thread
Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.4)) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.4))
EndThread EndThread
Call(UseBattleCamPreset, BTL_CAM_PRESET_07) Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 80) Call(SetBattleCamOffsetY, 80)
Call(SetBattleCamZoom, 150) Call(SetBattleCamDist, 150)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0A) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0A)
Wait(15) Wait(15)
@ -721,10 +721,10 @@ EvtScript N(EVS_Move_MakeBabies) = {
Thread Thread
Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.5)) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(0.5))
EndThread EndThread
Call(UseBattleCamPreset, BTL_CAM_PRESET_07) Call(UseBattleCamPreset, BTL_CAM_ACTOR_GOAL_SIMPLE)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 95) Call(SetBattleCamOffsetY, 95)
Call(SetBattleCamZoom, 60) Call(SetBattleCamDist, 60)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0B) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0B)
Wait(30) Wait(30)
@ -757,10 +757,10 @@ EvtScript N(EVS_Move_Enrage) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(SetGoalPos, 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(BattleCamTargetActor, ACTOR_SELF)
Call(SetBattleCamOffsetZ, 28) Call(SetBattleCamOffsetY, 28)
Call(SetBattleCamZoom, 297) Call(SetBattleCamDist, 297)
Call(MoveBattleCamOver, 50) Call(MoveBattleCamOver, 50)
Wait(20) Wait(20)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)

48
src/battle/area/trd_part_2/actor/fake_bowser.c
View File

@ -1542,10 +1542,10 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = {
Return Return
EndIf EndIf
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 28, 75, -101) Call(SetBattleCamTarget, 28, 75, -101)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(SetBattleCamZoom, 500) Call(SetBattleCamDist, 500)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(15) Wait(15)
Call(GetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, LVar0) 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) Call(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 2)
CaseEq(2) CaseEq(2)
Call(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, PRT_TARGET, -1, -1) 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(SetBattleCamTarget, 85, 81, 0)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(SetBattleCamZoom, 249) Call(SetBattleCamDist, 249)
Call(MoveBattleCamOver, 10) Call(MoveBattleCamOver, 10)
Wait(10) Wait(10)
Call(ActorSpeak, MSG_CH1_0101, ACTOR_SELF, PRT_TARGET, -1, -1) 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) Call(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 3)
CaseEq(3) CaseEq(3)
Call(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, PRT_TARGET, -1, -1) 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(SetBattleCamTarget, 85, 81, 0)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(SetBattleCamZoom, 249) Call(SetBattleCamDist, 249)
Call(MoveBattleCamOver, 10) Call(MoveBattleCamOver, 10)
Wait(10) Wait(10)
Call(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, PRT_TARGET, -1, -1) Call(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, PRT_TARGET, -1, -1)
@ -1594,11 +1594,11 @@ EvtScript N(EVS_FakeBowser_HandlePhase) = {
CaseEq(PHASE_PLAYER_BEGIN) CaseEq(PHASE_PLAYER_BEGIN)
Call(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) Call(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0)
IfNotFlag(LVar0, AFLAG_Boss_Dialogue_BowserReveal) IfNotFlag(LVar0, AFLAG_Boss_Dialogue_BowserReveal)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -4, 46, -2) Call(SetBattleCamTarget, -4, 46, -2)
Call(SetBattleCamYaw, 24) Call(SetBattleCamYaw, 24)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(SetBattleCamZoom, 461) Call(SetBattleCamDist, 461)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
Wait(30) Wait(30)
Call(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, PRT_TARGET, -1, -1) 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) Call(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch)
EndThread EndThread
Wait(30) Wait(30)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 70, 46, 0) Call(SetBattleCamTarget, 70, 46, 0)
Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamOffsetY, 0)
Call(SetBattleCamZoom, 292) Call(SetBattleCamDist, 292)
Call(MoveBattleCamOver, 20) Call(MoveBattleCamOver, 20)
Wait(28) Wait(28)
Call(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_ThumbsUp) 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(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1)
Call(GetHomePos, LVar1, LVar2, LVar3, LVar4) Call(GetHomePos, LVar1, LVar2, LVar3, LVar4)
Call(SetBattleCamTarget, LVar2, LVar3, LVar4) Call(SetBattleCamTarget, LVar2, LVar3, LVar4)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamOffsetY, 50)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(MoveBattleCamOver, LVar0) Call(MoveBattleCamOver, LVar0)
Wait(LVar0) Wait(LVar0)
Call(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) 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(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1)
Call(GetHomePos, LVar1, LVar2, LVar3, LVar4) Call(GetHomePos, LVar1, LVar2, LVar3, LVar4)
Call(SetBattleCamTarget, LVar2, LVar3, LVar4) Call(SetBattleCamTarget, LVar2, LVar3, LVar4)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamOffsetY, 50)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(MoveBattleCamOver, 30) Call(MoveBattleCamOver, 30)
IfEq(LVarD, 2) IfEq(LVarD, 2)
Wait(25) Wait(25)
@ -3048,10 +3048,10 @@ EvtScript N(EVS_KoopaBros_TakeTurn) = {
EndLoop EndLoop
// zoom in to show the toppled koopa bros and have them try to get up // zoom in to show the toppled koopa bros and have them try to get up
IfEq(LFlag0, TRUE) IfEq(LFlag0, TRUE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, 90, 0, 0) Call(SetBattleCamTarget, 90, 0, 0)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 40) Call(SetBattleCamOffsetY, 40)
Call(MoveBattleCamOver, 15) Call(MoveBattleCamOver, 15)
Wait(15) Wait(15)
EndIf EndIf

2
src/battle/battle.c
View File

@ -225,7 +225,7 @@ void load_demo_battle(u32 index) {
general_heap_create(); general_heap_create();
clear_worker_list(); clear_worker_list();
clear_script_list(); clear_script_list();
create_cameras_a(); create_cameras();
spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD); spr_init_sprites(PLAYER_SPRITES_MARIO_WORLD);
clear_animator_list(); clear_animator_list();
clear_entity_models(); clear_entity_models();

18
src/battle/btl_states_actions.c
View File

@ -2076,7 +2076,7 @@ void btl_state_update_end_battle(void) {
} }
if (encounterStatus->battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) { if (encounterStatus->battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) {
btl_cam_unfreeze(); 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_color(SCREEN_LAYER_FRONT, 0, 0, 0);
set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 160, 120); 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]; Camera* camera = &gCameras[gCurrentCameraID];
if (gCurrentEncounter.battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) { 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); set_screen_overlay_params_front(OVERLAY_SCREEN_MARIO, BattleScreenFadeAmt);
} else { } else {
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt); 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; gBattleStatus.flags2 |= BS_FLAGS2_PLAYER_TURN_USED;
playerData->fleeAttempts++; playerData->fleeAttempts++;
btl_cam_use_preset(BTL_CAM_PRESET_25); btl_cam_use_preset(BTL_CAM_PLAYER_FLEE);
btl_cam_target_actor(ACTOR_PLAYER); btl_cam_target_actor(ACTOR_PLAYER);
// calculate average escape chance // calculate average escape chance
@ -2405,7 +2405,7 @@ void btl_state_update_defeat(void) {
player->disableEffect->data.disableX->koDuration = 0; 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); btl_cam_target_actor(ACTOR_PLAYER);
battleStatus->battlePhase = PHASE_DEATH; battleStatus->battlePhase = PHASE_DEATH;
script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); 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; partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS;
battleStatus->stateFreezeCount = 0; battleStatus->stateFreezeCount = 0;
gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; 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_target_pos(-89.0, 40.0, -99.0);
btl_cam_set_zoom(372); btl_cam_set_zoom(372);
btl_cam_set_zoffset(0); btl_cam_set_zoffset(0);
@ -2839,7 +2839,7 @@ void btl_state_update_player_move(void) {
if (!enemyNotDone) { if (!enemyNotDone) {
gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS; gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS;
} else { } else {
btl_cam_use_preset(BTL_CAM_PRESET_03); btl_cam_use_preset(BTL_CAM_VIEW_ENEMIES);
switch (actor->statusAfflicted) { switch (actor->statusAfflicted) {
case 4: case 4:
messageIndex = BTL_MSG_ENEMY_DAZED; messageIndex = BTL_MSG_ENEMY_DAZED;
@ -3347,7 +3347,7 @@ void btl_state_update_partner_move(void) {
if (!enemyFound) { if (!enemyFound) {
gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_DONE; gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_DONE;
} else { } else {
btl_cam_use_preset(BTL_CAM_PRESET_03); btl_cam_use_preset(BTL_CAM_VIEW_ENEMIES);
switchCondition = enemyActor->statusAfflicted - 4; switchCondition = enemyActor->statusAfflicted - 4;
switch (switchCondition) { switch (switchCondition) {
case 0: case 0:
@ -3890,7 +3890,7 @@ void btl_state_update_first_strike(void) {
gBattleStatus.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE; gBattleStatus.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE;
gBattleStatus.flags1 &= ~BS_FLAGS1_PARTNER_ACTING; gBattleStatus.flags1 &= ~BS_FLAGS1_PARTNER_ACTING;
increment_status_bar_disabled(); 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); btl_cam_target_actor(ACTOR_PLAYER);
reset_actor_turn_info(); reset_actor_turn_info();
// begin the partner turn script // 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.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE;
gBattleStatus.flags1 |= BS_FLAGS1_PARTNER_ACTING; gBattleStatus.flags1 |= BS_FLAGS1_PARTNER_ACTING;
increment_status_bar_disabled(); 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); btl_cam_target_actor(ACTOR_PARTNER);
reset_actor_turn_info(); reset_actor_turn_info();
// begin the partner turn script // begin the partner turn script

1238
src/battle/camera.c
View File

File diff suppressed because it is too large Load Diff

2
src/battle/common/actor/albino_dino.inc.c
View File

@ -260,7 +260,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) ExecGetTID(N(EVS_AddWalkQuakeFX), LVar9)
Thread Thread
Loop(3) Loop(3)

8
src/battle/common/actor/amazy_dayzee.inc.c
View File

@ -239,7 +239,7 @@ EvtScript N(EVS_Attack_Sing) = {
Else Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 70)
Set(LFlag0, FALSE) Set(LFlag0, FALSE)
Label(0) Label(0)
@ -333,9 +333,9 @@ EvtScript N(EVS_Attack_Sing) = {
EvtScript N(EVS_Move_Flee) = { EvtScript N(EVS_Move_Flee) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 20) Sub(LVar0, 20)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)

4
src/battle/common/actor/anti_guy.inc.c
View File

@ -252,7 +252,7 @@ EvtScript N(EVS_Attack_Tackle) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim03)
Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetActorSpeed, ACTOR_SELF, Float(4.0))
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -347,7 +347,7 @@ EvtScript N(EVS_Attack_Vault) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 20) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09)
Wait(20) Wait(20)

2
src/battle/common/actor/bandit.inc.c
View File

@ -518,7 +518,7 @@ EvtScript N(EVS_TakeTurn) = {
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(GetBattlePhase, LVar0)
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)

6
src/battle/common/actor/bob_omb.inc.c
View File

@ -514,7 +514,7 @@ EvtScript N(EVS_Attack_Tackle) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
@ -577,7 +577,7 @@ EvtScript N(EVS_Attack_Tackle) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Buildup) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Buildup)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(GetActorSize, ACTOR_SELF, LVar3, LVar4) 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) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK)
Wait(20) Wait(20)
ExecWait(N(EVS_Explode)) ExecWait(N(EVS_Explode))
@ -624,7 +624,7 @@ EvtScript N(EVS_Attack_Blast) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE)
Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS)
Switch(LVar0) Switch(LVar0)

22
src/battle/common/actor/bony_beetle.inc.c
View File

@ -423,13 +423,13 @@ EvtScript N(EVS_Attack_ShellToss) = {
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim16)
Goto(100) Goto(100)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim10)
Wait(10) Wait(10)
Thread Thread
@ -660,14 +660,14 @@ EvtScript N(EVS_Attack_SpikeBounce) = {
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim17)
Wait(10) Wait(10)
Goto(100) Goto(100)
EndIf EndIf
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim11)
Wait(10) Wait(10)
Thread Thread
@ -704,7 +704,7 @@ EvtScript N(EVS_Attack_SpikeBounce) = {
Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(24.0)) Call(SetActorSpeed, ACTOR_SELF, Float(24.0))
Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(RunToGoal, ACTOR_SELF, 0, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
Thread Thread
Call(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0) Call(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0)
Set(LVar0, 0) Set(LVar0, 0)
@ -1005,9 +1005,9 @@ EvtScript N(EVS_TryGettingUp_Smooth) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim06) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim06)
Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) Call(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1C) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim07)
Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
Else Else
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(SetBattleCamZoom, 350) Call(SetBattleCamDist, 350)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) Call(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1D) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1D)

4
src/battle/common/actor/bullet_bill.inc.c
View File

@ -246,13 +246,13 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Fire)
Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0)
Wait(1) Wait(1)
Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0)
Wait(15) 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) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS)
Switch(LVar0) Switch(LVar0)
CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_MISS)

14
src/battle/common/actor/buzzy_beetle.inc.c
View File

@ -582,7 +582,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = {
Call(HPBarToHome, ACTOR_SELF) Call(HPBarToHome, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(GetBattlePhase, LVar0)
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(SetGoalToTarget, ACTOR_SELF) 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(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_FALL_QUICK, 0)
Call(GetBattlePhase, LVar0) Call(GetBattlePhase, LVar0)
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_05) Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT)
Call(SetBattleCamZoom, 430) Call(SetBattleCamDist, 430)
Call(SetBattleCamOffsetZ, 20) Call(SetBattleCamOffsetY, 20)
Call(MoveBattleCamOver, 10) 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 EndIf
Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS)
Switch(LVar0) Switch(LVar0)
@ -739,7 +739,7 @@ EvtScript N(EVS_TakeTurn_Ground) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0C)
Wait(10) Wait(10)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim06) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim06)
@ -771,7 +771,7 @@ EvtScript N(EVS_TakeTurn_Ground) = {
EndIf EndIf
Wait(1) Wait(1)
EndLoop EndLoop
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
IfEq(LVarA, HIT_RESULT_LUCKY) IfEq(LVarA, HIT_RESULT_LUCKY)
Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EndIf EndIf

10
src/battle/common/actor/bzzap.inc.c
View File

@ -338,7 +338,7 @@ EvtScript N(EVS_Attack_Sting) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim03)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 52, 10, 0) Call(AddGoalPos, ACTOR_SELF, 52, 10, 0)
@ -439,9 +439,9 @@ EvtScript N(EVS_SummonSwarmPart) = {
EndIf EndIf
Call(SetPartYaw, ACTOR_SELF, LVar9, 0) Call(SetPartYaw, ACTOR_SELF, LVar9, 0)
IfEq(LVar9, 2) IfEq(LVar9, 2)
Call(UseBattleCamPreset, BTL_CAM_PRESET_08) Call(UseBattleCamPreset, BTL_CAM_ACTOR_SIMPLE)
Call(SetBattleCamZoom, 400) Call(SetBattleCamDist, 400)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(BattleCamTargetActor, ACTOR_PLAYER) Call(BattleCamTargetActor, ACTOR_PLAYER)
Call(MoveBattleCamOver, 60) Call(MoveBattleCamOver, 60)
EndIf EndIf
@ -478,7 +478,7 @@ EvtScript N(EVS_Attack_CallSwarm) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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_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_2, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_3, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_3, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)

2
src/battle/common/actor/cleft.inc.c
View File

@ -448,7 +448,7 @@ EvtScript N(EVS_Attack_Tackle) = {
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 30)
Thread Thread
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)

2
src/battle/common/actor/clubba.inc.c
View File

@ -215,7 +215,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(GetBattlePhase, LVar0)
IfEq(LVar0, PHASE_FIRST_STRIKE) IfEq(LVar0, PHASE_FIRST_STRIKE)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)

8
src/battle/common/actor/crazee_dayzee.inc.c
View File

@ -232,7 +232,7 @@ EvtScript N(EVS_Attack_Sing) = {
Else Else
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(MoveBattleCamOver, 70)
Set(LFlag0, FALSE) Set(LFlag0, FALSE)
Label(0) Label(0)
@ -326,9 +326,9 @@ EvtScript N(EVS_Attack_Sing) = {
EvtScript N(EVS_Move_Flee) = { EvtScript N(EVS_Move_Flee) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_19) Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamZoom, 300) Call(SetBattleCamDist, 300)
Call(SetBattleCamOffsetZ, 30) Call(SetBattleCamOffsetY, 30)
Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Sub(LVar0, 20) Sub(LVar0, 20)
Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2)

2
src/battle/common/actor/dark_koopa.inc.c
View File

@ -613,7 +613,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin)
Wait(10) 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 EndIf
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)

6
src/battle/common/actor/dark_paratroopa.inc.c
View File

@ -454,7 +454,7 @@ EvtScript N(EVS_TakeTurn_Flying) = {
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(UseBattleCamPreset, BTL_CAM_PRESET_05) Call(UseBattleCamPreset, BTL_CAM_ACTOR_TARGET_MIDPOINT)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Dark_Run) 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(AddGoalPos, ACTOR_SELF, 40, 30, 0)
Call(SetActorSpeed, ACTOR_SELF, Float(7.0)) Call(SetActorSpeed, ACTOR_SELF, Float(7.0))
Call(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) Call(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR)
Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) Call(UseBattleCamPresetImmediately, BTL_CAM_INTERRUPT)
Wait(5) Wait(5)
Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS)
Switch(LVar0) Switch(LVar0)
@ -1171,7 +1171,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin)
Wait(10) 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 EndIf
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)

4
src/battle/common/actor/duplighost.inc.c
View File

@ -270,7 +270,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = {
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim07)
Wait(20) Wait(20)
Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0)
@ -596,7 +596,7 @@ API_CALLABLE(N(AdjustFormationPriority)) {
EvtScript N(EVS_CopyPartner) = { EvtScript N(EVS_CopyPartner) = {
Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, ACTOR_SELF, FALSE)
Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Wait(15) Wait(15)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM)

6
src/battle/common/actor/duplighost/ghost_bow.inc.c
View File

@ -238,7 +238,7 @@ EvtScript N(EVS_TakeTurn) = {
EndLoop EndLoop
EndThread EndThread
Wait(10) Wait(10)
Call(UseBattleCamPreset, BTL_CAM_PRESET_01) Call(UseBattleCamPreset, BTL_CAM_INTERRUPT)
Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Thread Thread
@ -253,10 +253,10 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle)
EndThread EndThread
Wait(15) Wait(15)
Call(UseBattleCamPreset, BTL_CAM_PRESET_15) Call(UseBattleCamPreset, BTL_CAM_ACTOR_FAR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 30) 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) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH_A)
Set(LVar0, 55) Set(LVar0, 55)
Loop(20) Loop(20)

8
src/battle/common/actor/duplighost/ghost_goombario.inc.c
View File

@ -276,7 +276,7 @@ EvtScript N(EVS_HeadbonkFollowthrough) = {
EvtScript N(EVS_ApproachPlayer) = { EvtScript N(EVS_ApproachPlayer) = {
Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Call(BattleCamTargetActor, ACTOR_SELF) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -535,7 +535,7 @@ EvtScript N(EVS_Move_Tattle) = {
Call(EnableBattleStatusBar, FALSE) Call(EnableBattleStatusBar, FALSE)
Call(SetCamEnabled, CAM_TATTLE, TRUE) Call(SetCamEnabled, CAM_TATTLE, TRUE)
Call(SetCamNoDraw, CAM_TATTLE, FALSE) 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(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99)
Call(SetGoalToTarget, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF)
Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -543,8 +543,8 @@ EvtScript N(EVS_Move_Tattle) = {
Set(LVar1, 0) Set(LVar1, 0)
Call(N(CalculateTattleCamBoomLength)) Call(N(CalculateTattleCamBoomLength))
Wait(1) Wait(1)
Call(func_802CAE50, CAM_TATTLE, LVar0, LVar1, LVar2) Call(SetCamLookTarget, CAM_TATTLE, LVar0, LVar1, LVar2)
Call(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) Call(SetInterpCamParams, CAM_TATTLE, 0, LVar3, 100, 4)
Wait(2) Wait(2)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TATTLE_WINDOW_OPEN) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TATTLE_WINDOW_OPEN)
Call(SetCamNoDraw, CAM_TATTLE, TRUE) Call(SetCamNoDraw, CAM_TATTLE, TRUE)

4
src/battle/common/actor/duplighost/ghost_kooper.inc.c
View File

@ -358,10 +358,10 @@ EvtScript N(EVS_TakeTurn) = {
Wait(15) Wait(15)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP)
Call(UseBattleCamPreset, BTL_CAM_PRESET_14) Call(UseBattleCamPreset, BTL_CAM_ACTOR)
Call(BattleCamTargetActor, ACTOR_SELF) Call(BattleCamTargetActor, ACTOR_SELF)
Call(MoveBattleCamOver, 75) 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) Call(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(PARTNER_RANK_NORMAL) CaseEq(PARTNER_RANK_NORMAL)

Some files were not shown because too many files have changed in this diff Show More