pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-08 02:29:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

various cleanup (#1030)

Browse Source 
* more fold

* fold render modes

* fold rename 1

* fold rename 2

* fold rename 3

* imgfx struct reorg

* post merge

* the rest

* extras

* forgot these

* done

* ImgFx

* ImgFX

* check

* misc cam stuff

* ws

* misc

* btl msg

* 3 combine modes

* 3 more

* many more

* screen overlays

* stencil types

* all screen transitions

* jp build fix

* another jp fix

* iq fix

* mystery battle enum added oOoOoOoOooo

* DMG_SRC

* starting battle cam presets

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-04-25 19:33:17 -04:00 committed by GitHub
parent e0cfd078da
commit 7a9df943ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
434 changed files with 5469 additions and 5334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/common_structs.h
View File

@ -956,7 +956,7 @@ typedef struct BattleStatus {
/* 0x197 */ s8 targetHomeIndex; /* some sort of home index used for target list construction */
/* 0x198 */ s8 powerBounceCounter;
/* 0x199 */ s8 wasStatusInflicted; /* during last attack */
/* 0x19A */ u8 unk_19A;
/* 0x19A */ u8 currentDamageSource;
/* 0x19B */ char unk_19B[5];
/* 0x1A0 */ s16 currentTargetID; /* selected? */
/* 0x1A2 */ s8 currentTargetPart; /* selected? */
@ -1405,7 +1405,7 @@ typedef struct GameStatus {
/* 0x06B */ s8 demoStickY;
/* 0x06C */ s32 mainScriptID;
/* 0x070 */ s8 isBattle;
/* 0x071 */ s8 demoState; /* (0 = not demo, 1 = map demo, 2 = demo map changing) */
/* 0x071 */ s8 demoState; // see DemoState enum
/* 0x072 */ s8 nextDemoScene; /* which part of the demo to play next */
/* 0x073 */ u8 contBitPattern;
/* 0x074 */ s8 debugEnemyContact;
@ -2302,18 +2302,18 @@ typedef struct VirtualEntity {
typedef VirtualEntity* VirtualEntityList[0x40];
typedef struct Message {
/* 0x00 */ s32 unk_00;
/* 0x00 */ b32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Vec3f accel;
/* 0x14 */ Vec3f vel;
/* 0x20 */ s32 unk_20;
/* 0x20 */ s32 appearTime;
/* 0x24 */ s32 unk_24;
/* 0x28 */ f32 rotZ;
/* 0x2C */ f32 rotVelZ;
/* 0x30 */ f32 rotY;
/* 0x34 */ f32 scale;
/* 0x38 */ Vec3f pos;
/* 0x44 */ s32 unk_44;
/* 0x44 */ s32 deleteTime;
/* 0x48 */ f32 unk_48;
} Message; // size = 0x4C
@ -2327,8 +2327,8 @@ typedef struct PopupMessage {
/* 0x10 */ s16 active;
/* 0x12 */ s16 messageIndex;
/* 0x14 */ s16 duration;
/* 0x16 */ s8 unk_16;
/* 0x17 */ s8 unk_17;
/* 0x16 */ s8 showMsgState;
/* 0x17 */ s8 needsInit;
/* 0x18 */ Message* message;
} PopupMessage; // size = 0x1C

26
include/effects.h
View File

@ -856,27 +856,21 @@ typedef struct BigSnowflakesFXData {
} BigSnowflakesFXData; // size = 0x30
typedef struct DebuffFXData {
/* 0x00 */ s16 unk_00;
/* 0x00 */ s16 type;
/* 0x02 */ char unk_02[2];
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ f32 unk_20;
/* 0x24 */ s32 unk_24;
/* 0x28 */ s32 unk_28;
/* 0x2C */ f32 unk_2C;
/* 0x1C */ f32 scaleY;
/* 0x20 */ f32 scaleX;
/* 0x24 */ s32 timeLeft;
/* 0x28 */ s32 lifetime;
/* 0x2C */ f32 rotZ;
/* 0x30 */ f32 unk_30;
/* 0x34 */ s32 unk_34;
/* 0x38 */ u8 unk_38;
/* 0x39 */ u8 unk_39;
/* 0x3A */ u8 unk_3A;
/* 0x3B */ u8 unk_3B;
/* 0x3C */ u8 unk_3C;
/* 0x3D */ u8 unk_3D;
/* 0x34 */ s32 alpha;
/* 0x38 */ Color_RGB8 primCol;
/* 0x38 */ Color_RGB8 envCol;
/* 0x3E */ char unk_3E[2];
} DebuffFXData; // size = 0x40

493
include/enums.h
View File

@ -2668,6 +2668,36 @@ enum ActionRatings {
ACTION_RATING_NICE_SUPER_COMBO = 5 ///< 'Nice' but becomes 'Super' if nice hits > 2
};
enum DamageSources {
DMG_SRC_DEFAULT = 0,
DMG_SRC_BABY_BLOOPER_SELF = 1,
DMG_SRC_SPIN_SMASH = 2,
DMG_SRC_D_DOWN_POUND = 3,
DMG_SRC_D_DOWN_JUMP = 4,
DMG_SRC_TUTORIAL_GOOMBARIO = 5,
DMG_SRC_SHELL_TOSS = 6,
DMG_SRC_POWER_SHELL = 7,
DMG_SRC_DIZZY_SHELL = 8,
DMG_SRC_FIRE_SHELL = 9,
DMG_SRC_NEXT_SLAP_LEFT = 10,
DMG_SRC_NEXT_SLAP_RIGHT = 11,
DMG_SRC_LAST_SLAP_LEFT = 12,
DMG_SRC_LAST_SLAP_RIGHT = 13,
DMG_SRC_NEXT_FAN_SMACK_LEFT = 14,
DMG_SRC_NEXT_FAN_SMACK_RIGHT = 15,
DMG_SRC_LAST_FAN_SMACK_LEFT = 16,
DMG_SRC_LAST_FAN_SMACK_RIGHT = 17,
DMG_SRC_SPOOK = 18,
DMG_SRC_ELECTRO_DASH = 19,
DMG_SRC_HURRICANE = 20,
DMG_SRC_FRIGHT_JAR = 21,
DMG_SRC_POW_BLOCK = 22,
DMG_SRC_TUBBA_SMASH = 23,
DMG_SRC_CRUSH = 24,
DMG_SRC_CRUSH_PARTNER = 25,
DMG_SRC_INK_BLAST = 26,
};
enum Iters {
ITER_FIRST = -1,
ITER_NEXT = 0,
@ -2931,64 +2961,89 @@ enum ItemSpawnModes {
};
enum Locations {
LOCATION_TOAD_TOWN = 0x00000001,
LOCATION_TOAD_TOWN_TUNNELS = 0x00000002,
LOCATION_KOOPA_BROS_FORTRESS = 0x00000007,
LOCATION_MT_RUGGED = 0x00000008,
LOCATION_DRY_DRY_OUTPOST = 0x00000009,
LOCATION_DRY_DRY_DESERT = 0x0000000A,
LOCATION_DRY_DRY_RUINS = 0x0000000B,
LOCATION_FOREVER_FOREST = 0x0000000C,
LOCATION_BOOS_MANSION = 0x0000000D,
LOCATION_TUBBAS_MANOR = 0x0000000F,
LOCATION_SHY_GUYS_TOYBOX = 0x00000010,
LOCATION_MT_LAVALAVA = 0x00000012,
LOCATION_CRYSTAL_PALACE = 0x00000015,
LOCATION_BOWSERS_CASTLE = 0x00000016,
LOCATION_TESTING = 0x00000017,
LOCATION_NONE = 0x00000018,
LOCATION_PEACH_CASTLE_GROUNDS = 0x00000019,
LOCATION_PEACHS_CASTLE = 0x0000001A,
LOCATION_SHOOTING_STAR_SUMMIT = 0x0000001B,
LOCATION_STAR_WAY = 0x0000001C,
LOCATION_STAR_HAVEN = 0x0000001D,
LOCATION_GOOMBA_VILLAGE = 0x0000001E,
LOCATION_GOOMBA_ROAD = 0x0000001F,
LOCATION_PLEASANT_PATH = 0x00000020,
LOCATION_KOOPA_VILLAGE = 0x00000021,
LOCATION_GUSTY_GULCH = 0x00000022,
LOCATION_WINDY_MILL = 0x00000023,
LOCATION_JADE_JUNGLE = 0x00000024,
LOCATION_YOSHIS_VILLAGE = 0x00000025,
LOCATION_FLOWER_FIELDS = 0x00000026,
LOCATION_CLOUDY_CLIMB = 0x00000027,
LOCATION_SHIVER_CITY = 0x00000028,
LOCATION_SHIVER_SNOWFIELD = 0x00000029,
LOCATION_STARBORN_VALLEY = 0x0000002A,
LOCATION_SHIVER_MOUNTAIN = 0x0000002B,
LOCATION_MARIOS_HOUSE = 0x0000002C,
LOCATION_TOAD_TOWN = 0x01,
LOCATION_TOAD_TOWN_TUNNELS = 0x02,
LOCATION_KOOPA_BROS_FORTRESS = 0x07,
LOCATION_MT_RUGGED = 0x08,
LOCATION_DRY_DRY_OUTPOST = 0x09,
LOCATION_DRY_DRY_DESERT = 0x0A,
LOCATION_DRY_DRY_RUINS = 0x0B,
LOCATION_FOREVER_FOREST = 0x0C,
LOCATION_BOOS_MANSION = 0x0D,
LOCATION_TUBBAS_MANOR = 0x0F,
LOCATION_SHY_GUYS_TOYBOX = 0x10,
LOCATION_MT_LAVALAVA = 0x12,
LOCATION_CRYSTAL_PALACE = 0x15,
LOCATION_BOWSERS_CASTLE = 0x16,
LOCATION_TESTING = 0x17,
LOCATION_NONE = 0x18,
LOCATION_PEACH_CASTLE_GROUNDS = 0x19,
LOCATION_PEACHS_CASTLE = 0x1A,
LOCATION_SHOOTING_STAR_SUMMIT = 0x1B,
LOCATION_STAR_WAY = 0x1C,
LOCATION_STAR_HAVEN = 0x1D,
LOCATION_GOOMBA_VILLAGE = 0x1E,
LOCATION_GOOMBA_ROAD = 0x1F,
LOCATION_PLEASANT_PATH = 0x20,
LOCATION_KOOPA_VILLAGE = 0x21,
LOCATION_GUSTY_GULCH = 0x22,
LOCATION_WINDY_MILL = 0x23,
LOCATION_JADE_JUNGLE = 0x24,
LOCATION_YOSHIS_VILLAGE = 0x25,
LOCATION_FLOWER_FIELDS = 0x26,
LOCATION_CLOUDY_CLIMB = 0x27,
LOCATION_SHIVER_CITY = 0x28,
LOCATION_SHIVER_SNOWFIELD = 0x29,
LOCATION_STARBORN_VALLEY = 0x2A,
LOCATION_SHIVER_MOUNTAIN = 0x2B,
LOCATION_MARIOS_HOUSE = 0x2C,
};
typedef enum ScreenTransition {
TRANSITION_0 = 0,
TRANSITION_1 = 1,
TRANSITION_2 = 2,
TRANSITION_3 = 3,
TRANSITION_4 = 4,
TRANSITION_5 = 5,
TRANSITION_6 = 6,
TRANSITION_7 = 7,
TRANSITION_8 = 8,
TRANSITION_9 = 9,
TRANSITION_10 = 10,
TRANSITION_11 = 11,
TRANSITION_12 = 12,
TRANSITION_13 = 13,
TRANSITION_14 = 14,
TRANSITION_15 = 15,
TRANSITION_16 = 16,
TRANSITION_STANDARD = 0, // fade to/from black
TRANSITION_TOY_TRAIN = 1, // similar to TRANSITION_TOY_TRAIN, but fade applies to whole screen
TRANSITION_END_DEMO_SCENE_BLACK = 2, // rapidly fade to black
TRANSITION_END_DEMO_SCENE_WHITE = 3, // slow fade to white -> rapid fade in from white
TRANSITION_BEGIN_OR_END_GAME = 4, // slow fade to/from black
TRANSITION_OUTRO_END_SCENE = 5, // slow fade to/from black
TRANSITION_BEGIN_OR_END_CHAPTER = 6, // white fade in/out; standard transition for entering kmr_22 (Begin Chapter) or leaving kmr_23 (End of Chapter)
TRANSITION_SLOW_FADE_TO_WHITE = 7, // slow fade to/from white
TRANSITION_ENTER_WORLD = 8, // black Mario stencil in/out
TRANSITION_MARIO_WHITE = 9, // white Mario stencil -> white fade in; used in post ch5 scene, fading to Save and Continue? screen
TRANSITION_MARIO_BLACK = 10, // black Mario stencil -> black fade in; used after Goombaria finds Mario and he wakes up in the inn
TRANSITION_AFTER_SAVE_PROMPT = 11, // white fade out -> white star stencil
TRANSITION_END_PEACH_INTERLUDE = 12, // white star stencil -> white Mario stencil
TRANSITION_PEACH_CAPTURED = 13, // black star stencil -> black fade in
TRANSITION_GET_STAR_CARD = 14, // used for entering kmr_23 (Get Star Card / End Chapter)
TRANSITION_END_CHAPTER_INTERRUPTED = 15, // white fade out -> white Mario stencil; used in kzn_19 for Ch5
TRANSITION_SLOW_BLUR_MOTION = 16, // unused?
} ScreenTransition;
enum ScreenLayer {
SCREEN_LAYER_FRONT = 0,
SCREEN_LAYER_BACK = 1,
};
typedef enum ScreenOverlayType {
OVERLAY_NONE = -1,
OVERLAY_SCREEN_COLOR = 0,
OVERLAY_VIEWPORT_COLOR = 1,
OVERLAY_TYPE_2 = 2,
OVERLAY_VIEWPORT_SPOTLIGHT = 3,
OVERLAY_VIEWPORT_MARIO = 4,
OVERLAY_VIEWPORT_STAR = 5,
OVERLAY_SCREEN_SPOTLIGHT = 6,
OVERLAY_SCREEN_MARIO = 7,
OVERLAY_SCREEN_STAR = 8,
OVERLAY_TYPE_9 = 9,
OVERLAY_START_BATTLE = 10,
OVERLAY_WORLD_DARKNESS = 11,
OVERLAY_BLUR = 12,
OVERLAY_BATTLE_DARKNESS = 13,
OVERLAY_UNUSED_1 = 14,
OVERLAY_UNUSED_2 = 15,
} ScreenOverlayType;
enum DoorSounds {
DOOR_SOUNDS_BASIC = 0,
DOOR_SOUNDS_METAL = 1,
@ -4340,6 +4395,8 @@ enum DemoState {
DEMO_STATE_NONE = 0,
DEMO_STATE_ACTIVE = 1,
DEMO_STATE_CHANGE_MAP = 2,
DEMO_STATE_4 = 4,
DEMO_STATE_DONE = 5,
};
enum MapLoadType {
@ -4865,91 +4922,91 @@ enum BattlePartnerMenuSubstates {
};
enum BattleMessages {
BTL_MSG_00 = 0x00,
BTL_MSG_01 = 0x01,
BTL_MSG_02 = 0x02,
BTL_MSG_03 = 0x03,
BTL_MSG_04 = 0x04,
BTL_MSG_05 = 0x05,
BTL_MSG_06 = 0x06,
BTL_MSG_07 = 0x07,
BTL_MSG_08 = 0x08,
BTL_MSG_09 = 0x09,
BTL_MSG_0A = 0x0A,
BTL_MSG_0B = 0x0B,
BTL_MSG_0C = 0x0C,
BTL_MSG_0D = 0x0D,
BTL_MSG_0E = 0x0E,
BTL_MSG_0F = 0x0F,
BTL_MSG_10 = 0x10,
BTL_MSG_11 = 0x11,
BTL_MSG_12 = 0x12,
BTL_MSG_13 = 0x13,
BTL_MSG_14 = 0x14,
BTL_MSG_15 = 0x15,
BTL_MSG_16 = 0x16,
BTL_MSG_17 = 0x17,
BTL_MSG_18 = 0x18,
BTL_MSG_19 = 0x19,
BTL_MSG_1A = 0x1A,
BTL_MSG_1B = 0x1B,
BTL_MSG_1C = 0x1C,
BTL_MSG_1D = 0x1D,
BTL_MSG_1E = 0x1E,
BTL_MSG_1F = 0x1F,
BTL_MSG_20 = 0x20,
BTL_MSG_21 = 0x21,
BTL_MSG_22 = 0x22,
BTL_MSG_23 = 0x23,
BTL_MSG_24 = 0x24,
BTL_MSG_25 = 0x25,
BTL_MSG_26 = 0x26,
BTL_MSG_27 = 0x27,
BTL_MSG_28 = 0x28,
BTL_MSG_29 = 0x29,
BTL_MSG_2A = 0x2A,
BTL_MSG_2B = 0x2B,
BTL_MSG_2C = 0x2C,
BTL_MSG_2D = 0x2D,
BTL_MSG_2E = 0x2E,
BTL_MSG_2F = 0x2F,
BTL_MSG_30 = 0x30,
BTL_MSG_31 = 0x31,
BTL_MSG_32 = 0x32,
BTL_MSG_33 = 0x33,
BTL_MSG_34 = 0x34,
BTL_MSG_35 = 0x35,
BTL_MSG_36 = 0x36,
BTL_MSG_37 = 0x37,
BTL_MSG_38 = 0x38,
BTL_MSG_39 = 0x39,
BTL_MSG_3A = 0x3A,
BTL_MSG_3B = 0x3B,
BTL_MSG_3C = 0x3C,
BTL_MSG_3D = 0x3D,
BTL_MSG_3E = 0x3E,
BTL_MSG_3F = 0x3F,
BTL_MSG_40 = 0x40,
BTL_MSG_41 = 0x41,
BTL_MSG_42 = 0x42,
BTL_MSG_43 = 0x43,
BTL_MSG_44 = 0x44,
BTL_MSG_45 = 0x45,
BTL_MSG_46 = 0x46,
BTL_MSG_47 = 0x47,
BTL_MSG_48 = 0x48,
BTL_MSG_49 = 0x49,
BTL_MSG_4A = 0x4A,
BTL_MSG_4B = 0x4B,
BTL_MSG_4C = 0x4C,
BTL_MSG_4D = 0x4D,
BTL_MSG_4E = 0x4E,
BTL_MSG_4F = 0x4F,
BTL_MSG_50 = 0x50,
BTL_MSG_51 = 0x51,
BTL_MSG_52 = 0x52,
BTL_MSG_53 = 0x53,
BTL_MSG_54 = 0x54,
BTL_MSG_MERLEE_ATK_UP = 0x00,
BTL_MSG_MERLEE_DEF_UP = 0x01,
BTL_MSG_MERLEE_EXP_UP = 0x02,
BTL_MSG_MERLEE_DONE = 0x03,
BTL_MSG_CHARGE_HAMMER = 0x04,
BTL_MSG_CHARGE_HAMMER_MORE = 0x05,
BTL_MSG_CHARGE_JUMP = 0x06,
BTL_MSG_CHARGE_JUMP_MORE = 0x07,
BTL_MSG_CANT_CHARGE = 0x08,
BTL_MSG_ENEMY_MISSED = 0x09,
BTL_MSG_PLAYER_DAZED = 0x0A,
BTL_MSG_PLAYER_ASLEEP = 0x0B,
BTL_MSG_PLAYER_FROZEN = 0x0C,
BTL_MSG_PLAYER_POISONED = 0x0D,
BTL_MSG_PLAYER_SHRUNK = 0x0E,
BTL_MSG_PLAYER_PARALYZED = 0x0F,
BTL_MSG_PLAYER_CHARGED = 0x10,
BTL_MSG_PLAYER_TRANSPARENT = 0x11,
BTL_MSG_ENEMY_DAZED = 0x12,
BTL_MSG_ENEMY_ASLEEP = 0x13,
BTL_MSG_ENEMY_FROZEN = 0x14,
BTL_MSG_ENEMY_POISONED = 0x15,
BTL_MSG_ENEMY_SHRUNK = 0x16,
BTL_MSG_ENEMY_PARALYZED = 0x17,
BTL_MSG_ENEMY_ELECTRIFIED = 0x18,
BTL_MSG_ENEMY_CANT_MOVE = 0x19,
BTL_MSG_STAR_POWER_RECHARGED = 0x1A,
BTL_MSG_STAR_POWER_MAXED = 0x1B,
BTL_MSG_STAR_POWER_FILLED = 0x1C,
BTL_MSG_ATTACK_UP = 0x1D,
BTL_MSG_DEFENCE_UP = 0x1E,
BTL_MSG_1F = 0x1F,
BTL_MSG_20 = 0x20,
BTL_MSG_ENEMY_TRANSPARENT = 0x21,
BTL_MSG_ENEMY_CHARGED = 0x22,
BTL_MSG_PARTNER_INJURED = 0x23,
BTL_MSG_CHARGE_GOOMBARIO = 0x24,
BTL_MSG_CHARGE_GOOMBARIO_MORE = 0x25,
BTL_MSG_WATER_BLOCK_BEGIN = 0x26,
BTL_MSG_WATER_BLOCK_END = 0x27,
BTL_MSG_CLOUD_NINE_BEGIN = 0x28,
BTL_MSG_CLOUD_NINE_END = 0x29,
BTL_MSG_TURBO_CHARGE_BEGIN = 0x2A,
BTL_MSG_TURBO_CHARGE_END = 0x2B,
BTL_MSG_CHILL_OUT_BEGIN = 0x2C,
BTL_MSG_UNUSED_CLOUD_NINE = 0x2D,
BTL_MSG_ACTION_TIP_00 = 0x2E,
BTL_MSG_ACTION_TIP_01 = 0x2F,
BTL_MSG_ACTION_TIP_02 = 0x30,
BTL_MSG_ACTION_TIP_03 = 0x31,
BTL_MSG_ACTION_TIP_04 = 0x32,
BTL_MSG_ACTION_TIP_05 = 0x33,
BTL_MSG_ACTION_TIP_06 = 0x34,
BTL_MSG_ACTION_TIP_07 = 0x35,
BTL_MSG_ACTION_TIP_08 = 0x36,
BTL_MSG_ACTION_TIP_09 = 0x37,
BTL_MSG_ACTION_TIP_0A = 0x38,
BTL_MSG_ACTION_TIP_0B = 0x39,
BTL_MSG_ACTION_TIP_0C = 0x3A,
BTL_MSG_ACTION_TIP_0D = 0x3B,
BTL_MSG_ACTION_TIP_0E = 0x3C,
BTL_MSG_ACTION_TIP_0F = 0x3D,
BTL_MSG_ACTION_TIP_10 = 0x3E,
BTL_MSG_ACTION_TIP_11 = 0x3F,
BTL_MSG_ACTION_TIP_12 = 0x40,
BTL_MSG_ACTION_TIP_13 = 0x41,
BTL_MSG_ACTION_TIP_14 = 0x42,
BTL_MSG_NO_JUMP_TARGET = 0x43,
BTL_MSG_NO_HAMMER_TARGET = 0x44,
BTL_MSG_NO_ITEM_TARGET = 0x45,
BTL_MSG_46 = 0x46,
BTL_MSG_47 = 0x47,
BTL_MSG_CANT_SELECT_NOW = 0x48,
BTL_MSG_HAMMER_DISABLED_1 = 0x49,
BTL_MSG_HAMMER_DISABLED_2 = 0x4A,
BTL_MSG_HAMMER_DISABLED_3 = 0x4B,
BTL_MSG_JUMP_DISABLED_1 = 0x4C,
BTL_MSG_JUMP_DISABLED_2 = 0x4D,
BTL_MSG_JUMP_DISABLED_3 = 0x4E,
BTL_MSG_ITEMS_DISABLED = 0x4F,
BTL_MSG_CANT_SWITCH = 0x50,
BTL_MSG_CANT_MOVE = 0x51,
BTL_MSG_CANT_SWITCH_UNUSED = 0x52,
BTL_MSG_CANT_MOVE_UNUSED = 0x53,
BTL_MSG_CANT_SELECT_NOW_ALT = 0x54,
};
// BattleMenuState
@ -5548,80 +5605,92 @@ enum CameraControlType {
};
enum BtlCameraPreset {
BTL_CAM_PRESET_A = 0,
BTL_CAM_PRESET_B,
BTL_CAM_PRESET_C,
BTL_CAM_PRESET_D,
BTL_CAM_PRESET_E,
BTL_CAM_PRESET_F,
BTL_CAM_PRESET_G,
BTL_CAM_PRESET_H,
BTL_CAM_PRESET_I,
BTL_CAM_PRESET_9,
BTL_CAM_PRESET_10,
BTL_CAM_PRESET_11,
BTL_CAM_PRESET_12,
BTL_CAM_PRESET_13,
BTL_CAM_PRESET_14,
BTL_CAM_PRESET_15,
BTL_CAM_PRESET_16,
BTL_CAM_PRESET_17,
BTL_CAM_PRESET_18,
BTL_CAM_PRESET_19,
BTL_CAM_PRESET_20,
BTL_CAM_PRESET_21,
BTL_CAM_PRESET_22,
BTL_CAM_PRESET_23,
BTL_CAM_PRESET_24,
BTL_CAM_PRESET_25,
BTL_CAM_PRESET_26,
BTL_CAM_PRESET_27,
BTL_CAM_PRESET_28,
BTL_CAM_PRESET_29,
BTL_CAM_PRESET_30,
BTL_CAM_PRESET_31,
BTL_CAM_PRESET_32,
BTL_CAM_PRESET_33,
BTL_CAM_PRESET_34,
BTL_CAM_PRESET_35,
BTL_CAM_PRESET_36,
BTL_CAM_PRESET_37,
BTL_CAM_PRESET_38,
BTL_CAM_PRESET_39,
BTL_CAM_PRESET_40,
BTL_CAM_PRESET_41,
BTL_CAM_PRESET_42,
BTL_CAM_PRESET_43,
BTL_CAM_PRESET_44,
BTL_CAM_PRESET_45,
BTL_CAM_PRESET_46,
BTL_CAM_PRESET_47,
BTL_CAM_PRESET_48,
BTL_CAM_PRESET_49,
BTL_CAM_PRESET_50,
BTL_CAM_PRESET_51,
BTL_CAM_PRESET_52,
BTL_CAM_PRESET_53,
BTL_CAM_PRESET_54,
BTL_CAM_PRESET_55,
BTL_CAM_PRESET_56,
BTL_CAM_PRESET_57,
BTL_CAM_PRESET_58,
BTL_CAM_PRESET_59,
BTL_CAM_PRESET_60,
BTL_CAM_PRESET_61,
BTL_CAM_PRESET_62,
BTL_CAM_PRESET_63,
BTL_CAM_PRESET_64,
BTL_CAM_PRESET_65,
BTL_CAM_PRESET_66,
BTL_CAM_PRESET_67,
BTL_CAM_PRESET_68,
BTL_CAM_PRESET_69,
BTL_CAM_PRESET_70,
BTL_CAM_PRESET_71,
BTL_CAM_PRESET_72,
BTL_CAM_PRESET_73,
BTL_CAM_PRESET_00 = 0, // unused?
BTL_CAM_PRESET_01 = 1, // STOP
BTL_CAM_DEFAULT = 2,
BTL_CAM_PRESET_03 = 3,
BTL_CAM_PRESET_04 = 4,
BTL_CAM_PRESET_05 = 5,
BTL_CAM_PRESET_06 = 6, // unused?
BTL_CAM_PRESET_07 = 7,
BTL_CAM_PRESET_08 = 8,
BTL_CAM_PRESET_09 = 9, // unused?
BTL_CAM_PRESET_10 = 10,
BTL_CAM_PRESET_11 = 11,
BTL_CAM_PRESET_12 = 12, // unused?
BTL_CAM_PRESET_13 = 13,
BTL_CAM_PRESET_14 = 14,
BTL_CAM_PRESET_15 = 15,
BTL_CAM_PRESET_16 = 16, // unused?
BTL_CAM_PRESET_17 = 17, // unused?
BTL_CAM_PRESET_18 = 18, // unused?
BTL_CAM_PRESET_19 = 19,
BTL_CAM_PRESET_20 = 20, // unused?
BTL_CAM_PRESET_21 = 21, // unused?
BTL_CAM_PLAYER_ENTRY = 22,
BTL_CAM_VICTORY = 23, // closeup on party while star points are tallied
BTL_CAM_PRESET_24 = 24,
BTL_CAM_PRESET_25 = 25, // closeup on player used when running away or being defeated
BTL_CAM_PLAYER_ATTACK_APPROACH = 26,
BTL_CAM_PRESET_27 = 27,
BTL_CAM_PRESET_28 = 28,
BTL_CAM_PRESET_29 = 29,
BTL_CAM_PLAYER_HIT_SPIKE = 30, // player hurt via spike contact
BTL_CAM_PLAYER_HIT_HAZARD = 31, // player hurt via burn or shock contact
BTL_CAM_PLAYER_CHARGE_UP = 32,
BTL_CAM_PLAYER_STATUS_AFFLICTED = 33,
BTL_CAM_PRESET_34 = 34,
BTL_CAM_PRESET_35 = 35,
BTL_CAM_PRESET_36 = 36, // unused?
BTL_CAM_PRESET_37 = 37,
BTL_CAM_PRESET_38 = 38,
BTL_CAM_PRESET_39 = 39,
BTL_CAM_PRESET_40 = 40,
BTL_CAM_PRESET_41 = 41, // unused?
BTL_CAM_PRESET_42 = 42, // unused?
BTL_CAM_PLAYER_AIM_HAMMER = 43,
BTL_CAM_PLAYER_HAMMER_STRIKE = 44,
BTL_CAM_PRESET_45 = 45, // unused?
BTL_CAM_PRESET_46 = 46,
BTL_CAM_PRESET_47 = 47,
BTL_CAM_PRESET_48 = 48,
BTL_CAM_PRESET_49 = 49, // unused?
BTL_CAM_PRESET_50 = 50,
BTL_CAM_PRESET_51 = 51,
BTL_CAM_PRESET_52 = 52,
BTL_CAM_PRESET_53 = 53,
BTL_CAM_PARTNER_INJURED = 54, // closeup on partner after being injured
BTL_CAM_PRESET_55 = 55,
BTL_CAM_PRESET_56 = 56, // unused?
BTL_CAM_PRESET_57 = 57, // unused?
BTL_CAM_PRESET_58 = 58, // unused?
BTL_CAM_PRESET_59 = 59,
BTL_CAM_PRESET_60 = 60, // unused?
BTL_CAM_PRESET_61 = 61,
BTL_CAM_PRESET_62 = 62,
BTL_CAM_PRESET_63 = 63,
BTL_CAM_PRESET_64 = 64, // unused?
BTL_CAM_PRESET_65 = 65, // unused?
BTL_CAM_PRESET_66 = 66,
BTL_CAM_PRESET_67 = 67, // unused?
BTL_CAM_PRESET_68 = 68, // unused?
BTL_CAM_PRESET_69 = 69,
BTL_CAM_PRESET_70 = 70, // unused?
BTL_CAM_PRESET_71 = 71, // unused?
BTL_CAM_PRESET_72 = 72, // unused?
BTL_CAM_PRESET_73 = 73,
};
enum BattleCamXModes {
BTL_CAM_MODEX_0 = 0,
BTL_CAM_MODEX_1 = 1,
};
enum BattleCamYModes {
BTL_CAM_MODEY_MINUS_2 = -2,
BTL_CAM_MODEY_MINUS_1 = -1,
BTL_CAM_MODEY_0 = 0,
BTL_CAM_MODEY_1 = 1,
};
enum MoveActionTips {

6
include/functions.h
View File

@ -640,7 +640,7 @@ void add_xz_vec3f_copy1(Vec3f* vector, f32 speed, f32 angleDeg);
void add_xz_vec3f_copy2(Vec3f* vector, f32 speed, f32 angleDeg);
void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg);
void func_80138D88(s32, s32, s32, s32, f32);
void draw_prev_frame_buffer_at_screen_pos(s32, s32, s32, s32, f32);
void func_8013A4D0(void);
void btl_draw_ui(void);
@ -744,7 +744,7 @@ void state_step_demo(void);
void state_drawUI_demo(void);
void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void));
void func_80260A60(void);
void btl_set_player_idle_anims(void);
void shim_create_audio_system_obfuscated(void);
void shim_load_engine_data_obfuscated(void);
@ -959,7 +959,7 @@ void set_message_msg(s32 msgID, s32 index);
void set_message_value(s32 value, s32 index);
s32 store_item(s32 itemID);
void open_status_menu_short(void);
void func_8024EFE0(f32 x, f32 y, f32 z, s32, s32, s32);
void show_immune_bonk(f32 x, f32 y, f32 z, s32, s32, s32);
void func_802664DC(f32 x, f32 y, f32 z, s32 attack, s32 a);
s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion);
void disable_actor_blur(Actor*);

59
include/macros.h
View File

@ -101,6 +101,8 @@
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
#define LAST_DEMO_SCENE_IDX 18
#define WORLD_ENTITY_HEAP_SIZE 0x17FF0
#define COLLISION_HEAP_SIZE 0x18000
#define GENERAL_HEAP_SIZE 0x54000
@ -218,6 +220,63 @@
#define DMG_STATUS_ALWAYS(typeFlag, duration) (STATUS_FLAG_80000000 | STATUS_FLAG_RIGHT_ON | typeFlag | (duration << 8))
#define DMG_STATUS_IGNORE_RES(typeFlag, duration) (typeFlag | (duration << 8) | STATUS_CHANCE_IGNORE_RES)
#define PM_CC_01 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0
#define PM_CC_02 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
#define PM_CC_03 TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0
#define PM_CC_04 PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0
#define PM_CC_05 TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0
#define PM_CC_06 COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED
#define PM_CC_07 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0
#define PM_CC_08 0, 0, 0, PRIMITIVE, 0, 0, 0, 1
#define PM_CC_09 0, 0, 0, PRIMITIVE, 0, 0, 0, 0
#define PM_CC_0A 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0
#define PM_CC_0B 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0
#define PM_CC_0C 0, 0, 0, 0, 0, 0, 0, COMBINED
#define PM_CC_0D 0, 0, 0, 0, SHADE, 0, TEXEL1, 0
#define PM_CC_0E 0, 0, 0, TEXEL0, 0, 0, 0, 0
#define PM_CC_0F 0, 0, 0, TEXEL0, 0, 0, 0, 1
#define PM_CC_10 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE
#define PM_CC_11 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0
#define PM_CC_12 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0
#define PM_CC_13 TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL1
#define PM_CC_14 PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0
#define PM_CC_15 PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1
#define PM_CC_16 COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED
#define PM_CC_17 COMBINED, 0, PRIMITIVE, ENVIRONMENT, 0, 0, 0, COMBINED
// custom cycle1 modes for window styles
#define PM_CC_WINDOW_2 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1
#define PM_CC_WINDOW_3 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0
#define PM_CC_WINDOW_4 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE
#define PM_CC_WINDOW_5 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1
#define PM_CC_WINDOW_6 0, 0, 0, TEXEL1, PRIMITIVE, 0, TEXEL1, 0
#define PM_CC_WINDOW_7 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, 1
// custom cycle2 modes for window styles
#define PM_CC_WINDOW_1 COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED
#define PM_CC_IMGFX_COLOR_FILL 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0
#define PM_CC_IMGFX_HOLOGRAM NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
#define PM_CC_MSG_NOISE_OUTLINE NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0
#define PM_CC_MSG_STATIC NOISE, TEXEL0, ENVIRONMENT, TEXEL0, 0, 0, 0, TEXEL0
#define PM_CC_CANDLE_1 TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1
#define PM_CC_CANDLE_2 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1
#define PM_CC_BOX1_OPAQUE TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL1
#define PM_CC_BOX2_OPAQUE TEXEL0, 0, TEXEL1, 0, 0, 0, 0, TEXEL1
#define PM_CC_BOX1_TRANSPARENT TEXEL0, 0, PRIMITIVE, 0, TEXEL1, 0, PRIMITIVE, 0
#define PM_CC_BOX2_TRANSPARENT TEXEL0, 0, TEXEL1, 0, TEXEL1, 0, PRIMITIVE, 0
#define PM_CC_BOX1_CYC2 TEXEL0, ENVIRONMENT, ENV_ALPHA, COMBINED, 0, 0, 0, COMBINED
#define PM_CC_BOX2_CYC2 PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED
#define PM_CC_CONST_ALPHA_1 0, 0, 0, 0, 0, 0, 0, 1
#define PM_CC_CONST_0 0, 0, 0, 0, 0, 0, 0, 0
#define PM_CC_CONST_1 0, 0, 0, 1, 0, 0, 0, 1
#ifdef OLD_GCC
#define VLA 0
#else

4
include/overlay.h
View File

@ -11,7 +11,7 @@ typedef struct ScreenOverlay {
} ScreenOverlay; // size = 0x18
void _render_transition_stencil(u8, f32, ScreenOverlay*);
void func_80139F10(s32, s32, f32, s32, s32, s32, s32, s32);
void func_80138E54(s32, s32, s32, f32, f32);
void appendGfx_screen_transition_stencil(s32, s32, f32, s32, s32, s32, s32, s32);
void appendGfx_darkness_stencil(s32, s32, s32, f32, f32);
#endif

34
include/script_api/battle.h
View File

@ -60,8 +60,8 @@ ApiStatus LoadMoveScript(Evt* script, s32 isInitialCall);
ApiStatus LoadBattleSection(Evt* script, s32 isInitialCall);
ApiStatus GetBattlePhase(Evt* script, s32 isInitialCall);
ApiStatus GetLastElement(Evt* script, s32 isInitialCall);
ApiStatus func_80269EAC(Evt* script, s32 isInitialCall);
ApiStatus func_80269E80(Evt* script, s32 isInitialCall);
ApiStatus SetDamageSource(Evt* script, s32 isInitialCall);
ApiStatus GetDamageSource(Evt* script, s32 isInitialCall);
ApiStatus SetGoalToHome(Evt* script, s32 isInitialCall);
ApiStatus SetIdleGoalToHome(Evt* script, s32 isInitialCall);
ApiStatus SetGoalToIndex(Evt* script, s32 isInitialCall);
@ -278,7 +278,7 @@ ApiStatus CamPresetUpdate_G(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_I(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_H(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_N(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_C(Evt* script, s32 isInitialCall);
ApiStatus BattleCamImpl_Default(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_D(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_E(Evt* script, s32 isInitialCall);
ApiStatus CamPresetUpdate_J(Evt* script, s32 isInitialCall);
@ -343,16 +343,16 @@ extern EvtScript EVS_MerleeExpBonus;
extern EvtScript EVS_PlayerHappy;
extern EvtScript EVS_ApplyDizzyAttack;
extern EvtScript EVS_PlayerRegainAbility;
extern EvtScript UseMystery;
extern EvtScript DoSleepHit;
extern EvtScript DoDizzyHit;
extern EvtScript DoParalyzeHit;
extern EvtScript DoPoisonHit;
extern EvtScript DoStopHit;
extern EvtScript DoFreezeHit;
extern EvtScript DoShrinkHit;
extern EvtScript ForceNextTarget;
extern EvtScript DoNormalHit;
extern EvtScript EVS_UseMystery;
extern EvtScript EVS_PlaySleepHitFX;
extern EvtScript EVS_PlayDizzyHitFX;
extern EvtScript EVS_PlayParalyzeHitFX;
extern EvtScript EVS_PlayPoisonHitFX;
extern EvtScript EVS_PlayStopHitFX;
extern EvtScript EVS_PlayFreezeHitFX;
extern EvtScript EVS_PlayShrinkHitFX;
extern EvtScript EVS_ForceNextTarget;
extern EvtScript EVS_DoNormalHit;
extern EvtScript DoPartnerRunAway;
extern EvtScript DoPartnerSpikeContact;
extern EvtScript D_80295350;
@ -362,7 +362,7 @@ extern EvtScript D_80295744;
extern EvtScript DoPartnerBurn;
extern EvtScript D_802977BC;
extern EvtScript DoPartnerHit;
extern EvtScript DoPartnerBlock;
extern EvtScript EVS_DoPartnerBlock;
extern EvtScript D_802976E8;
extern EvtScript D_8029C12C;
extern EvtScript DoBurnHit;
@ -370,8 +370,8 @@ extern EvtScript DoShockHit;
extern EvtScript D_8029A76C;
extern EvtScript D_80294720;
extern EvtScript DoImmune;
extern EvtScript DoDeath;
extern EvtScript D_8029AF08;
extern EvtScript EVS_DoDeath;
extern EvtScript EVS_AnimateDeath;
extern EvtScript Collapse;
extern EvtScript DoScareAway;
extern EvtScript DoSpinSmashHit;
@ -395,7 +395,7 @@ extern EvtScript Rumble_Unused_3;
extern EvtScript Rumble_Unused_4;
extern EvtScript CamPreset_A;
extern EvtScript CamPreset_B;
extern EvtScript CamPreset_C;
extern EvtScript EVS_BattleCam_Default;
extern EvtScript CamPreset_D;
extern EvtScript CamPreset_E;
extern EvtScript CamPreset_F;

20
src/111f0_len_860.c
View File

@ -12,7 +12,7 @@ void state_init_enter_demo(void) {
void state_init_enter_world(void) {
D_800A0948 = 1;
set_map_transition_effect(8);
set_map_transition_effect(TRANSITION_ENTER_WORLD);
init_enter_world_shared();
}
@ -45,7 +45,7 @@ void state_step_enter_world(void) {
gGameStatusPtr->prevArea = gGameStatusPtr->areaID;
set_time_freeze_mode(TIME_FREEZE_NORMAL);
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
disable_player_input();
}
update_cameras();
@ -75,10 +75,10 @@ void state_step_enter_world(void) {
update_cameras();
if (update_enter_map_screen_overlay(&gMapTransitionAlpha) != 0) {
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
enable_player_input();
}
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
set_game_mode(GAME_MODE_CHANGE_MAP);
}
break;
@ -123,7 +123,7 @@ void state_step_change_map(void) {
gMapTransitionState++;
break;
case 2:
if (gGameStatusPtr->demoState != 0) {
if (gGameStatusPtr->demoState != DEMO_STATE_NONE) {
set_game_mode(GAME_MODE_DEMO);
}
@ -135,7 +135,7 @@ void state_step_change_map(void) {
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
nuContRmbForceStopEnd();
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
disable_player_input();
}
update_cameras();
@ -163,10 +163,10 @@ void state_step_change_map(void) {
update_cameras();
if (update_enter_map_screen_overlay(&gMapTransitionAlpha) != 0) {
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
enable_player_input();
}
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
set_game_mode(GAME_MODE_CHANGE_MAP);
}
break;
@ -219,7 +219,7 @@ void func_8003646C(void) {
if (gMapTransitionAlpha < 0) {
gMapTransitionAlpha = 0;
gMapTransitionState++;
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
set_game_mode(GAME_MODE_CHANGE_MAP);
}
update_npcs();
@ -229,7 +229,7 @@ void func_8003646C(void) {
break;
}
set_screen_overlay_params_front(0, gMapTransitionAlpha);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, gMapTransitionAlpha);
}
void func_80036640(void) {

174
src/16F740.c
View File

@ -217,7 +217,7 @@ void btl_state_update_normal_start(void) {
switch (gBattleSubState) {
case BTL_SUBSTATE_NORMAL_START_INIT:
BattleEnemiesCreated = battle->formationSize;
set_screen_overlay_params_back(255, -1.0f);
set_screen_overlay_params_back(OVERLAY_NONE, -1.0f);
compressedAsset = load_asset_by_name(stage->shape, &size);
decode_yay0(compressedAsset, &gMapShapeData);
general_heap_free(compressedAsset);
@ -429,8 +429,8 @@ void btl_state_update_normal_start(void) {
battleStatus->controlScriptID = script->id;
}
if (battleStatus->darknessMode > BTL_DARKNESS_STATE_NONE) {
set_screen_overlay_color(1, 0, 0, 0);
set_screen_overlay_params_back(0, 215.0f);
set_screen_overlay_color(SCREEN_LAYER_BACK, 0, 0, 0);
set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, 215.0f);
}
if (is_ability_active(ABILITY_CHILL_OUT) && currentEncounter->firstStrikeType == FIRST_STRIKE_ENEMY) {
currentEncounter->firstStrikeType = FIRST_STRIKE_NONE;
@ -481,7 +481,7 @@ void btl_state_update_normal_start(void) {
D_8029F248++;
if (D_8029F248 == 15) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
}
if (!(gGameStatusPtr->demoFlags & 1)) {
@ -496,7 +496,7 @@ void btl_state_update_normal_start(void) {
break;
case BTL_SUBSTATE_NORMAL_START_DONE:
if (battleStatus->unk_8C == 0) {
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
btl_set_state(BATTLE_STATE_BEGIN_TURN);
}
break;
@ -504,12 +504,12 @@ void btl_state_update_normal_start(void) {
}
void btl_state_draw_normal_start(void) {
set_screen_overlay_color(0, 0, 0, 0);
set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0);
if (BattleScreenFadeAmt > 255) {
set_screen_overlay_params_front(0, 255.0f);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 255.0f);
} else {
set_screen_overlay_params_front(0, BattleScreenFadeAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt);
}
}
@ -704,7 +704,7 @@ void btl_state_update_begin_player_turn(void) {
s32 temp;
if (gBattleSubState == BTL_SUBSTATE_BEGIN_PLAYER_TURN_INIT) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(5);
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_RESET_STATE;
}
@ -766,7 +766,7 @@ void btl_state_update_begin_player_turn(void) {
fx_water_splash(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 24);
battleStatus->waterBlockEffect = NULL;
sfx_play_sound(SOUND_299);
btl_show_battle_message(BTL_MSG_27, 60);
btl_show_battle_message(BTL_MSG_WATER_BLOCK_END, 60);
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_WATER_BLOCK;
} else {
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_CHECK_CLOUD_NINE;
@ -792,7 +792,7 @@ void btl_state_update_begin_player_turn(void) {
if (battleStatus->cloudNineTurnsLeft <= 0) {
remove_effect(battleStatus->cloudNineEffect);
battleStatus->cloudNineEffect = NULL;
btl_show_battle_message(BTL_MSG_29, 60);
btl_show_battle_message(BTL_MSG_CLOUD_NINE_END, 60);
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_CLOUD_NINE;
} else {
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_CHECK_TURBO_CHARGE;
@ -818,7 +818,7 @@ void btl_state_update_begin_player_turn(void) {
battleStatus->turboChargeTurnsLeft--;
battleStatus->buffEffect->data.partnerBuff->unk_0C[FX_BUFF_DATA_TURBO_CHARGE].turnsLeft = battleStatus->turboChargeTurnsLeft;
if (battleStatus->turboChargeTurnsLeft <= 0) {
btl_show_battle_message(BTL_MSG_2B, 60);
btl_show_battle_message(BTL_MSG_TURBO_CHARGE_END, 60);
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_TURBO_CHARGE;
} else {
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_TRY_STATUS_DAMAGE;
@ -1092,7 +1092,7 @@ void btl_state_update_begin_partner_turn(void) {
gBattleSubState = BTL_SUBSTATE_BEGIN_PARTNER_TURN_END_DELAY;
} else if ((battleStatus->flags2 & (BS_FLAGS2_4 | BS_FLAGS2_2)) != (BS_FLAGS2_4 | BS_FLAGS2_2)) {
if (!(partner->flags & ACTOR_FLAG_NO_ATTACK)) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(5);
gBattleSubState = BTL_SUBSTATE_BEGIN_PARTNER_TURN_RESET_STATE;
} else {
@ -1377,7 +1377,7 @@ void btl_state_update_9(void) {
return;
}
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
if (partner == NULL || !(gBattleStatus.flags1 & BS_FLAGS1_PLAYER_IN_BACK)) {
gBattleSubState = BTL_SUBSTATE_9_4;
} else if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) {
@ -1578,7 +1578,7 @@ void btl_state_update_end_turn(void) {
}
if (!cond) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
gBattleSubState = BTL_SUBSTATE_END_TURN_CHECK_FOR_SWAP;
}
}
@ -1647,7 +1647,7 @@ void btl_state_update_end_turn(void) {
partner->disableDismissTimer = 0;
}
func_80260A60();
btl_set_player_idle_anims();
gBattleStatus.flags1 &= ~BS_FLAGS1_PLAYER_DEFENDING;
playerData->specialBarsFilled += 32;
if (playerData->specialBarsFilled > playerData->maxStarPower * 256) {
@ -1691,7 +1691,7 @@ void btl_state_update_end_turn(void) {
}
if (!cond) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
gBattleSubState = BTL_SUBSTATE_END_TURN_BEGIN_NEXT;
}
}
@ -1709,7 +1709,7 @@ void btl_state_draw_end_turn(void) {
}
void btl_state_update_1C(void) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_set_state(BATTLE_STATE_PREPARE_MENU);
}
@ -1854,7 +1854,7 @@ void btl_state_update_victory(void) {
}
if (gBattleSubState == BTL_SUBSTATE_VICTORY_CHECK_MERLEE) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_EXP_BOOST) {
if (battleStatus->totalStarPoints == 0) {
battleStatus->nextMerleeSpellType = MERLEE_SPELL_0;
@ -2011,7 +2011,7 @@ void btl_state_update_end_training_battle(void) {
switch (gBattleSubState) {
case BTL_SUBSTATE_END_TRAINING_RESET_CAM:
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
D_8029F248 = 30;
gBattleSubState = BTL_SUBSTATE_END_TRAINING_DONE;
break;
@ -2051,9 +2051,9 @@ void btl_state_update_end_battle(void) {
}
if (encounterStatus->battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) {
btl_cam_unfreeze();
btl_cam_use_preset(BTL_CAM_PRESET_B);
set_screen_overlay_color(0, 0, 0, 0);
set_screen_overlay_center(0, 0, 160, 120);
btl_cam_use_preset(BTL_CAM_PRESET_01);
set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0);
set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 160, 120);
}
gBattleSubState = BTL_SUBSTATE_END_BATTLE_FADE_OUT;
break;
@ -2149,9 +2149,9 @@ void btl_state_draw_end_battle(void) {
if (gCurrentEncounter.battleOutcome == OUTCOME_PLAYER_LOST && !(gBattleStatus.flags1 & BS_FLAGS1_NO_GAME_OVER)) {
camera->auxBoomZOffset += 256;
set_screen_overlay_params_front(7, BattleScreenFadeAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_MARIO, BattleScreenFadeAmt);
} else {
set_screen_overlay_params_front(0, BattleScreenFadeAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt);
}
}
@ -2545,7 +2545,7 @@ void btl_state_update_change_partner(void) {
break;
}
}
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
gBattleSubState = BTL_SUBSTATE_CHANGE_PARTNER_DONE;
break;
case BTL_SUBSTATE_CHANGE_PARTNER_DONE:
@ -2589,7 +2589,7 @@ void btl_state_update_player_move(void) {
battleStatus->unk_86 = 127;
battleStatus->blockResult = 127;
battleStatus->lastAttackDamage = 0;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
gBattleStatus.flags1 &= ~BS_FLAGS1_AUTO_SUCCEED_ACTION;
gBattleStatus.flags1 &= ~BS_FLAGS1_MENU_OPEN;
reset_actor_turn_info();
@ -2650,7 +2650,7 @@ void btl_state_update_player_move(void) {
if (battleStatus->selectedMoveID != MOVE_NONE) {
tipIndex = gMoveTable[battleStatus->selectedMoveID].actionTip;
if (tipIndex >= 0) {
btl_show_battle_message(BTL_MSG_2E + tipIndex, 60);
btl_show_battle_message(BTL_MSG_ACTION_TIP_00 + tipIndex, 60);
}
}
}
@ -2810,31 +2810,31 @@ void btl_state_update_player_move(void) {
if (!enemyNotDone) {
gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS;
} else {
btl_cam_use_preset(BTL_CAM_PRESET_D);
btl_cam_use_preset(BTL_CAM_PRESET_03);
switch (actor->statusAfflicted) {
case 4:
messageIndex = BTL_MSG_12;
messageIndex = BTL_MSG_ENEMY_DAZED;
break;
case 6:
messageIndex = BTL_MSG_13;
messageIndex = BTL_MSG_ENEMY_ASLEEP;
break;
case 7:
messageIndex = BTL_MSG_14;
messageIndex = BTL_MSG_ENEMY_FROZEN;
break;
case 9:
messageIndex = BTL_MSG_15;
messageIndex = BTL_MSG_ENEMY_POISONED;
break;
case 10:
messageIndex = BTL_MSG_16;
messageIndex = BTL_MSG_ENEMY_SHRUNK;
break;
case 5:
messageIndex = BTL_MSG_17;
messageIndex = BTL_MSG_ENEMY_PARALYZED;
break;
case 11:
messageIndex = BTL_MSG_18;
messageIndex = BTL_MSG_ENEMY_ELECTRIFIED;
break;
case 8:
messageIndex = BTL_MSG_19;
messageIndex = BTL_MSG_ENEMY_CANT_MOVE;
break;
default:
messageIndex = 0;
@ -2854,7 +2854,7 @@ void btl_state_update_player_move(void) {
break;
case BTL_SUBSTATE_PLAYER_MOVE_AWAIT_ENEMY_STATUS_POPUP:
if (!btl_is_popup_displayed()) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
D_8029F248 = 10;
gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_POST_ENEMY_STATUS_POPUP;
@ -2872,28 +2872,28 @@ void btl_state_update_player_move(void) {
switch (gBattleSubState) {
case BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS:
if (player->statusAfflicted != 0) {
btl_cam_use_preset(BTL_CAM_PRESET_33);
btl_cam_use_preset(BTL_CAM_PLAYER_STATUS_AFFLICTED);
switch (player->statusAfflicted) {
case 4:
messageIndex = BTL_MSG_0A;
messageIndex = BTL_MSG_PLAYER_DAZED;
break;
case 6:
messageIndex = BTL_MSG_0B;
messageIndex = BTL_MSG_PLAYER_ASLEEP;
break;
case 7:
messageIndex = BTL_MSG_0C;
messageIndex = BTL_MSG_PLAYER_FROZEN;
break;
case 9:
messageIndex = BTL_MSG_0D;
messageIndex = BTL_MSG_PLAYER_POISONED;
break;
case 10:
messageIndex = BTL_MSG_0E;
messageIndex = BTL_MSG_PLAYER_SHRUNK;
break;
case 5:
messageIndex = BTL_MSG_0F;
messageIndex = BTL_MSG_PLAYER_PARALYZED;
break;
case 11:
messageIndex = BTL_MSG_10;
messageIndex = BTL_MSG_PLAYER_CHARGED;
break;
default:
messageIndex = 0;
@ -2912,7 +2912,7 @@ void btl_state_update_player_move(void) {
break;
case BTL_SUBSTATE_PLAYER_MOVE_AWAIT_PLAYER_STATUS_POPUP:
if (!btl_is_popup_displayed()) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
D_8029F248 = 10;
gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_POST_PLAYER_STATUS_POPUP;
@ -3061,7 +3061,7 @@ void btl_state_update_end_player_turn(void) {
if (gBattleSubState == BTL_SUBSTATE_END_PLAYER_TURN_DONE) {
if(!btl_check_enemies_defeated()) {
if (battleStatus->moveCategory == BTL_MENU_TYPE_ITEMS && battleStatus->itemUsesLeft >= 2) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(10);
gBattleStatus.flags2 &= ~BS_FLAGS2_2;
} else {
@ -3146,7 +3146,7 @@ void btl_state_update_partner_move(void) {
battleStatus->unk_8C = 0;
battleStatus->unk_86 = 127;
battleStatus->blockResult = 127;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
gBattleStatus.flags1 &= ~BS_FLAGS1_AUTO_SUCCEED_ACTION;
gBattleStatus.flags1 &= ~BS_FLAGS1_MENU_OPEN;
reset_actor_turn_info();
@ -3164,7 +3164,7 @@ void btl_state_update_partner_move(void) {
enemyActor->statusAfflicted = 0;
}
}
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_EXECUTE_MOVE;
break;
case BTL_SUBSTATE_PARTNER_MOVE_EXECUTE_MOVE:
@ -3274,8 +3274,8 @@ void btl_state_update_partner_move(void) {
btl_update_ko_status();
if (partner->statusAfflicted == STATUS_DAZE && !btl_are_all_enemies_defeated()) {
btl_cam_use_preset(BTL_CAM_PRESET_54);
btl_show_battle_message(BTL_MSG_23, 60);
btl_cam_use_preset(BTL_CAM_PARTNER_INJURED);
btl_show_battle_message(BTL_MSG_PARTNER_INJURED, 60);
partner->statusAfflicted = 0;
partner->disableDismissTimer = 0;
gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_AWAIT_PARTNER_STATUS_POPUP;
@ -3288,7 +3288,7 @@ void btl_state_update_partner_move(void) {
if (btl_is_popup_displayed()) {
break;
}
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
D_8029F248 = 10;
gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_POST_PARTNER_STATUS_POPUP;
@ -3318,32 +3318,32 @@ void btl_state_update_partner_move(void) {
if (!enemyFound) {
gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_DONE;
} else {
btl_cam_use_preset(BTL_CAM_PRESET_D);
btl_cam_use_preset(BTL_CAM_PRESET_03);
switchCondition = enemyActor->statusAfflicted - 4;
switch (switchCondition) {
case 0:
messageIndex = BTL_MSG_12;
messageIndex = BTL_MSG_ENEMY_DAZED;
break;
case 2:
messageIndex = BTL_MSG_13;
messageIndex = BTL_MSG_ENEMY_ASLEEP;
break;
case 3:
messageIndex = BTL_MSG_14;
messageIndex = BTL_MSG_ENEMY_FROZEN;
break;
case 5:
messageIndex = BTL_MSG_15;
messageIndex = BTL_MSG_ENEMY_POISONED;
break;
case 6:
messageIndex = BTL_MSG_16;
messageIndex = BTL_MSG_ENEMY_SHRUNK;
break;
case 1:
messageIndex = BTL_MSG_17;
messageIndex = BTL_MSG_ENEMY_PARALYZED;
break;
case 7:
messageIndex = BTL_MSG_18;
messageIndex = BTL_MSG_ENEMY_ELECTRIFIED;
break;
case 4:
messageIndex = BTL_MSG_19;
messageIndex = BTL_MSG_ENEMY_CANT_MOVE;
break;
default:
messageIndex = 0;
@ -3365,7 +3365,7 @@ void btl_state_update_partner_move(void) {
break;
case BTL_SUBSTATE_PARTNER_MOVE_AWAIT_ENEMY_STATUS_POPUP:
if (btl_is_popup_displayed() == FALSE) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
D_8029F248 = 10;
gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_POST_ENEMY_STATUS_POPUP;
@ -3573,7 +3573,7 @@ void btl_state_update_enemy_move(void) {
battleStatus->actionSuccess = 0;
battleStatus->unk_86 = 127;
battleStatus->blockResult = 127;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
reset_actor_turn_info();
gBattleStatus.flags1 |= BS_FLAGS1_100;
player->statusAfflicted = 0;
@ -3675,26 +3675,26 @@ void btl_state_update_enemy_move(void) {
if (partner != NULL) {
partner->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
}
btl_cam_use_preset(BTL_CAM_PRESET_33);
btl_cam_use_preset(BTL_CAM_PLAYER_STATUS_AFFLICTED);
switch (player->statusAfflicted) {
case STATUS_DIZZY:
messageIndex = BTL_MSG_0A;
messageIndex = BTL_MSG_PLAYER_DAZED;
break;
case STATUS_SLEEP:
messageIndex = BTL_MSG_0B;
messageIndex = BTL_MSG_PLAYER_ASLEEP;
break;
case STATUS_FROZEN:
messageIndex = BTL_MSG_0C;
messageIndex = BTL_MSG_PLAYER_FROZEN;
break;
case STATUS_POISON:
messageIndex = BTL_MSG_0D;
messageIndex = BTL_MSG_PLAYER_POISONED;
break;
case STATUS_SHRINK:
messageIndex = BTL_MSG_0E;
messageIndex = BTL_MSG_PLAYER_SHRUNK;
break;
case STATUS_PARALYZE:
messageIndex = BTL_MSG_0F;
messageIndex = BTL_MSG_PLAYER_PARALYZED;
break;
default:
messageIndex = 0;
@ -3715,7 +3715,7 @@ void btl_state_update_enemy_move(void) {
break;
case BTL_SUBSTATE_ENEMY_MOVE_AWAIT_PLAYER_POPUP_DONE:
if (!btl_is_popup_displayed()) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
D_8029F248 = 10;
gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_POST_PLAYER_POPUP_DELAY;
@ -3737,8 +3737,8 @@ void btl_state_update_enemy_move(void) {
if (partner->statusAfflicted == STATUS_DAZE) {
player->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
partner->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
btl_cam_use_preset(BTL_CAM_PRESET_54);
btl_show_battle_message(BTL_MSG_23, 60);
btl_cam_use_preset(BTL_CAM_PARTNER_INJURED);
btl_show_battle_message(BTL_MSG_PARTNER_INJURED, 60);
partner->statusAfflicted = 0;
gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_AWAIT_PARTNER_POPUP_DONE;
} else {
@ -3750,7 +3750,7 @@ void btl_state_update_enemy_move(void) {
break;
case BTL_SUBSTATE_ENEMY_MOVE_AWAIT_PARTNER_POPUP_DONE:
if (!btl_is_popup_displayed()) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
D_8029F248 = 10;
gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_POST_PARTNER_POPUP_DELAY;
@ -3849,7 +3849,7 @@ void btl_state_update_first_strike(void) {
func_80263230(player, enemy);
battleStatus->unk_8C = 0;
battleStatus->lastAttackDamage = 0;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
gBattleStatus.flags1 &= ~BS_FLAGS1_MENU_OPEN;
gBattleStatus.flags2 |= BS_FLAGS2_1000000;
gBattleStatus.flags1 &= ~BS_FLAGS1_PARTNER_ACTING;
@ -3987,7 +3987,7 @@ void btl_state_update_first_strike(void) {
void btl_state_draw_first_stike(void) {
if (D_802809F6 == -1 && D_8029F254 != 0) {
if (BattleScreenFadeAmt == 0) {
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
} else {
if (!(gGameStatusPtr->demoFlags & 1)) {
BattleScreenFadeAmt -= 20;
@ -3998,7 +3998,7 @@ void btl_state_draw_first_stike(void) {
if (BattleScreenFadeAmt < 0) {
BattleScreenFadeAmt = 0;
}
set_screen_overlay_params_front(0, BattleScreenFadeAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt);
}
}
}
@ -4052,7 +4052,7 @@ void btl_state_update_partner_striking_first(void) {
partner->targetPartIndex = target->partID;
battleStatus->unk_8C = 0;
battleStatus->lastAttackDamage = 0;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
gBattleStatus.flags1 &= ~BS_FLAGS1_MENU_OPEN;
gBattleStatus.flags2 |= BS_FLAGS2_1000000;
gBattleStatus.flags1 |= BS_FLAGS1_PARTNER_ACTING;
@ -4171,14 +4171,14 @@ void btl_state_update_partner_striking_first(void) {
void btl_state_draw_partner_striking_first(void) {
if (D_8029F254 != 0) {
if (BattleScreenFadeAmt == 0) {
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
} else {
BattleScreenFadeAmt -= 20;
if (BattleScreenFadeAmt < 0) {
BattleScreenFadeAmt = 0;
}
set_screen_overlay_params_front(0, BattleScreenFadeAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt);
}
}
}
@ -4203,7 +4203,7 @@ void btl_state_update_enemy_striking_first(void) {
case BTL_SUBSTATE_ENEMY_FIRST_STRIKE_INIT:
battleStatus->unk_8C = 0;
battleStatus->lastAttackDamage = 0;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
playerData->enemyFirstStrikes++;
battleStatus->flags1 &= ~BS_FLAGS1_MENU_OPEN;
D_8029F254 = 0;
@ -4348,14 +4348,14 @@ void btl_state_update_enemy_striking_first(void) {
void btl_state_draw_enemy_striking_first(void) {
if (D_8029F254 != 0) {
if (BattleScreenFadeAmt == 0) {
set_screen_overlay_params_front(255, -1.0f);
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
} else {
BattleScreenFadeAmt -= 20;
if (BattleScreenFadeAmt < 0) {
BattleScreenFadeAmt = 0;
}
set_screen_overlay_params_front(0, BattleScreenFadeAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt);
}
}
}
@ -4441,7 +4441,7 @@ void btl_state_update_end_demo_battle(void) {
}
if (D_802809F6 != -1) {
gGameStatusPtr->nextDemoScene = 0x12;
gGameStatusPtr->nextDemoScene = LAST_DEMO_SCENE_IDX;
}
btl_set_state(BATTLE_STATE_0);
@ -4455,7 +4455,7 @@ const static f32 padding[] = { 0.0f, 0.0f, 0.0f };
void btl_state_draw_end_demo_battle(void) {
if (D_802809F6 == -1) {
set_screen_overlay_color(0, 0, 0, 0);
set_screen_overlay_params_front(0, BattleScreenFadeAmt);
set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt);
}
}

26
src/16c8e0.c
View File

@ -416,46 +416,46 @@ void btl_update(void) {
u8 paramType;
f32 paramAmount;
get_screen_overlay_params(1, &paramType, &paramAmount);
get_screen_overlay_params(SCREEN_LAYER_BACK, &paramType, &paramAmount);
if (battleStatus->darknessMode > BTL_DARKNESS_STATE_NONE) {
set_screen_overlay_color(1, 0, 0, 0);
set_screen_overlay_color(SCREEN_LAYER_BACK, 0, 0, 0);
if (partner == NULL) {
set_screen_overlay_params_back(0, 215.0f);
set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, 215.0f);
} else if (playerData->currentPartner == PARTNER_WATT) {
paramAmount -= 10.0f;
if (paramAmount < 0.0f) {
paramAmount = 0.0f;
}
set_screen_overlay_params_back(0, paramAmount);
set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, paramAmount);
} else {
paramAmount += 10.0f;
if (paramAmount > 215.0f) {
paramAmount = 215.0f;
}
set_screen_overlay_params_back(0, paramAmount);
set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, paramAmount);
}
} else if (battleStatus->darknessMode < BTL_DARKNESS_STATE_NONE) {
paramAmount -= 10.0f;
if (paramAmount < 0.0f) {
paramAmount = 0.0f;
set_screen_overlay_params_back(255, -1.0f);
set_screen_overlay_params_back(OVERLAY_NONE, -1.0f);
battleStatus->darknessMode = BTL_DARKNESS_STATE_NONE;
} else {
set_screen_overlay_params_back(0, paramAmount);
set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, paramAmount);
}
}
if (cond || D_802809F6 != -1) {
if (D_802809F6 == -1) {
if (gGameStatusPtr->demoState == 2) {
if (gGameStatusPtr->demoState == DEMO_STATE_CHANGE_MAP) {
u8 paramType;
f32 paramAmount;
get_screen_overlay_params(0, &paramType, &paramAmount);
if (paramType == 255) {
get_screen_overlay_params(SCREEN_LAYER_FRONT, &paramType, &paramAmount);
if (paramType == (u8) OVERLAY_NONE) {
D_802809F6 = 0;
set_screen_overlay_params_front(0, 0.0f);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 0.0f);
}
}
} else if (D_802809F6 == 255) {
@ -468,8 +468,8 @@ void btl_update(void) {
D_802809F6 = 255;
}
set_screen_overlay_params_front(0, D_802809F6);
set_screen_overlay_color(0, 208, 208, 208);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_802809F6);
set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208);
intro_logos_set_fade_alpha(255);
intro_logos_set_fade_color(224);
}

1091
src/17D6A0.c
View File

File diff suppressed because it is too large Load Diff

20
src/17FEB0.c
View File

@ -125,7 +125,7 @@ HitResult calc_item_damage_enemy(void) {
if (target->stoneStatus == STATUS_STONE) {
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1);
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0);
if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) {
return HIT_RESULT_1;
@ -195,7 +195,7 @@ HitResult calc_item_damage_enemy(void) {
if (targetPart->flags & ACTOR_PART_FLAG_2000) {
dispatch_event_actor(target, dispatchEvent);
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
return HIT_RESULT_NO_DAMAGE;
}
@ -435,7 +435,7 @@ HitResult calc_item_damage_enemy(void) {
if (!(target->flags & ACTOR_FLAG_NO_DMG_POPUP)) {
if (battleStatus->lastAttackDamage == 0) {
if (!sp1C && !wasStatusInflicted) {
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
}
} else if (!partImmuneToElement) {
if (battleStatus->currentAttackElement & (DAMAGE_TYPE_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS)) {
@ -467,42 +467,42 @@ HitResult calc_item_damage_enemy(void) {
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP) && wasStatusInflicted) {
script = start_script(&DoSleepHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlaySleepHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY) && wasStatusInflicted) {
script = start_script(&DoDizzyHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayDizzyHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE) && wasStatusInflicted) {
script = start_script(&DoParalyzeHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayParalyzeHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_POISON) && wasStatusInflicted) {
script = start_script(&DoPoisonHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayPoisonHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_STOP) && wasStatusInflicted) {
script = start_script(&DoStopHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayStopHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN) && wasStatusInflicted) {
script = start_script(&DoFreezeHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayFreezeHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
@ -510,7 +510,7 @@ HitResult calc_item_damage_enemy(void) {
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && wasStatusInflicted) {
script = start_script(&DoShrinkHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayShrinkHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;

2
src/181810.c
View File

@ -372,7 +372,7 @@ ApiStatus func_802537C0(Evt* script, s32 isInitialCall) {
s32 t3;
// While loop may not be necessary in the future
do { get_screen_overlay_params(1, &t1, &t2); } while (0);
do { get_screen_overlay_params(SCREEN_LAYER_BACK, &t1, &t2); } while (0);
if (t2 < 128.0f) {
t3 = 0;

10
src/18C790.c
View File

@ -517,7 +517,7 @@ void btl_state_update_celebration(void) {
}
CelebrateStateTime = 0;
btl_cam_use_preset(BTL_CAM_PRESET_23);
btl_cam_use_preset(BTL_CAM_VICTORY);
EndBattleRewardStep = 0;
CelebrateSubstateTime = 1;
gBattleSubState = BTL_SUBSTATE_CELEBRATE_LOAD_STAR_POINTS;
@ -611,7 +611,7 @@ void btl_state_update_celebration(void) {
case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_LOAD:
if (CelebrateStateTime >= 99) {
playerData->level++;
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(5);
dma_copy(level_up_ROM_START, level_up_ROM_END, level_up_VRAM);
sfx_play_sound(SOUND_80000008);
@ -1410,14 +1410,14 @@ void btl_state_draw_celebration(void) {
}
}
set_screen_overlay_params_front(0, bFadeToBlackAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, bFadeToBlackAmt);
break;
case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_DESTROY_HUD:
set_screen_overlay_params_front(0, bFadeToBlackAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, bFadeToBlackAmt);
break;
case BTL_SUBSTATE_CELEBRATE_WALK_AWAY:
if (bFadeToBlackAmt != 0) {
set_screen_overlay_params_front(0, bFadeToBlackAmt);
set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, bFadeToBlackAmt);
}
break;
}

92
src/18F340.c
View File

@ -13,7 +13,7 @@ extern HudScript HES_HPDrain;
extern EvtScript EVS_PlayerCelebrate;
extern EvtScript D_802988F0;
extern EvtScript D_80298724;
extern EvtScript EVS_OnPlayerHit;
extern EvtScript D_80298948;
extern PlayerCelebrationAnimOptions D_80280FC0;
@ -22,7 +22,7 @@ BSS s32 D_8029FB90;
BSS f32 D_8029FB94;
BSS EffectInstance* BattleMerleeOrbEffect;
BSS EffectInstance* BattleMerleeWaveEffect;
BSS s32 D_8029FBA0;
BSS s32 RefundHudElem;
BSS s16 D_8029FBA4;
BSS s32 D_8029FBA8;
BSS s32 D_8029FBAC;
@ -30,7 +30,7 @@ BSS s32 D_8029FBB0[3];
API_CALLABLE(func_802749F8);
void func_80260A60(void) {
void btl_set_player_idle_anims(void) {
BattleStatus* battleStatus = &gBattleStatus;
ActorPart* actorPart = &battleStatus->playerActor->partsTable[0];
@ -156,7 +156,7 @@ API_CALLABLE(func_80260DD8) {
}
API_CALLABLE(func_80260E38) {
btl_show_battle_message(BTL_MSG_31, 60);
btl_show_battle_message(BTL_MSG_ACTION_TIP_03, 60);
return ApiStatus_DONE2;
}
@ -167,12 +167,13 @@ API_CALLABLE(func_80260E5C) {
return ApiStatus_DONE2;
}
// out LVar0: time caller should wait for coin spawns
API_CALLABLE(GiveRefund) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* player = battleStatus->playerActor;
s32 sellValue = gItemTable[battleStatus->moveArgument].sellValue;
f32 facingAngleSign = 0.0f;
s32 sleepTime = 0;
s32 delayTime = 0;
f32 posX, posY, posZ;
posY = player->currentPos.y + player->size.y;
@ -180,6 +181,7 @@ API_CALLABLE(GiveRefund) {
s32 i;
s32 iconPosX, iconPosY, iconPosZ;
// 75% of the item's sell value, rounded up
sellValue = (sellValue * 75 + 99) / 100;
for (i = 0; i < sellValue; i++) {
@ -191,17 +193,17 @@ API_CALLABLE(GiveRefund) {
facingAngleSign += 30.0f;
}
sleepTime = (i * 3) + 30;
delayTime = (i * 3) + 30;
posX = player->currentPos.x;
posY = player->currentPos.y;
posZ = player->currentPos.z;
get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ);
D_8029FBA0 = hud_element_create(&HES_Refund);
hud_element_set_render_pos(D_8029FBA0, iconPosX + 36, iconPosY - 63);
RefundHudElem = hud_element_create(&HES_Refund);
hud_element_set_render_pos(RefundHudElem, iconPosX + 36, iconPosY - 63);
}
script->varTable[0] = sleepTime;
script->varTable[0] = delayTime;
return ApiStatus_DONE2;
}
@ -210,7 +212,7 @@ API_CALLABLE(GiveRefundCleanup) {
s32 sellValue = gItemTable[gBattleStatus.moveArgument].sellValue;
if (player_team_is_ability_active(gBattleStatus.playerActor, ABILITY_REFUND) && sellValue > 0) {
hud_element_free(D_8029FBA0);
hud_element_free(RefundHudElem);
}
return ApiStatus_DONE2;
@ -658,7 +660,7 @@ EvtScript EVS_Peach_OnActorCreate = {
};
EvtScript EVS_MarioEnterStage = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_22)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ENTRY)
EVT_CALL(SetBattleCamTarget, -80, 35, 8)
EVT_CALL(BattleCamTargetActor, ACTOR_PLAYER)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -701,7 +703,7 @@ EvtScript EVS_MarioEnterStage = {
EvtScript EVS_PeachEnterStage = {
EVT_CALL(func_8026BF48, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_22)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ENTRY)
EVT_CALL(SetBattleCamTarget, -80, 35, 8)
EVT_CALL(BattleCamTargetActor, ACTOR_PLAYER)
EVT_CHILD_THREAD
@ -843,7 +845,7 @@ EvtScript EVS_Player_HandleEvent = {
EVT_CASE_OR_EQ(EVENT_SPIKE_CONTACT)
EVT_CASE_OR_EQ(EVENT_SPIKE_DEATH)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HIT_SPIKE)
EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 60)
EVT_ADD(LVar1, 40)
@ -854,7 +856,7 @@ EvtScript EVS_Player_HandleEvent = {
EVT_SET_CONST(LVar1, ANIM_Mario1_HurtFoot)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802988F0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
@ -875,7 +877,7 @@ EvtScript EVS_Player_HandleEvent = {
EVT_CASE_OR_EQ(EVENT_BURN_CONTACT)
EVT_CASE_OR_EQ(EVENT_BURN_DEATH)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_31)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HIT_HAZARD)
EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 60)
EVT_ADD(LVar1, 40)
@ -888,18 +890,18 @@ EvtScript EVS_Player_HandleEvent = {
EVT_ADD(LVar5, 5)
EVT_ADD(LVar6, 4)
EVT_ADD(LVar7, 5)
EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15)
EVT_WAIT(2)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar5, LVar6, LVar7)
EVT_ADD(LVar5, -5)
EVT_ADD(LVar6, 18)
EVT_ADD(LVar7, 5)
EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15)
EVT_END_CHILD_THREAD
EVT_SET_CONST(LVar1, ANIM_MarioB3_BurnHurt)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802988F0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
@ -920,7 +922,7 @@ EvtScript EVS_Player_HandleEvent = {
EVT_CASE_OR_EQ(EVENT_SHOCK_HIT)
EVT_CASE_OR_EQ(EVENT_SHOCK_DEATH)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_31)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HIT_HAZARD)
EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 60)
EVT_ADD(LVar1, 40)
@ -928,11 +930,11 @@ EvtScript EVS_Player_HandleEvent = {
EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot)
EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(func_80273444, 5, 0, 1)
EVT_CALL(ShowShockEffect, -127)
EVT_CALL(ShowShockEffect, ACTOR_SELF)
EVT_SET_CONST(LVar1, ANIM_Mario1_HurtFoot)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802988F0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
@ -989,7 +991,7 @@ EvtScript EVS_Player_HandleEvent = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar1, ANIM_Mario1_Hurt)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_80298724)
EVT_EXEC_WAIT(EVS_OnPlayerHit)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
@ -1108,7 +1110,7 @@ EvtScript EVS_RunAwayNoCommand = {
EVT_CHILD_THREAD
EVT_LOOP(2)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0))
EVT_WAIT(5)
EVT_END_LOOP
EVT_END_CHILD_THREAD
@ -1133,12 +1135,12 @@ EvtScript EVS_RunAwayNoCommand = {
EVT_SUB(LVar0, 8)
EVT_ADD(LVar1, 14)
EVT_ADD(LVar2, 5)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_WAIT(5)
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
@ -1222,7 +1224,7 @@ EvtScript EVS_RunAwayStart = {
EVT_CHILD_THREAD
EVT_LOOP(2)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0))
EVT_WAIT(5)
EVT_END_LOOP
EVT_END_CHILD_THREAD
@ -1247,12 +1249,12 @@ EvtScript EVS_RunAwayStart = {
EVT_SUB(LVar0, 8)
EVT_ADD(LVar1, 14)
EVT_ADD(LVar2, 5)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_WAIT(5)
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
@ -1314,7 +1316,7 @@ EvtScript EVS_PlayerDies = {
EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar2, 20)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_WAIT(15)
EVT_RETURN
EVT_END
@ -1335,7 +1337,7 @@ EvtScript D_80287404 = {
EVT_SET(LVar3, LVar1)
EVT_ADD(LVar3, 10)
EVT_ADD(LVar3, 2)
EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30)
EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0)
EVT_SET(LVarA, LVar0)
EVT_CALL(GiveRefund)
@ -1352,7 +1354,7 @@ EvtScript D_80287404 = {
EVT_SET(LVar3, LVar1)
EVT_ADD(LVar3, 10)
EVT_ADD(LVar3, 2)
EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30)
EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0)
EVT_SET(LVarA, LVar0)
EVT_WAIT(15)
@ -1468,7 +1470,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_372)
EVT_ADD(LVar4, 15)
EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 3, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 3, LVar3, LVar4, LVar5, EVT_FLOAT(1.0))
EVT_SET(LVar0, LVarF)
EVT_LOOP(4)
EVT_CALL(SetItemFlags, LVarA, 64, 1)
@ -1479,13 +1481,13 @@ EvtScript EVS_UseLifeShroom = {
EVT_CALL(RemoveEffect, LVar0)
EVT_CALL(RemoveItemEntity, LVarA)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2055)
EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_373)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 50, 20, 32, 30, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 50, 20, 32, 30)
EVT_WAIT(40)
EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 30, 50, 32, 30, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 30, 50, 32, 30)
EVT_CHILD_THREAD
EVT_LOOP(3)
EVT_CALL(SetActorDispOffset, ACTOR_PLAYER, 1, 0, 0)
@ -1516,9 +1518,9 @@ EvtScript EVS_UseLifeShroom = {
EVT_CALL(ConsumeLifeShroom)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 25)
EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3)
EVT_CALL(FreezeBattleCam, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CHILD_THREAD
EVT_CALL(func_80261388)
@ -1541,7 +1543,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_LOOP(5)
EVT_WAIT(2)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 2, LVar0, LVar1, LVar2, 20, 20, EVT_FLOAT(1.0), 10, 50, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 2, LVar0, LVar1, LVar2, 20, 20, EVT_FLOAT(1.0), 10, 50)
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160)
@ -1568,7 +1570,7 @@ EvtScript EVS_MerleeRunOut = {
EVT_RETURN
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(ShowMessageBox, BTL_MSG_03, 60)
EVT_CALL(ShowMessageBox, BTL_MSG_MERLEE_DONE, 60)
EVT_CALL(WaitForMessageBoxDone)
EVT_RETURN
EVT_END
@ -1595,7 +1597,7 @@ EvtScript EVS_MerleeAttackBonus = {
EVT_WAIT(30)
EVT_CALL(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release)
EVT_CALL(func_802619B4)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 4)
EVT_CALL(BattleMerleeFadeStageFromBlack)
EVT_WAIT(20)
@ -1644,7 +1646,7 @@ EvtScript EVS_MerleeDefenseBonus = {
EVT_WAIT(30)
EVT_CALL(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release)
EVT_CALL(func_802619B4)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 4)
EVT_CALL(BattleMerleeFadeStageFromBlack)
EVT_WAIT(20)
@ -1698,7 +1700,7 @@ EvtScript EVS_MerleeExpBonus = {
EVT_WAIT(30)
EVT_CALL(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release)
EVT_CALL(func_802619B4)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 4)
EVT_CALL(BattleMerleeFadeStageFromBlack)
EVT_WAIT(20)
@ -1728,7 +1730,7 @@ EvtScript EVS_MerleeExpBonus = {
EvtScript EVS_PlayerHappy = {
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
EVT_CALL(UseBattleCamPresetWait, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPresetWait, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(func_802619E8, LVar0, LVar1, LVar2)
@ -1795,7 +1797,7 @@ EvtScript EVS_ApplyDizzyAttack = {
EvtScript EVS_PlayerRegainAbility = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVarF, LVar1, LVar2)
EVT_LOOP(LVar0)
EVT_ADD(LVarF, 3)
@ -1837,7 +1839,7 @@ EvtScript EVS_PlayerRegainAbility = {
EVT_CALL(func_80261FB4)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 0, LVar0, LVar1, LVar2, 30, 30, 10, 30, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 0, LVar0, LVar1, LVar2, 30, 30, 10, 30)
EVT_CALL(RemoveItemEntity, LVarA)
EVT_CALL(func_8026BF48, 0)
EVT_RETURN

4
src/190B20.c
View File

@ -244,7 +244,7 @@ void create_target_list(Actor* actor, s32 arg1) {
goto END2;
}
if (!(gBattleStatus.flags2 & BS_FLAGS2_4000) && battleStatus->darknessMode > 0) {
get_screen_overlay_params(1, &overlayType, &overlayZoom);
get_screen_overlay_params(SCREEN_LAYER_BACK, &overlayType, &overlayZoom);
if (overlayZoom >= 215.0f) {
skip = TRUE;
sp18 = 1;
@ -2930,7 +2930,7 @@ void btl_appendGfx_prim_quad(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 righ
if (a == 255) {
gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1);
gDPSetCombineMode(gMainGfxPos++, PM_CC_08, PM_CC_08);
} else {
gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);

106
src/19FAF0.c
View File

@ -5,58 +5,58 @@
s32 dispatch_damage_event_player(s32 damageAmount, s32 event, s32 arg2);
ApiStatus func_80271210(Evt* script, s32 isInitialCall) {
ApiStatus PlaySleepHitFX(Evt* script, s32 isInitialCall) {
fx_debuff(0, script->varTable[0], script->varTable[1], script->varTable[2]);
return ApiStatus_DONE2;
}
ApiStatus func_80271258(Evt* script, s32 isInitialCall) {
ApiStatus PlayDizzyHitFX(Evt* script, s32 isInitialCall) {
fx_debuff(1, script->varTable[0], script->varTable[1], script->varTable[2]);
return ApiStatus_DONE2;
}
ApiStatus func_802712A0(Evt* script, s32 isInitialCall) {
ApiStatus PlayParalyzeHitFX(Evt* script, s32 isInitialCall) {
EffectInstance* debuffEffect = fx_debuff(2, script->varTable[0], script->varTable[1], script->varTable[2]);
debuffEffect->data.debuff->unk_38 = 200;
debuffEffect->data.debuff->unk_39 = 120;
debuffEffect->data.debuff->unk_3A = 0;
debuffEffect->data.debuff->unk_3B = 234;
debuffEffect->data.debuff->unk_3C = 193;
debuffEffect->data.debuff->unk_3D = 0;
debuffEffect->data.debuff->primCol.r = 200;
debuffEffect->data.debuff->primCol.g = 120;
debuffEffect->data.debuff->primCol.b = 0;
debuffEffect->data.debuff->envCol.r = 234;
debuffEffect->data.debuff->envCol.g = 193;
debuffEffect->data.debuff->envCol.b = 0;
return ApiStatus_DONE2;
}
ApiStatus func_80271328(Evt* script, s32 isInitialCall) {
ApiStatus PlayPoisonHitFX(Evt* script, s32 isInitialCall) {
EffectInstance* debuffEffect = fx_debuff(2, script->varTable[0], script->varTable[1], script->varTable[2]);
debuffEffect->data.debuff->unk_38 = 60;
debuffEffect->data.debuff->unk_39 = 160;
debuffEffect->data.debuff->unk_3A = 0;
debuffEffect->data.debuff->unk_3B = 90;
debuffEffect->data.debuff->unk_3C = 240;
debuffEffect->data.debuff->unk_3D = 0;
debuffEffect->data.debuff->primCol.r = 60;
debuffEffect->data.debuff->primCol.g = 160;
debuffEffect->data.debuff->primCol.b = 0;
debuffEffect->data.debuff->envCol.r = 90;
debuffEffect->data.debuff->envCol.g = 240;
debuffEffect->data.debuff->envCol.b = 0;
return ApiStatus_DONE2;
}
ApiStatus func_802713B0(Evt* script, s32 isInitialCall) {
ApiStatus PlayStopHitFX(Evt* script, s32 isInitialCall) {
EffectInstance* debuffEffect = fx_debuff(2, script->varTable[0], script->varTable[1], script->varTable[2]);
debuffEffect->data.debuff->unk_38 = 205;
debuffEffect->data.debuff->unk_39 = 0;
debuffEffect->data.debuff->unk_3A = 40;
debuffEffect->data.debuff->unk_3B = 205;
debuffEffect->data.debuff->unk_3C = 32;
debuffEffect->data.debuff->unk_3D = 242;
debuffEffect->data.debuff->primCol.r = 205;
debuffEffect->data.debuff->primCol.g = 0;
debuffEffect->data.debuff->primCol.b = 40;
debuffEffect->data.debuff->envCol.r = 205;
debuffEffect->data.debuff->envCol.g = 32;
debuffEffect->data.debuff->envCol.b = 242;
return ApiStatus_DONE2;
}
ApiStatus func_8027143C(Evt* script, s32 isInitialCall) {
ApiStatus PlayFreezeHitSnowflakeFX(Evt* script, s32 isInitialCall) {
fx_big_snowflakes(0, script->varTable[0], script->varTable[1], script->varTable[2]);
return ApiStatus_DONE2;
}
ApiStatus func_80271484(Evt* script, s32 isInitialCall) {
ApiStatus PlayFreezeHitParticleFX(Evt* script, s32 isInitialCall) {
Actor* actor = (Actor*)script->varTable[3];
f32 temp1 = actor->size.y;
f32 temp2 = actor->size.x / 2;
@ -66,7 +66,7 @@ ApiStatus func_80271484(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_80271588(Evt* script, s32 isInitialCall) {
ApiStatus PlayShrinkHitFX(Evt* script, s32 isInitialCall) {
s32 i;
for (i = 0; i < 20; i++) {
@ -80,48 +80,48 @@ ApiStatus func_80271588(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
EvtScript DoSleepHit = {
EVT_CALL(func_80271210)
EvtScript EVS_PlaySleepHitFX = {
EVT_CALL(PlaySleepHitFX)
EVT_RETURN
EVT_END
};
EvtScript DoDizzyHit = {
EVT_CALL(func_80271258)
EvtScript EVS_PlayDizzyHitFX = {
EVT_CALL(PlayDizzyHitFX)
EVT_RETURN
EVT_END
};
EvtScript DoParalyzeHit = {
EVT_CALL(func_802712A0)
EvtScript EVS_PlayParalyzeHitFX = {
EVT_CALL(PlayParalyzeHitFX)
EVT_RETURN
EVT_END
};
EvtScript DoPoisonHit = {
EVT_CALL(func_80271328)
EvtScript EVS_PlayPoisonHitFX = {
EVT_CALL(PlayPoisonHitFX)
EVT_RETURN
EVT_END
};
EvtScript DoStopHit = {
EVT_CALL(func_802713B0)
EvtScript EVS_PlayStopHitFX = {
EVT_CALL(PlayStopHitFX)
EVT_RETURN
EVT_END
};
EvtScript DoFreezeHit = {
EVT_CALL(func_8027143C)
EvtScript EVS_PlayFreezeHitFX = {
EVT_CALL(PlayFreezeHitSnowflakeFX)
EVT_WAIT(8)
EVT_CALL(func_8027143C)
EVT_CALL(PlayFreezeHitSnowflakeFX)
EVT_WAIT(15)
EVT_CALL(func_80271484)
EVT_CALL(PlayFreezeHitParticleFX)
EVT_RETURN
EVT_END
};
EvtScript DoShrinkHit = {
EVT_CALL(func_80271588)
EvtScript EVS_PlayShrinkHitFX = {
EVT_CALL(PlayShrinkHitFX)
EVT_RETURN
EVT_END
};
@ -310,7 +310,7 @@ HitResult calc_player_damage_enemy(void) {
if (target->stoneStatus == STATUS_STONE) {
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1);
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0);
if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) {
return HIT_RESULT_1;
@ -645,7 +645,7 @@ HitResult calc_player_damage_enemy(void) {
dispatchEvent = (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) ? EVENT_ZERO_DAMAGE : EVENT_IMMUNE;
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_event_actor(target, dispatchEvent);
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) {
return HIT_RESULT_1;
}
@ -872,7 +872,7 @@ HitResult calc_player_damage_enemy(void) {
if (battleStatus->lastAttackDamage == 0) {
if (!tempBinary) {
if (!wasStatusInflicted) {
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
}
}
} else if (!partImmuneToElement) {
@ -932,7 +932,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP && wasStatusInflicted) {
evt = start_script(&DoSleepHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlaySleepHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -940,7 +940,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY && wasStatusInflicted) {
evt = start_script(&DoDizzyHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlayDizzyHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -948,7 +948,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE && wasStatusInflicted) {
evt = start_script(&DoParalyzeHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlayParalyzeHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -956,7 +956,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_POISON && wasStatusInflicted) {
evt = start_script(&DoPoisonHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlayPoisonHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -964,7 +964,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_STOP && wasStatusInflicted) {
evt = start_script(&DoStopHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlayStopHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -972,7 +972,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN && wasStatusInflicted) {
evt = start_script(&DoFreezeHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlayFreezeHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -981,7 +981,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK && wasStatusInflicted) {
evt = start_script(&DoShrinkHit, EVT_PRIORITY_A, 0);
evt = start_script(&EVS_PlayShrinkHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -1094,7 +1094,7 @@ s32 dispatch_damage_event_player_0(s32 damageAmount, s32 event) {
BattleStatus* battleStatus = &gBattleStatus;
battleStatus->currentAttackElement = ELEMENT_END;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
return dispatch_damage_event_player(damageAmount, event, FALSE);
}

22
src/1A5830.c
View File

@ -297,7 +297,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
}
if (target->stoneStatus == STATUS_STONE) {
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, -1);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, -1);
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0);
play_hit_sound(attacker, state->goalPos.x, state->goalPos.y, state->goalPos.z, 0);
dispatch_event_general(target, EVENT_IMMUNE);
@ -686,7 +686,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
if (battleStatus->lastAttackDamage == 0) {
if (!statusInflicted2 && !statusInflicted) {
// immune star fx?
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, -3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, -3);
}
} else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) {
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 1);
@ -700,7 +700,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
case ACTOR_CLASS_ENEMY:
if (battleStatus->lastAttackDamage == 0) {
if (!statusInflicted2 && !statusInflicted) {
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
}
} else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) {
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0);
@ -738,42 +738,42 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP) && statusInflicted) {
script = start_script(&DoSleepHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlaySleepHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY) && statusInflicted) {
script = start_script(&DoDizzyHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayDizzyHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE) && statusInflicted) {
script = start_script(&DoParalyzeHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayParalyzeHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_POISON) && statusInflicted) {
script = start_script(&DoPoisonHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayPoisonHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_STOP) && statusInflicted) {
script = start_script(&DoStopHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayStopHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN) && statusInflicted) {
script = start_script(&DoFreezeHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayFreezeHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
@ -781,7 +781,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && statusInflicted) {
script = start_script(&DoShrinkHit, EVT_PRIORITY_A, 0);
script = start_script(&EVS_PlayShrinkHitFX, EVT_PRIORITY_A, 0);
script->varTable[0] = state->goalPos.x;
script->varTable[1] = state->goalPos.y;
script->varTable[2] = state->goalPos.z;
@ -838,7 +838,7 @@ s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEven
battleStatus->lastAttackDamage += hpChange;
actor->lastDamageTaken = battleStatus->lastAttackDamage;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
if (battleStatus->flags1 & BS_FLAGS1_SP_EVT_ACTIVE) {
if (dispatchEvent == EVENT_HIT_COMBO) {
dispatchEvent = EVENT_HIT;

22
src/1AC760.c
View File

@ -213,7 +213,7 @@ HitResult calc_partner_damage_enemy(void) {
if (target->stoneStatus == STATUS_STONE) {
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1);
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0);
if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) {
return HIT_RESULT_1;
@ -481,7 +481,7 @@ HitResult calc_partner_damage_enemy(void) {
dispatchEvent = (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) ? EVENT_ZERO_DAMAGE : EVENT_IMMUNE;
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_event_actor(target, dispatchEvent);
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) {
return HIT_RESULT_1;
}
@ -741,7 +741,7 @@ HitResult calc_partner_damage_enemy(void) {
if (!(target->flags & ACTOR_FLAG_NO_DMG_POPUP)) {
if (battleStatus->lastAttackDamage == 0) {
if (!tempBinary && !wasStatusInflicted) {
func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
}
} else if (!partImmuneToElement) {
if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) {
@ -805,7 +805,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP && wasStatusInflicted) {
evt = start_script((EvtScript*) DoSleepHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlaySleepHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -813,7 +813,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY && wasStatusInflicted) {
evt = start_script((EvtScript*) DoDizzyHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlayDizzyHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -821,7 +821,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE && wasStatusInflicted) {
evt = start_script((EvtScript*) DoParalyzeHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlayParalyzeHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -829,7 +829,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_POISON && wasStatusInflicted) {
evt = start_script((EvtScript*) DoPoisonHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlayPoisonHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -837,7 +837,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_STOP && wasStatusInflicted) {
evt = start_script((EvtScript*) DoStopHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlayStopHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -845,7 +845,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN && wasStatusInflicted) {
evt = start_script((EvtScript*) DoFreezeHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlayFreezeHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -854,7 +854,7 @@ HitResult calc_partner_damage_enemy(void) {
}
if (battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK && wasStatusInflicted) {
evt = start_script((EvtScript*) DoShrinkHit, EVT_PRIORITY_A, 0);
evt = start_script((EvtScript*) EVS_PlayShrinkHitFX, EVT_PRIORITY_A, 0);
evt->varTable[0] = state->goalPos.x;
evt->varTable[1] = state->goalPos.y;
evt->varTable[2] = state->goalPos.z;
@ -917,7 +917,7 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) {
battleStatus->lastAttackDamage += hpChange;
partner->lastDamageTaken = battleStatus->lastAttackDamage;
battleStatus->unk_19A = 0;
battleStatus->currentDamageSource = DMG_SRC_DEFAULT;
if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) {
if (event == EVENT_HIT_COMBO) {
event = EVENT_HIT;

355
src/1AF120.c
View File

@ -3,7 +3,7 @@
#include "battle/battle.h"
#include "script_api/battle.h"
extern EvtScript D_80299828;
extern EvtScript EVS_Help_NormalDamageReaction;
extern EvtScript D_8029B818;
ApiStatus GetDamageIntensity(Evt* script, s32 isInitialCall) {
@ -34,50 +34,50 @@ EvtScript D_80294720 = {
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE)
EVT_LOOP(2)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(AddActorPos, -127, 0, 6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 6, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 4, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 4, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 3, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 3, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 2, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 2, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 1, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 1, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -1, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -1, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -2, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -2, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -3, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -3, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -4, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -4, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -6, 0)
EVT_WAIT(1)
EVT_WAIT(1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(AddActorPos, -127, 0, 6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 6, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 4, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 4, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 3, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 3, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 2, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 2, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 1, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 1, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -1, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -1, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -2, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -2, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -3, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -3, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -4, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -4, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -6, 0)
EVT_WAIT(1)
EVT_WAIT(1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar3)
@ -124,7 +124,7 @@ EvtScript DoPartnerBurnContact = {
EVT_SET(LVar1, LVarA)
EVT_SET(LVar2, LVarC)
EVT_EXEC_WAIT(DoPartnerBurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CHILD_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, LVarB, 0)
EVT_SET(LVar0, 0)
@ -170,7 +170,7 @@ EvtScript DoPartnerSpikeContact = {
EVT_SET(LVar1, LVarA)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802977BC)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CHILD_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, LVarB, 0)
EVT_SET(LVar0, 0)
@ -217,7 +217,7 @@ EvtScript D_80295350 = {
EVT_SET(LVar1, LVarA)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802977BC)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CHILD_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, LVarB, 0)
EVT_SET(LVar0, 0)
@ -266,11 +266,11 @@ EvtScript D_80295744 = {
EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, LVarA, LVarA, LVarA)
EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_PARTNER, 5, FALSE, FALSE, FALSE)
EVT_CALL(ShowShockEffect, -127)
EVT_CALL(ShowShockEffect, ACTOR_SELF)
EVT_SET(LVar1, LVarA)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802977BC)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CHILD_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, LVarB, 0)
EVT_SET(LVar0, 0)
@ -314,11 +314,11 @@ EvtScript D_80295AC0 = {
EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, LVarA, LVarA, LVarA)
EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_PARTNER, 5, FALSE, FALSE, FALSE)
EVT_CALL(ShowShockEffect, -127)
EVT_CALL(ShowShockEffect, ACTOR_SELF)
EVT_SET(LVar1, LVarA)
EVT_SET(LVar2, 0)
EVT_EXEC_WAIT(D_802977BC)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CHILD_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, LVarB, 0)
EVT_SET(LVar0, 0)
@ -357,7 +357,7 @@ EvtScript DoPartnerRecover = {
EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.8))
EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar7, LVar8, LVar9)
EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LVar2)
EVT_IF_EQ(LVar6, 000000)
EVT_IF_EQ(LVar6, 0)
EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar7, LVar6, LVar9)
EVT_CALL(JumpToGoal, ACTOR_PARTNER, 15, FALSE, TRUE, FALSE)
EVT_ELSE
@ -378,7 +378,7 @@ EvtScript DoPartnerHit = {
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(10)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(func_8026F1A0, ACTOR_PARTNER, 1)
EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LVarA)
EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
@ -704,19 +704,19 @@ EvtScript D_802975C8 = {
};
EvtScript D_802976E8 = {
EVT_CALL(func_80269E80, LVar0)
EVT_CALL(GetDamageSource, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(DMG_SRC_DEFAULT)
EVT_EXEC_WAIT(D_80296C8C)
EVT_CASE_OR_EQ(24)
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
EVT_CASE_OR_EQ(DMG_SRC_CRUSH)
EVT_CASE_OR_EQ(DMG_SRC_TUBBA_SMASH)
EVT_CASE_OR_EQ(DMG_SRC_CRUSH_PARTNER)
EVT_EXEC_WAIT(D_802975C8)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_EXEC_WAIT(D_80296C8C)
EVT_END_SWITCH
EVT_IF_NE(LVar2, 000000)
EVT_IF_NE(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LVar2)
EVT_WAIT(8)
EVT_END_IF
@ -726,7 +726,7 @@ EvtScript D_802976E8 = {
EvtScript D_802977BC = {
EVT_EXEC_WAIT(D_80296C8C)
EVT_IF_NE(LVar2, 000000)
EVT_IF_NE(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LVar2)
EVT_WAIT(8)
EVT_END_IF
@ -734,38 +734,38 @@ EvtScript D_802977BC = {
EVT_END
};
EvtScript DoPartnerBlock = {
EvtScript EVS_DoPartnerBlock = {
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(AddActorPos, -127, -2, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, -2, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 2, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 2, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, -4, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, -4, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 4, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 4, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, -2, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, -2, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 2, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 2, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, -3, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, -3, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 3, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 3, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, -2, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, -2, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 2, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 2, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, -1, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, -1, 0, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 1, 0, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 1, 0, 0)
EVT_WAIT(1)
EVT_RETURN
EVT_END
};
EvtScript D_80297A38 = {
EvtScript EVS_Help_OnPlayerDefaultHit = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVar1)
EVT_CALL(GetDamageIntensity)
EVT_SWITCH(LVar0)
@ -900,7 +900,7 @@ EvtScript D_80297A38 = {
EVT_END
};
EvtScript D_80298374 = {
EvtScript EVS_Help_OnPlayerCrushed = {
EVT_CALL(StartRumble, 6)
EVT_SETF(LVar0, EVT_FLOAT(1.0))
EVT_SETF(LVar1, EVT_FLOAT(1.0))
@ -922,7 +922,7 @@ EvtScript D_80298374 = {
EVT_END
};
EvtScript D_80298494 = {
EvtScript EVS_Help_OnPlayerNextSlapRight = {
EVT_CHILD_THREAD
EVT_SET(LVar0, 0)
EVT_LOOP(10)
@ -932,12 +932,12 @@ EvtScript D_80298494 = {
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80297A38)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_RETURN
EVT_END
};
EvtScript D_80298520 = {
EvtScript EVS_Help_OnPlayerNextSlapLeft = {
EVT_CHILD_THREAD
EVT_SET(LVar0, 0)
EVT_LOOP(10)
@ -947,12 +947,12 @@ EvtScript D_80298520 = {
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80297A38)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_RETURN
EVT_END
};
EvtScript D_802985AC = {
EvtScript EVS_Help_OnPlayerLastSlapRight = {
EVT_CHILD_THREAD
EVT_CALL(MakeLerp, 0, 2160, 60, 10)
EVT_LABEL(1)
@ -964,13 +964,13 @@ EvtScript D_802985AC = {
EVT_END_IF
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80297A38)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_WAIT(40)
EVT_RETURN
EVT_END
};
EvtScript D_80298668 = {
EvtScript EVS_Help_OnPlayerLastSlapLeft = {
EVT_CHILD_THREAD
EVT_CALL(MakeLerp, 2160, 0, 60, 10)
EVT_LABEL(1)
@ -982,42 +982,42 @@ EvtScript D_80298668 = {
EVT_END_IF
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80297A38)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_WAIT(40)
EVT_RETURN
EVT_END
};
EvtScript D_80298724 = {
EvtScript EVS_OnPlayerHit = {
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(func_80269E80, LVar0)
EVT_CALL(GetDamageSource, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(1)
EVT_CASE_EQ(DMG_SRC_BABY_BLOOPER_SELF)
EVT_WAIT(1000)
EVT_RETURN
EVT_CASE_EQ(0)
EVT_EXEC_WAIT(D_80297A38)
EVT_CASE_OR_EQ(24)
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
EVT_EXEC_WAIT(D_80298374)
EVT_CASE_EQ(DMG_SRC_DEFAULT)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_CASE_OR_EQ(DMG_SRC_CRUSH)
EVT_CASE_OR_EQ(DMG_SRC_TUBBA_SMASH)
EVT_CASE_OR_EQ(DMG_SRC_CRUSH_PARTNER)
EVT_EXEC_WAIT(EVS_Help_OnPlayerCrushed)
EVT_END_CASE_GROUP
EVT_CASE_EQ(11)
EVT_EXEC_WAIT(D_80298494)
EVT_CASE_EQ(10)
EVT_EXEC_WAIT(D_80298520)
EVT_CASE_EQ(13)
EVT_EXEC_WAIT(D_802985AC)
EVT_CASE_EQ(12)
EVT_EXEC_WAIT(D_80298668)
EVT_CASE_EQ(26)
EVT_SET(LVar1, 327683)
EVT_SET(LVar2, 65583)
EVT_EXEC_WAIT(D_80297A38)
EVT_CASE_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_EXEC_WAIT(EVS_Help_OnPlayerNextSlapRight)
EVT_CASE_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_EXEC_WAIT(EVS_Help_OnPlayerNextSlapLeft)
EVT_CASE_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_EXEC_WAIT(EVS_Help_OnPlayerLastSlapRight)
EVT_CASE_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_EXEC_WAIT(EVS_Help_OnPlayerLastSlapLeft)
EVT_CASE_EQ(DMG_SRC_INK_BLAST)
EVT_SET(LVar1, ANIM_MarioB3_BurnHurt)
EVT_SET(LVar2, ANIM_Mario1_Burnt)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVar2)
EVT_WAIT(15)
EVT_CASE_DEFAULT
EVT_EXEC_WAIT(D_80297A38)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_END_SWITCH
EVT_IF_NE(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVar2)
@ -1028,7 +1028,7 @@ EvtScript D_80298724 = {
};
EvtScript D_802988F0 = {
EVT_EXEC_WAIT(D_80297A38)
EVT_EXEC_WAIT(EVS_Help_OnPlayerDefaultHit)
EVT_IF_NE(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVar2)
EVT_WAIT(8)
@ -1068,16 +1068,16 @@ EvtScript D_80298948 = {
EVT_WAIT(1)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(1)
EVT_CALL(func_80269E80, LVar0)
EVT_CALL(GetDamageSource, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(5)
EVT_CASE_EQ(DMG_SRC_TUTORIAL_GOOMBARIO)
EVT_WAIT(15)
EVT_END_SWITCH
EVT_RETURN
EVT_END
};
EvtScript ForceNextTarget = {
EvtScript EVS_ForceNextTarget = {
EVT_CALL(GetOwnerID, LVarA)
EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
EVT_CALL(InitTargetIterator)
@ -1120,7 +1120,7 @@ EvtScript ForceNextTarget = {
EVT_END
};
EvtScript D_80298E20 = {
EvtScript EVS_Help_OnFanSmack = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2022)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4)
@ -1138,16 +1138,16 @@ EvtScript D_80298E20 = {
EVT_SUB(LVar1, LVar7)
EVT_END_IF
EVT_SUB(LVar1, 3)
EVT_CALL(PlayEffect, EFFECT_WHIRLWIND, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(func_80269E80, LVar0)
EVT_PLAY_EFFECT(EFFECT_WHIRLWIND, 0, LVar0, LVar1, LVar2, LVar3)
EVT_CALL(GetDamageSource, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_WAIT(10)
EVT_CALL(RemoveEffect, LVarF)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_WAIT(40)
EVT_CALL(func_802D7B10, LVarF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2023)
@ -1157,11 +1157,11 @@ EvtScript D_80298E20 = {
EVT_END
};
EvtScript DoNormalHit = {
EvtScript EVS_DoNormalHit = {
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(func_80269E80, LVar2)
EVT_CALL(GetDamageSource, LVar2)
EVT_SWITCH(LVar2)
EVT_CASE_EQ(7)
EVT_CASE_EQ(DMG_SRC_POWER_SHELL)
EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(ACTOR_TYPE_MONTY_MOLE)
@ -1205,10 +1205,10 @@ EvtScript DoNormalHit = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, FALSE, FALSE)
EVT_END_IF
EVT_END_SWITCH
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_IF_EQ(LVar2, 14)
EVT_EXEC(D_80298E20)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_IF_EQ(LVar2, DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_EXEC(EVS_Help_OnFanSmack)
EVT_END_IF
EVT_CHILD_THREAD
EVT_SET(LVar0, 0)
@ -1219,12 +1219,12 @@ EvtScript DoNormalHit = {
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80299828)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_IF_EQ(LVar2, 16)
EVT_EXEC(D_80298E20)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_IF_EQ(LVar2, DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_EXEC(EVS_Help_OnFanSmack)
EVT_END_IF
EVT_CHILD_THREAD
EVT_CALL(MakeLerp, 0, 2160, 60, 10)
@ -1237,13 +1237,13 @@ EvtScript DoNormalHit = {
EVT_END_IF
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80299828)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_WAIT(60)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_IF_EQ(LVar2, 15)
EVT_EXEC(D_80298E20)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_IF_EQ(LVar2, DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_EXEC(EVS_Help_OnFanSmack)
EVT_END_IF
EVT_CHILD_THREAD
EVT_SET(LVar0, 360)
@ -1254,12 +1254,12 @@ EvtScript DoNormalHit = {
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80299828)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_IF_EQ(LVar2, 17)
EVT_EXEC(D_80298E20)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_IF_EQ(LVar2, DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_EXEC(EVS_Help_OnFanSmack)
EVT_END_IF
EVT_CHILD_THREAD
EVT_CALL(MakeLerp, 2160, 0, 60, 10)
@ -1272,18 +1272,18 @@ EvtScript DoNormalHit = {
EVT_END_IF
EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80299828)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_WAIT(60)
EVT_END_CASE_GROUP
EVT_CASE_EQ(18)
EVT_CASE_EQ(DMG_SRC_SPOOK)
EVT_SET(LVar0, 3)
EVT_EXEC_WAIT(D_80299828)
EVT_CASE_EQ(2)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_CASE_EQ(DMG_SRC_SPIN_SMASH)
EVT_EXEC_GET_TID(D_8029B818, LVarE)
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80299828)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_LABEL(2)
EVT_CALL(GetActorRotation, -127, LVar0, LVar1, LVar2)
EVT_CALL(GetActorRotation, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_MOD(LVar1, 360)
EVT_IF_NE(LVar1, 0)
EVT_WAIT(1)
@ -1293,13 +1293,15 @@ EvtScript DoNormalHit = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CASE_DEFAULT
EVT_CALL(GetDamageIntensity)
EVT_EXEC_WAIT(D_80299828)
EVT_EXEC_WAIT(EVS_Help_NormalDamageReaction)
EVT_END_SWITCH
EVT_RETURN
EVT_END
};
EvtScript D_80299828 = {
// actor shakes in reaction to being hit
// in LVar0: damage intensity
EvtScript EVS_Help_NormalDamageReaction = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 1, 0)
@ -1427,12 +1429,12 @@ EvtScript D_80299828 = {
EvtScript DoBurnHit = {
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3)
EVT_IF_EQ(LVar3, EVENT_BURN_DEATH)
EVT_CALL(EnableActorGlow, -127, 0)
EVT_CALL(EnableActorGlow, ACTOR_SELF, 0)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(func_80269E80, LVar3)
EVT_CALL(GetDamageSource, LVar3)
EVT_SWITCH(LVar3)
EVT_CASE_EQ(9)
EVT_CASE_EQ(DMG_SRC_FIRE_SHELL)
EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar7)
EVT_SWITCH(LVar7)
EVT_CASE_OR_EQ(ACTOR_TYPE_MONTY_MOLE)
@ -1486,8 +1488,8 @@ EvtScript DoBurnHit = {
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar1)
EVT_SWITCH(LVar1)
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_CALL(GetPartEventFlags, -127, LVar0, LVar1)
EVT_IF_NOT_FLAG(LVar1, 0x00000202)
EVT_CALL(GetPartEventFlags, ACTOR_SELF, LVar0, LVar1)
EVT_IF_NOT_FLAG(LVar1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION | ACTOR_EVENT_FLAG_FIREY)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
@ -1511,7 +1513,7 @@ EvtScript DoBurnHit = {
EVT_SETF(LVar3, EVT_FLOAT(1.0))
EVT_END_IF
EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10)
EVT_END_IF
EVT_CASE_EQ(EVENT_BURN_DEATH)
EVT_END_SWITCH
@ -1535,49 +1537,49 @@ EvtScript D_8029A76C = {
EVT_SETF(LVar5, LVar3)
EVT_DIVF(LVar5, EVT_FLOAT(20.0))
EVT_ADDF(LVar1, LVar5)
EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(HPBarToCurrent, ACTOR_SELF)
EVT_CALL(func_8027D2D8, -127)
EVT_CALL(AddActorPos, -127, 0, 1, 0)
EVT_CALL(func_8027D2D8, ACTOR_SELF)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 1, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, 1, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 3, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 3, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, 3, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 12, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 12, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, 12, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -8, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -8, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -8, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 12, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 12, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, 12, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -4, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -4, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -4, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -4, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -4, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -4, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -6, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -6, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -6, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -6, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, 6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 6, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, 6, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -6, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -6, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -6, 0)
EVT_WAIT(1)
EVT_LOOP(6)
EVT_CALL(AddActorPos, -127, 0, 2, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, 2, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, 2, 0)
EVT_WAIT(1)
EVT_CALL(AddActorPos, -127, 0, -2, 0)
EVT_CALL(AddActorPos, ACTOR_SELF, 0, -2, 0)
EVT_CALL(AddEffectOffset, LVarF, 0, -2, 0)
EVT_WAIT(1)
EVT_END_LOOP
@ -1586,7 +1588,7 @@ EvtScript D_8029A76C = {
EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_IF_NE(LVar0, EVENT_SHOCK_DEATH)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_IF
EVT_RETURN
EVT_END
@ -1626,34 +1628,35 @@ EvtScript DoImmune = {
EVT_END
};
EvtScript DoDeath = {
EVT_EXEC_WAIT(D_8029AF08)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_EXEC_WAIT(ForceNextTarget)
EvtScript EVS_DoDeath = {
EVT_EXEC_WAIT(EVS_AnimateDeath)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(EVS_ForceNextTarget)
EVT_CALL(RemoveActor, ACTOR_SELF)
EVT_RETURN
EVT_END
};
EvtScript D_8029AF08 = {
// in LVar2: if set to -12345, the actor will not spin around
EvtScript EVS_AnimateDeath = {
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableActorGlow, -127, 0)
EVT_IF_NE(LVar1, -00001)
EVT_CALL(EnableActorGlow, ACTOR_SELF, 0)
EVT_IF_NE(LVar1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_WAIT(10)
EVT_END_IF
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LocalFlag(0), 0)
@ -1665,7 +1668,7 @@ EvtScript D_8029AF08 = {
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_IF_NE(LVar2, STATUS_FLAG_1 | 0x00000002 | 0x00000004 | 0x00000040 | 0x00000080 | 0x00000100 | 0x00000200 | 0x00000400 | 0x00000800 | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_POISON | STATUS_FLAG_DIZZY | STATUS_FLAG_SHRINK | STATUS_FLAG_STONE | STATUS_FLAG_STOP | 0x00400000 | 0x00800000 | STATUS_FLAG_KO | STATUS_FLAG_GLOWING | STATUS_FLAG_TRANSPARENT | STATUS_FLAG_ATTACK_BOOST | STATUS_FLAG_DEFENSE_BOOST | STATUS_FLAG_CHILL_OUT | STATUS_FLAG_RIGHT_ON | 0x80000000)
EVT_IF_NE(LVar2, -12345) // special signal value
EVT_SET(LVar2, 0)
EVT_LOOP(24)
EVT_CALL(SetActorYaw, ACTOR_SELF, LVar2)
@ -1678,9 +1681,9 @@ EvtScript D_8029AF08 = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(DropStarPoints, -127)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_SET(LVar3, 0)
EVT_LOOP(12)
@ -1694,7 +1697,7 @@ EvtScript D_8029AF08 = {
EvtScript DoScareAway = {
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar2)
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar9)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.05))
@ -1706,11 +1709,11 @@ EvtScript DoScareAway = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 3, FALSE, FALSE, FALSE)
EVT_WAIT(20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(EnableActorGlow, -127, 0)
EVT_CALL(FallToGoal, -127, 7)
EVT_CALL(EnableActorGlow, ACTOR_SELF, 0)
EVT_CALL(FallToGoal, ACTOR_SELF, 7)
EVT_ELSE
EVT_WAIT(15)
EVT_CALL(EnableActorGlow, -127, 0)
EVT_CALL(EnableActorGlow, ACTOR_SELF, 0)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_WAIT(17)
@ -1721,7 +1724,7 @@ EvtScript DoScareAway = {
EVT_ADD(LVarA, 300)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_EXEC_WAIT(ForceNextTarget)
EVT_EXEC_WAIT(EVS_ForceNextTarget)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(RemoveActor, ACTOR_SELF)
@ -1778,7 +1781,7 @@ EvtScript D_8029B494 = {
EVT_LABEL(10)
EVT_CHILD_THREAD
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04)
EVT_END_CHILD_THREAD
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1))
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -1826,7 +1829,7 @@ EvtScript D_8029B8A8 = {
EvtScript DoSpinSmashHit = {
EVT_EXEC_GET_TID(D_8029B818, LVarE)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(GetPartEventFlags, -127, LVar0, LVarA)
EVT_CALL(GetPartEventFlags, ACTOR_SELF, LVar0, LVarA)
EVT_EXEC_WAIT(D_8029B494)
EVT_CALL(SetActorPos, ACTOR_SELF, -200, 30, 0)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -1843,7 +1846,7 @@ EvtScript DoSpinSmashHit = {
EVT_EXEC(D_8029B8A8)
EVT_WAIT(15)
EVT_LABEL(0)
EVT_CALL(GetActorRotation, -127, LVar0, LVar1, LVar2)
EVT_CALL(GetActorRotation, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_MOD(LVar1, 360)
EVT_IF_NE(LVar1, 0)
EVT_WAIT(1)
@ -1885,7 +1888,7 @@ EvtScript D_8029BBB4 = {
};
EvtScript DoJumpBack = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
@ -1989,7 +1992,7 @@ EvtScript DoAirLift = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5)
EVT_CALL(GetActorSize, ACTOR_SELF, LVar6, LVar7)
EVT_ADD(LVar4, LVar6)
EVT_CALL(PlayEffect, EFFECT_SWEAT, 0, LVar3, LVar4, LVar5, 5, -45, 20, 0, 0, 0, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_SWEAT, 0, LVar3, LVar4, LVar5, 5, -45, 20)
EVT_WAIT(10)
EVT_END_LOOP
EVT_CALL(SetAnimationRate, ACTOR_SELF, LVar0, EVT_FLOAT(1.0))
@ -2056,7 +2059,7 @@ EvtScript DoBlowAway = {
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_END_IF
EVT_END_IF
EVT_EXEC_WAIT(ForceNextTarget)
EVT_EXEC_WAIT(EVS_ForceNextTarget)
EVT_WAIT(1000)
EVT_RETURN
EVT_END

2
src/325AD0.c
View File

@ -10,7 +10,7 @@ void* effectFuncs[] = {
cos_deg, atan2, npc_raycast_down_sides, load_effect, sqrtf, mdl_draw_hidden_panel_surface, is_point_visible,
guPerspectiveF, guMtxIdentF, transform_point, guLookAtHiliteF, set_screen_overlay_params_back,
set_screen_overlay_center, set_screen_overlay_center_worldpos, mdl_get_next_texture_address, guPositionF, guOrthoF,
guFrustumF, func_80138D88, draw_box, draw_msg, get_msg_width, get_background_color_blend, sfx_play_sound_at_position
guFrustumF, draw_prev_frame_buffer_at_screen_pos, draw_box, draw_msg, get_msg_width, get_background_color_blend, sfx_play_sound_at_position
};
s32 D_E0200734[128] = {

74
src/415D90.c
View File

@ -2238,7 +2238,7 @@ void btl_state_update_player_menu(void) {
btl_set_state(BATTLE_STATE_END_PLAYER_TURN);
return;
}
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(10);
if (!(battleStatus->flags1 & BS_FLAGS1_PLAYER_IN_BACK)) {
gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CREATE_MAIN_MENU;
@ -2317,7 +2317,7 @@ void btl_state_update_player_menu(void) {
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STRATEGIES)) {
BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_STRATEGIES) {
initialPos = entryIdx;
@ -2334,19 +2334,19 @@ void btl_state_update_player_menu(void) {
if(battleStatus->menuStatus[0] == 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_45;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_ITEM_TARGET;
}
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_ITEMS)) {
BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->itemLossTurns >= 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_ITEMS) {
@ -2365,17 +2365,17 @@ void btl_state_update_player_menu(void) {
if (battleStatus->menuStatus[1] <= 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].enabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_43;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_JUMP_TARGET;
}
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_JUMP)) {
BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->jumpLossTurns >= 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_JUMP) {
initialPos = entryIdx;
@ -2391,17 +2391,17 @@ void btl_state_update_player_menu(void) {
if (battleStatus->menuStatus[2] <= 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].enabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_44;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_HAMMER_TARGET;
}
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_SMASH)) {
BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->hammerLossTurns >= 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_SMASH) {
initialPos = entryIdx;
@ -2419,7 +2419,7 @@ void btl_state_update_player_menu(void) {
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STAR_POWERS)) {
BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.disabled;
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_STAR_POWERS) {
initialPos = entryIdx;
@ -2672,15 +2672,15 @@ void btl_state_update_player_menu(void) {
}
if (battleStatus->submenuStatus[i] == -1) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->submenuStatus[i] == -2) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->submenuStatus[i] == -3) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_54;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW_ALT;
}
battle_menu_moveOptionIconScripts[i] = hudScriptPair->enabled;
if (battleStatus->submenuStatus[i] == 0) {
@ -2811,9 +2811,9 @@ void btl_state_update_player_menu(void) {
break;
case BTL_SUBSTATE_PLAYER_MENU_MAIN_SHOW_CANT_SWAP:
if (gBattleStatus.flags2 & BS_FLAGS2_4) {
btl_show_variable_battle_message(BTL_MSG_50, 60, 0);
btl_show_variable_battle_message(BTL_MSG_CANT_SWITCH, 60, 0);
} else {
btl_show_variable_battle_message(BTL_MSG_51, 60, playerData->currentPartner);
btl_show_variable_battle_message(BTL_MSG_CANT_MOVE, 60, playerData->currentPartner);
}
D_802AD607 = 1;
gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_AWAIT_CANT_SWAP;
@ -3086,15 +3086,15 @@ void btl_state_update_player_menu(void) {
if (battleStatus->submenuStatus[i] == -1) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->submenuStatus[i] == -2) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
if (!(battleStatus->enabledStarPowersMask & (1 << i))) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 0];
@ -3633,7 +3633,7 @@ void btl_state_update_partner_menu(void) {
if (!func_802A58D0()) {
btl_set_state(BATTLE_STATE_9);
} else {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
battleStatus->flags1 |= BS_FLAGS1_MENU_OPEN;
playerActor->flags &= ~(ACTOR_FLAG_4000000 | ACTOR_FLAG_8000000);
partnerActor->flags &= ~(ACTOR_FLAG_4000000 | ACTOR_FLAG_8000000);
@ -3701,7 +3701,7 @@ void btl_state_update_partner_menu(void) {
BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_STRATEGIES];
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STRATEGIES)) {
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.disabled;
}
if (battleStatus->lastPartnerMenuSelection[entryIdx] == BTL_MENU_TYPE_STRATEGIES) {
@ -3717,12 +3717,12 @@ void btl_state_update_partner_menu(void) {
if (battleStatus->menuStatus[3] <= 0) {
BattleMenu_HudScripts[entryIdx] = battle_menu_PartnerMoveHudScripts[playerData->currentPartner][1];
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (!(battleStatus->menuDisableFlags & BTL_MSG_40)) {
if (!(battleStatus->menuDisableFlags & BTL_MSG_ACTION_TIP_12)) {
BattleMenu_HudScripts[entryIdx] = battle_menu_PartnerMoveHudScripts[playerData->currentPartner][1];
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_ABILITY) {
initialPos = entryIdx;
@ -3738,7 +3738,7 @@ void btl_state_update_partner_menu(void) {
BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_PARTNER_FOCUS];
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_PARTNER_FOCUS)) {
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.disabled;
}
if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_PARTNER_FOCUS) {
@ -3847,9 +3847,9 @@ void btl_state_update_partner_menu(void) {
break;
case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_7:
if (can_btl_state_update_switch_to_player() == 0) {
btl_show_variable_battle_message(BTL_MSG_51, 60, 0);
btl_show_variable_battle_message(BTL_MSG_CANT_MOVE, 60, 0);
} else {
btl_show_variable_battle_message(BTL_MSG_50, 60, 0);
btl_show_variable_battle_message(BTL_MSG_CANT_SWITCH, 60, 0);
}
D_802AD607 = 1;
gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_8;
@ -3872,11 +3872,11 @@ void btl_state_update_partner_menu(void) {
}
if (battleStatus->submenuStatus[i] == -1) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
if (battleStatus->submenuStatus[i] == -2) {
battleStatus->submenuStatus[i] = 0;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_48;
BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW;
}
battle_menu_moveOptionIconScripts[i] = battle_menu_PartnerMoveHudScripts[playerData->currentPartner][2 * i + 2];
if (battleStatus->submenuStatus[i] == 0) {
@ -4496,7 +4496,7 @@ void btl_state_update_peach_menu(void) {
switch (gBattleSubState) {
case BTL_SUBSTATE_PEACH_MENU_INIT:
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(10);
if (!(gBattleStatus.flags1 & BS_FLAGS1_PLAYER_IN_BACK)) {
gBattleSubState = BTL_SUBSTATE_PEACH_CREATE_MAIN_MENU;
@ -4556,7 +4556,7 @@ void btl_state_update_peach_menu(void) {
BattleMenu_TitleMessages[entryIdx] = D_802AB728[entryIdx];
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STAR_POWERS)) {
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
BattleMenu_HudScripts[entryIdx] = battle_menu_PeachStarPowerHudScripts.disabled;
}
@ -4614,7 +4614,7 @@ void btl_state_update_peach_menu(void) {
btl_main_menu_destroy();
break;
case BTL_SUBSTATE_PEACH_MENU_SHOW_CANT_SWITCH:
btl_show_variable_battle_message(BTL_MSG_50, 60, 0);
btl_show_variable_battle_message(BTL_MSG_CANT_SWITCH, 60, 0);
D_802AD607 = 1;
gBattleSubState = BTL_SUBSTATE_PEACH_MENU_AWAIT_CANT_SWITCH_POPUP;
break;
@ -4706,7 +4706,7 @@ void btl_state_update_twink_menu(void) {
break;
}
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(10);
if (!(gBattleStatus.flags1 & BS_FLAGS1_PLAYER_IN_BACK)) {
player->state.currentPos.x = player->homePos.x;
@ -4763,7 +4763,7 @@ void btl_state_update_twink_menu(void) {
BattleMenu_TitleMessages[entryIdx] = D_802AB734[entryIdx];
if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STAR_POWERS)) {
BattleMenu_OptionEnabled[entryIdx] = FALSE;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_48;
battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW;
BattleMenu_HudScripts[entryIdx] = battle_menu_TwinkStarPowerHudScripts.disabled;
}
@ -4821,7 +4821,7 @@ void btl_state_update_twink_menu(void) {
btl_main_menu_destroy();
break;
case BTL_SUBSTATE_TWINK_MENU_SHOW_CANT_SWITCH:
btl_show_variable_battle_message(BTL_MSG_50, 60, 0);
btl_show_variable_battle_message(BTL_MSG_CANT_SWITCH, 60, 0);
D_802AD607 = 1;
gBattleSubState = BTL_SUBSTATE_TWINK_MENU_AWAIT_CANT_SWITCH_POPUP;
break;
@ -4890,7 +4890,7 @@ void btl_state_update_select_target(void) {
s8 actionTip = gMoveTable[battleStatus->selectedMoveID].actionTip;
if (actionTip >= 0) {
btl_show_battle_message(BTL_MSG_2E + actionTip, 60);
btl_show_battle_message(BTL_MSG_ACTION_TIP_00 + actionTip, 60);
}
}
}

2
src/43F0.c
View File

@ -775,7 +775,7 @@ void appendGfx_startup_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16
if (a == 255) {
gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1);
gDPSetCombineMode(gMainGfxPos++, PM_CC_08, PM_CC_08);
} else {
gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);

1
src/7E9D0.c
View File

@ -32,6 +32,7 @@ s32 phys_adjust_cam_on_landing(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
s32 ret = 1;
//TODO hardcoded map IDs
switch (gameStatus->areaID) {
case AREA_OBK:
ret = gameStatus->mapID != 4;

10
src/80850_len_3060.c
View File

@ -524,11 +524,11 @@ void update_status_menu(void) {
s32 spBars;
s32 maxStarPower;
if (gGameStatusPtr->creditsViewportMode >= 0 ||
gGameStatusPtr->demoState != 0 ||
(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_IS_PEACH) ||
evt_get_variable(NULL, GB_StoryProgress) >= STORY_EPILOGUE)
{
if (gGameStatusPtr->creditsViewportMode >= 0
|| gGameStatusPtr->demoState != DEMO_STATE_NONE
|| (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_IS_PEACH)
|| evt_get_variable(NULL, GB_StoryProgress) >= STORY_EPILOGUE
) {
return;
}

16
src/8a860_len_3f30.c
View File

@ -114,10 +114,10 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt
void popup_menu_draw_title_contents(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening);
void func_800F48F4(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening);
void func_800F4944(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening);
void func_800F4C1C(PopupMessage* popup, s32 x, s32 y);
void popup_draw_cost_icon(PopupMessage* popup, s32 x, s32 y);
void popup_draw_already_have_partner(PopupMessage* popup, s32 x, s32 y);
void func_800F4D28(PopupMessage* popup, s32 x, s32 y);
void func_800F4C1C(s32* userData, s32 x, s32 y);
void popup_draw_cost_icon(s32* userData, s32 x, s32 y);
void popup_draw_already_have_partner(s32* userData, s32 x, s32 y);
void func_800F4D28(s32* userData, s32 x, s32 y);
void hide_popup_menu(void) {
if (PopupNotBattle) {
@ -1547,7 +1547,7 @@ void func_800F4944(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s
}
}
void func_800F4C1C(PopupMessage* popup, s32 x, s32 y) {
void func_800F4C1C(s32* userData, s32 x, s32 y) {
s32 msg = MSG_Menus_0069;
s32 xPos = x + 11;
s32 yPos = y + 8;
@ -1558,7 +1558,7 @@ void func_800F4C1C(PopupMessage* popup, s32 x, s32 y) {
draw_msg(msg, xPos, yPos, 255, MSG_PAL_0F, 0);
}
void popup_draw_cost_icon(PopupMessage* popup, s32 x, s32 y) {
void popup_draw_cost_icon(s32* userData, s32 x, s32 y) {
s32 hudElement;
s32 xPos;
s32 yPos;
@ -1583,11 +1583,11 @@ void popup_draw_cost_icon(PopupMessage* popup, s32 x, s32 y) {
hud_element_draw_clipped(hudElement);
}
void popup_draw_already_have_partner(PopupMessage* popup, s32 x, s32 y) {
void popup_draw_already_have_partner(s32* userData, s32 x, s32 y) {
draw_msg(MSG_Menus_006B, x + 16, y + 2, 255, MSG_PAL_0F, 0);
}
void func_800F4D28(PopupMessage* popup, s32 x, s32 y) {
void func_800F4D28(s32* userData, s32 x, s32 y) {
s32 hudElement = PopupMenu_TitleIconHEID;
PlayerData* playerData = &gPlayerData;
s32 xPos = x + 14;

5
src/C50A0.c
View File

@ -135,7 +135,7 @@ s32 draw_ci_image_with_clipping(IMG_PTR raster, s32 width, s32 height, s32 fmt,
return 1;
} else {
gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0);
gDPSetCombineMode(gMainGfxPos++, PM_CC_02, PM_CC_02);
gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, opacity);
}
@ -1416,8 +1416,7 @@ void appendGfx_item_entity(void* data) {
GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA),
AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL |
GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA));
gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0,
TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0);
gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0);
gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha);
}
}

91
src/CEE40.c
View File

@ -5,37 +5,40 @@ Gfx D_8014ED90[] = {
gsSPEndDisplayList(),
};
Vp D_8014ED98 = {
Vp DarknessStencilViewport = {
.vp = {
.vscale = { 128, 128, 511, 0 },
.vtrans = { 128, 128, 511, 0 }
}
};
Vtx D_8014EDA8[4] = {
Vtx Vtx_DarknessStencil[] = {
{{{ -16,-16, 0 }, 0, { 0x0000, 0x0000 }, { 0, 0, 0, 255 }}},
{{{ 16,-16, 0 }, 0, { 0x1000, 0x0000 }, { 0, 0, 0, 255 }}},
{{{ 16, 16, 0 }, 0, { 0x1000, 0x1000 }, { 0, 0, 0, 255 }}},
{{{ -16, 16, 0 }, 0, { 0x0000, 0x1000 }, { 0, 0, 0, 255 }}},
};
Gfx D_8014EDE8[] = {
gsSPVertex(D_8014EDA8, 4, 0),
Gfx Gfx_DarknessStencilQuad[] = {
gsSPVertex(Vtx_DarknessStencil, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPPipeSync(),
gsSPEndDisplayList(),
};
void func_80138740(s32 x1, s32 y1, s32 x2, s32 y2, f32 arg4) {
s32 t9, sp10;
void appendGfx_draw_prev_frame_buffer(s32 x1, s32 y1, s32 x2, s32 y2, f32 alpha) {
s32 stripY, extraY;
s32 i;
u16* prevGfxCfb = NULL;
x1 -= x1 % 4;
x2 = x2 - x2 % 4 + 4;
t9 = (y2 - y1) / 6;
sp10 = (y2 - y1) % 6;
// round the x positions
x1 = x1 - (x1 % 4);
x2 = x2 - (x2 % 4) + 4;
// can only load 6 rows of the color buffer at a time: 320*6*2 = 3840 bytes of the 4096 capacity
stripY = (y2 - y1) / 6;
extraY = (y2 - y1) % 6;
// get previous color buffer
for (i = 0; i < nuGfxCfbNum; i++) {
if (nuGfxCfb[i] == nuGfxCfb_ptr) {
prevGfxCfb = nuGfxCfb[(i + nuGfxCfbNum - 1) % nuGfxCfbNum];
@ -43,7 +46,7 @@ void func_80138740(s32 x1, s32 y1, s32 x2, s32 y2, f32 arg4) {
}
gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE);
gDPSetCombineMode(gMainGfxPos++, PM_CC_10, PM_CC_10);
gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE);
gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE);
@ -53,9 +56,9 @@ void func_80138740(s32 x1, s32 y1, s32 x2, s32 y2, f32 arg4) {
gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE);
gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP);
gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE);
gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, arg4);
gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha);
for (i = 0; i < t9; i++) {
for (i = 0; i < stripY; i++) {
gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 6,
x1, y1 + i * 6, x2 - 1, y1 + i * 6 + 5, 0,
G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -63,16 +66,16 @@ void func_80138740(s32 x1, s32 y1, s32 x2, s32 y2, f32 arg4) {
G_TX_RENDERTILE, x1 * 32, (y1 + i * 6) * 32, 1024, 1024);
}
if (sp10 != 0) {
gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, sp10,
x1, y1 + i * 6, x2 - 1, y1 + i * 6 + sp10 - 1, 0,
if (extraY != 0) {
gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, extraY,
x1, y1 + i * 6, x2 - 1, y1 + i * 6 + extraY - 1, 0,
G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + sp10) * 4,
gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + extraY) * 4,
G_TX_RENDERTILE, x1 * 32, (y1 + i * 6) * 32, 1024, 1024);
}
}
void func_80138D88(s32 x1, s32 y1, s32 x2, s32 y2, f32 alpha) {
void draw_prev_frame_buffer_at_screen_pos(s32 x1, s32 y1, s32 x2, s32 y2, f32 alpha) {
s32 minX;
s32 minY;
s32 maxX;
@ -86,8 +89,8 @@ void func_80138D88(s32 x1, s32 y1, s32 x2, s32 y2, f32 alpha) {
} else {
minX = x1;
}
minY = maxY;
if (maxY < y1) {
minY = maxY;
maxY = y1;
} else {
minY = y1;
@ -118,27 +121,27 @@ void func_80138D88(s32 x1, s32 y1, s32 x2, s32 y2, f32 alpha) {
maxY = SCREEN_HEIGHT - 1;
}
if (minX != maxX && minY != maxY) {
func_80138740(minX, minY, maxX, maxY, alpha);
appendGfx_draw_prev_frame_buffer(minX, minY, maxX, maxY, alpha);
}
}
}
void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) {
void appendGfx_darkness_stencil(b32 isWorld, s32 posX, s32 posY, f32 alpha, f32 progress) {
Camera* camera = &gCameras[gCurrentCameraID];
f32 texScale, f24;
s32 i;
if (arg3 == 0.0f) {
if (alpha == 0.0f) {
return;
}
if (arg0 == 0) {
texScale = (255.0f - arg3) * 10.0f / 255.0f + 0.14;
if (!isWorld) {
texScale = (255.0f - alpha) * 10.0f / 255.0f + 0.14;
} else {
texScale = 0.5f;
texScale = (255.0f - arg3) * 9.5f / 255.0f + texScale;
arg1 += (camera->viewportW / 2 - arg1) * (255.0f - arg3) / 255.0f;
arg2 += (camera->viewportH / 2 - arg2) * (255.0f - arg3) / 255.0f;
texScale = (255.0f - alpha) * 9.5f / 255.0f + texScale;
posX += (camera->viewportW / 2 - posX) * (255.0f - alpha) / 255.0f;
posY += (camera->viewportH / 2 - posY) * (255.0f - alpha) / 255.0f;
}
guOrtho(&gDisplayContext->matrixStack[gMatrixListPos], -16.0f, 0.0f, 0.0f, 16.0f, -1000.0f, 1000.0f, 1.0f);
@ -148,11 +151,11 @@ void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) {
gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP);
gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, osVirtualToPhysical(nuGfxZBuffer));
gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 64, 64);
gSPViewport(gMainGfxPos++, &D_8014ED98);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1);
gSPViewport(gMainGfxPos++, &DarknessStencilViewport);
gDPSetCombineMode(gMainGfxPos++, PM_CC_CONST_1, PM_CC_CONST_1);
guRotate(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f, 1.0f);
gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gMainGfxPos++, D_8014EDE8);
gSPDisplayList(gMainGfxPos++, Gfx_DarknessStencilQuad);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
gDPPipeSync(gMainGfxPos++);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, 0, 0, PRIMITIVE, TEXEL0, PRIMITIVE, 0);
@ -177,7 +180,7 @@ void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) {
gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
guScale(&gDisplayContext->matrixStack[gMatrixListPos], f20, f20, 1.0f);
gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPDisplayList(gMainGfxPos++, D_8014EDE8);
gSPDisplayList(gMainGfxPos++, Gfx_DarknessStencilQuad);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
}
@ -185,7 +188,7 @@ void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) {
gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE);
gDPSetColorImage(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 64, osVirtualToPhysical(nuGfxZBuffer));
gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 64, 64);
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1);
gDPSetCombineMode(gMainGfxPos++, PM_CC_0F, PM_CC_0F);
for (i = 0; i < 4; i++) {
gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[i * 2048]), G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, 16, 0, 0, 63, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -212,33 +215,33 @@ void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) {
gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE);
gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
if (arg3 != 255.0f || arg0 == 1) {
if (alpha != 255.0f || isWorld == 1) {
gDPSetCombineLERP(gMainGfxPos++, 1, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, PRIMITIVE, 1, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, PRIMITIVE);
} else {
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, 1, 0, ENVIRONMENT, PRIMITIVE, 0, 0, 0, 0, 1, 0, ENVIRONMENT, PRIMITIVE);
}
arg3 *= 0.5f;
gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, arg3 * 0.5f * arg4 / 255.0f);
gDPSetEnvColor(gMainGfxPos++, 255, 255, 255, (255.0f - arg3 * 0.5f) * arg4 / 255.0f);
alpha *= 0.5f;
gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha * 0.5f * progress / 255.0f);
gDPSetEnvColor(gMainGfxPos++, 255, 255, 255, (255.0f - alpha * 0.5f) * progress / 255.0f);
if (arg0 == 0) {
if (!isWorld) {
gSPTextureRectangle(gMainGfxPos++,
camera->viewportStartX * 4, camera->viewportStartY * 4,
(camera->viewportStartX + camera->viewportW) * 4, (camera->viewportStartY + camera->viewportH) * 4,
G_TX_RENDERTILE,
(12 - arg1) * 32.0f / texScale + 16.0f + 1024.0f, (19 - arg2) * 32.0f / texScale + 16.0f + 1024.0f,
(12 - posX) * 32.0f / texScale + 16.0f + 1024.0f, (19 - posY) * 32.0f / texScale + 16.0f + 1024.0f,
1024.0f / texScale, 1024.0f / texScale);
} else {
gSPTextureRectangle(gMainGfxPos++,
camera->viewportStartX * 4, camera->viewportStartY * 4,
(camera->viewportStartX + camera->viewportW) * 4, (camera->viewportStartY + camera->viewportH) * 4,
G_TX_RENDERTILE,
(9 - arg1) * 32.0f / texScale + 1024.0f, (32 - arg2) * 32.0f / texScale + 1024.0f,
(9 - posX) * 32.0f / texScale + 1024.0f, (32 - posY) * 32.0f / texScale + 1024.0f,
1024.0f / texScale, 1024.0f / texScale);
}
}
void func_80139F10(s32 arg0, s32 arg1, f32 alpha, s32 primR, s32 primG, s32 primB, s32 primA, s32 camID) {
void appendGfx_screen_transition_stencil(s32 arg0, s32 arg1, f32 progress, s32 primR, s32 primG, s32 primB, s32 primA, s32 camID) {
s32 x1, y1, x2, y2, t5, t6;
f32 texScale;
@ -258,16 +261,16 @@ void func_80139F10(s32 arg0, s32 arg1, f32 alpha, s32 primR, s32 primG, s32 prim
t6 = 0;
}
if (alpha == 0.0f) {
if (progress == 0.0f) {
return;
}
gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2);
if (alpha == 255.0f) {
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1);
if (progress == 255.0f) {
gDPSetCombineMode(gMainGfxPos++, PM_CC_08, PM_CC_08);
}
gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, primA);
texScale = (255.0f - alpha) * 10.5f / 255.0f + 0.09; // range from
texScale = (255.0f - progress) * 10.5f / 255.0f + 0.09; // range from
gSPTextureRectangle(gMainGfxPos++, x1 * 4, y1 * 4, x2 * 4, y2 * 4, G_TX_RENDERTILE,
(t5 - arg0) * 32.0f / texScale + 16.0f + 1024.0f, (t6 - arg1) * 32.0f / texScale + 16.0f + 1024.0f,
1024.0f / texScale, 1024.0f / texScale);

24
src/a5dd0_len_114e0.c
View File

@ -125,7 +125,7 @@ Gfx D_8014B0B8[21][5] = {
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_PASS2),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_PASS2),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, PRIMITIVE, PRIMITIVE_ALPHA, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, ENVIRONMENT, 0, 0, 0, COMBINED),
gsDPSetCombineMode(G_CC_MODULATEIA, PM_CC_17),
}, {
gsDPSetCombineMode(G_CC_BLENDRGBA, G_CC_BLENDRGBA),
gsDPSetCombineMode(G_CC_BLENDRGBA, G_CC_PASS2),
@ -1398,7 +1398,7 @@ void func_8010FD98(void* arg0, s32 alpha) {
gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA);
} else {
gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0);
gDPSetCombineMode(gMainGfxPos++, PM_CC_01, PM_CC_02);
gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha);
}
}
@ -4142,9 +4142,9 @@ void mdl_create_model(ModelBlueprint* bp, s32 arg1) {
if (prop != NULL) {
model->texPannerID = prop->data.s & 0xF;
} else {
model->texPannerID = 0;
model->texPannerID = TEX_PANNER_0;
}
model->customGfxIndex = 0;
model->customGfxIndex = CUSTOM_GFX_0;
if (node->type != SHAPE_TYPE_GROUP) {
prop = get_model_property(node, MODEL_PROP_KEY_RENDER_MODE);
@ -4213,17 +4213,17 @@ void mdl_create_model(ModelBlueprint* bp, s32 arg1) {
// Mysterious no-op
void iterate_models(void) {
Model* nonNull;
Model* ret;
Model* last = NULL;
Model* mdl;
s32 i;
for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) {
ret = (*gCurrentModels)[i];
if (ret != NULL) {
nonNull = ret;
mdl = (*gCurrentModels)[i];
if (mdl != NULL) {
last = mdl;
}
}
ret = nonNull;
mdl = last;
}
void func_80116698(void) {
@ -4284,9 +4284,10 @@ void func_80116698(void) {
if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAG_1000)) {
if (mtg->matrixMode != 0) {
mtg->matrixMode--;
if (!(mtg->matrixMode & 0xFF)) {
if (mtg->matrixMode == 0) {
mtg->matrixA = *mtg->transformMtx;
}
// store transformMtx on stack
mtx = mtg->transformMtx;
mtg->transformMtx = &gDisplayContext->matrixStack[gMatrixListPos++];
*mtg->transformMtx = *mtx;
@ -5473,7 +5474,6 @@ void build_custom_gfx(void) {
// weird temps necessary to match
/// @returns TRUE if mtx is NULL or identity.
// TODO takes a Matrix4f, not a Matrix4s - types being weird
s32 is_identity_fixed_mtx(Mtx* mtx) {
s32* mtxIt = (s32*)mtx;
s32* identityIt;

46
src/actor_api.c
View File

@ -190,15 +190,15 @@ ApiStatus GetLastElement(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_80269E80(Evt* script, s32 isInitialCall) {
evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_19A);
ApiStatus GetDamageSource(Evt* script, s32 isInitialCall) {
evt_set_variable(script, *script->ptrReadPos, gBattleStatus.currentDamageSource);
return ApiStatus_DONE2;
}
ApiStatus func_80269EAC(Evt* script, s32 isInitialCall) {
s32 a0 = *script->ptrReadPos;
ApiStatus SetDamageSource(Evt* script, s32 isInitialCall) {
s32 damageSource = *script->ptrReadPos;
gBattleStatus.unk_19A = a0;
gBattleStatus.currentDamageSource = damageSource;
return ApiStatus_DONE2;
}
@ -3180,7 +3180,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
script->functionTempPtr[1] = actor;
script->functionTemp[2] = attackBoost;
btl_cam_use_preset(BTL_CAM_PRESET_I);
btl_cam_use_preset(BTL_CAM_PRESET_08);
btl_cam_set_zoffset(12);
btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250);
@ -3234,7 +3234,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
actor->isGlowing = 1;
actor->attackBoost += attackBoost;
@ -3251,7 +3251,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
break;
case 3:
if (script->functionTemp[3] == 0) {
btl_show_variable_battle_message(BTL_MSG_1D, 60, attackBoost);
btl_show_variable_battle_message(BTL_MSG_ATTACK_UP, 60, attackBoost);
script->functionTemp[0] = 4;
} else {
script->functionTemp[3]--;
@ -3260,7 +3260,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
break;
case 4:
if (btl_is_popup_displayed() == 0) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
script->functionTemp[3] = 10;
script->functionTemp[0] = 5;
}
@ -3303,7 +3303,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
script->functionTempPtr[1] = actor;
script->functionTemp[2] = defenseBoost;
btl_cam_use_preset(BTL_CAM_PRESET_I);
btl_cam_use_preset(BTL_CAM_PRESET_08);
btl_cam_set_zoffset(12);
btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250);
@ -3358,7 +3358,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
actor->isGlowing = 1;
actor->defenseBoost += defenseBoost;
@ -3375,7 +3375,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
break;
case 3:
if (script->functionTemp[3] == 0) {
btl_show_variable_battle_message(BTL_MSG_1E, 60, defenseBoost);
btl_show_variable_battle_message(BTL_MSG_DEFENCE_UP, 60, defenseBoost);
script->functionTemp[0] = 4;
} else {
script->functionTemp[3]--;
@ -3384,7 +3384,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
break;
case 4:
if (btl_is_popup_displayed() == 0) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
script->functionTemp[3] = 10;
script->functionTemp[0] = 5;
}
@ -3425,7 +3425,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
script->functionTemp[1] = (s32) actor;
script->functionTemp[2] = vanished;
btl_cam_use_preset(BTL_CAM_PRESET_I);
btl_cam_use_preset(BTL_CAM_PRESET_08);
btl_cam_set_zoffset(12);
btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250);
@ -3469,7 +3469,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
inflict_status(actor, 0xE, vanished);
script->functionTemp[3] = 15;
@ -3481,7 +3481,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
break;
case 3:
if (script->functionTemp[3] == 0) {
btl_show_variable_battle_message(BTL_MSG_21, 60, vanished);
btl_show_variable_battle_message(BTL_MSG_ENEMY_TRANSPARENT, 60, vanished);
script->functionTemp[0] = 4;
} else {
script->functionTemp[3]--;
@ -3490,7 +3490,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
break;
case 4:
if (btl_is_popup_displayed() == 0) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
script->functionTemp[3] = 10;
script->functionTemp[0] = 5;
}
@ -3531,7 +3531,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
script->functionTempPtr[1] = actor;
script->functionTemp[2] = electrified;
btl_cam_use_preset(BTL_CAM_PRESET_I);
btl_cam_use_preset(BTL_CAM_PRESET_08);
btl_cam_set_zoffset(12);
btl_cam_target_actor(actor->actorID);
btl_cam_set_zoom(250);
@ -3575,7 +3575,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
inflict_status(actor, 0xB, electrified);
script->functionTemp[3] = 15;
@ -3587,7 +3587,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
break;
case 3:
if (script->functionTemp[3] == 0) {
btl_show_variable_battle_message(BTL_MSG_22, 60, electrified);
btl_show_variable_battle_message(BTL_MSG_ENEMY_CHARGED, 60, electrified);
script->functionTemp[0] = 4;
} else {
script->functionTemp[3]--;
@ -3596,7 +3596,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
break;
case 4:
if (btl_is_popup_displayed() == 0) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
script->functionTemp[3] = 10;
script->functionTemp[0] = 5;
}
@ -3641,7 +3641,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
script->functionTempPtr[1] = actor;
script->functionTemp[2] = hpBoost;
btl_cam_use_preset(BTL_CAM_PRESET_I);
btl_cam_use_preset(BTL_CAM_PRESET_08);
btl_cam_set_zoffset(12);
btl_cam_target_actor(actor->actorID);
btl_cam_move(10);
@ -3692,7 +3692,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
break;
case 2:
if (script->functionTemp[3] == 0) {
btl_cam_use_preset(BTL_CAM_PRESET_C);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
actor->currentHP += hpBoost;
if (actor->maxHP < actor->currentHP) {

10
src/audio/e0b30_len_b80.c
View File

@ -179,7 +179,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s
MusicSettings* musicSetting;
s32 mapSongVariation;
if (gGameStatusPtr->demoState != 0) {
if (gGameStatusPtr->demoState != DEMO_STATE_NONE) {
return 1;
}
@ -374,7 +374,7 @@ s32 func_8014AD40(void) {
void bgm_pop_song(void) {
MusicSettings* musicSetting = gMusicSettings;
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
musicSetting->flags |= MUSIC_SETTINGS_FLAG_8;
_bgm_set_song(0, musicSetting->savedSongID, musicSetting->savedVariation, 0, 8);
}
@ -383,7 +383,7 @@ void bgm_pop_song(void) {
void bgm_push_song(s32 songID, s32 variation) {
MusicSettings* musicSetting = gMusicSettings;
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
musicSetting->savedSongID = musicSetting->songID;
musicSetting->savedVariation = musicSetting->variation;
musicSetting->savedSongName = musicSetting->songName;
@ -395,7 +395,7 @@ void bgm_push_song(s32 songID, s32 variation) {
void bgm_pop_battle_song(void) {
MusicSettings* musicSetting = gMusicSettings;
if (gGameStatusPtr->demoState == 0) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE) {
if (gOverrideFlags & GLOBAL_OVERRIDES_20000) {
gOverrideFlags &= ~GLOBAL_OVERRIDES_20000;
} else {
@ -409,7 +409,7 @@ void bgm_pop_battle_song(void) {
void bgm_push_battle_song(void) {
MusicSettings* musicSetting = gMusicSettings;
if (gGameStatusPtr->demoState == 0 && !(gOverrideFlags & GLOBAL_OVERRIDES_20000)) {
if (gGameStatusPtr->demoState == DEMO_STATE_NONE && !(gOverrideFlags & GLOBAL_OVERRIDES_20000)) {
snd_ambient_pause(0, 250);
musicSetting->savedSongID = musicSetting->songID;
musicSetting->savedVariation = musicSetting->variation;

0
src/dc470_len_14c0.c → src/background.c
View File

3
src/background_gfx.c
View File

@ -363,8 +363,7 @@ void gfx_draw_background(void) {
// @bug In 1-cycle mode, the two combiner cycles should be identical. Using Texel1 here in the second cycle,
// which is the actual cycle of the combiner used on hardware in 1-cycle mode, actually samples the next
// pixel's texel value instead of the current pixel's. This results in a one-pixel offset.
gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE,
TEXEL1, PRIMITIVE_ALPHA, TEXEL1, 0, 0, 0, 1);
gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, TEXEL1, PRIMITIVE_ALPHA, TEXEL1, 0, 0, 0, 1);
gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, gPauseBackgroundFade);
gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT);

38
src/battle/area/arn/actor/hyper_cleft.c
View File

@ -146,7 +146,7 @@ EvtScript N(80220DC0) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim04)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -171,7 +171,7 @@ EvtScript N(80220DC0) = {
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_LOOP(20)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
@ -197,12 +197,12 @@ EvtScript N(80220DC0) = {
EVT_END_IF
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_THREAD
EVT_THREAD
EVT_LOOP(30)
@ -254,7 +254,7 @@ EvtScript N(80220DC0) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0)
EVT_SET(LVar0, 0)
@ -452,7 +452,7 @@ EvtScript N(handleEvent_80222140) = {
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_END_IF
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_SWITCH
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
@ -485,7 +485,7 @@ EvtScript N(handleEvent_80222140) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
@ -493,7 +493,7 @@ EvtScript N(handleEvent_80222140) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
@ -513,14 +513,14 @@ EvtScript N(handleEvent_80222140) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
@ -554,7 +554,7 @@ EvtScript N(handleEvent_80222140) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -608,19 +608,19 @@ EvtScript N(handleEvent_80222140) = {
EVT_IF_EQ(LVar0, 1)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim09)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
@ -727,7 +727,7 @@ EvtScript N(80223310) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -773,7 +773,7 @@ EvtScript N(80223310) = {
EVT_WAIT(15)
EVT_WAIT(8)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -801,11 +801,11 @@ EvtScript N(80223310) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim02)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 15)
EVT_SET(LVar1, 0)

60
src/battle/area/arn/actor/hyper_paragoomba.c
View File

@ -213,7 +213,7 @@ EvtScript N(8021B678) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Miss)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
@ -229,7 +229,7 @@ EvtScript N(8021B678) = {
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_LOOP(20)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
@ -270,7 +270,7 @@ EvtScript N(8021B678) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01))
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0))
EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, FALSE, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -60, 0, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.3))
@ -282,7 +282,7 @@ EvtScript N(8021B678) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, -200, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE)
@ -327,7 +327,7 @@ EvtScript N(8021B678) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0)
@ -522,7 +522,7 @@ EvtScript N(handleEvent_8021C9C4) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(GetEncounterState, LVar0)
@ -543,12 +543,12 @@ EvtScript N(handleEvent_8021C9C4) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_FALL_TRIGGER)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021D9F4))
EVT_CASE_EQ(EVENT_15)
EVT_SET_CONST(LVar0, 2)
@ -583,7 +583,7 @@ EvtScript N(handleEvent_8021C9C4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -608,11 +608,11 @@ EvtScript N(handleEvent_8021C9C4) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -656,7 +656,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -671,7 +671,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -704,7 +704,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 2, EVT_FLOAT(1.0))
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Run)
@ -721,7 +721,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -742,7 +742,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -904,7 +904,7 @@ EvtScript N(8021E218) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
@ -927,7 +927,7 @@ EvtScript N(8021E218) = {
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_LOOP(20)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
EVT_WAIT(1)
@ -950,12 +950,12 @@ EvtScript N(8021E218) = {
EVT_END_IF
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80)
@ -1012,7 +1012,7 @@ EvtScript N(8021E218) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_END_THREAD
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1185,7 +1185,7 @@ EvtScript N(handleEvent_8021F41C) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1199,7 +1199,7 @@ EvtScript N(handleEvent_8021F41C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1211,7 +1211,7 @@ EvtScript N(handleEvent_8021F41C) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
@ -1249,7 +1249,7 @@ EvtScript N(handleEvent_8021F41C) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -1274,11 +1274,11 @@ EvtScript N(handleEvent_8021F41C) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_END_FIRST_STRIKE)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0))
@ -1324,7 +1324,7 @@ EvtScript N(takeTurn_8021FE6C) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -1403,7 +1403,7 @@ EvtScript N(takeTurn_8021FE6C) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -1453,7 +1453,7 @@ EvtScript N(takeTurn_8021FE6C) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))

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

@ -138,7 +138,7 @@ EvtScript N(802189D4) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
@ -161,7 +161,7 @@ EvtScript N(802189D4) = {
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_LOOP(20)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
EVT_WAIT(1)
@ -184,12 +184,12 @@ EvtScript N(802189D4) = {
EVT_END_IF
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80)
@ -246,7 +246,7 @@ EvtScript N(802189D4) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_END_THREAD
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -419,7 +419,7 @@ EvtScript N(handleEvent_80219BD8) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -433,7 +433,7 @@ EvtScript N(handleEvent_80219BD8) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -445,7 +445,7 @@ EvtScript N(handleEvent_80219BD8) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
@ -483,7 +483,7 @@ EvtScript N(handleEvent_80219BD8) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -508,11 +508,11 @@ EvtScript N(handleEvent_80219BD8) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_END_FIRST_STRIKE)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0))
@ -558,7 +558,7 @@ EvtScript N(takeTurn_8021A628) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -637,7 +637,7 @@ EvtScript N(takeTurn_8021A628) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -687,7 +687,7 @@ EvtScript N(takeTurn_8021A628) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))

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

@ -179,7 +179,7 @@ EvtScript N(handleEvent_802260D0) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -198,7 +198,7 @@ EvtScript N(handleEvent_802260D0) = {
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
@ -215,7 +215,7 @@ EvtScript N(handleEvent_802260D0) = {
EVT_EXEC_WAIT(DoImmune)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_SHOCK_DEATH)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
@ -225,7 +225,7 @@ EvtScript N(handleEvent_802260D0) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(80227878))
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
@ -266,7 +266,7 @@ EvtScript N(80226558) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 150)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_SET(LVar1, 7012358)
EVT_EXEC_WAIT(N(80225F8C))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1)
@ -308,7 +308,7 @@ EvtScript N(80226558) = {
EVT_SET(LVar1, 7012353)
EVT_EXEC_WAIT(N(80225F8C))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -326,13 +326,13 @@ EvtScript N(80226558) = {
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 23)
EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
@ -341,7 +341,7 @@ EvtScript N(80226558) = {
EVT_SET(LVar1, 7012353)
EVT_EXEC_WAIT(N(80225F8C))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(80225FD4))
@ -356,7 +356,7 @@ EvtScript N(80226B88) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 150)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_SET(LVar1, 7012358)
EVT_EXEC_WAIT(N(80225F8C))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1)
@ -411,7 +411,7 @@ EvtScript N(80226B88) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0E)
@ -432,14 +432,14 @@ EvtScript N(80226B88) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
@ -511,7 +511,7 @@ EvtScript N(80226B88) = {
EVT_WAIT(8)
EVT_END_IF
EVT_LABEL(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(80225FD4))
@ -526,7 +526,7 @@ EvtScript N(80227878) = {
EVT_CALL(ActorSpeak, MSG_CH3_00C9, ACTOR_SELF, 1, ANIM_BattleTubba_Anim14, ANIM_BattleTubba_Anim14)
EVT_SET(LVar0, 1)
EVT_SET(LVar1, 7012372)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};

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

@ -202,7 +202,7 @@ EvtScript N(handleEvent_80224038) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_EXEC_WAIT(N(80223FD8))
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CASE_OR_EQ(EVENT_BURN_HIT)
@ -241,7 +241,7 @@ EvtScript N(handleEvent_80224038) = {
EVT_CASE_OR_EQ(EVENT_DEATH)
EVT_EXEC_WAIT(N(80223FD8))
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
EVT_EXEC_WAIT(N(80223FD8))
@ -276,7 +276,7 @@ EvtScript N(80224414) = {
EVT_CALL(MoveBattleCamOver, 40)
EVT_WAIT(40)
EVT_CALL(ActorSpeak, MSG_CH3_00C6, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim0D, ANIM_TubbasHeart_Anim0D)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 25)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE)
EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE)
@ -327,7 +327,7 @@ EvtScript N(takeTurn_802245C8) = {
EVT_CALL(ActorSpeak, MSG_CH3_00C4, ACTOR_PARTNER, 1, ANIM_BattleBow_Talk, ANIM_BattleBow_Idle)
EVT_CALL(SetAnimation, ACTOR_PARTNER, 1, ANIM_BattleBow_Laugh)
EVT_CALL(EndActorSpeech, ACTOR_PARTNER, 1, -1, -1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -389,7 +389,7 @@ EvtScript N(80224B3C) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim03)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -430,7 +430,7 @@ EvtScript N(80224B3C) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -451,7 +451,7 @@ EvtScript N(80224B3C) = {
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(HIT_RESULT_10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim01)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
@ -473,7 +473,7 @@ EvtScript N(80224B3C) = {
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim03)
EVT_EXEC_WAIT(N(802244DC))
@ -504,7 +504,7 @@ EvtScript N(80225258) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, LVar3, 60, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F7)
EVT_WAIT(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -547,7 +547,7 @@ EvtScript N(802255D8) = {
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_WAIT(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim0B)
EVT_THREAD
@ -605,7 +605,7 @@ EvtScript N(802255D8) = {
EVT_WAIT(37)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB)
EVT_WAIT(22)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_20FB)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)

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

@ -169,7 +169,7 @@ EvtScript N(nextTurn_80218FB0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim02)
EVT_END_THREAD
EVT_CALL(EndActorSpeech, ACTOR_SELF, 1, -1, -1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20)
EVT_CALL(func_802535B4, 1)
@ -220,7 +220,7 @@ EvtScript N(handleEvent_80219338) = {
EVT_EXEC_WAIT(N(802192E0))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim02)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CASE_OR_EQ(EVENT_BURN_HIT)
@ -232,7 +232,7 @@ EvtScript N(handleEvent_80219338) = {
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END_IF
EVT_END_CASE_GROUP
@ -261,11 +261,11 @@ EvtScript N(handleEvent_80219338) = {
EVT_CASE_OR_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
@ -274,7 +274,7 @@ EvtScript N(handleEvent_80219338) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleTubba_Anim14)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIKE_CONTACT)
EVT_CASE_EQ(EVENT_BURN_CONTACT)
@ -367,7 +367,7 @@ EvtScript N(takeTurn_80219750) = {
EVT_END_THREAD
EVT_CALL(EndActorSpeech, ACTOR_SELF, 1, -1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim01)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_WAIT(15)
EVT_CALL(func_802535B4, 1)
@ -389,7 +389,7 @@ EvtScript N(80219D88) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 150)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim07)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_IF_NOT_FLAG(LVar5, 0x00080000)
@ -429,7 +429,7 @@ EvtScript N(80219D88) = {
EVT_END_IF
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim02)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_EXEC_WAIT(N(80219238))
EVT_RETURN
@ -444,13 +444,13 @@ EvtScript N(80219D88) = {
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 23)
EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
@ -458,7 +458,7 @@ EvtScript N(80219D88) = {
EVT_CASE_OR_EQ(HIT_RESULT_10)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim02)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
@ -476,7 +476,7 @@ EvtScript N(8021A36C) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim07)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -528,7 +528,7 @@ EvtScript N(8021A36C) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim13)
@ -550,14 +550,14 @@ EvtScript N(8021A36C) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_SET(LVarF, LVar0)
EVT_SWITCH(LVarF)
@ -631,7 +631,7 @@ EvtScript N(8021A36C) = {
EVT_WAIT(8)
EVT_END_IF
EVT_LABEL(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN

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

@ -229,7 +229,7 @@ EvtScript N(takeTurn) = {
EVT_END_THREAD
EVT_CALL(EndActorSpeech, ACTOR_SELF, 1, -1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim01)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_WAIT(15)
EVT_CALL(func_802535B4, 1)
@ -246,7 +246,7 @@ EvtScript N(attackFistDrop) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 150)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim07)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
@ -280,7 +280,7 @@ EvtScript N(attackFistDrop) = {
EVT_CASE_OR_EQ(5)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim02)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -298,10 +298,10 @@ EvtScript N(attackFistDrop) = {
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 23)
EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
@ -325,7 +325,7 @@ EvtScript N(attackBodyCrush) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim07)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -374,7 +374,7 @@ EvtScript N(attackBodyCrush) = {
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim13)
@ -397,11 +397,11 @@ EvtScript N(attackBodyCrush) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_SET(LVarF, LVar0)
EVT_SWITCH(LVarF)

2
src/battle/area/dig/script/dig_02.c
View File

@ -23,7 +23,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) {
}
EvtScript NAMESPACE = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(3)
EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177)

2
src/battle/area/dig/script/dig_03.c
View File

@ -23,7 +23,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) {
}
EvtScript NAMESPACE = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(3)
EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177)

2
src/battle/area/dig/script/dig_04.c
View File

@ -28,7 +28,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) {
}
EvtScript NAMESPACE = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(3)
EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177)

2
src/battle/area/dig/script/dig_05.c
View File

@ -6,7 +6,7 @@
#include "common/SetDemoBattleBeginDelay.inc.c"
EvtScript NAMESPACE = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(3)
EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177)

20
src/battle/area/flo/actor/amazy_dayzee.c
View File

@ -129,7 +129,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Amazy_Anim08)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -143,7 +143,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Amazy_Anim0A)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -155,7 +155,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Amazy_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -171,7 +171,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Amazy_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -183,11 +183,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Amazy_Anim08)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Amazy_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -233,7 +233,7 @@ EvtScript N(attackPainfulSong) = {
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 70)
EVT_SET(LocalFlag(0), 0)
EVT_LABEL(0)
@ -294,7 +294,7 @@ EvtScript N(attackPainfulSong) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -313,7 +313,7 @@ EvtScript N(attackPainfulSong) = {
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(20)
EVT_CALL(YieldTurn)
@ -343,7 +343,7 @@ EvtScript N(flee) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Dayzee_Amazy_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0))

20
src/battle/area/flo/actor/crazee_dayzee.c
View File

@ -122,7 +122,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Anim08)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -136,7 +136,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Anim0A)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -148,7 +148,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -164,7 +164,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -176,11 +176,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Anim08)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Dayzee_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -226,7 +226,7 @@ EvtScript N(attackPainfulSong) = {
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 70)
EVT_SET(LocalFlag(0), 0)
EVT_LABEL(0)
@ -287,7 +287,7 @@ EvtScript N(attackPainfulSong) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -306,7 +306,7 @@ EvtScript N(attackPainfulSong) = {
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(20)
EVT_CALL(YieldTurn)
@ -336,7 +336,7 @@ EvtScript N(flee) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Dayzee_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0))

20
src/battle/area/flo/actor/lakitu.c
View File

@ -163,7 +163,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Lakitu_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -177,7 +177,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Lakitu_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -189,7 +189,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Lakitu_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -205,7 +205,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Lakitu_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -217,11 +217,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Lakitu_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Lakitu_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -262,7 +262,7 @@ EvtScript N(attackSpinyFlip) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lakitu_Anim03)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -329,7 +329,7 @@ EvtScript N(attackSpinyFlip) = {
EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_WAIT(20)
EVT_CALL(YieldTurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_EXEC_WAIT(N(returnHome))
@ -350,7 +350,7 @@ EvtScript N(attackSpinyFlip) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -426,7 +426,7 @@ EvtScript N(summonSpiny) = {
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lakitu_Anim01)
EVT_END_THREAD
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_20D2)
EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Lakitu_Anim0C)

20
src/battle/area/flo/actor/ruff_puff.c
View File

@ -118,7 +118,7 @@ EvtScript N(idle) = {
};
EvtScript N(returnHome) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TuffPuff_Run)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -136,7 +136,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_TuffPuff_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -150,7 +150,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_TuffPuff_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -162,7 +162,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_TuffPuff_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -178,7 +178,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_TuffPuff_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -190,11 +190,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_TuffPuff_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_TuffPuff_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -235,7 +235,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TuffPuff_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -286,7 +286,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -315,7 +315,7 @@ EvtScript N(takeTurn) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0)
EVT_SETF(LVar0, EVT_FLOAT(180.0))

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

@ -727,17 +727,17 @@ EvtScript N(OnHit) = {
EVT_THREAD
EVT_SET(LVar0, 1)
EVT_SET(LVar1, LVar2)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_THREAD
EVT_THREAD
EVT_SET(LVar0, 2)
EVT_SET(LVar1, LVar3)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_THREAD
EVT_THREAD
EVT_SET(LVar0, 3)
EVT_SET(LVar1, LVar4)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_THREAD
EVT_WAIT(30)
EVT_RETURN
@ -754,43 +754,43 @@ EvtScript N(OnDeath) = {
EVT_END_IF
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0)
EVT_IF_FLAG(LVar0, 0x1)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(0), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x2)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(1), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x4)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(2), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x8)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(3), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x10)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(4), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x20)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(5), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x40)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(6), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x80)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(7), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x100)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(8), EVENT_DEATH)
EVT_END_IF
EVT_IF_FLAG(LVar0, 0x200)
EVT_CALL(func_80269EAC, 0)
EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT)
EVT_CALL(DispatchEvent, ArrayVar(9), EVENT_DEATH)
EVT_END_IF
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TURN_NUMBER), LVar0)
@ -809,7 +809,7 @@ EvtScript N(OnDeath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim09)
EVT_SET(LVar0, 1)
EVT_SET(LVar1, ANIM_HuffNPuff_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};
@ -911,7 +911,7 @@ EvtScript N(OnBurnDeath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim28)
EVT_SET(LVar0, 1)
EVT_SET(LVar1, ANIM_HuffNPuff_Anim26)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};
@ -1062,7 +1062,7 @@ EvtScript N(Speak1) = {
EVT_END_IF
EVT_GOTO(1)
EVT_LABEL(0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, LVar0)
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(SetBattleCamOffsetZ, -10)
@ -1079,7 +1079,7 @@ EvtScript N(Speak1) = {
EVT_CALL(UseIdleAnimation, LVar0, TRUE)
EVT_WAIT(20)
EVT_LABEL(1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(SetBattleCamOffsetZ, -10)
@ -1092,14 +1092,14 @@ EvtScript N(Speak1) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim02)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim03)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_RETURN
EVT_END
};
EvtScript N(Speak2) = {
EVT_USE_ARRAY(N(TuffPuffActorIds))
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(SetBattleCamOffsetZ, -10)
@ -1190,14 +1190,14 @@ EvtScript N(Speak2) = {
EVT_END_LOOP
EVT_END_IF
EVT_LABEL(1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_RETURN
EVT_END
};
EvtScript N(Speak3) = {
EVT_USE_ARRAY(N(TuffPuffActorIds))
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(SetBattleCamOffsetZ, -10)
@ -1287,14 +1287,14 @@ EvtScript N(Speak3) = {
EVT_END_LOOP
EVT_END_IF
EVT_LABEL(1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_RETURN
EVT_END
};
EvtScript N(Speak4) = {
EVT_USE_ARRAY(N(TuffPuffActorIds))
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(SetBattleCamOffsetZ, -10)
@ -1364,7 +1364,7 @@ EvtScript N(Speak4) = {
EVT_END_IF
EVT_CALL(UseIdleAnimation, LVar0, TRUE)
EVT_LABEL(1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(SetBattleCamOffsetZ, -10)
@ -1377,7 +1377,7 @@ EvtScript N(Speak4) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim02)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim03)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_RETURN
EVT_END
};
@ -1522,7 +1522,7 @@ EvtScript N(attackBodySlam) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim0B)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim0C)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim0D)
@ -1562,7 +1562,7 @@ EvtScript N(attackBodySlam) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim01)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim02)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim03)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(FlyToGoal, ACTOR_SELF, 80, -20, EASING_SIN_OUT)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -1577,7 +1577,7 @@ EvtScript N(attackBodySlam) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar3, 5)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -30, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, FALSE, FALSE)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetActorHP, ACTOR_SELF, LVar0)
@ -1602,7 +1602,7 @@ EvtScript N(attackBodySlam) = {
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 20, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetBattleFlags, LVar0)
EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED)
EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0)
@ -1881,7 +1881,7 @@ EvtScript N(normalAction) = {
EVT_BITWISE_OR_CONST(LVar0, N(FLAG_HEALED_ONCE))
EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
@ -1955,7 +1955,7 @@ EvtScript N(attackWindBreath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim21)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim22)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SET(LVarA, LVar0)
@ -2034,7 +2034,7 @@ EvtScript N(attackWindBreath) = {
EVT_END_SWITCH
EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_STONE)
EVT_CALL(ShowMessageBox, BTL_MSG_31, 180)
EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_03, 180)
EVT_CALL(ShowActionHud, TRUE)
EVT_CALL(LoadActionCommand, ACTION_COMMAND_WHIRLWIND)
EVT_CALL(action_command_whirlwind_init, 0)
@ -2234,7 +2234,7 @@ EvtScript N(electricCharge) = {
EVT_CALL(SnakingStatic, LVar0, LVar1, LVar2, LVar3)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0)
EVT_WAIT(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -2265,7 +2265,7 @@ EvtScript N(attackGroundLightning) = {
EVT_GOTO(0)
EVT_END_IF
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_THREAD_ID), LVarA)
EVT_KILL_THREAD(LVarA)
@ -2378,7 +2378,7 @@ EvtScript N(electicCharge_copy) = {
EVT_CALL(SnakingStatic, LVar0, LVar1, LVar2, LVar3)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0)
EVT_WAIT(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -2394,7 +2394,7 @@ EvtScript N(attackDirectLightning) = {
EVT_CALL(AddBattleCamZoom, -100)
EVT_CALL(SetBattleCamOffsetZ, 50)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(N(StartRumbleWithParams), 70, 80)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3))
@ -2470,7 +2470,7 @@ EvtScript N(attackDirectLightning) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim05)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim06)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -2520,7 +2520,7 @@ EvtScript N(attackDirectLightning) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim05)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim06)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -2573,7 +2573,7 @@ EvtScript N(attackDirectLightning) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim01)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim02)
@ -2928,7 +2928,7 @@ EvtScript N(attackGroundSlam) = {
EVT_WAIT(8)
EVT_END_IF
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 10, EASING_QUADRATIC_IN)
@ -4488,7 +4488,7 @@ EvtScript N(attackTuffPuffs) = {
EVT_WAIT(4)
EVT_END_IF
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_SET(LVar9, 0)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0)
EVT_IF_FLAG(LVar0, 0x00000001)
@ -4599,7 +4599,7 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0)
EVT_BITWISE_AND_CONST(LVar0, ~N(FLAG_4))
EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0)
EVT_IF_FLAG(LVar0, 0x00000001)
@ -5126,7 +5126,7 @@ EvtScript N(attackTuffPuffs) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_ELSE
EVT_CALL(ShowMessageBox, BTL_MSG_31, 180)
EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_03, 180)
EVT_CALL(ShowActionHud, TRUE)
EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH)
EVT_CALL(action_command_stop_leech_init)
@ -5178,7 +5178,7 @@ EvtScript N(attackTuffPuffs) = {
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(1)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0)
EVT_IF_FLAG(LVar0, 0x00000001)

12
src/battle/area/flo2/actor/monty_mole_boss.c
View File

@ -235,13 +235,13 @@ EvtScript N(handleEvent) = {
EVT_END_CHILD_THREAD
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MontyMole_Dark_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Dark_Anim08)
EVT_WAIT(10)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MontyMole_Dark_Anim05)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_IF
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
@ -257,7 +257,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MontyMole_Dark_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -282,13 +282,13 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MontyMole_Dark_Anim05)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Dark_Anim06)
EVT_WAIT(10)
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MontyMole_Dark_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Dark_Anim06)
@ -355,7 +355,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_END_IF
EVT_CHILD_THREAD

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

@ -141,7 +141,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -155,7 +155,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -167,7 +167,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -183,7 +183,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -195,11 +195,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -240,7 +240,7 @@ EvtScript N(attack) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, 20, 30, LVar2)
@ -335,7 +335,7 @@ EvtScript N(attack) = {
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_EXEC_WAIT(N(returnHome))
@ -362,7 +362,7 @@ EvtScript N(attack) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(returnHome))

10
src/battle/area/flo2/actor/tuff_puff.c
View File

@ -253,7 +253,7 @@ EvtScript N(handleEvent) = {
EVT_ELSE
EVT_SET_CONST(LVar1, ANIM_RuffPuff_Anim0D)
EVT_END_IF
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_IS_BIG), LVar1)
@ -262,7 +262,7 @@ EvtScript N(handleEvent) = {
EVT_ELSE
EVT_SET_CONST(LVar1, ANIM_RuffPuff_Anim0D)
EVT_END_IF
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_IS_BIG), LVar1)
@ -301,7 +301,7 @@ EvtScript N(handleEvent) = {
EVT_ELSE
EVT_SET_CONST(LVar1, ANIM_RuffPuff_Anim11)
EVT_END_IF
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_ZERO_DAMAGE)
EVT_SET_CONST(LVar0, 1)
@ -329,7 +329,7 @@ EvtScript N(handleEvent) = {
EVT_ELSE
EVT_SET_CONST(LVar1, ANIM_RuffPuff_Anim0D)
EVT_END_IF
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_IS_BIG), LVar1)
@ -338,7 +338,7 @@ EvtScript N(handleEvent) = {
EVT_ELSE
EVT_SET_CONST(LVar1, ANIM_RuffPuff_Anim0D)
EVT_END_IF
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)

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

@ -138,7 +138,7 @@ EvtScript N(handleEvent_802191E0) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -149,7 +149,7 @@ EvtScript N(handleEvent_802191E0) = {
EVT_CASE_EQ(48)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -181,7 +181,7 @@ EvtScript N(takeTurn_80219444) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(SetBattleCamZoom, 400)
EVT_CALL(SetBattleCamOffsetZ, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0)
@ -227,7 +227,7 @@ EvtScript N(takeTurn_80219444) = {
EVT_END_IF
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(func_80269EAC, 5)
EVT_CALL(SetDamageSource, DMG_SRC_TUTORIAL_GOOMBARIO)
EVT_END_IF
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
@ -260,7 +260,7 @@ EvtScript N(takeTurn_80219444) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_Idle)
EVT_WAIT(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_Idle)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -300,7 +300,7 @@ EvtScript N(80219C74) = {
EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_JUMP)
EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL)
EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MOVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(SetGoalPos, ACTOR_PARTNER, -73, 40, 202)
EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 20, EASING_COS_IN_OUT)
@ -350,13 +350,13 @@ EvtScript N(80219C74) = {
EVT_CALL(SetActionSuccess, 1)
EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_LEARNED)
EVT_CALL(WaitForState, BATTLE_STATE_BEGIN_PARTNER_TURN)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE)
EVT_CALL(ActorSpeak, MSG_HOS_001D, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE)
EVT_CALL(WaitForState, BATTLE_STATE_9)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE)
EVT_CALL(ActorSpeak, MSG_HOS_001E, BS_FLAGS2_200, 1, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle)
@ -391,7 +391,7 @@ EvtScript N(80219C74) = {
EVT_CALL(SetActionSuccess, 1)
EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_BLOCK)
EVT_CALL(WaitForState, BATTLE_STATE_END_TURN)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_LEARNED)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE)
@ -469,7 +469,7 @@ EvtScript N(80219C74) = {
EVT_CALL(SetActionSuccess, 1)
EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_LEARNED)
EVT_CALL(WaitForState, BATTLE_STATE_BEGIN_PARTNER_TURN)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE)
EVT_CALL(ActorSpeak, MSG_HOS_0025, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly)

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

@ -258,7 +258,7 @@ EvtScript N(8021D890) = {
EVT_END_IF
EVT_RETURN
EVT_LABEL(0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_FLAG(LVar0, 0x80000)
EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4))
@ -324,14 +324,14 @@ EvtScript N(8021D890) = {
EvtScript N(runAway) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_IF_NE(LVar0, 57)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 15)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_END_IF
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -347,9 +347,9 @@ EvtScript N(runAway) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(YieldTurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_EXEC_WAIT(ForceNextTarget)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(EVS_ForceNextTarget)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(RemoveActor, ACTOR_SELF)
EVT_RETURN
EVT_END
@ -469,12 +469,12 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(61)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
@ -491,7 +491,7 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_EXEC_WAIT(N(8021E46C))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -505,7 +505,7 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_EXEC_WAIT(N(8021E46C))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(23)
EVT_SET_CONST(LVar0, 0x00000001)
@ -527,12 +527,12 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -574,7 +574,7 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_CASE_EQ(19)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -597,20 +597,20 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_EXEC_WAIT(N(8021D784))
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(12)
EVT_EXEC_WAIT(N(8021D784))
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_EXEC_WAIT(N(8021D890))
EVT_END_CASE_GROUP
EVT_CASE_EQ(61)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(15)
@ -630,7 +630,7 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_EXEC_WAIT(N(8021E46C))
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000002)
@ -644,7 +644,7 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_EXEC_WAIT(N(8021E46C))
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(23)
EVT_SET_CONST(LVar0, 0x00000002)
@ -666,12 +666,12 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(56)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -723,7 +723,7 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_CASE_EQ(19)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -803,7 +803,7 @@ EvtScript N(healOne) = {
EVT_CALL(func_8026BF48, 0)
EVT_END_THREAD
EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
@ -902,7 +902,7 @@ EvtScript N(healAll) = {
EVT_END_IF
EVT_CALL(WaitForBuffDone)
EVT_WAIT(1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
@ -932,10 +932,10 @@ EvtScript N(shapeSpell) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1)
@ -1401,7 +1401,7 @@ EvtScript N(makeCopy) = {
EVT_CALL(SetActorPos, LVarA, LVar0, LVar1, LVar2)
EVT_SET(LVar9, LVarA)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST4)
EVT_CALL(PlaySoundAtActor, LVar9, SOUND_SPELL_CAST4)
@ -1550,7 +1550,7 @@ EvtScript N(boostAttack) = {
EVT_CALL(func_8026BF48, 0)
EVT_END_THREAD
EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -1662,7 +1662,7 @@ EvtScript N(boostDefense) = {
EVT_CALL(func_8026BF48, 0)
EVT_END_THREAD
EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -1779,7 +1779,7 @@ EvtScript N(electrify) = {
EVT_CALL(func_8026BF48, 0)
EVT_END_THREAD
EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -1891,7 +1891,7 @@ EvtScript N(vanish) = {
EVT_CALL(func_8026BF48, 0)
EVT_END_THREAD
EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)

72
src/battle/area/isk_part_1/actor/pokey_mummy.c
View File

@ -232,31 +232,31 @@ EvtScript N(handleEvent_80219050) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_ELSE
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA)
EVT_IF_EQ(LVarA, 3)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_ELSE
EVT_CALL(func_80269E80, LVar0)
EVT_CALL(GetDamageSource, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(7)
EVT_CASE_OR_EQ(9)
EVT_CASE_OR_EQ(DMG_SRC_SHELL_TOSS)
EVT_CASE_OR_EQ(DMG_SRC_POWER_SHELL)
EVT_CASE_OR_EQ(DMG_SRC_FIRE_SHELL)
EVT_EXEC_WAIT(N(8021BDE4))
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_SWITCH
EVT_END_IF
EVT_END_IF
@ -265,34 +265,34 @@ EvtScript N(handleEvent_80219050) = {
EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_ELSE
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA)
EVT_IF_EQ(LVarA, 3)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_ELSE
EVT_CALL(func_80269E80, LVar0)
EVT_CALL(GetDamageSource, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(7)
EVT_CASE_OR_EQ(9)
EVT_CASE_OR_EQ(DMG_SRC_SHELL_TOSS)
EVT_CASE_OR_EQ(DMG_SRC_POWER_SHELL)
EVT_CASE_OR_EQ(DMG_SRC_FIRE_SHELL)
EVT_EXEC_WAIT(N(8021BDE4))
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_END_SWITCH
EVT_END_IF
EVT_END_IF
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar1)
@ -306,11 +306,11 @@ EvtScript N(handleEvent_80219050) = {
EVT_IF_EQ(LVarA, 3)
EVT_EXEC_WAIT(DoBurnHit)
EVT_ELSE
EVT_CALL(func_80269E80, LVarA)
EVT_CALL(GetDamageSource, LVarA)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(7)
EVT_CASE_OR_EQ(9)
EVT_CASE_OR_EQ(DMG_SRC_SHELL_TOSS)
EVT_CASE_OR_EQ(DMG_SRC_POWER_SHELL)
EVT_CASE_OR_EQ(DMG_SRC_FIRE_SHELL)
EVT_EXEC_WAIT(N(8021BDE4))
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
@ -330,11 +330,11 @@ EvtScript N(handleEvent_80219050) = {
EVT_IF_EQ(LVarA, 3)
EVT_EXEC_WAIT(DoBurnHit)
EVT_ELSE
EVT_CALL(func_80269E80, LVarA)
EVT_CALL(GetDamageSource, LVarA)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(7)
EVT_CASE_OR_EQ(9)
EVT_CASE_OR_EQ(DMG_SRC_SHELL_TOSS)
EVT_CASE_OR_EQ(DMG_SRC_POWER_SHELL)
EVT_CASE_OR_EQ(DMG_SRC_FIRE_SHELL)
EVT_EXEC_WAIT(N(8021BDE4))
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
@ -344,7 +344,7 @@ EvtScript N(handleEvent_80219050) = {
EVT_END_IF
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 7, LVar1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_EXEC_WAIT(N(8021B088))
@ -352,14 +352,14 @@ EvtScript N(handleEvent_80219050) = {
EVT_EXEC_WAIT(N(8021B088))
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_LAUNCH_HIT)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_ELSE
EVT_EXEC_WAIT(N(8021BDE4))
EVT_END_IF
@ -368,13 +368,13 @@ EvtScript N(handleEvent_80219050) = {
EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_ELSE
EVT_EXEC_WAIT(N(8021BDE4))
EVT_END_IF
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, -1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
@ -395,7 +395,7 @@ EvtScript N(handleEvent_80219050) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -466,7 +466,7 @@ EvtScript N(takeTurn_80219D88) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_END_IF
EVT_CALL(SetPartSounds, ACTOR_SELF, 6, ACTOR_SOUND_JUMP, 0, 0)
@ -589,7 +589,7 @@ EvtScript N(8021A6C8) = {
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -653,7 +653,7 @@ EvtScript N(8021A6C8) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -685,7 +685,7 @@ EvtScript N(8021A6C8) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -896,7 +896,7 @@ EvtScript N(8021B998) = {
EVT_CALL(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT)
EVT_GOTO(1)
EVT_LABEL(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03)
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1))
EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0))
EVT_CALL(JumpPartTo, ACTOR_SELF, 6, 296, 0, 0, 0, TRUE)
@ -978,7 +978,7 @@ EvtScript N(8021BDE4) = {
EvtScript N(8021C2BC) = {
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar9)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.05))
EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC)

20
src/battle/area/isk_part_1/actor/stone_chomp.c
View File

@ -556,7 +556,7 @@ EvtScript N(handleEvent_80222364) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_StoneChomp_Anim09)
@ -586,7 +586,7 @@ EvtScript N(handleEvent_80222364) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -601,7 +601,7 @@ EvtScript N(handleEvent_80222364) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim06)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
@ -644,16 +644,16 @@ EvtScript N(handleEvent_80222364) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
EVT_SET_CONST(LVar0, 1)
@ -661,7 +661,7 @@ EvtScript N(handleEvent_80222364) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_StoneChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -729,7 +729,7 @@ EvtScript N(takeTurn_80222ED0) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
@ -769,7 +769,7 @@ EvtScript N(takeTurn_80222ED0) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_StoneChomp_Anim04)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -807,7 +807,7 @@ EvtScript N(takeTurn_80222ED0) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_StoneChomp_Anim04)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)

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

@ -535,11 +535,11 @@ EvtScript N(handleEvent_802197C4) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -555,7 +555,7 @@ EvtScript N(handleEvent_802197C4) = {
EVT_CALL(SetActorVar, ACTOR_ENEMY0, 12, 2)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -570,7 +570,7 @@ EvtScript N(handleEvent_802197C4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
@ -645,17 +645,17 @@ EvtScript N(handleEvent_802197C4) = {
EVT_CALL(SetActorVar, ACTOR_ENEMY0, 12, 2)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_CALL(SetActorVar, ACTOR_ENEMY0, 12, 2)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
EVT_SET_CONST(LVar0, 1)
@ -664,7 +664,7 @@ EvtScript N(handleEvent_802197C4) = {
EVT_CALL(SetActorVar, ACTOR_ENEMY0, 12, 2)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim06)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -777,7 +777,7 @@ EvtScript N(takeTurn_8021A7C4) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
@ -842,7 +842,7 @@ EvtScript N(takeTurn_8021A7C4) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -877,7 +877,7 @@ EvtScript N(takeTurn_8021A7C4) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVarF)
EVT_CASE_DEFAULT
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ChainChomp_Anim04)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -924,7 +924,7 @@ EvtScript N(takeTurn_8021A7C4) = {
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ChainChomp_Anim01)
EVT_WAIT(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2)

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

@ -296,11 +296,11 @@ EvtScript N(handleEvent_8021BFD0) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Tutankoopa_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Tutankoopa_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(GetActorVar, ACTOR_SELF, 13, LVar2)
EVT_IF_NE(LVar2, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 13, 0)
@ -369,7 +369,7 @@ EvtScript N(handleEvent_8021BFD0) = {
EVT_CASE_OR_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Tutankoopa_Anim06)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Tutankoopa_Anim06)
@ -585,7 +585,7 @@ EvtScript N(8021D04C) = {
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, ANIM_BuzzyBeetle_Anim05)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -598,7 +598,7 @@ EvtScript N(8021D04C) = {
EVT_SUB(LVar0, 50)
EVT_SET(LVar1, -5)
EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 65)
EVT_SET(LVar1, -5)
@ -624,7 +624,7 @@ EvtScript N(8021D04C) = {
EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar8, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 55)
EVT_SET(LVar1, 0)
@ -639,7 +639,7 @@ EvtScript N(8021D04C) = {
EVT_IF_EQ(LVar8, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim02)
@ -664,8 +664,8 @@ EvtScript N(8021D81C) = {
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20)
EVT_CALL(ActorSpeak, MSG_CH2_00E5, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim03, ANIM_Tutankoopa_Anim03)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E1)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim03)
@ -673,7 +673,7 @@ EvtScript N(8021D81C) = {
EVT_ADD(LVar1, 20)
EVT_PLAY_EFFECT(EFFECT_HIEROGLYPHS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 70)
EVT_CALL(PlaySound, SOUND_20E7)
EVT_PLAY_EFFECT(EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0)
@ -929,13 +929,13 @@ EvtScript N(8021E9C8) = {
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetBattleCamZoom, 225)
EVT_CALL(SetBattleCamOffsetZ, -30)
EVT_CALL(MoveBattleCamOver, 40)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 35)
EVT_CALL(MoveBattleCamOver, 40)
@ -1016,7 +1016,7 @@ EvtScript N(8021E9C8) = {
EVT_END_THREAD
EVT_WAIT(8)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(3.0))
EVT_CALL(SetActorJumpGravity, LVarB, EVT_FLOAT(0.8))
@ -1103,7 +1103,7 @@ EvtScript N(8021F5E8) = {
EVT_ADD(LVar1, 20)
EVT_PLAY_EFFECT(EFFECT_HIEROGLYPHS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0)
EVT_WAIT(45)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 60)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E6)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1))
@ -1196,7 +1196,7 @@ EvtScript N(8021FA54) = {
EVT_END_THREAD
EVT_END_IF
EVT_END_IF
EVT_EXEC_WAIT(D_8029AF08)
EVT_EXEC_WAIT(EVS_AnimateDeath)
EVT_LABEL(0)
EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0)
EVT_IF_NE(LVar0, FALSE)

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

@ -193,11 +193,11 @@ EvtScript N(EVS_HandleEvent) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021FC34))
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -211,13 +211,13 @@ EvtScript N(EVS_HandleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoShockHit)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0)
EVT_EXEC_WAIT(N(EVS_FlyToHome))
@ -227,7 +227,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -239,11 +239,11 @@ EvtScript N(EVS_HandleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -334,7 +334,7 @@ EvtScript N(EVS_Attack_WindBlast) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim13)
EVT_WAIT(6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 50)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 90, EVT_FLOAT(0.5))
@ -359,7 +359,7 @@ EvtScript N(EVS_Attack_WindBlast) = {
EVT_RETURN
EVT_CASE_DEFAULT
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER)
EVT_CALL(ShowMessageBox, BTL_MSG_41, 90)
EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_13, 90)
EVT_CALL(ShowActionHud, TRUE)
EVT_CALL(LoadActionCommand, ACTION_COMMAND_WHIRLWIND)
EVT_CALL(action_command_whirlwind_init, 1)
@ -417,14 +417,14 @@ EvtScript N(EVS_Attack_WindBlast) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01)
EVT_WAIT(25)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_RETURN
EVT_END_SWITCH
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(ShowMessageBox, BTL_MSG_41, 90)
EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_13, 90)
EVT_CALL(ShowActionHud, TRUE)
EVT_CALL(LoadActionCommand, ACTION_COMMAND_WHIRLWIND)
EVT_CALL(action_command_whirlwind_init, 1)
@ -502,7 +502,7 @@ EvtScript N(EVS_Attack_WindBlast) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01)
EVT_WAIT(25)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_CALL(func_8026BF48, 0)
@ -515,7 +515,7 @@ EvtScript N(EVS_Attack_FeatherFling) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05)
EVT_CALL(SetBattleCamZoom, 180)
EVT_CALL(SetBattleCamOffsetZ, 0)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -564,7 +564,7 @@ EvtScript N(EVS_Attack_FeatherFling) = {
EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_FLY, 0, 0)
EVT_CALL(SetPartSounds, ACTOR_SELF, 4, ACTOR_SOUND_FLY, 0, 0)
EVT_CALL(SetPartSounds, ACTOR_SELF, 5, ACTOR_SOUND_FLY, 0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_THREAD
EVT_WAIT(20)
@ -625,7 +625,7 @@ EvtScript N(EVS_Attack_FeatherFling) = {
EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(func_8024ECF8, 0, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE)
EVT_WAIT(10)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -637,7 +637,7 @@ EvtScript N(EVS_Attack_FeatherFling) = {
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(func_8024ECF8, 0, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -814,7 +814,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -12, EASING_LINEAR)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -866,7 +866,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -907,7 +907,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_CALL(N(StartRumbleWithParams), 180, 20)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail)
EVT_CALL(ShowMessageBox, BTL_MSG_40, 90)
EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_12, 90)
EVT_THREAD
EVT_LOOP(90)
EVT_CALL(SetMessageBoxDuration, 99)
@ -947,7 +947,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_WAIT(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail))
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -999,7 +999,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_END_CASE_GROUP
@ -1018,7 +1018,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 240)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 60, 15, 0)
@ -1061,7 +1061,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -12, EASING_LINEAR)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -1115,7 +1115,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_END_CASE_GROUP

28
src/battle/area/iwa/actor/cleft.c
View File

@ -189,7 +189,7 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_END_IF
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_SWITCH
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
@ -222,7 +222,7 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
@ -230,7 +230,7 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
@ -250,14 +250,14 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
@ -279,7 +279,7 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_CASE_EQ(EVENT_SPIKE_TAUNT)
@ -316,19 +316,19 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_IF_EQ(LVar0, 1)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim09)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Cleft_Anim08)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
@ -435,7 +435,7 @@ EvtScript N(80219BA0) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 30)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -481,7 +481,7 @@ EvtScript N(80219BA0) = {
EVT_WAIT(15)
EVT_WAIT(8)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -509,11 +509,11 @@ EvtScript N(80219BA0) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim02)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 15)
EVT_SET(LVar1, 0)

22
src/battle/area/jan/actor/hurt_plant.c
View File

@ -148,7 +148,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_WAIT(3)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0E)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -162,7 +162,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0A)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim0D)
@ -178,7 +178,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0E)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim0D)
@ -196,7 +196,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0E)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -210,11 +210,11 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_WAIT(3)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0E)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0E)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -225,7 +225,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_WAIT(3)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_HurtPlant_Anim0E)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim04)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE)
@ -261,7 +261,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -283,7 +283,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2)
EVT_CALL(SetBattleCamZoom, 350)
EVT_CALL(SetBattleCamOffsetZ, 45)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -315,7 +315,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_EXEC_WAIT(N(8021DBFC))
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -334,7 +334,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim07)
EVT_WAIT(5)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))

