diff --git a/include/common_structs.h b/include/common_structs.h index 1697c8ad6b..761222e772 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -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 diff --git a/include/effects.h b/include/effects.h index 330e5483d3..330437e614 100644 --- a/include/effects.h +++ b/include/effects.h @@ -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 diff --git a/include/enums.h b/include/enums.h index 1538e6f083..e64a19deee 100644 --- a/include/enums.h +++ b/include/enums.h @@ -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 { diff --git a/include/functions.h b/include/functions.h index de44a9297f..f2dbf2b3ac 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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*); diff --git a/include/macros.h b/include/macros.h index 6e5c88a1ea..a600ed03e7 100644 --- a/include/macros.h +++ b/include/macros.h @@ -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 diff --git a/include/overlay.h b/include/overlay.h index 569abd88a4..f75c35d2f6 100644 --- a/include/overlay.h +++ b/include/overlay.h @@ -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 diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 6dae92289e..6dde28bbcc 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -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; diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index f3c5666054..eac24d8f41 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -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) { diff --git a/src/16F740.c b/src/16F740.c index 1899f2599b..a1e1384dc6 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -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); } } diff --git a/src/16c8e0.c b/src/16c8e0.c index 2107525b2d..96697cc235 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -416,46 +416,46 @@ void btl_update(void) { u8 paramType; f32 paramAmount; - get_screen_overlay_params(1, ¶mType, ¶mAmount); + get_screen_overlay_params(SCREEN_LAYER_BACK, ¶mType, ¶mAmount); 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, ¶mType, ¶mAmount); - if (paramType == 255) { + get_screen_overlay_params(SCREEN_LAYER_FRONT, ¶mType, ¶mAmount); + 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); } diff --git a/src/17D6A0.c b/src/17D6A0.c index 3c5daca6e3..e63bf8b7f3 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -9,8 +9,8 @@ extern IMG_BIN ui_battle_menu_spirits_png[]; extern PAL_BIN ui_battle_menu_spirits_pal[]; -extern IMG_BIN ui_battle_unk_star_png[]; -extern PAL_BIN ui_battle_unk_star_pal[]; +extern IMG_BIN ui_battle_solid_star_png[]; +extern PAL_BIN ui_battle_solid_star_pal[]; extern ActorBlueprint battle_partner_goombario; extern ActorBlueprint battle_partner_kooper; @@ -2378,121 +2378,146 @@ s16 D_802835D8[] = { 0, -12 }; //TODO Vec3f[] f32 D_802835DC[] = { - 0.0f, 4.5, 0.0f, 1.0f, 4.0f, 0.0f, 2.0f, 3.0f, 0.0f, 3.0f, 2.0f, 0.0f, 3.5f, 1.0f, 0.0f, 4.0f, 0.0f, 0.0f, 4.5, - 0.0f, 0.0f, 5.0f, 0.0f, 0.0f, 4.5, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f, 3.5f, -1.0f, 0.0f, 3.0f, -2.0f, 0.0f, 2.0f, -3.0f, - 0.0f, 1.0f, -4.0f, 0.0f, 0.0f, -4.5f, 0.0f, + 0.0f, 4.5f, 0.0f, + 1.0f, 4.0f, 0.0f, + 2.0f, 3.0f, 0.0f, + 3.0f, 2.0f, 0.0f, + 3.5f, 1.0f, 0.0f, + 4.0f, 0.0f, 0.0f, + 4.5f, 0.0f, 0.0f, + 5.0f, 0.0f, 0.0f, + 4.5f, 0.0f, 0.0f, + 4.0f, 0.0f, 0.0f, + 3.5f, -1.0f, 0.0f, + 3.0f, -2.0f, 0.0f, + 2.0f, -3.0f, 0.0f, + 1.0f, -4.0f, 0.0f, + 0.0f, -4.5f, 0.0f, }; -//TODO Vec3f[] -f32 D_80283690[] = { - 1.0f, 1.0f, 1.0f, 0.8f, 0.8f, 0.8f, 0.9f, 0.9f, 0.9f, 1.1f, 1.1f, 1.1f, 1.0f, 1.0f, 1.0f, 0.8f, 0.8f, 0.8f, 0.9f, - 0.9f, 0.9f, 1.1f, 1.1f, 1.1f, 1.0f, 1.0f, 1.0f, 0.8f, 0.8f, 0.8f, 0.9f, 0.9f, 0.9f, 1.1f, 1.1f, 1.1f, 1.0f, 1.0f, - 1.0f, 0.8f, 0.8f, 0.8f, 0.9f, 0.9f, 0.9f, +Vec3f D_80283690[] = { + { 1.0f, 1.0f, 1.0f }, + { 0.8f, 0.8f, 0.8f }, + { 0.9f, 0.9f, 0.9f }, + { 1.1f, 1.1f, 1.1f }, + { 1.0f, 1.0f, 1.0f }, + { 0.8f, 0.8f, 0.8f }, + { 0.9f, 0.9f, 0.9f }, + { 1.1f, 1.1f, 1.1f }, + { 1.0f, 1.0f, 1.0f }, + { 0.8f, 0.8f, 0.8f }, + { 0.9f, 0.9f, 0.9f }, + { 1.1f, 1.1f, 1.1f }, + { 1.0f, 1.0f, 1.0f }, + { 0.8f, 0.8f, 0.8f }, + { 0.9f, 0.9f, 0.9f }, }; -extern EntityModelScript D_80283D98; -EntityModelScript* D_80283744[] = { - NULL, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, &D_80283D98, +extern EntityModelScript EMS_BonkIcon; +EntityModelScript* bBonkModelScripts[] = { + NULL, + &EMS_BonkIcon, &EMS_BonkIcon, &EMS_BonkIcon, &EMS_BonkIcon, &EMS_BonkIcon, + &EMS_BonkIcon, &EMS_BonkIcon, &EMS_BonkIcon, &EMS_BonkIcon, &EMS_BonkIcon, }; s32 bMessages[] = { - [BTL_MSG_00] MSG_Menus_Merlee_IncreaseAttack, - [BTL_MSG_01] MSG_Menus_Merlee_DecreaseDamage, - [BTL_MSG_02] MSG_Menus_Merlee_IncreaseStarPoints, - [BTL_MSG_03] MSG_Menus_Merlee_Exhausted, - [BTL_MSG_04] MSG_Menus_ChargeHammer, - [BTL_MSG_05] MSG_Menus_ChargeHammerMore, - [BTL_MSG_06] MSG_Menus_ChargeJump, - [BTL_MSG_07] MSG_Menus_ChargeJumpMore, - [BTL_MSG_08] MSG_Menus_ChargeMaxedOut, - [BTL_MSG_09] MSG_Menus_EnemyMissed, + [BTL_MSG_MERLEE_ATK_UP] MSG_Menus_Merlee_IncreaseAttack, + [BTL_MSG_MERLEE_DEF_UP] MSG_Menus_Merlee_DecreaseDamage, + [BTL_MSG_MERLEE_EXP_UP] MSG_Menus_Merlee_IncreaseStarPoints, + [BTL_MSG_MERLEE_DONE] MSG_Menus_Merlee_Exhausted, + [BTL_MSG_CHARGE_HAMMER] MSG_Menus_ChargeHammer, + [BTL_MSG_CHARGE_HAMMER_MORE] MSG_Menus_ChargeHammerMore, + [BTL_MSG_CHARGE_JUMP] MSG_Menus_ChargeJump, + [BTL_MSG_CHARGE_JUMP_MORE] MSG_Menus_ChargeJumpMore, + [BTL_MSG_CANT_CHARGE] MSG_Menus_ChargeMaxedOut, + [BTL_MSG_ENEMY_MISSED] MSG_Menus_EnemyMissed, // player status effects - [BTL_MSG_0A] MSG_Menus_PlayerDazed, - [BTL_MSG_0B] MSG_Menus_PlayerAsleep, - [BTL_MSG_0C] MSG_Menus_PlayerFrozen, - [BTL_MSG_0D] MSG_Menus_PlayerPoisoned, - [BTL_MSG_0E] MSG_Menus_PlayerShrunk, - [BTL_MSG_0F] MSG_Menus_PlayerParalyzed, - [BTL_MSG_10] MSG_Menus_PlayerElectricCharge, - [BTL_MSG_11] MSG_Menus_PlayerTransparent, + [BTL_MSG_PLAYER_DAZED] MSG_Menus_PlayerDazed, + [BTL_MSG_PLAYER_ASLEEP] MSG_Menus_PlayerAsleep, + [BTL_MSG_PLAYER_FROZEN] MSG_Menus_PlayerFrozen, + [BTL_MSG_PLAYER_POISONED] MSG_Menus_PlayerPoisoned, + [BTL_MSG_PLAYER_SHRUNK] MSG_Menus_PlayerShrunk, + [BTL_MSG_PLAYER_PARALYZED] MSG_Menus_PlayerParalyzed, + [BTL_MSG_PLAYER_CHARGED] MSG_Menus_PlayerElectricCharge, + [BTL_MSG_PLAYER_TRANSPARENT] MSG_Menus_PlayerTransparent, // enemy status effects - [BTL_MSG_12] MSG_Menus_EnemyDazed, - [BTL_MSG_13] MSG_Menus_EnemyAsleep, - [BTL_MSG_14] MSG_Menus_EnemyFrozen, - [BTL_MSG_15] MSG_Menus_EnemyPoisoned, - [BTL_MSG_16] MSG_Menus_EnemyShrunk, - [BTL_MSG_17] MSG_Menus_EnemyParalyzed, - [BTL_MSG_18] MSG_Menus_EnemyElectrified, - [BTL_MSG_19] MSG_Menus_EnemyCantMove, + [BTL_MSG_ENEMY_DAZED] MSG_Menus_EnemyDazed, + [BTL_MSG_ENEMY_ASLEEP] MSG_Menus_EnemyAsleep, + [BTL_MSG_ENEMY_FROZEN] MSG_Menus_EnemyFrozen, + [BTL_MSG_ENEMY_POISONED] MSG_Menus_EnemyPoisoned, + [BTL_MSG_ENEMY_SHRUNK] MSG_Menus_EnemyShrunk, + [BTL_MSG_ENEMY_PARALYZED] MSG_Menus_EnemyParalyzed, + [BTL_MSG_ENEMY_ELECTRIFIED] MSG_Menus_EnemyElectrified, + [BTL_MSG_ENEMY_CANT_MOVE] MSG_Menus_EnemyCantMove, - [BTL_MSG_1A] MSG_Menus_StarEnergyRecharged, - [BTL_MSG_1B] MSG_Menus_StarEnergyMaxedOut, - [BTL_MSG_1C] MSG_Menus_StarEnergyFilled, - [BTL_MSG_1D] MSG_Menus_AttackUp, - [BTL_MSG_1E] MSG_Menus_DefenseUp, - [BTL_MSG_1F] MSG_Menus_0084, - [BTL_MSG_20] MSG_Menus_0085, + [BTL_MSG_STAR_POWER_RECHARGED] MSG_Menus_StarEnergyRecharged, + [BTL_MSG_STAR_POWER_MAXED] MSG_Menus_StarEnergyMaxedOut, + [BTL_MSG_STAR_POWER_FILLED] MSG_Menus_StarEnergyFilled, + [BTL_MSG_ATTACK_UP] MSG_Menus_AttackUp, + [BTL_MSG_DEFENCE_UP] MSG_Menus_DefenseUp, + [BTL_MSG_1F] MSG_Menus_0084, + [BTL_MSG_20] MSG_Menus_0085, - [BTL_MSG_21] MSG_Menus_EnemyTransparent, - [BTL_MSG_22] MSG_Menus_EnemyElectricCharge, - [BTL_MSG_23] MSG_Menus_PartnerInjured, - [BTL_MSG_24] MSG_Menus_ChargeGoombario, - [BTL_MSG_25] MSG_Menus_ChargeGoombarioMore, - [BTL_MSG_26] MSG_Menus_WaterBlockBegin, - [BTL_MSG_27] MSG_Menus_WaterBlockEnd, - [BTL_MSG_28] MSG_Menus_CloudNineBegin, - [BTL_MSG_29] MSG_Menus_CloudNineEnd, - [BTL_MSG_2A] MSG_Menus_TurboChargeBegin, - [BTL_MSG_2B] MSG_Menus_TurboChargeEnd, - [BTL_MSG_2C] MSG_Menus_ChillOutBegin, - [BTL_MSG_2D] MSG_Menus_CloudNineBegin, + [BTL_MSG_ENEMY_TRANSPARENT] MSG_Menus_EnemyTransparent, + [BTL_MSG_ENEMY_CHARGED] MSG_Menus_EnemyElectricCharge, + [BTL_MSG_PARTNER_INJURED] MSG_Menus_PartnerInjured, + [BTL_MSG_CHARGE_GOOMBARIO] MSG_Menus_ChargeGoombario, + [BTL_MSG_CHARGE_GOOMBARIO_MORE] MSG_Menus_ChargeGoombarioMore, + [BTL_MSG_WATER_BLOCK_BEGIN] MSG_Menus_WaterBlockBegin, + [BTL_MSG_WATER_BLOCK_END] MSG_Menus_WaterBlockEnd, + [BTL_MSG_CLOUD_NINE_BEGIN] MSG_Menus_CloudNineBegin, + [BTL_MSG_CLOUD_NINE_END] MSG_Menus_CloudNineEnd, + [BTL_MSG_TURBO_CHARGE_BEGIN] MSG_Menus_TurboChargeBegin, + [BTL_MSG_TURBO_CHARGE_END] MSG_Menus_TurboChargeEnd, + [BTL_MSG_CHILL_OUT_BEGIN] MSG_Menus_ChillOutBegin, + [BTL_MSG_UNUSED_CLOUD_NINE] MSG_Menus_CloudNineBegin, // move action command tips - [BTL_MSG_2E] MSG_Menus_MoveTip_PressBeforeLanding, - [BTL_MSG_2F] MSG_Menus_MoveTip_PushLeftWithTiming, - [BTL_MSG_30] MSG_Menus_MoveTip_PressBeforeStriking, - [BTL_MSG_31] MSG_Menus_MoveTip_PressRepeatedly, - [BTL_MSG_32] MSG_Menus_MoveTip_PushLeftRepeatedly, - [BTL_MSG_33] MSG_Menus_MoveTip_PushLeftToAim, - [BTL_MSG_34] MSG_Menus_MoveTip_PressBeforeLanding, - [BTL_MSG_35] MSG_Menus_MoveTip_PressBeforeLanding, - [BTL_MSG_36] MSG_Menus_MoveTip_PressAsShown, - [BTL_MSG_37] MSG_Menus_MoveTip_NOT_USED_1, - [BTL_MSG_38] MSG_Menus_MoveTip_PressAsLightsUp, - [BTL_MSG_39] MSG_Menus_MoveTip_NOT_USED_2, - [BTL_MSG_3A] MSG_Menus_MoveTip_PressBothRepeatedly, - [BTL_MSG_3B] MSG_Menus_MoveTip_PressBeforeLanding, - [BTL_MSG_3C] MSG_Menus_MoveTip_HoldThenTap, - [BTL_MSG_3D] MSG_Menus_MoveTip_HoldThenRelease, - [BTL_MSG_3E] MSG_Menus_MoveTip_MoveToAim, - [BTL_MSG_3F] MSG_Menus_MoveTip_PressBeforeLanding, - [BTL_MSG_40] MSG_Menus_MoveTip_PressToRunAway, - [BTL_MSG_41] MSG_Menus_MoveTip_PressToReduceDamage, - [BTL_MSG_42] MSG_Menus_MoveTip_NOT_USED_3, + [BTL_MSG_ACTION_TIP_00] MSG_Menus_MoveTip_PressBeforeLanding, + [BTL_MSG_ACTION_TIP_01] MSG_Menus_MoveTip_PushLeftWithTiming, + [BTL_MSG_ACTION_TIP_02] MSG_Menus_MoveTip_PressBeforeStriking, + [BTL_MSG_ACTION_TIP_03] MSG_Menus_MoveTip_PressRepeatedly, + [BTL_MSG_ACTION_TIP_04] MSG_Menus_MoveTip_PushLeftRepeatedly, + [BTL_MSG_ACTION_TIP_05] MSG_Menus_MoveTip_PushLeftToAim, + [BTL_MSG_ACTION_TIP_06] MSG_Menus_MoveTip_PressBeforeLanding, + [BTL_MSG_ACTION_TIP_07] MSG_Menus_MoveTip_PressBeforeLanding, + [BTL_MSG_ACTION_TIP_08] MSG_Menus_MoveTip_PressAsShown, + [BTL_MSG_ACTION_TIP_09] MSG_Menus_MoveTip_NOT_USED_1, + [BTL_MSG_ACTION_TIP_0A] MSG_Menus_MoveTip_PressAsLightsUp, + [BTL_MSG_ACTION_TIP_0B] MSG_Menus_MoveTip_NOT_USED_2, + [BTL_MSG_ACTION_TIP_0C] MSG_Menus_MoveTip_PressBothRepeatedly, + [BTL_MSG_ACTION_TIP_0D] MSG_Menus_MoveTip_PressBeforeLanding, + [BTL_MSG_ACTION_TIP_0E] MSG_Menus_MoveTip_HoldThenTap, + [BTL_MSG_ACTION_TIP_0F] MSG_Menus_MoveTip_HoldThenRelease, + [BTL_MSG_ACTION_TIP_10] MSG_Menus_MoveTip_MoveToAim, + [BTL_MSG_ACTION_TIP_11] MSG_Menus_MoveTip_PressBeforeLanding, + [BTL_MSG_ACTION_TIP_12] MSG_Menus_MoveTip_PressToRunAway, + [BTL_MSG_ACTION_TIP_13] MSG_Menus_MoveTip_PressToReduceDamage, + [BTL_MSG_ACTION_TIP_14] MSG_Menus_MoveTip_NOT_USED_3, // no targets available - [BTL_MSG_43] MSG_Menus_Battle_NoTarget_Jump, - [BTL_MSG_44] MSG_Menus_Battle_NoTarget_Hammer, - [BTL_MSG_45] MSG_Menus_Battle_NoTarget_Item, - [BTL_MSG_46] 0, - [BTL_MSG_47] 0, + [BTL_MSG_NO_JUMP_TARGET] MSG_Menus_Battle_NoTarget_Jump, + [BTL_MSG_NO_HAMMER_TARGET] MSG_Menus_Battle_NoTarget_Hammer, + [BTL_MSG_NO_ITEM_TARGET] MSG_Menus_Battle_NoTarget_Item, + [BTL_MSG_46] MSG_NONE, + [BTL_MSG_47] MSG_NONE, // errors and warnings - [BTL_MSG_48] MSG_Menus_Battle_CantSelectNow, - [BTL_MSG_49] MSG_Menus_Battle_CantUseHammer, - [BTL_MSG_4A] MSG_Menus_Battle_CantUseHammer, - [BTL_MSG_4B] MSG_Menus_Battle_CantUseHammer, - [BTL_MSG_4C] MSG_Menus_Battle_CantUseJump, - [BTL_MSG_4D] MSG_Menus_Battle_CantUseJump, - [BTL_MSG_4E] MSG_Menus_Battle_CantUseJump, - [BTL_MSG_4F] MSG_Menus_Battle_CantUseItems, - [BTL_MSG_50] MSG_Menus_Battle_CantSwitch, - [BTL_MSG_51] MSG_Menus_Battle_CantMove, - [BTL_MSG_52] MSG_Menus_Battle_CantSwitch, - [BTL_MSG_53] MSG_Menus_Battle_CantMove, - [BTL_MSG_54] MSG_Menus_Battle_CantSelectNow, + [BTL_MSG_CANT_SELECT_NOW] MSG_Menus_Battle_CantSelectNow, + [BTL_MSG_HAMMER_DISABLED_1] MSG_Menus_Battle_CantUseHammer, + [BTL_MSG_HAMMER_DISABLED_2] MSG_Menus_Battle_CantUseHammer, + [BTL_MSG_HAMMER_DISABLED_3] MSG_Menus_Battle_CantUseHammer, + [BTL_MSG_JUMP_DISABLED_1] MSG_Menus_Battle_CantUseJump, + [BTL_MSG_JUMP_DISABLED_2] MSG_Menus_Battle_CantUseJump, + [BTL_MSG_JUMP_DISABLED_3] MSG_Menus_Battle_CantUseJump, + [BTL_MSG_ITEMS_DISABLED] MSG_Menus_Battle_CantUseItems, + [BTL_MSG_CANT_SWITCH] MSG_Menus_Battle_CantSwitch, + [BTL_MSG_CANT_MOVE] MSG_Menus_Battle_CantMove, + [BTL_MSG_CANT_SWITCH_UNUSED] MSG_Menus_Battle_CantSwitch, + [BTL_MSG_CANT_MOVE_UNUSED] MSG_Menus_Battle_CantMove, + [BTL_MSG_CANT_SELECT_NOW_ALT] MSG_Menus_Battle_CantSelectNow, }; s32 bActorMessages[] = { @@ -2520,14 +2545,14 @@ s32 D_802838FC_padding = 0; #include "ui/battle/cursor_hand.png.inc.c" #include "ui/battle/cursor_hand.pal.inc.c" -Vtx D_80283B20[4] = { +Vtx BtlCursorModelVtx[] = { {{{ -22, -6, 0 }, 0, { 1024, 1024 }, { 0, 0, 0, 255 }}}, {{{ 9, -6, 0 }, 0, { 0, 1024 }, { 0, 0, 0, 255 }}}, {{{ 9, 25, 0 }, 0, { 0, 0 }, { 0, 0, 0, 255 }}}, {{{ -22, 25, 0 }, 0, { 1024, 0 }, { 0, 0, 0, 255 }}}, }; -Gfx D_80283B60[] = { +Gfx BtlCursorModelGfx[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -2538,29 +2563,29 @@ Gfx D_80283B60[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, D_80283B00), - gsDPLoadTextureTile_4b(D_80283900, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 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), + gsDPLoadTLUT_pal16(0, ui_battle_cursor_hand_pal), + gsDPLoadTextureTile_4b(ui_battle_cursor_hand_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 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), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(D_80283B20, 4, 0), + gsSPVertex(BtlCursorModelVtx, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsSPEndDisplayList(), }; -EntityModelScript D_80283C48 = STANDARD_ENTITY_MODEL_SCRIPT(D_80283B60, RENDER_MODE_ALPHATEST); +EntityModelScript EMS_CursorIcon = STANDARD_ENTITY_MODEL_SCRIPT(BtlCursorModelGfx, RENDER_MODE_ALPHATEST); -Vtx D_80283C68[4] = { +Vtx BtlBonkModelVtx[] = { {{{ -16, -16, 0 }, 0, { 0, 0 }, { 0, 0, 0, 255 }}}, {{{ 15, -16, 0 }, 0, { 1024, 0 }, { 0, 0, 0, 255 }}}, {{{ 15, 15, 0 }, 0, { 1024, 1024 }, { 0, 0, 0, 255 }}}, {{{ -16, 15, 0 }, 0, { 0, 1024 }, { 0, 0, 0, 255 }}}, }; -Gfx D_80283CA8[] = { +Gfx BtlBonkModelGfx[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0), + gsDPSetCombineMode(PM_CC_01, PM_CC_02), gsDPSetTexturePersp(G_TP_PERSP), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), @@ -2572,23 +2597,23 @@ Gfx D_80283CA8[] = { gsDPLoadTextureTile_4b(ui_battle_menu_spirits_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 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), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(D_80283C68, 4, 0), + gsSPVertex(BtlBonkModelVtx, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -EntityModelScript D_80283D98 = STANDARD_ENTITY_MODEL_SCRIPT(D_80283CA8, RENDER_MODE_2D); +EntityModelScript EMS_BonkIcon = STANDARD_ENTITY_MODEL_SCRIPT(BtlBonkModelGfx, RENDER_MODE_2D); -Vtx D_80283DB8[4] = { +Vtx BtlStarModelVtx[] = { {{{ -16, -16, 0 }, 0, { 0, 1024 }, { 0, 0, 0, 255 }}}, {{{ 15, -16, 0 }, 0, { 1024, 1024 }, { 0, 0, 0, 255 }}}, {{{ 15, 15, 0 }, 0, { 1024, 0 }, { 0, 0, 0, 255 }}}, {{{ -16, 15, 0 }, 0, { 0, 0 }, { 0, 0, 0, 255 }}}, }; -Gfx D_80283DF8[] = { +Gfx BtlStarModelGfx[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -2599,18 +2624,18 @@ Gfx D_80283DF8[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, ui_battle_unk_star_pal), - gsDPLoadTextureTile_4b(ui_battle_unk_star_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 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), + gsDPLoadTLUT_pal16(0, ui_battle_solid_star_pal), + gsDPLoadTextureTile_4b(ui_battle_solid_star_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 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), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(D_80283DB8, 4, 0), + gsSPVertex(BtlStarModelVtx, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), - }; -EntityModelScript D_80283EE8 = STANDARD_ENTITY_MODEL_SCRIPT(D_80283DF8, RENDER_MODE_ALPHATEST); + +EntityModelScript EMS_StarIcon = STANDARD_ENTITY_MODEL_SCRIPT(BtlStarModelGfx, RENDER_MODE_ALPHATEST); s32 D_80283F04_padding = 0; s32 D_80283F08_padding = 0; @@ -2676,8 +2701,8 @@ extern HudScript HES_StickTapLeft; extern HudScript HES_StickTapRight; extern HudScript HES_TimingBlink; -void func_8024F394(void* data); -void func_8024F5AC(void* data); +void btl_bonk_update(void* data); +void btl_bonk_render(void* data); void func_8024F768(void* data); void btl_update_message_popup(void* popup); void btl_show_message_popup(void* popup); @@ -2760,13 +2785,13 @@ void free_popup(PopupMessage* popup) { popup->active = FALSE; } -void func_8024EFE0(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { +void show_immune_bonk(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { BattleStatus* battleStatus = &gBattleStatus; PopupMessage* popup; Message* message; - EntityModelScript** sp10; + EntityModelScript** modelScript; f32 var_f20; - f32 var_f22; + f32 baseScale; f32* f1; f32* f2; f32* f3; @@ -2778,18 +2803,18 @@ void func_8024EFE0(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { s32 two; s32 i; - var_f22 = 1.0f; + baseScale = 1.0f; cond = FALSE; var_f20 = 1.0f; if (numMessages < 1) { numMessages = 1; cond = TRUE; - var_f22 = 0.4f; + baseScale = 0.4f; var_f20 = 0.7f; } if (battleStatus->flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40)) { - var_f22 *= 2.0; + baseScale *= 2.0; } popup = btl_create_popup(); @@ -2809,8 +2834,8 @@ void func_8024EFE0(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { } battleStatus->unk_90 = 0; - popup->updateFunc = func_8024F394; - popup->renderWorldFunc = func_8024F5AC; + popup->updateFunc = btl_bonk_update; + popup->renderWorldFunc = btl_bonk_render; popup->unk_00 = 0; popup->renderUIFunc = NULL; popup->messageIndex = 1; @@ -2819,9 +2844,9 @@ void func_8024EFE0(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { ASSERT (popup->message != NULL); for (i = 0; i < numMessages; i++, message++) { - sp10 = &D_80283744[numMessages]; - message->unk_00 = 1; - message->unk_04 = load_entity_model(*sp10); + modelScript = &bBonkModelScripts[numMessages]; + message->unk_00 = TRUE; + message->unk_04 = load_entity_model(*modelScript); set_entity_model_flags(message->unk_04, ENTITY_MODEL_FLAG_HIDDEN); bind_entity_model_setupGfx(message->unk_04, message, func_8024F768); message->pos.x = x; @@ -2844,29 +2869,29 @@ void func_8024EFE0(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { message->accel.z = *f3 * var_f20; iMod8 = (i % 8); - message->scale = D_80283690[iMod8 * 3] * var_f22; + message->scale = D_80283690[iMod8].x * baseScale; message->rotZ = 0; message->rotVelZ = sign * 107; message->rotY = clamp_angle(180.0f - gCameras[CAM_BATTLE].currentYaw); - message->unk_20 = 14; + message->appearTime = 14; message->unk_24 = arg4; - message->unk_44 = 240; + message->deleteTime = 240; if (cond) { - message->unk_44 = 10; + message->deleteTime = 10; } message->unk_48 = 255.0f; } } } -void func_8024F394(void* data) { +void btl_bonk_update(void* data) { PopupMessage* popup = data; Message* message = popup->message; s32 found = FALSE; s32 i; for (i = 0; i < popup->messageIndex; i++, message++) { - if (message->unk_00 != 0) { + if (message->unk_00) { s32 modelIdx = message->unk_04; found = TRUE; @@ -2877,33 +2902,33 @@ void func_8024F394(void* data) { } exec_entity_model_commandlist(modelIdx); break; - } else { - exec_entity_model_commandlist(modelIdx); - if (message->unk_20 >= 0) { - message->pos.x += message->vel.x; - message->pos.y += message->vel.y; - message->pos.z += message->vel.z; - } - message->rotY = clamp_angle(180.0f - gCameras[CAM_BATTLE].currentYaw); - message->rotZ += message->rotVelZ; - message->rotZ = clamp_angle(message->rotZ); - message->rotVelZ *= 0.8; - if (message->unk_20 < 10) { - message->accel.x *= 0.5; - message->accel.y *= 0.5; - message->accel.z *= 0.5; - message->vel.x = message->accel.x; - message->vel.y = message->accel.y; - message->vel.z = message->accel.z; - } + } - message->unk_20--; - if (message->unk_20 < 0) { - message->unk_44--; - if (message->unk_44 < 0) { - free_entity_model_by_index(modelIdx); - message->unk_00 = 0; - } + exec_entity_model_commandlist(modelIdx); + if (message->appearTime >= 0) { + message->pos.x += message->vel.x; + message->pos.y += message->vel.y; + message->pos.z += message->vel.z; + } + message->rotY = clamp_angle(180.0f - gCameras[CAM_BATTLE].currentYaw); + message->rotZ += message->rotVelZ; + message->rotZ = clamp_angle(message->rotZ); + message->rotVelZ *= 0.8; + if (message->appearTime < 10) { + message->accel.x *= 0.5; + message->accel.y *= 0.5; + message->accel.z *= 0.5; + message->vel.x = message->accel.x; + message->vel.y = message->accel.y; + message->vel.z = message->accel.z; + } + + message->appearTime--; + if (message->appearTime < 0) { + message->deleteTime--; + if (message->deleteTime < 0) { + free_entity_model_by_index(modelIdx); + message->unk_00 = FALSE; } } } @@ -2916,7 +2941,7 @@ void func_8024F394(void* data) { } } -void func_8024F5AC(void* data) { +void btl_bonk_render(void* data) { PopupMessage* popup = data; Message* message = popup->message; Matrix4f sp18; @@ -2931,7 +2956,7 @@ void func_8024F5AC(void* data) { s32 i; for (i = 0; i < popup->messageIndex; i++, message++) { - if (message->unk_00 != 0) { + if (message->unk_00) { if (message->unk_24 != 0) { break; } else { @@ -2955,7 +2980,7 @@ void func_8024F5AC(void* data) { void func_8024F768(void* data) { Message* message = data; - s32 alphaAmt = message->unk_44; + s32 alphaAmt = message->deleteTime; if (alphaAmt > 10) { alphaAmt = 10; @@ -2969,15 +2994,15 @@ void func_8024F7C8(void) { for (i = 0; i < ARRAY_COUNT(popupMessages); i++) { PopupMessage* popup = &popupMessages[i]; - if (popup->active && (popup->active & 0x10)) { + if (popup->active != 0 && (popup->active & 0x10)) { Message* message = popup->message; s32 j; for (j = 0; j < popup->messageIndex; j++, message++) { - if (message->unk_00 != 0) { + if (message->unk_00) { message->unk_24 = 0; - message->unk_20 = 1; - message->unk_44 = 20; + message->appearTime = 1; + message->deleteTime = 20; } } } @@ -2993,7 +3018,7 @@ ApiStatus func_8024F84C(Evt* script, s32 isInitialCall) { s32 arg5 = evt_get_variable(script, *args++); s32 arg6 = evt_get_variable(script, *args++); - func_8024EFE0(x, y, z, arg4, arg5, arg6); + show_immune_bonk(x, y, z, arg4, arg5, arg6); return ApiStatus_DONE2; } @@ -3002,6 +3027,7 @@ ApiStatus func_8024F940(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } +// show a popup message bubble with a message selected from BattleMessages void btl_show_battle_message(s32 messageIndex, s32 duration) { PopupMessage* popup = btl_create_popup(); @@ -3012,8 +3038,8 @@ void btl_show_battle_message(s32 messageIndex, s32 duration) { popup->renderWorldFunc = NULL; popup->messageIndex = messageIndex; popup->duration = duration; - popup->unk_16 = 0; - popup->unk_17 = TRUE; + popup->showMsgState = 0; + popup->needsInit = TRUE; popup->message = NULL; D_8029F640 = 0; bPopupMessage = popup; @@ -3024,6 +3050,7 @@ void btl_show_battle_message(s32 messageIndex, s32 duration) { } } +// show a popup message bubble with a message selected from BattleMessages void btl_show_variable_battle_message(s32 messageIndex, s32 duration, s32 varValue) { PopupMessage* popup = btl_create_popup(); @@ -3034,8 +3061,8 @@ void btl_show_variable_battle_message(s32 messageIndex, s32 duration, s32 varVal popup->renderWorldFunc = NULL; popup->messageIndex = messageIndex; popup->duration = duration; - popup->unk_16 = 0; - popup->unk_17 = TRUE; + popup->showMsgState = 0; + popup->needsInit = TRUE; popup->message = NULL; D_8029F640 = varValue; bPopupMessage = popup; @@ -3069,7 +3096,7 @@ void func_8024FAFC(void) { void close_action_command_instruction_popup(void) { PopupMessage* popup = bPopupMessage; - if (popup != NULL && popup->messageIndex < BTL_MSG_43 && popup->messageIndex >= BTL_MSG_2E) { + if (popup != NULL && popup->messageIndex < BTL_MSG_NO_JUMP_TARGET && popup->messageIndex >= BTL_MSG_ACTION_TIP_00) { popup->duration = 0; } } @@ -3082,65 +3109,65 @@ void btl_update_message_popup(void* data) { s32 temp_a0; switch (popup->messageIndex) { - case BTL_MSG_00: - case BTL_MSG_01: - case BTL_MSG_02: - case BTL_MSG_03: - case BTL_MSG_04: - case BTL_MSG_05: - case BTL_MSG_06: - case BTL_MSG_07: - case BTL_MSG_08: - case BTL_MSG_09: - case BTL_MSG_0A: - case BTL_MSG_0B: - case BTL_MSG_0C: - case BTL_MSG_0D: - case BTL_MSG_0E: - case BTL_MSG_0F: - case BTL_MSG_10: - case BTL_MSG_11: - case BTL_MSG_12: - case BTL_MSG_13: - case BTL_MSG_14: - case BTL_MSG_15: - case BTL_MSG_16: - case BTL_MSG_17: - case BTL_MSG_18: - case BTL_MSG_19: - case BTL_MSG_1A: - case BTL_MSG_1B: - case BTL_MSG_1C: - case BTL_MSG_1D: - case BTL_MSG_1E: + case BTL_MSG_MERLEE_ATK_UP: + case BTL_MSG_MERLEE_DEF_UP: + case BTL_MSG_MERLEE_EXP_UP: + case BTL_MSG_MERLEE_DONE: + case BTL_MSG_CHARGE_HAMMER: + case BTL_MSG_CHARGE_HAMMER_MORE: + case BTL_MSG_CHARGE_JUMP: + case BTL_MSG_CHARGE_JUMP_MORE: + case BTL_MSG_CANT_CHARGE: + case BTL_MSG_ENEMY_MISSED: + case BTL_MSG_PLAYER_DAZED: + case BTL_MSG_PLAYER_ASLEEP: + case BTL_MSG_PLAYER_FROZEN: + case BTL_MSG_PLAYER_POISONED: + case BTL_MSG_PLAYER_SHRUNK: + case BTL_MSG_PLAYER_PARALYZED: + case BTL_MSG_PLAYER_CHARGED: + case BTL_MSG_PLAYER_TRANSPARENT: + case BTL_MSG_ENEMY_DAZED: + case BTL_MSG_ENEMY_ASLEEP: + case BTL_MSG_ENEMY_FROZEN: + case BTL_MSG_ENEMY_POISONED: + case BTL_MSG_ENEMY_SHRUNK: + case BTL_MSG_ENEMY_PARALYZED: + case BTL_MSG_ENEMY_ELECTRIFIED: + case BTL_MSG_ENEMY_CANT_MOVE: + case BTL_MSG_STAR_POWER_RECHARGED: + case BTL_MSG_STAR_POWER_MAXED: + case BTL_MSG_STAR_POWER_FILLED: + case BTL_MSG_ATTACK_UP: + case BTL_MSG_DEFENCE_UP: case BTL_MSG_1F: case BTL_MSG_20: - case BTL_MSG_21: - case BTL_MSG_22: - case BTL_MSG_23: - case BTL_MSG_24: - case BTL_MSG_25: - case BTL_MSG_26: - case BTL_MSG_27: - case BTL_MSG_28: - case BTL_MSG_29: - case BTL_MSG_2A: - case BTL_MSG_2B: - case BTL_MSG_2C: - case BTL_MSG_2D: - case BTL_MSG_50: - case BTL_MSG_51: - case BTL_MSG_52: - case BTL_MSG_53: - case BTL_MSG_54: - switch (popup->unk_16) { + case BTL_MSG_ENEMY_TRANSPARENT: + case BTL_MSG_ENEMY_CHARGED: + case BTL_MSG_PARTNER_INJURED: + case BTL_MSG_CHARGE_GOOMBARIO: + case BTL_MSG_CHARGE_GOOMBARIO_MORE: + case BTL_MSG_WATER_BLOCK_BEGIN: + case BTL_MSG_WATER_BLOCK_END: + case BTL_MSG_CLOUD_NINE_BEGIN: + case BTL_MSG_CLOUD_NINE_END: + case BTL_MSG_TURBO_CHARGE_BEGIN: + case BTL_MSG_TURBO_CHARGE_END: + case BTL_MSG_CHILL_OUT_BEGIN: + case BTL_MSG_UNUSED_CLOUD_NINE: + case BTL_MSG_CANT_SWITCH: + case BTL_MSG_CANT_MOVE: + case BTL_MSG_CANT_SWITCH_UNUSED: + case BTL_MSG_CANT_MOVE_UNUSED: + case BTL_MSG_CANT_SELECT_NOW_ALT: + switch (popup->showMsgState) { default: break; case 0: - popup->unk_16 = 1; + popup->showMsgState = 1; break; case 1: - popup->unk_16 = 2; + popup->showMsgState = 2; break; case 2: if (battleStatus->currentButtonsPressed & (BUTTON_A | BUTTON_B)) { @@ -3150,39 +3177,39 @@ void btl_update_message_popup(void* data) { if (popup->duration != 0) { popup->duration--; } else { - popup->unk_16 = 3; + popup->showMsgState = 3; } break; case 4: shouldDisposeWindow = TRUE; break; case 3: - popup->unk_16 = 4; + popup->showMsgState = 4; break; } break; // move action command tips - case BTL_MSG_2E: - case BTL_MSG_2F: - case BTL_MSG_30: - case BTL_MSG_31: - case BTL_MSG_32: - case BTL_MSG_33: - case BTL_MSG_34: - case BTL_MSG_35: - case BTL_MSG_36: - case BTL_MSG_37: - case BTL_MSG_38: - case BTL_MSG_39: - case BTL_MSG_3A: - case BTL_MSG_3B: - case BTL_MSG_3C: - case BTL_MSG_3D: - case BTL_MSG_3E: - case BTL_MSG_3F: - case BTL_MSG_40: - case BTL_MSG_41: - case BTL_MSG_42: + case BTL_MSG_ACTION_TIP_00: + case BTL_MSG_ACTION_TIP_01: + case BTL_MSG_ACTION_TIP_02: + case BTL_MSG_ACTION_TIP_03: + case BTL_MSG_ACTION_TIP_04: + case BTL_MSG_ACTION_TIP_05: + case BTL_MSG_ACTION_TIP_06: + case BTL_MSG_ACTION_TIP_07: + case BTL_MSG_ACTION_TIP_08: + case BTL_MSG_ACTION_TIP_09: + case BTL_MSG_ACTION_TIP_0A: + case BTL_MSG_ACTION_TIP_0B: + case BTL_MSG_ACTION_TIP_0C: + case BTL_MSG_ACTION_TIP_0D: + case BTL_MSG_ACTION_TIP_0E: + case BTL_MSG_ACTION_TIP_0F: + case BTL_MSG_ACTION_TIP_10: + case BTL_MSG_ACTION_TIP_11: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: + case BTL_MSG_ACTION_TIP_14: temp_a0 = battleStatus->actionCommandMode; D_8029F64A = TRUE; if (temp_a0 == ACTION_COMMAND_MODE_NOT_LEARNED) { @@ -3191,17 +3218,17 @@ void btl_update_message_popup(void* data) { break; } - switch (popup->unk_16) { + switch (popup->showMsgState) { case 0: gBattleStatus.flags1 |= BS_FLAGS1_4000; gBattleStatus.flags1 &= ~BS_FLAGS1_10000; switch (popup->messageIndex) { - case BTL_MSG_32: + case BTL_MSG_ACTION_TIP_04: D_8029F642 = hud_element_create(&HES_StickNeutral); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_2F: + case BTL_MSG_ACTION_TIP_01: D_8029F642 = hud_element_create(&HES_StickNeutral); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3210,7 +3237,7 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; - case BTL_MSG_33: + case BTL_MSG_ACTION_TIP_05: D_8029F642 = hud_element_create(&HES_StickNeutral); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3220,7 +3247,7 @@ void btl_update_message_popup(void* data) { hud_element_set_render_pos(D_8029F644, -100, -100); hud_element_create_transform_B(D_8029F644); break; - case BTL_MSG_34: + case BTL_MSG_ACTION_TIP_06: D_8029F642 = hud_element_create(&HES_CUpButton); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3237,12 +3264,12 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F648, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F648, -100, -100); break; - case BTL_MSG_35: + case BTL_MSG_ACTION_TIP_07: D_8029F642 = hud_element_create(&HES_StickNeutral); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_36: + case BTL_MSG_ACTION_TIP_08: D_8029F642 = hud_element_create(&HES_AButton); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3255,12 +3282,12 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F646, -100, -100); break; - case BTL_MSG_37: + case BTL_MSG_ACTION_TIP_09: D_8029F642 = hud_element_create(&HES_StickNeutral); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_38: + case BTL_MSG_ACTION_TIP_0A: D_8029F642 = hud_element_create(&HES_TimingReady); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3269,7 +3296,7 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; - case BTL_MSG_39: + case BTL_MSG_ACTION_TIP_0B: D_8029F642 = hud_element_create(&HES_AButton); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3277,7 +3304,7 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_3A: + case BTL_MSG_ACTION_TIP_0C: D_8029F642 = hud_element_create(&HES_AButton); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3286,7 +3313,7 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; - case BTL_MSG_3D: + case BTL_MSG_ACTION_TIP_0F: D_8029F642 = hud_element_create(&HES_TimingReady); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3295,7 +3322,7 @@ void btl_update_message_popup(void* data) { hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; - case BTL_MSG_3E: + case BTL_MSG_ACTION_TIP_10: D_8029F642 = hud_element_create(&HES_StickNeutral); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); @@ -3310,111 +3337,111 @@ void btl_update_message_popup(void* data) { hud_element_set_render_pos(D_8029F646, -100, -100); hud_element_create_transform_B(D_8029F646); break; - case BTL_MSG_40: - case BTL_MSG_41: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: D_8029F642 = hud_element_create(&HES_AButton); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); // fallthrough - case BTL_MSG_2E: - case BTL_MSG_30: - case BTL_MSG_31: - case BTL_MSG_3B: - case BTL_MSG_3C: - case BTL_MSG_3F: - case BTL_MSG_42: + case BTL_MSG_ACTION_TIP_00: + case BTL_MSG_ACTION_TIP_02: + case BTL_MSG_ACTION_TIP_03: + case BTL_MSG_ACTION_TIP_0D: + case BTL_MSG_ACTION_TIP_0E: + case BTL_MSG_ACTION_TIP_11: + case BTL_MSG_ACTION_TIP_14: D_8029F642 = hud_element_create(&HES_AButton); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; } - popup->unk_16 = 1; + popup->showMsgState = 1; break; case 1: if (gBattleStatus.flags1 & BS_FLAGS1_10000) { gBattleStatus.flags1 &= ~BS_FLAGS1_4000; set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW_TRANSPARENT); popup->duration = 0; - popup->unk_16 = 2; + popup->showMsgState = 2; } else if (!(gBattleStatus.flags1 & BS_FLAGS1_4000) && (temp_a0 != 2)) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW_TRANSPARENT); switch (popup->messageIndex) { - case BTL_MSG_31: + case BTL_MSG_ACTION_TIP_03: hud_element_set_script(D_8029F642, &HES_MashAButton); break; - case BTL_MSG_32: + case BTL_MSG_ACTION_TIP_04: hud_element_set_script(D_8029F642, &HES_StickMashLeft); break; - case BTL_MSG_2F: + case BTL_MSG_ACTION_TIP_01: hud_element_set_script(D_8029F642, &HES_StickTapLeft); hud_element_set_script(D_8029F644, &HES_TimingBlink); break; - case BTL_MSG_33: + case BTL_MSG_ACTION_TIP_05: hud_element_set_script(D_8029F642, &HES_StickTapLeft); hud_element_set_script(D_8029F644, &HES_AimTarget); break; - case BTL_MSG_34: + case BTL_MSG_ACTION_TIP_06: hud_element_set_script(D_8029F642, &HES_MashCUpButton); hud_element_set_script(D_8029F644, &HES_MashCDownButton1); hud_element_set_script(D_8029F646, &HES_MashCLeftButton); hud_element_set_script(D_8029F648, &HES_MashCRightButton1); break; - case BTL_MSG_35: + case BTL_MSG_ACTION_TIP_07: hud_element_set_script(D_8029F642, &HES_StickBackAndForth); break; - case BTL_MSG_36: + case BTL_MSG_ACTION_TIP_08: hud_element_set_script(D_8029F642, &HES_PressAButton); hud_element_set_script(D_8029F644, &HES_PressBButton); hud_element_set_script(D_8029F646, &HES_PressCDownButton); break; - case BTL_MSG_37: + case BTL_MSG_ACTION_TIP_09: hud_element_set_script(D_8029F642, &HES_RotateStickCW); break; - case BTL_MSG_38: + case BTL_MSG_ACTION_TIP_0A: hud_element_set_script(D_8029F642, &HES_TimingBlink); hud_element_set_script(D_8029F644, &HES_MashAButton); break; - case BTL_MSG_39: + case BTL_MSG_ACTION_TIP_0B: hud_element_set_script(D_8029F642, &HES_MashAButton); hud_element_set_script(D_8029F644, &HES_MashBButton2); break; - case BTL_MSG_3A: + case BTL_MSG_ACTION_TIP_0C: hud_element_set_script(D_8029F642, &HES_MashAButton); hud_element_set_script(D_8029F644, &HES_MashBButton1); break; - case BTL_MSG_3B: + case BTL_MSG_ACTION_TIP_0D: hud_element_set_script(D_8029F642, &HES_MashAButton); break; - case BTL_MSG_3D: + case BTL_MSG_ACTION_TIP_0F: hud_element_set_script(D_8029F642, &HES_TimingBlink); hud_element_set_script(D_8029F644, &HES_PressAButton); break; - case BTL_MSG_3E: + case BTL_MSG_ACTION_TIP_10: hud_element_set_script(D_8029F642, &HES_StickTapRight); break; - case BTL_MSG_3F: + case BTL_MSG_ACTION_TIP_11: hud_element_set_script(D_8029F642, &HES_MashAButton); break; - case BTL_MSG_40: - case BTL_MSG_41: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: hud_element_set_script(D_8029F642, &HES_PressAButton); // fallthrough - case BTL_MSG_2E: - case BTL_MSG_30: - case BTL_MSG_3C: - case BTL_MSG_42: + case BTL_MSG_ACTION_TIP_00: + case BTL_MSG_ACTION_TIP_02: + case BTL_MSG_ACTION_TIP_0E: + case BTL_MSG_ACTION_TIP_14: hud_element_set_script(D_8029F642, &HES_PressAButton); break; } if (popup->duration != -1) { popup->duration = 30; } - popup->unk_16 = 2; + popup->showMsgState = 2; break; } break; case 2: - if ((temp_a0 != popup->unk_16) || (gBattleStatus.flags1 & BS_FLAGS1_10000)) { + if ((temp_a0 != popup->showMsgState) || (gBattleStatus.flags1 & BS_FLAGS1_10000)) { s16* duration; if (D_8029F64E < 192) { @@ -3436,36 +3463,36 @@ void btl_update_message_popup(void* data) { popup->duration--; } else { switch (popup->messageIndex) { - case BTL_MSG_2E: - case BTL_MSG_30: - case BTL_MSG_31: - case BTL_MSG_32: - case BTL_MSG_35: - case BTL_MSG_37: - case BTL_MSG_3B: - case BTL_MSG_3C: - case BTL_MSG_3F: - case BTL_MSG_40: - case BTL_MSG_41: - case BTL_MSG_42: + case BTL_MSG_ACTION_TIP_00: + case BTL_MSG_ACTION_TIP_02: + case BTL_MSG_ACTION_TIP_03: + case BTL_MSG_ACTION_TIP_04: + case BTL_MSG_ACTION_TIP_07: + case BTL_MSG_ACTION_TIP_09: + case BTL_MSG_ACTION_TIP_0D: + case BTL_MSG_ACTION_TIP_0E: + case BTL_MSG_ACTION_TIP_11: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: + case BTL_MSG_ACTION_TIP_14: hud_element_free(D_8029F642); break; - case BTL_MSG_2F: - case BTL_MSG_33: - case BTL_MSG_38: - case BTL_MSG_39: - case BTL_MSG_3A: - case BTL_MSG_3D: + case BTL_MSG_ACTION_TIP_01: + case BTL_MSG_ACTION_TIP_05: + case BTL_MSG_ACTION_TIP_0A: + case BTL_MSG_ACTION_TIP_0B: + case BTL_MSG_ACTION_TIP_0C: + case BTL_MSG_ACTION_TIP_0F: hud_element_free(D_8029F642); hud_element_free(D_8029F644); break; - case BTL_MSG_36: - case BTL_MSG_3E: + case BTL_MSG_ACTION_TIP_08: + case BTL_MSG_ACTION_TIP_10: hud_element_free(D_8029F642); hud_element_free(D_8029F644); hud_element_free(D_8029F646); break; - case BTL_MSG_34: + case BTL_MSG_ACTION_TIP_06: hud_element_free(D_8029F642); hud_element_free(D_8029F644); hud_element_free(D_8029F646); @@ -3480,20 +3507,20 @@ void btl_update_message_popup(void* data) { break; } break; - case BTL_MSG_43: - case BTL_MSG_44: - case BTL_MSG_45: + case BTL_MSG_NO_JUMP_TARGET: + case BTL_MSG_NO_HAMMER_TARGET: + case BTL_MSG_NO_ITEM_TARGET: case BTL_MSG_46: case BTL_MSG_47: - case BTL_MSG_48: - switch (popup->unk_16) { + case BTL_MSG_CANT_SELECT_NOW: + switch (popup->showMsgState) { default: break; case 0: - popup->unk_16 = 1; + popup->showMsgState = 1; break; case 1: - popup->unk_16 = 2; + popup->showMsgState = 2; break; case 2: if (battleStatus->currentButtonsPressed & (BUTTON_A | BUTTON_B)) { @@ -3503,64 +3530,64 @@ void btl_update_message_popup(void* data) { if (popup->duration != 0) { popup->duration--; } else { - popup->unk_16 = 3; + popup->showMsgState = 3; } break; case 3: - popup->unk_16 = 4; + popup->showMsgState = 4; break; case 4: shouldDisposeWindow = TRUE; break; } break; - case BTL_MSG_49: - case BTL_MSG_4A: - case BTL_MSG_4B: - case BTL_MSG_4C: - case BTL_MSG_4D: - case BTL_MSG_4E: - case BTL_MSG_4F: - switch (popup->unk_16) { + case BTL_MSG_HAMMER_DISABLED_1: + case BTL_MSG_HAMMER_DISABLED_2: + case BTL_MSG_HAMMER_DISABLED_3: + case BTL_MSG_JUMP_DISABLED_1: + case BTL_MSG_JUMP_DISABLED_2: + case BTL_MSG_JUMP_DISABLED_3: + case BTL_MSG_ITEMS_DISABLED: + switch (popup->showMsgState) { case 0: switch (popup->messageIndex) { - case BTL_MSG_49: + case BTL_MSG_HAMMER_DISABLED_1: D_8029F642 = hud_element_create(&HES_Item_Hammer1); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_4A: + case BTL_MSG_HAMMER_DISABLED_2: D_8029F642 = hud_element_create(&HES_Item_Hammer2); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_4B: + case BTL_MSG_HAMMER_DISABLED_3: D_8029F642 = hud_element_create(&HES_Item_Hammer3); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_4C: + case BTL_MSG_JUMP_DISABLED_1: D_8029F642 = hud_element_create(&HES_Item_Boots1); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_4D: + case BTL_MSG_JUMP_DISABLED_2: D_8029F642 = hud_element_create(&HES_Item_Boots2); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_4E: + case BTL_MSG_JUMP_DISABLED_3: D_8029F642 = hud_element_create(&HES_Item_Boots3); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; - case BTL_MSG_4F: + case BTL_MSG_ITEMS_DISABLED: D_8029F642 = hud_element_create(&HES_Item_Items); hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; } - popup->unk_16 = 1; + popup->showMsgState = 1; break; case 1: if (popup->duration != 0) { @@ -3590,117 +3617,117 @@ void func_80250818(void* data, s32 x, s32 y) { y += 6; switch (popup->messageIndex) { - case BTL_MSG_00: - case BTL_MSG_01: - case BTL_MSG_02: - case BTL_MSG_03: - case BTL_MSG_08: - case BTL_MSG_09: - case BTL_MSG_0A: - case BTL_MSG_0B: - case BTL_MSG_0C: - case BTL_MSG_0D: - case BTL_MSG_0E: - case BTL_MSG_0F: - case BTL_MSG_10: - case BTL_MSG_11: - case BTL_MSG_12: - case BTL_MSG_13: - case BTL_MSG_14: - case BTL_MSG_15: - case BTL_MSG_16: - case BTL_MSG_17: - case BTL_MSG_18: - case BTL_MSG_19: - case BTL_MSG_1A: - case BTL_MSG_1B: - case BTL_MSG_1C: - case BTL_MSG_23: - case BTL_MSG_24: - case BTL_MSG_25: - case BTL_MSG_26: - case BTL_MSG_27: - case BTL_MSG_28: - case BTL_MSG_29: - case BTL_MSG_2A: - case BTL_MSG_2B: - case BTL_MSG_2C: - case BTL_MSG_2D: - case BTL_MSG_43: - case BTL_MSG_44: - case BTL_MSG_45: + case BTL_MSG_MERLEE_ATK_UP: + case BTL_MSG_MERLEE_DEF_UP: + case BTL_MSG_MERLEE_EXP_UP: + case BTL_MSG_MERLEE_DONE: + case BTL_MSG_CANT_CHARGE: + case BTL_MSG_ENEMY_MISSED: + case BTL_MSG_PLAYER_DAZED: + case BTL_MSG_PLAYER_ASLEEP: + case BTL_MSG_PLAYER_FROZEN: + case BTL_MSG_PLAYER_POISONED: + case BTL_MSG_PLAYER_SHRUNK: + case BTL_MSG_PLAYER_PARALYZED: + case BTL_MSG_PLAYER_CHARGED: + case BTL_MSG_PLAYER_TRANSPARENT: + case BTL_MSG_ENEMY_DAZED: + case BTL_MSG_ENEMY_ASLEEP: + case BTL_MSG_ENEMY_FROZEN: + case BTL_MSG_ENEMY_POISONED: + case BTL_MSG_ENEMY_SHRUNK: + case BTL_MSG_ENEMY_PARALYZED: + case BTL_MSG_ENEMY_ELECTRIFIED: + case BTL_MSG_ENEMY_CANT_MOVE: + case BTL_MSG_STAR_POWER_RECHARGED: + case BTL_MSG_STAR_POWER_MAXED: + case BTL_MSG_STAR_POWER_FILLED: + case BTL_MSG_PARTNER_INJURED: + case BTL_MSG_CHARGE_GOOMBARIO: + case BTL_MSG_CHARGE_GOOMBARIO_MORE: + case BTL_MSG_WATER_BLOCK_BEGIN: + case BTL_MSG_WATER_BLOCK_END: + case BTL_MSG_CLOUD_NINE_BEGIN: + case BTL_MSG_CLOUD_NINE_END: + case BTL_MSG_TURBO_CHARGE_BEGIN: + case BTL_MSG_TURBO_CHARGE_END: + case BTL_MSG_CHILL_OUT_BEGIN: + case BTL_MSG_UNUSED_CLOUD_NINE: + case BTL_MSG_NO_JUMP_TARGET: + case BTL_MSG_NO_HAMMER_TARGET: + case BTL_MSG_NO_ITEM_TARGET: case BTL_MSG_46: case BTL_MSG_47: - case BTL_MSG_48: - case BTL_MSG_50: - case BTL_MSG_52: - case BTL_MSG_53: - case BTL_MSG_54: + case BTL_MSG_CANT_SELECT_NOW: + case BTL_MSG_CANT_SWITCH: + case BTL_MSG_CANT_SWITCH_UNUSED: + case BTL_MSG_CANT_MOVE_UNUSED: + case BTL_MSG_CANT_SELECT_NOW_ALT: messageID = bMessages[popup->messageIndex]; msgLinesIdx = get_msg_lines(messageID) - 1; draw_msg(messageID, x, y + D_802835D4[msgLinesIdx], 255, MSG_PAL_0F, 0); break; - case BTL_MSG_04: - case BTL_MSG_05: - case BTL_MSG_06: - case BTL_MSG_07: - case BTL_MSG_1D: - case BTL_MSG_1E: + case BTL_MSG_CHARGE_HAMMER: + case BTL_MSG_CHARGE_HAMMER_MORE: + case BTL_MSG_CHARGE_JUMP: + case BTL_MSG_CHARGE_JUMP_MORE: + case BTL_MSG_ATTACK_UP: + case BTL_MSG_DEFENCE_UP: case BTL_MSG_1F: case BTL_MSG_20: - case BTL_MSG_21: - case BTL_MSG_22: + case BTL_MSG_ENEMY_TRANSPARENT: + case BTL_MSG_ENEMY_CHARGED: messageID = bMessages[popup->messageIndex]; msgLinesIdx = get_msg_lines(messageID) - 1; y += D_802835D4[msgLinesIdx]; set_message_value(D_8029F640, 0); draw_msg(messageID, x, y, 255, MSG_PAL_0F, 0); break; - case BTL_MSG_51: + case BTL_MSG_CANT_MOVE: messageID = bMessages[popup->messageIndex]; msgLinesIdx = get_msg_lines(messageID) - 1; y += D_802835D4[msgLinesIdx]; set_message_msg(bActorMessages[D_8029F640], 0); draw_msg(messageID, x, y, 255, MSG_PAL_0F, 0); break; - case BTL_MSG_49: - case BTL_MSG_4A: - case BTL_MSG_4B: - case BTL_MSG_4C: - case BTL_MSG_4D: - case BTL_MSG_4E: - case BTL_MSG_4F: + case BTL_MSG_HAMMER_DISABLED_1: + case BTL_MSG_HAMMER_DISABLED_2: + case BTL_MSG_HAMMER_DISABLED_3: + case BTL_MSG_JUMP_DISABLED_1: + case BTL_MSG_JUMP_DISABLED_2: + case BTL_MSG_JUMP_DISABLED_3: + case BTL_MSG_ITEMS_DISABLED: messageID = bMessages[popup->messageIndex]; draw_msg(messageID, x + 0x1D, y + 6, 255, MSG_PAL_0F, 0); hud_element_set_render_pos(D_8029F642, x + 13, y + 14); hud_element_draw_clipped(D_8029F642); break; - case BTL_MSG_2E: - case BTL_MSG_2F: - case BTL_MSG_30: - case BTL_MSG_31: - case BTL_MSG_32: - case BTL_MSG_33: - case BTL_MSG_34: - case BTL_MSG_35: - case BTL_MSG_36: - case BTL_MSG_37: - case BTL_MSG_38: - case BTL_MSG_39: - case BTL_MSG_3A: - case BTL_MSG_3B: - case BTL_MSG_3C: - case BTL_MSG_3D: - case BTL_MSG_3E: - case BTL_MSG_3F: - case BTL_MSG_40: - case BTL_MSG_41: - case BTL_MSG_42: + case BTL_MSG_ACTION_TIP_00: + case BTL_MSG_ACTION_TIP_01: + case BTL_MSG_ACTION_TIP_02: + case BTL_MSG_ACTION_TIP_03: + case BTL_MSG_ACTION_TIP_04: + case BTL_MSG_ACTION_TIP_05: + case BTL_MSG_ACTION_TIP_06: + case BTL_MSG_ACTION_TIP_07: + case BTL_MSG_ACTION_TIP_08: + case BTL_MSG_ACTION_TIP_09: + case BTL_MSG_ACTION_TIP_0A: + case BTL_MSG_ACTION_TIP_0B: + case BTL_MSG_ACTION_TIP_0C: + case BTL_MSG_ACTION_TIP_0D: + case BTL_MSG_ACTION_TIP_0E: + case BTL_MSG_ACTION_TIP_0F: + case BTL_MSG_ACTION_TIP_10: + case BTL_MSG_ACTION_TIP_11: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: + case BTL_MSG_ACTION_TIP_14: opacity = 255; - if (popup->unk_16 < 2) { + if (popup->showMsgState < 2) { opacity = 160; } - if (popup->messageIndex == BTL_MSG_3B) { + if (popup->messageIndex == BTL_MSG_ACTION_TIP_0D) { opacity = 255; } @@ -3712,13 +3739,13 @@ void func_80250818(void* data, s32 x, s32 y) { draw_msg(messageID, x + 11, y + 6, opacity, MSG_PAL_0F, 0); switch (popup->messageIndex) { - case BTL_MSG_2E: + case BTL_MSG_ACTION_TIP_00: hud_element_set_render_pos(D_8029F642, x + 65, y + 14); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); break; - case BTL_MSG_2F: + case BTL_MSG_ACTION_TIP_01: hud_element_set_render_pos(D_8029F642, x + 55, y + 14); hud_element_set_scale(D_8029F642, 0.6f); hud_element_set_alpha(D_8029F642, opacity); @@ -3728,25 +3755,25 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F644, opacity); hud_element_draw_clipped(D_8029F644); break; - case BTL_MSG_30: + case BTL_MSG_ACTION_TIP_02: hud_element_set_render_pos(D_8029F642, x + 64, y + 14); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); break; - case BTL_MSG_31: + case BTL_MSG_ACTION_TIP_03: hud_element_set_render_pos(D_8029F642, x + 67, y + 14); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); break; - case BTL_MSG_32: + case BTL_MSG_ACTION_TIP_04: hud_element_set_render_pos(D_8029F642, x + 56, y + 14); hud_element_set_scale(D_8029F642, 0.6f); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); break; - case BTL_MSG_33: + case BTL_MSG_ACTION_TIP_05: hud_element_set_render_pos(D_8029F642, x + 65, y + 13); hud_element_set_scale(D_8029F642, 0.6f); hud_element_set_alpha(D_8029F642, opacity); @@ -3757,7 +3784,7 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F644, opacity); func_80144218(D_8029F644); break; - case BTL_MSG_36: + case BTL_MSG_ACTION_TIP_08: hud_element_set_render_pos(D_8029F642, x + 86, y + 13); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); @@ -3773,7 +3800,7 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F646, opacity); hud_element_draw_clipped(D_8029F646); break; - case BTL_MSG_38: + case BTL_MSG_ACTION_TIP_0A: hud_element_set_render_pos(D_8029F642, x + 105, y + 13); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); @@ -3783,7 +3810,7 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F644, opacity); hud_element_draw_clipped(D_8029F644); break; - case BTL_MSG_3A: + case BTL_MSG_ACTION_TIP_0C: hud_element_set_render_pos(D_8029F642, x + 63, y + 14); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); @@ -3794,13 +3821,13 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F644, opacity); hud_element_draw_clipped(D_8029F644); break; - case BTL_MSG_3C: + case BTL_MSG_ACTION_TIP_0E: hud_element_set_render_pos(D_8029F642, x + 124, y + 14); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); break; - case BTL_MSG_3D: + case BTL_MSG_ACTION_TIP_0F: hud_element_set_render_pos(D_8029F642, x + 56, y + 31); hud_element_set_alpha(D_8029F642, opacity); hud_element_draw_clipped(D_8029F642); @@ -3810,7 +3837,7 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F644, opacity); hud_element_draw_clipped(D_8029F644); break; - case BTL_MSG_3E: + case BTL_MSG_ACTION_TIP_10: hud_element_set_render_pos(D_8029F642, x + 107, y + 13); hud_element_set_scale(D_8029F642, 0.6f); hud_element_set_alpha(D_8029F642, opacity); @@ -3826,8 +3853,8 @@ void func_80250818(void* data, s32 x, s32 y) { hud_element_set_alpha(D_8029F646, opacity); func_80144218(D_8029F646); break; - case BTL_MSG_40: - case BTL_MSG_41: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: hud_element_set_render_pos(D_8029F642, x + 64, y + 13); hud_element_set_scale(D_8029F642, 0.5f); hud_element_set_alpha(D_8029F642, opacity); @@ -3848,56 +3875,56 @@ void btl_show_message_popup(void* data) { s32 height; switch (popup->messageIndex) { - case BTL_MSG_00: - case BTL_MSG_01: - case BTL_MSG_02: - case BTL_MSG_03: - case BTL_MSG_08: - case BTL_MSG_09: - case BTL_MSG_0A: - case BTL_MSG_0B: - case BTL_MSG_0C: - case BTL_MSG_0D: - case BTL_MSG_0E: - case BTL_MSG_0F: - case BTL_MSG_10: - case BTL_MSG_11: - case BTL_MSG_12: - case BTL_MSG_13: - case BTL_MSG_14: - case BTL_MSG_15: - case BTL_MSG_16: - case BTL_MSG_17: - case BTL_MSG_18: - case BTL_MSG_19: - case BTL_MSG_1A: - case BTL_MSG_1B: - case BTL_MSG_1C: - case BTL_MSG_23: - case BTL_MSG_24: - case BTL_MSG_25: - case BTL_MSG_26: - case BTL_MSG_27: - case BTL_MSG_28: - case BTL_MSG_29: - case BTL_MSG_2A: - case BTL_MSG_2B: - case BTL_MSG_2C: - case BTL_MSG_2D: - case BTL_MSG_43: - case BTL_MSG_44: - case BTL_MSG_45: + case BTL_MSG_MERLEE_ATK_UP: + case BTL_MSG_MERLEE_DEF_UP: + case BTL_MSG_MERLEE_EXP_UP: + case BTL_MSG_MERLEE_DONE: + case BTL_MSG_CANT_CHARGE: + case BTL_MSG_ENEMY_MISSED: + case BTL_MSG_PLAYER_DAZED: + case BTL_MSG_PLAYER_ASLEEP: + case BTL_MSG_PLAYER_FROZEN: + case BTL_MSG_PLAYER_POISONED: + case BTL_MSG_PLAYER_SHRUNK: + case BTL_MSG_PLAYER_PARALYZED: + case BTL_MSG_PLAYER_CHARGED: + case BTL_MSG_PLAYER_TRANSPARENT: + case BTL_MSG_ENEMY_DAZED: + case BTL_MSG_ENEMY_ASLEEP: + case BTL_MSG_ENEMY_FROZEN: + case BTL_MSG_ENEMY_POISONED: + case BTL_MSG_ENEMY_SHRUNK: + case BTL_MSG_ENEMY_PARALYZED: + case BTL_MSG_ENEMY_ELECTRIFIED: + case BTL_MSG_ENEMY_CANT_MOVE: + case BTL_MSG_STAR_POWER_RECHARGED: + case BTL_MSG_STAR_POWER_MAXED: + case BTL_MSG_STAR_POWER_FILLED: + case BTL_MSG_PARTNER_INJURED: + case BTL_MSG_CHARGE_GOOMBARIO: + case BTL_MSG_CHARGE_GOOMBARIO_MORE: + case BTL_MSG_WATER_BLOCK_BEGIN: + case BTL_MSG_WATER_BLOCK_END: + case BTL_MSG_CLOUD_NINE_BEGIN: + case BTL_MSG_CLOUD_NINE_END: + case BTL_MSG_TURBO_CHARGE_BEGIN: + case BTL_MSG_TURBO_CHARGE_END: + case BTL_MSG_CHILL_OUT_BEGIN: + case BTL_MSG_UNUSED_CLOUD_NINE: + case BTL_MSG_NO_JUMP_TARGET: + case BTL_MSG_NO_HAMMER_TARGET: + case BTL_MSG_NO_ITEM_TARGET: case BTL_MSG_46: case BTL_MSG_47: - case BTL_MSG_48: - case BTL_MSG_50: - case BTL_MSG_52: - case BTL_MSG_53: - case BTL_MSG_54: - if (popup->unk_17) { + case BTL_MSG_CANT_SELECT_NOW: + case BTL_MSG_CANT_SWITCH: + case BTL_MSG_CANT_SWITCH_UNUSED: + case BTL_MSG_CANT_MOVE_UNUSED: + case BTL_MSG_CANT_SELECT_NOW_ALT: + if (popup->needsInit) { s32 messageID; - popup->unk_17 = FALSE; + popup->needsInit = FALSE; messageID = bMessages[popup->messageIndex]; msgWidth = get_msg_width(messageID, 0) + 30; posX = 160 - (msgWidth / 2); @@ -3908,15 +3935,15 @@ void btl_show_message_popup(void* data) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW); } break; - case BTL_MSG_49: - case BTL_MSG_4A: - case BTL_MSG_4B: - case BTL_MSG_4C: - case BTL_MSG_4D: - case BTL_MSG_4E: - case BTL_MSG_4F: - if (popup->unk_17) { - popup->unk_17 = FALSE; + case BTL_MSG_HAMMER_DISABLED_1: + case BTL_MSG_HAMMER_DISABLED_2: + case BTL_MSG_HAMMER_DISABLED_3: + case BTL_MSG_JUMP_DISABLED_1: + case BTL_MSG_JUMP_DISABLED_2: + case BTL_MSG_JUMP_DISABLED_3: + case BTL_MSG_ITEMS_DISABLED: + if (popup->needsInit) { + popup->needsInit = FALSE; msgWidth = get_msg_width(bMessages[popup->messageIndex], 0) + 55; posX = 160 - (msgWidth / 2); width = msgWidth; @@ -3925,20 +3952,20 @@ void btl_show_message_popup(void* data) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW); } break; - case BTL_MSG_04: - case BTL_MSG_05: - case BTL_MSG_06: - case BTL_MSG_07: - case BTL_MSG_1D: - case BTL_MSG_1E: + case BTL_MSG_CHARGE_HAMMER: + case BTL_MSG_CHARGE_HAMMER_MORE: + case BTL_MSG_CHARGE_JUMP: + case BTL_MSG_CHARGE_JUMP_MORE: + case BTL_MSG_ATTACK_UP: + case BTL_MSG_DEFENCE_UP: case BTL_MSG_1F: case BTL_MSG_20: - case BTL_MSG_21: - case BTL_MSG_22: - if (popup->unk_17) { + case BTL_MSG_ENEMY_TRANSPARENT: + case BTL_MSG_ENEMY_CHARGED: + if (popup->needsInit) { s32 messageID; - popup->unk_17 = FALSE; + popup->needsInit = FALSE; messageID = bMessages[popup->messageIndex]; set_message_value(D_8029F640, 0); msgWidth = get_msg_width(messageID, 0) + 31; @@ -3950,11 +3977,11 @@ void btl_show_message_popup(void* data) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW); } break; - case BTL_MSG_51: - if (popup->unk_17) { + case BTL_MSG_CANT_MOVE: + if (popup->needsInit) { s32 messageID; - popup->unk_17 = FALSE; + popup->needsInit = FALSE; messageID = bMessages[popup->messageIndex]; set_message_msg(bActorMessages[D_8029F640], 0); msgWidth = get_msg_width(messageID, 0) + 31; @@ -3966,31 +3993,31 @@ void btl_show_message_popup(void* data) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW); } break; - case BTL_MSG_2E: - case BTL_MSG_2F: - case BTL_MSG_30: - case BTL_MSG_31: - case BTL_MSG_32: - case BTL_MSG_33: - case BTL_MSG_34: - case BTL_MSG_35: - case BTL_MSG_36: - case BTL_MSG_37: - case BTL_MSG_38: - case BTL_MSG_39: - case BTL_MSG_3A: - case BTL_MSG_3B: - case BTL_MSG_3C: - case BTL_MSG_3D: - case BTL_MSG_3E: - case BTL_MSG_3F: - case BTL_MSG_40: - case BTL_MSG_41: - case BTL_MSG_42: - if (popup->unk_17) { + case BTL_MSG_ACTION_TIP_00: + case BTL_MSG_ACTION_TIP_01: + case BTL_MSG_ACTION_TIP_02: + case BTL_MSG_ACTION_TIP_03: + case BTL_MSG_ACTION_TIP_04: + case BTL_MSG_ACTION_TIP_05: + case BTL_MSG_ACTION_TIP_06: + case BTL_MSG_ACTION_TIP_07: + case BTL_MSG_ACTION_TIP_08: + case BTL_MSG_ACTION_TIP_09: + case BTL_MSG_ACTION_TIP_0A: + case BTL_MSG_ACTION_TIP_0B: + case BTL_MSG_ACTION_TIP_0C: + case BTL_MSG_ACTION_TIP_0D: + case BTL_MSG_ACTION_TIP_0E: + case BTL_MSG_ACTION_TIP_0F: + case BTL_MSG_ACTION_TIP_10: + case BTL_MSG_ACTION_TIP_11: + case BTL_MSG_ACTION_TIP_12: + case BTL_MSG_ACTION_TIP_13: + case BTL_MSG_ACTION_TIP_14: + if (popup->needsInit) { s32 messageID; - popup->unk_17 = FALSE; + popup->needsInit = FALSE; messageID = bMessages[popup->messageIndex]; msgWidth = get_msg_width(messageID, 0) + 31; posX = 160 - (msgWidth / 2); @@ -3998,7 +4025,7 @@ void btl_show_message_popup(void* data) { width = msgWidth; numLines = get_msg_lines(messageID) - 1; height = bMsgHeights[numLines]; - if (popup->messageIndex == BTL_MSG_3B) { + if (popup->messageIndex == BTL_MSG_ACTION_TIP_0D) { posY = 120; D_8029F64C = 1; } @@ -4007,7 +4034,7 @@ void btl_show_message_popup(void* data) { posY = D_8029F64E + D_8029F650; set_window_properties(WINDOW_ID_BATTLE_POPUP, posX, posY, width, height, WINDOW_PRIORITY_0, func_80250818, popup, -1); - if (popup->messageIndex == BTL_MSG_3B) { + if (popup->messageIndex == BTL_MSG_ACTION_TIP_0D) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW); } else { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW_DARKENED); diff --git a/src/17FEB0.c b/src/17FEB0.c index aeca2ef5a0..aef96aa8a0 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -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; diff --git a/src/181810.c b/src/181810.c index e7ec15c012..1ca33a7db5 100644 --- a/src/181810.c +++ b/src/181810.c @@ -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; diff --git a/src/18C790.c b/src/18C790.c index 10a0df630e..1aa82f3c62 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -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; } diff --git a/src/18F340.c b/src/18F340.c index 1d7006a68f..47cce4e747 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -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 diff --git a/src/190B20.c b/src/190B20.c index 9f3d29d688..ff6872d3d1 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -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); diff --git a/src/19FAF0.c b/src/19FAF0.c index aa9c0e75ee..2cfc050280 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -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); } diff --git a/src/1A5830.c b/src/1A5830.c index 199ad414d0..d1bfd13108 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -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; diff --git a/src/1AC760.c b/src/1AC760.c index 9d754d970f..fb4a7b664f 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -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; diff --git a/src/1AF120.c b/src/1AF120.c index b0a0face1a..3c270eb7c1 100644 --- a/src/1AF120.c +++ b/src/1AF120.c @@ -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 diff --git a/src/325AD0.c b/src/325AD0.c index 191ed17f37..c59cd3cd33 100644 --- a/src/325AD0.c +++ b/src/325AD0.c @@ -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] = { diff --git a/src/415D90.c b/src/415D90.c index 5f62057617..7f1d1bf7a3 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -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); } } } diff --git a/src/43F0.c b/src/43F0.c index 0c0bfb5d80..c32fb4e168 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -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); diff --git a/src/7E9D0.c b/src/7E9D0.c index c84a69e8bf..7c765431a6 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -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; diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 9ccf79545c..5eac19aa46 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -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; } diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 213cf3d4f6..60346bdc04 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -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; diff --git a/src/C50A0.c b/src/C50A0.c index 6ec23e0c65..30c13921fb 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -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); } } diff --git a/src/CEE40.c b/src/CEE40.c index ac1a3176a7..36c361bb90 100644 --- a/src/CEE40.c +++ b/src/CEE40.c @@ -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); diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 012f49fc6d..95697419b7 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -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; diff --git a/src/actor_api.c b/src/actor_api.c index 3e21d2ef3f..a5d12d7178 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -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) { diff --git a/src/audio/e0b30_len_b80.c b/src/audio/e0b30_len_b80.c index 58cd3d9425..39e85d0d38 100644 --- a/src/audio/e0b30_len_b80.c +++ b/src/audio/e0b30_len_b80.c @@ -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; diff --git a/src/dc470_len_14c0.c b/src/background.c similarity index 100% rename from src/dc470_len_14c0.c rename to src/background.c diff --git a/src/background_gfx.c b/src/background_gfx.c index d26a706f41..0df2bf408b 100644 --- a/src/background_gfx.c +++ b/src/background_gfx.c @@ -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); diff --git a/src/battle/area/arn/actor/hyper_cleft.c b/src/battle/area/arn/actor/hyper_cleft.c index 6622002592..944bc439f5 100644 --- a/src/battle/area/arn/actor/hyper_cleft.c +++ b/src/battle/area/arn/actor/hyper_cleft.c @@ -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) diff --git a/src/battle/area/arn/actor/hyper_paragoomba.c b/src/battle/area/arn/actor/hyper_paragoomba.c index 956639ae4b..77146d7d5f 100644 --- a/src/battle/area/arn/actor/hyper_paragoomba.c +++ b/src/battle/area/arn/actor/hyper_paragoomba.c @@ -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)) diff --git a/src/battle/area/arn/actor/hypergoomba.c b/src/battle/area/arn/actor/hypergoomba.c index 14a83b635c..d00564c95e 100644 --- a/src/battle/area/arn/actor/hypergoomba.c +++ b/src/battle/area/arn/actor/hypergoomba.c @@ -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)) diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 7ffa3169be..9ebe5d96f1 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -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 }; diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index fc39369514..3bc19d6d5f 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -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) diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index 1a6bc1fa27..fcf78c0656 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -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 diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 396d283f1f..424dc4f1ce 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -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) diff --git a/src/battle/area/dig/script/dig_02.c b/src/battle/area/dig/script/dig_02.c index 17ba8125c1..43e1b95f9b 100644 --- a/src/battle/area/dig/script/dig_02.c +++ b/src/battle/area/dig/script/dig_02.c @@ -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) diff --git a/src/battle/area/dig/script/dig_03.c b/src/battle/area/dig/script/dig_03.c index 92c764d8d8..1719af593f 100644 --- a/src/battle/area/dig/script/dig_03.c +++ b/src/battle/area/dig/script/dig_03.c @@ -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) diff --git a/src/battle/area/dig/script/dig_04.c b/src/battle/area/dig/script/dig_04.c index d31afac824..ee3c2e3812 100644 --- a/src/battle/area/dig/script/dig_04.c +++ b/src/battle/area/dig/script/dig_04.c @@ -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) diff --git a/src/battle/area/dig/script/dig_05.c b/src/battle/area/dig/script/dig_05.c index 4918287d9c..d3acfc810e 100644 --- a/src/battle/area/dig/script/dig_05.c +++ b/src/battle/area/dig/script/dig_05.c @@ -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) diff --git a/src/battle/area/flo/actor/amazy_dayzee.c b/src/battle/area/flo/actor/amazy_dayzee.c index b0e9f62a90..39cc6b6490 100644 --- a/src/battle/area/flo/actor/amazy_dayzee.c +++ b/src/battle/area/flo/actor/amazy_dayzee.c @@ -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)) diff --git a/src/battle/area/flo/actor/crazee_dayzee.c b/src/battle/area/flo/actor/crazee_dayzee.c index 11b33866fa..3261673688 100644 --- a/src/battle/area/flo/actor/crazee_dayzee.c +++ b/src/battle/area/flo/actor/crazee_dayzee.c @@ -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)) diff --git a/src/battle/area/flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c index 17682b19b9..ec05bfcf86 100644 --- a/src/battle/area/flo/actor/lakitu.c +++ b/src/battle/area/flo/actor/lakitu.c @@ -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) diff --git a/src/battle/area/flo/actor/ruff_puff.c b/src/battle/area/flo/actor/ruff_puff.c index d47e9637b9..37197818e4 100644 --- a/src/battle/area/flo/actor/ruff_puff.c +++ b/src/battle/area/flo/actor/ruff_puff.c @@ -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)) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index f3436854c4..8b7753dc60 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -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) diff --git a/src/battle/area/flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c index 46dc7342ef..847acde47c 100644 --- a/src/battle/area/flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -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 diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 4652a480f6..3aead8175a 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -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)) diff --git a/src/battle/area/flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c index a32019d168..bb1f68da0e 100644 --- a/src/battle/area/flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -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) diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index d653ff713f..b236b64ef3 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -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) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 654ee1dd42..64bfdef472 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -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) diff --git a/src/battle/area/isk_part_1/actor/pokey_mummy.c b/src/battle/area/isk_part_1/actor/pokey_mummy.c index 822c3547f3..bec37c5faa 100644 --- a/src/battle/area/isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area/isk_part_1/actor/pokey_mummy.c @@ -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) diff --git a/src/battle/area/isk_part_1/actor/stone_chomp.c b/src/battle/area/isk_part_1/actor/stone_chomp.c index b6796cb15a..0f0a3915ef 100644 --- a/src/battle/area/isk_part_1/actor/stone_chomp.c +++ b/src/battle/area/isk_part_1/actor/stone_chomp.c @@ -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) diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index abfcc64451..5778d2290e 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -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) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 59aeea23b3..e46ec94dc5 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -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) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 0bb3d9cd6e..c213aa7938 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -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 diff --git a/src/battle/area/iwa/actor/cleft.c b/src/battle/area/iwa/actor/cleft.c index 71d1b235b0..f8c0b2d091 100644 --- a/src/battle/area/iwa/actor/cleft.c +++ b/src/battle/area/iwa/actor/cleft.c @@ -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) diff --git a/src/battle/area/jan/actor/hurt_plant.c b/src/battle/area/jan/actor/hurt_plant.c index 46ac9bef68..2ffead49c1 100644 --- a/src/battle/area/jan/actor/hurt_plant.c +++ b/src/battle/area/jan/actor/hurt_plant.c @@ -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)) diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index a47d6c5c14..8232cac589 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -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) diff --git a/src/battle/area/jan/actor/m_bush.c b/src/battle/area/jan/actor/m_bush.c index 1aee04a9f9..6c0bc35cdf 100644 --- a/src/battle/area/jan/actor/m_bush.c +++ b/src/battle/area/jan/actor/m_bush.c @@ -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) diff --git a/src/battle/area/jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c index fcb7dbc326..13c27a0651 100644 --- a/src/battle/area/jan/actor/spear_guy.c +++ b/src/battle/area/jan/actor/spear_guy.c @@ -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) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 9a85b6cc8a..b6f652fc77 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -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 diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index ca06701154..c073622c84 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -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) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba.c b/src/battle/area/kmr_part_2/actor/blue_goomba.c index c097451e38..b0b04ee2a8 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba.c @@ -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 diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba2.c b/src/battle/area/kmr_part_2/actor/blue_goomba2.c index 5b11657c83..e178626450 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba2.c @@ -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)) diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index 5b99de2acb..2702ede207 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -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) diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index ab3441dfda..35a3a26a5d 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -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) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba.c b/src/battle/area/kmr_part_2/actor/red_goomba.c index f39dbfca21..e8847a38bb 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba.c @@ -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 diff --git a/src/battle/area/kmr_part_2/actor/red_goomba2.c b/src/battle/area/kmr_part_2/actor/red_goomba2.c index 04f6e291d2..045027004e 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba2.c @@ -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)) diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index ecb006e9ba..f0c2de22db 100644 --- a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -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) diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index 5faba2b47b..677aaf4e2d 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -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) diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 2e7aa874f4..3047fd00dd 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -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 diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index e1aac8436e..878111d39d 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -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) diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index 8a03523478..546101a1c0 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -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) diff --git a/src/battle/area/kmr_part_3/actor/paragoomba.c b/src/battle/area/kmr_part_3/actor/paragoomba.c index 096b1fb66b..6147948b06 100644 --- a/src/battle/area/kmr_part_3/actor/paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/paragoomba.c @@ -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) diff --git a/src/battle/area/kmr_part_3/actor/spiked_goomba.c b/src/battle/area/kmr_part_3/actor/spiked_goomba.c index 03ef1d480b..ec2db00b05 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/spiked_goomba.c @@ -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) diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index 3092c31a52..5217a54363 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -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) diff --git a/src/battle/area/kpa/actor/bony_beetle.c b/src/battle/area/kpa/actor/bony_beetle.c index 763b7e5493..ba3ac2ec07 100644 --- a/src/battle/area/kpa/actor/bony_beetle.c +++ b/src/battle/area/kpa/actor/bony_beetle.c @@ -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 diff --git a/src/battle/area/kpa/actor/dry_bones.c b/src/battle/area/kpa/actor/dry_bones.c index 4540ce7354..6a5f419d68 100644 --- a/src/battle/area/kpa/actor/dry_bones.c +++ b/src/battle/area/kpa/actor/dry_bones.c @@ -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) diff --git a/src/battle/area/kpa2/actor/bowser.c b/src/battle/area/kpa2/actor/bowser.c index 7bcbc640df..c5b465ebad 100644 --- a/src/battle/area/kpa2/actor/bowser.c +++ b/src/battle/area/kpa2/actor/bowser.c @@ -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) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index 9dd3fd415a..530ab0ef55 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -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) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index 7f2d05035a..0c469ce1d3 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -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) diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index bcf331ea46..67516c63c8 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -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) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 2699c13487..b5673de582 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -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) diff --git a/src/battle/area/kpa3/actor/anti_guy.c b/src/battle/area/kpa3/actor/anti_guy.c index 8b3599c55d..fc5ffeb566 100644 --- a/src/battle/area/kpa3/actor/anti_guy.c +++ b/src/battle/area/kpa3/actor/anti_guy.c @@ -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) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 3456dd4c92..ee30258c8c 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -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 }; diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index b3d62b9a14..8fc24e12f6 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -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) diff --git a/src/battle/area/kzn/actor/lava_bubble.c b/src/battle/area/kzn/actor/lava_bubble.c index f88332fae0..4d18588cfe 100644 --- a/src/battle/area/kzn/actor/lava_bubble.c +++ b/src/battle/area/kzn/actor/lava_bubble.c @@ -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) diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index 47783ef35a..ea3b833d4c 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -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) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index eef2277860..f7052d8cf2 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -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 diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index 927256ccd5..136af3d4b6 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -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)) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index cb5acf6e8d..96cc3d52c3 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -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) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 29db076b06..83b72ac1a6 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -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 diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index efa5180dbc..f5d573c3c9 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -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 diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index bcbb7e2104..17fb6615fe 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -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 diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 823f54e798..7c052972d6 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -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 diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c index 9a39ca51b0..578f8e4f05 100644 --- a/src/battle/area/mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -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) diff --git a/src/battle/area/mim/actor/piranha_plant.c b/src/battle/area/mim/actor/piranha_plant.c index 263dc99105..02ea18f991 100644 --- a/src/battle/area/mim/actor/piranha_plant.c +++ b/src/battle/area/mim/actor/piranha_plant.c @@ -116,7 +116,7 @@ EvtScript N(idle_8021D4E4) = { }; EvtScript N(8021D4F4) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) @@ -142,7 +142,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -156,7 +156,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -168,7 +168,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -182,7 +182,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_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) @@ -216,11 +216,11 @@ EvtScript N(handleEvent_8021D60C) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -229,7 +229,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SmallPiranha_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim04) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) @@ -265,7 +265,7 @@ EvtScript N(takeTurn_8021DCD4) = { 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) @@ -287,7 +287,7 @@ EvtScript N(takeTurn_8021DCD4) = { 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) @@ -332,7 +332,7 @@ EvtScript N(takeTurn_8021DCD4) = { 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(YieldTurn) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_EXEC_WAIT(N(8021D4F4)) @@ -355,7 +355,7 @@ EvtScript N(takeTurn_8021DCD4) = { 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(2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim08) EVT_WAIT(15) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 27551d6ffe..9adaae1caa 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -220,7 +220,7 @@ extern EvtScript N(handleEvent_80227E08); extern EvtScript N(nextTurn_80227D2C); EvtScript N(init_80227C20) = { - EVT_CALL(func_8027D434, -127, 3, 70) + EVT_CALL(func_8027D434, ACTOR_SELF, 3, 70) EVT_CALL(SetPartSize, ACTOR_SELF, 3, 30, 30) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80228A7C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80227DD4))) @@ -272,111 +272,111 @@ EvtScript N(handleEvent_80227E08) = { EVT_SWITCH(LVarD) EVT_CASE_EQ(56) EVT_CASE_EQ(9) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(10) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CASE_EQ(32) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(14) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar0, 1) - EVT_SET(LVar1, 4653077) - EVT_SET(LVar2, 4653078) + EVT_SET(LVar1, ANIM_KentCKoopa_Anim15) + EVT_SET(LVar2, ANIM_KentCKoopa_Anim16) EVT_EXEC_WAIT(DoBurnHit) EVT_ELSE EVT_SET(LVar0, 1) - EVT_SET(LVar1, 4653079) - EVT_SET(LVar2, 4653080) + EVT_SET(LVar1, ANIM_KentCKoopa_Anim17) + EVT_SET(LVar2, ANIM_KentCKoopa_Anim18) EVT_EXEC_WAIT(DoBurnHit) EVT_END_IF EVT_CASE_EQ(36) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar0, 1) - EVT_SET(LVar1, 4653077) - EVT_SET(LVar2, 4653078) + EVT_SET(LVar1, ANIM_KentCKoopa_Anim15) + EVT_SET(LVar2, ANIM_KentCKoopa_Anim16) EVT_ELSE EVT_SET(LVar0, 1) - EVT_SET(LVar1, 4653079) - EVT_SET(LVar2, 4653080) + EVT_SET(LVar1, ANIM_KentCKoopa_Anim17) + EVT_SET(LVar2, ANIM_KentCKoopa_Anim18) EVT_END_IF EVT_EXEC_WAIT(DoBurnHit) EVT_WAIT(10) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, LVar2) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(11) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(N(8022B158)) EVT_END_IF EVT_CASE_EQ(33) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_EXEC_WAIT(EVS_DoNormalHit) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(N(8022B204)) EVT_RETURN EVT_END_IF EVT_CASE_EQ(47) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoShockHit) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoJumpBack) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoReturnHome) EVT_CASE_EQ(38) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoShockHit) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoJumpBack) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(23) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim09) EVT_EXEC_WAIT(DoImmune) EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim1A) EVT_EXEC_WAIT(DoImmune) EVT_END_IF @@ -384,7 +384,7 @@ EvtScript N(handleEvent_80227E08) = { EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim09) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar2) @@ -394,16 +394,16 @@ EvtScript N(handleEvent_80227E08) = { EVT_WAIT(8) EVT_END_IF EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim1A) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(31) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET(LVar1, 4653057) + EVT_SET(LVar1, ANIM_KentCKoopa_Anim01) EVT_ELSE - EVT_SET(LVar1, 4653082) + EVT_SET(LVar1, ANIM_KentCKoopa_Anim1A) EVT_END_IF EVT_SET(LVar0, 1) EVT_EXEC_WAIT(DoImmune) @@ -414,19 +414,19 @@ EvtScript N(handleEvent_80227E08) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim01) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_EXEC_WAIT(DoRecover) EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim1A) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(13) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim12) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_RETURN EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) @@ -434,8 +434,8 @@ EvtScript N(handleEvent_80227E08) = { EVT_SUB(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVar0) EVT_END_IF - EVT_CALL(func_80269E80, LVar0) - EVT_IF_EQ(LVar0, 22) + EVT_CALL(GetDamageSource, LVar0) + EVT_IF_EQ(LVar0, DMG_SRC_POW_BLOCK) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) @@ -451,11 +451,11 @@ EvtScript N(handleEvent_80227E08) = { EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim1C) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim09) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar2) @@ -466,9 +466,9 @@ EvtScript N(handleEvent_80227E08) = { EVT_END_IF EVT_END_IF EVT_ELSE - EVT_SET_CONST(LVar0, 0x00000001) + EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim1C) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_IF EVT_CASE_DEFAULT @@ -508,7 +508,7 @@ EvtScript N(takeTurn_80228A7C) = { EVT_END_LOOP EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -524,7 +524,7 @@ EvtScript N(takeTurn_80228A7C) = { EVT_END_LOOP EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim19) @@ -617,7 +617,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVarB) EVT_CASE_EQ(6) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -694,7 +694,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarE) EVT_IF_NOT_FLAG(LVarE, STATUS_FLAG_SHRINK) - EVT_CALL(func_80269EAC, 24) + EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LVarA, 0) @@ -717,7 +717,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(func_80269EAC, 25) + EVT_CALL(SetDamageSource, DMG_SRC_CRUSH_PARTNER) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) @@ -725,7 +725,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -240, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetActorPos, ACTOR_SELF, 240, 0, LVar2) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -785,7 +785,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim04) @@ -805,7 +805,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(SetBattleCamZoom, 280) 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) @@ -872,7 +872,7 @@ EvtScript N(tackle_KentC) = { 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_SET(LVar3, 0) EVT_LOOP(12) @@ -914,14 +914,14 @@ EvtScript N(tackle_KentC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarF) EVT_IF_NOT_FLAG(LVarF, 0x80000) - EVT_CALL(func_80269EAC, 24) + EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, SUPPRESS_EVENT_ALL, 0, 10, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVarF) 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(MoveBattleCamOver, 30) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) @@ -976,7 +976,7 @@ EvtScript N(tackle_KentC) = { 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(MoveBattleCamOver, 20) EVT_EXEC_WAIT(N(8022AD84)) EVT_CASE_EQ(3) @@ -1081,7 +1081,7 @@ EvtScript N(8022B204) = { EVT_WAIT(10) EVT_SET(LVar0, 1) EVT_SET(LVar1, -1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; diff --git a/src/battle/area/omo/actor/anti_guy.c b/src/battle/area/omo/actor/anti_guy.c index 74e9c8e7b3..816c7293d3 100644 --- a/src/battle/area/omo/actor/anti_guy.c +++ b/src/battle/area/omo/actor/anti_guy.c @@ -142,7 +142,7 @@ EvtScript N(handleEvent_80221C20) = { 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) @@ -156,7 +156,7 @@ EvtScript N(handleEvent_80221C20) = { 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) @@ -168,7 +168,7 @@ EvtScript N(handleEvent_80221C20) = { 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) @@ -185,7 +185,7 @@ EvtScript N(handleEvent_80221C20) = { 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) @@ -197,11 +197,11 @@ EvtScript N(handleEvent_80221C20) = { 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) @@ -236,7 +236,7 @@ EvtScript N(802220FC) = { 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, PT_MAIN, ANIM_ShyGuy_Black_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -272,7 +272,7 @@ EvtScript N(802220FC) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -306,7 +306,7 @@ EvtScript N(802220FC) = { 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) @@ -331,7 +331,7 @@ EvtScript N(80222824) = { 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, PT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(20) @@ -382,7 +382,7 @@ EvtScript N(80222824) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -412,7 +412,7 @@ EvtScript N(80222824) = { 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) diff --git a/src/battle/area/omo/actor/blue_shy_guy.c b/src/battle/area/omo/actor/blue_shy_guy.c index 84cb1ab104..822e3d5330 100644 --- a/src/battle/area/omo/actor/blue_shy_guy.c +++ b/src/battle/area/omo/actor/blue_shy_guy.c @@ -143,7 +143,7 @@ EvtScript N(handleEvent_8021B028) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_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) @@ -157,7 +157,7 @@ EvtScript N(handleEvent_8021B028) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -169,7 +169,7 @@ EvtScript N(handleEvent_8021B028) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -186,7 +186,7 @@ EvtScript N(handleEvent_8021B028) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_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) @@ -198,11 +198,11 @@ EvtScript N(handleEvent_8021B028) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim0C) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -237,7 +237,7 @@ EvtScript N(8021B504) = { 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, PT_MAIN, ANIM_ShyGuy_Blue_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -273,7 +273,7 @@ EvtScript N(8021B504) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -307,7 +307,7 @@ EvtScript N(8021B504) = { 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) @@ -332,7 +332,7 @@ EvtScript N(8021BC2C) = { 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, PT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_WAIT(20) @@ -383,7 +383,7 @@ EvtScript N(8021BC2C) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -413,7 +413,7 @@ EvtScript N(8021BC2C) = { 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) diff --git a/src/battle/area/omo/actor/green_shy_guy.c b/src/battle/area/omo/actor/green_shy_guy.c index 05d9fbc465..8b9105ce23 100644 --- a/src/battle/area/omo/actor/green_shy_guy.c +++ b/src/battle/area/omo/actor/green_shy_guy.c @@ -143,7 +143,7 @@ EvtScript N(handleEvent_80220128) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_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) @@ -157,7 +157,7 @@ EvtScript N(handleEvent_80220128) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -169,7 +169,7 @@ EvtScript N(handleEvent_80220128) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -186,7 +186,7 @@ EvtScript N(handleEvent_80220128) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_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) @@ -198,11 +198,11 @@ EvtScript N(handleEvent_80220128) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim0C) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -237,7 +237,7 @@ EvtScript N(80220604) = { 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, PT_MAIN, ANIM_ShyGuy_Green_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -273,7 +273,7 @@ EvtScript N(80220604) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -307,7 +307,7 @@ EvtScript N(80220604) = { 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) @@ -332,7 +332,7 @@ EvtScript N(80220D2C) = { 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, PT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_WAIT(20) @@ -383,7 +383,7 @@ EvtScript N(80220D2C) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -413,7 +413,7 @@ EvtScript N(80220D2C) = { 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) diff --git a/src/battle/area/omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c index 0c0e59e972..4a5e1be891 100644 --- a/src/battle/area/omo/actor/groove_guy.c +++ b/src/battle/area/omo/actor/groove_guy.c @@ -157,7 +157,7 @@ EvtScript N(handleEvent_80224D10) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_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) @@ -171,7 +171,7 @@ EvtScript N(handleEvent_80224D10) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_Anim0F) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -183,7 +183,7 @@ EvtScript N(handleEvent_80224D10) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_Anim08) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -200,7 +200,7 @@ EvtScript N(handleEvent_80224D10) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_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) @@ -211,11 +211,11 @@ EvtScript N(handleEvent_80224D10) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_Anim08) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_Anim08) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -254,7 +254,7 @@ EvtScript N(basicAttack) = { 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, PT_MAIN, ANIM_GrooveGuy_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -289,7 +289,7 @@ EvtScript N(basicAttack) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -321,7 +321,7 @@ EvtScript N(basicAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) 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, 30) EVT_SET(LVar1, 0) @@ -346,7 +346,7 @@ EvtScript N(sleepySpin) = { 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(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim10) @@ -376,7 +376,7 @@ EvtScript N(sleepySpin) = { EVT_IF_EQ(LVar0, 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(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(80224CAC)) @@ -414,7 +414,7 @@ EvtScript N(sleepySpin) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E4) EVT_THREAD EVT_SET(LVar0, 0) @@ -595,7 +595,7 @@ EvtScript N(randomSummon) = { EVT_CASE_EQ(2) EVT_EXEC_WAIT(N(802271A0)) EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(IdleAnimations_802249E0))) EVT_RETURN EVT_END @@ -715,7 +715,7 @@ EvtScript N(80226C00) = { EVT_SET(LVar2, 0) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_ShyGuy_Red_Anim04) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetGoalToIndex, LVarB, LVarA) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) @@ -736,7 +736,7 @@ EvtScript N(80226DEC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_EXEC_WAIT(N(8022671C)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273C4)), 0) EVT_SET(LVarB, LVar0) @@ -802,7 +802,7 @@ EvtScript N(802271A0) = { EVT_SET(LVar2, LVar5) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_380, SOUND_0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) diff --git a/src/battle/area/omo/actor/pink_shy_guy.c b/src/battle/area/omo/actor/pink_shy_guy.c index 9cec2859d7..086f43085f 100644 --- a/src/battle/area/omo/actor/pink_shy_guy.c +++ b/src/battle/area/omo/actor/pink_shy_guy.c @@ -143,7 +143,7 @@ EvtScript N(handleEvent_8021E628) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_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) @@ -157,7 +157,7 @@ EvtScript N(handleEvent_8021E628) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -169,7 +169,7 @@ EvtScript N(handleEvent_8021E628) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -186,7 +186,7 @@ EvtScript N(handleEvent_8021E628) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_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) @@ -198,11 +198,11 @@ EvtScript N(handleEvent_8021E628) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim0C) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -237,7 +237,7 @@ EvtScript N(8021EB04) = { 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, PT_MAIN, ANIM_ShyGuy_Pink_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -273,7 +273,7 @@ EvtScript N(8021EB04) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -307,7 +307,7 @@ EvtScript N(8021EB04) = { 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) @@ -332,7 +332,7 @@ EvtScript N(8021F22C) = { 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, PT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(20) @@ -383,7 +383,7 @@ EvtScript N(8021F22C) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -413,7 +413,7 @@ EvtScript N(8021F22C) = { 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) diff --git a/src/battle/area/omo/actor/pyro_guy.c b/src/battle/area/omo/actor/pyro_guy.c index 4687808ead..4d23dfea1a 100644 --- a/src/battle/area/omo/actor/pyro_guy.c +++ b/src/battle/area/omo/actor/pyro_guy.c @@ -149,7 +149,7 @@ EvtScript N(handleEvent_8022CE60) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -163,7 +163,7 @@ EvtScript N(handleEvent_8022CE60) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -175,7 +175,7 @@ EvtScript N(handleEvent_8022CE60) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -192,7 +192,7 @@ EvtScript N(handleEvent_8022CE60) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -204,10 +204,10 @@ EvtScript N(handleEvent_8022CE60) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -242,7 +242,7 @@ EvtScript N(takeTurn_8022D344) = { 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, PT_MAIN, ANIM_PyroGuy_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -284,7 +284,7 @@ EvtScript N(takeTurn_8022D344) = { 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -311,7 +311,7 @@ EvtScript N(takeTurn_8022D344) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) 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, 30) EVT_SET(LVar1, 0) diff --git a/src/battle/area/omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c index ba2da128c4..767a136d52 100644 --- a/src/battle/area/omo/actor/sky_guy.c +++ b/src/battle/area/omo/actor/sky_guy.c @@ -272,7 +272,7 @@ EvtScript N(idle_80229A24) = { EvtScript N(80229A34) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar2) EVT_IF_NE(LVar2, 0) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(GetActorPos, ACTOR_SELF, LVar7, LVar8, LVar9) @@ -287,7 +287,7 @@ EvtScript N(80229A34) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_END @@ -408,7 +408,7 @@ EvtScript N(handleEvent_8022A398) = { EVT_ELSE EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_SkyGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_CASE_EQ(EVENT_HIT) EVT_CALL(func_8026E914, LVar0, LVar1) @@ -418,7 +418,7 @@ EvtScript N(handleEvent_8022A398) = { EVT_ELSE EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_SkyGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 2) @@ -457,7 +457,7 @@ EvtScript N(handleEvent_8022A398) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_SkyGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_SkyGuy_Anim06) @@ -515,7 +515,7 @@ EvtScript N(takeTurn_8022A9D0) = { 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E7) @@ -658,7 +658,7 @@ EvtScript N(handleEvent_8022B310) = { 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) @@ -672,7 +672,7 @@ EvtScript N(handleEvent_8022B310) = { 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) @@ -684,7 +684,7 @@ EvtScript N(handleEvent_8022B310) = { 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) @@ -701,7 +701,7 @@ EvtScript N(handleEvent_8022B310) = { 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) @@ -713,11 +713,11 @@ EvtScript N(handleEvent_8022B310) = { 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) @@ -752,7 +752,7 @@ EvtScript N(8022B7EC) = { 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, PT_MAIN, ANIM_ShyGuy_Red_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -788,7 +788,7 @@ EvtScript N(8022B7EC) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -822,7 +822,7 @@ EvtScript N(8022B7EC) = { 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) @@ -847,7 +847,7 @@ EvtScript N(8022BF14) = { 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, PT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(20) @@ -898,7 +898,7 @@ EvtScript N(8022BF14) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -928,7 +928,7 @@ EvtScript N(8022BF14) = { 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) diff --git a/src/battle/area/omo/actor/spy_guy.c b/src/battle/area/omo/actor/spy_guy.c index 7677c07d66..2873dea832 100644 --- a/src/battle/area/omo/actor/spy_guy.c +++ b/src/battle/area/omo/actor/spy_guy.c @@ -215,12 +215,12 @@ EvtScript N(handleEvent_80227ABC) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) EVT_EXEC_WAIT(N(802276D4)) EVT_CASE_EQ(EVENT_BURN_HIT) @@ -237,7 +237,7 @@ EvtScript N(handleEvent_80227ABC) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -251,7 +251,7 @@ EvtScript N(handleEvent_80227ABC) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 1) @@ -277,11 +277,11 @@ EvtScript N(handleEvent_80227ABC) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -335,7 +335,7 @@ EvtScript N(slingshotAttack) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2E7) @@ -462,7 +462,7 @@ EvtScript N(hammerAttack) = { 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, PT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -480,7 +480,7 @@ EvtScript N(hammerAttack) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_WAIT(10) - EVT_CALL(func_8024ECF8, -1, 1, 0) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_THREAD EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_327) @@ -496,7 +496,7 @@ EvtScript N(hammerAttack) = { 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(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_SET_CONST(LVar0, 1) @@ -592,7 +592,7 @@ EvtScript N(hammerAttack) = { EVT_WAIT(20) EVT_END_IF EVT_LABEL(100) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim07) EVT_EXEC_WAIT(DoReturnHome) diff --git a/src/battle/area/omo/actor/yellow_shy_guy.c b/src/battle/area/omo/actor/yellow_shy_guy.c index f1238f478e..46d4dd756d 100644 --- a/src/battle/area/omo/actor/yellow_shy_guy.c +++ b/src/battle/area/omo/actor/yellow_shy_guy.c @@ -143,7 +143,7 @@ EvtScript N(handleEvent_8021CB28) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_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) @@ -157,7 +157,7 @@ EvtScript N(handleEvent_8021CB28) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -169,7 +169,7 @@ EvtScript N(handleEvent_8021CB28) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -186,7 +186,7 @@ EvtScript N(handleEvent_8021CB28) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_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) @@ -198,11 +198,11 @@ EvtScript N(handleEvent_8021CB28) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim0C) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -237,7 +237,7 @@ EvtScript N(8021D004) = { 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, PT_MAIN, ANIM_ShyGuy_Yellow_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -273,7 +273,7 @@ EvtScript N(8021D004) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -307,7 +307,7 @@ EvtScript N(8021D004) = { 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) @@ -332,7 +332,7 @@ EvtScript N(8021D72C) = { 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, PT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_WAIT(20) @@ -383,7 +383,7 @@ EvtScript N(8021D72C) = { 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, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -413,7 +413,7 @@ EvtScript N(8021D72C) = { 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) diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index 02d16f6b3b..29bb56c361 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -185,7 +185,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GeneralGuy_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET(LVar0, 1) @@ -200,7 +200,7 @@ EvtScript N(handleEvent) = { EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GeneralGuy_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -212,7 +212,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GeneralGuy_Anim05) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -235,11 +235,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GeneralGuy_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GeneralGuy_Anim05) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) @@ -253,7 +253,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GeneralGuy_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) @@ -299,7 +299,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(MoveBattleCamOver, 30) EVT_THREAD EVT_WAIT(35) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_END_THREAD EVT_WAIT(5) @@ -356,7 +356,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.1)) EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - 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) @@ -433,7 +433,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GeneralGuy_Anim03) EVT_WAIT(20) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, 1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_THREAD EVT_CALL(N(FadeBackgroundToBlack)) diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index f0a8f228f3..a05c83cc19 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -58,7 +58,7 @@ API_CALLABLE(N(UpdateBulbGlow)) { API_CALLABLE(func_802181F4_52B894) { Bytecode* args = script->ptrReadPos; get_actor(script->owner1.actorID); - set_screen_overlay_params_back(13, evt_get_variable(script, *args)); + set_screen_overlay_params_back(OVERLAY_BATTLE_DARKNESS, evt_get_variable(script, *args)); return ApiStatus_DONE2; } @@ -298,9 +298,9 @@ EvtScript N(onHit) = { EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 2, 0, 50) EVT_EXEC_WAIT(N(shake_tank)) EVT_CALL(GetActorVar, ACTOR_ENEMY0, 1, LVar0) - EVT_CALL(func_80269E80, LVar1) + EVT_CALL(GetDamageSource, LVar1) EVT_SWITCH(LVar1) - EVT_CASE_EQ(19) + EVT_CASE_EQ(DMG_SRC_ELECTRO_DASH) EVT_IF_NOT_FLAG(LVar0, 0x2) EVT_BITWISE_OR_CONST(LVar0, 0xE) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 1, LVar0) @@ -310,11 +310,11 @@ EvtScript N(onHit) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH4_0072, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05, ANIM_GeneralGuy_Anim05) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_END_IF - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) + EVT_CASE_OR_EQ(DMG_SRC_D_DOWN_POUND) + EVT_CASE_OR_EQ(DMG_SRC_D_DOWN_JUMP) EVT_IF_NOT_FLAG(LVar0, 0x4) EVT_BITWISE_OR_CONST(LVar0, 0xC) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 1, LVar0) @@ -324,7 +324,7 @@ EvtScript N(onHit) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH4_0073, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05, ANIM_GeneralGuy_Anim05) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_END_IF EVT_END_CASE_GROUP @@ -338,7 +338,7 @@ EvtScript N(onHit) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH4_0074, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05, ANIM_GeneralGuy_Anim05) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_END_IF EVT_END_SWITCH @@ -462,7 +462,7 @@ EvtScript N(update_phase) = { EvtScript N(start_stilt_guys_phase) = { EVT_CALL(func_802535B4, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_CALL(GetActorVar, ACTOR_ENEMY0, 1, LVar0) @@ -498,7 +498,7 @@ EvtScript N(start_stilt_guys_phase) = { EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_ENEMY0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(func_802535B4, 1) EVT_CALL(func_8026BF48, 0) @@ -517,7 +517,7 @@ EvtScript N(start_shy_stack_phase) = { EVT_CALL(ActorSpeak, MSG_CH4_006E, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) EVT_ELSE EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) EVT_CALL(LoadBattleSection, 43) @@ -571,7 +571,7 @@ EvtScript N(start_shy_stack_phase) = { EVT_CALL(UseIdleAnimation, ACTOR_ENEMY4, TRUE) EVT_END_THREAD EVT_CALL(ActorSpeak, MSG_CH4_0070, ACTOR_ENEMY4, 1, -1, -1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_CALL(func_802535B4, 1) @@ -585,13 +585,13 @@ EvtScript N(summon_stilt_guys) = { EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0) EVT_CALL(MoveBattleCamOver, 40) EVT_WAIT(40) - EVT_CALL(func_8024ECF8, 0, 1, 0) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetActorVar, ACTOR_ENEMY0, 2, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(ActorSpeak, MSG_CH4_006B, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) EVT_ELSE EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) EVT_CALL(LoadBattleSection, 42) @@ -625,7 +625,7 @@ EvtScript N(summon_stilt_guys) = { EVT_CALL(JumpToGoal, ACTOR_ENEMY4, 10, FALSE, TRUE, FALSE) EVT_END_THREAD EVT_CALL(ActorSpeak, MSG_CH4_006D, ACTOR_ENEMY4, 1, -1, -1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(func_8026BF48, 0) EVT_RETURN @@ -633,7 +633,7 @@ EvtScript N(summon_stilt_guys) = { }; EvtScript N(summon_tank_squad) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_CALL(SetActorYaw, ACTOR_ENEMY0, 180) @@ -648,12 +648,12 @@ EvtScript N(summon_tank_squad) = { EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0) EVT_CALL(MoveBattleCamOver, 40) EVT_WAIT(20) - EVT_CALL(func_8024ECF8, 0, 1, 0) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) EVT_CALL(EndActorSpeech, ACTOR_ENEMY0, 1, -1, -1) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) EVT_CALL(SetActorYaw, ACTOR_ENEMY0, 0) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) @@ -689,7 +689,7 @@ EvtScript N(summon_tank_squad) = { EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim04) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) @@ -723,7 +723,7 @@ EvtScript N(start_battle_with_tank) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(func_802535B4, 1) EVT_CALL(func_8026BF48, 0) @@ -764,7 +764,7 @@ EvtScript N(onDeath) = { EVT_CALL(SetGoalPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_ENEMY0, 50, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_20E4) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim10) EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 2a82a60fd4..4b99890238 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -866,7 +866,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(onHit)) EVT_SET_CONST(LVar1, ANIM_ShySquadGuy_Anim0D) EVT_EXEC_WAIT(N(onShock)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -915,7 +915,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShySquadGuy_Anim0D) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_CASE_DEFAULT @@ -957,17 +957,17 @@ EvtScript N(onHit) = { EVT_ADD(LVar3, LVar8) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(0.5)) EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, 0, LVar3, 15, TRUE) - 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(LVar7, 0) @@ -1020,17 +1020,17 @@ EvtScript N(kill_guy) = { 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(LVar2, 0) @@ -1176,7 +1176,7 @@ EvtScript N(attack) = { EVT_END_THREAD EVT_END_IF EVT_WAIT(36) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_SET(LVar0, 15) EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar1) @@ -1234,7 +1234,7 @@ EvtScript N(attack) = { EVT_WAIT(10) EVT_END_LOOP EVT_CALL(StopSound, SOUND_3AD) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(20) EVT_SET(LVar0, 15) @@ -1278,7 +1278,7 @@ EvtScript N(flee) = { EVT_WAIT(30) EVT_CALL(ActorSpeak, MSG_CH4_0066, ACTOR_SELF, 1, -1, -1) EVT_CALL(func_8027D32C, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_SET(LVar0, 2) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim08) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 8156c571dd..c3823fdc1c 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -470,11 +470,11 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(check_fall_off)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_SPIN_SMASH_HIT) @@ -493,7 +493,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(check_fall_off_2)) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_NE(LVar0, 0) @@ -509,8 +509,8 @@ EvtScript N(handleEvent) = { EVT_SET(LVar1, 7340033) EVT_EXEC_WAIT(DoImmune) EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_CALL(func_80269E80, LVar0) - EVT_IF_NE(LVar0, 9) + EVT_CALL(GetDamageSource, LVar0) + EVT_IF_NE(LVar0, DMG_SRC_FIRE_SHELL) EVT_SET(LVar0, 2) EVT_SET(LVar1, ANIM_StiltGuy_Anim09) EVT_SET(LVar2, ANIM_StiltGuy_Anim0A) @@ -535,7 +535,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim07) EVT_EXEC_WAIT(N(onDeath)) @@ -557,7 +557,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim07) @@ -574,7 +574,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_StiltGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 2) @@ -647,7 +647,7 @@ EvtScript N(attack) = { EVT_CALL(SetBattleCamOffsetZ, 40) 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, 2, ANIM_StiltGuy_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -687,7 +687,7 @@ EvtScript N(attack) = { 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(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -718,7 +718,7 @@ EvtScript N(attack) = { 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(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_SET(LVar1, 0) @@ -796,7 +796,7 @@ EvtScript N(fallOff) = { }; EvtScript N(onDeath) = { - EVT_EXEC_WAIT(D_8029AF08) + EVT_EXEC_WAIT(EVS_AnimateDeath) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 2, LVar0) @@ -805,7 +805,7 @@ EvtScript N(onDeath) = { EVT_IF_GE(LVar0, 2) EVT_CALL(func_8026BF48, 1) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 100) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -864,7 +864,7 @@ EvtScript N(shy_guy_on_spin_smash) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_GOTO(1) EVT_LABEL(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(GetActorSize, ACTOR_SELF, LVar0, LVar3) @@ -963,7 +963,7 @@ EvtScript N(shy_guy_handleEvent) = { 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) @@ -1018,7 +1018,7 @@ EvtScript N(shy_guy_handleEvent) = { 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) @@ -1057,7 +1057,7 @@ EvtScript N(shy_guy_attack1) = { 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) @@ -1093,7 +1093,7 @@ EvtScript N(shy_guy_attack1) = { 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)) @@ -1127,7 +1127,7 @@ EvtScript N(shy_guy_attack1) = { 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) @@ -1152,7 +1152,7 @@ EvtScript N(shy_guy_attack2) = { 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) @@ -1203,7 +1203,7 @@ EvtScript N(shy_guy_attack2) = { 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) @@ -1233,7 +1233,7 @@ EvtScript N(shy_guy_attack2) = { 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) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 75294fb301..fd246b82ca 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -637,31 +637,31 @@ EvtScript N(handleEvent) = { 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, 8, 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(80235168)) 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 @@ -670,27 +670,27 @@ EvtScript N(handleEvent) = { 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, 8, 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(80235168)) 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 @@ -711,11 +711,11 @@ EvtScript N(handleEvent) = { 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(80235168)) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -737,11 +737,11 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar1) 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(80235168)) EVT_SET_CONST(LVar1, -1) EVT_END_CASE_GROUP @@ -759,7 +759,7 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar5, 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(onSpinSmash)) EVT_END_IF @@ -768,7 +768,7 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar5, 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(onSpinSmash)) EVT_END_IF @@ -781,7 +781,7 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar5, 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(80235168)) EVT_END_IF @@ -790,7 +790,7 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar5, 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(80235168)) EVT_END_IF @@ -831,7 +831,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar2) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) @@ -916,7 +916,7 @@ EvtScript N(doSpinSmashHitLastGuy) = { 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(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(GetActorSize, ACTOR_SELF, LVar0, LVar3) @@ -1118,7 +1118,7 @@ EvtScript N(doSpinSmashHit) = { 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, 10, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 10, EVT_FLOAT(6.0)) EVT_CALL(GetActorSize, ACTOR_SELF, LVar0, LVar3) @@ -1155,8 +1155,8 @@ EvtScript N(doSpinSmashHit) = { }; EvtScript N(80235168) = { - EVT_CALL(func_80269E80, LVar0) - EVT_IF_EQ(LVar0, 9) + EVT_CALL(GetDamageSource, LVar0) + EVT_IF_EQ(LVar0, DMG_SRC_FIRE_SHELL) EVT_CALL(SetAnimation, ACTOR_SELF, 10, ANIM_ShyStackDamage_Anim01) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 10, ANIM_ShyStackDamage_Anim00) @@ -1248,7 +1248,7 @@ EvtScript N(takeTurn) = { 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(GetActorVar, ACTOR_SELF, 6, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar0) EVT_WAIT(20) @@ -1323,7 +1323,7 @@ EvtScript N(takeTurn) = { 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_WAIT(15) EVT_WAIT(15) EVT_END_CASE_GROUP @@ -1433,7 +1433,7 @@ EvtScript N(launch_rock) = { }; EvtScript N(onDeath) = { - EVT_EXEC_WAIT(D_8029AF08) + EVT_EXEC_WAIT(EVS_AnimateDeath) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 3, LVar0) EVT_ADD(LVar0, 1) diff --git a/src/battle/area/omo2_4/actor/signal_guy.c b/src/battle/area/omo2_4/actor/signal_guy.c index d25a97bc08..bedb32ab68 100644 --- a/src/battle/area/omo2_4/actor/signal_guy.c +++ b/src/battle/area/omo2_4/actor/signal_guy.c @@ -171,7 +171,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MarshalGuy_Anim0A) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/area/omo2_5/actor/shy_squad_dup.c b/src/battle/area/omo2_5/actor/shy_squad_dup.c index 8433bfeb86..74c9ed62fa 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_dup.c +++ b/src/battle/area/omo2_5/actor/shy_squad_dup.c @@ -774,7 +774,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_TankGuy_Anim04) EVT_EXEC_WAIT(N(onShock)) EVT_WAIT(40) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_EXEC_WAIT(N(run_squad_to_pos)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) @@ -811,7 +811,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_TankGuy_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_CASE_DEFAULT @@ -851,17 +851,17 @@ EvtScript N(onHit) = { EVT_ADD(LVar3, LVar8) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(0.5)) EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, 0, LVar3, 15, TRUE) - 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(LVar7, 0) @@ -913,17 +913,17 @@ EvtScript N(80233E48) = { 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(LVar2, 0) @@ -1015,7 +1015,7 @@ EvtScript N(next_phase) = { EvtScript N(run_away) = { EVT_CALL(SetActorVar, ACTOR_SELF, 15, 0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 40) EVT_SET(LVar0, 2) EVT_SET(LVar1, 0) @@ -1125,7 +1125,7 @@ EvtScript N(attack) = { EVT_END_THREAD EVT_END_IF EVT_WAIT(36) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_EXEC_WAIT(N(run_squad_to_pos)) EVT_SET(LVar1, ANIM_TankGuy_Anim01) @@ -1166,7 +1166,7 @@ EvtScript N(attack) = { EVT_END_IF EVT_WAIT(10) EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(20) EVT_EXEC_WAIT(N(run_squad_to_pos)) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index 80796bab58..cd27ab44fb 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -145,8 +145,8 @@ s32 N(IdleAnimations)[] = { API_CALLABLE(N(init_overlay)) { get_actor(script->owner1.actorID); - set_screen_overlay_params_back(13, 220.0f); - set_screen_overlay_alpha(1, 200.0f); + set_screen_overlay_params_back(OVERLAY_BATTLE_DARKNESS, 220.0f); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, 200.0f); return ApiStatus_DONE2; } @@ -180,7 +180,7 @@ API_CALLABLE(N(update_effect)) { s32 compListIdx; if (actor == NULL) { - set_screen_overlay_alpha(1, 0.0f); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, 0.0f); return ApiStatus_BLOCK; } @@ -259,8 +259,8 @@ API_CALLABLE(N(update_effect)) { break; } - set_screen_overlay_alpha(1, opacity); - set_screen_overlay_center_worldpos(1, 0, posX + partX, posY + partY, posZ + partZ); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, opacity); + set_screen_overlay_center_worldpos(SCREEN_LAYER_BACK, 0, posX + partX, posY + partY, posZ + partZ); actorState->varTable[N(VAR_LANTERN_X)] = posX + partX; actorState->varTable[N(VAR_LANTERN_Y)] = posY + partY; @@ -316,7 +316,7 @@ EvtScript N(nextTurn) = { EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_CALL(ActorSpeak, MSG_CH4_0051, ACTOR_SELF, 1, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_IF EVT_CASE_EQ(PHASE_ENEMY_BEGIN) EVT_END_SWITCH @@ -364,7 +364,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(checkExtinguish)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BigLanternGhost_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_EXEC_WAIT(N(onHit)) @@ -468,7 +468,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BigLanternGhost_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BigLanternGhost_Anim09) @@ -484,7 +484,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BigLanternGhost_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(1000) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) @@ -534,7 +534,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetBattleCamZoom, 260) 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) @@ -577,7 +577,7 @@ EvtScript N(attackHeavyJump) = { 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_EXEC_WAIT(N(returnHome)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -605,7 +605,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetBattleCamZoom, 320) 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_THREAD EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BigLanternGhost_Anim10) @@ -623,7 +623,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) EVT_WAIT(8) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP @@ -644,7 +644,7 @@ EvtScript N(attackLightBeam) = { EVT_CALL(SetBattleCamZoom, 240) 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 80) @@ -655,7 +655,7 @@ EvtScript N(attackLightBeam) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BigLanternGhost_Anim01) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) EVT_CALL(SetBattleCamZoom, 350) EVT_CALL(SetBattleCamOffsetZ, 35) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -730,7 +730,7 @@ EvtScript N(attackLightBeam) = { EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BigLanternGhost_Anim14) EVT_WAIT(60) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -796,7 +796,7 @@ EvtScript N(extinguish) = { EVT_WAIT(14) EVT_WAIT(1) EVT_WAIT(15) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BigLanternGhost_Anim01) EVT_EXEC_WAIT(N(setGhostNoTarget)) @@ -863,7 +863,7 @@ EvtScript N(setGhostNoTarget) = { }; EvtScript N(onDeath) = { - EVT_EXEC_WAIT(D_8029AF08) + EVT_EXEC_WAIT(EVS_AnimateDeath) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT), LVar0) EVT_CALL(RemoveEffect, LVar0) EVT_CALL(RemoveActor, ACTOR_SELF) diff --git a/src/battle/area/pra/actor/albino_dino.c b/src/battle/area/pra/actor/albino_dino.c index 8fdd836e9c..d18a781580 100644 --- a/src/battle/area/pra/actor/albino_dino.c +++ b/src/battle/area/pra/actor/albino_dino.c @@ -125,7 +125,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_AlbinoDino_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) @@ -139,7 +139,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_AlbinoDino_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) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_AlbinoDino_Anim09) - 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(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_AlbinoDino_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) @@ -179,10 +179,10 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_AlbinoDino_Anim08) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_AlbinoDino_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -239,7 +239,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_EXEC_GET_TID(N(stamp), LVar9) EVT_THREAD EVT_LOOP(3) @@ -262,7 +262,7 @@ EvtScript N(takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_KILL_THREAD(LVar9) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(30) EVT_IF_EQ(LVarF, HIT_RESULT_LUCKY) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -299,7 +299,7 @@ EvtScript N(takeTurn) = { 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) diff --git a/src/battle/area/pra2/actor/crystal_bit.c b/src/battle/area/pra2/actor/crystal_bit.c index 9fd9ca27e5..b491aaef5e 100644 --- a/src/battle/area/pra2/actor/crystal_bit.c +++ b/src/battle/area/pra2/actor/crystal_bit.c @@ -260,7 +260,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_CALL(GetOwnerID, LVar0) @@ -293,7 +293,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index ebddd8afea..322f64fbc8 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -389,19 +389,19 @@ EvtScript N(OnHit) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT1_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(func_80269EAC, 0) + EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT2_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(func_80269EAC, 0) + EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT3_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(func_80269EAC, 0) + EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_END_IF @@ -437,7 +437,7 @@ EvtScript N(OnHit) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim19) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_IF_NE(LVar1, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLY_THREAD_ID), LVarA) EVT_KILL_THREAD(LVarA) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E3) @@ -485,21 +485,21 @@ EvtScript N(OnDeath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT1_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(func_80269EAC, 0) + EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT) EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT2_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(func_80269EAC, 0) + EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT) EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT3_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(func_80269EAC, 0) + EVT_CALL(SetDamageSource, DMG_SRC_DEFAULT) EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF @@ -560,7 +560,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetOwnerID, LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim09) EVT_END_THREAD EVT_END_IF @@ -571,13 +571,13 @@ EvtScript N(handleEvent) = { EVT_CALL(SetOwnerID, LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim09) EVT_END_THREAD EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) @@ -586,7 +586,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetOwnerID, LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim09) EVT_END_THREAD EVT_END_IF @@ -597,13 +597,13 @@ EvtScript N(handleEvent) = { EVT_CALL(SetOwnerID, LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim09) EVT_END_THREAD EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(OnHit)) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) @@ -661,7 +661,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetOwnerID, LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_THREAD EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVar0) @@ -671,16 +671,16 @@ EvtScript N(handleEvent) = { EVT_CALL(SetOwnerID, LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_THREAD EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) @@ -712,7 +712,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim21) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_THREAD @@ -950,7 +950,7 @@ EvtScript N(AttackIcyBreath) = { EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_END_IF EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) @@ -984,7 +984,7 @@ EvtScript N(AttackIcyBreath) = { 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(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1016,7 +1016,7 @@ EvtScript N(AttackIcyBreath) = { 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_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1047,7 +1047,7 @@ EvtScript N(AttackIceBolt) = { EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_END_IF EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) @@ -1093,7 +1093,7 @@ EvtScript N(AttackIceBolt) = { 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(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1143,7 +1143,7 @@ EvtScript N(AttackIceBolt) = { EVT_PLAY_EFFECT(EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 30, 0) EVT_CALL(func_80218344_660A94, LVarF) EVT_WAIT(30) - 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) @@ -1264,7 +1264,7 @@ EvtScript N(MakeIllusions) = { EVT_EXEC_GET_TID(N(FlyWithClones), LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLY_THREAD_ID), LVar0) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVarA) EVT_CALL(SetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -1338,7 +1338,7 @@ EvtScript N(MakeIllusions) = { EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetActorFlagBits, LVarB, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetActorFlagBits, LVarC, ACTOR_FLAG_NO_SHADOW, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 150) EVT_THREAD EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -1535,7 +1535,7 @@ EvtScript N(SummonCrystalBits) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT3_ID), LVar0) EVT_CALL(ForceHomePos, LVar0, 42, 85, -10) EVT_CALL(HPBarToHome, LVar0) - 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 @@ -1598,7 +1598,7 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_END_IF EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim1C) EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim1C) @@ -1660,7 +1660,7 @@ EvtScript N(AttackIcyBreathWithClones) = { 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(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) EVT_BITWISE_AND_CONST(LVar0, ~N(FLAG_NOT_IDLE)) EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) @@ -1724,7 +1724,7 @@ EvtScript N(AttackIcyBreathWithClones) = { 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_END_CASE_GROUP EVT_END_SWITCH @@ -1882,7 +1882,7 @@ EvtScript N(NormalAttack) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim13) EVT_WAIT(30) - 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_SWITCH(LVar0) @@ -2057,7 +2057,7 @@ EvtScript N(Heal) = { EVT_CALL(SetAnimation, LVarB, 1, ANIM_CrystalKing_Anim09) EVT_END_IF 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_IF_EQ(LocalFlag(0), 1) diff --git a/src/battle/area/sam/actor/frost_piranha.c b/src/battle/area/sam/actor/frost_piranha.c index bcb65fe9b1..39c0f265bf 100644 --- a/src/battle/area/sam/actor/frost_piranha.c +++ b/src/battle/area/sam/actor/frost_piranha.c @@ -144,7 +144,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Frost_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) @@ -158,7 +158,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Frost_Anim11) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -170,7 +170,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Frost_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -184,7 +184,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Frost_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) @@ -196,11 +196,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Frost_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Frost_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -286,7 +286,7 @@ EvtScript N(attack_bite) = { 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(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim03) @@ -320,7 +320,7 @@ EvtScript N(attack_bite) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(14) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -361,7 +361,7 @@ EvtScript N(attack_bite) = { 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_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim07) EVT_WAIT(20) @@ -400,7 +400,7 @@ EvtScript N(attack_icy_breath) = { 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_LargePiranha_Frost_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim03) @@ -445,7 +445,7 @@ EvtScript N(attack_icy_breath) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(14) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) @@ -466,7 +466,7 @@ EvtScript N(attack_icy_breath) = { 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_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim0D) EVT_WAIT(20) diff --git a/src/battle/area/sam/actor/gulpit.c b/src/battle/area/sam/actor/gulpit.c index 50cb9689b4..310e34fa31 100644 --- a/src/battle/area/sam/actor/gulpit.c +++ b/src/battle/area/sam/actor/gulpit.c @@ -157,7 +157,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -171,7 +171,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim0D) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -183,7 +183,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -199,7 +199,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Gulpit_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) @@ -211,11 +211,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -249,7 +249,7 @@ EvtScript N(attack_lick) = { 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(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -285,7 +285,7 @@ EvtScript N(attack_lick) = { 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -302,7 +302,7 @@ EvtScript N(attack_lick) = { 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(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) @@ -321,7 +321,7 @@ EvtScript N(attack_rock) = { 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(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_SUB(LVar2, 1) @@ -360,7 +360,7 @@ EvtScript N(attack_rock) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVar9, LVar0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) @@ -407,7 +407,7 @@ EvtScript N(attack_rock) = { 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_Gulpit_Anim01) EVT_CALL(GetPartOffset, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -100) diff --git a/src/battle/area/sam/actor/gulpit_rocks.c b/src/battle/area/sam/actor/gulpit_rocks.c index 09016c2507..3a664b3801 100644 --- a/src/battle/area/sam/actor/gulpit_rocks.c +++ b/src/battle/area/sam/actor/gulpit_rocks.c @@ -138,7 +138,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim10) EVT_SET_CONST(LVar2, ANIM_Gulpit_Anim12) EVT_EXEC_WAIT(N(setAnim)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -156,7 +156,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Gulpit_Anim10) EVT_SET_CONST(LVar2, ANIM_Gulpit_Anim12) EVT_EXEC_WAIT(N(setAnim)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index abd72039d5..d5bb959f4f 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -236,7 +236,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Monstar_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET(LVar0, 1) @@ -277,7 +277,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Monstar_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Monstar_Hurt) @@ -332,7 +332,7 @@ EvtScript N(unused) = { EVT_SUB(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 10, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 300, 0) EVT_WAIT(75) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -409,7 +409,7 @@ EvtScript N(attack) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(8) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) @@ -494,7 +494,7 @@ EvtScript N(takeTurn) = { EVT_END_SWITCH EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_RETURN EVT_END @@ -507,17 +507,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) @@ -552,8 +552,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 @@ -561,9 +561,9 @@ EvtScript N(OnDeath) = { EvtScript N(OnBurn) = { 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) diff --git a/src/battle/area/tik/actor/dark_koopa.c b/src/battle/area/tik/actor/dark_koopa.c index cf16ef0887..c0b7a9de5e 100644 --- a/src/battle/area/tik/actor/dark_koopa.c +++ b/src/battle/area/tik/actor/dark_koopa.c @@ -358,7 +358,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_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) @@ -372,7 +372,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -384,7 +384,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -445,7 +445,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_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) @@ -473,11 +473,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -593,7 +593,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(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(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) @@ -628,7 +628,7 @@ EvtScript N(attackShellToss) = { EVT_SUB(LVar1, 20) 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -653,7 +653,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) @@ -735,7 +735,7 @@ EvtScript N(attackDizzyTornado) = { 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(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -773,7 +773,7 @@ EvtScript N(attackDizzyTornado) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(10) EVT_WAIT(10) - 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_KoopaTroopa_Dark_Run) diff --git a/src/battle/area/tik/actor/dark_paratroopa.c b/src/battle/area/tik/actor/dark_paratroopa.c index c1874d2821..48549254af 100644 --- a/src/battle/area/tik/actor/dark_paratroopa.c +++ b/src/battle/area/tik/actor/dark_paratroopa.c @@ -297,11 +297,11 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_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) @@ -319,7 +319,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 2) @@ -333,12 +333,12 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_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_ParaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(fall)) EVT_CASE_EQ(EVENT_15) EVT_SET_CONST(LVar0, 1) @@ -360,7 +360,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) @@ -383,11 +383,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_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) @@ -428,7 +428,7 @@ EvtScript N(takeTurn) = { 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(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Run) @@ -436,7 +436,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) EVT_WAIT(5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -499,7 +499,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 30) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) @@ -532,7 +532,7 @@ EvtScript N(takeTurn) = { 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, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -908,7 +908,7 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_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) @@ -922,7 +922,7 @@ EvtScript N(handleEvent_koopa) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -934,7 +934,7 @@ EvtScript N(handleEvent_koopa) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -995,7 +995,7 @@ EvtScript N(handleEvent_koopa) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_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) @@ -1023,11 +1023,11 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -1143,7 +1143,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(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(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) @@ -1178,7 +1178,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_SUB(LVar1, 20) 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -1203,7 +1203,7 @@ EvtScript N(koopa_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) @@ -1285,7 +1285,7 @@ EvtScript N(koopa_attackDizzyTornado) = { 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(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -1323,7 +1323,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(10) EVT_WAIT(10) - 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_KoopaTroopa_Dark_Run) diff --git a/src/battle/area/tik/actor/gloomba.c b/src/battle/area/tik/actor/gloomba.c index b602d3341b..0f6e48df26 100644 --- a/src/battle/area/tik/actor/gloomba.c +++ b/src/battle/area/tik/actor/gloomba.c @@ -174,7 +174,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_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) @@ -188,7 +188,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -200,7 +200,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -226,7 +226,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -239,11 +239,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_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)) @@ -289,7 +289,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_Goomba_Dark_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -368,7 +368,7 @@ EvtScript N(takeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_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) @@ -418,7 +418,7 @@ EvtScript N(takeTurn) = { 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)) diff --git a/src/battle/area/tik/actor/paragloomba.c b/src/battle/area/tik/actor/paragloomba.c index 632371430a..b6cb13c446 100644 --- a/src/battle/area/tik/actor/paragloomba.c +++ b/src/battle/area/tik/actor/paragloomba.c @@ -267,7 +267,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_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) @@ -288,12 +288,12 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_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_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(fall)) EVT_CASE_EQ(EVENT_15) EVT_SET_CONST(LVar0, 2) @@ -316,7 +316,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -329,11 +329,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_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) @@ -377,7 +377,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, 2, ANIM_Paragoomba_Dark_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -392,7 +392,7 @@ EvtScript N(takeTurn) = { 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)) @@ -425,7 +425,7 @@ EvtScript N(takeTurn) = { 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_Dark_Run) @@ -442,7 +442,7 @@ EvtScript N(takeTurn) = { 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)) @@ -463,7 +463,7 @@ EvtScript N(takeTurn) = { 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)) @@ -645,7 +645,7 @@ EvtScript N(handleEvent_gloomba) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_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) @@ -659,7 +659,7 @@ EvtScript N(handleEvent_gloomba) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -671,7 +671,7 @@ EvtScript N(handleEvent_gloomba) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -697,7 +697,7 @@ EvtScript N(handleEvent_gloomba) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -710,11 +710,11 @@ EvtScript N(handleEvent_gloomba) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dark_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)) @@ -760,7 +760,7 @@ EvtScript N(takeTurn_gloomba) = { 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_Dark_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -839,7 +839,7 @@ EvtScript N(takeTurn_gloomba) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_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) @@ -889,7 +889,7 @@ EvtScript N(takeTurn_gloomba) = { 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)) diff --git a/src/battle/area/tik/actor/spiked_gloomba.c b/src/battle/area/tik/actor/spiked_gloomba.c index c8a54b71a7..54b94723fa 100644 --- a/src/battle/area/tik/actor/spiked_gloomba.c +++ b/src/battle/area/tik/actor/spiked_gloomba.c @@ -175,7 +175,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Dark_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) @@ -189,7 +189,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Dark_BurnEyesOpen) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -201,7 +201,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Dark_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -227,7 +227,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Dark_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -240,11 +240,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Dark_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Dark_HurtStill) - 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)) @@ -305,7 +305,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_SpikedGoomba_Dark_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -384,7 +384,7 @@ EvtScript N(takeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Dark_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) @@ -434,7 +434,7 @@ EvtScript N(takeTurn) = { 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)) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index c4ec858fd5..bcb8c366c1 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -286,12 +286,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) EVT_EXEC_WAIT(N(onDeath)) EVT_RETURN @@ -362,7 +362,7 @@ EvtScript N(handleEvent) = { EvtScript N(onDeath) = { EVT_SET_CONST(LVar0, 1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; @@ -426,7 +426,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_IF_EQ(LVarF, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -460,7 +460,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE) @@ -542,7 +542,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) @@ -573,7 +573,7 @@ EvtScript N(attackInkBlast) = { EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(func_80269EAC, 26) + EVT_CALL(SetDamageSource, DMG_SRC_INK_BLAST) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index c2187cfbb8..ca2afc9e42 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -310,12 +310,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BabyBlooper_Anim02) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BabyBlooper_Anim02) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar1, ANIM_BabyBlooper_Anim03) EVT_EXEC_WAIT(N(onDeath)) EVT_RETURN @@ -388,7 +388,7 @@ EvtScript N(handleEvent) = { EvtScript N(onDeath) = { EVT_SET_CONST(LVar0, 1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; @@ -467,7 +467,7 @@ EvtScript N(takeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim08) - 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) @@ -554,7 +554,7 @@ EvtScript N(takeTurn) = { EVT_BREAK_LOOP EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(func_80269EAC, 1) + EVT_CALL(SetDamageSource, DMG_SRC_BABY_BLOOPER_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_40) EVT_CALL(StartRumble, 2) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) @@ -654,7 +654,7 @@ EvtScript N(takeTurn) = { EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(func_80269470) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 30aa55a9be..3eb064ef56 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -388,13 +388,13 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(discharge)) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(discharge)) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) EVT_EXEC_WAIT(N(onDeath)) @@ -442,7 +442,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(discharge)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -479,7 +479,7 @@ EvtScript N(handleEvent) = { EvtScript N(onDeath) = { EVT_SET_CONST(LVar0, 1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; @@ -536,7 +536,7 @@ EvtScript N(electricCharge) = { EVT_WAIT(10) EVT_EXEC_WAIT(N(charge)) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) @@ -589,7 +589,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_IF_EQ(LVarF, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -623,7 +623,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 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_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE) @@ -686,7 +686,7 @@ EvtScript N(attackElectricDrop) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_IF_EQ(LVarF, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -723,7 +723,7 @@ EvtScript N(attackElectricDrop) = { EVT_IF_NE(LVarF, HIT_RESULT_HIT_STATIC) EVT_EXEC_WAIT(N(discharge)) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE) @@ -802,7 +802,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) @@ -833,7 +833,7 @@ EvtScript N(attackInkBlast) = { EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(func_80269EAC, 26) + EVT_CALL(SetDamageSource, DMG_SRC_INK_BLAST) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index e2c4e52490..bb1bcf816b 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -343,12 +343,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) EVT_EXEC_WAIT(N(onDeath)) @@ -393,7 +393,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(unEnrage)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_EXEC_WAIT(N(unEnrage)) @@ -431,7 +431,7 @@ EvtScript N(handleEvent) = { }; EvtScript N(onDeath) = { - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; @@ -648,7 +648,7 @@ EvtScript N(attackInkBlast) = { EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(func_80269EAC, 26) + EVT_CALL(SetDamageSource, DMG_SRC_INK_BLAST) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) @@ -666,7 +666,7 @@ EvtScript N(makeBabies) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) 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, 50) EVT_CALL(SetBattleCamZoom, 330) @@ -678,7 +678,7 @@ EvtScript N(makeBabies) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetBattleCamOffsetZ, 65) EVT_CALL(SetBattleCamZoom, 240) @@ -689,7 +689,7 @@ EvtScript N(makeBabies) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.4)) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetBattleCamOffsetZ, 80) EVT_CALL(SetBattleCamZoom, 150) @@ -700,14 +700,14 @@ EvtScript N(makeBabies) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetBattleCamOffsetZ, 95) EVT_CALL(SetBattleCamZoom, 60) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0B) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim03) EVT_WAIT(10) @@ -736,7 +736,7 @@ EvtScript N(getEnraged) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) 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, 28) EVT_CALL(SetBattleCamZoom, 297) @@ -755,7 +755,7 @@ EvtScript N(getEnraged) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0B) EVT_WAIT(10) EVT_EXEC_WAIT(N(enrage)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) diff --git a/src/battle/area/trd_part_1/actor/bill_blaster.c b/src/battle/area/trd_part_1/actor/bill_blaster.c index fafc6a9868..8b5cf935de 100644 --- a/src/battle/area/trd_part_1/actor/bill_blaster.c +++ b/src/battle/area/trd_part_1/actor/bill_blaster.c @@ -126,7 +126,7 @@ EvtScript N(handleEvent_80219EE0) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BillBlaster_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) @@ -140,7 +140,7 @@ EvtScript N(handleEvent_80219EE0) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BillBlaster_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) @@ -152,11 +152,11 @@ EvtScript N(handleEvent_80219EE0) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/area/trd_part_1/actor/bob_omb.c b/src/battle/area/trd_part_1/actor/bob_omb.c index db2a6e3ee2..5caca4d6a7 100644 --- a/src/battle/area/trd_part_1/actor/bob_omb.c +++ b/src/battle/area/trd_part_1/actor/bob_omb.c @@ -231,7 +231,7 @@ EvtScript N(handleEvent_8021ACE8) = { EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_CALL(GetLastElement, LVarE) EVT_IF_FLAG(LVarE, DAMAGE_TYPE_SHOCK) @@ -243,12 +243,12 @@ EvtScript N(handleEvent_8021ACE8) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 0) EVT_EXEC_WAIT(N(ignite)) @@ -264,7 +264,7 @@ EvtScript N(handleEvent_8021ACE8) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) @@ -282,14 +282,14 @@ EvtScript N(handleEvent_8021ACE8) = { EVT_EXEC_WAIT(N(8021AAE8)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_SHOCK_HIT) EVT_CASE_OR_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 1) @@ -316,17 +316,17 @@ EvtScript N(handleEvent_8021ACE8) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_EXEC_WAIT(N(8021AAE8)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_EXPLODE_TRIGGER) @@ -338,7 +338,7 @@ EvtScript N(handleEvent_8021ACE8) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -378,11 +378,11 @@ EvtScript N(handleEvent_8021B4A8) = { EVT_EXEC_WAIT(N(8021A9C8)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0F) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_CASE_EQ(EVENT_HIT) EVT_CALL(GetLastElement, LVarE) @@ -391,28 +391,28 @@ EvtScript N(handleEvent_8021B4A8) = { EVT_EXEC_WAIT(N(8021A9C8)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_FLAG(DAMAGE_TYPE_SHOCK) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(8021AB54)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_DEFAULT EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0F) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) EVT_EXEC_WAIT(N(8021AB54)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_IF EVT_END_SWITCH @@ -425,7 +425,7 @@ EvtScript N(handleEvent_8021B4A8) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -447,7 +447,7 @@ EvtScript N(handleEvent_8021B4A8) = { EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) EVT_END_IF - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_SHOCK_HIT) EVT_CASE_OR_EQ(EVENT_SHOCK_DEATH) @@ -455,7 +455,7 @@ EvtScript N(handleEvent_8021B4A8) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -474,8 +474,8 @@ EvtScript N(handleEvent_8021B4A8) = { EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1D) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) - EVT_CALL(func_80269E80, LVar0) - EVT_IF_EQ(LVar0, 20) + EVT_CALL(GetDamageSource, LVar0) + EVT_IF_EQ(LVar0, DMG_SRC_HURRICANE) EVT_EXEC_WAIT(N(8021A9C8)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1C) @@ -504,7 +504,7 @@ EvtScript N(tackleAttack) = { 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_Bobomb_Anim06) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -548,7 +548,7 @@ EvtScript N(tackleAttack) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(YieldTurn) - 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(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim06) @@ -583,7 +583,7 @@ EvtScript N(tackleAttack) = { 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) @@ -614,7 +614,7 @@ EvtScript N(blastAttack) = { 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(PlayLoopingSoundAtActor, ACTOR_SELF, 0, 0x80000001) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -635,7 +635,7 @@ EvtScript N(blastAttack) = { EVT_SUB(LVar0, 30) 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_EXEC_WAIT(N(8021AB54)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim11) EVT_WAIT(10) @@ -648,7 +648,7 @@ EvtScript N(blastAttack) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, -1) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH @@ -665,12 +665,12 @@ EvtScript N(blastAttack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim11) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(15) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; diff --git a/src/battle/area/trd_part_1/actor/bullet_bill.c b/src/battle/area/trd_part_1/actor/bullet_bill.c index 17667291dd..11aeb458e3 100644 --- a/src/battle/area/trd_part_1/actor/bullet_bill.c +++ b/src/battle/area/trd_part_1/actor/bullet_bill.c @@ -143,7 +143,7 @@ EvtScript N(80219390) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim07) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; @@ -156,11 +156,11 @@ EvtScript N(handleEvent_802193E8) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BulletBill_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_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_EXEC_WAIT(N(80219390)) EVT_RETURN @@ -195,7 +195,7 @@ EvtScript N(handleEvent_802193E8) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(80219390)) EVT_RETURN EVT_CASE_EQ(EVENT_EXPLODE_TRIGGER) @@ -208,7 +208,7 @@ EvtScript N(handleEvent_802193E8) = { EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(80219390)) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) @@ -235,7 +235,7 @@ EvtScript N(takeTurn_802197C0) = { 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_Anim04) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) EVT_WAIT(1) @@ -258,7 +258,7 @@ EvtScript N(takeTurn_802197C0) = { 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) @@ -278,12 +278,12 @@ EvtScript N(takeTurn_802197C0) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 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_Anim07) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END }; diff --git a/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c index c437d78ab8..01d703014c 100644 --- a/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c @@ -198,7 +198,7 @@ EvtScript N(8022B6E8) = { EVT_CASE_OR_EQ(6) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) @@ -427,7 +427,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -619,7 +619,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -705,7 +705,7 @@ EvtScript N(handleEvent_8022DD88) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -719,7 +719,7 @@ EvtScript N(handleEvent_8022DD88) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0F) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -731,7 +731,7 @@ EvtScript N(handleEvent_8022DD88) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) @@ -788,10 +788,10 @@ EvtScript N(handleEvent_8022DD88) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index b6cf90a552..c43c66b585 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -1556,7 +1556,7 @@ EvtScript N(nextTurn_8021F410) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_OR_CONST(LVar0, 0x8) EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(20) EVT_END_IF EVT_END_SWITCH @@ -2948,7 +2948,7 @@ EvtScript N(takeTurn_80224D84) = { EVT_END_SWITCH EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_IF_FLAG(LVar0, 0x00000200) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) EVT_SET(LVarA, 8) EVT_EXEC_WAIT(N(80223870)) @@ -2970,7 +2970,7 @@ EvtScript N(takeTurn_80224D84) = { EVT_IF_EQ(LVar0, 3) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_IF_NOT_FLAG(LVar0, 4) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) diff --git a/src/battle/area/trd_part_2/actor/green_ninja_koopa.c b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c index d8fd7ac1f7..7083460b69 100644 --- a/src/battle/area/trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c @@ -198,7 +198,7 @@ EvtScript N(802257A8) = { EVT_CASE_OR_EQ(6) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) @@ -427,7 +427,7 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -619,7 +619,7 @@ EvtScript N(802257A8) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -705,7 +705,7 @@ EvtScript N(handleEvent_80227E48) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -719,7 +719,7 @@ EvtScript N(handleEvent_80227E48) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0F) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -731,7 +731,7 @@ EvtScript N(handleEvent_80227E48) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) @@ -788,10 +788,10 @@ EvtScript N(handleEvent_80227E48) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) diff --git a/src/battle/area/trd_part_2/actor/red_ninja_koopa.c b/src/battle/area/trd_part_2/actor/red_ninja_koopa.c index 830f274b0d..a7d00a6926 100644 --- a/src/battle/area/trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/red_ninja_koopa.c @@ -198,7 +198,7 @@ EvtScript N(80228748) = { EVT_CASE_OR_EQ(6) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) @@ -427,7 +427,7 @@ EvtScript N(80228748) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -619,7 +619,7 @@ EvtScript N(80228748) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -705,7 +705,7 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -719,7 +719,7 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0F) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -731,7 +731,7 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) @@ -788,10 +788,10 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) diff --git a/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c index 788dc46253..a84377e109 100644 --- a/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c @@ -198,7 +198,7 @@ EvtScript N(8022E688) = { EVT_CASE_OR_EQ(6) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) @@ -427,7 +427,7 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -619,7 +619,7 @@ EvtScript N(8022E688) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -705,7 +705,7 @@ EvtScript N(handleEvent_80230D28) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -719,7 +719,7 @@ EvtScript N(handleEvent_80230D28) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0F) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -731,7 +731,7 @@ EvtScript N(handleEvent_80230D28) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) @@ -788,10 +788,10 @@ EvtScript N(handleEvent_80230D28) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) diff --git a/src/battle/battle.c b/src/battle/battle.c index 67875a00dc..bfc00ac0f7 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -231,7 +231,7 @@ void load_demo_battle(u32 index) { clear_player_data(); initialize_status_menu(); clear_item_entity_data(); - set_screen_overlay_params_front(9, 255.0f); + set_screen_overlay_params_front(OVERLAY_TYPE_9, 255.0f); switch (index) { case 0: diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index c4bc017b54..01adc5c294 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -305,7 +305,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_GET_TID(N(dropCoin), ArrayVar(0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(ArrayVar(0), LVar0) EVT_IF_EQ(LVar0, 0) @@ -318,7 +318,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_GET_TID(N(dropCoin), ArrayVar(0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(ArrayVar(0), LVar0) EVT_IF_EQ(LVar0, 0) @@ -348,7 +348,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(ArrayVar(0), LVar0) EVT_IF_EQ(LVar0, 0) @@ -376,7 +376,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(ArrayVar(0), LVar0) EVT_IF_EQ(LVar0, 0) @@ -403,7 +403,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_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) @@ -423,11 +423,11 @@ EvtScript N(handleEvent) = { EVT_EXEC_GET_TID(N(dropCoin), ArrayVar(0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_Anim09) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bandit_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(ArrayVar(0), LVar0) EVT_IF_EQ(LVar0, 0) @@ -501,7 +501,7 @@ EvtScript N(takeTurn) = { 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(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -549,7 +549,7 @@ EvtScript N(takeTurn) = { 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) @@ -667,7 +667,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bandit_Anim08) EVT_END_SWITCH - 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(8.0)) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 291b896873..5254b56516 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -219,16 +219,16 @@ EvtScript N(handleEvent_ceiling) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim13) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim13) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(fallOff)) EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim13) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(fallOff)) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -243,7 +243,7 @@ EvtScript N(handleEvent_ceiling) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim18) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -261,7 +261,7 @@ EvtScript N(handleEvent_ceiling) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 1) @@ -279,11 +279,11 @@ EvtScript N(handleEvent_ceiling) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim13) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim13) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_SCARE_AWAY) @@ -326,7 +326,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim07) EVT_SET_CONST(LVar2, ANIM_BuzzyBeetle_Anim19) EVT_EXEC_WAIT(N(setAnimation)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -350,7 +350,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim1D) @@ -358,7 +358,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim1D) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) @@ -416,7 +416,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -460,13 +460,13 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim07) EVT_SET_CONST(LVar2, ANIM_BuzzyBeetle_Anim19) EVT_EXEC_WAIT(N(setAnimation)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim07) EVT_SET_CONST(LVar2, ANIM_BuzzyBeetle_Anim19) EVT_EXEC_WAIT(N(setAnimation)) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) @@ -478,7 +478,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim07) EVT_SET_CONST(LVar2, ANIM_BuzzyBeetle_Anim19) EVT_EXEC_WAIT(N(setAnimation)) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -563,7 +563,7 @@ EvtScript N(takeTurn_ceiling) = { 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, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -585,11 +585,11 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - 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) @@ -622,7 +622,7 @@ EvtScript N(takeTurn_ceiling) = { 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)) @@ -655,7 +655,7 @@ EvtScript N(takeTurn_ceiling) = { 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_SET(LVar1, 0) @@ -695,7 +695,7 @@ EvtScript N(takeTurn) = { 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) @@ -720,7 +720,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_BuzzyBeetle_Anim0C) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim06) @@ -752,12 +752,12 @@ EvtScript N(takeTurn) = { 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -150, 0, 0) @@ -790,7 +790,7 @@ EvtScript N(takeTurn) = { 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) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 47765c80d8..ee1fac0da8 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -216,7 +216,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -230,7 +230,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim08) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -242,7 +242,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -258,7 +258,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_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) @@ -270,11 +270,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim0B) - 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) @@ -323,7 +323,7 @@ EvtScript N(attackThornStab) = { 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_Bzzap_Anim03) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 52, 10, 0) @@ -350,7 +350,7 @@ EvtScript N(attackThornStab) = { 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -379,7 +379,7 @@ EvtScript N(attackThornStab) = { 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_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) @@ -424,7 +424,7 @@ EvtScript N(8021B77C) = { EVT_END_IF EVT_CALL(SetPartYaw, ACTOR_SELF, LVar9, 0) EVT_IF_EQ(LVar9, 2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_I) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_08) EVT_CALL(SetBattleCamZoom, 400) EVT_CALL(SetBattleCamOffsetZ, 30) EVT_CALL(BattleCamTargetActor, ACTOR_PLAYER) @@ -463,7 +463,7 @@ EvtScript N(attackSwarmSting) = { 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(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_FLY, 0, 0) EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_FLY, 0, 0) EVT_CALL(SetPartSounds, ACTOR_SELF, 4, ACTOR_SOUND_FLY, 0, 0) @@ -600,7 +600,7 @@ EvtScript N(attackSwarmSting) = { 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_WAIT(30) EVT_CALL(StopSound, SOUND_358) EVT_CALL(YieldTurn) @@ -703,7 +703,7 @@ EvtScript N(attackSwarmSting) = { 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, 6, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, 6, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 0b4d109576..0afe99e5fc 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -111,7 +111,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_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) @@ -125,7 +125,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -137,7 +137,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -155,7 +155,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_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) @@ -167,11 +167,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -206,7 +206,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(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -243,7 +243,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(20) EVT_END_IF EVT_CALL(YieldTurn) - 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_SET_CONST(LVar0, 1) @@ -270,7 +270,7 @@ EvtScript N(takeTurn) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(19) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index b97c912f53..37c860015a 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -148,7 +148,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Duplighost_Anim0A) - 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) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Duplighost_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -174,7 +174,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Duplighost_Anim0A) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) @@ -191,7 +191,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Duplighost_Anim0A) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -203,11 +203,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Duplighost_Anim0A) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Duplighost_Anim0A) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -242,7 +242,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_Duplighost_Anim07) EVT_WAIT(20) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2CB, 0) @@ -251,7 +251,7 @@ EvtScript N(attack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Duplighost_Anim08) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -100, 0, 0) @@ -293,7 +293,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_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Duplighost_Anim09) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -356,7 +356,7 @@ EvtScript N(OnHitElectric) = { EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim0A) 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) @@ -425,7 +425,7 @@ EvtScript N(OnShockHit) = { EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim0A) EVT_WAIT(15) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, LVarA, LVarB, LVarC, LVarD) EVT_ADD(LVarB, 30) @@ -481,7 +481,7 @@ EvtScript N(OnShockDeath) = { 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) @@ -677,7 +677,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) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index ba0643d6da..48d1b2ce81 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -343,7 +343,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC(N(split)) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(14) EVT_EXEC(N(split)) @@ -358,7 +358,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(11) EVT_EXEC(N(split)) @@ -371,7 +371,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(47) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) @@ -389,7 +389,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(23) EVT_CASE_OR_EQ(25) @@ -402,10 +402,10 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_CASE_EQ(32) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(56) EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0) @@ -447,7 +447,7 @@ EvtScript N(8021BE64) = { 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_Blue_Anim03) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -487,7 +487,7 @@ EvtScript N(8021BE64) = { 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(8021B2FC)) @@ -510,7 +510,7 @@ EvtScript N(8021BE64) = { 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_SET(LVar0, 1) EVT_SET(LVar1, 4587780) EVT_EXEC_WAIT(DoJumpBack) @@ -565,7 +565,7 @@ EvtScript N(8021C654) = { 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) @@ -605,7 +605,7 @@ EvtScript N(8021C654) = { 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(8021B2FC)) @@ -633,7 +633,7 @@ EvtScript N(8021C654) = { 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_EXEC_WAIT(N(8021B2FC)) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -649,7 +649,7 @@ EvtScript N(8021CBC8) = { 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_Blue_Anim03) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0) @@ -686,7 +686,7 @@ EvtScript N(8021CBC8) = { 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(8021B2FC)) @@ -722,7 +722,7 @@ EvtScript N(8021CBC8) = { 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(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(20) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index dbe69bc8da..c81de1ddbf 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -122,7 +122,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_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) @@ -136,7 +136,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_BurnStill) - 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_Fuzzy_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -169,7 +169,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_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) @@ -183,19 +183,19 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar0, DAMAGE_TYPE_SHOCK) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -233,7 +233,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(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -292,7 +292,7 @@ EvtScript N(takeTurn) = { 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) @@ -354,7 +354,7 @@ EvtScript N(takeTurn) = { 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(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) diff --git a/src/battle/common/actor/ghost_bombette.inc.c b/src/battle/common/actor/ghost_bombette.inc.c index 5f267c4a9b..33bc14876e 100644 --- a/src/battle/common/actor/ghost_bombette.inc.c +++ b/src/battle/common/actor/ghost_bombette.inc.c @@ -125,22 +125,22 @@ EvtScript N(bombette_handleEvent) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(GetLastElement, LVar1) EVT_IF_FLAG(LVar1, DAMAGE_TYPE_SHOCK) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_BurnHurt) EVT_WAIT(20) EVT_EXEC_WAIT(N(bombette_playEffects)) EVT_EXEC_WAIT(N(OnDeath)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnStill) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_IF EVT_CASE_EQ(EVENT_BURN_HIT) @@ -153,7 +153,7 @@ EvtScript N(bombette_handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnStill) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) @@ -165,7 +165,7 @@ EvtScript N(bombette_handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnStill) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -178,7 +178,7 @@ EvtScript N(bombette_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_SHOCK_HIT) EVT_CASE_OR_EQ(EVENT_SHOCK_DEATH) @@ -187,11 +187,11 @@ EvtScript N(bombette_handleEvent) = { EVT_WAIT(20) EVT_EXEC_WAIT(N(bombette_playEffects)) EVT_EXEC_WAIT(N(OnDeath)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnStill) EVT_SET(LVar2, -12345) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -205,11 +205,11 @@ EvtScript N(bombette_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -287,7 +287,7 @@ EvtScript N(bombette_takeTurn) = { 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) @@ -318,7 +318,7 @@ EvtScript N(bombette_takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) 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) diff --git a/src/battle/common/actor/ghost_bow.inc.c b/src/battle/common/actor/ghost_bow.inc.c index 9392eb9f1b..6e360fe0e0 100644 --- a/src/battle/common/actor/ghost_bow.inc.c +++ b/src/battle/common/actor/ghost_bow.inc.c @@ -127,7 +127,7 @@ EvtScript N(bow_handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -144,7 +144,7 @@ EvtScript N(bow_handleEvent) = { EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_BurnStillAlt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -157,16 +157,16 @@ EvtScript N(bow_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) EVT_EXEC_WAIT(N(OnShockHit)) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_DEATH) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) @@ -174,7 +174,7 @@ EvtScript N(bow_handleEvent) = { EVT_EXEC_WAIT(N(OnShockDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_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) @@ -187,11 +187,11 @@ EvtScript N(bow_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -234,7 +234,7 @@ EvtScript N(bow_takeTurn) = { 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 @@ -252,7 +252,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_15) 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH) EVT_SET(LVar0, 55) EVT_LOOP(20) @@ -270,7 +270,7 @@ EvtScript N(bow_takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) 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) @@ -301,7 +301,7 @@ EvtScript N(bow_takeTurn) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) @@ -339,17 +339,17 @@ EvtScript N(bow_takeTurn) = { 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) @@ -393,7 +393,7 @@ EvtScript N(bow_takeTurn) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index b7e12af687..9d8eb0eee4 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -137,7 +137,7 @@ EvtScript N(goombario_handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -154,7 +154,7 @@ EvtScript N(goombario_handleEvent) = { EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_BurnHurt2) - 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(goombario_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -182,7 +182,7 @@ EvtScript N(goombario_handleEvent) = { EVT_EXEC_WAIT(N(OnShockDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) - 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(goombario_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -229,7 +229,7 @@ EvtScript N(goombario_handleEvent) = { }; EvtScript N(goombario_returnBack) = { - 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) @@ -291,7 +291,7 @@ EvtScript N(goombario_returnBack) = { EvtScript N(goombario_runToPlayer) = { 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) @@ -519,7 +519,7 @@ EvtScript N(goombario_tattle) = { EVT_CALL(SetCamEnabled, CAM_TATTLE, FALSE) EVT_WAIT(32) EVT_CALL(func_802535B4, 1) - 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) diff --git a/src/battle/common/actor/ghost_kooper.inc.c b/src/battle/common/actor/ghost_kooper.inc.c index 54ff304c37..9bacc1653e 100644 --- a/src/battle/common/actor/ghost_kooper.inc.c +++ b/src/battle/common/actor/ghost_kooper.inc.c @@ -184,7 +184,7 @@ EvtScript N(kooper_handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -200,7 +200,7 @@ EvtScript N(kooper_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -213,7 +213,7 @@ EvtScript N(kooper_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) @@ -266,11 +266,11 @@ EvtScript N(kooper_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) @@ -386,7 +386,7 @@ EvtScript N(kooper_takeTurn) = { 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) @@ -429,7 +429,7 @@ EvtScript N(kooper_takeTurn) = { 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) @@ -472,7 +472,7 @@ EvtScript N(kooper_takeTurn) = { 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) @@ -500,7 +500,7 @@ EvtScript N(kooper_takeTurn) = { 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, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) diff --git a/src/battle/common/actor/ghost_lakilester.inc.c b/src/battle/common/actor/ghost_lakilester.inc.c index 8b0713155e..854dcc7078 100644 --- a/src/battle/common/actor/ghost_lakilester.inc.c +++ b/src/battle/common/actor/ghost_lakilester.inc.c @@ -132,7 +132,7 @@ EvtScript N(lakilester_handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -149,7 +149,7 @@ EvtScript N(lakilester_handleEvent) = { EVT_WAIT(10) 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) @@ -162,7 +162,7 @@ EvtScript N(lakilester_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) @@ -181,7 +181,7 @@ EvtScript N(lakilester_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) @@ -194,11 +194,11 @@ EvtScript N(lakilester_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) 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_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -233,7 +233,7 @@ EvtScript N(lakilester_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_BattleLakilester_Run) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) @@ -326,7 +326,7 @@ EvtScript N(lakilester_takeTurn) = { 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) @@ -363,7 +363,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) 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) diff --git a/src/battle/common/actor/ghost_parakarry.inc.c b/src/battle/common/actor/ghost_parakarry.inc.c index 200328e329..1e5af7bce5 100644 --- a/src/battle/common/actor/ghost_parakarry.inc.c +++ b/src/battle/common/actor/ghost_parakarry.inc.c @@ -127,7 +127,7 @@ EvtScript N(parakarry_handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -144,7 +144,7 @@ EvtScript N(parakarry_handleEvent) = { EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -157,7 +157,7 @@ EvtScript N(parakarry_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -172,7 +172,7 @@ EvtScript N(parakarry_handleEvent) = { EVT_EXEC_WAIT(N(OnShockDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_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) @@ -185,11 +185,11 @@ EvtScript N(parakarry_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_Hurt) - 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(parakarry_doTakeTurn) = { 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) @@ -240,7 +240,7 @@ EvtScript N(parakarry_doTakeTurn) = { 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) @@ -276,7 +276,7 @@ EvtScript N(parakarry_doTakeTurn) = { 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)) @@ -306,7 +306,7 @@ EvtScript N(parakarry_doTakeTurn) = { 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_BattleParakarry_Dive) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/ghost_sushie.inc.c b/src/battle/common/actor/ghost_sushie.inc.c index 85a90867ec..9f02242a97 100644 --- a/src/battle/common/actor/ghost_sushie.inc.c +++ b/src/battle/common/actor/ghost_sushie.inc.c @@ -115,7 +115,7 @@ EvtScript N(sushie_handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -132,7 +132,7 @@ EvtScript N(sushie_handleEvent) = { EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -145,7 +145,7 @@ EvtScript N(sushie_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -160,7 +160,7 @@ EvtScript N(sushie_handleEvent) = { EVT_EXEC_WAIT(N(OnShockDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_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) @@ -173,11 +173,11 @@ EvtScript N(sushie_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -211,7 +211,7 @@ EvtScript N(sushie_takeTurn) = { 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) @@ -228,11 +228,11 @@ EvtScript N(sushie_takeTurn) = { 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) @@ -242,7 +242,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) 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 @@ -321,7 +321,7 @@ EvtScript N(sushie_takeTurn) = { 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) @@ -332,7 +332,7 @@ EvtScript N(sushie_takeTurn) = { 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 @@ -437,7 +437,7 @@ EvtScript N(sushie_takeTurn) = { 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) diff --git a/src/battle/common/actor/ghost_watt.inc.c b/src/battle/common/actor/ghost_watt.inc.c index 5da0100ffa..f88df30b82 100644 --- a/src/battle/common/actor/ghost_watt.inc.c +++ b/src/battle/common/actor/ghost_watt.inc.c @@ -260,7 +260,7 @@ EvtScript N(watt_handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_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) @@ -276,7 +276,7 @@ EvtScript N(watt_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -290,7 +290,7 @@ EvtScript N(watt_handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_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) @@ -304,11 +304,11 @@ EvtScript N(watt_handleEvent) = { EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -345,7 +345,7 @@ EvtScript N(watt_takeTurn) = { 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) @@ -379,7 +379,7 @@ EvtScript N(watt_takeTurn) = { EVT_CALL(N(UnkWattEffectFunc4), 1) EVT_CALL(N(UnkWattEffectFunc3), 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) @@ -393,7 +393,7 @@ EvtScript N(watt_takeTurn) = { 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, STATUS_FLAG_SHRINK) @@ -439,7 +439,7 @@ EvtScript N(watt_takeTurn) = { 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(N(UnkWattEffectFunc4), 1) EVT_CALL(N(UnkWattEffectFunc3), 1) EVT_CALL(AddGoalPos, ACTOR_SELF, 25, 10, 0) diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 4aa5042d53..a0caf2c064 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -172,7 +172,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_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) @@ -186,7 +186,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -198,7 +198,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -224,7 +224,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -237,11 +237,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_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)) @@ -287,7 +287,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_Goomba_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -366,7 +366,7 @@ EvtScript N(takeTurn) = { 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) @@ -416,7 +416,7 @@ EvtScript N(takeTurn) = { 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)) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 9a64c7d5cb..b975817b16 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -226,7 +226,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Gray_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) @@ -240,7 +240,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Gray_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -252,7 +252,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Gray_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) @@ -264,11 +264,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Gray_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Gray_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -418,13 +418,13 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Gray_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Gray_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockOff)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_BURN_HIT) @@ -443,7 +443,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Gray_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) @@ -455,7 +455,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Gray_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) @@ -467,11 +467,11 @@ EvtScript N(handleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Gray_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Gray_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) @@ -528,10 +528,10 @@ EvtScript N(attackMagicBlast) = { 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_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) @@ -621,7 +621,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Gray_Anim02) @@ -659,7 +659,7 @@ EvtScript N(attackWandStrike) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - 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 @@ -692,7 +692,7 @@ EvtScript N(attackWandStrike) = { 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(10) EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -729,7 +729,7 @@ EvtScript N(flee) = { 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) @@ -745,8 +745,8 @@ EvtScript N(flee) = { 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(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_EXEC_WAIT(EVS_ForceNextTarget) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -884,7 +884,7 @@ EvtScript N(takeTurn) = { 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) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 4980b034fb..e74151694a 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -228,7 +228,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Green_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) @@ -242,7 +242,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Green_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -254,7 +254,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Green_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) @@ -266,11 +266,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Green_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Green_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -420,13 +420,13 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Green_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Green_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockOff)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_BURN_HIT) @@ -445,7 +445,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Green_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) @@ -457,7 +457,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Green_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) @@ -469,11 +469,11 @@ EvtScript N(handleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Green_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Green_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) @@ -530,10 +530,10 @@ EvtScript N(attackMagicBlast) = { 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_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) @@ -623,7 +623,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Green_Anim02) @@ -661,7 +661,7 @@ EvtScript N(attackWandStrike) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - 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 @@ -694,7 +694,7 @@ EvtScript N(attackWandStrike) = { 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(10) EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -731,7 +731,7 @@ EvtScript N(flee) = { 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) @@ -747,8 +747,8 @@ EvtScript N(flee) = { 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(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_EXEC_WAIT(EVS_ForceNextTarget) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -886,7 +886,7 @@ EvtScript N(takeTurn) = { 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) diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index 7f5b6be24a..861ce73877 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -196,7 +196,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_HammerBros_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) @@ -210,7 +210,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_HammerBros_Anim10) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -222,7 +222,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_HammerBros_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) @@ -238,11 +238,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_HammerBros_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_HammerBros_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -289,7 +289,7 @@ EvtScript N(attackHammerThrow) = { 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) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 77497a809b..69b7a731b6 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -251,7 +251,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_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) @@ -265,7 +265,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -277,7 +277,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) @@ -332,7 +332,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_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) @@ -355,11 +355,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -509,7 +509,7 @@ EvtScript N(takeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) EVT_WAIT(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(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) @@ -524,11 +524,11 @@ EvtScript N(takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) EVT_CALL(SetBattleCamZoom, 300) 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(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(8) @@ -551,7 +551,7 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar1, 20) 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -577,7 +577,7 @@ EvtScript N(takeTurn) = { 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) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 28aca58485..bbea1b82c6 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -339,12 +339,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(N(STATE_FLIPPED)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(N(STATE_CHARGED)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_SWITCH EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -359,7 +359,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0D) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) @@ -385,7 +385,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_CASE_GROUP EVT_CASE_EQ(N(STATE_CHARGED)) EVT_SET_CONST(LVar0, 1) @@ -395,7 +395,7 @@ EvtScript N(handleEvent) = { EVT_WAIT(5) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_SWITCH EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED)) @@ -449,7 +449,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) @@ -527,22 +527,22 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(N(STATE_FLIPPED)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(N(STATE_CHARGED)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim08) EVT_WAIT(5) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim0B) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_SWITCH EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -689,7 +689,7 @@ EvtScript N(attackShellToss) = { 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_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim07) EVT_WAIT(10) @@ -705,7 +705,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim06) EVT_WAIT(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(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) @@ -720,11 +720,11 @@ EvtScript N(attackShellToss) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) EVT_CALL(SetBattleCamZoom, 300) 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_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -747,7 +747,7 @@ EvtScript N(attackShellToss) = { EVT_SUB(LVar1, 20) 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -773,7 +773,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) @@ -817,7 +817,7 @@ EvtScript N(attackShellMissile) = { EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim15) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD EVT_WAIT(8) @@ -847,7 +847,7 @@ EvtScript N(attackShellMissile) = { 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) @@ -872,12 +872,12 @@ EvtScript N(attackShellMissile) = { 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) @@ -931,7 +931,7 @@ EvtScript N(attackShellMissile) = { EVT_SWITCH(LVarA) 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) @@ -1071,7 +1071,7 @@ EvtScript N(summonFriend) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim09) EVT_WAIT(8) EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) EVT_THREAD EVT_WAIT(8) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index e6e4230d80..684f4735e1 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -383,7 +383,7 @@ EvtScript N(flee) = { 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) @@ -399,8 +399,8 @@ EvtScript N(flee) = { 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(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_EXEC_WAIT(EVS_ForceNextTarget) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -517,12 +517,12 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_UP_AND_AWAY) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -539,7 +539,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(removeClone)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -553,7 +553,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(removeClone)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 1) @@ -575,12 +575,12 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -622,7 +622,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -645,20 +645,20 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_EXEC_WAIT(N(knockOff)) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_UP_AND_AWAY) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_CASE_OR_EQ(EVENT_BURN_HIT) EVT_CASE_OR_EQ(EVENT_15) @@ -678,7 +678,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(removeClone)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) @@ -692,7 +692,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(removeClone)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 2) @@ -714,12 +714,12 @@ EvtScript N(handleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_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) @@ -771,7 +771,7 @@ EvtScript N(handleEvent_flying) = { EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(removeClone)) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -851,7 +851,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) @@ -950,7 +950,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) @@ -980,10 +980,10 @@ EvtScript N(attackMagicBlast) = { 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_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) @@ -1449,7 +1449,7 @@ EvtScript N(makeClone) = { 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) @@ -1598,7 +1598,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) @@ -1710,7 +1710,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) @@ -1827,7 +1827,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) @@ -1939,7 +1939,7 @@ EvtScript N(makeTransparent) = { 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) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 2c790bf3bf..5e3b0672ce 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -147,7 +147,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -161,7 +161,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_Anim09) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -173,7 +173,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -191,7 +191,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_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) @@ -203,11 +203,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_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) @@ -250,7 +250,7 @@ EvtScript N(flyingAttack) = { 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_THREAD EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(15) @@ -301,7 +301,7 @@ EvtScript N(flyingAttack) = { EVT_END_IF EVT_WAIT(30) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - 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(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_EXEC_WAIT(N(returnHome)) @@ -337,7 +337,7 @@ EvtScript N(flyingAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - 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_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) @@ -390,7 +390,7 @@ EvtScript N(healOneAlly) = { 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 diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index 71d847b8fe..31664a1c62 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -231,13 +231,13 @@ EvtScript N(handleEvent) = { EVT_END_CHILD_THREAD EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MontyMole_Anim06) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Anim08) EVT_WAIT(10) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MontyMole_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) @@ -253,7 +253,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(makeHole)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MontyMole_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) @@ -278,13 +278,13 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MontyMole_Anim05) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Anim06) EVT_WAIT(10) EVT_EXEC_WAIT(N(makeHole)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MontyMole_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_Anim06) @@ -351,7 +351,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 diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index b4c2ee88f3..3933329801 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -262,7 +262,7 @@ EvtScript N(handleEvent_8021B768) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) 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_8021B768) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_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_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(8021C574)) EVT_CASE_EQ(EVENT_15) EVT_SET_CONST(LVar0, 2) @@ -311,7 +311,7 @@ EvtScript N(handleEvent_8021B768) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -324,11 +324,11 @@ EvtScript N(handleEvent_8021B768) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_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) @@ -372,7 +372,7 @@ EvtScript N(takeTurn_8021BD5C) = { 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_8021BD5C) = { 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_8021BD5C) = { 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_8021BD5C) = { 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_8021BD5C) = { 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)) @@ -649,7 +649,7 @@ EvtScript N(handleEvent_8021CEBC) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_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) @@ -663,7 +663,7 @@ EvtScript N(handleEvent_8021CEBC) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -675,7 +675,7 @@ EvtScript N(handleEvent_8021CEBC) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -701,7 +701,7 @@ EvtScript N(handleEvent_8021CEBC) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Dead) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -714,11 +714,11 @@ EvtScript N(handleEvent_8021CEBC) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_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)) @@ -764,7 +764,7 @@ EvtScript N(takeTurn_8021D6E8) = { 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) @@ -843,7 +843,7 @@ EvtScript N(takeTurn_8021D6E8) = { 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) @@ -893,7 +893,7 @@ EvtScript N(takeTurn_8021D6E8) = { 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)) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 0d3f3e0a59..fe96d1a2b9 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -292,11 +292,11 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_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) @@ -314,7 +314,7 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 2) @@ -328,12 +328,12 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_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_ParaTroopa_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(802204DC)) EVT_CASE_EQ(EVENT_15) EVT_SET_CONST(LVar0, 1) @@ -355,7 +355,7 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) @@ -378,11 +378,11 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_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) @@ -423,7 +423,7 @@ EvtScript N(takeTurn_8021FA24) = { 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(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Run) @@ -431,7 +431,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) EVT_WAIT(5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -494,7 +494,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_ADD(LVar1, 30) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) @@ -527,7 +527,7 @@ EvtScript N(takeTurn_8021FA24) = { 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, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -808,7 +808,7 @@ EvtScript N(handleEvent_80221228) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_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) @@ -822,7 +822,7 @@ EvtScript N(handleEvent_80221228) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -834,7 +834,7 @@ EvtScript N(handleEvent_80221228) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) @@ -889,7 +889,7 @@ EvtScript N(handleEvent_80221228) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_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) @@ -912,11 +912,11 @@ EvtScript N(handleEvent_80221228) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -1066,7 +1066,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) EVT_WAIT(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(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) @@ -1081,11 +1081,11 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) EVT_CALL(SetBattleCamZoom, 300) 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(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(8) @@ -1108,7 +1108,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_SUB(LVar1, 20) 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(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) @@ -1134,7 +1134,7 @@ EvtScript N(takeTurn_80221DAC) = { 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) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index b4547a1325..b1c1af5706 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -243,31 +243,31 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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, N(VAR_ANIM_HIT), LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), LVarA) EVT_IF_EQ(LVarA, 3) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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(onHit)) EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_SWITCH EVT_END_IF EVT_END_IF @@ -276,34 +276,34 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_ELSE EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), LVarA) EVT_IF_EQ(LVarA, 3) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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(onHit)) EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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, N(VAR_ANIM_HIT), LVar1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_HIT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), LVar1) @@ -317,11 +317,11 @@ EvtScript N(handleEvent) = { 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(onHit)) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -341,11 +341,11 @@ EvtScript N(handleEvent) = { 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(onHit)) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -355,7 +355,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), LVar1) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_EXEC_WAIT(N(onSpinSmash)) @@ -363,14 +363,14 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(onSpinSmash)) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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, N(VAR_ANIM_HIT), LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_EXEC_WAIT(N(onHit)) EVT_END_IF @@ -379,13 +379,13 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), LVar1) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_EXEC_WAIT(N(onHit)) 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) @@ -406,7 +406,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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) @@ -469,7 +469,7 @@ EvtScript N(timberAttack) = { 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), LVar0) EVT_SWITCH(LVar0) @@ -545,7 +545,7 @@ EvtScript N(timberAttack) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF 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(GetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), LVar0) EVT_SWITCH(LVar0) @@ -588,7 +588,7 @@ EvtScript N(timberAttack) = { 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(MakeLerp, 90, 0, 10, EASING_LINEAR) EVT_LABEL(5) EVT_CALL(UpdateLerp) @@ -703,7 +703,7 @@ EvtScript N(takeTurn) = { 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) @@ -966,7 +966,7 @@ EvtScript N(unearthFriend) = { EVT_CASE_EQ(1) EVT_CALL(SetActorVar, LVarB, N(VAR_SUMMON_COUNT), 2) EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_SET(LVarA, LVar0) EVT_CALL(MakeLerp, 90, -30, 7, EASING_QUADRATIC_OUT) @@ -1001,7 +1001,7 @@ EvtScript N(attackHeadDive) = { 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) @@ -1065,7 +1065,7 @@ EvtScript N(attackHeadDive) = { 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) @@ -1097,7 +1097,7 @@ EvtScript N(attackHeadDive) = { 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) @@ -1310,7 +1310,7 @@ EvtScript N(doSpinSmashHit) = { 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) @@ -1392,7 +1392,7 @@ EvtScript N(onHit) = { EvtScript N(flee) = { EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), 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) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 3f49d51107..698aeec9ad 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -139,7 +139,7 @@ EvtScript N(handleEvent_8021B3D0) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Putrid_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) @@ -153,7 +153,7 @@ EvtScript N(handleEvent_8021B3D0) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Putrid_Anim11) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -165,7 +165,7 @@ EvtScript N(handleEvent_8021B3D0) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Putrid_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -179,7 +179,7 @@ EvtScript N(handleEvent_8021B3D0) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Putrid_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) @@ -191,11 +191,11 @@ EvtScript N(handleEvent_8021B3D0) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Putrid_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LargePiranha_Putrid_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -276,7 +276,7 @@ EvtScript N(bite) = { 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(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim03) @@ -310,7 +310,7 @@ EvtScript N(bite) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(14) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(YieldTurn) EVT_CALL(GetBattlePhase, LVar0) @@ -352,7 +352,7 @@ EvtScript N(bite) = { 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_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim07) EVT_WAIT(20) @@ -391,7 +391,7 @@ EvtScript N(breath) = { 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_LargePiranha_Putrid_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim03) @@ -436,7 +436,7 @@ EvtScript N(breath) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(14) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) @@ -457,7 +457,7 @@ EvtScript N(breath) = { 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_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim0A) EVT_WAIT(20) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 176228594a..cc550e4daf 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -226,7 +226,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Red_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) @@ -240,7 +240,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Red_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -252,7 +252,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Red_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) @@ -264,11 +264,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Red_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Red_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -418,13 +418,13 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Red_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Red_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockOff)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_BURN_HIT) @@ -443,7 +443,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Red_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) @@ -455,7 +455,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Red_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) @@ -467,11 +467,11 @@ EvtScript N(handleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Red_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Red_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) @@ -528,10 +528,10 @@ EvtScript N(attackMagicBlast) = { 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_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) @@ -621,7 +621,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Red_Anim02) @@ -659,7 +659,7 @@ EvtScript N(attackWandStrike) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - 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 @@ -692,7 +692,7 @@ EvtScript N(attackWandStrike) = { 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(10) EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -729,7 +729,7 @@ EvtScript N(flee) = { 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) @@ -745,8 +745,8 @@ EvtScript N(flee) = { 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(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_EXEC_WAIT(EVS_ForceNextTarget) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -884,7 +884,7 @@ EvtScript N(takeTurn) = { 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) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index 2aa427add5..abd8d797d9 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -137,7 +137,7 @@ EvtScript N(handleEvent) = { 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) @@ -151,7 +151,7 @@ EvtScript N(handleEvent) = { 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) @@ -163,7 +163,7 @@ EvtScript N(handleEvent) = { 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) @@ -180,7 +180,7 @@ EvtScript N(handleEvent) = { 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) @@ -192,11 +192,11 @@ EvtScript N(handleEvent) = { 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) @@ -231,7 +231,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_Red_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -267,7 +267,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)) @@ -301,7 +301,7 @@ EvtScript N(bumpAttack) = { 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) @@ -326,7 +326,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_Red_Anim09) EVT_WAIT(20) @@ -377,7 +377,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) @@ -407,7 +407,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) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 5238bb4814..1e5915dc15 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -219,16 +219,16 @@ EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim14) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim14) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(spikeTop_FallDown)) EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim14) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(spikeTop_FallDown)) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -243,7 +243,7 @@ EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim1A) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -261,7 +261,7 @@ EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim13) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 1) @@ -279,11 +279,11 @@ EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim14) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim14) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_SCARE_AWAY) @@ -327,7 +327,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim13) EVT_SET_CONST(LVar2, ANIM_SpikeTop_Anim15) EVT_EXEC_WAIT(N(8021D57C)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -351,7 +351,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim17) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim18) @@ -359,7 +359,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim18) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) @@ -418,7 +418,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim13) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -462,13 +462,13 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim13) EVT_SET_CONST(LVar2, ANIM_SpikeTop_Anim15) EVT_EXEC_WAIT(N(8021D57C)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim13) EVT_SET_CONST(LVar2, ANIM_SpikeTop_Anim15) EVT_EXEC_WAIT(N(8021D57C)) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) @@ -480,7 +480,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim13) EVT_SET_CONST(LVar2, ANIM_SpikeTop_Anim15) EVT_EXEC_WAIT(N(8021D57C)) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) @@ -566,7 +566,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { 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, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -588,11 +588,11 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - 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, 4, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -625,7 +625,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { 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(spikeTop_TakeTurn_Ceiling) = { 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_SET(LVar1, 0) @@ -698,7 +698,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { 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) @@ -724,7 +724,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { 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_SpikeTop_Anim0B) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim0F) @@ -756,12 +756,12 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -150, 0, 0) @@ -794,7 +794,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { 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) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 310f5f30f6..dda3c9775d 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -173,7 +173,7 @@ EvtScript N(handleEvent_8021E874) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_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) @@ -187,7 +187,7 @@ EvtScript N(handleEvent_8021E874) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_BurnEyesOpen) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -199,7 +199,7 @@ EvtScript N(handleEvent_8021E874) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -225,7 +225,7 @@ EvtScript N(handleEvent_8021E874) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_HurtStill) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -238,11 +238,11 @@ EvtScript N(handleEvent_8021E874) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikedGoomba_HurtStill) - 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)) @@ -303,7 +303,7 @@ EvtScript N(takeTurn_8021F1BC) = { 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_8021F1BC) = { 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_8021F1BC) = { 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)) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 0e0e1a3710..1798307d0b 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -180,7 +180,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Spiny_Anim09) EVT_SET_CONST(LVar2, ANIM_Spiny_Anim0A) EVT_EXEC_WAIT(N(getAnimation)) - 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) @@ -204,7 +204,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Spiny_Anim0C) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Spiny_Anim0D) @@ -212,7 +212,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Spiny_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) @@ -231,7 +231,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Spiny_Anim09) EVT_SET_CONST(LVar2, ANIM_Spiny_Anim0A) EVT_EXEC_WAIT(N(getAnimation)) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -294,13 +294,13 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Spiny_Anim09) EVT_SET_CONST(LVar2, ANIM_Spiny_Anim0A) EVT_EXEC_WAIT(N(getAnimation)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Spiny_Anim09) EVT_SET_CONST(LVar2, ANIM_Spiny_Anim0A) EVT_EXEC_WAIT(N(getAnimation)) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -393,7 +393,7 @@ EvtScript N(takeTurn) = { 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) @@ -435,12 +435,12 @@ EvtScript N(takeTurn) = { 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(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -200, 0, 0) @@ -448,7 +448,7 @@ EvtScript N(takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - 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)) @@ -466,7 +466,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_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Lakitu_Anim0B) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 1301b93c56..3f70d1e946 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -154,7 +154,7 @@ EvtScript N(hadleEvent_flying) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -168,14 +168,14 @@ EvtScript N(hadleEvent_flying) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim18) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_CALL(func_80269470) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) EVT_EXEC_WAIT(DoShockHit) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(func_80269470) @@ -184,11 +184,11 @@ EvtScript N(hadleEvent_flying) = { EVT_EXEC_WAIT(DoShockHit) EVT_THREAD EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -200,11 +200,11 @@ EvtScript N(hadleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -292,22 +292,22 @@ EvtScript N(handleEvent) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_CASE_EQ(EVENT_HIT) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockDown)) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_HIT) @@ -333,7 +333,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim18) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim11) @@ -341,7 +341,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim12) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) @@ -349,7 +349,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) EVT_EXEC_WAIT(D_8029A76C) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(func_80269470) @@ -358,11 +358,11 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(D_8029A76C) EVT_THREAD EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -375,19 +375,19 @@ EvtScript N(handleEvent) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) @@ -431,7 +431,7 @@ EvtScript N(takeTurn_flying) = { 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(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -464,7 +464,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(YieldTurn) - 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_EXEC_WAIT(N(returnHome)) @@ -495,7 +495,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, 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(8.0)) @@ -521,7 +521,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_Swooper_Anim02) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -549,7 +549,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(YieldTurn) - 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_EXEC_WAIT(N(returnHome)) @@ -577,7 +577,7 @@ EvtScript N(takeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, 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(8.0)) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index 8ca0eeb09f..aff2c12e9e 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -155,7 +155,7 @@ EvtScript N(hadleEvent_flying) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) @@ -169,14 +169,14 @@ EvtScript N(hadleEvent_flying) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim18) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_CALL(func_80269470) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) EVT_EXEC_WAIT(DoShockHit) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(func_80269470) @@ -185,11 +185,11 @@ EvtScript N(hadleEvent_flying) = { EVT_EXEC_WAIT(DoShockHit) EVT_THREAD EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -201,11 +201,11 @@ EvtScript N(hadleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -295,22 +295,22 @@ EvtScript N(handleEvent) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_IF EVT_CASE_EQ(EVENT_HIT) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockDown)) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_HIT) @@ -336,7 +336,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim18) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim11) @@ -344,7 +344,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim12) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) @@ -352,7 +352,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) EVT_EXEC_WAIT(D_8029A76C) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(func_80269470) @@ -361,11 +361,11 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(D_8029A76C) EVT_THREAD EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -378,19 +378,19 @@ EvtScript N(handleEvent) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim15) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim0E) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim0E) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) @@ -436,7 +436,7 @@ EvtScript N(takeTurn_flying) = { 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(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -469,7 +469,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(YieldTurn) - 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_EXEC_WAIT(N(returnHome)) @@ -549,7 +549,7 @@ EvtScript N(takeTurn_flying) = { EVT_WAIT(30) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x7FFF) + EVT_CALL(ShowMessageBox, BTL_MSG_ACTION_TIP_03, 0x7FFF) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) @@ -867,7 +867,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(func_80269470) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - 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(8.0)) @@ -893,7 +893,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_Swooper_Gray_Anim02) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -921,7 +921,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(YieldTurn) - 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_EXEC_WAIT(N(returnHome)) @@ -999,7 +999,7 @@ EvtScript N(takeTurn) = { 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) @@ -1172,7 +1172,7 @@ EvtScript N(takeTurn) = { EVT_CALL(func_80269470) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - 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(8.0)) diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index 02ca08eab6..f6ce50ecb4 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -131,12 +131,12 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2073) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Hurt) EVT_EXEC_WAIT(N(spawnWhackasBump)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LE(LVar0, 100) EVT_EXEC_WAIT(N(die)) @@ -147,7 +147,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) EVT_SET_CONST(LVar2, ANIM_Whacka_Idle) EVT_EXEC_WAIT(N(spawnWhackasBump)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LE(LVar0, 100) EVT_EXEC_WAIT(N(die)) @@ -158,14 +158,14 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) EVT_SET_CONST(LVar2, ANIM_Whacka_Idle) EVT_EXEC_WAIT(N(spawnWhackasBump)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_IF_GE(100, 100) EVT_EXEC_WAIT(N(die)) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_IF EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) @@ -187,7 +187,7 @@ EvtScript N(handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_IF EVT_CASE_EQ(EVENT_SHOCK_HIT) @@ -206,7 +206,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, 1) @@ -234,7 +234,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Hurt) EVT_EXEC_WAIT(N(spawnWhackasBump)) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_IF_GE(100, 100) EVT_EXEC_WAIT(N(die)) @@ -242,7 +242,7 @@ EvtScript N(handleEvent) = { EVT_ELSE EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_END_IF EVT_CASE_EQ(EVENT_RECOVER_STATUS) diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 9babe98ac9..2d08a6e776 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -113,7 +113,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_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) @@ -127,7 +127,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_Anim07) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -139,7 +139,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) @@ -157,7 +157,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_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) @@ -169,11 +169,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -208,7 +208,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(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -243,7 +243,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_WAIT(20) EVT_END_IF - 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) @@ -331,7 +331,7 @@ EvtScript N(takeTurn) = { 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(19) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 41515369e8..9a8b43b708 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -231,7 +231,7 @@ EvtScript N(handleEvent_80223E24) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_White_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) @@ -245,7 +245,7 @@ EvtScript N(handleEvent_80223E24) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_White_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -257,7 +257,7 @@ EvtScript N(handleEvent_80223E24) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_White_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) @@ -269,11 +269,11 @@ EvtScript N(handleEvent_80223E24) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_White_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_White_Anim04) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -423,13 +423,13 @@ EvtScript N(handleEvent_80224A44) = { EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_White_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_White_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockOff)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_BURN_HIT) @@ -448,7 +448,7 @@ EvtScript N(handleEvent_80224A44) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_White_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) @@ -460,7 +460,7 @@ EvtScript N(handleEvent_80224A44) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_White_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) @@ -472,11 +472,11 @@ EvtScript N(handleEvent_80224A44) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_White_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_White_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) @@ -533,10 +533,10 @@ EvtScript N(wMagikoopa_ShapeSpell) = { 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_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) @@ -626,7 +626,7 @@ EvtScript N(wMagikoopa_WandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_White_Anim02) @@ -664,7 +664,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - 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 @@ -697,7 +697,7 @@ EvtScript N(wMagikoopa_WandStrike) = { 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(10) EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -734,7 +734,7 @@ EvtScript N(run_away) = { 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) @@ -750,8 +750,8 @@ EvtScript N(run_away) = { 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(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_EXEC_WAIT(EVS_ForceNextTarget) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -899,7 +899,7 @@ EvtScript N(healOne) = { EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVarA) EVT_CALL(GetActorHP, ACTOR_SELF, LVarB) EVT_IF_NE(LVarA, LVarB) - EVT_SET(LVar8, -127) + EVT_SET(LVar8, ACTOR_SELF) EVT_GOTO(100) EVT_END_IF EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) @@ -999,7 +999,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_WAIT(10) EVT_CALL(YieldTurn) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1104,7 +1104,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_WAIT(10) EVT_CALL(YieldTurn) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index a023e47de0..f48ea054f4 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -225,7 +225,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Yellow_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) @@ -239,7 +239,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Yellow_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) @@ -251,7 +251,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Yellow_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) @@ -263,11 +263,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Yellow_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Yellow_Anim04) - 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(handleEvent_flying) = { EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Yellow_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Yellow_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_EXEC_WAIT(N(knockOff)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_BURN_HIT) @@ -442,7 +442,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Yellow_Anim06) - EVT_EXEC_WAIT(DoDeath) + EVT_EXEC_WAIT(EVS_DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) @@ -454,7 +454,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Yellow_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) @@ -466,11 +466,11 @@ EvtScript N(handleEvent_flying) = { EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Yellow_Anim04) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Yellow_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) @@ -527,10 +527,10 @@ EvtScript N(attackMagicBlast) = { 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_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) @@ -620,7 +620,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Yellow_Anim02) @@ -658,7 +658,7 @@ EvtScript N(attackWandStrike) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - 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 @@ -691,7 +691,7 @@ EvtScript N(attackWandStrike) = { 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(10) EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -728,7 +728,7 @@ EvtScript N(flee) = { 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) @@ -744,8 +744,8 @@ EvtScript N(flee) = { 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(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_EXEC_WAIT(EVS_ForceNextTarget) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -888,7 +888,7 @@ EvtScript N(takeTurn) = { 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) diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index ae290d09d3..78b61802ba 100644 --- a/src/battle/common/move/HammerSupport.inc.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -12,7 +12,7 @@ EvtScript N(EVS_HammerSupport_A) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 32) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) @@ -22,7 +22,7 @@ EvtScript N(EVS_HammerSupport_A) = { EvtScript N(EVS_HammerSupport_B) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) @@ -124,7 +124,7 @@ EvtScript N(EVS_HammerSupport_E) = { }; EvtScript N(EVS_HammerSupport_F) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -157,14 +157,14 @@ EvtScript N(EVS_HammerSupport_F) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PreSwing) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Swing) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_RETURN EVT_END }; EvtScript N(EVS_Hammer_ReturnHome_A) = { EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(func_802693F0) EVT_WAIT(20) @@ -221,7 +221,7 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_C)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, 16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -307,7 +307,7 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_D)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -376,7 +376,7 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_E)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -445,7 +445,7 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_C)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -503,7 +503,7 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_D)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -552,7 +552,7 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_E)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) diff --git a/src/battle/common/move/ItemRefund.inc.c b/src/battle/common/move/ItemRefund.inc.c index 39fae85e93..2600bf02f0 100644 --- a/src/battle/common/move/ItemRefund.inc.c +++ b/src/battle/common/move/ItemRefund.inc.c @@ -3,7 +3,7 @@ static s32 itemIcon; -// Returns time to sleep for on $x. +// out LVar0: time caller should wait for coin spawns API_CALLABLE(N(GiveRefund)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = gBattleStatus.playerActor; @@ -12,7 +12,7 @@ API_CALLABLE(N(GiveRefund)) { f32 posY = player->currentPos.y + player->size.y; f32 posZ; f32 facingAngleSign = 0.0f; - s32 sleepTime = 0; + s32 delayTime = 0; s32 tempIcon; if (player_team_is_ability_active(player, ABILITY_REFUND) && sellValue > 0) { @@ -34,7 +34,7 @@ API_CALLABLE(N(GiveRefund)) { facingAngleSign += 30.0f; } - sleepTime = (i * 3) + 30; + delayTime = (i * 3) + 30; posX = player->currentPos.x; posY = player->currentPos.y; @@ -64,7 +64,7 @@ API_CALLABLE(N(GiveRefund)) { #endif } - script->varTable[0] = sleepTime; + script->varTable[0] = delayTime; return ApiStatus_DONE2; } diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index 6289c85a48..97d13e7537 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -34,7 +34,7 @@ EvtScript N(EVS_JumpSupport_A) = { EVT_SET(LVar3, LVar0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) @@ -103,7 +103,7 @@ EvtScript N(EVS_JumpSupport_D) = { EvtScript N(EVS_JumpSupport_E) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(func_802693F0) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -132,7 +132,7 @@ EvtScript N(EVS_JumpSupport_E) = { EvtScript N(EVS_JumpSupport_F) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(func_802693F0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 50) @@ -190,7 +190,7 @@ EvtScript N(EVS_JumpSupport_G) = { EvtScript N(EVS_JumpSupport_H) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(func_802693F0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 60) @@ -220,7 +220,7 @@ EvtScript N(EVS_JumpSupport_I) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(func_802693F0) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -266,7 +266,7 @@ EvtScript N(EVS_JumpSupport_J) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) EVT_WAIT(20) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(func_802693F0) EVT_CALL(EnablePlayerBlur, -1) EVT_CALL(func_80276EFC) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 4056674391..447610fd8c 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -153,7 +153,7 @@ EvtScript N(802A2C20) = { EvtScript N(802A2E2C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -185,7 +185,7 @@ EvtScript N(802A2E2C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -438,7 +438,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { break; case PEACH_STAR_BEAM_ZOOM_OUT: if (script->functionTemp[1] == 0) { - btl_cam_use_preset(BTL_CAM_PRESET_C); + btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(10); script->functionTemp[1] = 15; script->functionTemp[0] = PEACH_STAR_BEAM_SHRINK_CIRCLE; @@ -540,7 +540,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } } - btl_cam_use_preset(BTL_CAM_PRESET_D); + btl_cam_use_preset(BTL_CAM_PRESET_03); btl_cam_move(30); script->functionTemp[1] = 15; script->functionTemp[0] = PEACH_STAR_BEAM_MAKE_ADDITIONAL_EFFECTS; diff --git a/src/battle/move/hammer/attack.c b/src/battle/move/hammer/attack.c index 32adcb6ab5..d59b95f311 100644 --- a/src/battle/move/hammer/attack.c +++ b/src/battle/move/hammer/attack.c @@ -84,7 +84,7 @@ EvtScript N(EVS_UseMove0_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -155,12 +155,12 @@ EvtScript N(EVS_UseMove1) = { EVT_SUB(LVar0, 32) EVT_SET(LVar1, 0) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarA) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarB) EVT_WAIT(3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarC) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -183,7 +183,7 @@ EvtScript N(EVS_UseMove1) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) EVT_END_THREAD EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -261,7 +261,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) EVT_END_THREAD EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN EVT_END_IF @@ -306,7 +306,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/hammer/auto_smash.c b/src/battle/move/hammer/auto_smash.c index 343a8bcaee..59ff8c10d2 100644 --- a/src/battle/move/hammer/auto_smash.c +++ b/src/battle/move/hammer/auto_smash.c @@ -84,7 +84,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/hammer/d_down_pound.c b/src/battle/move/hammer/d_down_pound.c index 14bff17153..56176685b6 100644 --- a/src/battle/move/hammer/d_down_pound.c +++ b/src/battle/move/hammer/d_down_pound.c @@ -25,7 +25,7 @@ extern EvtScript N(UseMove_Impl); EvtScript N(EVS_UseMove) = { EVT_CALL(ShowActionHud, TRUE) - EVT_CALL(func_80269EAC, 3) + EVT_CALL(SetDamageSource, DMG_SRC_D_DOWN_POUND) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -102,10 +102,10 @@ EvtScript N(UseMove_Impl) = { EVT_END_SWITCH EVT_CALL(DidActionSucceed, LVar0) EVT_IF_GT(LVar0, FALSE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(MoveBattleCamOver, 5) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(MoveBattleCamOver, 50) EVT_END_IF EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index b289e21cbc..d61634b506 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -117,7 +117,7 @@ EvtScript N(EVS_802A3348) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) @@ -184,7 +184,7 @@ EvtScript N(EVS_UseMove0) = { }; EvtScript N(EVS_802A3948) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -198,7 +198,7 @@ EvtScript N(EVS_802A3948) = { EVT_WAIT(3) EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -219,9 +219,9 @@ EvtScript N(EVS_802A3948) = { EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_CHARGE_HAMMER, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -235,7 +235,7 @@ EvtScript N(EVS_802A3948) = { }; EvtScript N(EVS_802A3C90) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -249,7 +249,7 @@ EvtScript N(EVS_802A3C90) = { EVT_WAIT(3) EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -270,9 +270,9 @@ EvtScript N(EVS_802A3C90) = { EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_CHARGE_HAMMER, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -286,7 +286,7 @@ EvtScript N(EVS_802A3C90) = { }; EvtScript N(EVS_802A3FD8) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -300,7 +300,7 @@ EvtScript N(EVS_802A3FD8) = { EVT_WAIT(3) EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -321,9 +321,9 @@ EvtScript N(EVS_802A3FD8) = { EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_CHARGE_HAMMER, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index 53a5706a3a..a1d0d9e0c1 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -126,7 +126,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) @@ -193,7 +193,7 @@ EvtScript N(EVS_UseMove0) = { }; EvtScript N(EVS_802A39C8) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -207,7 +207,7 @@ EvtScript N(EVS_802A39C8) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -231,7 +231,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -245,7 +245,7 @@ EvtScript N(EVS_802A39C8) = { }; EvtScript N(EVS_802A3D1C) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -259,7 +259,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -283,7 +283,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -297,7 +297,7 @@ EvtScript N(EVS_802A3D1C) = { }; EvtScript N(EVS_802A4070) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -311,7 +311,7 @@ EvtScript N(EVS_802A4070) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -335,7 +335,7 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index bc03370ce7..451ff184df 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -126,7 +126,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) @@ -193,7 +193,7 @@ EvtScript N(EVS_UseMove0) = { }; EvtScript N(EVS_802A39C8) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -207,7 +207,7 @@ EvtScript N(EVS_802A39C8) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -230,7 +230,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -243,7 +243,7 @@ EvtScript N(EVS_802A39C8) = { }; EvtScript N(EVS_802A3CF4) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -257,7 +257,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -280,7 +280,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -293,7 +293,7 @@ EvtScript N(EVS_802A3CF4) = { }; EvtScript N(EVS_802A4020) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -307,7 +307,7 @@ EvtScript N(EVS_802A4020) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsHammerMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -330,7 +330,7 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c index b99d3d9221..0e70548b1f 100644 --- a/src/battle/move/hammer/hammer_throw.c +++ b/src/battle/move/hammer/hammer_throw.c @@ -172,7 +172,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_EXEC_WAIT(N(EVS_802A4164)) EVT_END_SWITCH EVT_CALL(InitTargetIterator) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(AddBattleCamZoom, 50) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -376,7 +376,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c index 004e68b913..10b8b2adbe 100644 --- a/src/battle/move/hammer/mega_quake.c +++ b/src/battle/move/hammer/mega_quake.c @@ -19,17 +19,17 @@ API_CALLABLE(func_802A10A4_756824) { script->functionTemp[0] = 1; } - set_screen_overlay_center(1, 0, 0, 0); - set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT); - set_screen_overlay_params_back(12, 160.0f); + set_screen_overlay_center(SCREEN_LAYER_BACK, 0, 0, 0); + set_screen_overlay_center(SCREEN_LAYER_BACK, 1, SCREEN_WIDTH, SCREEN_HEIGHT); + set_screen_overlay_params_back(OVERLAY_BLUR, 160.0f); if (script->functionTemp[1] != 0) { script->functionTemp[1]--; return ApiStatus_BLOCK; } else { - set_screen_overlay_center(1, 0, 0, 0); - set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT); - set_screen_overlay_params_back(12, 0.0f); + set_screen_overlay_center(SCREEN_LAYER_BACK, 0, 0, 0); + set_screen_overlay_center(SCREEN_LAYER_BACK, 1, SCREEN_WIDTH, SCREEN_HEIGHT); + set_screen_overlay_params_back(OVERLAY_BLUR, 0.0f); return ApiStatus_DONE2; } } @@ -207,7 +207,7 @@ EvtScript N(EVS_802A3238) = { EVT_END_THREAD EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_RETURN EVT_END }; diff --git a/src/battle/move/hammer/mega_smash.c b/src/battle/move/hammer/mega_smash.c index 24789e5cae..f86f0170e1 100644 --- a/src/battle/move/hammer/mega_smash.c +++ b/src/battle/move/hammer/mega_smash.c @@ -62,7 +62,7 @@ EvtScript N(UseMove_Impl) = { EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) EVT_END_SWITCH EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_EXEC_WAIT(N(EVS_802A3188)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c index 18169d388d..8e9ae2e2c0 100644 --- a/src/battle/move/hammer/power_quake.c +++ b/src/battle/move/hammer/power_quake.c @@ -156,7 +156,7 @@ EvtScript N(EVS_802A3168) = { EVT_END_THREAD EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_RETURN EVT_END }; diff --git a/src/battle/move/hammer/power_smash.c b/src/battle/move/hammer/power_smash.c index ac4a2c66fa..59efed6cd3 100644 --- a/src/battle/move/hammer/power_smash.c +++ b/src/battle/move/hammer/power_smash.c @@ -56,7 +56,7 @@ EvtScript N(UseMove_Impl) = { EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) EVT_END_SWITCH EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_EXEC_WAIT(N(EVS_802A3188)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c index 57f9e1cf26..bbb49e1fe8 100644 --- a/src/battle/move/hammer/quake_hammer.c +++ b/src/battle/move/hammer/quake_hammer.c @@ -141,7 +141,7 @@ EvtScript N(EVS_802A3168) = { EVT_END_THREAD EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_RETURN EVT_END }; diff --git a/src/battle/move/hammer/shell_crack.c b/src/battle/move/hammer/shell_crack.c index dfd9d6a358..b70b6c122c 100644 --- a/src/battle/move/hammer/shell_crack.c +++ b/src/battle/move/hammer/shell_crack.c @@ -79,7 +79,7 @@ EvtScript N(UseMove_Impl) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(func_802A10A4_77F2E4) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/hammer/shrink_smash.c b/src/battle/move/hammer/shrink_smash.c index 9668e85761..ce6605508d 100644 --- a/src/battle/move/hammer/shrink_smash.c +++ b/src/battle/move/hammer/shrink_smash.c @@ -82,7 +82,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_END_THREAD EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c index 10d90f7107..a6b3ee8321 100644 --- a/src/battle/move/hammer/spin_smash.c +++ b/src/battle/move/hammer/spin_smash.c @@ -35,7 +35,7 @@ extern EvtScript N(EVS_UseMove3_Impl); EvtScript N(EVS_UseMove) = { EVT_CALL(ShowActionHud, TRUE) - EVT_CALL(func_80269EAC, 2) + EVT_CALL(SetDamageSource, DMG_SRC_SPIN_SMASH) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -91,7 +91,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Raise) EVT_WAIT(8) @@ -213,7 +213,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Raise) EVT_WAIT(8) @@ -333,7 +333,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_WAIT(0) EVT_END_SWITCH EVT_CALL(InitTargetIterator) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Raise) EVT_WAIT(8) diff --git a/src/battle/move/hammer/super_smash.c b/src/battle/move/hammer/super_smash.c index 86cda7c9cd..04cf3a2a1b 100644 --- a/src/battle/move/hammer/super_smash.c +++ b/src/battle/move/hammer/super_smash.c @@ -58,7 +58,7 @@ EvtScript N(UseMove_Impl) = { EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) EVT_END_SWITCH EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_HAMMER_STRIKE) EVT_WAIT(1) EVT_EXEC_WAIT(N(EVS_802A3188)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, 16) diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c index 9adc2f5d76..f95c778d3f 100644 --- a/src/battle/move/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -49,7 +49,7 @@ EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayLi EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_COCONUT) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index fd53dc47ac..de9f4c3597 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -9,7 +9,7 @@ static s32 D_802A1CD0; #include "battle/common/move/ItemRefund.inc.c" void func_802A123C_727B4C(void) { - func_80138D88(0, 0, 320, 240, 160.0f); + draw_prev_frame_buffer_at_screen_pos(0, 0, 320, 240, 160.0f); } API_CALLABLE(N(func_802A1270_727B80)) { @@ -51,18 +51,18 @@ API_CALLABLE(N(func_802A1270_727B80)) { EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_DIZZY_DIAL) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_THREAD EVT_WAIT(5) EVT_CALL(AddBattleCamZoom, -250) EVT_CALL(MoveBattleCamOver, 80) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_WAIT(80) EVT_CALL(AddBattleCamZoom, 250) EVT_CALL(MoveBattleCamOver, 3) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_END_THREAD EVT_CALL(N(func_802A1270_727B80)) EVT_THREAD @@ -74,9 +74,9 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(func_8024ECF8, 0, 0, 0) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, FALSE) EVT_END_THREAD EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c index bcdb6932b8..f321ad888b 100644 --- a/src/battle/move/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -48,7 +48,7 @@ EntityModelScript N(EMS_DustyHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(DustyHamme EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_DUSTY_HAMMER) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index 3b17821a63..c6c6bb5b27 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -150,7 +150,7 @@ EntityModelScript unusedModelScript = STANDARD_ENTITY_MODEL_SCRIPT( EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_EGG_MISSILE) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/electro_pop.c b/src/battle/move/item/electro_pop.c index 57bb532296..d933af3212 100644 --- a/src/battle/move/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -123,7 +123,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_PLAYER_CHARGED, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index dd0dc6c9c9..96213dfda4 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -49,7 +49,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(35) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) @@ -77,7 +77,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(80) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/move/item/food.c b/src/battle/move/item/food.c index fe1cc7cdb3..226b50b205 100644 --- a/src/battle/move/item/food.c +++ b/src/battle/move/item/food.c @@ -5,7 +5,7 @@ #define NAMESPACE battle_item_food -extern EntityModelScript D_80283EE8; +extern EntityModelScript EMS_StarIcon; #include "battle/common/move/ItemRefund.inc.c" @@ -100,7 +100,7 @@ API_CALLABLE(N(func_802A15A0_733670)) { #include "battle/common/move/UseItem.inc.c" -EvtScript N(EVS_FeedPartner) = { +EvtScript N(EVS_UseOnPartner) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -121,7 +121,7 @@ EvtScript N(EVS_FeedPartner) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 30) @@ -186,7 +186,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_IF_EQ(LVar0, ACTOR_PARTNER) - EVT_EXEC_WAIT(N(EVS_FeedPartner)) + EVT_EXEC_WAIT(N(EVS_UseOnPartner)) EVT_RETURN EVT_END_IF EVT_SET(LVar1, LVarE) diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index af73b06722..c1e8679ae4 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -33,7 +33,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(FadeBackgroundToBlack)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) @@ -58,7 +58,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 2) EVT_WAIT(2) EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -67,7 +67,7 @@ EvtScript N(EVS_UseItem) = { EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF - EVT_CALL(func_80269EAC, 21) + EVT_CALL(SetDamageSource, DMG_SRC_FRIGHT_JAR) EVT_CALL(ItemSpookEnemy, LVar0, 1879052288, 0, 100, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index c0f20e72a2..f14c8dd375 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -112,7 +112,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_LOOP EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index a8c48f82b7..3f5355d87e 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -94,7 +94,7 @@ EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayLi EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_INSECTICIDE_HERB) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/life_shroom.c b/src/battle/move/item/life_shroom.c index 8e1736fed0..6156ef4660 100644 --- a/src/battle/move/item/life_shroom.c +++ b/src/battle/move/item/life_shroom.c @@ -5,7 +5,7 @@ #define NAMESPACE battle_item_life_shroom -extern EntityModelScript D_80283EE8; +extern EntityModelScript EMS_StarIcon; #include "battle/common/move/ItemRefund.inc.c" @@ -90,7 +90,7 @@ API_CALLABLE(N(func_802A1484_72E9B4)) { #include "battle/common/move/UseItem.inc.c" -EvtScript N(script6) = { +EvtScript N(EVS_UseOnPartner) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -111,7 +111,7 @@ EvtScript N(script6) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 30) @@ -175,8 +175,8 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(func_802A1484_72E9B4), LVarA) EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_IF_EQ(LVar0, 256) - EVT_EXEC_WAIT(N(script6)) + EVT_IF_EQ(LVar0, ACTOR_PARTNER) + EVT_EXEC_WAIT(N(EVS_UseOnPartner)) EVT_RETURN EVT_END_IF EVT_SET_CONST(LVarA, ITEM_LIFE_SHROOM) diff --git a/src/battle/move/item/mushroom.c b/src/battle/move/item/mushroom.c index 224d2866e5..4aa5c02d8b 100644 --- a/src/battle/move/item/mushroom.c +++ b/src/battle/move/item/mushroom.c @@ -5,7 +5,7 @@ #define NAMESPACE battle_item_mushroom -extern EntityModelScript D_80283EE8; +extern EntityModelScript EMS_StarIcon; #include "battle/common/move/ItemRefund.inc.c" @@ -89,7 +89,7 @@ API_CALLABLE(N(func_802A15A0_715DF0)) { #include "battle/common/move/UseItem.inc.c" -EvtScript N(script6) = { +EvtScript N(EVS_UseOnPartner) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -110,7 +110,7 @@ EvtScript N(script6) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 30) @@ -175,7 +175,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_IF_EQ(LVar0, ACTOR_PARTNER) - EVT_EXEC_WAIT(N(script6)) + EVT_EXEC_WAIT(N(EVS_UseOnPartner)) EVT_RETURN EVT_END_IF EVT_SET(LVar1, LVarE) diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index f4406ee21d..29f7b76dc7 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -127,7 +127,7 @@ s32 N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { u8 type; f32 zoom; - get_screen_overlay_params(1, &type, &zoom); + get_screen_overlay_params(SCREEN_LAYER_BACK, &type, &zoom); if (zoom >= 215.0f) { D_802A25FC = N(D_802A229C_72D84C); } @@ -245,7 +245,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(func_802A13E4_72C994)) EVT_WAIT(2) EVT_IF_NE(LVar0, 133) - EVT_JUMP(EVT_PTR(UseMystery)) + EVT_JUMP(EVT_PTR(EVS_UseMystery)) EVT_RETURN EVT_END_IF EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(modelCommandList))) diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index 4b876d83bf..fdec779939 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -48,7 +48,7 @@ EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayLi EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_PEBBLE) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 62b8e6b4ff..a5410f4546 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseItem) = { EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 55, 20, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD EVT_WAIT(15) @@ -100,7 +100,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -111,7 +111,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_CALL(GetItemPower, ITEM_POW_BLOCK, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(func_80269EAC, 22) + EVT_CALL(SetDamageSource, DMG_SRC_POW_BLOCK) EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_POW | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index 8f787d4830..a762c62f84 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -34,7 +34,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetItemPower, ITEM_REPEL_GEL, LVar0, LVar1) EVT_CALL(N(func_802A123C_72DDAC)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, BTL_MSG_11, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_PLAYER_TRANSPARENT, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index 8ef3171b0b..40a3400719 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -73,7 +73,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(N(func_802A1444_71DBB4)) @@ -110,7 +110,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(90) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -130,7 +130,7 @@ EvtScript N(EVS_UseItem) = { 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, 20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_THREAD diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index 453f8e3de3..7a05be5f94 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -340,7 +340,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(func_802A1740_71ED90)) EVT_CALL(N(func_802A1848_71EE98)) EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(8) EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Flail, ANIM_Mario1_Flail, ANIM_Mario1_Fall) @@ -411,7 +411,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(DeleteVirtualEntity, LVarA) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index 5e0a67ae7c..b233c8d684 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -56,7 +56,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(50) EVT_PLAY_EFFECT(EFFECT_SNOWMAN_DOLL, 0, 0, 0, 20, EVT_FLOAT(1.0), 160, 0) diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index 6fab2cd137..d2e0bb7b6a 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -31,14 +31,14 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(N(FadeBackgroundToBlack)) EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) EVT_WAIT(200) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index ef4dcc264a..08ead371e9 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -328,7 +328,7 @@ EvtScript N(script7) = { EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_CALL(N(func_802A1AD8_731DD8)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_PLAYER_CHARGED, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END @@ -341,7 +341,7 @@ EvtScript N(script8) = { EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_CALL(N(func_802A1B14_731E14)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, BTL_MSG_11, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_PLAYER_TRANSPARENT, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END @@ -351,10 +351,10 @@ EvtScript N(script9) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Sleep) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_EXEC(DoSleepHit) + EVT_EXEC(EVS_PlaySleepHitFX) EVT_CALL(N(func_802A1B68_731E68)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, BTL_MSG_0B, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_PLAYER_ASLEEP, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END diff --git a/src/battle/move/item/super_soda.c b/src/battle/move/item/super_soda.c index e3d93d4f67..2cbe03cdd0 100644 --- a/src/battle/move/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -5,7 +5,7 @@ #define NAMESPACE battle_item_super_soda -extern EntityModelScript D_80283EE8; +extern EntityModelScript EMS_StarIcon; #include "battle/common/move/ItemRefund.inc.c" @@ -93,7 +93,7 @@ API_CALLABLE(N(ShowFlowerRecoveryFX)) { #include "battle/common/move/UseItem.inc.c" -EvtScript N(script6) = { +EvtScript N(EVS_UseOnPartner) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -114,7 +114,7 @@ EvtScript N(script6) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 30) @@ -176,7 +176,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_IF_EQ(LVar0, 0) + EVT_IF_EQ(LVar0, ACTOR_PLAYER) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Drink) EVT_WAIT(45) @@ -203,7 +203,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET(LVarB, 0) EVT_SET(LVarC, 0) EVT_SET(LVarF, 0) - EVT_EXEC_WAIT(N(script6)) + EVT_EXEC_WAIT(N(EVS_UseOnPartner)) EVT_END_IF EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index fd99b4b39d..d7c10cf9e6 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -60,7 +60,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(battle_item_thunder_bolt_UseItemWithEffect) EVT_THREAD EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(battle_item_thunder_bolt_FadeBackgroundToBlack) @@ -80,7 +80,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index fb0eb0d6b6..ab1b906eca 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -59,7 +59,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CHILD_THREAD EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_CHILD_THREAD EVT_CALL(N(FadeBackgroundToBlack)) @@ -85,7 +85,7 @@ EvtScript N(EVS_UseItem) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) diff --git a/src/battle/move/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c index 90e18a8d5c..24576893c5 100644 --- a/src/battle/move/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -33,7 +33,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_71AA2C)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_PLAYER_CHARGED, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index f76a0cc565..bb6a64c07f 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -28,7 +28,7 @@ extern EvtScript N(EVS_UseMove_ImplC); EvtScript N(EVS_UseMove) = { EVT_CALL(ShowActionHud, TRUE) - EVT_CALL(func_80269EAC, 4) + EVT_CALL(SetDamageSource, DMG_SRC_D_DOWN_JUMP) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index 1f0147225a..d31c79edd6 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -54,7 +54,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) @@ -272,7 +272,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) @@ -498,7 +498,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c index 16b10794e3..3722b73260 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -48,7 +48,7 @@ EvtScript N(EVS_UseMove1) = { }; EvtScript N(EVS_UseMove0) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -62,7 +62,7 @@ EvtScript N(EVS_UseMove0) = { EVT_WAIT(3) EVT_CALL(N(func_802A120C_74D77C), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsJumpMaxCharged)) EVT_IF_EQ(LVar0, FALSE) @@ -84,9 +84,9 @@ EvtScript N(EVS_UseMove0) = { EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(ShowVariableMessageBox, BTL_MSG_06, 60, 1) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_CHARGE_JUMP, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index bf56377da3..d009888ea8 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -57,7 +57,7 @@ EvtScript N(EVS_UseMove1) = { }; EvtScript N(EVS_UseMove0) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -71,7 +71,7 @@ EvtScript N(EVS_UseMove0) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsJumpMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -96,7 +96,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A133C_75CCBC)) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index 03a703c4fd..e7a325e3aa 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -57,7 +57,7 @@ EvtScript N(EVS_UseMove1) = { }; EvtScript N(EVS_UseMove0) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) @@ -71,7 +71,7 @@ EvtScript N(EVS_UseMove0) = { EVT_WAIT(3) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(N(IsJumpMaxCharged)) EVT_IF_EQ(LVar0, 0) @@ -95,7 +95,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A133C_761C5C)) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index 0f5c28bdc3..d13ef6cea4 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -250,7 +250,7 @@ EvtScript N(802A2020) = { EvtScript N(802A222C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -282,7 +282,7 @@ EvtScript N(802A222C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -348,7 +348,7 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A2020)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMuskular_Shout) EVT_WAIT(16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(PlaySound, SOUND_244) EVT_CALL(InitTargetIterator) EVT_LABEL(10) @@ -416,7 +416,7 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(5) EVT_CALL(func_802A1528_7905F8) EVT_IF_EQ(LVar0, 1) - EVT_CALL(ShowMessageBox, BTL_MSG_2C, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CHILL_OUT_BEGIN, 60) EVT_END_IF EVT_CALL(func_80276EFC) EVT_EXEC_WAIT(N(802A222C)) diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index eef795e4f1..a2c0d4d70d 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -195,7 +195,7 @@ EvtScript N(802A1D60) = { EvtScript N(802A1F6C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -227,7 +227,7 @@ EvtScript N(802A1F6C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -295,14 +295,14 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(func_802A1518_78A378) EVT_WAIT(30) EVT_CALL(N(UnkBackgroundFunc)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ShowMessageBox, BTL_MSG_1A, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_RECHARGED, 60) EVT_CASE_EQ(1) - EVT_CALL(ShowMessageBox, BTL_MSG_1B, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_MAXED, 60) EVT_CASE_EQ(2) - EVT_CALL(ShowMessageBox, BTL_MSG_1C, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_FILLED, 60) EVT_END_SWITCH EVT_CALL(WaitForMessageBoxDone) EVT_CALL(func_80276EFC) @@ -316,14 +316,14 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(func_802A15B0_78A410) EVT_WAIT(30) EVT_CALL(N(UnkBackgroundFunc)) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ShowMessageBox, BTL_MSG_1A, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_RECHARGED, 60) EVT_CASE_EQ(1) - EVT_CALL(ShowMessageBox, BTL_MSG_1B, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_MAXED, 60) EVT_CASE_EQ(2) - EVT_CALL(ShowMessageBox, BTL_MSG_1C, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_FILLED, 60) EVT_END_SWITCH EVT_CALL(WaitForMessageBoxDone) EVT_CALL(PartnerYieldTurn) diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index f1f53f8b10..ae26658bac 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -181,7 +181,7 @@ EvtScript N(802A1D50) = { EvtScript N(802A1F5C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -213,7 +213,7 @@ EvtScript N(802A1F5C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -278,7 +278,7 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1D50)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMamar_Shout) EVT_WAIT(16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_WAIT(15) EVT_CALL(PlaySound, SOUND_3F4) EVT_CALL(func_802A1518_78D668) diff --git a/src/battle/move/star_power/peach_beam.c b/src/battle/move/star_power/peach_beam.c index aa97497c20..a4e24180ec 100644 --- a/src/battle/move/star_power/peach_beam.c +++ b/src/battle/move/star_power/peach_beam.c @@ -38,7 +38,7 @@ EvtScript N(EVS_UsePower) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(N(unkStarBeamBgFunc)) EVT_CALL(func_80276EFC) EVT_EXEC_WAIT(N(afterUsePower)) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index 338fad8ddb..e9fad0c52a 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -160,7 +160,7 @@ EvtScript N(802A1C60) = { EvtScript N(802A1E6C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -192,7 +192,7 @@ EvtScript N(802A1E6C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -302,7 +302,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(GetActorVar, ACTOR_PARTNER, 1, LVar0) EVT_CALL(func_802A1518_79C4B8) EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorYaw, ACTOR_SELF, 150) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_SELF, 120) diff --git a/src/battle/move/star_power/refresh.c b/src/battle/move/star_power/refresh.c index 29dafa2d0f..68eb019b34 100644 --- a/src/battle/move/star_power/refresh.c +++ b/src/battle/move/star_power/refresh.c @@ -268,7 +268,7 @@ EvtScript N(802A21A0) = { EvtScript N(802A23AC) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -300,7 +300,7 @@ EvtScript N(802A23AC) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -367,7 +367,7 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(16) EVT_THREAD EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD EVT_CALL(PlaySound, SOUND_242) EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index c2f8141c6c..51c69a9b96 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -167,7 +167,7 @@ EvtScript N(802A1D60) = { EvtScript N(802A1F6C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -199,7 +199,7 @@ EvtScript N(802A1F6C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -378,7 +378,7 @@ EvtScript N(EVS_UsePower) = { EVT_LOOP(10) EVT_WAIT(3) EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) diff --git a/src/battle/move/star_power/star_beam.c b/src/battle/move/star_power/star_beam.c index 317b194679..3cf4793278 100644 --- a/src/battle/move/star_power/star_beam.c +++ b/src/battle/move/star_power/star_beam.c @@ -39,7 +39,7 @@ EvtScript N(EVS_UsePower) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(N(unkStarBeamBgFunc)) EVT_CALL(func_80276EFC) EVT_EXEC_WAIT(N(afterUsePower)) diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index 40926db11d..d6deebc700 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -181,7 +181,7 @@ EvtScript N(802A1E20) = { EvtScript N(802A202C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -213,7 +213,7 @@ EvtScript N(802A202C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -278,7 +278,7 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1E20)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleSkolar_Shout) EVT_WAIT(16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(10) diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index 9ebb1102c8..5ddfba70bb 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -153,7 +153,7 @@ EvtScript N(802A1C50) = { EvtScript N(802A1E5C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -185,7 +185,7 @@ EvtScript N(802A1E5C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -250,7 +250,7 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1C50)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKlevar_Shout) EVT_WAIT(16) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(PlaySound, SOUND_246) EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) diff --git a/src/battle/move/star_power/twink_dash.c b/src/battle/move/star_power/twink_dash.c index 3c33e950c3..5df528bc4b 100644 --- a/src/battle/move/star_power/twink_dash.c +++ b/src/battle/move/star_power/twink_dash.c @@ -172,7 +172,7 @@ EvtScript N(802A1CE0) = { EvtScript N(802A1EEC) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -204,7 +204,7 @@ EvtScript N(802A1EEC) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index a4f06ad1ac..50a7bf8844 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -5,7 +5,7 @@ #include "entity.h" #include "model.h" -extern EntityModelScript D_80283EE8; +extern EntityModelScript EMS_StarIcon; #define NAMESPACE battle_move_up_and_away @@ -217,7 +217,7 @@ EvtScript N(802A1E00) = { EvtScript N(802A200C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) @@ -249,7 +249,7 @@ EvtScript N(802A200C) = { EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) @@ -313,7 +313,7 @@ EvtScript N(EVS_UsePower) = { EVT_SET_CONST(LVar0, ANIM_BattleKalmar_Idle) EVT_EXEC_WAIT(N(802A1E00)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKalmar_Shout) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(20) EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10) EVT_CALL(func_802A1518_7957F8) @@ -344,7 +344,7 @@ EvtScript N(EVS_UsePower) = { EVT_THREAD EVT_CALL(GetOwnerTarget, LVarB, LVar1) EVT_WAIT(10) - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_SET(LVarD, LVar0) EVT_SET(LVarE, LVar1) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index ce30c985c2..7356980c43 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -362,7 +362,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) @@ -439,7 +439,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBombette_BurnHurt) EVT_SET_CONST(LVar2, ANIM_BattleBombette_BurnStill) EVT_EXEC_WAIT(DoPartnerBurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_SET(LVarA, 0) EVT_CALL(N(PlayExplosionFX), LVar0, LVar1, LVar2) @@ -514,7 +514,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(D_802977BC) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Fall) EVT_WAIT(8) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_SET(LVarA, 0) EVT_CALL(N(PlayExplosionFX), LVar0, LVar1, LVar2) @@ -578,7 +578,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Block) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -687,7 +687,7 @@ EvtScript N(nextTurn) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Backfire2) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1111,7 +1111,7 @@ EvtScript N(bomb) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 8) EVT_CALL(GetActionSuccessCopy, LVar0) EVT_CALL(N(GetBombDamage), LVar0) @@ -1290,7 +1290,7 @@ EvtScript N(bomb) = { EVT_END_IF EVT_END_SWITCH EVT_IF_GT(LF_MashEnded, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(MoveBattleCamOver, 10) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) @@ -1361,7 +1361,7 @@ EvtScript N(firstStrikeBodySlam) = { EVT_SET(LVarA, 0) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(N(PlayExplosionFX), LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 8) EVT_THREAD EVT_CALL(StartRumble, 4) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 0571d79153..1e74f2935a 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -255,7 +255,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) @@ -294,7 +294,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBow_Block) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -394,7 +394,7 @@ EvtScript N(executeAction) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) EVT_THREAD EVT_SET(LVar0, 200) @@ -558,11 +558,11 @@ EvtScript N(smack) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapOnce) EVT_SET(LocalFlag(0), 1) - EVT_CALL(func_80269EAC, 10) + EVT_CALL(SetDamageSource, DMG_SRC_NEXT_SLAP_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapBack) EVT_SET(LocalFlag(0), 0) - EVT_CALL(func_80269EAC, 11) + EVT_CALL(SetDamageSource, DMG_SRC_NEXT_SLAP_RIGHT) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -614,11 +614,11 @@ EvtScript N(smack) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapOnce) EVT_SET(LocalFlag(0), 1) - EVT_CALL(func_80269EAC, 12) + EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapBack) EVT_SET(LocalFlag(0), 0) - EVT_CALL(func_80269EAC, 13) + EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_RIGHT) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -706,7 +706,7 @@ EvtScript N(outtaSight) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(ApplyOuttaSight)) EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) @@ -715,7 +715,7 @@ EvtScript N(outtaSight) = { }; EvtScript N(hidePlayer) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOW_APPEAR) EVT_THREAD @@ -736,7 +736,7 @@ EvtScript N(hidePlayer) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) @@ -801,56 +801,56 @@ EvtScript N(spook) = { EVT_IF_EQ(LVar2, 7) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 8) EVT_END_IF EVT_CASE_GT(70) EVT_IF_EQ(LVar2, 6) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 7) EVT_END_IF EVT_CASE_GT(60) EVT_IF_EQ(LVar2, 5) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 6) EVT_END_IF EVT_CASE_GT(50) EVT_IF_EQ(LVar2, 4) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 5) EVT_END_IF EVT_CASE_GT(40) EVT_IF_EQ(LVar2, 3) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 4) EVT_END_IF EVT_CASE_GT(30) EVT_IF_EQ(LVar2, 2) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 3) EVT_END_IF EVT_CASE_GT(20) EVT_IF_EQ(LVar2, 1) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 2) EVT_END_IF EVT_CASE_GT(10) EVT_IF_EQ(LVar2, 0) EVT_CALL(AddBattleCamZoom, -20) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_SET(LVar2, 1) EVT_END_IF EVT_END_SWITCH @@ -861,10 +861,10 @@ EvtScript N(spook) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SpookLoop) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_WAIT(5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01) EVT_LOOP(5) EVT_CALL(SetBattleCamParam, 3, 110) EVT_WAIT(2) @@ -928,7 +928,7 @@ EvtScript N(spook) = { EVT_IF_EQ(LVar0, 6) EVT_GOTO(10) EVT_END_IF - EVT_CALL(func_80269EAC, 18) + EVT_CALL(SetDamageSource, DMG_SRC_SPOOK) EVT_SWITCH(LVarF) EVT_CASE_GT(99) EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) @@ -945,7 +945,7 @@ EvtScript N(spook) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1075,11 +1075,11 @@ EvtScript N(fanSmack) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackOnce) EVT_SET(LocalFlag(0), 1) - EVT_CALL(func_80269EAC, 14) + EVT_CALL(SetDamageSource, DMG_SRC_NEXT_FAN_SMACK_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackBack) EVT_SET(LocalFlag(0), 0) - EVT_CALL(func_80269EAC, 15) + EVT_CALL(SetDamageSource, DMG_SRC_NEXT_FAN_SMACK_RIGHT) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -1154,11 +1154,11 @@ EvtScript N(fanSmack) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackOnce) EVT_SET(LocalFlag(0), 1) - EVT_CALL(func_80269EAC, 16) + EVT_CALL(SetDamageSource, DMG_SRC_LAST_FAN_SMACK_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackBack) EVT_SET(LocalFlag(0), 0) - EVT_CALL(func_80269EAC, 17) + EVT_CALL(SetDamageSource, DMG_SRC_LAST_FAN_SMACK_RIGHT) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 34208bef54..ff710869f6 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -469,9 +469,9 @@ API_CALLABLE(N(PlayChargeFX)) { API_CALLABLE(N(GetChargeMessage)) { if (N(isCharged) == 0) { - script->varTable[0] = 36; + script->varTable[0] = BTL_MSG_CHARGE_GOOMBARIO; } else { - script->varTable[0] = 37; + script->varTable[0] = BTL_MSG_CHARGE_GOOMBARIO_MORE; } return ApiStatus_DONE2; @@ -587,7 +587,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) @@ -627,7 +627,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_Block) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -819,7 +819,7 @@ EvtScript N(returnHome) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1460,7 +1460,7 @@ EvtScript N(tattle) = { 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(PartnerYieldTurn) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) @@ -1495,7 +1495,7 @@ EvtScript N(charge) = { EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(N(CanChargeMore)) EVT_IF_EQ(LVar0, 0) @@ -1515,15 +1515,15 @@ EvtScript N(charge) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_TATTLE) - EVT_CALL(ShowMessageBox, BTL_MSG_24, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CHARGE_GOOMBARIO, 60) EVT_CASE_EQ(MOVE_CHARGE) EVT_CALL(N(GetChargeMessage)) EVT_CALL(ShowMessageBox, LVar0, 60) EVT_CASE_EQ(MOVE_MULTIBONK) - EVT_CALL(ShowMessageBox, BTL_MSG_24, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CHARGE_GOOMBARIO, 60) EVT_END_SWITCH EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CANT_CHARGE, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/partner/goompa.c b/src/battle/partner/goompa.c index 2806129c6b..7e2e462ae6 100644 --- a/src/battle/partner/goompa.c +++ b/src/battle/partner/goompa.c @@ -97,7 +97,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goompa_Injured) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -121,7 +121,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 0) EVT_SET_CONST(LVar1, ANIM_Goompa_Injured) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CASE_EQ(EVENT_33) EVT_CASE_EQ(EVENT_RECOVER_FROM_KO) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index a5e67bedfa..7449f2a9ce 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -288,7 +288,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) @@ -328,7 +328,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleKooper_LowerShell) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ExitShell) EVT_END_CASE_GROUP @@ -406,28 +406,28 @@ EvtScript N(executeAction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SHELL_TOSS1) - EVT_CALL(func_80269EAC, 6) + EVT_CALL(SetDamageSource, DMG_SRC_SHELL_TOSS) EVT_SET(LVarF, 2) EVT_SET(LVarE, 1) EVT_EXEC_WAIT(N(shellToss)) EVT_CASE_EQ(MOVE_SHELL_TOSS2) - EVT_CALL(func_80269EAC, 6) + EVT_CALL(SetDamageSource, DMG_SRC_SHELL_TOSS) EVT_SET(LVarF, 3) EVT_SET(LVarE, 2) EVT_EXEC_WAIT(N(shellToss)) EVT_CASE_EQ(MOVE_SHELL_TOSS3) - EVT_CALL(func_80269EAC, 6) + EVT_CALL(SetDamageSource, DMG_SRC_SHELL_TOSS) EVT_SET(LVarF, 5) EVT_SET(LVarE, 3) EVT_EXEC_WAIT(N(shellToss)) EVT_CASE_EQ(MOVE_POWER_SHELL) - EVT_CALL(func_80269EAC, 7) + EVT_CALL(SetDamageSource, DMG_SRC_POWER_SHELL) EVT_EXEC_WAIT(N(powerShell)) EVT_CASE_EQ(MOVE_DIZZY_SHELL) - EVT_CALL(func_80269EAC, 8) + EVT_CALL(SetDamageSource, DMG_SRC_DIZZY_SHELL) EVT_EXEC_WAIT(N(dizzyShell)) EVT_CASE_EQ(MOVE_FIRE_SHELL) - EVT_CALL(func_80269EAC, 9) + EVT_CALL(SetDamageSource, DMG_SRC_FIRE_SHELL) EVT_EXEC_WAIT(N(fireShell)) EVT_END_SWITCH EVT_RETURN @@ -438,13 +438,13 @@ EvtScript N(firstStrike) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SHELL_TOSS1) - EVT_CALL(func_80269EAC, 6) + EVT_CALL(SetDamageSource, DMG_SRC_SHELL_TOSS) EVT_EXEC_WAIT(N(shellTossOnFirstStrike)) EVT_CASE_EQ(MOVE_SHELL_TOSS2) - EVT_CALL(func_80269EAC, 6) + EVT_CALL(SetDamageSource, DMG_SRC_SHELL_TOSS) EVT_EXEC_WAIT(N(shellTossOnFirstStrike)) EVT_CASE_EQ(MOVE_SHELL_TOSS3) - EVT_CALL(func_80269EAC, 6) + EVT_CALL(SetDamageSource, DMG_SRC_SHELL_TOSS) EVT_EXEC_WAIT(N(shellTossOnFirstStrike)) EVT_END_SWITCH EVT_RETURN @@ -454,9 +454,9 @@ EvtScript N(firstStrike) = { EvtScript N(returnHomeOnMiss) = { EVT_CALL(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) EVT_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD EVT_CALL(PartnerYieldTurn) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -619,7 +619,7 @@ EvtScript N(shellToss) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200A) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_EXEC_WAIT(N(getShellTossMoveTime)) EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) @@ -790,7 +790,7 @@ EvtScript N(powerShell) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200B) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_SET(LVarB, 260) EVT_DIVF(LVarB, LVarA) @@ -822,7 +822,7 @@ EvtScript N(powerShell) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -845,7 +845,7 @@ EvtScript N(powerShell) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -932,7 +932,7 @@ EvtScript N(dizzyShell) = { EVT_END_SWITCH EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_290) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_SET(LVarB, 300) EVT_DIVF(LVarB, LVarA) @@ -977,7 +977,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1014,7 +1014,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1154,18 +1154,18 @@ EvtScript N(fireShell) = { EVT_SWITCH(LVarE) EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 50) EVT_SETF(LVarA, EVT_FLOAT(10.0)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 30) EVT_SETF(LVarA, EVT_FLOAT(10.0)) EVT_END_CASE_GROUP EVT_CASE_EQ(4) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_SETF(LVarA, EVT_FLOAT(16.0)) EVT_END_SWITCH @@ -1223,7 +1223,7 @@ EvtScript N(fireShell) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1247,7 +1247,7 @@ EvtScript N(fireShell) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1277,7 +1277,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_ADD(LVar0, 60) EVT_CALL(SetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(InitTargetIterator) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -1342,7 +1342,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CASE_EQ(MOVE_SHELL_TOSS3) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) EVT_SET(LVar1, 0) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 6662245bfd..dda947714b 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -209,7 +209,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt) @@ -248,7 +248,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Block) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -344,7 +344,7 @@ EvtScript N(executeAction) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) @@ -921,7 +921,7 @@ EvtScript N(spinyFlip) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1066,7 +1066,7 @@ EvtScript N(spinySurge) = { EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH @@ -1141,7 +1141,7 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(action_command_water_block_start, 0, 97, 3) EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, 100) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_WAIT(100) EVT_WAIT(3) EVT_CALL(AddBattleCamZoom, 50) @@ -1201,11 +1201,11 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(SetActorYaw, ACTOR_PARTNER, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) EVT_IF_GT(LVarA, 0) - EVT_CALL(ShowMessageBox, BTL_MSG_28, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CLOUD_NINE_BEGIN, 60) EVT_CALL(WaitForMessageBoxDone) EVT_END_IF EVT_CALL(SetBattleFlagBits, BS_FLAGS1_8, TRUE) @@ -1256,7 +1256,7 @@ EvtScript N(cloudNine_immobile) = { EVT_CALL(action_command_water_block_start, 0, 97, 3) EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, 100) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_WAIT(100) EVT_WAIT(3) EVT_CALL(AddBattleCamZoom, 50) @@ -1308,11 +1308,11 @@ EvtScript N(cloudNine_immobile) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) EVT_IF_GT(LVarA, 0) - EVT_CALL(ShowMessageBox, BTL_MSG_28, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_CLOUD_NINE_BEGIN, 60) EVT_CALL(WaitForMessageBoxDone) EVT_END_IF EVT_RETURN @@ -1694,7 +1694,7 @@ EvtScript N(hurricane) = { EVT_CALL(action_command_hurricane_init) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) EVT_CALL(SetActionHudPrepareTime, 15) - EVT_CALL(func_80269EAC, 20) + EVT_CALL(SetDamageSource, DMG_SRC_HURRICANE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -45, 54, 0) EVT_CALL(SetBattleCamOffsetZ, 0) @@ -1716,7 +1716,7 @@ EvtScript N(hurricane) = { EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(SetBattleCamZoom, 430) EVT_CALL(MoveBattleCamOver, 150 * DT) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_288) EVT_THREAD EVT_CALL(N(ProcessHurricane)) @@ -1737,7 +1737,7 @@ EvtScript N(hurricane) = { EVT_CALL(GetActionSuccessCopy, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index b2499fbaff..ee92c6b564 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -724,7 +724,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_HurtStill) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar0, 1) @@ -766,7 +766,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_OrientShell) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ExitShell) EVT_END_CASE_GROUP @@ -876,7 +876,7 @@ EvtScript N(nextTurn) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LVarA) EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.4)) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -50, 0, 0) @@ -1172,7 +1172,7 @@ EvtScript N(airLift) = { EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(DispatchEvent, LVar0, EVENT_BLOW_AWAY) EVT_CALL(N(CarryAway), LVar0) @@ -1228,7 +1228,7 @@ EvtScript N(airRaid) = { EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_COS_IN_OUT) EVT_WAIT(2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CHILD_THREAD @@ -1248,7 +1248,7 @@ EvtScript N(airRaid) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) EVT_CALL(N(FlyAround)) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetActionResult, LVar0) EVT_CALL(N(GetAirRaidDamage)) @@ -1277,7 +1277,7 @@ EvtScript N(airRaid) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 08ce6baeb3..4ac095f060 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -494,7 +494,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) @@ -533,7 +533,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Block) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -624,7 +624,7 @@ EvtScript N(executeAction) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Fall) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 60) @@ -677,7 +677,7 @@ EvtScript N(returnHome) = { EvtScript N(restoreFromSquirt2) = { EVT_CALL(PartnerYieldTurn) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -921,7 +921,7 @@ EvtScript N(bellyFlop) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 8) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP @@ -979,7 +979,7 @@ EvtScript N(squirt) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_297) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -1110,7 +1110,7 @@ EvtScript N(waterBlock) = { EVT_ADD(LVarF, 6) EVT_PLAY_EFFECT(EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0) EVT_WAIT(4) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(PartnerYieldTurn) EVT_LABEL(10) @@ -1126,7 +1126,7 @@ EvtScript N(waterBlock) = { EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_IF_EQ(LVarA, 0) EVT_ELSE - EVT_CALL(ShowVariableMessageBox, BTL_MSG_26, 60, LVarA) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_WATER_BLOCK_BEGIN, 60, LVarA) EVT_END_IF EVT_CALL(WaitForMessageBoxDone) EVT_RETURN @@ -1183,7 +1183,7 @@ EvtScript N(tidalWave) = { EVT_CALL(N(SetScaleTidalWaveCharge)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_WAIT(10) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) @@ -1191,7 +1191,7 @@ EvtScript N(tidalWave) = { EVT_CALL(SetActorPos, ACTOR_PARTNER, -220, 0, 0) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_WAIT(15) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetActionSuccessCopy, LVar0) EVT_SET(LVarE, LVar0) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index 7e2ca93071..7de2949982 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -149,7 +149,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_Gasp) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Twink_Hurt) - EVT_EXEC_WAIT(DoNormalHit) + EVT_EXEC_WAIT(EVS_DoNormalHit) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Walk) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) @@ -257,13 +257,13 @@ EvtScript N(executeAction) = { EVT_ELSE EVT_CALL(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 150, 100, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 20, EASING_LINEAR) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_WAIT(20) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_LOOP(0) EVT_WAIT(1) EVT_CALL(GetActorVar, ACTOR_ENEMY0, 1, LVar0) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 1ee3828dda..29b95fd718 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -556,7 +556,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_CALL(N(WattFXBounce)) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_CONTACT) @@ -602,7 +602,7 @@ EvtScript N(handleEvent) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleWatt_Block) - EVT_EXEC_WAIT(DoPartnerBlock) + EVT_EXEC_WAIT(EVS_DoPartnerBlock) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_LIFE_SHROOM_PROC) @@ -705,7 +705,7 @@ EvtScript N(executeAction) = { }; EvtScript N(returnHome2) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -896,7 +896,7 @@ EvtScript N(electroDash) = { EVT_CALL(CloseActionCommandInfo) EVT_CALL(N(ElectroDashFXDisable)) EVT_CALL(StopLoopingSoundAtActor, ACTOR_PARTNER, 0) - EVT_CALL(func_80269EAC, 19) + EVT_CALL(SetDamageSource, DMG_SRC_ELECTRO_DASH) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 10) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -1109,7 +1109,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(action_command_water_block_start, 0, 100 * DT, 3) EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, 100 * DT) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) @@ -1142,7 +1142,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208E) EVT_CALL(GetActionCommandResult, LVar0) @@ -1158,7 +1158,7 @@ EvtScript N(8023AE8C) = { EVT_END_IF EVT_IF_EQ(LVar0, 0) EVT_ELSE - EVT_CALL(ShowVariableMessageBox, BTL_MSG_2A, 60, LVarA) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_TURBO_CHARGE_BEGIN, 60, LVarA) EVT_END_IF EVT_CALL(WaitForMessageBoxDone) EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) @@ -1192,7 +1192,7 @@ EvtScript N(8023B450) = { EVT_CALL(action_command_water_block_start, 0, 100 * DT, 3) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(MoveBattleCamOver, 100 * DT) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) @@ -1213,7 +1213,7 @@ EvtScript N(8023B450) = { EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 5) EVT_WAIT(30) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208E) EVT_CALL(GetActionCommandResult, LVar0) @@ -1229,7 +1229,7 @@ EvtScript N(8023B450) = { EVT_END_IF EVT_IF_EQ(LVar0, 0) EVT_ELSE - EVT_CALL(ShowVariableMessageBox, BTL_MSG_2A, 60, LVarA) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_TURBO_CHARGE_BEGIN, 60, LVarA) EVT_END_IF EVT_CALL(WaitForMessageBoxDone) EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) @@ -1287,7 +1287,7 @@ EvtScript N(megaShock) = { EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), 90 * DT, 0) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(MoveBattleCamOver, 90 * DT) - EVT_CALL(func_8024ECF8, 0, 0, 1) + EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 10) EVT_CALL(N(WattFXDisable)) diff --git a/src/battle/use_items.c b/src/battle/use_items.c index 60f1e2f6a2..ddbffe4289 100644 --- a/src/battle/use_items.c +++ b/src/battle/use_items.c @@ -200,7 +200,7 @@ API_CALLABLE(LoadMysteryItemScript) { return ApiStatus_DONE2; } -EvtScript UseMystery = { +EvtScript EVS_UseMystery = { EVT_WAIT(2) EVT_CALL(LoadMysteryItemScript) EVT_EXEC_WAIT(LVar0) diff --git a/src/battle_cam.c b/src/battle_cam.c index a31d0e0616..b4dcbeb026 100644 --- a/src/battle_cam.c +++ b/src/battle_cam.c @@ -76,8 +76,8 @@ EvtScript CamPreset_N = { EVT_END }; -EvtScript CamPreset_C = { - EVT_CALL(CamPresetUpdate_C) +EvtScript EVS_BattleCam_Default = { + EVT_CALL(BattleCamImpl_Default) EVT_RETURN EVT_END }; @@ -186,14 +186,14 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY != -1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_MINUS_1) { middlePosY = y + (targetY - y) / 4; } else { middlePosY = targetY; @@ -225,8 +225,8 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) /2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -260,14 +260,14 @@ s32 CamPresetUpdate_F(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY == -1) { + if (BattleCam_ModeY == BTL_CAM_MODEY_MINUS_1) { middlePosY = targetY; } else { middlePosY = y; @@ -400,14 +400,14 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY != -1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_MINUS_1) { middlePosY = y + (targetY - y) / 4; } else { middlePosY = targetY; @@ -439,8 +439,8 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) /2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -474,14 +474,14 @@ s32 CamPresetUpdate_M(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; } } else { - if (BattleCam_ModeY == -1) { + if (BattleCam_ModeY == BTL_CAM_MODEY_MINUS_1) { middlePosY = targetY; } else { middlePosY = y; @@ -610,8 +610,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -644,8 +644,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -679,8 +679,8 @@ s32 CamPresetUpdate_G(Evt* script, s32 isInitialCall) { targetAverageSize = (targetActor->size.y + targetActor->size.x) / 2; middlePosX = x + (targetX - x) / 2; - if (BattleCam_ModeY >= 0) { - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY > BTL_CAM_MODEY_MINUS_1) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { middlePosY = targetY + (y - targetY) * 0.5f + (y - targetY) / 6.0f; } else { middlePosY = y; @@ -783,7 +783,7 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { case ACTOR_CLASS_PLAYER: actor = battleStatus->playerActor; if (actor == NULL) { - btl_cam_use_preset(BTL_CAM_PRESET_C); + btl_cam_use_preset(BTL_CAM_DEFAULT); return ApiStatus_BLOCK; } x = actor->currentPos.x; @@ -797,7 +797,7 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { case ACTOR_CLASS_PARTNER: actor = battleStatus->partnerActor; if (actor == NULL) { - btl_cam_use_preset(BTL_CAM_PRESET_C); + btl_cam_use_preset(BTL_CAM_DEFAULT); return ApiStatus_BLOCK; } x = actor->currentPos.x; @@ -811,7 +811,7 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { case ACTOR_CLASS_ENEMY: actor = battleStatus->enemyActors[actorID]; if (actor == NULL) { - btl_cam_use_preset(BTL_CAM_PRESET_C); + btl_cam_use_preset(BTL_CAM_DEFAULT); return ApiStatus_BLOCK; } x = actor->currentPos.x; @@ -866,10 +866,10 @@ s32 CamPresetUpdate_I(Evt* script, s32 isInitialCall) { alpha /= BattleCam_MoveTimeTotal; } - if (BattleCam_ModeX) { + if (BattleCam_ModeX != BTL_CAM_MODEX_0) { camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, x + D_8029F2A7, alpha); } - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, y, alpha); } camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, z, alpha); @@ -943,12 +943,12 @@ s32 CamPresetUpdate_H(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - if (BattleCam_ModeY != 0) { + if (BattleCam_ModeY != BTL_CAM_MODEY_0) { f32 delta = currentY - y; y += delta / 2 + delta / 6.0f; } - if (BattleCam_ModeX) { + if (BattleCam_ModeX != BTL_CAM_MODEX_0) { x += (currentX - x) / 2; if (x > 75.0f) { x -= fabsf(75.0f - x); @@ -1051,7 +1051,7 @@ ApiStatus CamPresetUpdate_N(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus CamPresetUpdate_C(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleCamImpl_Default) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; f32 x, y, z; @@ -1446,82 +1446,82 @@ ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -void btl_cam_use_preset_intl(s32 id) { +void btl_cam_use_preset_impl(s32 id) { BattleStatus* battleStatus = &gBattleStatus; EvtScript* preset = NULL; Evt* newScript; if (!BattleCam_IsFrozen) { D_8029F2A6 = TRUE; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_UseLinearInterp = FALSE; D_8029F2A7 = 0; switch (id) { - case BTL_CAM_PRESET_A: + case BTL_CAM_PRESET_00: preset = &CamPreset_A; break; - case BTL_CAM_PRESET_B: + case BTL_CAM_PRESET_01: preset = &CamPreset_B; break; - case BTL_CAM_PRESET_C: + case BTL_CAM_DEFAULT: if (BattleCam_CurrentPresetID != id) { BattleCam_BoomLength = 500; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_C; + preset = &EVS_BattleCam_Default; break; } return; - case BTL_CAM_PRESET_D: + case BTL_CAM_PRESET_03: if (BattleCam_CurrentPresetID != id) { BattleCam_BoomLength = 480; - preset = &CamPreset_D; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 0; + preset = &CamPreset_D; break; } return; - case BTL_CAM_PRESET_E: + case BTL_CAM_PRESET_04: if (BattleCam_CurrentPresetID != id) { BattleCam_BoomLength = 500; - preset = &CamPreset_E; BattleCam_MoveTimeLeft = 10; BattleCam_BoomZOffset = 0; + preset = &CamPreset_E; break; } return; - case BTL_CAM_PRESET_F: + case BTL_CAM_PRESET_05: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; preset = &CamPreset_F; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; break; - case BTL_CAM_PRESET_G: + case BTL_CAM_PRESET_06: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; preset = &CamPreset_G; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; - case BTL_CAM_PRESET_H: + case BTL_CAM_PRESET_07: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; preset = &CamPreset_H; break; - case BTL_CAM_PRESET_I: + case BTL_CAM_PRESET_08: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; preset = &CamPreset_I; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; - case BTL_CAM_PRESET_9: - if (BattleCam_ControlScript != &CamPreset_C) { + case BTL_CAM_PRESET_09: + if (BattleCam_ControlScript != &EVS_BattleCam_Default) { BattleCam_BoomLength = 500; BattleCam_MoveTimeLeft = 120; - preset = &CamPreset_C; + preset = &EVS_BattleCam_Default; break; } return; @@ -1532,8 +1532,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_F; BattleCam_BoomZOffset = 15; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_11: BattleCam_BoomLength = 300; @@ -1542,8 +1542,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_12: BattleCam_BoomLength = 400; @@ -1552,8 +1552,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_F; BattleCam_BoomZOffset = 30; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_13: BattleCam_BoomLength = 200; @@ -1562,8 +1562,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_I; BattleCam_BoomZOffset = 15; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_14: BattleCam_BoomLength = 300; @@ -1572,8 +1572,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_15: BattleCam_BoomLength = 400; @@ -1582,8 +1582,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_I; BattleCam_BoomZOffset = 30; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_16: BattleCam_BoomLength = 267; @@ -1639,26 +1639,26 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 14; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; BattleCam_IsFrozen = TRUE; preset = &CamPreset_I; break; - case BTL_CAM_PRESET_23: + case BTL_CAM_VICTORY: BattleCam_BoomLength = 255; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 29; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; btl_cam_set_target_pos(-95.0f, 18.0f, 10.0f); BattleCam_TargetActor = ACTOR_PLAYER; preset = &CamPreset_J; break; - case BTL_CAM_PRESET_22: + case BTL_CAM_PLAYER_ENTRY: BattleCam_BoomLength = 230; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1667,15 +1667,15 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_TargetActor = ACTOR_PLAYER; preset = &CamPreset_J; break; - case BTL_CAM_PRESET_26: + case BTL_CAM_PLAYER_ATTACK_APPROACH: BattleCam_BoomLength = 310; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; preset = &CamPreset_M; break; @@ -1685,8 +1685,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 5; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; @@ -1697,47 +1697,47 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 5; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_TargetActor = ACTOR_PLAYER; D_8029F2A6 = FALSE; preset = &CamPreset_M; break; - case BTL_CAM_PRESET_30: - case BTL_CAM_PRESET_31: + case BTL_CAM_PLAYER_HIT_SPIKE: + case BTL_CAM_PLAYER_HIT_HAZARD: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 15; BattleCam_BoomZOffset = -32; D_8029F2A7 = 20; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_TargetActor = ACTOR_PLAYER; preset = &CamPreset_I; break; - case BTL_CAM_PRESET_32: + case BTL_CAM_PLAYER_CHARGE_UP: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_MoveTimeLeft = 10; preset = &CamPreset_N; BattleCam_BoomZOffset = 10; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = -65.0f; BattleCam_PosY = 30.0f; break; - case BTL_CAM_PRESET_33: + case BTL_CAM_PLAYER_STATUS_AFFLICTED: BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; preset = &CamPreset_I; BattleCam_BoomZOffset = 24; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; break; @@ -1747,8 +1747,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_TargetActor = ACTOR_PLAYER; D_8029F2A6 = FALSE; preset = &CamPreset_M; @@ -1759,8 +1759,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 60; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_UseLinearInterp = TRUE; preset = &CamPreset_M; D_8029F2A6 = FALSE; @@ -1772,8 +1772,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; @@ -1784,8 +1784,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 60; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_UseLinearInterp = TRUE; preset = &CamPreset_M; D_8029F2A6 = FALSE; @@ -1797,8 +1797,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; @@ -1809,8 +1809,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 30; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; @@ -1822,8 +1822,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_M; BattleCam_BoomZOffset = -4; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; break; @@ -1836,27 +1836,27 @@ void btl_cam_use_preset_intl(s32 id) { D_8029F2A6 = FALSE; preset = BattleCam_ControlScript; break; - case BTL_CAM_PRESET_43: + case BTL_CAM_PLAYER_AIM_HAMMER: BattleCam_BoomLength = 214; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; - BattleCam_ModeY = -2; + BattleCam_ModeY = BTL_CAM_MODEY_MINUS_2; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeX = TRUE; + BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; preset = &CamPreset_M; break; - case BTL_CAM_PRESET_44: + case BTL_CAM_PLAYER_HAMMER_STRIKE: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 8; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = 0; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; preset = &CamPreset_M; break; @@ -1868,8 +1868,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomZOffset = 16; BattleCam_TargetActor = ACTOR_PLAYER; preset = &CamPreset_N; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; @@ -1881,7 +1881,7 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 27; BattleCam_TargetActor = ACTOR_PLAYER; - BattleCam_ModeY = 0; + BattleCam_ModeY = BTL_CAM_MODEY_0; preset = &CamPreset_N; BattleCam_PosZ = 0.0f; BattleCam_PosX = 60.0f; @@ -1925,8 +1925,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_N; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 17; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = -75.0f; BattleCam_PosY = 150.0f; @@ -1936,8 +1936,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = 16; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; preset = &CamPreset_M; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PARTNER; @@ -1948,8 +1948,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 120; BattleCam_BoomZOffset = 16; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_UseLinearInterp = TRUE; preset = &CamPreset_M; BattleCam_BoomYaw = 0; @@ -1961,8 +1961,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 120; BattleCam_BoomZOffset = 16; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_UseLinearInterp = TRUE; preset = &CamPreset_I; BattleCam_BoomYaw = 0; @@ -1973,10 +1973,10 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 5; - BattleCam_ModeY = 1; + BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; BattleCam_TargetActor = ACTOR_PARTNER; D_8029F2A6 = FALSE; @@ -1993,9 +1993,9 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = -4; - BattleCam_ModeY = 1; + BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_BoomYaw = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; @@ -2004,22 +2004,22 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomLength = 380; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 60; - BattleCam_ModeY = 1; + BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_UseLinearInterp = TRUE; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; break; - case BTL_CAM_PRESET_54: + case BTL_CAM_PARTNER_INJURED: BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = 24; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; preset = &CamPreset_I; BattleCam_BoomYaw = 0; D_8029F2A6 = FALSE; @@ -2032,8 +2032,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_N; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 10; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = -95.0f; BattleCam_PosY = 22.0f; @@ -2043,9 +2043,9 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = -4; - BattleCam_ModeY = 1; + BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_BoomYaw = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_TargetActor = ACTOR_PARTNER; preset = &CamPreset_M; break; @@ -2053,10 +2053,10 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - BattleCam_ModeY = 1; + BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_TargetActor = ACTOR_PARTNER; preset = &CamPreset_M; break; @@ -2067,8 +2067,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_N; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 10; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = 25.0f; BattleCam_PosY = 60.0f; @@ -2078,8 +2078,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 60; BattleCam_BoomZOffset = 11; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_UseLinearInterp = TRUE; preset = &CamPreset_I; BattleCam_BoomYaw = 0; @@ -2093,8 +2093,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PARTNER; - BattleCam_ModeY = 0; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_I; break; case BTL_CAM_PRESET_61: @@ -2104,8 +2104,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 15; BattleCam_BoomZOffset = -32; D_8029F2A7 = 20; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PARTNER; preset = &CamPreset_I; @@ -2117,8 +2117,8 @@ void btl_cam_use_preset_intl(s32 id) { preset = &CamPreset_F; BattleCam_BoomZOffset = 27; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_64: BattleCam_BoomLength = 358; @@ -2126,14 +2126,14 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 10; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_F; break; case BTL_CAM_PRESET_65: BattleCam_MoveTimeLeft = 50; BattleCam_BoomLength = 500; - preset = &CamPreset_C; + preset = &EVS_BattleCam_Default; break; case BTL_CAM_PRESET_66: BattleCam_BoomLength = 267; @@ -2141,8 +2141,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = FALSE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_0; preset = &CamPreset_F; break; case BTL_CAM_PRESET_67: @@ -2152,8 +2152,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; case BTL_CAM_PRESET_68: BattleCam_BoomLength = 300; @@ -2162,8 +2162,8 @@ void btl_cam_use_preset_intl(s32 id) { BattleCam_MoveTimeLeft = 4; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - BattleCam_ModeY = 1; - BattleCam_ModeX = TRUE; + BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_ModeX = BTL_CAM_MODEX_1; break; } @@ -2184,14 +2184,14 @@ void btl_cam_use_preset_intl(s32 id) { void btl_cam_use_preset_immediately(s32 preset) { if (!BattleCam_IsFrozen) { BattleCam_SetImmediately = TRUE; - btl_cam_use_preset_intl(preset); + btl_cam_use_preset_impl(preset); } } void btl_cam_use_preset(s32 preset) { if (!BattleCam_IsFrozen) { BattleCam_SetImmediately = FALSE; - btl_cam_use_preset_intl(preset); + btl_cam_use_preset_impl(preset); } } @@ -2292,7 +2292,7 @@ ApiStatus UseBattleCamPreset(Evt* script, s32 isInitialCall) { preset = evt_get_variable(script, *args++); BattleCam_SetImmediately = FALSE; - btl_cam_use_preset_intl(preset); + btl_cam_use_preset_impl(preset); return ApiStatus_DONE2; } @@ -2307,7 +2307,7 @@ ApiStatus UseBattleCamPresetImmediately(Evt* script, s32 isInitialCall) { preset = evt_get_variable(script, *args++); BattleCam_SetImmediately = TRUE; - btl_cam_use_preset_intl(preset); + btl_cam_use_preset_impl(preset); return ApiStatus_DONE2; } diff --git a/src/battle_ui_gfx.c b/src/battle_ui_gfx.c index cca0cadb48..43fd3dfc0e 100644 --- a/src/battle_ui_gfx.c +++ b/src/battle_ui_gfx.c @@ -220,8 +220,8 @@ #include "ui/battle/cmd/aim/target_1.png.inc.c" #include "ui/battle/cmd/aim/target_1.pal.inc.c" -#include "ui/battle/unk_star.png.inc.c" -#include "ui/battle/unk_star.pal.inc.c" +#include "ui/battle/solid_star.png.inc.c" +#include "ui/battle/solid_star.pal.inc.c" Gfx D_8028F860[] = { gsSPEndDisplayList(), diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c index be22f25d12..793bbfe609 100644 --- a/src/cd180_len_38f0.c +++ b/src/cd180_len_38f0.c @@ -7,9 +7,9 @@ extern f32 screen_overlay_frontZoom; extern s32 screen_overlay_backType; extern f32 screen_overlay_backZoom; extern s32 D_80156910; -extern ScreenOverlay D_8015C790[2]; +extern ScreenOverlay ScreenOverlays[2]; -ScreenTransition D_8014C6F0 = TRANSITION_2; +ScreenTransition CurrentScreenTransition = TRANSITION_END_DEMO_SCENE_BLACK; // padding? s32 D_8014C6F4[] = { 0x00000000, 0x00000000, 0x00000000, }; @@ -172,63 +172,63 @@ Gfx D_8014EA48[] = { gsDPSetDepthSource(G_ZS_PIXEL) }; -void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { +void _render_transition_stencil(u8 stencilType, f32 progress, ScreenOverlay* overlay) { Camera* camera = &gCameras[gCurrentCameraID]; - u8 s3, s4, s5; - s32 s1, s2, s6, s7; - f32 f28; + u8 colR, colG, colB; + s32 x1, y1, x2, y2; + f32 alpha; s16 v0; s16 s0; Mtx* matrixStack = gDisplayContext->matrixStack; - if (arg1 == 0.0f) { + if (progress == 0.0f) { return; } if (overlay != NULL) { - s3 = overlay->color.r; - s4 = overlay->color.g; - s5 = overlay->color.b; - s1 = overlay->screenPos[0][0]; - s2 = overlay->screenPos[0][1]; - s6 = overlay->screenPos[1][0]; - s7 = overlay->screenPos[1][1]; - f28 = overlay->alpha; + colR = overlay->color.r; + colG = overlay->color.g; + colB = overlay->color.b; + x1 = overlay->screenPos[0][0]; + y1 = overlay->screenPos[0][1]; + x2 = overlay->screenPos[1][0]; + y2 = overlay->screenPos[1][1]; + alpha = overlay->alpha; } else { - s3 = s4 = s5 = 0; - s1 = s2 = s6 = s7 = 0; - f28 = 0.0f; + colR = colG = colB = 0; + x1 = y1 = x2 = y2 = 0; + alpha = 0.0f; } - switch (arg0) { - case 0: + switch (stencilType) { + case OVERLAY_SCREEN_COLOR: gDPPipeSync(gMainGfxPos++); gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); - if (arg1 == 255.0f) { + if (progress == 255.0f) { gDPSetRenderMode(gMainGfxPos++, CVG_DST_SAVE | G_RM_OPA_SURF, CVG_DST_SAVE | G_RM_OPA_SURF2); } else { gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMainGfxPos++, 0, 0, s3, s4, s5, arg1); + gDPSetPrimColor(gMainGfxPos++, 0, 0, colR, colG, colB, progress); gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); return; - case 1: + case OVERLAY_VIEWPORT_COLOR: gDPPipeSync(gMainGfxPos++); gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); - if (arg1 == 255.0f) { + if (progress == 255.0f) { gDPSetRenderMode(gMainGfxPos++, CVG_DST_SAVE | G_RM_OPA_SURF, CVG_DST_SAVE | G_RM_OPA_SURF2); } else { gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMainGfxPos++, 0, 0, s3, s4, s5, arg1); + gDPSetPrimColor(gMainGfxPos++, 0, 0, colR, colG, colB, progress); gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); gDPFillRectangle(gMainGfxPos++, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); @@ -239,33 +239,33 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { guOrtho(&matrixStack[gMatrixListPos], 0.0f, 320.0f, 0.0f, 240.0f, -1000.0f, 1000.0f, 1.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - switch (arg0) { - case 4: + switch (stencilType) { + case OVERLAY_VIEWPORT_MARIO: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Mario); - func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, gCurrentCameraID); + appendGfx_screen_transition_stencil(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, progress, colR, colG, colB, progress * alpha / 255.0f, gCurrentCameraID); break; - case 7: + case OVERLAY_SCREEN_MARIO: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Mario); - func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, -1); + appendGfx_screen_transition_stencil(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, progress, colR, colG, colB, progress * alpha / 255.0f, -1); break; - case 5: + case OVERLAY_VIEWPORT_STAR: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Star); - func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, gCurrentCameraID); + appendGfx_screen_transition_stencil(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, progress, colR, colG, colB, progress * alpha / 255.0f, gCurrentCameraID); break; - case 8: + case OVERLAY_SCREEN_STAR: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Star); - func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, -1); + appendGfx_screen_transition_stencil(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, progress, colR, colG, colB, progress * alpha / 255.0f, -1); break; - case 3: + case OVERLAY_VIEWPORT_SPOTLIGHT: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_SharpCircle); - func_80139F10(s1, s2, arg1, 0, 0, 0, 0, gCurrentCameraID); + appendGfx_screen_transition_stencil(x1, y1, progress, 0, 0, 0, 0, gCurrentCameraID); break; - case 6: + case OVERLAY_SCREEN_SPOTLIGHT: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_SharpCircle); - func_80139F10(s1, s2, arg1, 0, 0, 0, 0, -1); + appendGfx_screen_transition_stencil(x1, y1, progress, 0, 0, 0, 0, -1); break; - case 2: - s0 = arg1; + case OVERLAY_TYPE_2: + s0 = progress; guTranslate(&matrixStack[gMatrixListPos], 80.0f, 120.0f, 0.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); @@ -289,10 +289,10 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { gSPDisplayList(gMainGfxPos++, D_8014EA48); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); break; - case 9: - s0 = arg1; + case OVERLAY_TYPE_9: + s0 = progress; gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 0); - guTranslate(&matrixStack[gMatrixListPos], s1, SCREEN_HEIGHT - s2, 0.0f); + guTranslate(&matrixStack[gMatrixListPos], x1, SCREEN_HEIGHT - y1, 0.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -301,7 +301,7 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { gSPDisplayList(gMainGfxPos++, D_8014E8F0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - guTranslate(&matrixStack[gMatrixListPos], s6, SCREEN_HEIGHT - s7, 0.0f); + guTranslate(&matrixStack[gMatrixListPos], x2, SCREEN_HEIGHT - y2, 0.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -312,14 +312,14 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { guTranslate(&matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, f28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); gSPDisplayList(gMainGfxPos++, D_8014E9A8); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); break; - case 10: - s0 = arg1; + case OVERLAY_START_BATTLE: + s0 = progress; gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 0); - guTranslate(&matrixStack[gMatrixListPos], s1, SCREEN_HEIGHT - s2, 0.0f); + guTranslate(&matrixStack[gMatrixListPos], x1, SCREEN_HEIGHT - y1, 0.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -330,28 +330,28 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { guTranslate(&matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f); gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, f28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); gSPDisplayList(gMainGfxPos++, D_8014E9A8); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - v0 = arg1 + 40; - if (arg1 > 170) { + v0 = progress + 40; + if (progress > 170) { v0 = 170; } - func_80138D88(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, v0); + draw_prev_frame_buffer_at_screen_pos(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, v0); break; - case 11: + case OVERLAY_WORLD_DARKNESS: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_BlurryCircle); - func_80138E54(1, s6, s7, f28, arg1); + appendGfx_darkness_stencil(TRUE, x2, y2, alpha, progress); break; - case 12: - func_80138D88(s1, s2, s6, s7, arg1); + case OVERLAY_BLUR: + draw_prev_frame_buffer_at_screen_pos(x1, y1, x2, y2, progress); break; - case 13: + case OVERLAY_BATTLE_DARKNESS: gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_BlurryCircle); - func_80138E54(0, s1, s2, f28, arg1); + appendGfx_darkness_stencil(FALSE, x1, y1, alpha, progress); break; - case 14: - case 15: + case OVERLAY_UNUSED_1: + case OVERLAY_UNUSED_2: break; } @@ -368,56 +368,56 @@ void set_screen_overlay_params_back(u8 type, f32 zoom) { screen_overlay_backZoom = zoom; } -void get_screen_overlay_params(s32 idx, u8* type, f32* zoom) { - switch (idx) { - case 0: +void get_screen_overlay_params(s32 layer, u8* type, f32* zoom) { + switch (layer) { + case SCREEN_LAYER_FRONT: *type = screen_overlay_frontType; *zoom = screen_overlay_frontZoom; break; - case 1: + case SCREEN_LAYER_BACK: *type = screen_overlay_backType; *zoom = screen_overlay_backZoom; break; } } -void set_screen_overlay_color(s32 idx, u8 r, u8 g, u8 b) { - switch (idx) { - case 0: - case 1: - D_8015C790[idx].color.r = r; - D_8015C790[idx].color.g = g; - D_8015C790[idx].color.b = b; +void set_screen_overlay_color(s32 layer, u8 r, u8 g, u8 b) { + switch (layer) { + case SCREEN_LAYER_FRONT: + case SCREEN_LAYER_BACK: + ScreenOverlays[layer].color.r = r; + ScreenOverlays[layer].color.g = g; + ScreenOverlays[layer].color.b = b; break; } } -void set_screen_overlay_center(s32 idx, s32 arg1, s32 arg2, s32 arg3) { - switch (idx) { - case 0: - case 1: +void set_screen_overlay_center(s32 layer, s32 arg1, s32 screenPosX, s32 screenPosY) { + switch (layer) { + case SCREEN_LAYER_FRONT: + case SCREEN_LAYER_BACK: switch (arg1) { case 0: - D_8015C790[idx].screenPos[0][0] = arg2; - D_8015C790[idx].screenPos[0][1] = arg3; + ScreenOverlays[layer].screenPos[0][0] = screenPosX; + ScreenOverlays[layer].screenPos[0][1] = screenPosY; break; case 1: - D_8015C790[idx].screenPos[1][0] = arg2; - D_8015C790[idx].screenPos[1][1] = arg3; + ScreenOverlays[layer].screenPos[1][0] = screenPosX; + ScreenOverlays[layer].screenPos[1][1] = screenPosY; break; } break; } } -void set_screen_overlay_center_worldpos(s32 idx, s32 posIdx, s32 x, s32 y, s32 z) { +void set_screen_overlay_center_worldpos(s32 layer, s32 posIdx, s32 worldPosX, s32 worldPosY, s32 worldPosZ) { Camera* camera = &gCameras[gCurrentCameraID]; f32 tx, ty, tz, tw; - switch (idx) { - case 0: - case 1: - transform_point(camera->perspectiveMatrix, x, y, z, 1.0f, &tx, &ty, &tz, &tw); + switch (layer) { + case SCREEN_LAYER_FRONT: + case SCREEN_LAYER_BACK: + transform_point(camera->perspectiveMatrix, worldPosX, worldPosY, worldPosZ, 1.0f, &tx, &ty, &tz, &tw); tw = 1.0f / tw; tx *= tw; ty *= -tw; @@ -427,23 +427,23 @@ void set_screen_overlay_center_worldpos(s32 idx, s32 posIdx, s32 x, s32 y, s32 z switch (posIdx) { case 0: - D_8015C790[idx].screenPos[0][0] = tx; - D_8015C790[idx].screenPos[0][1] = ty; + ScreenOverlays[layer].screenPos[0][0] = tx; + ScreenOverlays[layer].screenPos[0][1] = ty; break; case 1: - D_8015C790[idx].screenPos[1][0] = tx; - D_8015C790[idx].screenPos[1][1] = ty; + ScreenOverlays[layer].screenPos[1][0] = tx; + ScreenOverlays[layer].screenPos[1][1] = ty; break; } break; } } -void set_screen_overlay_alpha(s32 idx, f32 alpha) { - switch (idx) { - case 0: - case 1: - D_8015C790[idx].alpha = alpha; +void set_screen_overlay_alpha(s32 layer, f32 alpha) { + switch (layer) { + case SCREEN_LAYER_FRONT: + case SCREEN_LAYER_BACK: + ScreenOverlays[layer].alpha = alpha; break; } } @@ -452,12 +452,12 @@ void clear_screen_overlays(void) { ScreenOverlay* it; s32 i; - screen_overlay_frontType = -1; - screen_overlay_backType = -1; + screen_overlay_frontType = OVERLAY_NONE; + screen_overlay_backType = OVERLAY_NONE; screen_overlay_frontZoom = -1.0f; - screen_overlay_backZoom = -1.0f; + screen_overlay_backZoom = -1.0f; - for (it = &D_8015C790[0], i = 0; i < ARRAY_COUNT(D_8015C790); i++, it++) { + for (it = &ScreenOverlays[0], i = 0; i < ARRAY_COUNT(ScreenOverlays); i++, it++) { it->color.b = 0; it->color.g = 0; it->color.r = 0; @@ -477,202 +477,216 @@ void func_80138198(void) { } void render_screen_overlay_frontUI(void) { - if (screen_overlay_frontType != -1 && screen_overlay_frontZoom != -1.0f && gGameStatusPtr->isBattle != 2) { - _render_transition_stencil(screen_overlay_frontType, screen_overlay_frontZoom, &D_8015C790[0]); + if (screen_overlay_frontType != OVERLAY_NONE + && screen_overlay_frontZoom != -1.0f + && gGameStatusPtr->isBattle != 2 + ) { + _render_transition_stencil(screen_overlay_frontType, screen_overlay_frontZoom, &ScreenOverlays[0]); } } void render_screen_overlay_backUI(void) { - if (screen_overlay_backType != -1 && screen_overlay_backZoom != -1.0f && gGameStatusPtr->isBattle != 2) { - _render_transition_stencil(screen_overlay_backType, screen_overlay_backZoom, &D_8015C790[1]); + if (screen_overlay_backType != OVERLAY_NONE + && screen_overlay_backZoom != -1.0f + && gGameStatusPtr->isBattle != 2 + ) { + _render_transition_stencil(screen_overlay_backType, screen_overlay_backZoom, &ScreenOverlays[1]); } } void set_map_transition_effect(ScreenTransition transition) { - D_8014C6F0 = transition; + CurrentScreenTransition = transition; } +enum ScreenFadeRates { + VERY_SLOW_FADE_RATE = 2, + SLOW_FADE_RATE = 7, + SLOWER_FADE_RATE = 10, + STANDARD_FADE_RATE = 20, + FAST_FADE_RATE = 50, +}; + s16 update_exit_map_screen_overlay(s16* progress) { u8 overlayColor; - u8 type = 0; + u8 fadeOutType = OVERLAY_SCREEN_COLOR; u8 r = 0; u8 g = 0; u8 b = 0; s16 t = 0; - s32 amt = 20; + s32 fadeRate = STANDARD_FADE_RATE; - switch (D_8014C6F0) { - case TRANSITION_1: - type = 0; + switch (CurrentScreenTransition) { + case TRANSITION_STANDARD: + fadeOutType = OVERLAY_VIEWPORT_COLOR; break; - case TRANSITION_3: + case TRANSITION_TOY_TRAIN: + fadeOutType = OVERLAY_SCREEN_COLOR; + break; + case TRANSITION_END_DEMO_SCENE_BLACK: + fadeOutType = OVERLAY_VIEWPORT_COLOR; + fadeRate = FAST_FADE_RATE; + break; + case TRANSITION_END_DEMO_SCENE_WHITE: r = g = b = 208; - type = 1; - amt = 10; - if (gGameStatusPtr->demoState == 2) { - gGameStatusPtr->nextDemoScene = 18; + fadeOutType = OVERLAY_VIEWPORT_COLOR; + fadeRate = SLOWER_FADE_RATE; + if (gGameStatusPtr->demoState == DEMO_STATE_CHANGE_MAP) { + gGameStatusPtr->nextDemoScene = LAST_DEMO_SCENE_IDX; } break; - case TRANSITION_6: + case TRANSITION_BEGIN_OR_END_GAME: + case TRANSITION_OUTRO_END_SCENE: + fadeOutType = OVERLAY_VIEWPORT_COLOR; + fadeRate = SLOW_FADE_RATE; + break; + case TRANSITION_BEGIN_OR_END_CHAPTER: r = g = b = 208; - type = 1; + fadeOutType = OVERLAY_VIEWPORT_COLOR; break; - case TRANSITION_0: - type = 1; - break; - case TRANSITION_7: - if (gGameStatusPtr->demoState == 2) { - gGameStatusPtr->nextDemoScene = 18; + case TRANSITION_SLOW_FADE_TO_WHITE: + if (gGameStatusPtr->demoState == DEMO_STATE_CHANGE_MAP) { + gGameStatusPtr->nextDemoScene = LAST_DEMO_SCENE_IDX; } r = g = b = 208; - type = 1; - amt = 7; + fadeOutType = OVERLAY_VIEWPORT_COLOR; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_11: - case TRANSITION_15: + case TRANSITION_AFTER_SAVE_PROMPT: + case TRANSITION_END_CHAPTER_INTERRUPTED: r = g = b = 208; - type = 1; - amt = 7; + fadeOutType = OVERLAY_VIEWPORT_COLOR; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_4: - case TRANSITION_5: - type = 1; - amt = 7; - break; - case TRANSITION_14: + case TRANSITION_GET_STAR_CARD: r = g = b = 208; - type = 1; - amt = 50; + fadeOutType = OVERLAY_VIEWPORT_COLOR; + fadeRate = FAST_FADE_RATE; break; - case TRANSITION_2: - type = 1; - amt = 50; + case TRANSITION_ENTER_WORLD: + set_screen_overlay_alpha(SCREEN_LAYER_FRONT, 0.0f); + fadeOutType = OVERLAY_VIEWPORT_MARIO; break; - case TRANSITION_8: - set_screen_overlay_alpha(0, 0.0f); - type = 4; - break; - case TRANSITION_9: + case TRANSITION_MARIO_WHITE: r = g = b = 208; - set_screen_overlay_alpha(0, 0.0f); - type = 4; - amt = 7; + set_screen_overlay_alpha(SCREEN_LAYER_FRONT, 0.0f); + fadeOutType = OVERLAY_VIEWPORT_MARIO; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_10: - set_screen_overlay_alpha(0, 0.0f); - type = 4; - amt = 7; + case TRANSITION_MARIO_BLACK: + set_screen_overlay_alpha(SCREEN_LAYER_FRONT, 0.0f); + fadeOutType = OVERLAY_VIEWPORT_MARIO; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_12: - set_screen_overlay_alpha(0, 160.0f); + case TRANSITION_END_PEACH_INTERLUDE: + set_screen_overlay_alpha(SCREEN_LAYER_FRONT, 160.0f); r = g = b = 208; - type = 5; - amt = 7; + fadeOutType = OVERLAY_VIEWPORT_STAR; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_13: - set_screen_overlay_alpha(0, 0.0f); - type = 5; - amt = 7; + case TRANSITION_PEACH_CAPTURED: + set_screen_overlay_alpha(SCREEN_LAYER_FRONT, 0.0f); + fadeOutType = OVERLAY_VIEWPORT_STAR; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_16: - set_screen_overlay_center(0, 0, 15, 28); - set_screen_overlay_center(0, 1, 305, 156); - set_screen_overlay_params_front(12, 255.0f); - *progress = 0xFF; + case TRANSITION_SLOW_BLUR_MOTION: + set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 15, 28); + set_screen_overlay_center(SCREEN_LAYER_FRONT, 1, 305, 156); + set_screen_overlay_params_front(OVERLAY_BLUR, 255.0f); + *progress = 255; return 1; } - if (D_8014C6F0 == TRANSITION_5) { + if (CurrentScreenTransition == TRANSITION_OUTRO_END_SCENE) { overlayColor = ((255 - *progress) * 208) / 255; - set_screen_overlay_color(0, overlayColor, overlayColor, overlayColor); - set_screen_overlay_params_front(type, 255.0f); - if (*progress == 0xFF) { + set_screen_overlay_color(SCREEN_LAYER_FRONT, overlayColor, overlayColor, overlayColor); + set_screen_overlay_params_front(fadeOutType, 255.0f); + if (*progress == 255) { return 1; } - *progress += amt; - if (*progress > 0xFF) { - *progress = 0xFF; + *progress += fadeRate; + if (*progress > 255) { + *progress = 255; } } else { set_screen_overlay_color(t, r, g, b); if (t == 0) { - set_screen_overlay_params_front(type, *progress); + set_screen_overlay_params_front(fadeOutType, *progress); } else { - set_screen_overlay_params_back(type, *progress); + set_screen_overlay_params_back(fadeOutType, *progress); } - if (*progress == 0xFF) { + if (*progress == 255) { return 1; } - *progress += amt; - if (*progress > 0xFF) { - *progress = 0xFF; + *progress += fadeRate; + if (*progress > 255) { + *progress = 255; } } return 0; } s16 update_enter_map_screen_overlay(s16* progress) { - u8 frontType = 0; - s32 amt = 20; + u8 fadeInType = OVERLAY_SCREEN_COLOR; + s32 fadeRate = STANDARD_FADE_RATE; u8 ret = FALSE; - switch (D_8014C6F0) { - case TRANSITION_3: - set_screen_overlay_color(0, 208, 208, 208); - amt = 50; + switch (CurrentScreenTransition) { + case TRANSITION_END_DEMO_SCENE_WHITE: + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); + fadeRate = FAST_FADE_RATE; break; - case TRANSITION_2: - frontType = 1; - amt = 50; + case TRANSITION_END_DEMO_SCENE_BLACK: + fadeInType = OVERLAY_VIEWPORT_COLOR; + fadeRate = FAST_FADE_RATE; break; - case TRANSITION_4: - case TRANSITION_5: - case TRANSITION_7: - case TRANSITION_9: - case TRANSITION_10: - frontType = 1; - amt = 7; + case TRANSITION_BEGIN_OR_END_GAME: + case TRANSITION_OUTRO_END_SCENE: + case TRANSITION_SLOW_FADE_TO_WHITE: + case TRANSITION_MARIO_WHITE: + case TRANSITION_MARIO_BLACK: + fadeInType = OVERLAY_VIEWPORT_COLOR; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_0: - case TRANSITION_1: - case TRANSITION_6: - case TRANSITION_13: - case TRANSITION_14: - frontType = 1; + case TRANSITION_STANDARD: + case TRANSITION_TOY_TRAIN: + case TRANSITION_BEGIN_OR_END_CHAPTER: + case TRANSITION_PEACH_CAPTURED: + case TRANSITION_GET_STAR_CARD: + fadeInType = OVERLAY_VIEWPORT_COLOR; break; - case TRANSITION_8: - case TRANSITION_15: - frontType = 4; + case TRANSITION_ENTER_WORLD: + case TRANSITION_END_CHAPTER_INTERRUPTED: + fadeInType = OVERLAY_VIEWPORT_MARIO; break; - case TRANSITION_11: - frontType = 5; - amt = 7; + case TRANSITION_AFTER_SAVE_PROMPT: + fadeInType = OVERLAY_VIEWPORT_STAR; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_12: - frontType = 4; - amt = 7; + case TRANSITION_END_PEACH_INTERLUDE: + fadeInType = OVERLAY_VIEWPORT_MARIO; + fadeRate = SLOW_FADE_RATE; break; - case TRANSITION_16: - set_screen_overlay_center(0, 0, 15, 28); - set_screen_overlay_center(0, 1, 305, 156); - set_screen_overlay_params_front(12, *progress); - amt = 2; + case TRANSITION_SLOW_BLUR_MOTION: + set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 15, 28); + set_screen_overlay_center(SCREEN_LAYER_FRONT, 1, 305, 156); + set_screen_overlay_params_front(OVERLAY_BLUR, *progress); + fadeRate = VERY_SLOW_FADE_RATE; break; } - if (D_8014C6F0 != TRANSITION_16) { - set_screen_overlay_params_front(frontType, *progress); + if (CurrentScreenTransition != TRANSITION_SLOW_BLUR_MOTION) { + set_screen_overlay_params_front(fadeInType, *progress); } if (*progress == 0) { ret = TRUE; } - *progress -= amt; + *progress -= fadeRate; if (*progress < 0) { *progress = 0; diff --git a/src/common/DisableRandomAbility.inc.c b/src/common/DisableRandomAbility.inc.c index d45fdd4beb..41a552acb1 100644 --- a/src/common/DisableRandomAbility.inc.c +++ b/src/common/DisableRandomAbility.inc.c @@ -1,12 +1,28 @@ #include "common.h" -s32 N(hammer_icons)[] = { ITEM_HAMMER1_ICON, ITEM_HAMMER2_ICON, ITEM_HAMMER3_ICON }; +s32 N(hammer_icons)[] = { + ITEM_HAMMER1_ICON, + ITEM_HAMMER2_ICON, + ITEM_HAMMER3_ICON +}; -s32 N(hammer_text)[] = { 73, 74, 75 }; +s32 N(hammer_text)[] = { + BTL_MSG_HAMMER_DISABLED_1, + BTL_MSG_HAMMER_DISABLED_2, + BTL_MSG_HAMMER_DISABLED_3 +}; -s32 N(jump_icons)[] = { ITEM_BOOTS1_ICON, ITEM_BOOTS2_ICON, ITEM_BOOTS3_ICON }; +s32 N(jump_icons)[] = { + ITEM_BOOTS1_ICON, + ITEM_BOOTS2_ICON, + ITEM_BOOTS3_ICON +}; -s32 N(jump_text)[] = { 76, 77, 78 }; +s32 N(jump_text)[] = { + BTL_MSG_JUMP_DISABLED_1, + BTL_MSG_JUMP_DISABLED_2, + BTL_MSG_JUMP_DISABLED_3 +}; API_CALLABLE(N(DisableRandomAbility)) { Bytecode* args = script->ptrReadPos; @@ -45,7 +61,7 @@ API_CALLABLE(N(DisableRandomAbility)) { case 2: battleStatus->itemLossTurns = turnsLost; evt_set_variable(script, *args++, ITEM_ITEMS_ICON); - evt_set_variable(script, *args++, 79); + evt_set_variable(script, *args++, BTL_MSG_ITEMS_DISABLED); break; } diff --git a/src/curtains.c b/src/curtains.c index 9e51d70139..308922d7f5 100644 --- a/src/curtains.c +++ b/src/curtains.c @@ -1,68 +1,68 @@ #include "common.h" -#include "sprite/unk_checkers.png.h" -#include "sprite/curtains.png.h" -#include "sprite/checkers.png.h" +#include "theater/walls.png.h" +#include "theater/curtains.png.h" +#include "theater/floor.png.h" #include "ui/no_controller.png.h" #include "ld_addrs.h" #include "nu/nusys.h" -#include "sprite/unk_checkers.png.inc.c" +#include "theater/walls.png.inc.c" Gfx D_800746E0[] = { gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock_4b(sprite_unk_checkers_png, G_IM_FMT_I, 16, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock_4b(theater_walls_png, G_IM_FMT_I, 16, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPEndDisplayList(), }; -#include "sprite/curtains.png.inc.c" +#include "theater/curtains.png.inc.c" Gfx D_80075730[] = { gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sprite_curtains_png, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(theater_curtains_png, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPEndDisplayList(), }; -#include "sprite/checkers.png.inc.c" -#include "sprite/checkers.pal.inc.c" +#include "theater/floor.png.inc.c" +#include "theater/floor.pal.inc.c" Gfx D_800758A0[] = { gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, sprite_checkers_pal), + gsDPLoadTLUT_pal16(0, theater_floor_pal), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock_4b(sprite_checkers_png, G_IM_FMT_CI, 32, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | + gsDPLoadTextureBlock_4b(theater_floor_png, G_IM_FMT_CI, 32, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 5, 4, G_TX_NOLOD, G_TX_NOLOD), gsSPEndDisplayList(), }; -#include "vtx/curtains1.vtx.inc.c" -#include "vtx/curtains2.vtx.inc.c" -#include "vtx/curtains3.vtx.inc.c" -#include "vtx/curtains4.vtx.inc.c" -#include "vtx/curtains5.vtx.inc.c" -#include "vtx/curtains6.vtx.inc.c" -#include "vtx/curtains7.vtx.inc.c" +#include "theater/left_wall_vtx.vtx.inc.c" +#include "theater/right_wall_vtx.vtx.inc.c" +#include "theater/floor_vtx.vtx.inc.c" +#include "theater/left_inset_shadow_vtx.vtx.inc.c" +#include "theater/right_inset_shadow_vtx.vtx.inc.c" +#include "theater/curtain_vtx.vtx.inc.c" +#include "theater/wall_shadows_vtx.vtx.inc.c" -Gfx D_80075E60[] = { +Gfx TheaterWallShadowsGfx[] = { gsDPPipeSync(), gsDPSetRenderMode(G_RM_PASS, G_RM_CLD_SURF2), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsDPSetCombineMode(G_CC_MODULATEIA, PM_CC_16), gsSPDisplayList(D_80075730), - gsSPVertex(vtx_curtains7, 8, 0), + gsSPVertex(theater_wall_shadows_vtx, 8, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSPEndDisplayList(), }; -Gfx D_80075EA0[] = { +Gfx TheaterCurtainGfx[] = { gsDPPipeSync(), gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), gsSPDisplayList(D_80075730), - gsSPVertex(vtx_curtains6, 31, 0), + gsSPVertex(theater_curtain_vtx, 31, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), @@ -76,25 +76,25 @@ Gfx D_80075EA0[] = { gsSPEndDisplayList(), }; -Gfx D_80075F20[] = { +Gfx TheaterInsetShadowsGfx[] = { gsDPPipeSync(), gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), - gsSPVertex(vtx_curtains4, 4, 0), + gsSPVertex(theater_left_inset_shadow_vtx, 4, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPVertex(vtx_curtains5, 4, 0), + gsSPVertex(theater_right_inset_shadow_vtx, 4, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSPEndDisplayList(), }; -Gfx D_80075F68[] = { +Gfx TheaterFloorGfx[] = { gsDPPipeSync(), gsDPSetRenderMode(CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsDPSetCombineMode(G_CC_MODULATEIA, PM_CC_16), gsSPDisplayList(D_800746E0), - gsSPVertex(vtx_curtains3, 25, 0), + gsSPVertex(theater_floor_vtx, 25, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0), gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0), @@ -110,49 +110,49 @@ Gfx D_80075F68[] = { gsSPEndDisplayList(), }; -Gfx D_80075FF8[] = { +Gfx TheaterRightWallGfx[] = { gsDPPipeSync(), gsDPSetRenderMode(CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsDPSetCombineMode(G_CC_MODULATEIA, PM_CC_16), gsSPDisplayList(D_800758A0), - gsSPVertex(vtx_curtains2, 6, 0), + gsSPVertex(theater_right_wall_vtx, 6, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), gsSPEndDisplayList(), }; -Gfx D_80076038[] = { +Gfx TheaterLeftWallGfx[] = { gsDPPipeSync(), gsDPSetRenderMode(CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsDPSetCombineMode(G_CC_MODULATEIA, PM_CC_16), gsSPDisplayList(D_800758A0), - gsSPVertex(vtx_curtains1, 6, 0), + gsSPVertex(theater_left_wall_vtx, 6, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), gsSPEndDisplayList(), }; -Gfx D_80076078[] ={ - gsSPDisplayList(D_80075F68), - gsSPDisplayList(D_80076038), - gsSPDisplayList(D_80075FF8), - gsSPDisplayList(D_80075F20), - gsSPDisplayList(D_80075E60), - gsSPDisplayList(D_80075EA0), +Gfx TheaterGfx[] ={ + gsSPDisplayList(TheaterFloorGfx), + gsSPDisplayList(TheaterLeftWallGfx), + gsSPDisplayList(TheaterRightWallGfx), + gsSPDisplayList(TheaterInsetShadowsGfx), + gsSPDisplayList(TheaterWallShadowsGfx), + gsSPDisplayList(TheaterCurtainGfx), gsSPEndDisplayList(), }; -Vp D_800760B0 = { +Vp TheaterViewport = { { {(SCREEN_WIDTH/2)*4, (SCREEN_HEIGHT/2)*4, 0x200 - 1, 0}, {(SCREEN_WIDTH/2)*4, (SCREEN_HEIGHT/2)*4, 0x200 - 1, 0}, } }; -Gfx D_800760C0[] = { - gsSPViewport(&D_800760B0), +Gfx TheaterInitGfx[] = { + gsSPViewport(&TheaterViewport), gsDPSetCycleType(G_CYC_2CYCLE), gsDPSetTextureLOD(G_TL_TILE), gsDPSetTexturePersp(G_TP_PERSP), @@ -173,7 +173,7 @@ Gfx D_800760C0[] = { #include "ui/no_controller.png.inc.c" -Gfx D_80077140[] = { +Gfx NoControllerSetupTexGfx[] = { gsDPPipeSync(), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), gsDPSetCycleType(G_CYC_1CYCLE), @@ -194,7 +194,7 @@ Gfx D_80077140[] = { gsSPEndDisplayList(), }; -Gfx D_800771E8[] = { +Gfx NoControllerGfx[] = { gsSPTextureRectangle(0x0180, 0x0260, 0x0380, 0x02E0, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400), gsDPPipeSync(), gsSPEndDisplayList(), @@ -230,7 +230,7 @@ void render_curtains(void) { gDPPipeSync(gMainGfxPos++); gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gSPDisplayList(gMainGfxPos++, &D_800760C0); + gSPDisplayList(gMainGfxPos++, &TheaterInitGfx); guFrustumF(m, -80.0f, 80.0f, -60.0f, 60.0f, 160.0f, 640.0f, 1.0f); guMtxF2L(m, &D_8009BAA8[0]); @@ -249,7 +249,7 @@ void render_curtains(void) { gSPMatrix(gMainGfxPos++, &D_8009BAA8[1], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); rgb = 255.0f - (gCurtainFade * 255.0f); gDPSetPrimColor(gMainGfxPos++, 0, 0, rgb, rgb, rgb, 255); - gSPDisplayList(gMainGfxPos++, &D_80076078); + gSPDisplayList(gMainGfxPos++, &TheaterGfx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMainGfxPos++); } @@ -261,17 +261,17 @@ void render_curtains(void) { if (!(gGameStatusPtr->contBitPattern & 1)) { if ((get_game_mode() == GAME_MODE_INTRO) || (get_game_mode() == GAME_MODE_TITLE_SCREEN) - || (gGameStatusPtr->demoState != 0)) { + || (gGameStatusPtr->demoState != DEMO_STATE_NONE)) { s32 alpha = ((gGameStatusPtr->frameCounter) % 0x18) << 5; if (alpha > 255) { alpha = 255; } - gSPDisplayList(gMainGfxPos++, &D_800760C0); - gSPDisplayList(gMainGfxPos++, &D_80077140); + gSPDisplayList(gMainGfxPos++, &TheaterInitGfx); + gSPDisplayList(gMainGfxPos++, &NoControllerSetupTexGfx); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0xFF, 0x20, 0x10, alpha); - gSPDisplayList(gMainGfxPos++, &D_800771E8); + gSPDisplayList(gMainGfxPos++, &NoControllerGfx); } } } diff --git a/src/draw_box.c b/src/draw_box.c index f7f3cb3b83..e8f808dc4d 100644 --- a/src/draw_box.c +++ b/src/draw_box.c @@ -305,12 +305,14 @@ WindowCorners gBoxCorners[] = { }; Gfx gBoxCombineModes[] = { - gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL1, TEXEL0, ENVIRONMENT, ENV_ALPHA, COMBINED, 0, 0, 0, COMBINED), - gsDPSetCombineLERP(TEXEL0, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED), - gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL1, 0, PRIMITIVE, 0, TEXEL0, ENVIRONMENT, ENV_ALPHA, COMBINED, 0, 0, 0, COMBINED), - gsDPSetCombineLERP(TEXEL0, 0, TEXEL1, 0, TEXEL1, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED) + gsDPSetCombineMode(PM_CC_BOX1_OPAQUE, PM_CC_BOX1_CYC2), + gsDPSetCombineMode(PM_CC_BOX2_OPAQUE, PM_CC_BOX2_CYC2), + gsDPSetCombineMode(PM_CC_BOX1_TRANSPARENT, PM_CC_BOX1_CYC2), + gsDPSetCombineMode(PM_CC_BOX2_TRANSPARENT, PM_CC_BOX2_CYC2) }; + s32 gBoxQuadIndex = 0; + Vp gBoxViewport = { .vp = { .vscale = { 640, 480, 511, 0 }, diff --git a/src/effects/debuff.c b/src/effects/debuff.c index a17801e1d7..ea86113c6f 100644 --- a/src/effects/debuff.c +++ b/src/effects/debuff.c @@ -12,7 +12,7 @@ void debuff_update(EffectInstance* effect); void debuff_render(EffectInstance* effect); void debuff_appendGfx(void* effect); -EffectInstance* debuff_main(s32 arg0, f32 x, f32 y, f32 z) { +EffectInstance* debuff_main(s32 type, f32 x, f32 y, f32 z) { EffectBlueprint bp; EffectInstance* effect; DebuffFXData* data; @@ -35,45 +35,45 @@ EffectInstance* debuff_main(s32 arg0, f32 x, f32 y, f32 z) { shim_mem_clear(data, numParts * sizeof(*data)); - data->unk_24 = 30; - data->unk_28 = 0; - data->unk_00 = arg0; - data->unk_04 = x; - data->unk_08 = y; - data->unk_0C = z; - data->unk_34 = 255; + data->timeLeft = 30; + data->lifetime = 0; + data->type = type; + data->pos.x = x; + data->pos.y = y; + data->pos.z = z; + data->alpha = 255; - if (arg0 == 0) { - data->unk_3B = 20; - data->unk_38 = 20; - data->unk_3C = 21; - data->unk_39 = 21; - data->unk_3D = 242; - data->unk_3A = 242; + if (type == 0) { + data->envCol.r = 20; + data->primCol.r = 20; + data->envCol.g = 21; + data->primCol.g = 21; + data->envCol.b = 242; + data->primCol.b = 242; } else { - data->unk_3B = 200; - data->unk_38 = 200; - data->unk_3C = 21; - data->unk_39 = 21; - data->unk_3D = 212; - data->unk_3A = 212; + data->envCol.r = 200; + data->primCol.r = 200; + data->envCol.g = 21; + data->primCol.g = 21; + data->envCol.b = 212; + data->primCol.b = 212; } data++; for (i = 1; i < numParts; i++, data++) { - s32 temp = ((i - 1) * 360) / (numParts - 1); + s32 angle = ((i - 1) * 360) / (numParts - 1); f32 temp2 = 1.0f; - data->unk_04 = shim_cos_deg(temp + 90.0f); - data->unk_08 = shim_sin_deg(temp + 90.0f); - data->unk_0C = 0.0f; + data->pos.x = shim_cos_deg(angle + 90.0f); + data->pos.y = shim_sin_deg(angle + 90.0f); + data->pos.z = 0.0f; data->unk_10 = 0.0f; data->unk_14 = 0.0f; data->unk_18 = 0.0f; - data->unk_1C = 0.1f; - data->unk_20 = 0.1f; + data->scaleY = 0.1f; + data->scaleX = 0.1f; data->unk_30 = temp2; - data->unk_2C = temp; + data->rotZ = angle; } return effect; @@ -84,36 +84,36 @@ void debuff_init(EffectInstance* effect) { void debuff_update(EffectInstance* effect) { DebuffFXData* data = effect->data.debuff; - s32 temp; + s32 time; s32 i; - data->unk_28++; - data->unk_24--; - if (data->unk_24 < 0) { + data->lifetime++; + data->timeLeft--; + if (data->timeLeft < 0) { shim_remove_effect(effect); return; } - temp = data->unk_28; + time = data->lifetime; - if (temp >= 11) { - data->unk_34 *= 0.9; + if (time > 10) { + data->alpha *= 0.9; } data++; for (i = 1; i < effect->numParts; i++, data++) { - if (temp > 10) { - data->unk_1C += (1.0 - data->unk_1C) * 0.1; - data->unk_20 += (2.4f - data->unk_20) * 0.1; + if (time > 10) { + data->scaleY += (1.0 - data->scaleY) * 0.1; + data->scaleX += (2.4f - data->scaleX) * 0.1; data->unk_30 += ((100.0f - data->unk_30) * 0.07) * 0.2; } - if (temp < 10) { - data->unk_1C += (7.0f - data->unk_1C) * 0.05; - data->unk_20 += (1.0f - data->unk_20) * 0.1; + if (time < 10) { + data->scaleY += (7.0f - data->scaleY) * 0.05; + data->scaleX += (1.0f - data->scaleX) * 0.1; data->unk_30 += ((10.0f - data->unk_30) * 0.05) * 0.6; } - data->unk_04 = shim_cos_deg(data->unk_2C + 90.0f) * data->unk_30; - data->unk_08 = shim_sin_deg(data->unk_2C + 90.0f) * data->unk_30; + data->pos.x = shim_cos_deg(data->rotZ + 90.0f) * data->unk_30; + data->pos.y = shim_sin_deg(data->rotZ + 90.0f) * data->unk_30; } } @@ -135,33 +135,33 @@ void debuff_appendGfx(void* effect) { DebuffFXData* data = eff->data.debuff; Gfx* dlist = D_E00628C0[0]; Gfx* dlist2 = D_E00628C4[0]; - Matrix4f sp18; - Matrix4f sp58; - Matrix4f sp98; + Matrix4f mtxTranslate; + Matrix4f mtxRotate; + Matrix4f mtxTransform; s32 i; gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guTranslateF(mtxTranslate, data->pos.x, data->pos.y, data->pos.z); + shim_guRotateF(mtxRotate, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(mtxRotate, mtxTranslate, mtxTransform); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_38, data->unk_39, data->unk_3A, data->unk_34); - gDPSetEnvColor(gMainGfxPos++, data->unk_3B, data->unk_3C, data->unk_3D, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, data->alpha); + gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, 0); data++; for (i = 1; i < eff->numParts; i++, data++) { - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp58, data->unk_2C, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, data->unk_20, data->unk_1C, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guTranslateF(mtxTranslate, data->pos.x, data->pos.y, data->pos.z); + shim_guRotateF(mtxRotate, data->rotZ, 0.0f, 0.0f, 1.0f); + shim_guMtxCatF(mtxRotate, mtxTranslate, mtxTranslate); + shim_guScaleF(mtxRotate, data->scaleX, data->scaleY, 1.0f); + shim_guMtxCatF(mtxRotate, mtxTranslate, mtxTranslate); + shim_guMtxF2L(mtxTranslate, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c index 5fca944e44..f289084662 100644 --- a/src/effects/disable_x.c +++ b/src/effects/disable_x.c @@ -248,8 +248,7 @@ void func_E00826C4(DisableXFXData* data) { gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); } else { gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, - PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); } } diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index c6127691d9..6c442a6769 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void shim_func_80138D88(s32, s32, s32, s32, f32); +void shim_draw_prev_frame_buffer_at_screen_pos(s32, s32, s32, s32, f32); void firework_rocket_init(EffectInstance* effect); void firework_rocket_render(EffectInstance* effect); @@ -246,7 +246,7 @@ void firework_rocket_appendGfx(void* effect) { isExploded = data->isExploded; if (firework_rocket_frame_counter != gGameStatusPtr->frameCounter) { // draw previous frame to create motion blur effect - shim_func_80138D88(10, 10, SCREEN_WIDTH - 10, SCREEN_HEIGHT - 10, firework_rocket_blur_alpha * 0.8); + shim_draw_prev_frame_buffer_at_screen_pos(10, 10, SCREEN_WIDTH - 10, SCREEN_HEIGHT - 10, firework_rocket_blur_alpha * 0.8); firework_rocket_frame_counter = gGameStatusPtr->frameCounter; firework_rocket_blur_alpha = 0; } diff --git a/src/effects/gfx/flame.c b/src/effects/gfx/flame.c index 67c300855b..9fdfb00702 100644 --- a/src/effects/gfx/flame.c +++ b/src/effects/gfx/flame.c @@ -38,7 +38,7 @@ Gfx D_090009E0_354590[] = { gsDPSetTexturePersp(G_TP_NONE), gsDPSetTextureFilter(G_TF_BILERP), gsDPSetRenderMode(G_RM_PASS, G_RM_CLD_SURF2), - gsDPSetCombineLERP(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1), + gsDPSetCombineMode(PM_CC_CONST_ALPHA_1, PM_CC_CONST_ALPHA_1), gsSPTextureRectangle(0, 0, 0x0080, 0x0100, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400), gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, TEXEL1, 1, TEXEL0, TEXEL1, 1, 0, 0, 0, COMBINED, COMBINED, TEXEL1, TEXEL1, TEXEL1), diff --git a/src/effects/partner_buff.c b/src/effects/partner_buff.c index 3af84fb99a..91bb64c6f8 100644 --- a/src/effects/partner_buff.c +++ b/src/effects/partner_buff.c @@ -189,8 +189,7 @@ void func_E011A3BC(s16 alpha) { gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, - TEXEL0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_01, PM_CC_01); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } } diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c index 08c00e01b3..11140fd27b 100644 --- a/src/effects/quizmo_stage.c +++ b/src/effects/quizmo_stage.c @@ -121,7 +121,7 @@ void quizmo_stage_appendGfx(void* effect) { gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, microphoneRaiseAmt, microphoneRaiseAmt, microphoneRaiseAmt, 255); - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, PM_CC_16); gSPDisplayList(gMainGfxPos++, D_09007230_39FDF0); if (data->unk_3C != 255) { diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index 3355346362..931ae808f8 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -168,7 +168,7 @@ void radiating_energy_orb_appendGfx(void* effect) { if (scale != 0.0f) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, (part->unk_14 * unk_14) >> 8); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); shim_guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); shim_guTranslateF(sp58, part->unk_2C, 0.0f, 0.0f); diff --git a/src/effects/tattle_window.c b/src/effects/tattle_window.c index 952fd2215d..9c69b9b277 100644 --- a/src/effects/tattle_window.c +++ b/src/effects/tattle_window.c @@ -26,10 +26,8 @@ WindowStyleCustom D_E00D87E0 = { .size3 = {16, 8}, .size4 = {16, 8}, }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, - COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, - 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 61, 74, 188, 255 }, .color2 = { 0, 25, 28, 255}, }; diff --git a/src/encounter.c b/src/encounter.c index 9b86a7ad05..e5efa232b6 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -1405,7 +1405,7 @@ void update_encounters_pre_battle(void) { currentEncounter->coinsEarned = 0; currentEncounter->fadeOutAccel = 0; currentEncounter->fadeOutAmount = 255; - set_screen_overlay_params_front(0, 255.0f); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 255.0f); gEncounterState = ENCOUNTER_STATE_POST_BATTLE; D_8009A678 = 1; gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_INIT; @@ -1489,21 +1489,21 @@ void draw_encounters_pre_battle(void) { otherZ = playerZ; } - if (gGameStatusPtr->demoState == 2) { - set_screen_overlay_params_back(10, encounter->fadeOutAmount); - set_screen_overlay_alpha(1, 255.0f); - set_screen_overlay_color(1, 0, 0, 0); + if (gGameStatusPtr->demoState == DEMO_STATE_CHANGE_MAP) { + set_screen_overlay_params_back(OVERLAY_START_BATTLE, encounter->fadeOutAmount); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, 255.0f); + set_screen_overlay_color(SCREEN_LAYER_BACK, 0, 0, 0); get_screen_coords(gCurrentCameraID, playerX, playerY + 20.0f, playerZ, &pScreenX, &pScreenY, &pScreenZ); get_screen_coords(gCurrentCameraID, otherX, otherY + 15.0f, otherZ, &oScreenX, &oScreenY, &oScreenZ); - set_screen_overlay_center(1, 0, (pScreenX - oScreenX) / 2 + oScreenX, + set_screen_overlay_center(SCREEN_LAYER_BACK, 0, (pScreenX - oScreenX) / 2 + oScreenX, (pScreenY - oScreenY) / 2 + oScreenY); } else { - set_screen_overlay_params_front(10, encounter->fadeOutAmount); - set_screen_overlay_alpha(0, 255.0f); - set_screen_overlay_color(0, 0, 0, 0); + set_screen_overlay_params_front(OVERLAY_START_BATTLE, encounter->fadeOutAmount); + set_screen_overlay_alpha(SCREEN_LAYER_FRONT, 255.0f); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0); get_screen_coords(gCurrentCameraID, playerX, playerY + 20.0f, playerZ, &pScreenX, &pScreenY, &pScreenZ); get_screen_coords(gCurrentCameraID, otherX, otherY + 15.0f, otherZ, &oScreenX, &oScreenY, &oScreenZ); - set_screen_overlay_center(0, 0, (pScreenX - oScreenX) / 2 + oScreenX, + set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, (pScreenX - oScreenX) / 2 + oScreenX, (pScreenY - oScreenY) / 2 + oScreenY); } } @@ -1792,7 +1792,7 @@ void update_encounters_post_battle(void) { if (!D_8009A63C) { suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } - set_screen_overlay_params_front(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); resume_all_group(EVT_GROUP_10); gEncounterState = ENCOUNTER_STATE_NEUTRAL; D_8009A678 = 1; @@ -1907,7 +1907,7 @@ void update_encounters_post_battle(void) { playerStatus->blinkTimer = 45; enable_player_input(); partner_enable_input(); - set_screen_overlay_params_front(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); if (!D_8009A63C) { currentEncounter->unk_94 = 15; } else { @@ -2006,7 +2006,7 @@ void update_encounters_post_battle(void) { } enable_player_input(); partner_enable_input(); - set_screen_overlay_params_front(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); currentEncounter->unk_94 = 15; gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_TO_NEUTRAL; } @@ -2044,7 +2044,7 @@ void update_encounters_post_battle(void) { } enable_player_input(); partner_enable_input(); - set_screen_overlay_params_front(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); resume_all_group(EVT_GROUP_10); gEncounterState = ENCOUNTER_STATE_NEUTRAL; D_8009A678 = 1; @@ -2147,7 +2147,7 @@ void update_encounters_post_battle(void) { currentEncounter->battleTriggerCooldown = 45; enable_player_input(); partner_enable_input(); - set_screen_overlay_params_front(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); resume_all_group(EVT_GROUP_10); gEncounterState = ENCOUNTER_STATE_NEUTRAL; D_8009A678 = 1; @@ -2186,8 +2186,8 @@ void draw_encounters_post_battle(void) { s32 ret = currentEncounter->fadeOutAccel; if (ret != 0) { - set_screen_overlay_params_front(0, currentEncounter->fadeOutAmount); - set_screen_overlay_color(0, 0, 0, 0); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, currentEncounter->fadeOutAmount); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0); } } diff --git a/src/entity/Block.c b/src/entity/Block.c index ed194f9b90..d4d38156c4 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -41,7 +41,7 @@ void entity_base_block_setupGfx(s32 entityIndex) { gDPSetRenderMode(gfx++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfx++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gfx++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfx++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, entity->alpha); } diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index bbe56d7e07..68bf8f24fa 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -35,7 +35,7 @@ void entity_HeartBlockContent__setupGfx(s32 entityIndex, Gfx* arg1) { dlist = ENTITY_ADDR(entity, Gfx*, arg1); - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, entity->alpha); alpha = 92; @@ -50,7 +50,7 @@ void entity_HeartBlockContent__setupGfx(s32 entityIndex, Gfx* arg1) { gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | 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)); gSPDisplayList(gfxPos++, dlist); gDPPipeSync(gfxPos++); - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); @@ -66,7 +66,7 @@ void entity_HeartBlockContent__setupGfx(s32 entityIndex, Gfx* arg1) { gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | 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)); gSPDisplayList(gfxPos++, dlist); gDPPipeSync(gfxPos++); - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index b5f996bb96..72c2e58dea 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -231,7 +231,7 @@ void entity_ItemBlock_setupGfx(s32 entityIndex) { gDPSetRenderMode(gfx++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfx++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gfx++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfx++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, entity->alpha); } diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index c757019c6f..7169747575 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -32,7 +32,7 @@ void entity_SaveBlock_setupGfx(s32 index) { gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetRenderMode(gfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, 128); gSPDisplayList(gfxPos++, Entity_SaveBlock_RenderContent); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); @@ -45,7 +45,7 @@ void entity_SaveBlock_setupGfx(s32 index) { gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetRenderMode(gfxPos++, G_RM_AA_XLU_SURF | Z_CMP, G_RM_AA_XLU_SURF2 | Z_CMP); - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, 128); gSPDisplayList(gfxPos++, dlist); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); diff --git a/src/entity/ShatteringBlock_common.c b/src/entity/ShatteringBlock_common.c index 1da2864670..c144e67010 100644 --- a/src/entity/ShatteringBlock_common.c +++ b/src/entity/ShatteringBlock_common.c @@ -175,7 +175,7 @@ void entity_shattering_setupGfx(s32 entityIndex) { gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_11, PM_CC_12); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->alpha); } diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index 12fb0dc982..e21c3283c5 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -158,7 +158,7 @@ void entity_SuperBlockContent_setupGfx(s32 entityIndex) { gDisplayContext->matrixStack[gMatrixListPos] = data->unk_50; gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | 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(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); gSPDisplayList(gfxPos++, dlist); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); @@ -174,7 +174,7 @@ void entity_SuperBlockContent_setupGfx(s32 entityIndex) { gDisplayContext->matrixStack[gMatrixListPos] = data->unk_90; gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | 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(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); gSPDisplayList(gfxPos++, dlist); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 2e41ba8968..fe1aee21b9 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -193,7 +193,7 @@ void entity_WoodenCrate_setupGfx(s32 entityIndex) { gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_11, PM_CC_12); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->fragmentMoveAngle[i]); } diff --git a/src/entity/default/BoardedFloor.c b/src/entity/default/BoardedFloor.c index 5f661edd44..01f38d36ee 100644 --- a/src/entity/default/BoardedFloor.c +++ b/src/entity/default/BoardedFloor.c @@ -181,7 +181,7 @@ void Entity_BoardedFloor_setupGfx(s32 entityIndex) { gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_11, PM_CC_12); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->fragmentMoveAngle[i]); } diff --git a/src/entity/default/BombableRock.c b/src/entity/default/BombableRock.c index 6de468a935..761734e8b5 100644 --- a/src/entity/default/BombableRock.c +++ b/src/entity/default/BombableRock.c @@ -206,7 +206,7 @@ void entity_BombableRock_setupGfx(s32 entityIndex) { gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_11, PM_CC_12); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->fragmentMoveAngle[i]); } diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index ffd9b07664..11d5ecf2ba 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -168,7 +168,7 @@ void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { guMtxCatF(sp18, sp58, sp18); guTranslateF(sp58, entity->position.x + 16.0f * sinAngle, entity->position.y , entity->position.z - 16.0f * cosAngle); guMtxCatF(sp18, sp58, sp18); - gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02); gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, entity->alpha); guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/entity/model/BellbellPlant_gfx.c b/src/entity/model/BellbellPlant_gfx.c index c94db936c3..0c8744223c 100644 --- a/src/entity/model/BellbellPlant_gfx.c +++ b/src/entity/model/BellbellPlant_gfx.c @@ -19,7 +19,7 @@ Gfx Entity_BellbellPlant_RenderNode5[] = { gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0), gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -60,7 +60,7 @@ Gfx Entity_BellbellPlant_RenderNode4[] = { gsSP2Triangles(1, 10, 2, 0, 2, 10, 14, 0), gsSP2Triangles(2, 14, 4, 0, 4, 14, 6, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -76,7 +76,7 @@ Gfx Entity_BellbellPlant_RenderNode3[] = { gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0), gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -117,7 +117,7 @@ Gfx Entity_BellbellPlant_RenderNode2[] = { gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -168,7 +168,7 @@ Gfx Entity_BellbellPlant_RenderNode1[] = { gsSP2Triangles(18, 4, 24, 0, 18, 6, 19, 0), gsSP2Triangles(19, 6, 8, 0, 19, 8, 13, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/BoardedFloor.c b/src/entity/model/BoardedFloor.c index d700d713de..a7704761d7 100644 --- a/src/entity/model/BoardedFloor.c +++ b/src/entity/model/BoardedFloor.c @@ -17,7 +17,7 @@ Gfx D_0A002400_E50BF0[] = { gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock(D_0A001400_E4FBF0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), diff --git a/src/entity/model/BombableRock.c b/src/entity/model/BombableRock.c index 8af40c69c8..66fb8c88c8 100644 --- a/src/entity/model/BombableRock.c +++ b/src/entity/model/BombableRock.c @@ -11,7 +11,7 @@ Gfx D_0A001060_E9E6B0[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock_4b(D_0A000840_E9DE90, G_IM_FMT_CI, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), diff --git a/src/entity/model/HitFloatingYellowBlock_gfx.c b/src/entity/model/HitFloatingYellowBlock_gfx.c index 602d554296..8d7e287883 100644 --- a/src/entity/model/HitFloatingYellowBlock_gfx.c +++ b/src/entity/model/HitFloatingYellowBlock_gfx.c @@ -20,7 +20,7 @@ Gfx Entity_HitFloatingYellowBlock_RenderBlock2[] = { gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -39,7 +39,7 @@ Gfx Entity_HitFloatingYellowBlock_RenderBlock1[] = { gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/HitRedBlock_gfx.c b/src/entity/model/HitRedBlock_gfx.c index 89b1adcbe4..a9ab4ac497 100644 --- a/src/entity/model/HitRedBlock_gfx.c +++ b/src/entity/model/HitRedBlock_gfx.c @@ -24,7 +24,7 @@ Gfx Entity_HitRedBlock_RenderBlock2[] = { gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -47,7 +47,7 @@ Gfx Entity_HitRedBlock_RenderBlock1[] = { gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/HitYellowBlock_gfx.c b/src/entity/model/HitYellowBlock_gfx.c index 457d8670f4..91bb1e9fd5 100644 --- a/src/entity/model/HitYellowBlock_gfx.c +++ b/src/entity/model/HitYellowBlock_gfx.c @@ -20,7 +20,7 @@ Gfx Entity_HitYellowBlock_RenderBlock2[] = { gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -39,7 +39,7 @@ Gfx Entity_HitYellowBlock_RenderBlock1[] = { gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaBeginChew_gfx.c b/src/entity/model/MunchlesiaBeginChew_gfx.c index 6cbb9f8e8e..e8800422ee 100644 --- a/src/entity/model/MunchlesiaBeginChew_gfx.c +++ b/src/entity/model/MunchlesiaBeginChew_gfx.c @@ -3335,7 +3335,7 @@ Gfx Entity_MunchlesiaBeginChew_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaChewing_gfx.c b/src/entity/model/MunchlesiaChewing_gfx.c index 8ff2a5251d..2260d488ec 100644 --- a/src/entity/model/MunchlesiaChewing_gfx.c +++ b/src/entity/model/MunchlesiaChewing_gfx.c @@ -140,7 +140,7 @@ Gfx Entity_MunchlesiaChewing_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaEnvelop_gfx.c b/src/entity/model/MunchlesiaEnvelop_gfx.c index be487553ae..e56fc9c39b 100644 --- a/src/entity/model/MunchlesiaEnvelop_gfx.c +++ b/src/entity/model/MunchlesiaEnvelop_gfx.c @@ -2936,7 +2936,7 @@ Gfx Entity_MunchlesiaEnvelop_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaGrab_gfx.c b/src/entity/model/MunchlesiaGrab_gfx.c index fd4b11c614..f92be1f4c2 100644 --- a/src/entity/model/MunchlesiaGrab_gfx.c +++ b/src/entity/model/MunchlesiaGrab_gfx.c @@ -2936,7 +2936,7 @@ Gfx Entity_MunchlesiaGrab_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaReset1_gfx.c b/src/entity/model/MunchlesiaReset1_gfx.c index 49880462ef..9f38bc45d6 100644 --- a/src/entity/model/MunchlesiaReset1_gfx.c +++ b/src/entity/model/MunchlesiaReset1_gfx.c @@ -3335,7 +3335,7 @@ Gfx Entity_MunchlesiaReset1_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaReset_gfx.c b/src/entity/model/MunchlesiaReset_gfx.c index b8f5fb9408..4875f726b4 100644 --- a/src/entity/model/MunchlesiaReset_gfx.c +++ b/src/entity/model/MunchlesiaReset_gfx.c @@ -2936,7 +2936,7 @@ Gfx Entity_MunchlesiaReset_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/MunchlesiaSpitOut_gfx.c b/src/entity/model/MunchlesiaSpitOut_gfx.c index cc4be97ce3..d8304fdf09 100644 --- a/src/entity/model/MunchlesiaSpitOut_gfx.c +++ b/src/entity/model/MunchlesiaSpitOut_gfx.c @@ -3335,7 +3335,7 @@ Gfx Entity_MunchlesiaSpitOut_Render[] = { gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/ShatteringBrickBlock.c b/src/entity/model/ShatteringBrickBlock.c index 1d991c7557..c668411e60 100644 --- a/src/entity/model/ShatteringBrickBlock.c +++ b/src/entity/model/ShatteringBrickBlock.c @@ -6,7 +6,7 @@ Gfx D_0A0022A0_E40500[] = { gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock(D_0A001AA0_E3FD00, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), @@ -333,7 +333,7 @@ Mtx Entity_ShatteringBrickBlock_FragmentsMatrices[] = { Gfx D_0A002998_E40BF8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -371,7 +371,7 @@ Gfx D_0A002A68_E40CC8[] = { Gfx D_0A002A80_E40CE0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -410,7 +410,7 @@ Gfx D_0A002B58_E40DB8[] = { Gfx D_0A002B70_E40DD0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -449,7 +449,7 @@ Gfx D_0A002C48_E40EA8[] = { Gfx D_0A002C60_E40EC0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -487,7 +487,7 @@ Gfx D_0A002D30_E40F90[] = { Gfx D_0A002D48_E40FA8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -515,7 +515,7 @@ Gfx D_0A002DE8_E41048[] = { Gfx D_0A002DF8_E41058[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -553,7 +553,7 @@ Gfx D_0A002EC8_E41128[] = { Gfx D_0A002EE0_E41140[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -587,7 +587,7 @@ Gfx D_0A002F90_E411F0[] = { Gfx D_0A002FA8_E41208[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -620,7 +620,7 @@ Gfx D_0A003050_E412B0[] = { Gfx D_0A003068_E412C8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -654,7 +654,7 @@ Gfx D_0A003118_E41378[] = { Gfx D_0A003130_E41390[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -691,7 +691,7 @@ Gfx D_0A0031F8_E41458[] = { Gfx D_0A003210_E41470[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -730,7 +730,7 @@ Gfx D_0A0032E8_E41548[] = { Gfx D_0A003300_E41560[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -768,7 +768,7 @@ Gfx D_0A0033D0_E41630[] = { Gfx D_0A0033E8_E41648[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -806,7 +806,7 @@ Gfx D_0A0034B8_E41718[] = { Gfx D_0A0034D0_E41730[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -844,7 +844,7 @@ Gfx D_0A0035A0_E41800[] = { Gfx D_0A0035B8_E41818[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -877,7 +877,7 @@ Gfx D_0A003660_E418C0[] = { Gfx D_0A003678_E418D8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -910,7 +910,7 @@ Gfx D_0A003720_E41980[] = { Gfx D_0A003738_E41998[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -943,7 +943,7 @@ Gfx D_0A0037E0_E41A40[] = { Gfx D_0A0037F8_E41A58[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -980,7 +980,7 @@ Gfx D_0A0038C0_E41B20[] = { Gfx D_0A0038D8_E41B38[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1019,7 +1019,7 @@ Gfx D_0A0039B0_E41C10[] = { Gfx D_0A0039C8_E41C28[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1057,7 +1057,7 @@ Gfx D_0A003A98_E41CF8[] = { Gfx D_0A003AB0_E41D10[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1095,7 +1095,7 @@ Gfx D_0A003B80_E41DE0[] = { Gfx D_0A003B98_E41DF8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1123,7 +1123,7 @@ Gfx D_0A003C38_E41E98[] = { Gfx D_0A003C48_E41EA8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1161,7 +1161,7 @@ Gfx D_0A003D18_E41F78[] = { Gfx D_0A003D30_E41F90[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1194,7 +1194,7 @@ Gfx D_0A003DD8_E42038[] = { Gfx D_0A003DF0_E42050[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), @@ -1227,7 +1227,7 @@ Gfx D_0A003E98_E420F8[] = { Gfx D_0A003EB0_E42110[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_CULL_BACK), diff --git a/src/entity/model/ShatteringHammer1Block.c b/src/entity/model/ShatteringHammer1Block.c index 3595ac999e..b6d50f0c8a 100644 --- a/src/entity/model/ShatteringHammer1Block.c +++ b/src/entity/model/ShatteringHammer1Block.c @@ -8,7 +8,7 @@ Gfx D_0A001460_E33880[] = { gsDPSetTextureLUT(G_TT_RGBA16), gsDPLoadTLUT_pal256(D_0A001260_E33680), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock(D_0A001060_E33480, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), @@ -335,7 +335,7 @@ Mtx Entity_ShatteringHammer1Block_FragmentsMatrices[] = { Gfx D_0A001B88_E33FA8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -374,7 +374,7 @@ Gfx D_0A001C60_E34080[] = { Gfx D_0A001C78_E34098[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -416,7 +416,7 @@ Gfx D_0A001D68_E34188[] = { Gfx D_0A001D80_E341A0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -456,7 +456,7 @@ Gfx D_0A001E60_E34280[] = { Gfx D_0A001E78_E34298[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -493,7 +493,7 @@ Gfx D_0A001F40_E34360[] = { Gfx D_0A001F58_E34378[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -529,7 +529,7 @@ Gfx D_0A002018_E34438[] = { Gfx D_0A002030_E34450[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -565,7 +565,7 @@ Gfx D_0A0020F0_E34510[] = { Gfx D_0A002108_E34528[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -600,7 +600,7 @@ Gfx D_0A0021C0_E345E0[] = { Gfx D_0A0021D8_E345F8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -635,7 +635,7 @@ Gfx D_0A002290_E346B0[] = { Gfx D_0A0022A8_E346C8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -669,7 +669,7 @@ Gfx D_0A002358_E34778[] = { Gfx D_0A002370_E34790[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -708,7 +708,7 @@ Gfx D_0A002448_E34868[] = { Gfx D_0A002460_E34880[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -749,7 +749,7 @@ Gfx D_0A002548_E34968[] = { Gfx D_0A002560_E34980[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -788,7 +788,7 @@ Gfx D_0A002638_E34A58[] = { Gfx D_0A002650_E34A70[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -823,7 +823,7 @@ Gfx D_0A002708_E34B28[] = { Gfx D_0A002720_E34B40[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -857,7 +857,7 @@ Gfx D_0A0027D0_E34BF0[] = { Gfx D_0A0027E8_E34C08[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -891,7 +891,7 @@ Gfx D_0A002898_E34CB8[] = { Gfx D_0A0028B0_E34CD0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -925,7 +925,7 @@ Gfx D_0A002960_E34D80[] = { Gfx D_0A002978_E34D98[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -958,7 +958,7 @@ Gfx D_0A002A20_E34E40[] = { Gfx D_0A002A38_E34E58[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -997,7 +997,7 @@ Gfx D_0A002B10_E34F30[] = { Gfx D_0A002B28_E34F48[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1038,7 +1038,7 @@ Gfx D_0A002C10_E35030[] = { Gfx D_0A002C28_E35048[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1077,7 +1077,7 @@ Gfx D_0A002D00_E35120[] = { Gfx D_0A002D18_E35138[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1113,7 +1113,7 @@ Gfx D_0A002DD8_E351F8[] = { Gfx D_0A002DF0_E35210[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1148,7 +1148,7 @@ Gfx D_0A002EA8_E352C8[] = { Gfx D_0A002EC0_E352E0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1183,7 +1183,7 @@ Gfx D_0A002F78_E35398[] = { Gfx D_0A002F90_E353B0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1217,7 +1217,7 @@ Gfx D_0A003040_E35460[] = { Gfx D_0A003058_E35478[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1251,7 +1251,7 @@ Gfx D_0A003108_E35528[] = { Gfx D_0A003120_E35540[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), diff --git a/src/entity/model/ShatteringHammer2Block.c b/src/entity/model/ShatteringHammer2Block.c index 5e78bac273..8425540eb6 100644 --- a/src/entity/model/ShatteringHammer2Block.c +++ b/src/entity/model/ShatteringHammer2Block.c @@ -6,7 +6,7 @@ Gfx D_0A001460_E36AD0[] = { gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock(D_0A001060_E366D0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), @@ -333,7 +333,7 @@ Mtx Entity_ShatteringHammer2Block_FragmentsMatrices[] = { Gfx D_0A001B58_E371C8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -372,7 +372,7 @@ Gfx D_0A001C30_E372A0[] = { Gfx D_0A001C48_E372B8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -414,7 +414,7 @@ Gfx D_0A001D38_E373A8[] = { Gfx D_0A001D50_E373C0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -454,7 +454,7 @@ Gfx D_0A001E30_E374A0[] = { Gfx D_0A001E48_E374B8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -491,7 +491,7 @@ Gfx D_0A001F10_E37580[] = { Gfx D_0A001F28_E37598[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -527,7 +527,7 @@ Gfx D_0A001FE8_E37658[] = { Gfx D_0A002000_E37670[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -563,7 +563,7 @@ Gfx D_0A0020C0_E37730[] = { Gfx D_0A0020D8_E37748[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -598,7 +598,7 @@ Gfx D_0A002190_E37800[] = { Gfx D_0A0021A8_E37818[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -633,7 +633,7 @@ Gfx D_0A002260_E378D0[] = { Gfx D_0A002278_E378E8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -667,7 +667,7 @@ Gfx D_0A002328_E37998[] = { Gfx D_0A002340_E379B0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -706,7 +706,7 @@ Gfx D_0A002418_E37A88[] = { Gfx D_0A002430_E37AA0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -747,7 +747,7 @@ Gfx D_0A002518_E37B88[] = { Gfx D_0A002530_E37BA0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -786,7 +786,7 @@ Gfx D_0A002608_E37C78[] = { Gfx D_0A002620_E37C90[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -821,7 +821,7 @@ Gfx D_0A0026D8_E37D48[] = { Gfx D_0A0026F0_E37D60[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -855,7 +855,7 @@ Gfx D_0A0027A0_E37E10[] = { Gfx D_0A0027B8_E37E28[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -889,7 +889,7 @@ Gfx D_0A002868_E37ED8[] = { Gfx D_0A002880_E37EF0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -923,7 +923,7 @@ Gfx D_0A002930_E37FA0[] = { Gfx D_0A002948_E37FB8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -956,7 +956,7 @@ Gfx D_0A0029F0_E38060[] = { Gfx D_0A002A08_E38078[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -995,7 +995,7 @@ Gfx D_0A002AE0_E38150[] = { Gfx D_0A002AF8_E38168[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1036,7 +1036,7 @@ Gfx D_0A002BE0_E38250[] = { Gfx D_0A002BF8_E38268[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1075,7 +1075,7 @@ Gfx D_0A002CD0_E38340[] = { Gfx D_0A002CE8_E38358[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1111,7 +1111,7 @@ Gfx D_0A002DA8_E38418[] = { Gfx D_0A002DC0_E38430[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1146,7 +1146,7 @@ Gfx D_0A002E78_E384E8[] = { Gfx D_0A002E90_E38500[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1181,7 +1181,7 @@ Gfx D_0A002F48_E385B8[] = { Gfx D_0A002F60_E385D0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1215,7 +1215,7 @@ Gfx D_0A003010_E38680[] = { Gfx D_0A003028_E38698[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1249,7 +1249,7 @@ Gfx D_0A0030D8_E38748[] = { Gfx D_0A0030F0_E38760[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), diff --git a/src/entity/model/ShatteringHammer3Block.c b/src/entity/model/ShatteringHammer3Block.c index 284586c8d6..e1cce7a800 100644 --- a/src/entity/model/ShatteringHammer3Block.c +++ b/src/entity/model/ShatteringHammer3Block.c @@ -8,7 +8,7 @@ Gfx D_0A001170_E39A00[] = { gsDPSetTextureLUT(G_TT_RGBA16), gsDPLoadTLUT_pal16(0, D_0A001150_E399E0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock_4b(D_0A001050_E398E0, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), @@ -335,7 +335,7 @@ Mtx Entity_ShatteringHammer3Block_FragmentsMatrices[] = { Gfx D_0A001898_E3A128[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -375,7 +375,7 @@ Gfx D_0A001978_E3A208[] = { Gfx D_0A001990_E3A220[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -418,7 +418,7 @@ Gfx D_0A001A88_E3A318[] = { Gfx D_0A001AA0_E3A330[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -459,7 +459,7 @@ Gfx D_0A001B88_E3A418[] = { Gfx D_0A001BA0_E3A430[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -497,7 +497,7 @@ Gfx D_0A001C70_E3A500[] = { Gfx D_0A001C88_E3A518[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -534,7 +534,7 @@ Gfx D_0A001D50_E3A5E0[] = { Gfx D_0A001D68_E3A5F8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -572,7 +572,7 @@ Gfx D_0A001E38_E3A6C8[] = { Gfx D_0A001E50_E3A6E0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -608,7 +608,7 @@ Gfx D_0A001F10_E3A7A0[] = { Gfx D_0A001F28_E3A7B8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -644,7 +644,7 @@ Gfx D_0A001FE8_E3A878[] = { Gfx D_0A002000_E3A890[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -678,7 +678,7 @@ Gfx D_0A0020B0_E3A940[] = { Gfx D_0A0020C8_E3A958[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -718,7 +718,7 @@ Gfx D_0A0021A8_E3AA38[] = { Gfx D_0A0021C0_E3AA50[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -760,7 +760,7 @@ Gfx D_0A0022B0_E3AB40[] = { Gfx D_0A0022C8_E3AB58[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -800,7 +800,7 @@ Gfx D_0A0023A8_E3AC38[] = { Gfx D_0A0023C0_E3AC50[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -836,7 +836,7 @@ Gfx D_0A002480_E3AD10[] = { Gfx D_0A002498_E3AD28[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -872,7 +872,7 @@ Gfx D_0A002558_E3ADE8[] = { Gfx D_0A002570_E3AE00[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -907,7 +907,7 @@ Gfx D_0A002628_E3AEB8[] = { Gfx D_0A002640_E3AED0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -942,7 +942,7 @@ Gfx D_0A0026F8_E3AF88[] = { Gfx D_0A002710_E3AFA0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -975,7 +975,7 @@ Gfx D_0A0027B8_E3B048[] = { Gfx D_0A0027D0_E3B060[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1014,7 +1014,7 @@ Gfx D_0A0028A8_E3B138[] = { Gfx D_0A0028C0_E3B150[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1055,7 +1055,7 @@ Gfx D_0A0029A8_E3B238[] = { Gfx D_0A0029C0_E3B250[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1094,7 +1094,7 @@ Gfx D_0A002A98_E3B328[] = { Gfx D_0A002AB0_E3B340[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1130,7 +1130,7 @@ Gfx D_0A002B70_E3B400[] = { Gfx D_0A002B88_E3B418[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1165,7 +1165,7 @@ Gfx D_0A002C40_E3B4D0[] = { Gfx D_0A002C58_E3B4E8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1200,7 +1200,7 @@ Gfx D_0A002D10_E3B5A0[] = { Gfx D_0A002D28_E3B5B8[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1234,7 +1234,7 @@ Gfx D_0A002DD8_E3B668[] = { Gfx D_0A002DF0_E3B680[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), @@ -1268,7 +1268,7 @@ Gfx D_0A002EA0_E3B730[] = { Gfx D_0A002EB8_E3B748[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), diff --git a/src/entity/model/TrumpetPlant_gfx.c b/src/entity/model/TrumpetPlant_gfx.c index 100f58d719..3c1e6e86fb 100644 --- a/src/entity/model/TrumpetPlant_gfx.c +++ b/src/entity/model/TrumpetPlant_gfx.c @@ -83,7 +83,7 @@ Gfx Entity_TrumpetPlant_RenderNode2[] = { gsSP2Triangles(22, 3, 5, 0, 22, 5, 21, 0), gsSP2Triangles(23, 0, 3, 0, 23, 3, 22, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; @@ -108,7 +108,7 @@ Gfx Entity_TrumpetPlant_RenderNode1[] = { gsSPVertex(&D_0A000000_E6D390[32], 4, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_04, PM_CC_04), gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), gsSPEndDisplayList(), }; diff --git a/src/entity/model/WoodenCrate.c b/src/entity/model/WoodenCrate.c index be2cd223bc..58c93dfa3b 100644 --- a/src/entity/model/WoodenCrate.c +++ b/src/entity/model/WoodenCrate.c @@ -8,7 +8,7 @@ Gfx Entity_WoodenCrate_LoadTexture1[] = { gsDPSetTextureLUT(G_TT_RGBA16), gsDPLoadTLUT_pal16(0, D_0A001D60_E533A0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetCombineMode(PM_CC_03, PM_CC_03), gsDPSetTextureDetail(G_TD_CLAMP), gsDPSetTextureLOD(G_TL_TILE), gsDPLoadTextureBlock_4b(D_0A001560_E52BA0, G_IM_FMT_CI, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), diff --git a/src/evt/f8f60_len_1560.c b/src/evt/f8f60_len_1560.c index 30de888b80..d6407c894c 100644 --- a/src/evt/f8f60_len_1560.c +++ b/src/evt/f8f60_len_1560.c @@ -189,87 +189,89 @@ ApiStatus AddVectorPolar(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4BDC(Evt* script, s32 initialCall) { - s32* t0 = &script->functionTemp[0]; - s32* t1 = &script->functionTemp[1]; +ApiStatus func_802D4BDC(Evt* script, s32 isInitialCall) { + s32* ready = &script->functionTemp[0]; + s32* progress = &script->functionTemp[1]; s32 t1v; - if (initialCall) { - *t0 = 0; - *t1 = 0; + if (isInitialCall) { + *ready = 0; + *progress = 0; } - if (*t0 == 0) { - t1v = *t1; + // always zero? + if (*ready == 0) { + t1v = *progress; if (t1v == 255) { return ApiStatus_DONE2; } t1v += 10; - *t1 = t1v; + *progress = t1v; if (t1v > 255) { - *t1 = 255; + *progress = 255; } - set_screen_overlay_params_back(10, *t1); + set_screen_overlay_params_back(OVERLAY_START_BATTLE, *progress); } return ApiStatus_BLOCK; } -ApiStatus func_802D4C4C(Evt* script, s32 initialCall) { - s32* t0 = &script->functionTemp[0]; - s32* t1 = &script->functionTemp[1]; +ApiStatus func_802D4C4C(Evt* script, s32 isInitialCall) { + s32* ready = &script->functionTemp[0]; + s32* progress = &script->functionTemp[1]; s32 t1v; - if (initialCall) { - *t0 = 0; - *t1 = 255; + if (isInitialCall) { + *ready = 0; + *progress = 255; } - if (*t0 == 0) { - t1v = *t1; + // always zero? + if (*ready == 0) { + t1v = *progress; if (t1v == 0) { - set_screen_overlay_params_back(255, -1.0f); + set_screen_overlay_params_back(OVERLAY_NONE, -1.0f); return ApiStatus_DONE2; } t1v -= 10; - *t1 = t1v; + *progress = t1v; if (t1v < 0) { - *t1 = 0; + *progress = 0; } - set_screen_overlay_params_back(10, *t1); + set_screen_overlay_params_back(OVERLAY_START_BATTLE, *progress); } return ApiStatus_BLOCK; } -ApiStatus func_802D4CC4(Evt* script, s32 initialCall) { +ApiStatus func_802D4CC4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 value = evt_get_variable(script, *args++); if (value < 0) { - set_screen_overlay_params_back(255, -1.0f); + set_screen_overlay_params_back(OVERLAY_NONE, -1.0f); } else { - set_screen_overlay_params_back(10, value); + set_screen_overlay_params_back(OVERLAY_START_BATTLE, value); } return ApiStatus_DONE2; } -ApiStatus func_802D4D14(Evt* script, s32 initialCall) { +ApiStatus func_802D4D14(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 value = evt_get_float_variable(script, *args++); - set_screen_overlay_center(0, 0, 0xC, 0x14); - set_screen_overlay_center(0, 1, 0x134, 0xDC); - set_screen_overlay_params_front(0xC, value); + set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 12, 20); + set_screen_overlay_center(SCREEN_LAYER_FRONT, 1, 308, 220); + set_screen_overlay_params_front(OVERLAY_BLUR, value); return ApiStatus_DONE2; } -ApiStatus func_802D4D88(Evt* script, s32 initialCall) { - set_screen_overlay_params_front(0xC, 0); +ApiStatus func_802D4D88(Evt* script, s32 isInitialCall) { + set_screen_overlay_params_front(OVERLAY_BLUR, 0); return ApiStatus_DONE2; } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index fadedb958e..601582290f 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -161,20 +161,20 @@ ApiStatus InterpMotionBlurParams(Evt* script, s32 isInitialCall) { if (isInitialCall) { script->functionTemp[0] = duration; - get_screen_overlay_params(1, &overlayType, &initialAmt); + get_screen_overlay_params(SCREEN_LAYER_BACK, &overlayType, &initialAmt); script->functionTemp[1] = initialAmt; - set_screen_overlay_center(1, 0, centerX0, centerY0); - set_screen_overlay_center(1, 1, centerX1, centerY1); + set_screen_overlay_center(SCREEN_LAYER_BACK, 0, centerX0, centerY0); + set_screen_overlay_center(SCREEN_LAYER_BACK, 1, centerX1, centerY1); } - get_screen_overlay_params(1, &overlayType, &initialAmt); + get_screen_overlay_params(SCREEN_LAYER_BACK, &overlayType, &initialAmt); // lerp from initialAmt (stored in functionTemp[1]) to finalAmt (stored in varTable[5]) delta = (script->functionTemp[1] - finalAmt); - set_screen_overlay_params_back(12, (delta * script->functionTemp[0] / duration) + finalAmt); + set_screen_overlay_params_back(OVERLAY_BLUR, (delta * script->functionTemp[0] / duration) + finalAmt); script->functionTemp[0]--; if (script->functionTemp[0] < 0) { - set_screen_overlay_params_back(12, finalAmt); + set_screen_overlay_params_back(OVERLAY_BLUR, finalAmt); return ApiStatus_DONE2; } return ApiStatus_BLOCK; diff --git a/src/evt/map_api.c b/src/evt/map_api.c index a418e86248..cd7703ab3a 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -699,7 +699,7 @@ void goto_map(Evt* script, s32 mode) { Bytecode* args = script->ptrReadPos; s16 mapID; s16 areaID; - s16 mapTransitionEffect = 0; + s16 mapTransitionEffect = TRANSITION_STANDARD; if (mode == 2) { areaID = evt_get_variable(script, *args++); diff --git a/src/evt/virtual_entity.c b/src/evt/virtual_entity.c index 345a022662..33b53a2811 100644 --- a/src/evt/virtual_entity.c +++ b/src/evt/virtual_entity.c @@ -11,7 +11,7 @@ void virtual_entity_appendGfx_quad(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u1 gDPPipeSync(gMainGfxPos++); if (a == 0xFF) { - 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); diff --git a/src/filemenu/filemenu_msg.c b/src/filemenu/filemenu_msg.c index 3bbd0821e4..aa22769cd1 100644 --- a/src/filemenu/filemenu_msg.c +++ b/src/filemenu/filemenu_msg.c @@ -207,7 +207,7 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) { } if (flag2) { - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); filemenu_draw_rect((x + 2) * 4, (y + 2) * 4, (2 + x + texSizeX) * 4, (2 + y + texSizeY) * 4, 0, 0, 0, 0x400, 0x400); gDPPipeSync(gMainGfxPos++); @@ -245,7 +245,7 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) { gDPLoadTextureBlock_4b(gMainGfxPos++, &filemenu_glyphBuffer[*offsetPtr][0], G_IM_FMT_CI, 16, 16, 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); if (flag2) { - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); filemenu_draw_rect((x + 2) * 4, (y + 2) * 4, (x + 18) * 4, (y + 18) * 4, 0, 0, 0, 0x400, 0x400); gDPPipeSync(gMainGfxPos++); diff --git a/src/filemenu/filemenu_styles.c b/src/filemenu/filemenu_styles.c index 3f107d87b2..79b1f29775 100644 --- a/src/filemenu/filemenu_styles.c +++ b/src/filemenu/filemenu_styles.c @@ -25,8 +25,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, 1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_7, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_4, G_CC_PASS2), .color1 = { 64, 92, 246, 255 }, .color2 = { 0, 0, 0, 0 }, }, @@ -52,7 +52,7 @@ WindowStyleCustom filemenu_windowStyles[] = { }, .unk_1C = { 0, 0, 0, 0}, .opaqueCombineMode = gsDPNoOp(), - .transparentCombineMode = gsDPNoOp(), + .transparentCombineMode = gsDPNoOp(), .color1 = { 0, 255, 0, 0 }, .color2 = { 0, 0, 0, 0 }, }, @@ -78,7 +78,7 @@ WindowStyleCustom filemenu_windowStyles[] = { }, .unk_1C = { 0, 0, 0, 0}, .opaqueCombineMode = gsDPNoOp(), - .transparentCombineMode = gsDPNoOp(), + .transparentCombineMode = gsDPNoOp(), .color1 = { 0, 0, 0, 0 }, .color2 = { 0, 0, 0, 0 }, }, @@ -103,8 +103,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_5, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_6, G_CC_PASS2), .color1 = { 0, 0, 0, 255 }, .color2 = { 0, 0, 0, 0 }, }, @@ -129,8 +129,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 215, 140, 150, 255 }, .color2 = { 125, 45, 35, 255 }, }, @@ -155,8 +155,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 215, 140, 150, 255 }, .color2 = { 125, 45, 35, 255 }, }, @@ -181,8 +181,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 215, 140, 150, 255 }, .color2 = { 125, 45, 35, 255 }, }, @@ -207,8 +207,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 200, 200, 200, 255 }, .color2 = { 130, 130, 101, 255 }, }, @@ -233,8 +233,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 200, 200, 200, 255 }, .color2 = { 130, 130, 101, 255 }, }, @@ -259,8 +259,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 200, 200, 200, 255 }, .color2 = { 130, 130, 101, 255 }, }, @@ -285,8 +285,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 200, 200, 200, 255 }, .color2 = { 130, 130, 101, 255 }, }, @@ -311,8 +311,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 88, 92, 68, 255 }, .color2 = { 152, 143, 130, 255 }, }, @@ -337,8 +337,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 88, 92, 68, 255 }, .color2 = { 152, 143, 130, 255 }, }, @@ -363,8 +363,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 88, 92, 68, 255 }, .color2 = { 152, 143, 130, 255 }, }, @@ -389,8 +389,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 88, 92, 68, 255 }, .color2 = { 152, 143, 130, 255 }, }, @@ -415,8 +415,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 200, 200, 200, 255 }, .color2 = { 130, 130, 101, 255 }, }, @@ -441,8 +441,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 255, 255, 255, 255 }, .color2 = { 200, 200, 170, 255 }, }, @@ -467,8 +467,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 88, 92, 68, 255 }, .color2 = { 152, 143, 130, 255 }, }, @@ -493,8 +493,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 255, 238, 106, 255 }, .color2 = { 146, 100, 26, 255 }, }, @@ -519,8 +519,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_5, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_6, G_CC_PASS2), .color1 = { 0, 0, 0, 255 }, .color2 = { 0, 0, 0, 0 }, }, @@ -545,8 +545,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_5, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_6, G_CC_PASS2), .color1 = { 0, 0, 0, 255 }, .color2 = { 0, 0, 0, 0 }, }, @@ -571,8 +571,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(0, 0, 0, TEXEL1, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_5, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_6, G_CC_PASS2), .color1 = { 0, 0, 0, 255 }, .color2 = { 0, 0, 0, 0 }, }, @@ -597,8 +597,8 @@ WindowStyleCustom filemenu_windowStyles[] = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 255, 255, 255, 255 }, .color2 = { 200, 200, 170, 255 }, }, diff --git a/src/hud_element.c b/src/hud_element.c index 21a7be78eb..5730d73375 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -486,7 +486,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } 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); } if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { @@ -516,7 +516,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s } } else { gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, 72); } @@ -1574,8 +1574,7 @@ void render_hud_element(HudElement* hudElement) { vtx[3].v.tc[1] = 0; gDPPipeSync(gMainGfxPos++); - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); gDPSetPrimColor(gMainGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); diff --git a/src/imgfx.c b/src/imgfx.c index bc44849e96..9b680064a5 100644 --- a/src/imgfx.c +++ b/src/imgfx.c @@ -901,9 +901,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { if (primAlpha <= 0) { return; } - 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, primAlpha); break; case IMGFX_RENDER_MULTIPLY_RGBA: @@ -956,9 +954,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { case IMGFX_RENDER_MULTIPLY_SHADE_ALPHA: // color: texture // alpha: texture * vtx color - gDPSetCombineLERP(gMainGfxPos++, - 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, - 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; @@ -1003,9 +999,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; // color: blend texure and noise // alpha: texure * prim - gDPSetCombineLERP(gMainGfxPos++, - NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, - NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_IMGFX_HOLOGRAM, PM_CC_IMGFX_HOLOGRAM); gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.hologram.noiseAmt, state->ints.hologram.noiseAmt, @@ -1015,9 +1009,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; // color: texture // alpha: texture * prim - 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, primAlpha); gDPSetAlphaCompare(gMainGfxPos++, G_AC_DITHER); } else if (state->ints.hologram.mode == IMGFX_HOLOGRAM_THRESHOLD) { @@ -1028,9 +1020,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; // color: texture // alpha: texture * prim - 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); gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_THRESHOLD); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primAlpha); @@ -1040,9 +1030,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { case IMGFX_RENDER_COLOR_FILL: // color: prim // alpha: texture - gDPSetCombineLERP(gMainGfxPos++, - 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, - 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_IMGFX_COLOR_FILL, PM_CC_IMGFX_COLOR_FILL); gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color.r, state->ints.color.g, state->ints.color.b, 0); break; @@ -1056,9 +1044,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { case IMGFX_RENDER_OVERLAY_RGBA: // color: texture // alpha: texture * prim - 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, state->ints.overlay.alpha); break; } @@ -1554,12 +1540,10 @@ void imgfx_appendGfx_mesh_basic(ImgFXState* state, Matrix4f mtx) { gDPSetRenderMode(gMainGfxPos++, G_RM_PASS, state->otherModeL); if (alpha == -1) { - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL1, 0, 0, 0, 0, 0, 0, - 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_0D, PM_CC_0C); } else { gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, - 0, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_0B, PM_CC_0C); } gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[i], 4, 0); @@ -1612,8 +1596,7 @@ void imgfx_appendGfx_mesh_basic(ImgFXState* state, Matrix4f mtx) { gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0); } else { gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, - ENVIRONMENT, 0, TEXEL0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_0A, PM_CC_0A); } gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[i], 4, 0); @@ -1628,8 +1611,7 @@ void imgfx_appendGfx_mesh_basic(ImgFXState* state, Matrix4f mtx) { gDPSetEnvColor(gMainGfxPos++, 100, 100, 100, 255); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha2); - gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0, SHADE, - ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0); + gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0); gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); } } @@ -1800,9 +1782,7 @@ void imgfx_appendGfx_mesh_strip(ImgFXState* state, Matrix4f mtx) { if (state->renderType == IMGFX_RENDER_OVERLAY_RGBA) { s32 alpha = state->ints.overlay.alpha; gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); } else { gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } diff --git a/src/input.c b/src/input.c index 8a98e69cec..811a536492 100644 --- a/src/input.c +++ b/src/input.c @@ -37,12 +37,12 @@ void update_input(void) { nuContDataGet(contData, 0); } - if (gGameStatusPtr->demoState != 0) { - if (gGameStatusPtr->demoState < 2 && - (contData->button & (BUTTON_A | BUTTON_B | BUTTON_Z | BUTTON_START)) && - handleInput) - { - gGameStatusPtr->demoState = 2; + if (gGameStatusPtr->demoState != DEMO_STATE_NONE) { + if (gGameStatusPtr->demoState < DEMO_STATE_CHANGE_MAP + && (contData->button & (BUTTON_A | BUTTON_B | BUTTON_Z | BUTTON_START)) + && handleInput + ) { + gGameStatusPtr->demoState = DEMO_STATE_CHANGE_MAP; } contData->button = gGameStatusPtr->demoButtonInput; contData->stick_x = gGameStatusPtr->demoStickX; diff --git a/src/intro_logos.c b/src/intro_logos.c index 5460d2d259..3053d8f55c 100644 --- a/src/intro_logos.c +++ b/src/intro_logos.c @@ -35,6 +35,6 @@ s32 intro_logos_fade_out(s16 addAlpha) { } void intro_logos_update_fade(void) { - set_screen_overlay_params_front(0, gGameStatusPtr->bootAlpha); - set_screen_overlay_color(0, gGameStatusPtr->bootBlue, gGameStatusPtr->bootGreen, gGameStatusPtr->bootRed); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, gGameStatusPtr->bootAlpha); + set_screen_overlay_color(SCREEN_LAYER_FRONT, gGameStatusPtr->bootBlue, gGameStatusPtr->bootGreen, gGameStatusPtr->bootRed); } diff --git a/src/msg.c b/src/msg.c index d2f4bb32e0..a2c67a65d3 100644 --- a/src/msg.c +++ b/src/msg.c @@ -64,7 +64,7 @@ Gfx D_8014C2D8[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetRenderMode(IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | G_RM_PASS, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), - gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetCombineMode(PM_CC_13, G_CC_PASS2), gsSPEndDisplayList(), }; @@ -2186,7 +2186,7 @@ void msg_draw_choice_pointer(MessagePrintState* printer) { gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); gDPLoadTLUT_pal16(gMainGfxPos++, 0, ui_point_right_pal); gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, shadowAlpha); draw_image_with_clipping(ui_point_right_png, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, posX + 2, posY + 2, 10, 10, 300, 220); draw_ci_image_with_clipping(ui_point_right_png, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, ui_point_right_pal, posX, posY, 20, 20, 300, 200, pointerAlpha); @@ -2269,7 +2269,7 @@ void draw_number(s32 value, s32 x, s32 y, s32 charset, s32 palette, s32 opacity, for (i = 0; i < count; i++) { gDPPipeSync(gMainGfxPos++); gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, 72); draw_digit(raster + digits[i] * texSize, charset, digitPosX[i] + 2, y + 2); gDPPipeSync(gMainGfxPos++); @@ -2281,7 +2281,7 @@ void draw_number(s32 value, s32 x, s32 y, s32 charset, s32 palette, s32 opacity, gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_01, PM_CC_01); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, opacity); } @@ -3208,7 +3208,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit break; case MSG_FX_NOISE_OUTLINE: msg_drawState->effectFlags |= MSG_FX_FLAG_NOISE_OUTLINE; - gDPSetCombineLERP(gMainGfxPos++, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_MSG_NOISE_OUTLINE, PM_CC_MSG_NOISE_OUTLINE); msg_drawState->drawBufferPos += 2; break; case MSG_FX_STATIC: @@ -3218,8 +3218,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], 0); - gDPSetCombineLERP(gMainGfxPos++, NOISE, TEXEL0, ENVIRONMENT, TEXEL0, 0, 0, 0, TEXEL0, NOISE, TEXEL0, ENVIRONMENT, - TEXEL0, 0, 0, 0, TEXEL0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_MSG_STATIC, PM_CC_MSG_STATIC); msg_drawState->drawBufferPos += 3; break; case MSG_FX_BLUR: @@ -3420,7 +3419,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit G_BL_1MA)); } - 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, phi_s2_5); } else if ((sp96 < 0xFF) && (phi_s2_5 == 0xFF)) { gDPPipeSync(gMainGfxPos++); @@ -3562,8 +3561,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit if ((msg_drawState->effectFlags & MSG_FX_FLAG_DROP_SHADOW) && (phi_s2_5 == 0xFF)) { gDPPipeSync(gMainGfxPos++); gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, - PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, 72); msg_draw_char(printer, msg_drawState, msg_drawState->printBuffer[msg_drawState->drawBufferPos], @@ -3762,7 +3760,7 @@ void appendGfx_msg_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 ulX, u16 ulY, u16 lrX, gDPPipeSync(gMainGfxPos++); if (a == 255) { - 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); @@ -3863,8 +3861,7 @@ void msg_draw_speech_bubble( GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - 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, 32, 32, 32, opacity); } @@ -3996,7 +3993,7 @@ void msg_draw_speech_arrow(MessagePrintState* printer) { gDPPipeSync(gMainGfxPos++); gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - 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); gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); gDPSetPrimColor(gMainGfxPos++, 0, 0, 32, 32, 32, 255); gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_arrow_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); @@ -4054,7 +4051,7 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal gDPPipeSync(gMainGfxPos++); gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - 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); if (fading == 0 || bgAlpha == 255) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 216); } else { @@ -4222,7 +4219,7 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal gDPPipeSync(gMainGfxPos++); 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, frameAlpha); gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); gDPLoadTLUT_pal16(gMainGfxPos++, 0, ui_msg_palettes[palette]); diff --git a/src/pause/pause_gfx.c b/src/pause/pause_gfx.c index 298003985f..f811d41453 100644 --- a/src/pause/pause_gfx.c +++ b/src/pause/pause_gfx.c @@ -272,7 +272,7 @@ Gfx gPauseDLOrbs[] = { gsDPSetTextureLUT(G_TT_NONE), gsDPLoadTextureTile(pause_orbs_png, G_IM_FMT_RGBA, G_IM_SIZ_16b, pause_orbs_png_width, pause_orbs_png_height, 0, 0, pause_orbs_png_width - 1, pause_orbs_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 3, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPSetRenderMode(AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0), + gsDPSetCombineMode(PM_CC_01, PM_CC_01), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), gsSPEndDisplayList(), diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index 4a02e54bdd..bb0e354c3c 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -187,7 +187,7 @@ Gfx gPausePartnersDL[] = { gsDPSetTextureFilter(G_TF_POINT), gsDPSetTextureConvert(G_TC_FILT), gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1), + gsDPSetCombineMode(PM_CC_0F, PM_CC_0F), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), gsSPEndDisplayList() diff --git a/src/pause/pause_styles.c b/src/pause/pause_styles.c index 13df1b0ea3..2cb23f38a8 100644 --- a/src/pause/pause_styles.c +++ b/src/pause/pause_styles.c @@ -28,8 +28,8 @@ WindowStyleCustom gPauseWS_0 = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_CONST_0, PM_CC_CONST_0), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_4, G_CC_PASS2), .color1 = { 64, 92, 246, 255 }, .color2 = { 0, 0, 0, 0 }, }; @@ -54,8 +54,8 @@ WindowStyleCustom gPauseWS_1 = { .unk_0D = { 0, 0, 0} }, .unk_1C = { 0, 0, 0, 0}, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 226, 225, 216, 255 }, .color2 = { 217, 208, 201, 0 }, }; @@ -80,8 +80,8 @@ WindowStyleCustom gPauseWS_2 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 226, 225, 216, 255 }, .color2 = { 217, 208, 201, 0 }, }; @@ -106,8 +106,8 @@ WindowStyleCustom gPauseWS_3 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 240, 199, 78, 255 }, .color2 = { 127, 86, 23, 0 }, }; @@ -132,8 +132,8 @@ WindowStyleCustom gPauseWS_4 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 0xFD, 0x74, 0x4A, 0xFF }, .color2 = { 0x74, 0x30, 0x1B, 0x00 }, }; @@ -158,8 +158,8 @@ WindowStyleCustom gPauseWS_5 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 39, 72, 225, 255 }, .color2 = { 9, 26, 102, 0 }, }; @@ -184,8 +184,8 @@ WindowStyleCustom gPauseWS_6 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 34, 238, 201, 255 }, .color2 = { 7, 109, 90, 0 }, }; @@ -210,8 +210,8 @@ WindowStyleCustom gPauseWS_7 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 104, 255, 81, 255 }, .color2 = { 42, 121, 30, 0 }, }; @@ -236,8 +236,8 @@ WindowStyleCustom gPauseWS_8 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 173, 114, 194, 255 }, .color2 = { 76, 47, 87, 0 }, }; @@ -288,8 +288,8 @@ WindowStyleCustom gPauseWS_10 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 240, 199, 78, 255 }, .color2 = { 127, 86, 23, 0 }, }; @@ -314,8 +314,8 @@ WindowStyleCustom gPauseWS_11 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 213, 165, 116, 255 }, .color2 = { 96, 72, 48, 96 }, }; @@ -340,8 +340,8 @@ WindowStyleCustom gPauseWS_12 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 226, 216, 179, 255 }, .color2 = { 210, 192, 144, 0 }, }; @@ -366,8 +366,8 @@ WindowStyleCustom gPauseWS_13 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 253, 116, 74, 255 }, .color2 = { 116, 48, 27, 0 }, }; @@ -392,8 +392,8 @@ WindowStyleCustom gPauseWS_14 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 245, 185, 160, 255 }, .color2 = { 203, 153, 128, 255 }, }; @@ -418,8 +418,8 @@ WindowStyleCustom gPauseWS_15 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 216, 191, 182, 255 }, .color2 = { 225, 209, 209, 0 }, }; @@ -444,8 +444,8 @@ WindowStyleCustom gPauseWS_16 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 202, 170, 165, 255 }, .color2 = { 226, 200, 200, 0 }, }; @@ -470,8 +470,8 @@ WindowStyleCustom gPauseWS_17 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 39, 72, 225, 255 }, .color2 = { 9, 26, 102, 0 }, }; @@ -496,8 +496,8 @@ WindowStyleCustom gPauseWS_18 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 198, 207, 222, 255 }, .color2 = { 214, 223, 236, 0 }, }; @@ -522,8 +522,8 @@ WindowStyleCustom gPauseWS_19 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 207, 210, 242, 255 }, .color2 = { 184, 190, 217, 0 }, }; @@ -548,8 +548,8 @@ WindowStyleCustom gPauseWS_20 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 202, 217, 214, 255 }, .color2 = { 176, 206, 206, 0 }, }; @@ -574,8 +574,8 @@ WindowStyleCustom gPauseWS_21 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 222, 237, 234, 255 }, .color2 = { 196, 226, 226, 0 }, }; @@ -600,8 +600,8 @@ WindowStyleCustom gPauseWS_22 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 14, 218, 181, 255 }, .color2 = { 127, 127, 127, 0 }, }; @@ -626,8 +626,8 @@ WindowStyleCustom gPauseWS_23 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 193, 225, 193, 255 }, .color2 = { 169, 215, 169, 0 }, }; @@ -652,8 +652,8 @@ WindowStyleCustom gPauseWS_24 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 104, 255, 81, 255 }, .color2 = { 42, 121, 30, 0 }, }; @@ -678,8 +678,8 @@ WindowStyleCustom gPauseWS_25 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 207, 250, 200, 255 }, .color2 = { 206, 239, 192, 0 }, }; @@ -704,8 +704,8 @@ WindowStyleCustom gPauseWS_26 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 216, 202, 219, 255 }, .color2 = { 205, 180, 209, 0 }, }; @@ -730,8 +730,8 @@ WindowStyleCustom gPauseWS_27 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, COMBINED, 0, TEXEL0, 0, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_2, PM_CC_WINDOW_1), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_WINDOW_3, PM_CC_WINDOW_1), .color1 = { 236, 222, 239, 255 }, .color2 = { 225, 200, 229, 0 }, }; @@ -756,8 +756,8 @@ WindowStyleCustom gPauseWS_28 = { .unk_0D = { 0, 0, 0 }, }, .unk_1C = { 0, 0, 0, 0 }, - .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .opaqueCombineMode = gsDPSetCombineMode(PM_CC_15, G_CC_PASS2), + .transparentCombineMode = gsDPSetCombineMode(PM_CC_14, G_CC_PASS2), .color1 = { 173, 114, 194, 255 }, .color2 = { 76, 47, 87, 0 }, }; diff --git a/src/rumble.c b/src/rumble.c index 6ec51f5f46..765fc4f541 100644 --- a/src/rumble.c +++ b/src/rumble.c @@ -13,7 +13,7 @@ void poll_rumble(void) { } void start_rumble(s32 freq, s32 nframes) { - if (gGameStatusPtr->demoState == 0) { + if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { if (rumbleMaxDuration != 0) { #if !VERSION_JP s32 maxFrames = rumbleMaxDuration * 2; diff --git a/src/sprite.c b/src/sprite.c index 15bee9391e..d8b1ae93d6 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -62,7 +62,7 @@ Gfx D_802DF3F0[] = { Gfx D_802DF428[] = { gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0), + gsDPSetCombineMode(PM_CC_02, PM_CC_02), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2), @@ -253,7 +253,7 @@ void spr_appendGfx_component_flat( } gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, 0, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_0B, PM_CC_0C); gSPVertex(gMainGfxPos++, vertices, 4, 0); gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); gDPPipeSync(gMainGfxPos++); @@ -277,8 +277,7 @@ void spr_appendGfx_component_flat( } gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, ENVIRONMENT, 0, - TEXEL0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_0A, PM_CC_0A); gSPVertex(gMainGfxPos++, vertices, 4, 0); gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); gDPPipeSync(gMainGfxPos++); @@ -294,8 +293,7 @@ void spr_appendGfx_component_flat( gDPSetEnvColor(gMainGfxPos++, 100, 100, 100, 255); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); - gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, SHADE, - ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); } } diff --git a/src/sprite_shading.c b/src/sprite_shading.c index c5f0da6471..e194a717db 100644 --- a/src/sprite_shading.c +++ b/src/sprite_shading.c @@ -382,8 +382,7 @@ void appendGfx_shading_palette( } gDPSetPrimColor(gMainGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); - gDPSetCombineLERP(gMainGfxPos++, TEXEL1, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, COMBINED, TEXEL0, COMBINED_ALPHA, - TEXEL0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL1, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, COMBINED, TEXEL0, COMBINED_ALPHA, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SpriteShadingPalette); gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 16, 1); @@ -395,8 +394,7 @@ void appendGfx_shading_palette( gDPSetPrimColor(gMainGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); gDPSetEnvColor(gMainGfxPos++, highlightR, highlightG, highlightB, 0); - gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1, - PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1, PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1); gSPTextureRectangle(gMainGfxPos++, 0, 0, 16 << 2, 1 << 2, 2, 0, 0, 4 << 10, 1 << 10); gDPPipeSync(gMainGfxPos++); gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); @@ -419,11 +417,9 @@ void appendGfx_shading_palette( gDPSetEnvColor(gMainGfxPos++, 100, 100, 100, 255); if (alpha == 255) { - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, SHADE, ENVIRONMENT, COMBINED, - COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, SHADE, ENVIRONMENT, COMBINED, COMBINED, 0, 0, 0, COMBINED); } else { - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, PRIMITIVE, 0, TEXEL1, 0, SHADE, ENVIRONMENT, COMBINED, - COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, PRIMITIVE, 0, TEXEL1, 0, SHADE, ENVIRONMENT, COMBINED, COMBINED, 0, 0, 0, COMBINED); } offsetX = offsetXComp * facingDir; @@ -442,12 +438,8 @@ void func_801491E4(Matrix4f mtx, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 alp gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); if (alpha == 255) { - gDPSetCombineLERP(gMainGfxPos++, - 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, - 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_WINDOW_5, G_CC_PASS2); } else { - gDPSetCombineLERP(gMainGfxPos++, - 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_02, G_CC_PASS2); } } diff --git a/src/state_battle.c b/src/state_battle.c index 838d877f27..cb6b5211a1 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -9,6 +9,7 @@ extern u16 gFrameBuf0[]; extern u16 gFrameBuf1[]; extern u16 gFrameBuf2[]; + u16* bFrameBuffers[] = { gFrameBuf0, gFrameBuf1, gFrameBuf2 }; diff --git a/src/state_demo.c b/src/state_demo.c index 6fc6ba33b4..86f7f99f8b 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -133,27 +133,17 @@ DemoSceneData DemoScenes[] = { .partnerID = PARTNER_NONE, .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE }, - { + [LAST_DEMO_SCENE_IDX] { .sceneType = DEMO_SCENE_DONE, .mapName = "end" }, {} // final entry blank }; -#if VERSION_JP -char versionString[] = "Prg Ver.00/07/06 22:22"; -#elif VERSION_US -char versionString[] = "Prg Ver.00/12/05 16:54"; -#elif VERSION_IQUE -char versionString[] = "Prg Ver.04/05/18 10:52"; -#else -char versionString[] = "Prg Ver.??/??/?? ??:??"; -#endif - void state_init_demo(void) { - if (gGameStatusPtr->demoState == 0) { + if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { gGameStatusPtr->nextDemoScene = 0; - gGameStatusPtr->demoState = 1; + gGameStatusPtr->demoState = DEMO_STATE_ACTIVE; } gGameStatusPtr->demoButtonInput = 0; @@ -161,8 +151,8 @@ void state_init_demo(void) { gGameStatusPtr->demoStickY = 0; disable_sounds(); - set_map_transition_effect(2); - set_screen_overlay_params_front(0, 255.0f); + set_map_transition_effect(TRANSITION_END_DEMO_SCENE_BLACK); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 255.0f); clear_saved_variables(); clear_script_list(); } @@ -174,10 +164,10 @@ void state_step_demo(void) { s16 mapID; s16 areaID; - if (gGameStatusPtr->demoState == 4) { + if (gGameStatusPtr->demoState == DEMO_STATE_4) { mode = DEMO_SCENE_DONE; } - if (gGameStatusPtr->demoState == 5) { + if (gGameStatusPtr->demoState == DEMO_STATE_DONE) { mode = DEMO_SCENE_EXIT; } @@ -188,7 +178,7 @@ void state_step_demo(void) { gGameStatusPtr->introState = INTRO_STATE_3; gOverrideFlags |= GLOBAL_OVERRIDES_8; intro_logos_update_fade(); - gGameStatusPtr->demoState = 5; + gGameStatusPtr->demoState = DEMO_STATE_DONE; break; case DEMO_SCENE_EXIT: if (gGameStatusPtr->introState != INTRO_STATE_0) { @@ -197,7 +187,7 @@ void state_step_demo(void) { if (gGameStatusPtr->introState == INTRO_STATE_0) { gGameStatusPtr->nextDemoScene = 0; - gGameStatusPtr->demoState = 0; + gGameStatusPtr->demoState = DEMO_STATE_NONE; gGameStatusPtr->peachFlags = 0; enable_sounds(); gGameStatusPtr->isBattle = FALSE; @@ -244,9 +234,9 @@ void state_step_demo(void) { evt_set_variable(NULL, GB_StoryProgress, demoSceneData->storyProgress); if (gGameStatusPtr->nextDemoScene == 0) { - set_map_transition_effect(3); + set_map_transition_effect(TRANSITION_END_DEMO_SCENE_WHITE); } else { - set_map_transition_effect(2); + set_map_transition_effect(TRANSITION_END_DEMO_SCENE_BLACK); } set_game_mode(GAME_MODE_ENTER_DEMO_WORLD); @@ -262,9 +252,9 @@ void state_step_demo(void) { evt_set_variable(NULL, GB_StoryProgress, demoSceneData->storyProgress); if (gGameStatusPtr->nextDemoScene == 0) { - set_map_transition_effect(3); + set_map_transition_effect(TRANSITION_END_DEMO_SCENE_WHITE); } else { - set_map_transition_effect(2); + set_map_transition_effect(TRANSITION_END_DEMO_SCENE_BLACK); } set_game_mode(GAME_MODE_ENTER_DEMO_WORLD); @@ -275,8 +265,8 @@ void state_step_demo(void) { } gGameStatusPtr->nextDemoScene++; - if (gGameStatusPtr->nextDemoScene > ARRAY_COUNT(DemoScenes) - 2) { - gGameStatusPtr->nextDemoScene = ARRAY_COUNT(DemoScenes) - 2; + if (gGameStatusPtr->nextDemoScene > LAST_DEMO_SCENE_IDX) { + gGameStatusPtr->nextDemoScene = LAST_DEMO_SCENE_IDX; } } @@ -284,4 +274,14 @@ void state_drawUI_demo(void) { } +#if VERSION_JP +char versionString[] = "Prg Ver.00/07/06 22:22"; +#elif VERSION_US +char versionString[] = "Prg Ver.00/12/05 16:54"; +#elif VERSION_IQUE +char versionString[] = "Prg Ver.04/05/18 10:52"; +#else +char versionString[] = "Prg Ver.??/??/?? ??:??"; +#endif + static const f32 pad[] = {0.0f, 0.0f}; diff --git a/src/state_file_select.c b/src/state_file_select.c index da3e916f53..5629cb9b95 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -46,7 +46,7 @@ void state_init_language_select(void) { D_800A0932[0] = 0; disable_player_input(); set_time_freeze_mode(TIME_FREEZE_FULL); - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); } void state_init_file_select(void) { @@ -99,7 +99,7 @@ void state_step_language_select(void) { if (D_800A0932[0] > 255) { D_800A0932[0] = 255; } - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); if (D_800A0932[0] == 255) { D_800A0931 = 1; @@ -156,7 +156,7 @@ void state_step_language_select(void) { nuPiReadRomOverlay(&D_8007798C); filemenu_init(TRUE); gOverrideFlags &= ~GLOBAL_OVERRIDES_8; - set_screen_overlay_params_front(255, 255.0f); + set_screen_overlay_params_front(OVERLAY_NONE, 255.0f); } if (D_800A0930 >= 0) { break; @@ -168,7 +168,7 @@ void state_step_language_select(void) { if (D_800A0932[0] < 0) { D_800A0932[0] = 0; } - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); break; } } @@ -213,10 +213,10 @@ void state_drawUI_file_select(void) { void state_init_exit_language_select(void) { if (D_800A0932[0] > 0) { D_800A0931 = 0; - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); } else { D_800A0931 = 1; - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); } D_800A0930 = 1; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -228,9 +228,9 @@ void state_init_exit_file_select(void) { D_800A0930 = 0; if (func_80244BC4() == 0) { - set_map_transition_effect(7); + set_map_transition_effect(TRANSITION_SLOW_FADE_TO_WHITE); } else { - set_map_transition_effect(8); + set_map_transition_effect(TRANSITION_ENTER_WORLD); gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS; bgm_set_song(0, -1, 0, 1000, 8); } @@ -245,7 +245,7 @@ void state_step_exit_language_select(void) { if (D_800A0932[0] < 0) { D_800A0932[0] = 0; } - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); if (D_800A0932[0] == 0) { D_800A0931 = 1; } @@ -259,7 +259,7 @@ void state_step_exit_language_select(void) { if (D_800A0932[0] > 255) { D_800A0932[0] = 255; } - set_screen_overlay_params_front(0U, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); if (D_800A0932[0] == 255) { D_800A0931 = 2; } @@ -339,7 +339,7 @@ void state_step_exit_language_select(void) { if (D_800A0932[0] < 0) { D_800A0932[0] = 0; } - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); } break; case 3: @@ -355,7 +355,7 @@ void state_step_exit_language_select(void) { if (D_800A0932[0] < 0) { D_800A0932[0] = 0; } - set_screen_overlay_params_front(0, D_800A0932[0]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_800A0932[0]); } break; case 4: @@ -366,7 +366,7 @@ void state_step_exit_language_select(void) { update_effects(); enable_player_input(); set_game_mode(GAME_MODE_CHANGE_MAP); - set_screen_overlay_params_front(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); break; } } diff --git a/src/state_intro.c b/src/state_intro.c index 391b56b2fe..3d97e0925f 100644 --- a/src/state_intro.c +++ b/src/state_intro.c @@ -67,7 +67,7 @@ void state_init_intro(void) { } set_screen_overlay_params_back(D_800A0963, D_800A0954); - set_screen_overlay_color(1, D_800A095B, D_800A095D, D_800A095F); + set_screen_overlay_color(SCREEN_LAYER_BACK, D_800A095B, D_800A095D, D_800A095F); intro_logos_update_fade(); } @@ -216,8 +216,8 @@ void state_step_intro(void) { update_cameras(); update_npcs(); if (D_800A0954 == 0) { - set_screen_overlay_params_front(255, -1.0f); - set_screen_overlay_params_back(255, -1.0f); + set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); + set_screen_overlay_params_back(OVERLAY_NONE, -1.0f); } else { D_800A0954 -= D_800A0958; if (D_800A0954 < 0) { @@ -228,7 +228,7 @@ void state_step_intro(void) { } set_screen_overlay_params_back(D_800A0963, D_800A0954); - set_screen_overlay_color(1, D_800A095B, D_800A095D, D_800A095F); + set_screen_overlay_color(SCREEN_LAYER_BACK, D_800A095B, D_800A095D, D_800A095F); intro_logos_update_fade(); } diff --git a/src/state_startup.c b/src/state_startup.c index ce40c6fc02..0d8fb63ab1 100644 --- a/src/state_startup.c +++ b/src/state_startup.c @@ -29,7 +29,7 @@ void state_step_startup(void) { gGameStatusPtr->creditsViewportMode = -1; gGameStatusPtr->demoFlags = 0; gGameStatusPtr->unk_A9 = -1; - gGameStatusPtr->demoState = 0; + gGameStatusPtr->demoState = DEMO_STATE_NONE; general_heap_create(); clear_render_tasks(); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index a5f93fa4ba..84b1f256d0 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -474,8 +474,7 @@ void title_screen_draw_copyright(f32 arg0) { if (alpha < 0) { alpha = 0; } - 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, alpha); } diff --git a/src/status_icons.c b/src/status_icons.c index 4326ecded3..1170f8600d 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -209,12 +209,12 @@ void show_merlee_message(s16 messageIndex, s16 duration) { if (popup != NULL) { popup->updateFunc = update_merlee_message; popup->renderUIFunc = draw_merlee_message; - popup->unk_17 = TRUE; + popup->needsInit = TRUE; popup->unk_00 = 0; popup->renderWorldFunc = NULL; popup->messageIndex = messageIndex; popup->duration = duration; - popup->unk_16 = 0; + popup->showMsgState = 0; D_800A0F40 = 1; } } @@ -223,12 +223,12 @@ void update_merlee_message(void* data) { PopupMessage* popup = data; s32 closeMessage = FALSE; - switch (popup->unk_16) { + switch (popup->showMsgState) { case 0: - popup->unk_16 = 1; + popup->showMsgState = 1; break; case 1: - popup->unk_16 = 2; + popup->showMsgState = 2; break; case 2: if (gGameStatusPtr->pressedButtons[0] & 0xC000) { @@ -237,11 +237,11 @@ void update_merlee_message(void* data) { if (popup->duration != 0) { popup->duration--; } else { - popup->unk_16 = 3; + popup->showMsgState = 3; } break; case 3: - popup->unk_16 = 4; + popup->showMsgState = 4; break; case 4: closeMessage = TRUE; @@ -289,8 +289,8 @@ void draw_merlee_message(void* data) { switch (popup->messageIndex) { case 0: - if (popup->unk_17 != 0) { - popup->unk_17 = 0; + if (popup->needsInit) { + popup->needsInit = FALSE; messageID = D_80078168[popup->messageIndex]; width = get_msg_width(messageID, 0) + 23; xPos = 160 - (width / 2); @@ -301,8 +301,8 @@ void draw_merlee_message(void* data) { break; case 1: - if (popup->unk_17 != 0) { - popup->unk_17 = 0; + if (popup->needsInit) { + popup->needsInit = FALSE; messageID = D_80078168[popup->messageIndex]; width = get_msg_width(messageID, 0) + 23; xPos = 160 - (width / 2); @@ -318,8 +318,8 @@ void draw_merlee_message(void* data) { s32 xPos; s32 width; - if (popup->unk_17) { - popup->unk_17 = FALSE; + if (popup->needsInit) { + popup->needsInit = FALSE; messageID = D_80078168[popup->messageIndex]; width = get_msg_width(messageID, 0) + 30; xPos = 160 - (width / 2); diff --git a/src/world/area_arn/arn_07/arn_07_2_main.c b/src/world/area_arn/arn_07/arn_07_2_main.c index d9f89d0486..7ac6e90731 100644 --- a/src/world/area_arn/arn_07/arn_07_2_main.c +++ b/src/world/area_arn/arn_07/arn_07_2_main.c @@ -65,7 +65,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_2, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_2, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END @@ -127,7 +127,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_2, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_2, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_08/arn_08_5_demo.c b/src/world/area_arn/arn_08/arn_08_5_demo.c index a6ac457b7a..520ab147da 100644 --- a/src/world/area_arn/arn_08/arn_08_5_demo.c +++ b/src/world/area_arn/arn_08/arn_08_5_demo.c @@ -74,7 +74,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("arn_08"), arn_08_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("arn_08"), arn_08_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(100) EVT_RETURN EVT_END @@ -93,7 +93,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("arn_08"), arn_08_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("arn_08"), arn_08_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(35) EVT_RETURN EVT_END diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/end_01_4_opera_float.c index cd39989dcd..7ddf9f3838 100644 --- a/src/world/area_end/end_01/end_01_4_opera_float.c +++ b/src/world/area_end/end_01/end_01_4_opera_float.c @@ -111,9 +111,7 @@ API_CALLABLE(N(SetSpotlightsAlpha)) { } void N(gfx_build_set_spotlight_alpha)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(SpotlightsAlpha)); } diff --git a/src/world/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/area_flo/flo_10/flo_10_6_waterfx.c index 699591daa2..5dc0c1c66a 100644 --- a/src/world/area_flo/flo_10/flo_10_6_waterfx.c +++ b/src/world/area_flo/flo_10/flo_10_6_waterfx.c @@ -230,7 +230,7 @@ void N(UnkModelFunc001)(void) { gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_09, PM_CC_09); gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 240, 0); gDPPipeSync(gMainGfxPos++); @@ -247,7 +247,7 @@ void N(UnkModelFunc001)(void) { gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); - 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); gDPPipeSync(gMainGfxPos++); N(UnkModelFunc000)(temp_f24, temp_f26, temp_f20, temp_f22); diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c index c88e6430dd..09e60e0729 100644 --- a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c @@ -44,7 +44,7 @@ API_CALLABLE(N(PartnerRideBeanstalk)) { } API_CALLABLE(N(SetScreenFadeAmount)) { - set_screen_overlay_params_back(1, script->varTable[0]); + set_screen_overlay_params_back(OVERLAY_VIEWPORT_COLOR, script->varTable[0]); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/flo_21_2_main.c index e280e02408..a7f2e8ca4a 100644 --- a/src/world/area_flo/flo_21/flo_21_2_main.c +++ b/src/world/area_flo/flo_21/flo_21_2_main.c @@ -77,7 +77,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH6_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_5, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_5, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index 085b3c8025..5207a78abc 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -273,9 +273,9 @@ API_CALLABLE(N(FadeToTitleScreen)) { script->functionTemp[0] = 255; } - set_screen_overlay_color(1, 208, 208, 208); - set_screen_overlay_params_back(0, script->functionTemp[0]); - set_screen_overlay_alpha(1, 0); + set_screen_overlay_color(SCREEN_LAYER_BACK, 208, 208, 208); + set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, script->functionTemp[0]); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, 0); return script->functionTemp[0] == 255; } diff --git a/src/world/area_hos/common/Narrator.inc.c b/src/world/area_hos/common/Narrator.inc.c index faf219aa1f..669e2e7c54 100644 --- a/src/world/area_hos/common/Narrator.inc.c +++ b/src/world/area_hos/common/Narrator.inc.c @@ -80,8 +80,8 @@ void N(UpdateIntroMessages)(IntroMessage** introMessageLists) { } break; } - get_screen_overlay_params(1, &type, &zoom1); - get_screen_overlay_params(0, &type, &zoom2); + get_screen_overlay_params(SCREEN_LAYER_BACK, &type, &zoom1); + get_screen_overlay_params(SCREEN_LAYER_FRONT, &type, &zoom2); opacity = ((N(IntroMessageAlpha) * (255.0f - zoom1) * (255.0f - zoom2)) / 255.0f) / 255.0f; if (opacity > 0) { messageID = N(CurMessageList)->messageID; diff --git a/src/world/area_hos/hos_01/hos_01_2_main.c b/src/world/area_hos/hos_01/hos_01_2_main.c index f60390e897..c99dfd1684 100644 --- a/src/world/area_hos/hos_01/hos_01_2_main.c +++ b/src/world/area_hos/hos_01/hos_01_2_main.c @@ -7,7 +7,7 @@ //@bug malformed script is missing EVT_RETURN and EVT_END, only works because another EvtScript follows EvtScript N(EVS_GotoMap_kmr_24_0) = { EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_11) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_AFTER_SAVE_PROMPT) EVT_WAIT(100) }; diff --git a/src/world/area_hos/hos_01/hos_01_3_model_fx.c b/src/world/area_hos/hos_01/hos_01_3_model_fx.c index 36d3313eb8..916fd52bd7 100644 --- a/src/world/area_hos/hos_01/hos_01_3_model_fx.c +++ b/src/world/area_hos/hos_01/hos_01_3_model_fx.c @@ -35,9 +35,7 @@ API_CALLABLE(N(SetStarBeamMasterAlpha)) { } void N(setup_gfx_glowing_star)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(GlowingStarAlpha)); } @@ -49,9 +47,7 @@ API_CALLABLE(N(SetGlowingStarAlpha)) { } void N(setup_gfx_giving_power)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(GivingPowerAlpha)); } diff --git a/src/world/area_hos/hos_04/hos_04_7_starship.c b/src/world/area_hos/hos_04/hos_04_7_starship.c index ad60ab2f5a..f5a5e8feaa 100644 --- a/src/world/area_hos/hos_04/hos_04_7_starship.c +++ b/src/world/area_hos/hos_04/hos_04_7_starship.c @@ -11,7 +11,7 @@ API_CALLABLE(N(ScreenOverlayFadeIn)) { script->functionTemp[1] = 255; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index 84e838b6e9..fdc752741b 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -1326,7 +1326,7 @@ Gfx N(gfx_setup_story_viewport)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetTexturePersp(G_TP_NONE), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE), + gsDPSetCombineMode(PM_CC_10, PM_CC_10), gsDPSetScissor(G_SC_NON_INTERLACE, 29, 28, 291, 190), gsDPSetColorDither(G_CD_DISABLE), gsDPSetAlphaDither(G_AD_PATTERN), @@ -1368,13 +1368,11 @@ void N(appendGfx_image_strips)(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); } - get_screen_overlay_params(1, &overlayType, &overlayAlphaBack); - get_screen_overlay_params(0, &overlayType, &overlayAlphaFront); + get_screen_overlay_params(SCREEN_LAYER_BACK, &overlayType, &overlayAlphaBack); + get_screen_overlay_params(SCREEN_LAYER_FRONT, &overlayType, &overlayAlphaFront); alpha = alpha * (255.0f - overlayAlphaBack) * (255.0f - overlayAlphaFront) / 255.0f / 255.0f; if (alpha != 255) { - gDPSetCombineLERP(gMainGfxPos++, - 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, - 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_01, PM_CC_01); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } else { gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -1442,11 +1440,9 @@ void N(worker_draw_story_graphics)(void) { gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(StoryGraphicsPtr)->storyPageAlpha); } - get_screen_overlay_params(1, &overlayType, &overlayAlpha); + get_screen_overlay_params(SCREEN_LAYER_BACK, &overlayType, &overlayAlpha); if (overlayAlpha != 0.0f) { - gDPSetCombineLERP(gMainGfxPos++, - PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, - PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1); gDPSetPrimColor(gMainGfxPos++, 0, 0, 208, 208, 208, (s32) overlayAlpha); } @@ -1973,18 +1969,18 @@ API_CALLABLE(N(AnimKammy_FlyOff)) { API_CALLABLE(N(func_80244934_A2EB74)) { if (isInitialCall) { script->functionTemp[0] = 0; - set_screen_overlay_params_back(1, 255.0f); - set_screen_overlay_color(1, 250, 250, 250); + set_screen_overlay_params_back(OVERLAY_VIEWPORT_COLOR, 255.0f); + set_screen_overlay_color(SCREEN_LAYER_BACK, 250, 250, 250); return ApiStatus_BLOCK; } script->functionTemp[0]++; if (script->functionTemp[0] == 10) { - set_screen_overlay_params_back(0, 0.0f); - set_screen_overlay_color(1, 250, 250, 250); + set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, 0.0f); + set_screen_overlay_color(SCREEN_LAYER_BACK, 250, 250, 250); return ApiStatus_DONE2; } - set_screen_overlay_params_back(1, (10 - script->functionTemp[0]) * 25); - set_screen_overlay_color(1, 250, 250, 250); + set_screen_overlay_params_back(OVERLAY_VIEWPORT_COLOR, (10 - script->functionTemp[0]) * 25); + set_screen_overlay_color(SCREEN_LAYER_BACK, 250, 250, 250); return ApiStatus_BLOCK; } diff --git a/src/world/area_hos/hos_05/hos_05_7_model_fx.c b/src/world/area_hos/hos_05/hos_05_7_model_fx.c index e150536cc5..f39ec36faf 100644 --- a/src/world/area_hos/hos_05/hos_05_7_model_fx.c +++ b/src/world/area_hos/hos_05/hos_05_7_model_fx.c @@ -53,9 +53,7 @@ API_CALLABLE(N(SetWorldColorParams)) { #define NAME_SUFFIX void N(setup_gfx_light_beam)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, StarShrineLightBeamAlpha & 0xFF); } @@ -69,9 +67,7 @@ API_CALLABLE(N(SetLightBeamAlpha)) { s32 N(StarshipShimmerAmt) = 255; void N(setup_gfx_starship_shimmer)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(StarshipShimmerAmt)); } @@ -85,9 +81,7 @@ API_CALLABLE(N(SetStarshipShimmerAmt)) { s32 N(UnusedAlphaParam) = 255; void N(setup_gfx_unused)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(UnusedAlphaParam)); } diff --git a/src/world/area_hos/hos_10/hos_10_6_pre_title.c b/src/world/area_hos/hos_10/hos_10_6_pre_title.c index e95865eeab..6cb4adc770 100644 --- a/src/world/area_hos/hos_10/hos_10_6_pre_title.c +++ b/src/world/area_hos/hos_10/hos_10_6_pre_title.c @@ -83,7 +83,7 @@ EvtScript N(EVS_Scene_PreTitle) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_21"), kmr_21_ENTRY_0, TRANSITION_7) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_21"), kmr_21_ENTRY_0, TRANSITION_SLOW_FADE_TO_WHITE) EVT_WAIT(100 * DT) EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_10/hos_10_7_ending.c b/src/world/area_hos/hos_10/hos_10_7_ending.c index dc80354f72..4f0d08a764 100644 --- a/src/world/area_hos/hos_10/hos_10_7_ending.c +++ b/src/world/area_hos/hos_10/hos_10_7_ending.c @@ -97,8 +97,8 @@ API_CALLABLE(N(FadeScreenToWhite)) { script->functionTemp[1] = 0; } - set_screen_overlay_color(0, 208, 208, 208); - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -549,7 +549,7 @@ EvtScript N(EVS_Scene_SpiritsFlyingAway) = { EVT_CALL(N(FadeScreenToWhite)) EVT_WAIT(90) EVT_CALL(N(ClearCurrentPartner)) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_20"), kmr_20_ENTRY_2, TRANSITION_5) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_20"), kmr_20_ENTRY_2, TRANSITION_OUTRO_END_SCENE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_04/isk_04_6_demo.c b/src/world/area_isk/isk_04/isk_04_6_demo.c index 0aabc33485..384ed8f651 100644 --- a/src/world/area_isk/isk_04/isk_04_6_demo.c +++ b/src/world/area_isk/isk_04/isk_04_6_demo.c @@ -83,7 +83,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("isk_04"), isk_04_ENTRY_5, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("isk_04"), isk_04_ENTRY_5, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(323) EVT_RETURN EVT_END @@ -102,7 +102,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("isk_04"), isk_04_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("isk_04"), isk_04_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(313) EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_16/isk_16_1_main.c b/src/world/area_isk/isk_16/isk_16_1_main.c index 2c6c584b03..727242b96f 100644 --- a/src/world/area_isk/isk_16/isk_16_1_main.c +++ b/src/world/area_isk/isk_16/isk_16_1_main.c @@ -67,7 +67,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_1, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_1, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_iwa/iwa_11/iwa_11_3_train.c b/src/world/area_iwa/iwa_11/iwa_11_3_train.c index 7bc6ad053d..3acb9574b7 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_3_train.c +++ b/src/world/area_iwa/iwa_11/iwa_11_3_train.c @@ -374,7 +374,7 @@ EvtScript N(EVS_TravelToMtRugged) = { EVT_IF_EQ(GF_StartedChapter2, FALSE) EVT_SET(GF_StartedChapter2, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_2, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_2, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_jan/jan_00/jan_00_4_whale.c b/src/world/area_jan/jan_00/jan_00_4_whale.c index 1732fdcf6f..c220ef950d 100644 --- a/src/world/area_jan/jan_00/jan_00_4_whale.c +++ b/src/world/area_jan/jan_00/jan_00_4_whale.c @@ -87,7 +87,7 @@ EvtScript N(D_80245E6C_B263AC) = { EVT_MOD(LVar1, 4) EVT_IF_EQ(LVar1, 0) EVT_CALL(N(UnkPlayerPosFunc)) - EVT_CALL(PlayEffect, EFFECT_DAMAGE_STARS, 2, LVar0, LVar1, LVar2, 0, -1, 0, 5, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 2, LVar0, LVar1, LVar2, 0, -1, 0, 5) EVT_END_IF EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) diff --git a/src/world/area_jan/jan_04/jan_04_10_demo.c b/src/world/area_jan/jan_04/jan_04_10_demo.c index bfc522e560..5f427616f3 100644 --- a/src/world/area_jan/jan_04/jan_04_10_demo.c +++ b/src/world/area_jan/jan_04/jan_04_10_demo.c @@ -72,7 +72,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("jan_04"), jan_04_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_04"), jan_04_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -91,7 +91,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("jan_04"), jan_04_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_04"), jan_04_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_jan/jan_04/jan_04_2_main.c b/src/world/area_jan/jan_04/jan_04_2_main.c index e2ecbb041c..0eec368f63 100644 --- a/src/world/area_jan/jan_04/jan_04_2_main.c +++ b/src/world/area_jan/jan_04/jan_04_2_main.c @@ -4,7 +4,7 @@ EvtScript N(EVS_GotoMap_kmr_24_0) = { EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_9) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_MARIO_WHITE) EVT_WAIT(100) }; //@bug script not terminated diff --git a/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c b/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c index a943bdc6cc..9a8ce2697f 100644 --- a/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c +++ b/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c @@ -5,8 +5,8 @@ API_CALLABLE(N(FadeScreenToWhite)) { script->functionTemp[1] = 0; } - set_screen_overlay_color(0, 208, 208, 208); - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -214,7 +214,7 @@ EvtScript N(EVS_Scene_Ending) = { EVT_CALL(N(FadeScreenToWhite)) EVT_WAIT(60) EVT_CALL(FadeOutMusic, 0, 2000) - EVT_CALL(GotoMapSpecial, EVT_PTR("end_00"), end_00_ENTRY_0, TRANSITION_5) + EVT_CALL(GotoMapSpecial, EVT_PTR("end_00"), end_00_ENTRY_0, TRANSITION_OUTRO_END_SCENE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_03/kkj_03_2_main.c b/src/world/area_kkj/kkj_03/kkj_03_2_main.c index d123f00eee..f0c2c5770a 100644 --- a/src/world/area_kkj/kkj_03/kkj_03_2_main.c +++ b/src/world/area_kkj/kkj_03/kkj_03_2_main.c @@ -14,7 +14,7 @@ Gfx N(setup_gfx_candle_lights)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetPrimColor(0, 0, 75, 31, 19, 255), gsDPSetEnvColor(255, 118, 77, 0), - gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetCombineMode(PM_CC_CANDLE_1, PM_CC_CANDLE_2), gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c index 7e62f5f5b1..ec7a803cbe 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c +++ b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c @@ -28,7 +28,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c index a7a9b4b4a5..8b07c93be4 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c +++ b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c @@ -47,7 +47,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_kkj/kkj_11/kkj_11_4_demo.c b/src/world/area_kkj/kkj_11/kkj_11_4_demo.c index 39e4ded65c..a036a2f4af 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_4_demo.c +++ b/src/world/area_kkj/kkj_11/kkj_11_4_demo.c @@ -188,7 +188,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_11"), kkj_11_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_11"), kkj_11_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -207,7 +207,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_11"), kkj_11_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_11"), kkj_11_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c index 8c0cfb6ec6..f25740e4a8 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c +++ b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c @@ -29,7 +29,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) @@ -171,7 +171,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c index 86885c38b4..4d4d79058a 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c +++ b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c @@ -46,7 +46,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c index a80e49f3d6..179faea416 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -134,7 +134,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_kkj/kkj_13/kkj_13_2_main.c b/src/world/area_kkj/kkj_13/kkj_13_2_main.c index 1bb614faf5..b098c1da6d 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_2_main.c +++ b/src/world/area_kkj/kkj_13/kkj_13_2_main.c @@ -14,7 +14,7 @@ Gfx N(setup_gfx_candle_lights)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetPrimColor(0, 0, 75, 31, 19, 255), gsDPSetEnvColor(255, 118, 77, 0), - gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetCombineMode(PM_CC_CANDLE_1, PM_CC_CANDLE_2), gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c index 60302669f7..7adc6649dc 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -39,8 +39,8 @@ API_CALLABLE(N(ScreenWhiteFlashOn)) { script->functionTemp[1] = 255; } - set_screen_overlay_color(0, 160, 160, 160); - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 160, 160, 160); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -60,8 +60,8 @@ API_CALLABLE(N(ScreenWhiteFlashOff)) { script->functionTemp[1] = 0; } - set_screen_overlay_color(0, 160, 160, 160); - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 160, 160, 160); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 0) { return ApiStatus_DONE2; diff --git a/src/world/area_kkj/kkj_14/kkj_14_2_main.c b/src/world/area_kkj/kkj_14/kkj_14_2_main.c index c5205d593f..8263724f63 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_2_main.c +++ b/src/world/area_kkj/kkj_14/kkj_14_2_main.c @@ -20,7 +20,7 @@ Gfx N(setup_gfx_candle_lights)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetPrimColor(0, 0, 75, 31, 19, 255), gsDPSetEnvColor(255, 118, 77, 0), - gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetCombineMode(PM_CC_CANDLE_1, PM_CC_CANDLE_2), gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), @@ -31,7 +31,7 @@ EvtScript N(EVS_EndPeachChapter7) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("pra_01"), pra_01_ENTRY_4, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("pra_01"), pra_01_ENTRY_4, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; diff --git a/src/world/area_kkj/kkj_15/kkj_15_2_main.c b/src/world/area_kkj/kkj_15/kkj_15_2_main.c index 2e75a7da65..3217de31de 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_2_main.c +++ b/src/world/area_kkj/kkj_15/kkj_15_2_main.c @@ -15,7 +15,7 @@ Gfx N(setup_gfx_candle_lights)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetPrimColor(0, 0, 75, 31, 19, 255), gsDPSetEnvColor(255, 118, 77, 0), - gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetCombineMode(PM_CC_CANDLE_1, PM_CC_CANDLE_2), gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), @@ -26,7 +26,7 @@ EvtScript N(EVS_EndPeachChapter0) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_10"), kmr_10_ENTRY_0, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_10"), kmr_10_ENTRY_0, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated @@ -34,7 +34,7 @@ EvtScript N(EVS_EndPeachChapter1) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("trd_00"), trd_00_ENTRY_5, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("trd_00"), trd_00_ENTRY_5, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated @@ -42,7 +42,7 @@ EvtScript N(EVS_EndPeachChapter3) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("arn_07"), arn_07_ENTRY_3, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("arn_07"), arn_07_ENTRY_3, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated diff --git a/src/world/area_kkj/kkj_16/kkj_16_1_main.c b/src/world/area_kkj/kkj_16/kkj_16_1_main.c index 4468f65a87..eabf3e3e9f 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_1_main.c +++ b/src/world/area_kkj/kkj_16/kkj_16_1_main.c @@ -7,7 +7,7 @@ EvtScript N(EVS_EndPeachChapter2) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("sbk_02"), sbk_02_ENTRY_5, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("sbk_02"), sbk_02_ENTRY_5, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c index da15866d7b..ce82af3164 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c +++ b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c @@ -30,7 +30,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c index 416dce028c..cf3b8155ee 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c +++ b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c @@ -88,7 +88,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_18/kkj_18_2_main.c b/src/world/area_kkj/kkj_18/kkj_18_2_main.c index 39a6ecdd71..4955df5f62 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_2_main.c +++ b/src/world/area_kkj/kkj_18/kkj_18_2_main.c @@ -15,7 +15,7 @@ Gfx N(setup_gfx_candle_lights)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetPrimColor(0, 0, 75, 31, 19, 255), gsDPSetEnvColor(255, 118, 77, 0), - gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetCombineMode(PM_CC_CANDLE_1, PM_CC_CANDLE_2), gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), @@ -26,7 +26,7 @@ EvtScript N(EVS_EndPeachChapter4) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("mac_04"), mac_04_ENTRY_5, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_04"), mac_04_ENTRY_5, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c index 1dee73611a..f201248e65 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c +++ b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c @@ -230,7 +230,7 @@ API_CALLABLE(N(FadeScreenToBlack)) { script->functionTemp[1] = 255; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -250,7 +250,7 @@ API_CALLABLE(N(FadeScreenFromBlack)) { return ApiStatus_DONE2; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); return ApiStatus_BLOCK; } diff --git a/src/world/area_kkj/kkj_23/kkj_23_2_main.c b/src/world/area_kkj/kkj_23/kkj_23_2_main.c index 37f779be30..69a79e8330 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_2_main.c +++ b/src/world/area_kkj/kkj_23/kkj_23_2_main.c @@ -7,7 +7,7 @@ EvtScript N(EVS_EndPeachChapter6) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("flo_00"), flo_00_ENTRY_A, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("flo_00"), flo_00_ENTRY_A, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c index a333d71023..3f47603f05 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c +++ b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c @@ -64,7 +64,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad) EVT_WAIT(20) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index e4ccba6854..59a90c7d5c 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = { API_CALLABLE(N(func_80240020_B06A20)) { increment_status_menu_disabled(); - set_screen_overlay_params_back(0, 255.0f); + set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, 255.0f); return ApiStatus_DONE2; } diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index 0a61db0bf6..4ec4e8a8ed 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -38,8 +38,8 @@ API_CALLABLE(N(FadeScreenToRedAndWhite)) { switch (script->FT_state) { case TEMP_FADE_TO_RED: - set_screen_overlay_color(0, 208, 0, 0); - set_screen_overlay_params_front(1, script->FT_alpha); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 0, 0); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->FT_alpha); if (script->FT_alpha == 255) { script->FT_alpha = 0; script->FT_state = TEMP_FADE_TO_WHITE; @@ -57,7 +57,7 @@ API_CALLABLE(N(FadeScreenToRedAndWhite)) { (script->FT_alpha * 208) / 255, (script->FT_alpha * 208) / 255 ); - set_screen_overlay_params_front(1, 255.0f); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, 255.0f); if (script->FT_alpha == 255) { script->FT_state = TEMP_FADE_COMPLETE; } @@ -82,7 +82,7 @@ API_CALLABLE(N(FadeScreenFromWhite)) { script->functionTemp[1] = 255; } - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 0) { return ApiStatus_DONE2; diff --git a/src/world/area_kkj/kkj_26/kkj_26_1_main.c b/src/world/area_kkj/kkj_26/kkj_26_1_main.c index 49443bf5ca..720e298c29 100644 --- a/src/world/area_kkj/kkj_26/kkj_26_1_main.c +++ b/src/world/area_kkj/kkj_26/kkj_26_1_main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_GotoMap_hos_00_1) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("hos_00"), hos_00_ENTRY_1, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("hos_00"), hos_00_ENTRY_1, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; diff --git a/src/world/area_kkj/kkj_26/kkj_26_3_demo.c b/src/world/area_kkj/kkj_26/kkj_26_3_demo.c index 0f4aefbe33..d2ca9d7ec0 100644 --- a/src/world/area_kkj/kkj_26/kkj_26_3_demo.c +++ b/src/world/area_kkj/kkj_26/kkj_26_3_demo.c @@ -22,7 +22,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_26"), kkj_26_ENTRY_2, TRANSITION_7) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_26"), kkj_26_ENTRY_2, TRANSITION_SLOW_FADE_TO_WHITE) EVT_WAIT(110) EVT_RETURN EVT_END @@ -41,7 +41,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_26"), kkj_26_ENTRY_2, TRANSITION_7) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_26"), kkj_26_ENTRY_2, TRANSITION_SLOW_FADE_TO_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_27/kkj_27_2_main.c b/src/world/area_kkj/kkj_27/kkj_27_2_main.c index c287c61fb9..20f9c1f9f8 100644 --- a/src/world/area_kkj/kkj_27/kkj_27_2_main.c +++ b/src/world/area_kkj/kkj_27/kkj_27_2_main.c @@ -14,7 +14,7 @@ Gfx N(setup_gfx_candle_lights)[] = { gsDPSetTextureConvert(G_TC_FILT), gsDPSetPrimColor(0, 0, 75, 31, 19, 255), gsDPSetEnvColor(255, 118, 77, 0), - gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetCombineMode(PM_CC_CANDLE_1, PM_CC_CANDLE_2), gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), gsSPClearGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), diff --git a/src/world/area_kkj/kkj_29/kkj_29_1_main.c b/src/world/area_kkj/kkj_29/kkj_29_1_main.c index b65c858f36..7bdd590cb9 100644 --- a/src/world/area_kkj/kkj_29/kkj_29_1_main.c +++ b/src/world/area_kkj/kkj_29/kkj_29_1_main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_EndPeachChapter5) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) EVT_CALL(PlaySound, SOUND_DC) - EVT_CALL(GotoMapSpecial, EVT_PTR("jan_22"), jan_22_ENTRY_3, TRANSITION_12) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_22"), jan_22_ENTRY_3, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index e6b7ec0e74..d5a06e48e7 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -657,7 +657,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_SET(GB_StoryProgress, STORY_CH0_WAKE_UP) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(N(func_802405CC_8AC55C)) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_02"), kmr_02_ENTRY_5, TRANSITION_10) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_02"), kmr_02_ENTRY_5, TRANSITION_MARIO_BLACK) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_11/kmr_11_2_main.c b/src/world/area_kmr/kmr_11/kmr_11_2_main.c index 5d12d57616..7d5a1535a2 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_2_main.c +++ b/src/world/area_kmr/kmr_11/kmr_11_2_main.c @@ -37,7 +37,7 @@ EvtScript N(EVS_PlayBridgeAnimation) = { //@bug exit to 'Save and Continue?' map is not properly terminated! EvtScript N(EVS_BadExit_kmr_24_0) = { EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_10) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_MARIO_BLACK) EVT_WAIT(100) }; diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index fd23e92cff..0a256bc0ea 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -385,7 +385,7 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) EVT_WAIT(5 * DT) EVT_CALL(ClearAmbientSounds, 250) - EVT_CALL(GotoMapSpecial, EVT_PTR("osr_00"), osr_00_ENTRY_3, TRANSITION_7) + EVT_CALL(GotoMapSpecial, EVT_PTR("osr_00"), osr_00_ENTRY_3, TRANSITION_SLOW_FADE_TO_WHITE) EVT_WAIT(15 * DT) EVT_CALL(ClearAmbientSounds, 250) EVT_WAIT(100 * DT) diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index ef946b4f28..43193c3ed7 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -27,7 +27,7 @@ API_CALLABLE(N(func_80242084_8EDEA4)) { script->functionTemp[1] = 255; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -47,7 +47,7 @@ API_CALLABLE(N(func_802420EC_8EDF0C)) { return ApiStatus_DONE2; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); return ApiStatus_BLOCK; } diff --git a/src/world/area_kmr/kmr_20/kmr_20_2_main.c b/src/world/area_kmr/kmr_20/kmr_20_2_main.c index 050569fa15..19bb365388 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_2_main.c +++ b/src/world/area_kmr/kmr_20/kmr_20_2_main.c @@ -3,7 +3,7 @@ #include "world/common/entity/Pipe.inc.c" API_CALLABLE(N(func_80240310_8EC130)){ - set_map_transition_effect(TRANSITION_4); + set_map_transition_effect(TRANSITION_BEGIN_OR_END_GAME); return ApiStatus_DONE2; } diff --git a/src/world/area_kmr/kmr_21/kmr_21_1_main.c b/src/world/area_kmr/kmr_21/kmr_21_1_main.c index 5bf0874212..49caa63eae 100644 --- a/src/world/area_kmr/kmr_21/kmr_21_1_main.c +++ b/src/world/area_kmr/kmr_21/kmr_21_1_main.c @@ -123,7 +123,7 @@ EvtScript N(EVS_Scene_ShowTitle) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(15 * DT) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100 * DT) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/kmr_22_1_main.c index 39ecba6856..c77cd40999 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_1_main.c +++ b/src/world/area_kmr/kmr_22/kmr_22_1_main.c @@ -113,23 +113,23 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(kmr_22_ENTRY_0) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_00"), kmr_00_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_00"), kmr_00_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_1) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_11"), nok_11_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_11"), nok_11_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_2) - EVT_CALL(GotoMapSpecial, EVT_PTR("iwa_10"), iwa_10_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("iwa_10"), iwa_10_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_3) - EVT_CALL(GotoMapSpecial, EVT_PTR("mim_01"), mim_01_ENTRY_1, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("mim_01"), mim_01_ENTRY_1, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_4) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_4, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_4, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_5) - EVT_CALL(GotoMapSpecial, EVT_PTR("jan_00"), jan_00_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_00"), jan_00_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_6) - EVT_CALL(GotoMapSpecial, EVT_PTR("flo_00"), flo_00_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("flo_00"), flo_00_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_7) - EVT_CALL(GotoMapSpecial, EVT_PTR("sam_02"), sam_02_ENTRY_2, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("sam_02"), sam_02_ENTRY_2, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_CASE_EQ(kmr_22_ENTRY_8) - EVT_CALL(GotoMapSpecial, EVT_PTR("kpa_63"), kpa_63_ENTRY_1, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kpa_63"), kpa_63_ENTRY_1, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_END_SWITCH EVT_CALL(N(DismissCurtains)) EVT_WAIT(100) diff --git a/src/world/area_kmr/kmr_23/kmr_23_1_main.c b/src/world/area_kmr/kmr_23/kmr_23_1_main.c index 25723ec081..8040612395 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_1_main.c +++ b/src/world/area_kmr/kmr_23/kmr_23_1_main.c @@ -16,9 +16,9 @@ EvtScript N(D_80241190_908BC0) = { EVT_END_LOOP EVT_CALL(GetEntryID, LVar0) EVT_IF_NE(LVar0, kmr_23_ENTRY_4) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("kzn_19"), kzn_19_ENTRY_3, TRANSITION_15) + EVT_CALL(GotoMapSpecial, EVT_PTR("kzn_19"), kzn_19_ENTRY_3, TRANSITION_END_CHAPTER_INTERRUPTED) EVT_END_IF EVT_CALL(FadeOutMusic, 0, 2000) EVT_CALL(N(func_80240010_907A40)) diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index 0deccc1ede..cd49b1ba2a 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -227,8 +227,8 @@ API_CALLABLE(N(FlashScreenWhite)) { switch(script->functionTemp[0]) { case FADE_TO_WHITE: - set_screen_overlay_color(0, 208, 208, 208); - set_screen_overlay_params_front(1, data->screenWhiteness); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, data->screenWhiteness); if (data->screenWhiteness == 255) { data->spiritCardEffect->flags |= EFFECT_INSTANCE_FLAG_10; data->spiritCardEffect = NULL; @@ -251,7 +251,7 @@ API_CALLABLE(N(FlashScreenWhite)) { } break; case BACK_TO_NORMAL: - set_screen_overlay_params_front(1, data->screenWhiteness); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, data->screenWhiteness); if (data->screenWhiteness == 0) { set_curtain_scale_goal(1.0f); return ApiStatus_DONE1; diff --git a/src/world/area_kmr/kmr_24/kmr_24_1_main.c b/src/world/area_kmr/kmr_24/kmr_24_1_main.c index 60ffdd75e5..2d33eb2f6b 100644 --- a/src/world/area_kmr/kmr_24/kmr_24_1_main.c +++ b/src/world/area_kmr/kmr_24/kmr_24_1_main.c @@ -6,7 +6,7 @@ API_CALLABLE(N(ExitGame)) { s16 result; if (isInitialCall) { - set_map_transition_effect(TRANSITION_4); + set_map_transition_effect(TRANSITION_BEGIN_OR_END_GAME); script->functionTemp[1] = 0; } @@ -55,7 +55,7 @@ EvtScript N(EVS_SaveAndContinue_Prompt) = { EVT_WAIT(100) EVT_CASE_EQ(2) EVT_END_SWITCH - EVT_CALL(GotoMapSpecial, EVT_PTR("osr_03"), osr_03_ENTRY_4, TRANSITION_11) + EVT_CALL(GotoMapSpecial, EVT_PTR("osr_03"), osr_03_ENTRY_4, TRANSITION_AFTER_SAVE_PROMPT) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c b/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c index 428619d4ae..1b1771a279 100644 --- a/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c +++ b/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c @@ -98,11 +98,7 @@ API_CALLABLE(N(UpdateTheEndAlpha)) { return ApiStatus_DONE2; } void N(gfx_build_the_end)(void) { - gDPSetCombineLERP(gMainGfxPos++, - TEXEL0, 0, SHADE, 0, - TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, SHADE, 0, - TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_05); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, TheEndModelAlpha); } diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index ef00ce785c..d01a3d97c3 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -7,7 +7,7 @@ API_CALLABLE(N(SetScreenBlackFadeAmount)) { Bytecode* args = script->ptrReadPos; f32 amount = evt_get_variable(script, *args++); - set_screen_overlay_params_front(0, amount); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, amount); return ApiStatus_DONE2; } diff --git a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c index cc15ba8156..e481605188 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c +++ b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c @@ -53,7 +53,7 @@ EvtScript N(EVS_Scene_Arrival) = { EVT_WAIT(15) EVT_SET(GF_StartedChapter8, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_8, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_8, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_kzn/kzn_02/kzn_02_4_demo.c b/src/world/area_kzn/kzn_02/kzn_02_4_demo.c index cfdaa1cd32..cf9f094976 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_4_demo.c +++ b/src/world/area_kzn/kzn_02/kzn_02_4_demo.c @@ -24,7 +24,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kzn_02"), kzn_02_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("kzn_02"), kzn_02_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -43,7 +43,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kzn_02"), kzn_02_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("kzn_02"), kzn_02_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(10) EVT_RETURN EVT_END diff --git a/src/world/area_kzn/kzn_08/kzn_08_4_extra.c b/src/world/area_kzn/kzn_08/kzn_08_4_extra.c index 88c1144e97..41bbdd388d 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_4_extra.c +++ b/src/world/area_kzn/kzn_08/kzn_08_4_extra.c @@ -14,7 +14,7 @@ API_CALLABLE(N(func_80243EE0_C75360)) { script->functionTemp[1] = FALSE; } - set_screen_overlay_center_worldpos(1, 1, + set_screen_overlay_center_worldpos(SCREEN_LAYER_BACK, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); get_model_fog_color_parameters(&primR, &primG, &primB, &primA, &fogR, &fogG, &fogB, &fogStart, &fogEnd); @@ -27,8 +27,8 @@ API_CALLABLE(N(func_80243EE0_C75360)) { alpha = 0.0f; } if (alpha == 0.0f) { - set_screen_overlay_alpha(1, 0.0f); - set_screen_overlay_params_back(0xB, 0.0f); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, 0.0f); + set_screen_overlay_params_back(OVERLAY_WORLD_DARKNESS, 0.0f); return ApiStatus_BLOCK; } @@ -57,8 +57,8 @@ API_CALLABLE(N(func_80243EE0_C75360)) { } else { script->functionTemp[0] = 255; } - set_screen_overlay_alpha(1, script->functionTemp[0]); - set_screen_overlay_params_back(0xB, alpha); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, script->functionTemp[0]); + set_screen_overlay_params_back(OVERLAY_WORLD_DARKNESS, alpha); return ApiStatus_BLOCK; } diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/kzn_19_2_main.c index 99704f96e1..5e9f3b9335 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_2_main.c @@ -79,7 +79,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 3) EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_00/mac_00_8_demo.c b/src/world/area_mac/mac_00/mac_00_8_demo.c index cdd6623c96..36164bbf5e 100644 --- a/src/world/area_mac/mac_00/mac_00_8_demo.c +++ b/src/world/area_mac/mac_00/mac_00_8_demo.c @@ -83,7 +83,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("mac_00"), mac_00_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_00"), mac_00_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -102,7 +102,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("mac_00"), mac_00_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_00"), mac_00_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c b/src/world/area_mac/mac_00/mac_00_9_water_gfx.c index 4ac2573fa7..6a3ad8f5a0 100644 --- a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c +++ b/src/world/area_mac/mac_00/mac_00_9_water_gfx.c @@ -10,7 +10,7 @@ void N(gfx_build_water)(void) { gDPSetPrimDepth(gMainGfxPos++, 0x7FF0, 0); gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_09, PM_CC_09); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 128, 0); gDPPipeSync(gMainGfxPos++); diff --git a/src/world/area_mac/mac_01/mac_01_2_main.c b/src/world/area_mac/mac_01/mac_01_2_main.c index c5d1057fca..69fea46af9 100644 --- a/src/world/area_mac/mac_01/mac_01_2_main.c +++ b/src/world/area_mac/mac_01/mac_01_2_main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_ExitWalk_nok_11_0) = { EVT_IF_EQ(GF_StartedChapter1, FALSE) EVT_SET(GF_StartedChapter1, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_1, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_1, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c b/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c index bf7f11dbd9..aac28551a1 100644 --- a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c +++ b/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c @@ -87,7 +87,7 @@ void N(gfx_build_inside_crystal_ball)(void) { gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_09, PM_CC_09); gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 240, 0); gDPPipeSync(gMainGfxPos++); gSPDisplayList(gMainGfxPos++, model->modelNode->displayData->displayList); @@ -110,7 +110,7 @@ void N(gfx_build_inside_crystal_ball)(void) { gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(nuGfxCfb_ptr), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SCREEN_HEIGHT, ulx, uly, ulx + 31, uly + 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 0, 0, 0, 0, TEXEL0, 0, 0, 0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_0E, PM_CC_0E); gSPScisTextureRectangle(gMainGfxPos++, (ulx - 8) * 4, (uly - 8) * 4, (ulx + 24) * 4, (uly + 24) * 4, G_TX_RENDERTILE, (ulx & 0x1F) << 5, (uly & 0x1F) << 5, 700, 700); } diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 83788f0ad1..9b18094323 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -226,7 +226,7 @@ API_CALLABLE(N(func_802447E0_805060)) { script->functionTemp[1] = 255; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -246,7 +246,7 @@ API_CALLABLE(N(func_80244848_8050C8)) { return ApiStatus_DONE2; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); return ApiStatus_BLOCK; } diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index f2ade2eabe..c542712eff 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -709,7 +709,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_IF_EQ(GF_StartedChapter6, FALSE) EVT_SET(GF_StartedChapter6, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_6, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_6, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_mac/mac_03/mac_03_8_demo.c b/src/world/area_mac/mac_03/mac_03_8_demo.c index c45a01acd7..0081a30d02 100644 --- a/src/world/area_mac/mac_03/mac_03_8_demo.c +++ b/src/world/area_mac/mac_03/mac_03_8_demo.c @@ -118,7 +118,7 @@ EvtScript N(EVS_DemoDepartForMtRugged) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("mac_03"), mac_03_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_03"), mac_03_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -137,7 +137,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("mac_03"), mac_03_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_03"), mac_03_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c index 20c6d3a898..39579f7493 100644 --- a/src/world/area_mac/mac_04/mac_04_8_entity.c +++ b/src/world/area_mac/mac_04/mac_04_8_entity.c @@ -143,7 +143,7 @@ EvtScript N(EVS_EnterToybox) = { EVT_IF_EQ(GF_StartedChapter4, FALSE) EVT_SET(GF_StartedChapter4, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_4, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_4, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index 58cec207a7..8c206f7948 100644 --- a/src/world/area_mac/mac_06/mac_06_3_npc.c +++ b/src/world/area_mac/mac_06/mac_06_3_npc.c @@ -195,7 +195,7 @@ EvtScript N(EVS_NpcIdle_Whale) = { EVT_IF_EQ(GF_StartedChapter5, FALSE) EVT_SET(GF_StartedChapter5, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_5, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_5, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_ELSE EVT_CALL(GotoMap, EVT_PTR("jan_00"), jan_00_ENTRY_0) EVT_END_IF diff --git a/src/world/area_mac/machi/machi_3_entity.c b/src/world/area_mac/machi/machi_3_entity.c index 93e81407d0..4cefac57fd 100644 --- a/src/world/area_mac/machi/machi_3_entity.c +++ b/src/world/area_mac/machi/machi_3_entity.c @@ -20,7 +20,7 @@ API_CALLABLE(N(func_80240048_7E73E8)) { gOverrideFlags |= GLOBAL_OVERRIDES_10; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { return ApiStatus_DONE2; @@ -52,7 +52,7 @@ API_CALLABLE(N(func_80240114_7E74B4)) { gOverrideFlags |= GLOBAL_OVERRIDES_10; } - set_screen_overlay_params_front(0, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 0) { gOverrideFlags &= ~GLOBAL_OVERRIDES_10; diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/mim_04_4_hint.c index def4056519..9856d6a808 100644 --- a/src/world/area_mim/mim_04/mim_04_4_hint.c +++ b/src/world/area_mim/mim_04/mim_04_4_hint.c @@ -44,7 +44,7 @@ void N(gfx_build_evil_tree_face)(s32 index) { gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(EvilTreeFaceAlpha)); - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_06); gDPSetRenderMode(gMainGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); } diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/mim_07_4_hint.c index c788294f8d..bf5824ac81 100644 --- a/src/world/area_mim/mim_07/mim_07_4_hint.c +++ b/src/world/area_mim/mim_07/mim_07_4_hint.c @@ -56,7 +56,7 @@ void N(gfx_build_evil_rock_face)(s32 index) { gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(EvilRockAlpha)); - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); + gDPSetCombineMode(gMainGfxPos++, PM_CC_05, PM_CC_06); gDPSetRenderMode(gMainGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); } diff --git a/src/world/area_mim/mim_10/mim_10_3_main.c b/src/world/area_mim/mim_10/mim_10_3_main.c index c0f3487334..5c7528607b 100644 --- a/src/world/area_mim/mim_10/mim_10_3_main.c +++ b/src/world/area_mim/mim_10/mim_10_3_main.c @@ -10,7 +10,7 @@ EvtScript N(EVS_ExitWalk_mim_01_1) = { EVT_IF_EQ(GF_StartedChapter3, FALSE) EVT_SET(GF_StartedChapter3, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_3, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_3, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_nok/nok_02/nok_02_7_demo.c b/src/world/area_nok/nok_02/nok_02_7_demo.c index c6f55c5e55..c2bd404179 100644 --- a/src/world/area_nok/nok_02/nok_02_7_demo.c +++ b/src/world/area_nok/nok_02/nok_02_7_demo.c @@ -124,7 +124,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_02"), nok_02_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_02"), nok_02_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -143,7 +143,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_02"), nok_02_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_02"), nok_02_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(110) EVT_RETURN EVT_END diff --git a/src/world/area_nok/nok_12/nok_12_7_demo.c b/src/world/area_nok/nok_12/nok_12_7_demo.c index 8e14fe2ffe..be0bc466c6 100644 --- a/src/world/area_nok/nok_12/nok_12_7_demo.c +++ b/src/world/area_nok/nok_12/nok_12_7_demo.c @@ -26,7 +26,7 @@ EvtScript N(EVS_ProvideDemoInputs1) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(100) EVT_RETURN EVT_END @@ -45,7 +45,7 @@ EvtScript N(EVS_MonitorDemoState1) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END @@ -105,7 +105,7 @@ EvtScript N(EVS_ProvideDemoInputs2) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(100) EVT_RETURN EVT_END @@ -124,7 +124,7 @@ EvtScript N(EVS_MonitorDemoState2) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("nok_12"), nok_12_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(216) EVT_RETURN EVT_END diff --git a/src/world/area_omo/common/ToyTrain.inc.c b/src/world/area_omo/common/ToyTrain.inc.c index fdaf8a04cb..922ecaa327 100644 --- a/src/world/area_omo/common/ToyTrain.inc.c +++ b/src/world/area_omo/common/ToyTrain.inc.c @@ -539,13 +539,13 @@ EvtScript N(EVS_TrainUnk_AltE) = { EvtScript N(EVS_TrainUnk_F) = { EVT_SWITCH(AB_OMO_6) EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_3, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_3, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(1) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_3, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_3, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(2) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_3, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_3, TRANSITION_TOY_TRAIN) EVT_END_SWITCH EVT_WAIT(100) EVT_RETURN @@ -557,42 +557,42 @@ EvtScript N(EVS_TrainUnk_G) = { EVT_CASE_RANGE(0, 1) EVT_SWITCH(AB_OMO_6) EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(1) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(2) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_END_SWITCH EVT_CASE_EQ(2) EVT_SWITCH(AB_OMO_6) EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(1) EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_END_IF EVT_CASE_EQ(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_END_SWITCH EVT_CASE_EQ(3) EVT_SWITCH(AB_OMO_6) EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_CASE_EQ(1) EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_END_IF EVT_CASE_EQ(2) EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_TOY_TRAIN) EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_TOY_TRAIN) EVT_END_IF EVT_END_SWITCH EVT_END_SWITCH diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/omo_12_3_npc.c index e9efee7514..0842f28386 100644 --- a/src/world/area_omo/omo_12/omo_12_3_npc.c +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -25,15 +25,15 @@ API_CALLABLE(N(SetLightOriginAndPower)) { s32 z = evt_get_variable(script, *args++); s32 alpha = evt_get_variable(script, *args++); - set_screen_overlay_center_worldpos(1, 1, x, y, z); - set_screen_overlay_alpha(1, alpha); - set_screen_overlay_params_back(0xB, 255.0f); + set_screen_overlay_center_worldpos(SCREEN_LAYER_BACK, 1, x, y, z); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, alpha); + set_screen_overlay_params_back(OVERLAY_WORLD_DARKNESS, 255.0f); return ApiStatus_DONE2; } API_CALLABLE(N(SetLightOff)) { - set_screen_overlay_alpha(1, 0.0f); - set_screen_overlay_params_back(0xB, 0.0f); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, 0.0f); + set_screen_overlay_params_back(OVERLAY_WORLD_DARKNESS, 0.0f); return ApiStatus_DONE2; } diff --git a/src/world/area_omo/omo_15/omo_15_2_main.c b/src/world/area_omo/omo_15/omo_15_2_main.c index 4ccfc04cf1..e0f15e3f8d 100644 --- a/src/world/area_omo/omo_15/omo_15_2_main.c +++ b/src/world/area_omo/omo_15/omo_15_2_main.c @@ -71,7 +71,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH4_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_3, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_3, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_osr/osr_00/osr_00_5_scenes.c b/src/world/area_osr/osr_00/osr_00_5_scenes.c index cb488c63e0..7b2dc22601 100644 --- a/src/world/area_osr/osr_00/osr_00_5_scenes.c +++ b/src/world/area_osr/osr_00/osr_00_5_scenes.c @@ -59,7 +59,7 @@ EvtScript N(EVS_Scene_ShowInvitation) = { EVT_WAIT(12 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0023, 160, 40) EVT_WAIT(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_20"), kmr_20_ENTRY_1, TRANSITION_7) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_20"), kmr_20_ENTRY_1, TRANSITION_SLOW_FADE_TO_WHITE) EVT_WAIT(40 * DT) EVT_RETURN EVT_END diff --git a/src/world/area_osr/osr_03/osr_03_6_ending.c b/src/world/area_osr/osr_03/osr_03_6_ending.c index 7241ac8c53..93d4cef8d5 100644 --- a/src/world/area_osr/osr_03/osr_03_6_ending.c +++ b/src/world/area_osr/osr_03/osr_03_6_ending.c @@ -8,8 +8,8 @@ API_CALLABLE(N(FlashScreenWhite)) { } switch (script->functionTemp[2]) { case 0: // fading in - set_screen_overlay_color(0, 208, 208, 208); - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 255) { script->functionTemp[2] = 1; break; @@ -21,8 +21,8 @@ API_CALLABLE(N(FlashScreenWhite)) { script->functionTemp[1] = 255; break; case 1: // fading out - set_screen_overlay_color(0, 208, 208, 208); - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 0) { return ApiStatus_DONE2; } @@ -184,7 +184,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GotoMapSpecial, EVT_PTR("hos_10"), hos_10_ENTRY_1, TRANSITION_7) + EVT_CALL(GotoMapSpecial, EVT_PTR("hos_10"), hos_10_ENTRY_1, TRANSITION_SLOW_FADE_TO_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_pra/pra_32/pra_32_2_main.c b/src/world/area_pra/pra_32/pra_32_2_main.c index 51639ab7ba..b3c176f2d7 100644 --- a/src/world/area_pra/pra_32/pra_32_2_main.c +++ b/src/world/area_pra/pra_32/pra_32_2_main.c @@ -64,7 +64,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_6, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_6, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END @@ -126,7 +126,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_6, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_6, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_sam/sam_12/sam_12_4_scenes.c b/src/world/area_sam/sam_12/sam_12_4_scenes.c index 34b156782b..f825466f51 100644 --- a/src/world/area_sam/sam_12/sam_12_4_scenes.c +++ b/src/world/area_sam/sam_12/sam_12_4_scenes.c @@ -4,7 +4,7 @@ API_CALLABLE(N(SetScreenFadeAmount)) { Bytecode* args = script->ptrReadPos; - set_screen_overlay_params_front(0, evt_get_float_variable(script, *args++)); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, evt_get_float_variable(script, *args++)); return ApiStatus_DONE2; } diff --git a/src/world/area_tik/tik_03/tik_03_6_demo.c b/src/world/area_tik/tik_03/tik_03_6_demo.c index 3d942d665f..c454b14942 100644 --- a/src/world/area_tik/tik_03/tik_03_6_demo.c +++ b/src/world/area_tik/tik_03/tik_03_6_demo.c @@ -23,7 +23,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("tik_03"), tik_03_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("tik_03"), tik_03_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(110) EVT_RETURN EVT_END @@ -42,7 +42,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("tik_03"), tik_03_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("tik_03"), tik_03_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_tik/tik_17/tik_17_3_main.c b/src/world/area_tik/tik_17/tik_17_3_main.c index 7340130de3..5cfa504970 100644 --- a/src/world/area_tik/tik_17/tik_17_3_main.c +++ b/src/world/area_tik/tik_17/tik_17_3_main.c @@ -8,7 +8,7 @@ EvtScript N(EVS_GotoMap_sam_02_2) = { EVT_IF_EQ(GF_StartedChapter7, FALSE) EVT_SET(GF_StartedChapter7, TRUE) EVT_CALL(FadeOutMusic, 0, 1500) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_7, TRANSITION_6) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_7, TRANSITION_BEGIN_OR_END_CHAPTER) EVT_WAIT(100) EVT_RETURN EVT_END_IF diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c index 9bd3416b86..d7a732dde3 100644 --- a/src/world/area_trd/trd_04/trd_04_1_main.c +++ b/src/world/area_trd/trd_04/trd_04_1_main.c @@ -132,7 +132,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_LOOP(5) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 150) - EVT_CALL(PlayEffect, EFFECT_DUST, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 0, LVar0, LVar1, LVar2, 40) EVT_CALL(RandInt, 20 * DT, LVar0) EVT_ADD(LVar0, 20 * DT) EVT_WAIT(LVar0) @@ -148,7 +148,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_ADD(LVar1, LVar4) EVT_ADD(LVar2, 200) EVT_ADD(LVar3, LVar5) - EVT_CALL(PlayEffect, EFFECT_SHATTERING_STONES, 0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHATTERING_STONES, 0, LVar1, LVar2, LVar3) EVT_CALL(RandInt, 30 * DT, LVar0) EVT_ADD(LVar0, 30 * DT) EVT_WAIT(LVar0) diff --git a/src/world/area_trd/trd_09/trd_09_4_demo.c b/src/world/area_trd/trd_09/trd_09_4_demo.c index df52aaa1fc..22600beb54 100644 --- a/src/world/area_trd/trd_09/trd_09_4_demo.c +++ b/src/world/area_trd/trd_09/trd_09_4_demo.c @@ -50,7 +50,7 @@ EvtScript N(EVS_ProvideDemoInputs) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("trd_09"), trd_09_ENTRY_2, TRANSITION_2) + EVT_CALL(GotoMapSpecial, EVT_PTR("trd_09"), trd_09_ENTRY_2, TRANSITION_END_DEMO_SCENE_BLACK) EVT_WAIT(123) EVT_RETURN EVT_END @@ -69,7 +69,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_RETURN EVT_END_IF EVT_SET(GF_DemoSceneDone, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("trd_09"), trd_09_ENTRY_2, TRANSITION_3) + EVT_CALL(GotoMapSpecial, EVT_PTR("trd_09"), trd_09_ENTRY_2, TRANSITION_END_DEMO_SCENE_WHITE) EVT_WAIT(113) EVT_RETURN EVT_END diff --git a/src/world/area_trd/trd_10/trd_10_1_main.c b/src/world/area_trd/trd_10/trd_10_1_main.c index bafdd245a3..89b8e39081 100644 --- a/src/world/area_trd/trd_10/trd_10_1_main.c +++ b/src/world/area_trd/trd_10/trd_10_1_main.c @@ -83,7 +83,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH1_STAR_SPIRIT_RESCUED) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_0, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_0, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/src/world/area_tst/tst_12/tst_12_1_main.c b/src/world/area_tst/tst_12/tst_12_1_main.c index 7e35a1f839..5454495d10 100644 --- a/src/world/area_tst/tst_12/tst_12_1_main.c +++ b/src/world/area_tst/tst_12/tst_12_1_main.c @@ -40,7 +40,7 @@ EvtScript N(D_80240050_B1D340) = { EVT_ADD(LVar0, LVarA) EVT_ADD(LVar1, LVarB) EVT_ADD(LVar2, LVarE) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar2, LVar1, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLOATING_FLOWER, LVar0, LVar2, LVar1, LVar3) EVT_END_LOOP EVT_WAIT(LVarF) EVT_LABEL(0) @@ -48,7 +48,7 @@ EvtScript N(D_80240050_B1D340) = { EVT_CALL(RandInt, LVarD, LVar1) EVT_ADD(LVar0, LVarA) EVT_ADD(LVar1, LVarB) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVarE, LVar1, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLOATING_FLOWER, LVar0, LVarE, LVar1, 200) EVT_WAIT(LVarF) EVT_GOTO(0) EVT_RETURN diff --git a/src/world/common/atomic/CreateDarkness.inc.c b/src/world/common/atomic/CreateDarkness.inc.c index b35c311c9a..de5a1b6724 100644 --- a/src/world/common/atomic/CreateDarkness.inc.c +++ b/src/world/common/atomic/CreateDarkness.inc.c @@ -9,7 +9,7 @@ API_CALLABLE(N(DarkRoomUpdate)) { script->functionTemp[1] = FALSE; } - set_screen_overlay_center_worldpos(1, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); + set_screen_overlay_center_worldpos(SCREEN_LAYER_BACK, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); if (gPartnerStatus.partnerActionState != PARTNER_ACTION_NONE) { if (playerData->currentPartner == PARTNER_WATT) { @@ -37,8 +37,8 @@ API_CALLABLE(N(DarkRoomUpdate)) { script->functionTemp[0] = 255; } - set_screen_overlay_alpha(1, script->functionTemp[0]); - set_screen_overlay_params_back(0xB, 255.0f); + set_screen_overlay_alpha(SCREEN_LAYER_BACK, script->functionTemp[0]); + set_screen_overlay_params_back(OVERLAY_WORLD_DARKNESS, 255.0f); return ApiStatus_BLOCK; } diff --git a/src/world/common/atomic/ToadHouse.inc.c b/src/world/common/atomic/ToadHouse.inc.c index f34dc76e96..f1d892f3a5 100644 --- a/src/world/common/atomic/ToadHouse.inc.c +++ b/src/world/common/atomic/ToadHouse.inc.c @@ -18,7 +18,7 @@ API_CALLABLE(N(ToadHouse_UpdateScreenOverlay)) { s32 type = evt_get_variable(script, *args++); s32 zoom = evt_get_variable(script, *args++); - set_screen_overlay_center(0, 0, 190, 145); + set_screen_overlay_center(SCREEN_LAYER_FRONT, 0, 190, 145); set_screen_overlay_params_front(type, zoom); return ApiStatus_DONE2; } @@ -79,7 +79,7 @@ API_CALLABLE(N(ToadHouse_InitScreenOverlay)) { s32 g = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); - set_screen_overlay_color(0, r, g, b); + set_screen_overlay_color(SCREEN_LAYER_FRONT, r, g, b); return ApiStatus_DONE2; } diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 63912436e5..7b1b5c0519 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -1059,18 +1059,18 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) EVT_CALL(N(Quizmo_AddViewRelativeOffset), 0, 0, 83, LVar0, LVar2) - EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x44, 4, LVar0, LVar1, LVar2, 1, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_CONFETTI, 4, LVar0, LVar1, LVar2, 1, 60) EVT_WAIT(15) EVT_ADD(LVar1, -3) EVT_CALL(N(Quizmo_AddViewRelativeOffset), 0, 0, 58, LVar0, LVar2) - EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x44, 4, LVar0, LVar1, LVar2, 1, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_CONFETTI, 4, LVar0, LVar1, LVar2, 1, 60) EVT_WAIT(15) EVT_ADD(LVar1, 30) EVT_CALL(N(Quizmo_AddViewRelativeOffset), 0, 0, 93, LVar0, LVar2) - EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x44, 4, LVar0, LVar1, LVar2, 1, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_CONFETTI, 4, LVar0, LVar1, LVar2, 1, 60) EVT_WAIT(15) EVT_END_THREAD EVT_WAIT(20) @@ -1137,7 +1137,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(PlaySound, SOUND_8B) EVT_EXEC_GET_TID(N(EVS_Quizmo_WrongAnswer), LVar1) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(PlayEffect, 0x2B, 0, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WINDY_LEAVES, 0, LVar2, LVar3, LVar4) EVT_CALL(ContinueSpeech, -1, -1, -1, 0, MSG_MGM_000D) EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_CloseWrong) EVT_LOOP(0) diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index f74118e4bf..5c4714a8ce 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -377,7 +377,7 @@ API_CALLABLE(N(SuperBlock_WhiteScreenFlash)) { script->varTable[1] = evt_get_variable(script, *args++); script->functionTemp[0] = 0; script->functionTemp[1] = 0; - set_screen_overlay_color(0, 208, 208, 208); + set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); } switch (script->functionTemp[0]) { @@ -410,7 +410,7 @@ API_CALLABLE(N(SuperBlock_WhiteScreenFlash)) { break; } - set_screen_overlay_params_front(1, script->functionTemp[1]); + set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, script->functionTemp[1]); return ret; } diff --git a/src/world/common/todo/UnkFunc1.inc.c b/src/world/common/todo/UnkFunc1.inc.c index b5a87bc090..112c116119 100644 --- a/src/world/common/todo/UnkFunc1.inc.c +++ b/src/world/common/todo/UnkFunc1.inc.c @@ -3,6 +3,6 @@ API_CALLABLE(N(UnkFunc1)) { increment_status_menu_disabled(); - set_screen_overlay_params_back(0, 255.0f); + set_screen_overlay_params_back(OVERLAY_SCREEN_COLOR, 255.0f); return ApiStatus_DONE2; } diff --git a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c index 985a7bc8df..21895729b4 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c +++ b/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c @@ -308,7 +308,7 @@ void N(UnkModelFunc001)(void) { } gDPSetColorImage(new_var, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetCombineMode(gMainGfxPos++, PM_CC_09, PM_CC_09); gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 240, 0); gDPPipeSync(gMainGfxPos++); @@ -331,7 +331,7 @@ void N(UnkModelFunc001)(void) { gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); - 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); gDPPipeSync(gMainGfxPos++); N(UnkModelFunc000)(temp_f24, temp_f26, temp_f20, temp_f22); diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c index b29bb0607f..41601f0738 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c @@ -44,7 +44,7 @@ API_CALLABLE(N(PartnerRideBeanstalk)) { } API_CALLABLE(N(SetScreenFadeAmount)) { - set_screen_overlay_params_back(1, script->varTable[0]); + set_screen_overlay_params_back(OVERLAY_VIEWPORT_COLOR, script->varTable[0]); return ApiStatus_DONE2; } diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c index 0187236a57..a5c24ca948 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c @@ -79,7 +79,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 3) EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_14) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) EVT_RETURN EVT_END diff --git a/tools/splat_ext/pm_sprite_shading_profiles.py b/tools/splat_ext/pm_sprite_shading_profiles.py index b5a4f30643..67916faaf8 100644 --- a/tools/splat_ext/pm_sprite_shading_profiles.py +++ b/tools/splat_ext/pm_sprite_shading_profiles.py @@ -204,6 +204,7 @@ class N64SegPm_sprite_shading_profiles(N64Segment): self.json_out = extract(data) def split(self, rom_bytes): + self.out_path().parent.mkdir(parents=True, exist_ok=True) with open(self.out_path(), "w") as f: f.write(self.json_out) diff --git a/ver/ique/asm/bss3.s b/ver/ique/asm/bss3.s index aa5019a8e0..5cdcc56656 100644 --- a/ver/ique/asm/bss3.s +++ b/ver/ique/asm/bss3.s @@ -717,7 +717,7 @@ dlabel D_8015A57C dlabel mdl_textureHandles .space 0x00002200 -dlabel D_8015C790 +dlabel ScreenOverlays .space 0x00000030 dlabel AmbientSoundData diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml index afb551730c..395fdf7cb8 100644 --- a/ver/ique/splat.yaml +++ b/ver/ique/splat.yaml @@ -299,20 +299,20 @@ segments: type: .data name: curtains subsegments: - - [0x4E650, i4, sprite/unk_checkers, 16, 32] + - [0x4E650, i4, theater/walls, 16, 32] - [0x4E750] - - [0x4E7A0, rgba32, sprite/curtains, 32, 32] + - [0x4E7A0, rgba32, theater/curtains, 32, 32] - [0x4F7A0] - - [0x4F7F0, ci4, sprite/checkers, 32, 16] - - [0x4F8F0, palette, sprite/checkers] + - [0x4F7F0, ci4, theater/floor, 32, 16] + - [0x4F8F0, palette, theater/floor] - [0x4F910] - - [0x4F990, vtx, vtx/curtains1] - - [0x4F9F0, vtx, vtx/curtains2] - - [0x4FA50, vtx, vtx/curtains3] - - [0x4FBE0, vtx, vtx/curtains4] - - [0x4FC20, vtx, vtx/curtains5] - - [0x4FC60, vtx, vtx/curtains6] - - [0x4FE50, vtx, vtx/curtains7] + - [0x4F990, vtx, theater/left_wall_vtx] + - [0x4F9F0, vtx, theater/right_wall_vtx] + - [0x4FA50, vtx, theater/floor_vtx] + - [0x4FBE0, vtx, theater/left_inset_shadow_vtx] + - [0x4FC20, vtx, theater/right_inset_shadow_vtx] + - [0x4FC60, vtx, theater/curtain_vtx] + - [0x4FE50, vtx, theater/wall_shadows_vtx] - [0x4FED0] - [0x501B0, ia8, ui/no_controller, 128, 32] - [0x511B0] @@ -413,7 +413,7 @@ segments: - [0xD49C0, c, hud_element] - [0xDA990, c, dba20_len_350] - [0xDACE0, c, trigger] - - [0xDB3E0, c, dc470_len_14c0] + - [0xDB3E0, c, background] - [0xDC8A0, c, audio/ambience] - [0xDCA60, c, windows] - [0xDD6B0, c, sprite_shading] @@ -440,7 +440,7 @@ segments: - [0xE4400, .data, CEE40] - [0xE4480, .data, imgfx] - [0xE4630, .data, hud_element] - - [0xE4790, .data, dc470_len_14c0] + - [0xE4790, .data, background] - [0xE47B0, .data, audio/ambience] - [0xE47C0, .data, windows] - [0xE4940, .data, audio/sfx] diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index 8cafc1fe86..f1c6b42294 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -8,14 +8,14 @@ calculate_segment_intersection = 0x8003198c; calculate_line_segment_intersection = 0x80031c94; npc_do_player_collision = 0x80038988; npc_do_other_npc_collision = 0x800386bc; -vtx_curtains1 = 0x80074590; -vtx_curtains2 = 0x800745f0; -vtx_curtains3 = 0x80074650; -vtx_curtains4 = 0x800747e0; -vtx_curtains5 = 0x80074820; -vtx_curtains6 = 0x80074860; -vtx_curtains7 = 0x80074a50; -sprite_unk_checkers_png = 0x80073250; +theater_left_wall_vtx = 0x80074590; +theater_right_wall_vtx = 0x800745f0; +theater_floor_vtx = 0x80074650; +theater_left_inset_shadow_vtx = 0x800747e0; +theater_right_inset_shadow_vtx = 0x80074820; +theater_curtain_vtx = 0x80074860; +theater_wall_shadows_vtx = 0x80074a50; +theater_walls_png = 0x80073250; __osMaxControllers = 0x800991D2; __osFlashMsgBuf = 0x800991D4; __osCurrentTime = 0x800991D8; @@ -27,9 +27,9 @@ __osTimerCounter = 0x80099200; __osBbVCountWraps = 0x80099210; __osFlashVersion = 0x80099180; -sprite_curtains_png = 0x800733A0; -sprite_checkers_pal = 0x800744f0; -sprite_checkers_png = 0x800743f0; +theater_curtains_png = 0x800733A0; +theater_floor_pal = 0x800744f0; +theater_floor_png = 0x800743f0; ui_no_controller_png = 0x80074db0; __osBbHackFlags = 0x8000038C; __osMaxControllers = 0x800991d2; diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 3203cd548e..60bb67df85 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -298,20 +298,20 @@ segments: type: .data name: curtains subsegments: - - [0x4F9C0, i4, sprite/unk_checkers, 16, 32] + - [0x4F9C0, i4, theater/walls, 16, 32] - [0x4FAC0] - - [0x4FB10, rgba32, sprite/curtains, 32, 32] + - [0x4FB10, rgba32, theater/curtains, 32, 32] - [0x50B10] - - [0x50B60, ci4, sprite/checkers, 32, 16] - - [0x50C60, palette, sprite/checkers] + - [0x50B60, ci4, theater/floor, 32, 16] + - [0x50C60, palette, theater/floor] - [0x50C80] - - [0x50D00, vtx, vtx/curtains1] - - [0x50D60, vtx, vtx/curtains2] - - [0x50DC0, vtx, vtx/curtains3] - - [0x50F50, vtx, vtx/curtains4] - - [0x50F90, vtx, vtx/curtains5] - - [0x50FD0, vtx, vtx/curtains6] - - [0x511C0, vtx, vtx/curtains7] + - [0x50D00, vtx, theater/left_wall_vtx] + - [0x50D60, vtx, theater/right_wall_vtx] + - [0x50DC0, vtx, theater/floor_vtx] + - [0x50F50, vtx, theater/left_inset_shadow_vtx] + - [0x50F90, vtx, theater/right_inset_shadow_vtx] + - [0x50FD0, vtx, theater/curtain_vtx] + - [0x511C0, vtx, theater/wall_shadows_vtx] - [0x51240] - [0x51520, ia8, ui/no_controller, 128, 32] - [0x52520] diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 55f8e1033f..1c0e3d8796 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -163,21 +163,21 @@ gGameStatusPtr = 0x8007417C; D_800741A2 = 0x80074182; gMatrixListPos = 0x800741D0; gRandSeed = 0x800743F0; -sprite_unk_checkers_png = 0x800745C0; +theater_walls_png = 0x800745C0; D_800746E0 = 0x800746C0; -sprite_curtains_png = 0x80074710; +theater_curtains_png = 0x80074710; D_80075730 = 0x80075710; -sprite_checkers_png = 0x80075760; -sprite_checkers_pal = 0x80075860; +theater_floor_png = 0x80075760; +theater_floor_pal = 0x80075860; D_800758A0 = 0x80075880; -vtx_curtains1 = 0x80075900; -vtx_curtains2 = 0x80075960; -vtx_curtains3 = 0x800759C0; -vtx_curtains4 = 0x80075B50; -vtx_curtains5 = 0x80075B90; -vtx_curtains6 = 0x80075BD0; -vtx_curtains7 = 0x80075DC0; -D_80075E60 = 0x80075E40; +theater_left_wall_vtx = 0x80075900; +theater_right_wall_vtx = 0x80075960; +theater_floor_vtx = 0x800759C0; +theater_left_inset_shadow_vtx = 0x80075B50; +theater_right_inset_shadow_vtx = 0x80075B90; +theater_curtain_vtx = 0x80075BD0; +theater_wall_shadows_vtx = 0x80075DC0; +TheaterWallShadowsGfx = 0x80075E40; ui_no_controller_png = 0x80076120; gCurrentCameraID = 0x800773E0; gSaveSlotMetadata = 0x80077994; diff --git a/ver/pal/effect_shims.yaml b/ver/pal/effect_shims.yaml index 824f1d4327..d9748eb05f 100644 --- a/ver/pal/effect_shims.yaml +++ b/ver/pal/effect_shims.yaml @@ -32,7 +32,7 @@ - shim_guPositionF - shim_guOrthoF - shim_guFrustumF -- shim_func_80138D88 +- shim_draw_prev_frame_buffer_at_screen_pos - shim_draw_box - shim_draw_msg - shim_get_msg_width diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 8e3502d526..e0e7bc732c 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -470,7 +470,7 @@ set_screen_overlay_alpha = 0x80136C74; clear_screen_overlays = 0x80136CA8; set_map_transition_effect = 0x80136E40; update_exit_map_screen_overlay = 0x80136E4C; -func_80138D88 = 0x80137928; +draw_prev_frame_buffer_at_screen_pos = 0x80137928; imgfx_get_free_instances = 0x801392A4; imgfx_release_instance = 0x801393F4; imgfx_update = 0x8013963C; @@ -619,8 +619,8 @@ get_actor = 0x8026A15C; LoadBattleSection = 0x8026A1D4; GetBattlePhase = 0x8026A218; GetLastElement = 0x8026A244; -func_80269E80 = 0x8026A270; -func_80269EAC = 0x8026A29C; +GetDamageSource = 0x8026A270; +SetDamageSource = 0x8026A29C; SetGoalToHome = 0x8026A2B4; SetIdleGoalToHome = 0x8026A31C; SetGoalToIndex = 0x8026A384; @@ -827,7 +827,7 @@ GetGridIndexFromPos = 0x802836C8; bMarioHideAnims = 0x80283760; SetPushBlockFallEffect = 0x802837BC; ItemShopInteract = 0x80284064; -D_80283EE8 = 0x802843A8; +EMS_StarIcon = 0x802843A8; EnterWalk = 0x80285970; EnterWalkShort = 0x80285A70; EnterPostPipe = 0x80285C60; @@ -858,8 +858,8 @@ HES_AimShimmerF = 0x80293BB4; HES_AimReticle = 0x80293D7C; HES_AimTarget = 0x80293DB4; HES_AimBlinkA = 0x80293DEC; -UseMystery = 0x80294490; -DoSleepHit = 0x80294C30; +EVS_UseMystery = 0x80294490; +EVS_PlaySleepHitFX = 0x80294C30; D_80294720 = 0x80294D70; DoPartnerRunAway = 0x8029514C; DoPartnerBurnContact = 0x802952B8; @@ -871,15 +871,15 @@ DoPartnerHit = 0x80296664; DoPartnerBurn = 0x8029686C; D_802976E8 = 0x80297D38; D_802977BC = 0x80297E0C; -DoPartnerBlock = 0x80297E64; -ForceNextTarget = 0x80299240; -DoNormalHit = 0x80299694; +EVS_DoPartnerBlock = 0x80297E64; +EVS_ForceNextTarget = 0x80299240; +EVS_DoNormalHit = 0x80299694; DoBurnHit = 0x8029A720; DoShockHit = 0x8029AD4C; D_8029A76C = 0x8029ADBC; DoImmune = 0x8029B2C0; -DoDeath = 0x8029B510; -D_8029AF08 = 0x8029B558; +EVS_DoDeath = 0x8029B510; +EVS_AnimateDeath = 0x8029B558; DoScareAway = 0x8029B87C; DoSpinSmashHit = 0x8029BFE8; D_8029BBB4 = 0x8029C204; diff --git a/ver/us/asm/bss3.s b/ver/us/asm/bss3.s index ba26436476..e7f2e5be0e 100644 --- a/ver/us/asm/bss3.s +++ b/ver/us/asm/bss3.s @@ -712,7 +712,7 @@ dlabel D_8015A57C dlabel mdl_textureHandles .space 0x00002200 -dlabel D_8015C790 +dlabel ScreenOverlays .space 0x00000030 dlabel AmbientSoundData diff --git a/ver/us/effect_shims.yaml b/ver/us/effect_shims.yaml index 824f1d4327..d9748eb05f 100644 --- a/ver/us/effect_shims.yaml +++ b/ver/us/effect_shims.yaml @@ -32,7 +32,7 @@ - shim_guPositionF - shim_guOrthoF - shim_guFrustumF -- shim_func_80138D88 +- shim_draw_prev_frame_buffer_at_screen_pos - shim_draw_box - shim_draw_msg - shim_get_msg_width diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index a9ae0339a2..97f53f433c 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -300,20 +300,20 @@ segments: type: .data name: curtains subsegments: - - [0x4F9E0, i4, sprite/unk_checkers, 16, 32] + - [0x4F9E0, i4, theater/walls, 16, 32] - [0x4FAE0] - - [0x4FB30, rgba32, sprite/curtains, 32, 32] + - [0x4FB30, rgba32, theater/curtains, 32, 32] #TODO: flip - [0x50B30] - - [0x50B80, ci4, sprite/checkers, 32, 16] - - [0x50C80, palette, sprite/checkers] + - [0x50B80, ci4, theater/floor, 32, 16] #TODO: flip + - [0x50C80, palette, theater/floor] - [0x50CA0] - - [0x50D20, vtx, vtx/curtains1] - - [0x50D80, vtx, vtx/curtains2] - - [0x50DE0, vtx, vtx/curtains3] - - [0x50F70, vtx, vtx/curtains4] - - [0x50FB0, vtx, vtx/curtains5] - - [0x50FF0, vtx, vtx/curtains6] - - [0x511E0, vtx, vtx/curtains7] + - [0x50D20, vtx, theater/left_wall_vtx] + - [0x50D80, vtx, theater/right_wall_vtx] + - [0x50DE0, vtx, theater/floor_vtx] + - [0x50F70, vtx, theater/left_inset_shadow_vtx] + - [0x50FB0, vtx, theater/right_inset_shadow_vtx] + - [0x50FF0, vtx, theater/curtain_vtx] + - [0x511E0, vtx, theater/wall_shadows_vtx] - [0x51260] - [0x51540, ia8, ui/no_controller, 128, 32] - [0x52540] @@ -836,7 +836,7 @@ segments: - [0xD5A50, c, hud_element] - [0xDBA20, c, dba20_len_350] - [0xDBD70, c, trigger] - - [0xDC470, c, dc470_len_14c0] + - [0xDC470, c, background] - [0xDD930, c, audio/ambience] - [0xDDAF0, c, windows] - [0xDE740, c, sprite_shading] @@ -863,7 +863,7 @@ segments: - [0xE5490, .data, CEE40] - [0xE5510, .data, imgfx] - [0xE56C0, .data, hud_element] - - [0xE5820, .data, dc470_len_14c0] + - [0xE5820, .data, background] - [0xE5840, .data, audio/ambience] - [0xE5850, .data, windows] - [0xE59D0, .data, audio/sfx] @@ -1551,8 +1551,8 @@ segments: - [0x1BDDC0, palette, ui/battle/cmd/aim/target_0] - [0x1BDDE0, ci4, ui/battle/cmd/aim/target_1, 24, 24] - [0x1BDF00, palette, ui/battle/cmd/aim/target_1] - - [0x1BDF20, ci4, ui/battle/unk_star, 32, 32] - - [0x1BE120, palette, ui/battle/unk_star] + - [0x1BDF20, ci4, ui/battle/solid_star, 32, 32] + - [0x1BE120, palette, ui/battle/solid_star] - [0x1BE140] - [0x1BE148, ia8, ui/battle/projector_spot, 32, 32] - [0x1BE548] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 1a4894d694..67bacd9e97 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1325,32 +1325,32 @@ gRandSeed = 0x80074410; // rom:0x4F810 D_80074414 = 0x80074414; // type:data rom:0x4F814 D_80074580 = 0x80074580; // type:data rom:0x4F980 magicSaveString = 0x800745D0; // type:data rom:0x4F9D0 -sprite_unk_checkers_png = 0x800745E0; // type:data rom:0x4F9E0 +theater_walls_png = 0x800745E0; // type:data rom:0x4F9E0 D_800746E0 = 0x800746E0; // type:data rom:0x4FAE0 -sprite_curtains_png = 0x80074730; // type:data rom:0x4FB30 +theater_curtains_png = 0x80074730; // type:data rom:0x4FB30 D_80075730 = 0x80075730; // type:data rom:0x50B30 -sprite_checkers_png = 0x80075780; // type:data rom:0x50B80 -sprite_checkers_pal = 0x80075880; // type:data rom:0x50C80 +theater_floor_png = 0x80075780; // type:data rom:0x50B80 +theater_floor_pal = 0x80075880; // type:data rom:0x50C80 D_800758A0 = 0x800758A0; // type:data rom:0x50CA0 -vtx_curtains1 = 0x80075920; // type:data rom:0x50D20 -vtx_curtains2 = 0x80075980; // type:data rom:0x50D80 -vtx_curtains3 = 0x800759E0; // type:data rom:0x50DE0 -vtx_curtains4 = 0x80075B70; // type:data rom:0x50F70 -vtx_curtains5 = 0x80075BB0; // type:data rom:0x50FB0 -vtx_curtains6 = 0x80075BF0; // type:data rom:0x50FF0 -vtx_curtains7 = 0x80075DE0; // type:data rom:0x511E0 -D_80075E60 = 0x80075E60; // type:data rom:0x51260 -D_80075EA0 = 0x80075EA0; // type:data rom:0x512A0 -D_80075F20 = 0x80075F20; // type:data rom:0x51320 -D_80075F68 = 0x80075F68; // type:data rom:0x51368 -D_80075FF8 = 0x80075FF8; // type:data rom:0x513F8 -D_80076038 = 0x80076038; // type:data rom:0x51438 -D_80076078 = 0x80076078; // type:data rom:0x51478 -D_800760B0 = 0x800760B0; // type:data rom:0x514B0 -D_800760C0 = 0x800760C0; // type:data rom:0x514C0 +theater_left_wall_vtx = 0x80075920; // type:data rom:0x50D20 +theater_right_wall_vtx = 0x80075980; // type:data rom:0x50D80 +theater_floor_vtx = 0x800759E0; // type:data rom:0x50DE0 +theater_left_inset_shadow_vtx = 0x80075B70; // type:data rom:0x50F70 +theater_right_inset_shadow_vtx = 0x80075BB0; // type:data rom:0x50FB0 +theater_curtain_vtx = 0x80075BF0; // type:data rom:0x50FF0 +theater_wall_shadows_vtx = 0x80075DE0; // type:data rom:0x511E0 +TheaterWallShadowsGfx = 0x80075E60; // type:data rom:0x51260 +TheaterCurtainGfx = 0x80075EA0; // type:data rom:0x512A0 +TheaterInsetShadowsGfx = 0x80075F20; // type:data rom:0x51320 +TheaterFloorGfx = 0x80075F68; // type:data rom:0x51368 +TheaterRightWallGfx = 0x80075FF8; // type:data rom:0x513F8 +TheaterLeftWallGfx = 0x80076038; // type:data rom:0x51438 +TheaterGfx = 0x80076078; // type:data rom:0x51478 +TheaterViewport = 0x800760B0; // type:data rom:0x514B0 +TheaterInitGfx = 0x800760C0; // type:data rom:0x514C0 ui_no_controller_png = 0x80076140; // type:data rom:0x51540 -D_80077140 = 0x80077140; // type:data rom:0x52540 -D_800771E8 = 0x800771E8; // type:data rom:0x525E8 +NoControllerSetupTexGfx = 0x80077140; // type:data rom:0x52540 +NoControllerGfx = 0x800771E8; // type:data rom:0x525E8 gCrashScreencharToGlyph = 0x80077210; // type:data rom:0x52610 gCrashScreenFont = 0x80077290; // type:data rom:0x52690 gFaultCauses = 0x80077390; // type:data rom:0x52790 @@ -4308,10 +4308,10 @@ render_screen_overlay_backUI = 0x80138220; // type:func rom:0xCE920 set_map_transition_effect = 0x801382A0; // type:func rom:0xCE9A0 update_exit_map_screen_overlay = 0x801382AC; // type:func rom:0xCE9AC update_enter_map_screen_overlay = 0x801385D4; // type:func rom:0xCECD4 -func_80138740 = 0x80138740; // type:func rom:0xCEE40 -func_80138D88 = 0x80138D88; // type:func rom:0xCF488 -func_80138E54 = 0x80138E54; // type:func rom:0xCF554 -func_80139F10 = 0x80139F10; // type:func rom:0xD0610 +appendGfx_draw_prev_frame_buffer = 0x80138740; // type:func rom:0xCEE40 +draw_prev_frame_buffer_at_screen_pos = 0x80138D88; // type:func rom:0xCF488 +appendGfx_darkness_stencil = 0x80138E54; // type:func rom:0xCF554 +appendGfx_screen_transition_stencil = 0x80139F10; // type:func rom:0xD0610 imgfx_set_vtx_buf_capacity = 0x8013A370; // type:func rom:0xD0A70 imgfx_init = 0x8013A37C; // type:func rom:0xD0A7C func_8013A4D0 = 0x8013A4D0; // type:func rom:0xD0BD0 @@ -4610,7 +4610,7 @@ D_8014C6A0 = 0x8014C6A0; // type:data rom:0xE2DA0 D_8014C6C8 = 0x8014C6C8; // type:data rom:0xE2DC8 D_8014C6E0 = 0x8014C6E0; // type:data rom:0xE2DE0 D_8014C6E4 = 0x8014C6E4; // type:data rom:0xE2DE4 -D_8014C6F0 = 0x8014C6F0; // type:data rom:0xE2DF0 +CurrentScreenTransition = 0x8014C6F0; // type:data rom:0xE2DF0 D_8014C6F4 = 0x8014C6F4; // type:data rom:0xE2DF4 ui_stencil_star_png = 0x8014C700; // rom:0xE2E00 ui_stencil_mario_png = 0x8014CB00; // rom:0xE3200 @@ -5335,7 +5335,7 @@ GetNpcAnimation = 0x802CE160; // type:func rom:0xF2B10 SetNpcAnimationSpeed = 0x802CE1C0; // type:func rom:0xF2B70 NpcMoveTo = 0x802CE22C; // type:func rom:0xF2BDC _npc_jump_to = 0x802CE434; // type:func rom:0xF2DE4 -D_8015C790 = 0x8015C790; // type:data rom:0xF2E90 +ScreenOverlays = 0x8015C790; // type:data rom:0xF2E90 AmbientSoundData = 0x8015C7C0; // type:data rom:0xF2EC0 CreateEntityVarArgBuffer = 0x8015C7D0; // type:data rom:0xF2ED0 CreateEntityVarArgBuffer1 = 0x8015C7D4; // type:data rom:0xF2ED4 @@ -6577,14 +6577,14 @@ CamPresetUpdate_G = 0x8024A214; // type:func rom:0x178AF4 CamPresetUpdate_I = 0x8024A990; // type:func rom:0x179270 CamPresetUpdate_H = 0x8024AFE4; // type:func rom:0x1798C4 CamPresetUpdate_N = 0x8024B5FC; // type:func rom:0x179EDC -CamPresetUpdate_C = 0x8024B9A0; // type:func rom:0x17A280 +BattleCamImpl_Default = 0x8024B9A0; // type:func rom:0x17A280 CamPresetUpdate_D = 0x8024BDA4; // type:func rom:0x17A684 CamPresetUpdate_E = 0x8024C180; // type:func rom:0x17AA60 CamPresetUpdate_J = 0x8024C570; // type:func rom:0x17AE50 CamPresetUpdate_K = 0x8024C944; // type:func rom:0x17B224 CamPresetUpdate_L = 0x8024CB68; // type:func rom:0x17B448 func_8024CE9C = 0x8024CE9C; // type:func rom:0x17B77C -btl_cam_use_preset_intl = 0x8024CF34; // type:func rom:0x17B814 +btl_cam_use_preset_impl = 0x8024CF34; // type:func rom:0x17B814 btl_cam_use_preset_immediately = 0x8024E3D8; // type:func rom:0x17CCB8 btl_cam_use_preset = 0x8024E40C; // type:func rom:0x17CCEC btl_cam_target_actor = 0x8024E43C; // type:func rom:0x17CD1C @@ -6624,9 +6624,9 @@ btl_popup_messages_draw_world_geometry = 0x8024EEA8; // type:func rom:0x17D788 btl_popup_messages_draw_ui = 0x8024EF08; // type:func rom:0x17D7E8 btl_create_popup = 0x8024EF68; // type:func rom:0x17D848 free_popup = 0x8024EFA4; // type:func rom:0x17D884 -func_8024EFE0 = 0x8024EFE0; // type:func rom:0x17D8C0 -func_8024F394 = 0x8024F394; // type:func rom:0x17DC74 -func_8024F5AC = 0x8024F5AC; // type:func rom:0x17DE8C +show_immune_bonk = 0x8024EFE0; // type:func rom:0x17D8C0 +btl_bonk_update = 0x8024F394; // type:func rom:0x17DC74 +btl_bonk_render = 0x8024F5AC; // type:func rom:0x17DE8C func_8024F768 = 0x8024F768; // type:func rom:0x17E048 func_8024F7C8 = 0x8024F7C8; // type:func rom:0x17E0A8 func_8024F84C = 0x8024F84C; // type:func rom:0x17E12C @@ -6780,7 +6780,7 @@ btl_draw_upgrade_windows = 0x8025FF8C; // type:func rom:0x18E86C btl_state_draw_celebration = 0x802601BC; // type:func rom:0x18EA9C draw_content_level_up_textbox = 0x80260948; // type:func rom:0x18F228 draw_content_cant_increase_popup = 0x80260A20; // type:func rom:0x18F300 -func_80260A60 = 0x80260A60; // type:func rom:0x18F340 +btl_set_player_idle_anims = 0x80260A60; // type:func rom:0x18F340 IsPartnerImmobile = 0x80260AD4; // type:func rom:0x18F3B4 activate_defend_command = 0x80260B04; // type:func rom:0x18F3E4 func_80260B70 = 0x80260B70; // type:func rom:0x18F450 @@ -6955,8 +6955,8 @@ get_actor = 0x80269D6C; // type:func rom:0x19864C LoadBattleSection = 0x80269DE4; // type:func rom:0x1986C4 GetBattlePhase = 0x80269E28; // type:func rom:0x198708 GetLastElement = 0x80269E54; // type:func rom:0x198734 -func_80269E80 = 0x80269E80; // type:func rom:0x198760 -func_80269EAC = 0x80269EAC; // type:func rom:0x19878C +GetDamageSource = 0x80269E80; // type:func rom:0x198760 +SetDamageSource = 0x80269EAC; // type:func rom:0x19878C SetGoalToHome = 0x80269EC4; // type:func rom:0x1987A4 SetIdleGoalToHome = 0x80269F2C; // type:func rom:0x19880C SetGoalToIndex = 0x80269F94; // type:func rom:0x198874 @@ -7104,14 +7104,14 @@ ElectrifyActor = 0x8027095C; // type:func rom:0x19F23C HealActor = 0x80270CA4; // type:func rom:0x19F584 WaitForBuffDone = 0x8027114C; // type:func rom:0x19FA2C CopyBuffs = 0x80271160; // type:func rom:0x19FA40 -func_80271210 = 0x80271210; // type:func rom:0x19FAF0 -func_80271258 = 0x80271258; // type:func rom:0x19FB38 -func_802712A0 = 0x802712A0; // type:func rom:0x19FB80 -func_80271328 = 0x80271328; // type:func rom:0x19FC08 -func_802713B0 = 0x802713B0; // type:func rom:0x19FC90 -func_8027143C = 0x8027143C; // type:func rom:0x19FD1C -func_80271484 = 0x80271484; // type:func rom:0x19FD64 -func_80271588 = 0x80271588; // type:func rom:0x19FE68 +PlaySleepHitFX = 0x80271210; // type:func rom:0x19FAF0 +PlayDizzyHitFX = 0x80271258; // type:func rom:0x19FB38 +PlayParalyzeHitFX = 0x802712A0; // type:func rom:0x19FB80 +PlayPoisonHitFX = 0x80271328; // type:func rom:0x19FC08 +PlayStopHitFX = 0x802713B0; // type:func rom:0x19FC90 +PlayFreezeHitSnowflakeFX = 0x8027143C; // type:func rom:0x19FD1C +PlayFreezeHitParticleFX = 0x80271484; // type:func rom:0x19FD64 +PlayShrinkHitFX = 0x80271588; // type:func rom:0x19FE68 dispatch_event_player = 0x80271658; // type:func rom:0x19FF38 dispatch_event_player_continue_turn = 0x802716E4; // type:func rom:0x19FFC4 calc_player_test_enemy = 0x80271754; // type:func rom:0x1A0034 @@ -7248,7 +7248,7 @@ CamPreset_G = 0x80280D3C; // type:data rom:0x1AF61C CamPreset_I = 0x80280D58; // type:data rom:0x1AF638 CamPreset_H = 0x80280D74; // type:data rom:0x1AF654 CamPreset_N = 0x80280D90; // type:data rom:0x1AF670 -CamPreset_C = 0x80280DAC; // type:data rom:0x1AF68C +EVS_BattleCam_Default = 0x80280DAC; // type:data rom:0x1AF68C CamPreset_D = 0x80280DC8; // type:data rom:0x1AF6A8 CamPreset_E = 0x80280DE4; // type:data rom:0x1AF6C4 CamPreset_J = 0x80280E00; // type:data rom:0x1AF6E0 @@ -7276,11 +7276,13 @@ D_802835D4 = 0x802835D4; // type:data rom:0x1B1EB4 D_802835D8 = 0x802835D8; // type:data rom:0x1B1EB8 D_802835DC = 0x802835DC; // type:data rom:0x1B1EBC D_80283690 = 0x80283690; // type:data rom:0x1B1F70 -D_80283744 = 0x80283744; // type:data rom:0x1B2024 +bBonkModelScripts = 0x80283744; // type:data rom:0x1B2024 bMessages = 0x80283770; // type:data rom:0x1B2050 bActorMessages = 0x802838C4; // type:data rom:0x1B21A4 bPopupMessage = 0x802838F8; // type:data rom:0x1B21D8 -D_80283D98 = 0x80283D98; // type:data rom:0x1B2678 +ui_battle_cursor_hand_png = 0x80283900; // type:data rom:0x1B21E0 +ui_battle_cursor_hand_pal = 0x80283B00; // type:data rom:0x1B23E0 +EMS_BonkIcon = 0x80283D98; // type:data rom:0x1B2678 gBattleDmaDest = 0x80284000; // rom:0x1B28E0 EVS_MarioEnterStage = 0x80284A40; // rom:0x1B3320 EVS_PeachEnterStage = 0x80284D04; // rom:0x1B35E4 @@ -7433,8 +7435,8 @@ ui_battle_cmd_aim_target_0_png = 0x8028F3C0; // rom:0x1BDCA0 ui_battle_cmd_aim_target_0_pal = 0x8028F4E0; // rom:0x1BDDC0 ui_battle_cmd_aim_target_1_png = 0x8028F500; // rom:0x1BDDE0 ui_battle_cmd_aim_target_1_pal = 0x8028F620; // rom:0x1BDF00 -ui_battle_unk_star_png = 0x8028F640; // type:data rom:0x1BDF20 -ui_battle_unk_star_pal = 0x8028F840; // type:data rom:0x1BE120 +ui_battle_solid_star_png = 0x8028F640; // type:data rom:0x1BDF20 +ui_battle_solid_star_pal = 0x8028F840; // type:data rom:0x1BE120 D_8028F860 = 0x8028F860; // type:data rom:0x1BE140 ui_battle_projector_spot_png = 0x8028F868; // rom:0x1BE148 D_8028FC68 = 0x8028FC68; // type:data rom:0x1BE548 @@ -7532,13 +7534,13 @@ HES_AimBlinkA = 0x8029370C; // type:data rom:0x1C1FEC HES_AimBlinkB = 0x80293764; // type:data rom:0x1C2044 HES_AimBlinkC = 0x802937C4; // type:data rom:0x1C20A4 gMoveScriptTable = 0x80293E80; // rom:0x1C2760 -DoSleepHit = 0x802945E0; // rom:0x1C2EC0 -DoDizzyHit = 0x802945FC; // rom:0x1C2EDC -DoParalyzeHit = 0x80294618; // rom:0x1C2EF8 -DoPoisonHit = 0x80294634; // rom:0x1C2F14 -DoStopHit = 0x80294650; // rom:0x1C2F30 -DoFreezeHit = 0x8029466C; // rom:0x1C2F4C -DoShrinkHit = 0x802946B8; // rom:0x1C2F98 +EVS_PlaySleepHitFX = 0x802945E0; // rom:0x1C2EC0 +EVS_PlayDizzyHitFX = 0x802945FC; // rom:0x1C2EDC +EVS_PlayParalyzeHitFX = 0x80294618; // rom:0x1C2EF8 +EVS_PlayPoisonHitFX = 0x80294634; // rom:0x1C2F14 +EVS_PlayStopHitFX = 0x80294650; // rom:0x1C2F30 +EVS_PlayFreezeHitFX = 0x8029466C; // rom:0x1C2F4C +EVS_PlayShrinkHitFX = 0x802946B8; // rom:0x1C2F98 D_802946E0 = 0x802946E0; // type:data rom:0x1C2FC0 D_80294720 = 0x80294720; // type:data rom:0x1C3000 DoPartnerRunAway = 0x80294AFC; // type:data rom:0x1C33DC @@ -7554,26 +7556,26 @@ D_80296C8C = 0x80296C8C; // type:data rom:0x1C556C D_802975C8 = 0x802975C8; // type:data rom:0x1C5EA8 D_802976E8 = 0x802976E8; // type:data rom:0x1C5FC8 D_802977BC = 0x802977BC; // type:data rom:0x1C609C -DoPartnerBlock = 0x80297814; // type:data rom:0x1C60F4 -D_80297A38 = 0x80297A38; // type:data rom:0x1C6318 -D_80298374 = 0x80298374; // type:data rom:0x1C6C54 -D_80298494 = 0x80298494; // type:data rom:0x1C6D74 -D_80298520 = 0x80298520; // type:data rom:0x1C6E00 -D_802985AC = 0x802985AC; // type:data rom:0x1C6E8C -D_80298668 = 0x80298668; // type:data rom:0x1C6F48 -D_80298724 = 0x80298724; // type:data rom:0x1C7004 +EVS_DoPartnerBlock = 0x80297814; // type:data rom:0x1C60F4 +EVS_Help_OnPlayerDefaultHit = 0x80297A38; // type:data rom:0x1C6318 +EVS_Help_OnPlayerCrushed = 0x80298374; // type:data rom:0x1C6C54 +EVS_Help_OnPlayerNextSlapRight = 0x80298494; // type:data rom:0x1C6D74 +EVS_Help_OnPlayerNextSlapLeft = 0x80298520; // type:data rom:0x1C6E00 +EVS_Help_OnPlayerLastSlapRight = 0x802985AC; // type:data rom:0x1C6E8C +EVS_Help_OnPlayerLastSlapLeft = 0x80298668; // type:data rom:0x1C6F48 +EVS_OnPlayerHit = 0x80298724; // type:data rom:0x1C7004 D_802988F0 = 0x802988F0; // type:data rom:0x1C71D0 D_80298948 = 0x80298948; // type:data rom:0x1C7228 -ForceNextTarget = 0x80298BF0; // rom:0x1C74D0 +EVS_ForceNextTarget = 0x80298BF0; // rom:0x1C74D0 D_80298E20 = 0x80298E20; // type:data rom:0x1C7700 -DoNormalHit = 0x80299044; // rom:0x1C7924 -D_80299828 = 0x80299828; // type:data rom:0x1C8108 +EVS_DoNormalHit = 0x80299044; // rom:0x1C7924 +EVS_Help_NormalDamageReaction = 0x80299828; // type:data rom:0x1C8108 DoBurnHit = 0x8029A0D0; // rom:0x1C89B0 DoShockHit = 0x8029A6FC; // rom:0x1C8FDC D_8029A76C = 0x8029A76C; // type:data rom:0x1C904C DoImmune = 0x8029AC70; // rom:0x1C9550 -DoDeath = 0x8029AEC0; // rom:0x1C97A0 -D_8029AF08 = 0x8029AF08; // type:data rom:0x1C97E8 +EVS_DoDeath = 0x8029AEC0; // rom:0x1C97A0 +EVS_AnimateDeath = 0x8029AF08; // type:data rom:0x1C97E8 DoScareAway = 0x8029B22C; // rom:0x1C9B0C D_8029B494 = 0x8029B494; // type:data rom:0x1C9D74 D_8029B818 = 0x8029B818; // type:data rom:0x1CA0F8 @@ -7988,7 +7990,7 @@ shim_mdl_get_next_texture_address = 0xE02005F0; // type:func rom:0x3260C0 shim_guPositionF = 0xE0200600; // type:func rom:0x3260D0 shim_guOrthoF = 0xE0200610; // type:func rom:0x3260E0 shim_guFrustumF = 0xE0200620; // type:func rom:0x3260F0 -shim_func_80138D88 = 0xE0200630; // type:func rom:0x326100 +shim_draw_prev_frame_buffer_at_screen_pos = 0xE0200630; // type:func rom:0x326100 shim_draw_box = 0xE0200640; // type:func rom:0x326110 shim_draw_msg = 0xE0200650; // type:func rom:0x326120 shim_get_msg_width = 0xE0200660; // type:func rom:0x326130 @@ -26788,7 +26790,7 @@ EVS_MerleeDefenseBonus = 0x8028870C; // EVS_MerleeExpBonus = 0x80288A58; // EVS_PlayerHappy = 0x80288D64; // gBattleItemTable = 0x80293C04; // type:data -UseMystery = 0x80293E40; // +EVS_UseMystery = 0x80293E40; // actionCmdTableJump = 0x802941C0; // type:data actionCmdTableHammer = 0x802941E0; // type:data actionCmdTableFlee = 0x80294200; // type:data @@ -26902,7 +26904,7 @@ D_8029FB90 = 0x8029FB90; // type:data D_8029FB94 = 0x8029FB94; // type:data BattleMerleeOrbEffect = 0x8029FB98; // type:data BattleMerleeWaveEffect = 0x8029FB9C; // type:data -D_8029FBA0 = 0x8029FBA0; // type:data +RefundHudElem = 0x8029FBA0; // type:data D_8029FBA4 = 0x8029FBA4; // type:data D_8029FBA8 = 0x8029FBA8; // type:data D_8029FBAC = 0x8029FBAC; // type:data