28
src/battle/area/jan/actor/jungle_fuzzy.c
View File

@ -127,7 +127,7 @@ EvtScript N(handleEvent_8021EB9C) = {
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt)
EVT_END_IF
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -141,7 +141,7 @@ EvtScript N(handleEvent_8021EB9C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -153,7 +153,7 @@ EvtScript N(handleEvent_8021EB9C) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(func_80269470)
@ -176,7 +176,7 @@ EvtScript N(handleEvent_8021EB9C) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -189,19 +189,19 @@ EvtScript N(handleEvent_8021EB9C) = {
EVT_IF_FLAG(LVar0, DAMAGE_TYPE_SHOCK)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
@ -246,7 +246,7 @@ EvtScript N(divide) = {
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_THREAD
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206E)
@ -264,7 +264,7 @@ EvtScript N(divide) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3)
EVT_CALL(SetGoalToIndex, LVar0, LVarA)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Walk)
@ -301,7 +301,7 @@ EvtScript N(leechAttack) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -361,7 +361,7 @@ EvtScript N(leechAttack) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -426,7 +426,7 @@ EvtScript N(leechAttack) = {
EVT_WAIT(30)
EVT_END_LOOP
EVT_ELSE
EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x00007FFF)
EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_03, 0x00007FFF)
EVT_CALL(ShowActionHud, TRUE)
EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH)
EVT_CALL(action_command_stop_leech_init)
@ -611,7 +611,7 @@ EvtScript N(leechAttack) = {
EVT_END_IF
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Idle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.6), EVT_FLOAT(0.6), EVT_FLOAT(1.0))
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0)

18
src/battle/area/jan/actor/m_bush.c
View File

@ -125,7 +125,7 @@ EvtScript N(handleEvent_80221A74) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MBush_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -139,7 +139,7 @@ EvtScript N(handleEvent_80221A74) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MBush_Anim0B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -151,7 +151,7 @@ EvtScript N(handleEvent_80221A74) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MBush_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -168,7 +168,7 @@ EvtScript N(handleEvent_80221A74) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MBush_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -180,11 +180,11 @@ EvtScript N(handleEvent_80221A74) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MBush_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_MBush_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -219,7 +219,7 @@ EvtScript N(takeTurn_80221F78) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MBush_Anim04)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -252,7 +252,7 @@ EvtScript N(takeTurn_80221F78) = {
EVT_WAIT(15)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MBush_Anim02)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -274,7 +274,7 @@ EvtScript N(takeTurn_80221F78) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
EVT_SET(LVar1, 0)

52
src/battle/area/jan/actor/spear_guy.c
View File

@ -284,7 +284,7 @@ EvtScript N(idle_80218BE0) = {
};
EvtScript N(80218D7C) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim06)
EVT_EXEC_WAIT(DoReturnHome)
@ -310,7 +310,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07)
EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08)
EVT_EXEC_WAIT(N(80218B5C))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -342,7 +342,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0B)
@ -350,7 +350,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_ELSE
EVT_SET_CONST(LVar0, 2)
@ -359,7 +359,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
@ -378,7 +378,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim09)
EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08)
EVT_EXEC_WAIT(N(80218B5C))
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 2)
@ -398,7 +398,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -414,13 +414,13 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07)
EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08)
EVT_EXEC_WAIT(N(80218B5C))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 2)
EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim09)
EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08)
EVT_EXEC_WAIT(N(80218B5C))
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -513,7 +513,7 @@ EvtScript N(spearStab) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim06)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -552,7 +552,7 @@ EvtScript N(spearStab) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT)
EVT_EXEC_WAIT(N(80218D7C))
@ -572,7 +572,7 @@ EvtScript N(spearStab) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(20)
EVT_EXEC_WAIT(N(80218D7C))
EVT_END_CASE_GROUP
@ -590,7 +590,7 @@ EvtScript N(summonBackup) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 15)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim05)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_THREAD
@ -675,7 +675,7 @@ EvtScript N(summonBackup) = {
EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021A8DC)), 0)
EVT_END_IF
EVT_SET(LVarB, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim10)
EVT_CALL(SetGoalToIndex, LVarB, LVarA)
EVT_CALL(GetGoalPos, LVarB, LVar0, LVar1, LVar2)
@ -1147,7 +1147,7 @@ EvtScript N(handleEvent_8021C14C) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim0C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1161,7 +1161,7 @@ EvtScript N(handleEvent_8021C14C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim0E)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1173,7 +1173,7 @@ EvtScript N(handleEvent_8021C14C) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1190,7 +1190,7 @@ EvtScript N(handleEvent_8021C14C) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -1202,11 +1202,11 @@ EvtScript N(handleEvent_8021C14C) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim0C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -1241,7 +1241,7 @@ EvtScript N(8021C628) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim03)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1277,7 +1277,7 @@ EvtScript N(8021C628) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
@ -1311,7 +1311,7 @@ EvtScript N(8021C628) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
@ -1336,7 +1336,7 @@ EvtScript N(8021CD50) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09)
EVT_WAIT(20)
@ -1387,7 +1387,7 @@ EvtScript N(8021CD50) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -1417,7 +1417,7 @@ EvtScript N(8021CD50) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 14, 0)

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

@ -141,14 +141,14 @@ EvtScript N(nextTurn_80218C58) = {
EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 10)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_CALL(ActorSpeak, MSG_MAC_Port_009C, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_END_IF
@ -316,7 +316,7 @@ EvtScript N(handleEvent_802197FC) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -330,7 +330,7 @@ EvtScript N(handleEvent_802197FC) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1F)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -342,7 +342,7 @@ EvtScript N(handleEvent_802197FC) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
@ -362,7 +362,7 @@ EvtScript N(handleEvent_802197FC) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -373,11 +373,11 @@ EvtScript N(handleEvent_802197FC) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
@ -386,12 +386,12 @@ EvtScript N(handleEvent_802197FC) = {
EVT_EXEC_WAIT(DoRecover)
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim19)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -434,11 +434,11 @@ EvtScript N(handleEvent_80219ED4) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(80219D68))
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -453,7 +453,7 @@ EvtScript N(handleEvent_80219ED4) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim21)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
@ -473,7 +473,7 @@ EvtScript N(handleEvent_80219ED4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -485,11 +485,11 @@ EvtScript N(handleEvent_80219ED4) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim1C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -563,7 +563,7 @@ EvtScript N(8021A6D8) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_EXEC_WAIT(N(8021A2E8))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim0A)
@ -613,7 +613,7 @@ EvtScript N(8021A6D8) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_EXEC_WAIT(N(80219668))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0)
@ -647,7 +647,7 @@ EvtScript N(8021A6D8) = {
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04)
EVT_THREAD
EVT_SET(LVar0, 180)
@ -729,7 +729,7 @@ EvtScript N(8021B22C) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_EXEC_WAIT(N(8021A2E8))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim0A)
@ -790,7 +790,7 @@ EvtScript N(8021B22C) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_EXEC_WAIT(N(80219668))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0)
@ -900,7 +900,7 @@ EvtScript N(8021B22C) = {
EVT_WAIT(8)
EVT_WAIT(10)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(80219668))
EVT_END_CASE_GROUP
EVT_END_SWITCH
@ -933,7 +933,7 @@ EvtScript N(8021C004) = {
EVT_CALL(func_8026BF48, 0)
EVT_END_THREAD
EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN

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

@ -149,7 +149,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleKammy_Anim0D)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(speakOnHit))
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
@ -162,7 +162,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleKammy_Anim0D)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_EXEC_WAIT(N(onDeath))
EVT_RETURN
@ -200,36 +200,36 @@ API_CALLABLE(N(BlockAppear)) {
API_CALLABLE(func_8021833C_6DC0DC) {
if (isInitialCall) {
script->functionTemp[0] = 20;
set_screen_overlay_center(1, 0, 0, 0);
set_screen_overlay_center(1, 1, 320, 240);
set_screen_overlay_params_back(12, 150);
set_screen_overlay_center(SCREEN_LAYER_BACK, 0, 0, 0);
set_screen_overlay_center(SCREEN_LAYER_BACK, 1, 320, 240);
set_screen_overlay_params_back(OVERLAY_BLUR, 150);
}
if (script->functionTemp[0] != 0) {
script->functionTemp[0]--;
return ApiStatus_BLOCK;
}
set_screen_overlay_center(1, 0, 0, 0);
set_screen_overlay_center(1, 1, 320, 240);
set_screen_overlay_params_back(0xFF, -1);
set_screen_overlay_center(SCREEN_LAYER_BACK, 0, 0, 0);
set_screen_overlay_center(SCREEN_LAYER_BACK, 1, 320, 240);
set_screen_overlay_params_back(OVERLAY_NONE, -1);
return ApiStatus_DONE2;
}
API_CALLABLE(func_802183EC_6DC18C) {
if (isInitialCall) {
script->functionTemp[0] = 30;
set_screen_overlay_center(1, 0, 0, 0);
set_screen_overlay_center(1, 1, 320, 240);
set_screen_overlay_params_back(12, 150);
set_screen_overlay_center(SCREEN_LAYER_BACK, 0, 0, 0);
set_screen_overlay_center(SCREEN_LAYER_BACK, 1, 320, 240);
set_screen_overlay_params_back(OVERLAY_BLUR, 150);
}
if (script->functionTemp[0] != 0) {
script->functionTemp[0]--;
return ApiStatus_BLOCK;
}
set_screen_overlay_center(1, 0, 0, 0);
set_screen_overlay_center(1, 1, 320, 240);
set_screen_overlay_params_back(0xFF, -1);
set_screen_overlay_center(SCREEN_LAYER_BACK, 0, 0, 0);
set_screen_overlay_center(SCREEN_LAYER_BACK, 1, 320, 240);
set_screen_overlay_params_back(OVERLAY_NONE, -1);
return ApiStatus_DONE2;
}
@ -353,7 +353,7 @@ EvtScript N(takeTurn) = {
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_WAIT(19)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(GetLastDamage, ACTOR_PARTNER, LVar0)
@ -373,7 +373,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(ActorSpeak, MSG_CH8_009A, ACTOR_SELF, 1, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05)
EVT_WAIT(10)
EVT_CALL(FreezeBattleCam, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -413,7 +413,7 @@ EvtScript N(nextTurn) = {
EVT_WAIT(10)
EVT_CALL(ActorSpeak, MSG_CH8_0095, ACTOR_PLAYER, 1, ANIM_BattleParakarry_EnterShell, ANIM_BattleParakarry_ShellFly)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorVar, ACTOR_SELF, 0, 1)
EVT_END_SWITCH
EVT_CASE_EQ(12)
@ -440,7 +440,7 @@ EvtScript N(speakOnHit) = {
EVT_CALL(ActorSpeak, MSG_CH8_0097, ACTOR_SELF, 1, ANIM_BattleKammy_Anim09, ANIM_BattleKammy_Anim05)
EVT_WAIT(10)
EVT_CALL(FreezeBattleCam, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CASE_OR_EQ(9)
EVT_CASE_OR_EQ(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19)
@ -453,7 +453,7 @@ EvtScript N(speakOnHit) = {
EVT_CALL(ActorSpeak, MSG_CH8_0098, ACTOR_SELF, 1, ANIM_BattleKammy_Anim0A, ANIM_BattleKammy_Anim05)
EVT_WAIT(10)
EVT_CALL(FreezeBattleCam, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(7)
EVT_CASE_OR_EQ(6)
@ -476,7 +476,7 @@ EvtScript N(speakOnHit) = {
EVT_CALL(ActorSpeak, MSG_CH8_0099, ACTOR_SELF, 1, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05)
EVT_WAIT(10)
EVT_CALL(FreezeBattleCam, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorVar, ACTOR_SELF, 0, 1)
EVT_END_CASE_GROUP
EVT_END_SWITCH
@ -506,7 +506,7 @@ EvtScript N(onDeath) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -521,7 +521,7 @@ EvtScript N(onDeath) = {
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE)
EVT_CALL(ActorSpeak, MSG_CH8_009B, ACTOR_SELF, 1, ANIM_BattleKammy_Anim03, ANIM_BattleKammy_Anim03)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 60)
EVT_WAIT(40)
EVT_CALL(SetBattleFlagBits, BS_FLAGS1_PLAYER_IN_BACK, FALSE)

14
src/battle/area/kmr_part_2/actor/blue_goomba.c
View File

@ -175,7 +175,7 @@ EvtScript N(handleEvent_80219D74) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -240,7 +240,7 @@ EvtScript N(handleEvent_80219D74) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
@ -290,7 +290,7 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Blue_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -369,7 +369,7 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Blue_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -419,7 +419,7 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
@ -481,7 +481,7 @@ EvtScript N(takeTurn_8021B2C8) = {
};
EvtScript N(doDeath_8021B388) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_SET(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
@ -520,7 +520,7 @@ EvtScript N(doDeath_8021B388) = {
EVT_CALL(ActorSpeak, MSG_CH0_00C1, ACTOR_ENEMY1, 1, -1, -1)
EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 1)
EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_END_IF

18
src/battle/area/kmr_part_2/actor/blue_goomba2.c
View File

@ -173,7 +173,7 @@ EvtScript N(handleEvent_8021D8C4) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -187,7 +187,7 @@ EvtScript N(handleEvent_8021D8C4) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -199,7 +199,7 @@ EvtScript N(handleEvent_8021D8C4) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -225,7 +225,7 @@ EvtScript N(handleEvent_8021D8C4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(19)
EVT_CASE_OR_EQ(23)
@ -238,11 +238,11 @@ EvtScript N(handleEvent_8021D8C4) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Blue_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0))
@ -288,7 +288,7 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Blue_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -367,7 +367,7 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Blue_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -417,7 +417,7 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))

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

@ -211,7 +211,7 @@ EvtScript N(idle_80220B50) = {
};
EvtScript N(80220DB0) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
@ -239,11 +239,11 @@ EvtScript N(handleEvent_80220F34) = {
EVT_CASE_EQ(9)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaKing_BurnHurt)
@ -282,7 +282,7 @@ EvtScript N(handleEvent_80220F34) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0)
EVT_KILL_THREAD(LVar0)
@ -370,13 +370,13 @@ EvtScript N(80221680) = {
EVT_CALL(SetBattleCamOffsetZ, 20)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(AddBattleCamZoom, -100)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
@ -420,7 +420,7 @@ EvtScript N(80221680) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaKing_Idle)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -433,7 +433,7 @@ EvtScript N(80221680) = {
EVT_RETURN
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -463,14 +463,14 @@ EvtScript N(80221CD4) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_WAIT(15)
EVT_CALL(func_8024ECF8, 0, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaKing_Angry)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaKing_Still)
EVT_THREAD
@ -678,7 +678,7 @@ EvtScript N(nextTurn_802229C4) = {
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(20)
EVT_CALL(func_802535B4, 1)
EVT_END_IF
@ -701,7 +701,7 @@ EvtScript N(80222D9C) = {
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(StartRumble, 1)
EVT_CALL(func_8026DF88, -127, 1, LVar0)
EVT_CALL(func_8026DF88, ACTOR_SELF, 1, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0)
EVT_IF_EQ(LVar0, 0)
@ -722,7 +722,7 @@ EvtScript N(80222D9C) = {
};
EvtScript N(doDeath_80222F50) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_SET(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)

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

@ -367,7 +367,7 @@ EvtScript N(80223DBC) = {
EVT_ELSE
EVT_CALL(FallPartTo, ACTOR_SELF, 2, 10, 32, 10, 10)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(SetOwnerTarget, ACTOR_ENEMY0, 2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)

14
src/battle/area/kmr_part_2/actor/red_goomba.c
View File

@ -175,7 +175,7 @@ EvtScript N(handleEvent_8021BB84) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -240,7 +240,7 @@ EvtScript N(handleEvent_8021BB84) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
@ -290,7 +290,7 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Red_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -369,7 +369,7 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Red_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -419,7 +419,7 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
@ -465,7 +465,7 @@ EvtScript N(init_8021D078) = {
};
EvtScript N(doDeath_8021D0C4) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_SET(LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
@ -504,7 +504,7 @@ EvtScript N(doDeath_8021D0C4) = {
EVT_CALL(ActorSpeak, MSG_CH0_00C0, ACTOR_ENEMY0, 1, -1, -1)
EVT_CALL(EnableIdleScript, ACTOR_ENEMY0, 1)
EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_END_IF

18
src/battle/area/kmr_part_2/actor/red_goomba2.c
View File

@ -173,7 +173,7 @@ EvtScript N(handleEvent_8021F2C4) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -187,7 +187,7 @@ EvtScript N(handleEvent_8021F2C4) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -199,7 +199,7 @@ EvtScript N(handleEvent_8021F2C4) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -225,7 +225,7 @@ EvtScript N(handleEvent_8021F2C4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(19)
EVT_CASE_OR_EQ(23)
@ -238,11 +238,11 @@ EvtScript N(handleEvent_8021F2C4) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_GoombaBros_Red_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0))
@ -288,7 +288,7 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Red_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -367,7 +367,7 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Red_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -417,7 +417,7 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))

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

@ -106,7 +106,7 @@ ActorBlueprint NAMESPACE = {
EvtScript N(80224510) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamOffsetZ, 38)
EVT_CALL(SetBattleCamZoom, 256)
@ -117,7 +117,7 @@ EvtScript N(80224510) = {
EvtScript N(802245A8) = {
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 12)
EVT_RETURN
EVT_END
@ -140,21 +140,21 @@ s32 N(IdleAnimations_8022464C)[] = {
EvtScript N(80224658) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, LVar1)
EVT_WAIT(10)
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LVar2, 0)
@ -184,7 +184,7 @@ EvtScript N(80224658) = {
EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(IdleAnimations_8022464C)))
EVT_WAIT(60)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE)
EVT_RETURN
EVT_END
};
@ -240,17 +240,17 @@ EvtScript N(handleEvent_80224B58) = {
EVT_EXEC_WAIT(N(802250E4))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(10)
EVT_EXEC_WAIT(N(802250E4))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(802251CC))
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Panic)
@ -387,7 +387,7 @@ EvtScript N(takeTurn_80225314) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Run)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -429,7 +429,7 @@ EvtScript N(takeTurn_80225314) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 25)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -458,7 +458,7 @@ EvtScript N(takeTurn_80225314) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_DEFAULT
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)

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

@ -254,7 +254,7 @@ EvtScript N(8022C804) = {
EvtScript N(8022CB2C) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamOffsetZ, 38)
EVT_CALL(SetBattleCamZoom, 256)
@ -265,7 +265,7 @@ EvtScript N(8022CB2C) = {
EvtScript N(8022CBC4) = {
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 12)
EVT_RETURN
EVT_END
@ -288,21 +288,21 @@ s32 N(IdleAnimations_8022CC68)[] = {
EvtScript N(8022CC74) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, LVar1)
EVT_WAIT(10)
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LVar2, 0)
@ -393,17 +393,17 @@ EvtScript N(handleEvent_8022D1C4) = {
EVT_CASE_EQ(9)
EVT_SET(LVar1, 0)
EVT_EXEC_WAIT(N(802315F0))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(10)
EVT_SET(LVar1, 0)
EVT_EXEC_WAIT(N(802315F0))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8022C6D4))
EVT_EXEC_WAIT(N(80232170))
EVT_CASE_EQ(32)
EVT_SET(LVar1, 0)
EVT_EXEC_WAIT(N(802315F0))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_EXEC_WAIT(N(802318F8))
EVT_RETURN
@ -501,7 +501,7 @@ EvtScript N(handleEvent_8022D1C4) = {
EVT_CASE_EQ(42)
EVT_SET(LVar1, 0)
EVT_EXEC_WAIT(N(802315F0))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(53)
EVT_EXEC_WAIT(N(80232040))
EVT_CALL(HPBarToHome, ACTOR_SELF)
@ -638,7 +638,7 @@ EvtScript N(8022DF54) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(ActorSpeak, MSG_CH8_005F, ACTOR_SELF, 2, 0x0023000F, 0x0023000F)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 120)
EVT_EXEC_WAIT(N(8022C804))
EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00020001, TRUE)
@ -669,7 +669,7 @@ EvtScript N(8022E198) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Run)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -703,7 +703,7 @@ EvtScript N(8022E198) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_CUBIC_OUT)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_ChargeArmsUp)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -749,7 +749,7 @@ EvtScript N(8022E198) = {
EVT_SUB(LVar0, 10)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Run)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0))
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -780,7 +780,7 @@ EvtScript N(8022E198) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)
EVT_SET(LVar1, 0)
@ -814,7 +814,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -826,7 +826,7 @@ EvtScript N(8022ED10) = {
EVT_CASE_OR_EQ(5)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -848,7 +848,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast)
@ -866,7 +866,7 @@ EvtScript N(8022ED10) = {
EVT_END_SWITCH
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -883,7 +883,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
@ -917,7 +917,7 @@ EvtScript N(8022F468) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_EnterEgg)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_EggIdle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
@ -1010,7 +1010,7 @@ EvtScript N(8022F468) = {
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 9, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
@ -1052,7 +1052,7 @@ EvtScript N(80230034) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_RaiseStaff)
EVT_WAIT(8)
@ -1139,7 +1139,7 @@ EvtScript N(80230034) = {
EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0)
EVT_WAIT(15)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
@ -1174,7 +1174,7 @@ EvtScript N(80230794) = {
EVT_ADD(LVar0, LVar3)
EVT_ADD(LVar1, LVar4)
EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 60)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
@ -1257,7 +1257,7 @@ EvtScript N(80230794) = {
EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0)
EVT_WAIT(14)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT), 0, SUPPRESS_EVENT_FLAG_10000, 9, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR)
EVT_LABEL(2)
EVT_CALL(UpdateLerp)
@ -1426,20 +1426,20 @@ EvtScript N(802318F8) = {
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2))
EVT_CALL(FallToGoal, ACTOR_SELF, 10)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(HPBarToCurrent, ACTOR_SELF)
EVT_CALL(func_8027D2D8, -127)
EVT_CALL(func_8027D2D8, ACTOR_SELF)
EVT_LABEL(0)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1471,19 +1471,19 @@ EvtScript N(802318F8) = {
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE)
EVT_RETURN
EVT_CASE_EQ(3)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LVar2, 0)

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

@ -90,7 +90,7 @@ ActorBlueprint NAMESPACE = {
EvtScript N(80222B30) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamOffsetZ, 38)
EVT_CALL(SetBattleCamZoom, 256)
@ -101,7 +101,7 @@ EvtScript N(80222B30) = {
EvtScript N(80222BC8) = {
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 12)
EVT_RETURN
EVT_END
@ -124,21 +124,21 @@ s32 N(IdleAnimations_80222C6C)[] = {
EvtScript N(80222C78) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, LVar1)
EVT_WAIT(10)
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LVar2, 0)
@ -169,7 +169,7 @@ EvtScript N(80222C78) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(IdleAnimations_80222C6C)))
EVT_WAIT(30)
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(15)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
@ -245,12 +245,12 @@ EvtScript N(handleEvent_80223290) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_JrTroopa_Panic)
@ -293,7 +293,7 @@ EvtScript N(takeTurn_802234A4) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Run)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -330,7 +330,7 @@ EvtScript N(takeTurn_802234A4) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Run)
@ -353,7 +353,7 @@ EvtScript N(takeTurn_802234A4) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)
@ -419,7 +419,7 @@ EvtScript N(nextTurn_80223D2C) = {
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 4)
EVT_END_IF
EVT_END_IF

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

@ -186,7 +186,7 @@ EvtScript N(8022A880) = {
EvtScript N(8022ABA8) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamOffsetZ, 38)
EVT_CALL(SetBattleCamZoom, 256)
@ -197,7 +197,7 @@ EvtScript N(8022ABA8) = {
EvtScript N(8022AC40) = {
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 12)
EVT_RETURN
EVT_END
@ -250,17 +250,17 @@ EvtScript N(handleEvent_8022ADD8) = {
EVT_CASE_EQ(9)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_MageJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_MageJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8022A750))
EVT_EXEC_WAIT(N(8022C2A4))
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_MageJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_MageJrTroopa_Still)
@ -391,7 +391,7 @@ EvtScript N(takeTurn_8022B4F0) = {
EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_SwingStaff)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
@ -522,19 +522,19 @@ EvtScript N(nextTurn_8022BB44) = {
};
EvtScript N(8022BF1C) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LVar2, 0)

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

@ -173,7 +173,7 @@ EvtScript N(802260AC) = {
EvtScript N(802263D4) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamOffsetZ, 38)
EVT_CALL(SetBattleCamZoom, 256)
@ -184,7 +184,7 @@ EvtScript N(802263D4) = {
EvtScript N(8022646C) = {
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 12)
EVT_RETURN
EVT_END
@ -249,14 +249,14 @@ EvtScript N(handleEvent_802266B0) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_ParaJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(80225F7C))
EVT_EXEC_WAIT(N(80227E1C))
EVT_END_CASE_GROUP
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_ParaJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_ParaJrTroopa_Hurt)
@ -394,7 +394,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -407,7 +407,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CASE_OR_EQ(5)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -429,7 +429,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast)
@ -446,7 +446,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CASE_DEFAULT
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -469,7 +469,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
@ -532,21 +532,21 @@ EvtScript N(nextTurn_80227724) = {
};
EvtScript N(802279B0) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2))
EVT_CALL(FallToGoal, ACTOR_SELF, 10)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(HPBarToCurrent, ACTOR_SELF)
EVT_CALL(func_8027D2D8, -127)
EVT_CALL(func_8027D2D8, ACTOR_SELF)
EVT_LABEL(0)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)

44
src/battle/area/kmr_part_3/actor/paragoomba.c
View File

@ -262,7 +262,7 @@ EvtScript N(handleEvent_8021C808) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(GetEncounterState, LVar0)
@ -283,12 +283,12 @@ EvtScript N(handleEvent_8021C808) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(12)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021D614))
EVT_CASE_EQ(15)
EVT_SET_CONST(LVar0, 0x00000002)
@ -311,7 +311,7 @@ EvtScript N(handleEvent_8021C808) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(19)
EVT_CASE_OR_EQ(23)
@ -324,11 +324,11 @@ EvtScript N(handleEvent_8021C808) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000002)
EVT_SET_CONST(LVar1, ANIM_Paragoomba_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(56)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -372,7 +372,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -387,7 +387,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -420,7 +420,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 2, EVT_FLOAT(1.0))
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Run)
@ -437,7 +437,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -458,7 +458,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -482,7 +482,7 @@ EvtScript N(takeTurn_8021CDFC) = {
extern EvtScript N(8021DC34);
EvtScript N(8021D614) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 0x00020005)
EVT_CALL(SetPartFlags, ACTOR_SELF, 3, 0x00120004)
EVT_CALL(SetPartFlags, ACTOR_SELF, 4, 0x00120004)
@ -646,7 +646,7 @@ EvtScript N(handleEvent_8021DF5C) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -660,7 +660,7 @@ EvtScript N(handleEvent_8021DF5C) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Goomba_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -672,7 +672,7 @@ EvtScript N(handleEvent_8021DF5C) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Goomba_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -698,7 +698,7 @@ EvtScript N(handleEvent_8021DF5C) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Goomba_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(19)
EVT_CASE_OR_EQ(23)
@ -711,11 +711,11 @@ EvtScript N(handleEvent_8021DF5C) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Goomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Goomba_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0))
@ -761,7 +761,7 @@ EvtScript N(takeTurn_8021E788) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -840,7 +840,7 @@ EvtScript N(takeTurn_8021E788) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -890,7 +890,7 @@ EvtScript N(takeTurn_8021E788) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
@ -951,7 +951,7 @@ EvtScript N(8021F4B0) = {
EVT_WAIT(1)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_CH0_00B8, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001)
EVT_SET(GF_Tutorial_FlyingEnemy, 1)

20
src/battle/area/kmr_part_3/actor/spiked_goomba.c
View File

@ -173,7 +173,7 @@ EvtScript N(handleEvent_8021A854) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -187,7 +187,7 @@ EvtScript N(handleEvent_8021A854) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_BurnEyesOpen)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -199,7 +199,7 @@ EvtScript N(handleEvent_8021A854) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -225,7 +225,7 @@ EvtScript N(handleEvent_8021A854) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(19)
EVT_CASE_OR_EQ(23)
@ -238,11 +238,11 @@ EvtScript N(handleEvent_8021A854) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0))
@ -303,7 +303,7 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -382,7 +382,7 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Dizzy)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -432,7 +432,7 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
@ -499,7 +499,7 @@ EvtScript N(8021BF1C) = {
EVT_WAIT(1)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180)
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_CH0_00B9, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001)
EVT_SET(GF_Tutorial_SpikyEnemy, 1)

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

@ -167,7 +167,7 @@ EvtScript N(802281B4) = {
EvtScript N(802284DC) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamOffsetZ, 38)
EVT_CALL(SetBattleCamZoom, 256)
@ -178,7 +178,7 @@ EvtScript N(802284DC) = {
EvtScript N(80228574) = {
EVT_CALL(func_802535B4, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 12)
EVT_RETURN
EVT_END
@ -246,19 +246,19 @@ EvtScript N(handleEvent_802287D0) = {
EVT_EXEC_WAIT(N(80228FE8))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedParaJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(10)
EVT_EXEC_WAIT(N(80228FE8))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedParaJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8022906C))
EVT_EXEC_WAIT(N(80228084))
EVT_EXEC_WAIT(N(8022A480))
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedParaJrTroopa_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_SpikedParaJrTroopa_Hurt)
@ -444,7 +444,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -457,7 +457,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CASE_OR_EQ(5)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -479,7 +479,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast)
@ -496,7 +496,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CASE_DEFAULT
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -519,7 +519,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
@ -575,8 +575,8 @@ EvtScript N(nextTurn_80229B38) = {
EVT_CALL(ActorSpeak, MSG_MAC_Port_00B8, ACTOR_SELF, 2, 0x00210005, 0x00210005)
EVT_WAIT(10)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, TRUE)
EVT_CALL(func_8026D940, -127, -20, 40)
EVT_CALL(func_8027D2D8, -127)
EVT_CALL(func_8026D940, ACTOR_SELF, -20, 40)
EVT_CALL(func_8027D2D8, ACTOR_SELF)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar0, 115)
EVT_SET(LVar1, 150)
@ -601,8 +601,8 @@ EvtScript N(nextTurn_80229B38) = {
EVT_CALL(ActorSpeak, MSG_MAC_Port_00B9, ACTOR_SELF, 2, 0x00210013, 0x00210013)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, FALSE)
EVT_CALL(N(FreeIcon), LVarA)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8026D940, -127, 0, 0)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(func_8026D940, ACTOR_SELF, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_OutOfBreath)
EVT_WAIT(25)
EVT_CALL(ActorSpeak, MSG_MAC_Port_00BA, ACTOR_SELF, 2, 0x00210016, 0x00210003)
@ -631,21 +631,21 @@ EvtScript N(nextTurn_80229B38) = {
};
EvtScript N(8022A018) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2))
EVT_CALL(FallToGoal, ACTOR_SELF, 10)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(HPBarToCurrent, ACTOR_SELF)
EVT_CALL(func_8027D2D8, -127)
EVT_CALL(func_8027D2D8, ACTOR_SELF)
EVT_LABEL(0)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)

70
src/battle/area/kpa/actor/bony_beetle.c
View File

@ -296,7 +296,7 @@ EvtScript N(handleEvent_normal) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim18)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_WAS_HIT), 1)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
@ -312,7 +312,7 @@ EvtScript N(handleEvent_normal) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1F)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -325,7 +325,7 @@ EvtScript N(handleEvent_normal) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim18)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_FLIP_TRIGGER)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED))
@ -373,16 +373,16 @@ EvtScript N(handleEvent_normal) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim18)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim18)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim18)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -417,13 +417,13 @@ EvtScript N(attackShellToss) = {
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim16)
EVT_GOTO(100)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim10)
EVT_WAIT(10)
EVT_THREAD
@ -457,7 +457,7 @@ EvtScript N(attackShellToss) = {
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim12)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -482,7 +482,7 @@ EvtScript N(attackShellToss) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)
EVT_SET(LVar1, 0)
@ -518,7 +518,7 @@ EvtScript N(handleEvent_spiky) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim19)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_WAS_HIT), 1)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
@ -534,7 +534,7 @@ EvtScript N(handleEvent_spiky) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim21)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -547,7 +547,7 @@ EvtScript N(handleEvent_spiky) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim19)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_FLIP_TRIGGER)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY_FLIPPED))
@ -619,16 +619,16 @@ EvtScript N(handleEvent_spiky) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim19)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim19)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim19)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -654,14 +654,14 @@ EvtScript N(attackSpikeBounce) = {
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim17)
EVT_WAIT(10)
EVT_GOTO(100)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim11)
EVT_WAIT(10)
EVT_THREAD
@ -698,7 +698,7 @@ EvtScript N(attackSpikeBounce) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(24.0))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0)
EVT_SET(LVar0, 0)
@ -761,7 +761,7 @@ EvtScript N(attackSpikeBounce) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -797,7 +797,7 @@ EvtScript N(attackSpikeBounce) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0)
EVT_SET(LVar0, 180)
@ -897,7 +897,7 @@ EvtScript N(handleEvent_flipped) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1A)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -911,7 +911,7 @@ EvtScript N(handleEvent_flipped) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim23)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -923,7 +923,7 @@ EvtScript N(handleEvent_flipped) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1A)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_FLIP_TRIGGER)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED))
@ -956,16 +956,16 @@ EvtScript N(handleEvent_flipped) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1A)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1A)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1A)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -1015,7 +1015,7 @@ EvtScript N(standUp) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
@ -1029,7 +1029,7 @@ EvtScript N(handleEvent_spiky_flipped) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1043,7 +1043,7 @@ EvtScript N(handleEvent_spiky_flipped) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim25)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -1055,7 +1055,7 @@ EvtScript N(handleEvent_spiky_flipped) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_FLIP_TRIGGER)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY_FLIPPED))
@ -1088,16 +1088,16 @@ EvtScript N(handleEvent_spiky_flipped) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1B)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim1B)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -1149,7 +1149,7 @@ EvtScript N(standUp_spiky) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN

10
src/battle/area/kpa/actor/dry_bones.c
View File

@ -290,11 +290,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_DryBones_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_DryBones_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, TRUE)
EVT_SET_CONST(LVar0, 1)
@ -309,7 +309,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_DryBones_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -336,7 +336,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_DryBones_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_WAIT(10)
@ -423,7 +423,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 1)
EVT_END_IF
EVT_CALL(GetBattlePhase, LVar0)

24
src/battle/area/kpa2/actor/bowser.c
View File

@ -178,7 +178,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_DEFAULT
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
@ -192,16 +192,16 @@ EvtScript N(handleEvent) = {
EvtScript N(onHit) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_RETURN
EVT_END
};
EvtScript N(onDeath) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};
@ -275,7 +275,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_RearUpMock)
EVT_WAIT(25)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Swipe)
EVT_WAIT(3)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
@ -283,7 +283,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Tantrum)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -311,7 +311,7 @@ EvtScript N(attackClawSwipe) = {
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
EVT_EXEC_WAIT(N(returnHome))
@ -335,7 +335,7 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 80, 0, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_WAIT(15)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PreJump)
@ -365,7 +365,7 @@ EvtScript N(attackHeavyJump) = {
EVT_WAIT(3)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_WAIT(25)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -405,7 +405,7 @@ EvtScript N(attackHeavyJump) = {
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
EVT_EXEC_WAIT(N(returnHome))
@ -438,7 +438,7 @@ EvtScript N(attackFlameBreath) = {
EVT_SUB(LVar3, 40)
EVT_SET(LVar4, 20)
EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 100)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_FireBreathLoop)
@ -502,7 +502,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_SUB(LVar2, 3)
EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0)
EVT_WAIT(16)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 45)
EVT_WAIT(19)
EVT_CALL(RemoveEffect, LVarF)

22
src/battle/area/kpa2/actor/bowser_intro.c
View File

@ -208,7 +208,7 @@ EvtScript N(nextTurn) = {
EVT_WAIT(10)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(20)
EVT_CALL(func_802535B4, 1)
EVT_END_IF
@ -276,7 +276,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_DEFAULT
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
@ -290,16 +290,16 @@ EvtScript N(handleEvent) = {
EvtScript N(onHit) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_RETURN
EVT_END
};
EvtScript N(onDeath) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};
@ -335,7 +335,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 0, 0)
@ -351,14 +351,14 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TURN_COUNTER), LVar1)
EVT_IF_LT(LVar1, 3)
EVT_SET(LVar0, 1)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_ELSE
EVT_SET(LVar0, 3)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_THREAD
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TURN_COUNTER), LVar0)
@ -420,7 +420,7 @@ EvtScript N(attackFireBreath) = {
EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Weep)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 55)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_FireBreathLoop)
@ -625,7 +625,7 @@ EvtScript N(jumpHome) = {
EVT_IF_NE(LVar1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4)

72
src/battle/area/kpa2/actor/bowser_phase_1.c
View File

@ -225,7 +225,7 @@ EvtScript N(nextTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(ActorSpeak, MSG_CH8_0073, ACTOR_SELF, 1, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20)
EVT_CALL(func_802535B4, 1)
@ -325,10 +325,10 @@ EvtScript N(handleEvent) = {
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
EVT_CALL(func_80269E80, LVar2)
EVT_CALL(GetDamageSource, LVar2)
EVT_SWITCH(LVar2)
EVT_CASE_OR_EQ(18)
EVT_CASE_OR_EQ(21)
EVT_CASE_OR_EQ(DMG_SRC_SPOOK)
EVT_CASE_OR_EQ(DMG_SRC_FRIGHT_JAR)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Mock)
EVT_WAIT(30)
EVT_END_CASE_GROUP
@ -352,7 +352,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CALL(N(UnfadeBackgroundToBlack))
@ -411,7 +411,7 @@ EvtScript N(handleEvent) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_END_IF
EVT_CALL(FreezeBattleCam, FALSE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_CASE_DEFAULT
@ -454,7 +454,7 @@ EvtScript N(onSpinSmashOrNormalHit) = {
EvtScript N(onHit) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_RETURN
EVT_END
};
@ -466,17 +466,17 @@ EvtScript N(onDeath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_WAIT(10)
EVT_END_IF
EVT_CALL(func_80269E80, LVar5)
EVT_CALL(GetDamageSource, LVar5)
EVT_SWITCH(LVar5)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(16)
EVT_CASE_OR_EQ(11)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(13)
EVT_CASE_OR_EQ(17)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_NEXT_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_SLAP_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT)
EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
EVT_SET(LocalFlag(0), 0)
@ -511,8 +511,8 @@ EvtScript N(onDeath) = {
EVT_ADD(LVar3, 8)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_EXEC_WAIT(ForceNextTarget)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(EVS_ForceNextTarget)
EVT_CALL(RemoveActor, ACTOR_SELF)
EVT_RETURN
EVT_END
@ -665,7 +665,7 @@ EvtScript N(useStarRod) = {
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 39)
EVT_WAIT(30)
EVT_RETURN
@ -676,7 +676,7 @@ EvtScript N(jumpHome) = {
EVT_IF_NE(LVar1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4)
@ -999,14 +999,14 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(SetBattleCamOffsetZ, 36)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 240)
EVT_CALL(SetBattleCamOffsetZ, 14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1045,7 +1045,7 @@ EvtScript N(attackHeavyJump) = {
EVT_WAIT(3)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_WAIT(25)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -1072,7 +1072,7 @@ EvtScript N(attackHeavyJump) = {
EVT_END_IF
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarF)
EVT_IF_NOT_FLAG(LVarF, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SET(LVar0, -1)
@ -1186,7 +1186,7 @@ EvtScript N(attackHeavyJump) = {
EVT_IF_EQ(LVarF, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
EVT_EXEC_WAIT(N(returnHome))
@ -1218,14 +1218,14 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 160)
EVT_CALL(SetBattleCamOffsetZ, 5)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1247,7 +1247,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_EXEC_WAIT(N(onAttackMissed))
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
@ -1268,14 +1268,14 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar0)
EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_ENCHANTED)
EVT_SET(LVar0, 12)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_ELSE
EVT_SET(LVar0, 6)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
@ -1285,7 +1285,7 @@ EvtScript N(attackClawSwipe) = {
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
@ -1465,7 +1465,7 @@ EvtScript N(attackFlameBreath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PreFireBreath)
EVT_WAIT(35)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_FireBreathStill)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 55)
EVT_WAIT(10)
EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar3)
@ -1564,9 +1564,9 @@ EvtScript N(onBurnHit) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(func_80269E80, LVar3)
EVT_CALL(GetDamageSource, LVar3)
EVT_SWITCH(LVar3)
EVT_CASE_EQ(9)
EVT_CASE_EQ(DMG_SRC_FIRE_SHELL)
EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar7)
EVT_SWITCH(LVar7)
EVT_CASE_OR_EQ(ACTOR_TYPE_MONTY_MOLE)

50
src/battle/area/kpa2/actor/bowser_phase_2.c
View File

@ -265,10 +265,10 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(returnHome))
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
EVT_CALL(func_80269E80, LVar2)
EVT_CALL(GetDamageSource, LVar2)
EVT_SWITCH(LVar2)
EVT_CASE_OR_EQ(18)
EVT_CASE_OR_EQ(21)
EVT_CASE_OR_EQ(DMG_SRC_SPOOK)
EVT_CASE_OR_EQ(DMG_SRC_FRIGHT_JAR)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Mock)
EVT_WAIT(30)
EVT_END_CASE_GROUP
@ -298,7 +298,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_EQ(EVENT_INVUNERABLE_TAUNT)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
@ -347,7 +347,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_DEFAULT
EVT_CALL(ActorSpeak, MSG_CH8_0086, ACTOR_PARTNER, 0, -1, -1)
EVT_END_SWITCH
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(GetActorHP, ACTOR_SELF, GB_FinalBowserHP)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE)
@ -371,16 +371,16 @@ EvtScript N(onHit) = {
EvtScript N(doOnHit) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_RETURN
EVT_END
};
EvtScript N(onDeath) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};
@ -516,7 +516,7 @@ EvtScript N(useStarRod) = {
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 39)
EVT_WAIT(30)
EVT_RETURN
@ -527,7 +527,7 @@ EvtScript N(jumpHome) = {
EVT_IF_NE(LVar1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4)
@ -852,14 +852,14 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(SetBattleCamOffsetZ, 54)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 240)
EVT_CALL(SetBattleCamOffsetZ, 21)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -898,7 +898,7 @@ EvtScript N(attackHeavyJump) = {
EVT_WAIT(3)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_WAIT(25)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -925,7 +925,7 @@ EvtScript N(attackHeavyJump) = {
EVT_END_IF
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarF)
EVT_IF_NOT_FLAG(LVarF, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SET(LVar0, -1)
@ -1039,7 +1039,7 @@ EvtScript N(attackHeavyJump) = {
EVT_IF_EQ(LVarF, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
EVT_EXEC_WAIT(N(returnHome))
@ -1071,14 +1071,14 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 160)
EVT_CALL(SetBattleCamOffsetZ, 5)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1100,7 +1100,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_EXEC_WAIT(N(onAttackMissed))
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
@ -1121,11 +1121,11 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar0)
EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED)
EVT_SET(LVar0, 16)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_ELSE
EVT_SET(LVar0, 8)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_IF
EVT_SWITCH(LVarF)
@ -1136,7 +1136,7 @@ EvtScript N(attackClawSwipe) = {
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
@ -1316,7 +1316,7 @@ EvtScript N(attackFlameBreath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PreFireBreath)
EVT_WAIT(35)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_FireBreathStill)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 55)
EVT_WAIT(10)
EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar3)
@ -1417,9 +1417,9 @@ EvtScript N(attackFlameBreath) = {
EvtScript N(onBurnHit) = {
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(func_80269E80, LVar3)
EVT_CALL(GetDamageSource, LVar3)
EVT_SWITCH(LVar3)
EVT_CASE_EQ(9)
EVT_CASE_EQ(DMG_SRC_FIRE_SHELL)
EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar7)
EVT_SWITCH(LVar7)
EVT_CASE_OR_EQ(ACTOR_TYPE_MONTY_MOLE)
@ -1511,7 +1511,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Brandish)

50
src/battle/area/kpa2/actor/bowser_phase_3.c
View File

@ -353,7 +353,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(N(onDeath))
EVT_RETURN
@ -377,7 +377,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(N(onDeath))
EVT_RETURN
@ -404,10 +404,10 @@ EvtScript N(handleEvent) = {
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
EVT_CALL(func_80269E80, LVar2)
EVT_CALL(GetDamageSource, LVar2)
EVT_SWITCH(LVar2)
EVT_CASE_OR_EQ(18)
EVT_CASE_OR_EQ(21)
EVT_CASE_OR_EQ(DMG_SRC_SPOOK)
EVT_CASE_OR_EQ(DMG_SRC_FRIGHT_JAR)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Mock)
EVT_WAIT(30)
EVT_END_CASE_GROUP
@ -433,7 +433,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_EQ(EVENT_INVUNERABLE_TAUNT)
EVT_SET(LVar1, ANIM_BattleBowser_Idle)
@ -485,7 +485,7 @@ EvtScript N(handleEvent) = {
EVT_CALL(SetBattleCamOffsetZ, 0)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(ActorSpeak, MSG_CH8_00A7, ACTOR_SELF, 1, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 45)
EVT_END_IF
EVT_CALL(FreezeBattleCam, FALSE)
@ -505,7 +505,7 @@ EvtScript N(onHit) = {
EvtScript N(doOnHit) = {
EVT_SET_CONST(LVar0, 1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_RETURN
EVT_END
};
@ -775,7 +775,7 @@ EvtScript N(useStarRod) = {
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 39)
EVT_WAIT(30)
EVT_RETURN
@ -786,7 +786,7 @@ EvtScript N(jumpHome) = {
EVT_IF_NE(LVar1, -1)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4)
@ -1085,14 +1085,14 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(SetBattleCamOffsetZ, 54)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 240)
EVT_CALL(SetBattleCamOffsetZ, 21)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1131,7 +1131,7 @@ EvtScript N(attackHeavyJump) = {
EVT_WAIT(3)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle)
EVT_WAIT(25)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -1158,7 +1158,7 @@ EvtScript N(attackHeavyJump) = {
EVT_END_IF
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarF)
EVT_IF_NOT_FLAG(LVarF, STATUS_FLAG_SHRINK)
EVT_CALL(func_80269EAC, 24)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SET(LVar0, -1)
@ -1272,7 +1272,7 @@ EvtScript N(attackHeavyJump) = {
EVT_IF_EQ(LVarF, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
EVT_EXEC_WAIT(N(returnHome))
@ -1304,14 +1304,14 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(SetBattleCamZoom, 160)
EVT_CALL(SetBattleCamOffsetZ, 5)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 40)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Walk)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1333,7 +1333,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_EXEC_WAIT(N(onAttackMissed))
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
@ -1354,11 +1354,11 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar0)
EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED)
EVT_SET(LVar0, 16)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_ELSE
EVT_SET(LVar0, 8)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_IF
EVT_SWITCH(LVarF)
@ -1369,7 +1369,7 @@ EvtScript N(attackClawSwipe) = {
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
@ -1549,7 +1549,7 @@ EvtScript N(attackFlameBreath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PreFireBreath)
EVT_WAIT(35)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_FireBreathStill)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 55)
EVT_WAIT(10)
EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar3)
@ -1650,9 +1650,9 @@ EvtScript N(attackFlameBreath) = {
EvtScript N(onBurnHit) = {
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(func_80269E80, LVar3)
EVT_CALL(GetDamageSource, LVar3)
EVT_SWITCH(LVar3)
EVT_CASE_EQ(9)
EVT_CASE_EQ(DMG_SRC_FIRE_SHELL)
EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar7)
EVT_SWITCH(LVar7)
EVT_CASE_OR_EQ(ACTOR_TYPE_MONTY_MOLE)
@ -1744,7 +1744,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Brandish)

24
src/battle/area/kpa3/actor/anti_guy.c
View File

@ -138,7 +138,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim0C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -152,7 +152,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim0E)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -164,7 +164,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -181,7 +181,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -193,11 +193,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim0C)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim0C)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)
@ -232,7 +232,7 @@ EvtScript N(bumpAttack) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim03)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -268,7 +268,7 @@ EvtScript N(bumpAttack) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
@ -302,7 +302,7 @@ EvtScript N(bumpAttack) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
@ -327,7 +327,7 @@ EvtScript N(acrobaticAttack) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09)
EVT_WAIT(20)
@ -378,7 +378,7 @@ EvtScript N(acrobaticAttack) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -408,7 +408,7 @@ EvtScript N(acrobaticAttack) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 14, 0)

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

@ -142,7 +142,7 @@ EvtScript N(explode) = {
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim07)
EVT_SET(LVar2, -12345)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};
@ -155,11 +155,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_EXEC_WAIT(N(explode))
EVT_RETURN
@ -194,7 +194,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(explode))
EVT_RETURN
EVT_CASE_EQ(EVENT_EXPLODE_TRIGGER)
@ -207,7 +207,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_SCARE_AWAY)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(explode))
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT)
@ -234,7 +234,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BulletBill_Gold_Anim04)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -1, 0)
EVT_WAIT(1)
@ -257,7 +257,7 @@ EvtScript N(takeTurn) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -277,12 +277,12 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim07)
EVT_SET(LVar2, -12345)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_END
};

8
src/battle/area/kpa4/actor/bombshell_bill_blaster.c
View File

@ -116,7 +116,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -130,7 +130,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -142,11 +142,11 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, 1)

30
src/battle/area/kzn/actor/lava_bubble.c
View File

@ -244,7 +244,7 @@ EvtScript N(handleEvent_80219500) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -258,7 +258,7 @@ EvtScript N(handleEvent_80219500) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim09)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -270,7 +270,7 @@ EvtScript N(handleEvent_80219500) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND)
@ -288,7 +288,7 @@ EvtScript N(handleEvent_80219500) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -301,10 +301,10 @@ EvtScript N(handleEvent_80219500) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -346,7 +346,7 @@ EvtScript N(fireTackle) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim03)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -386,7 +386,7 @@ EvtScript N(fireTackle) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 3, FALSE, TRUE, FALSE)
EVT_WAIT(14)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_EXEC_WAIT(N(80219464))
@ -409,7 +409,7 @@ EvtScript N(fireTackle) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_SET(LVar0, 1)
EVT_SET(LVar1, 4587524)
EVT_EXEC_WAIT(DoJumpBack)
@ -464,7 +464,7 @@ EvtScript N(fireballs_Partner) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA)
EVT_IF_EQ(LVarA, 1)
@ -504,7 +504,7 @@ EvtScript N(fireballs_Partner) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_EXEC_WAIT(N(80219464))
@ -532,7 +532,7 @@ EvtScript N(fireballs_Partner) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(80219464))
EVT_END_CASE_GROUP
EVT_END_SWITCH
@ -548,7 +548,7 @@ EvtScript N(fireballs_Player) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim03)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0)
@ -585,7 +585,7 @@ EvtScript N(fireballs_Player) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_EXEC_WAIT(N(80219464))
@ -621,7 +621,7 @@ EvtScript N(fireballs_Player) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR)
EVT_WAIT(20)

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

@ -302,7 +302,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar1)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -428,7 +428,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(playModelAnimation))
EVT_WAIT(4)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0)
EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0)
@ -514,7 +514,7 @@ EvtScript N(summonPetitPiranha) = {
EVT_CALL(SetBattleCamOffsetZ, 30)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(45)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_END_THREAD
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -980,7 +980,7 @@ EvtScript N(attackPetitSpit) = {
EVT_CALL(SetBattleCamOffsetZ, 30)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(45)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_END_THREAD
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -1036,7 +1036,7 @@ EvtScript N(attackPetitSpit) = {
EVT_IF_EQ(LVar9, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, LVar5, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(RemoveActor, LVar5)
EVT_RETURN
EVT_END_CASE_GROUP
@ -1078,7 +1078,7 @@ EvtScript N(attackPetitSpit) = {
EVT_IF_EQ(LVar9, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)

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

@ -1001,7 +1001,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_LavaPiranha_Anim09)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -1096,7 +1096,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE)
EVT_WAIT(4)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3BB)
EVT_SET(LVar0, ACTOR_ENEMY0)
@ -1138,7 +1138,7 @@ EvtScript N(attackFlameSpew) = {
EVT_CALL(SetBattleCamOffsetZ, 30)
EVT_CALL(MoveBattleCamOver, 45)
EVT_WAIT(57)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_END_THREAD
EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE)
@ -1178,7 +1178,7 @@ EvtScript N(attackFlameSpew) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
@ -1200,7 +1200,7 @@ EvtScript N(attackFlameSpew) = {
EVT_IF_EQ(LVarF, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -1220,7 +1220,7 @@ EvtScript N(attackFireStream) = {
EVT_CALL(SetBattleCamOffsetZ, 30)
EVT_CALL(MoveBattleCamOver, 45)
EVT_WAIT(54)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_END_THREAD
EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE)
@ -1262,7 +1262,7 @@ EvtScript N(attackFireStream) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
@ -1284,7 +1284,7 @@ EvtScript N(attackFireStream) = {
EVT_IF_EQ(LVarF, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN

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

@ -125,7 +125,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -141,7 +141,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -154,7 +154,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_SET_CONST(LVar0, 1)
@ -167,7 +167,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -184,12 +184,12 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_EXEC_WAIT(N(onDeath))
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_END_FIRST_STRIKE)
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
@ -199,7 +199,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_PetitPiranha_Anim03)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(1000)
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -283,7 +283,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_LINEAR)
EVT_WAIT(10)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CB)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
@ -347,7 +347,7 @@ EvtScript N(takeTurn) = {
EVT_IF_EQ(LVar9, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(onDeath))
EVT_CALL(RemoveActor, ACTOR_SELF)
EVT_RETURN
@ -377,7 +377,7 @@ EvtScript N(takeTurn) = {
EVT_IF_EQ(LVar9, 10)
EVT_RETURN
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_EXEC_WAIT(N(onDeath))

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

@ -161,7 +161,7 @@ EvtScript N(idle_8021A11C) = {
};
EvtScript N(8021A12C) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9)
@ -221,16 +221,16 @@ EvtScript N(handleEvent_8021A560) = {
EVT_CASE_EQ(9)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_CASE_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021A12C))
EVT_CASE_EQ(13)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_EXEC_WAIT(N(8021A12C))
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -245,7 +245,7 @@ EvtScript N(handleEvent_8021A560) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -263,7 +263,7 @@ EvtScript N(handleEvent_8021A560) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(23)
EVT_SET_CONST(LVar0, 0x00000001)
@ -281,11 +281,11 @@ EvtScript N(handleEvent_8021A560) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_CASE_EQ(57)
@ -329,7 +329,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_SET_CONST(LVar2, ANIM_Chan_ToppledHurt)
EVT_EXEC_WAIT(N(8021AA1C))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
@ -353,7 +353,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_ToppledBurnHurt)
@ -361,7 +361,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_ToppledBurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(11)
@ -419,7 +419,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(23)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
@ -463,13 +463,13 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_SET_CONST(LVar2, ANIM_Chan_ToppledHurt)
EVT_EXEC_WAIT(N(8021AA1C))
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_SET_CONST(LVar2, ANIM_Chan_ToppledHurt)
EVT_EXEC_WAIT(N(8021AA1C))
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(33)
EVT_SET_CONST(LVar0, 0x00000001)
@ -481,7 +481,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_SET_CONST(LVar1, ANIM_Chan_Hurt)
EVT_SET_CONST(LVar2, ANIM_Chan_ToppledHurt)
EVT_EXEC_WAIT(N(8021AA1C))
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
@ -566,7 +566,7 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -588,11 +588,11 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05)
EVT_CALL(SetBattleCamZoom, 430)
EVT_CALL(SetBattleCamOffsetZ, 20)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_END_IF
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
@ -625,7 +625,7 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_WAIT(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -658,7 +658,7 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
EVT_SET(LVar1, 0)
@ -698,7 +698,7 @@ EvtScript N(takeTurn_Chan) = {
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(30)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_ELSE
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(20)
@ -723,7 +723,7 @@ EvtScript N(takeTurn_Chan) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_EnterShell)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ShellStill)
@ -755,12 +755,12 @@ EvtScript N(takeTurn_Chan) = {
EVT_END_IF
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_THREAD
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -150, 0, 0)
@ -793,7 +793,7 @@ EvtScript N(takeTurn_Chan) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)
EVT_SET(LVar1, 0)
@ -845,7 +845,7 @@ EvtScript N(nextTurn_8021CD7C) = {
EVT_CASE_EQ(10)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_001F, ACTOR_SELF, 1, 0x00A30004, 0x00A30003)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1)
@ -872,7 +872,7 @@ EvtScript N(nextTurn_8021CD7C) = {
EVT_IF_LE(LVar0, LVar1)
EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0021, ACTOR_SELF, 1, LVarA, LVarB)
EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1)
@ -881,7 +881,7 @@ EvtScript N(nextTurn_8021CD7C) = {
EVT_END_IF
EVT_CALL(GetPlayerHP, LVar0)
EVT_IF_LE(LVar0, 5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0022, ACTOR_SELF, 1, LVarA, LVarB)
EVT_BREAK_SWITCH
@ -926,7 +926,7 @@ EvtScript N(handleEvent_8021D0CC) = {
EVT_ADD(LVar0, 1)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0020, ACTOR_SELF, 1, 0x00A30007, 0x00A30002)
EVT_CASE_EQ(2)

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

@ -165,7 +165,7 @@ EvtScript N(handleEvent_8021D600) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Lee_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -179,7 +179,7 @@ EvtScript N(handleEvent_8021D600) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Lee_Burned)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -191,7 +191,7 @@ EvtScript N(handleEvent_8021D600) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Lee_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
@ -208,7 +208,7 @@ EvtScript N(handleEvent_8021D600) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Lee_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -220,11 +220,11 @@ EvtScript N(handleEvent_8021D600) = {
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Lee_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_Lee_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -260,7 +260,7 @@ EvtScript N(flyingTackle) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_Crouch)
EVT_WAIT(20)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2CB, 0)
@ -269,7 +269,7 @@ EvtScript N(flyingTackle) = {
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_SET(LVarA, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_Midair)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -312,7 +312,7 @@ EvtScript N(flyingTackle) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_Land)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -343,7 +343,7 @@ EvtScript N(8021E0E0) = {
EvtScript N(8021E118) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_WAIT(30)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA)
@ -375,7 +375,7 @@ EvtScript N(8021E118) = {
EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations_8021D3AC)))
EVT_CALL(SetAnimation, LVarA, 1, ANIM_Lee_Hurt)
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, LVarA, LVarB, LVarC, LVarD)
EVT_IF_GT(LVarC, 0)
EVT_SET(LVarC, 0)
@ -402,7 +402,7 @@ EvtScript N(8021E118) = {
};
EvtScript N(8021E5DC) = {
EVT_CALL(func_8027D32C, -127)
EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_SET(LVarA, LVar0)
EVT_SET(LVarB, LVar1)
EVT_SET(LVarC, LVar2)
@ -420,7 +420,7 @@ EvtScript N(8021E5DC) = {
EVT_SET(LVar0, LVarA)
EVT_SET(LVar1, LVarB)
EVT_EXEC_WAIT(DoShockHit)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, LVarC, 0)
EVT_SET(LVar0, 0)
@ -561,7 +561,7 @@ EvtScript N(handleEvent_8021EB24) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -577,7 +577,7 @@ EvtScript N(handleEvent_8021EB24) = {
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_BurnHurt2)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -590,7 +590,7 @@ EvtScript N(handleEvent_8021EB24) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -609,7 +609,7 @@ EvtScript N(handleEvent_8021EB24) = {
EVT_EXEC_WAIT(N(8021E5DC))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -622,11 +622,11 @@ EvtScript N(handleEvent_8021EB24) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -656,7 +656,7 @@ EvtScript N(handleEvent_8021EB24) = {
};
EvtScript N(8021F08C) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_Idle)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0)
@ -718,7 +718,7 @@ EvtScript N(8021F08C) = {
EvtScript N(8021F514) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -1024,7 +1024,7 @@ EvtScript N(80220100) = {
EVT_WAIT(12)
EVT_CALL(SetCamEnabled, CAM_TATTLE, FALSE)
EVT_WAIT(32)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -1222,7 +1222,7 @@ EvtScript N(handleEvent_80220908) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -1237,7 +1237,7 @@ EvtScript N(handleEvent_80220908) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleKooper_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -1250,7 +1250,7 @@ EvtScript N(handleEvent_80220908) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(13)
EVT_CALL(SetActorVar, ACTOR_SELF, 4, 1)
@ -1303,11 +1303,11 @@ EvtScript N(handleEvent_80220908) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0)
@ -1425,7 +1425,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 75)
EVT_CALL(func_8024ECF8, 1, 1, 1)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE)
EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
@ -1468,7 +1468,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_END_LOOP
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1511,7 +1511,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ExitShell)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Run)
@ -1539,7 +1539,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 60)
@ -1707,7 +1707,7 @@ EvtScript N(handleEvent_80222468) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -1722,7 +1722,7 @@ EvtScript N(handleEvent_80222468) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -1735,7 +1735,7 @@ EvtScript N(handleEvent_80222468) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -1754,7 +1754,7 @@ EvtScript N(handleEvent_80222468) = {
EVT_EXEC_WAIT(N(8021E5DC))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -1767,11 +1767,11 @@ EvtScript N(handleEvent_80222468) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -1851,7 +1851,7 @@ EvtScript N(takeTurn_802229C4) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -1882,7 +1882,7 @@ EvtScript N(takeTurn_802229C4) = {
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Idle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 8)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Backfire2)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -2073,7 +2073,7 @@ EvtScript N(handleEvent_80223584) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2089,7 +2089,7 @@ EvtScript N(handleEvent_80223584) = {
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleParakarry_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2102,7 +2102,7 @@ EvtScript N(handleEvent_80223584) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2121,7 +2121,7 @@ EvtScript N(handleEvent_80223584) = {
EVT_EXEC_WAIT(N(8021E5DC))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -2134,11 +2134,11 @@ EvtScript N(handleEvent_80223584) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2181,7 +2181,7 @@ EvtScript N(80223B74) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 0, 0)
@ -2189,7 +2189,7 @@ EvtScript N(80223B74) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Still)
EVT_WAIT(3)
EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_FlyFast)
@ -2225,7 +2225,7 @@ EvtScript N(80223B74) = {
EVT_WAIT(20)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -2255,7 +2255,7 @@ EvtScript N(80223B74) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Dive)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -2435,7 +2435,7 @@ EvtScript N(handleEvent_8022460C) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2451,7 +2451,7 @@ EvtScript N(handleEvent_8022460C) = {
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_BurnStillAlt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2464,10 +2464,10 @@ EvtScript N(handleEvent_8022460C) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
EVT_SET(LVar2, 14)
@ -2481,7 +2481,7 @@ EvtScript N(handleEvent_8022460C) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 60)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run)
@ -2495,7 +2495,7 @@ EvtScript N(handleEvent_8022460C) = {
EVT_END_LOOP
EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255)
EVT_CASE_EQ(38)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
@ -2503,7 +2503,7 @@ EvtScript N(handleEvent_8022460C) = {
EVT_EXEC_WAIT(N(8021E5DC))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -2516,11 +2516,11 @@ EvtScript N(handleEvent_8022460C) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -2562,7 +2562,7 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
@ -2596,7 +2596,7 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_SET(LVarA, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_SlapOnce)
EVT_WAIT(2)
@ -2627,7 +2627,7 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 60)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run)
@ -2664,17 +2664,17 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_SlapOnce)
EVT_SET(LocalFlag(0), 1)
EVT_IF_EQ(LVarA, LVar8)
EVT_CALL(func_80269EAC, 12)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT)
EVT_ELSE
EVT_CALL(func_80269EAC, 10)
EVT_CALL(SetDamageSource, DMG_SRC_NEXT_SLAP_LEFT)
EVT_END_IF
EVT_ELSE
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_SlapBack)
EVT_SET(LocalFlag(0), 0)
EVT_IF_EQ(LVarA, LVar8)
EVT_CALL(func_80269EAC, 13)
EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_RIGHT)
EVT_ELSE
EVT_CALL(func_80269EAC, 11)
EVT_CALL(SetDamageSource, DMG_SRC_NEXT_SLAP_RIGHT)
EVT_END_IF
EVT_END_IF
EVT_WAIT(2)
@ -2718,7 +2718,7 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run)
@ -3016,7 +3016,7 @@ EvtScript N(handleEvent_80225B90) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3032,7 +3032,7 @@ EvtScript N(handleEvent_80225B90) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleWatt_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3046,7 +3046,7 @@ EvtScript N(handleEvent_80225B90) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -3060,11 +3060,11 @@ EvtScript N(handleEvent_80225B90) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3105,7 +3105,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_CALL(SetBattleCamZoom, 350)
EVT_CALL(SetBattleCamOffsetZ, 40)
EVT_CALL(MoveBattleCamOver, 80)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run)
@ -3139,7 +3139,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_CALL(func_802196A4_465B34, 1)
EVT_CALL(func_80219658_465AE8, 1)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run)
@ -3153,7 +3153,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_SET(LVarA, 40)
EVT_CALL(AddBattleCamZoom, -75)
EVT_CALL(MoveBattleCamOver, LVarA)
EVT_CALL(func_8024ECF8, 0, 0, 1)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_289)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_FLAG(LVar0, 0x80000)
@ -3177,7 +3177,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle)
EVT_CALL(func_8026EA7C, -127, 1, 9)
EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 9)
EVT_CALL(AddBattleCamZoom, 75)
EVT_CALL(MoveBattleCamOver, 5)
EVT_THREAD
@ -3199,7 +3199,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(func_802196A4_465B34, 1)
EVT_CALL(func_80219658_465AE8, 1)
EVT_CALL(AddGoalPos, ACTOR_SELF, 25, 10, 0)
@ -3353,7 +3353,7 @@ EvtScript N(handleEvent_80226B54) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3369,7 +3369,7 @@ EvtScript N(handleEvent_80226B54) = {
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleSushie_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3382,7 +3382,7 @@ EvtScript N(handleEvent_80226B54) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3401,7 +3401,7 @@ EvtScript N(handleEvent_80226B54) = {
EVT_EXEC_WAIT(N(8021E5DC))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -3414,11 +3414,11 @@ EvtScript N(handleEvent_80226B54) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3452,7 +3452,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0)
@ -3469,11 +3469,11 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(RunToGoal, ACTOR_SELF, LVarA, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Idle)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(AddBattleCamZoom, -50)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(func_8024ECF8, 1, 1, 1)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Tense1)
EVT_WAIT(15)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Tense2)
@ -3483,7 +3483,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_SET(LVarA, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Jump)
EVT_THREAD
@ -3562,7 +3562,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -3573,7 +3573,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_RETURN
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Jump)
EVT_THREAD
@ -3678,7 +3678,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Idle)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -3844,7 +3844,7 @@ EvtScript N(handleEvent_80228614) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3860,7 +3860,7 @@ EvtScript N(handleEvent_80228614) = {
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3873,7 +3873,7 @@ EvtScript N(handleEvent_80228614) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3892,7 +3892,7 @@ EvtScript N(handleEvent_80228614) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
@ -3905,11 +3905,11 @@ EvtScript N(handleEvent_80228614) = {
EVT_EXEC_WAIT(N(8021E0E0))
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Dead)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_SET_CONST(LVar0, 0x00000001)
@ -3944,7 +3944,7 @@ EvtScript N(takeTurn_80228B78) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, 20, 30, LVar2)
@ -4037,7 +4037,7 @@ EvtScript N(takeTurn_80228B78) = {
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 60)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -4074,7 +4074,7 @@ EvtScript N(takeTurn_80228B78) = {
EVT_CASE_OR_EQ(2)
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 8)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
@ -4231,7 +4231,7 @@ EvtScript N(copyPartner) = {
EVT_CALL(SetActorVar, LVarA, 0, LVar0)
EVT_CALL(SetActorVar, LVarA, 1, LVar6)
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_THREAD
EVT_CALL(MakeLerp, 200, 0, 20, EASING_LINEAR)
@ -4304,7 +4304,7 @@ EvtScript N(nextTurn_8022A038) = {
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1)
EVT_DIV(LVar1, 2)
EVT_IF_LE(LVar0, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_IF_EQ(LVar0, 1)
@ -4316,7 +4316,7 @@ EvtScript N(nextTurn_8022A038) = {
EVT_END_IF
EVT_CALL(GetPlayerHP, LVar0)
EVT_IF_LE(LVar0, 5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0029, ACTOR_SELF, 1, 0x00A40006, 0x00A40003)
EVT_BREAK_SWITCH

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

@ -122,7 +122,7 @@ EvtScript N(8022A4A4) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -136,7 +136,7 @@ EvtScript N(8022A4A4) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_Defeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -173,16 +173,16 @@ EvtScript N(8022A4A4) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_Defeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_Defeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(33)
EVT_SET_CONST(LVar0, 0x00000001)
@ -190,7 +190,7 @@ EvtScript N(8022A4A4) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_Defeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_SET_CONST(LVar0, 0x00000001)
@ -221,7 +221,7 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Run)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0)
@ -247,7 +247,7 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -278,7 +278,7 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 20)
@ -290,7 +290,7 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_WAIT(20)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Idle)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
@ -311,7 +311,7 @@ EvtScript N(nextTurn_8022B06C) = {
EVT_CASE_EQ(10)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_002E, ACTOR_SELF, 1, 0x00A20009, 0x00A20005)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1)
@ -325,14 +325,14 @@ EvtScript N(nextTurn_8022B06C) = {
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1)
EVT_DIV(LVar1, 2)
EVT_IF_LE(LVar0, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0031, ACTOR_SELF, 1, 0x00A20009, 0x00A20005)
EVT_BREAK_SWITCH
EVT_END_IF
EVT_CALL(GetPlayerHP, LVar0)
EVT_IF_LE(LVar0, 5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0032, ACTOR_SELF, 1, 0x00A20009, 0x00A20005)
EVT_BREAK_SWITCH
@ -387,13 +387,13 @@ EvtScript N(handleEvent_8022B2CC) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_IF_EQ(LVarA, 1)
EVT_IF_GT(LVarB, 2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0030, ACTOR_SELF, 1, 0x00A20009, 0x00A20005)
EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0)
EVT_END_IF
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_002F, ACTOR_SELF, 1, 0x00A20009, 0x00A20005)
EVT_END_IF

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

@ -134,7 +134,7 @@ EvtScript N(8022B8C0) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedHurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_SET_CONST(LVar0, 0x00000001)
@ -148,7 +148,7 @@ EvtScript N(8022B8C0) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -185,16 +185,16 @@ EvtScript N(8022B8C0) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedHurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(33)
EVT_SET_CONST(LVar0, 0x00000001)
@ -202,7 +202,7 @@ EvtScript N(8022B8C0) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_SET_CONST(LVar0, 0x00000001)
@ -231,7 +231,7 @@ EvtScript N(singleStrike2) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -253,7 +253,7 @@ EvtScript N(singleStrike2) = {
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
@ -285,7 +285,7 @@ EvtScript N(singleStrike2) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 20, 0)
@ -332,7 +332,7 @@ EvtScript N(singleStrike2) = {
EvtScript N(doubleStrike2) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 13)
@ -340,7 +340,7 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedDownwardStance)
EVT_WAIT(40)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(10)
@ -350,7 +350,7 @@ EvtScript N(doubleStrike2) = {
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
@ -390,7 +390,7 @@ EvtScript N(doubleStrike2) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_10)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
@ -414,7 +414,7 @@ EvtScript N(doubleStrike2) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
@ -537,7 +537,7 @@ EvtScript N(nextTurn_8022CFFC) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B68C)))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0033, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_END_IF
@ -550,14 +550,14 @@ EvtScript N(nextTurn_8022CFFC) = {
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1)
EVT_DIV(LVar1, 2)
EVT_IF_LE(LVar0, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0036, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_BREAK_SWITCH
EVT_END_IF
EVT_CALL(GetPlayerHP, LVar0)
EVT_IF_LE(LVar0, 5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0037, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_BREAK_SWITCH
@ -612,13 +612,13 @@ EvtScript N(handleEvent_8022D634) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_IF_EQ(LVarA, 1)
EVT_IF_GT(LVarB, 2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0035, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0)
EVT_END_IF
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0034, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_END_IF

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

@ -146,7 +146,7 @@ EvtScript N(8022DC44) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedHurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0)
@ -165,7 +165,7 @@ EvtScript N(8022DC44) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_SET_CONST(LVar0, 0x00000001)
@ -210,16 +210,16 @@ EvtScript N(8022DC44) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(32)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedHurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(33)
EVT_SET_CONST(LVar0, 0x00000001)
@ -227,7 +227,7 @@ EvtScript N(8022DC44) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 0x00000001)
EVT_SET_CONST(LVar1, ANIM_TheMaster_AscendedDefeated)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(53)
EVT_SET_CONST(LVar0, 0x00000001)
@ -256,7 +256,7 @@ EvtScript N(singleStrike3) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0)
@ -278,7 +278,7 @@ EvtScript N(singleStrike3) = {
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
@ -310,7 +310,7 @@ EvtScript N(singleStrike3) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 20, 0)
@ -357,7 +357,7 @@ EvtScript N(singleStrike3) = {
EvtScript N(doubleStrike3) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 13)
@ -365,7 +365,7 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedDownwardStance)
EVT_WAIT(40)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(10)
@ -375,7 +375,7 @@ EvtScript N(doubleStrike3) = {
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
@ -415,7 +415,7 @@ EvtScript N(doubleStrike3) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
@ -439,7 +439,7 @@ EvtScript N(doubleStrike3) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
@ -487,7 +487,7 @@ EvtScript N(doubleStrike3) = {
EvtScript N(tripleStrike3) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 13)
@ -496,7 +496,7 @@ EvtScript N(tripleStrike3) = {
EVT_WAIT(20)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_003C, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(10)
@ -506,7 +506,7 @@ EvtScript N(tripleStrike3) = {
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
@ -546,7 +546,7 @@ EvtScript N(tripleStrike3) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_10)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1)
EVT_WAIT(5)
@ -629,7 +629,7 @@ EvtScript N(tripleStrike3) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
@ -676,7 +676,7 @@ EvtScript N(tripleStrike3) = {
};
EvtScript N(80230240) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 13)
@ -704,7 +704,7 @@ EvtScript N(80230240) = {
EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_SET(LVar0, 80)
@ -727,7 +727,7 @@ EvtScript N(80230240) = {
EvtScript N(8023059C) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 13)
@ -739,7 +739,7 @@ EvtScript N(8023059C) = {
EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 80, LVar0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPunch)
EVT_THREAD
@ -777,7 +777,7 @@ EvtScript N(8023059C) = {
EvtScript N(80230914) = {
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 13)
@ -920,7 +920,7 @@ EvtScript N(nextTurn_80230D44) = {
EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 50, 50, 0, 0)
EVT_WAIT(15)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0038, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_END_IF
@ -933,14 +933,14 @@ EvtScript N(nextTurn_80230D44) = {
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1)
EVT_DIV(LVar1, 2)
EVT_IF_LE(LVar0, LVar1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_003B, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_BREAK_SWITCH
EVT_END_IF
EVT_CALL(GetPlayerHP, LVar0)
EVT_IF_LE(LVar0, 10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_003D, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_BREAK_SWITCH
@ -995,13 +995,13 @@ EvtScript N(handleEvent_80231408) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_IF_EQ(LVarA, 1)
EVT_IF_GT(LVarB, 2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_003A, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0)
EVT_END_IF
EVT_ELSE
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0039, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006)
EVT_END_IF

26
src/battle/area/mim/actor/forest_fuzzy.c
View File

@ -125,7 +125,7 @@ EvtScript N(handleEvent_80218584) = {
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt)
EVT_END_IF
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_END_CASE_GROUP
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, 1)
@ -139,7 +139,7 @@ EvtScript N(handleEvent_80218584) = {
EVT_EXEC_WAIT(DoBurnHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_BurnStill)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, 1)
@ -151,7 +151,7 @@ EvtScript N(handleEvent_80218584) = {
EVT_EXEC_WAIT(DoSpinSmashHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(func_80269470)
@ -174,7 +174,7 @@ EvtScript N(handleEvent_80218584) = {
EVT_EXEC_WAIT(DoShockHit)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_RETURN
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -187,19 +187,19 @@ EvtScript N(handleEvent_80218584) = {
EVT_IF_FLAG(LVar0, DAMAGE_TYPE_SHOCK)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_ELSE
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_EXEC_WAIT(EVS_DoNormalHit)
EVT_WAIT(10)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt)
EVT_EXEC_WAIT(DoDeath)
EVT_EXEC_WAIT(EVS_DoDeath)
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
@ -244,7 +244,7 @@ EvtScript N(80218C48) = {
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_THREAD
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206E)
@ -262,7 +262,7 @@ EvtScript N(80218C48) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3)
EVT_CALL(SetGoalToIndex, LVar0, LVarA)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Walk)
@ -299,7 +299,7 @@ EvtScript N(80219054) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -359,7 +359,7 @@ EvtScript N(80219054) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_WAIT(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT)
@ -419,7 +419,7 @@ EvtScript N(80219054) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Idle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3)
EVT_IF_NE(LVar3, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)

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