From 22cdceae0cb19a577a844b6fb6c07b947f6a9f3b Mon Sep 17 00:00:00 2001 From: z64a Date: Thu, 12 Sep 2024 14:43:37 -0400 Subject: [PATCH] enum renames --- include/effects.h | 31 +- include/enums.h | 174 +++--- include/script_api/battle.h | 18 +- src/battle/actor_api.c | 8 +- src/battle/area/arn/actor/tubba_blubba.c | 8 +- src/battle/area/arn/actor/tubbas_heart.c | 16 +- src/battle/area/dgb/actor/tubba_blubba.c | 12 +- src/battle/area/dig/actor/tubba_blubba.c | 4 +- src/battle/area/flo2/actor/huff_n_puff.c | 14 +- src/battle/area/flo2/actor/spike.c | 2 +- src/battle/area/hos/actor/goombario_tutor.c | 4 +- src/battle/area/hos/actor/magikoopa.c | 16 +- .../area/isk_part_2/actor/chain_chomp.c | 2 +- src/battle/area/isk_part_2/actor/tutankoopa.c | 28 +- src/battle/area/iwa/actor/buzzar.c | 24 +- src/battle/area/kgr/actor/fuzzipede.c | 6 +- src/battle/area/kkj/actor/kammy_koopa.c | 22 +- .../area/kmr_part_2/actor/blue_goomba_1.c | 6 +- .../area/kmr_part_2/actor/blue_goomba_2.c | 2 +- .../area/kmr_part_2/actor/goomba_king.c | 16 +- .../area/kmr_part_2/actor/goomnut_tree.c | 2 +- .../area/kmr_part_2/actor/red_goomba_1.c | 4 +- .../area/kmr_part_2/actor/red_goomba_2.c | 2 +- .../area/kmr_part_3/actor/egg_jr_troopa.c | 6 +- .../area/kmr_part_3/actor/final_jr_troopa.c | 32 +- src/battle/area/kmr_part_3/actor/jr_troopa.c | 6 +- .../area/kmr_part_3/actor/mage_jr_troopa.c | 4 +- .../area/kmr_part_3/actor/para_jr_troopa.c | 16 +- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 16 +- .../kmr_part_3/actor/tutorial_paragoomba.c | 10 +- .../kmr_part_3/actor/tutorial_spiked_goomba.c | 2 +- src/battle/area/kpa2/actor/final_bowser_1.c | 32 +- src/battle/area/kpa2/actor/final_bowser_2.c | 42 +- src/battle/area/kpa2/actor/hallway_bowser.c | 36 +- src/battle/area/kpa2/actor/intro_bowser.c | 16 +- src/battle/area/kpa2/actor/unused_bowser.c | 6 +- src/battle/area/kpa4/actor/bombshell_bill.c | 4 +- src/battle/area/kzn2/actor/lava_bud.c | 8 +- src/battle/area/kzn2/actor/lava_piranha.c | 20 +- src/battle/area/kzn2/actor/petit_piranha.c | 4 +- src/battle/area/mac/actor/chan.c | 6 +- src/battle/area/mac/actor/lee.c | 4 +- src/battle/area/mac/actor/lee_bow.inc.c | 2 +- src/battle/area/mac/actor/lee_goombario.inc.c | 2 +- src/battle/area/mac/actor/lee_kooper.inc.c | 4 +- .../area/mac/actor/lee_lakilester.inc.c | 2 +- src/battle/area/mac/actor/lee_parakarry.inc.c | 2 +- src/battle/area/mac/actor/lee_sushie.inc.c | 4 +- src/battle/area/mac/actor/lee_watt.inc.c | 6 +- src/battle/area/mac/actor/master1.c | 2 +- src/battle/area/mac/actor/master2.c | 4 +- src/battle/area/mac/actor/master3.c | 4 +- src/battle/area/nok/actor/kent_c_koopa.c | 12 +- src/battle/area/omo2/actor/general_guy.c | 4 +- src/battle/area/omo2/actor/toy_tank.c | 32 +- src/battle/area/omo2_1/actor/shy_squad.c | 6 +- src/battle/area/omo2_2/actor/stilt_guy.c | 6 +- src/battle/area/omo2_3/actor/shy_stack.c | 2 +- .../area/omo2_5/actor/shy_squad_redux.c | 2 +- .../area/omo3/actor/big_lantern_ghost.c | 14 +- src/battle/area/pra2/actor/crystal_king.c | 14 +- src/battle/area/sam2/actor/monstar.c | 10 +- src/battle/area/tik2/actor/blooper.c | 6 +- src/battle/area/tik2/actor/blooper_baby.c | 2 +- src/battle/area/tik2/actor/electro_blooper.c | 12 +- .../area/trd_part_2/actor/fake_bowser.c | 18 +- src/battle/btl_states_actions.c | 10 +- src/battle/camera.c | 505 +++++++++--------- src/battle/common/actor/albino_dino.inc.c | 2 +- src/battle/common/actor/amazy_dayzee.inc.c | 4 +- src/battle/common/actor/anti_guy.inc.c | 4 +- src/battle/common/actor/bandit.inc.c | 2 +- src/battle/common/actor/bob_omb.inc.c | 6 +- src/battle/common/actor/bony_beetle.inc.c | 12 +- src/battle/common/actor/bullet_bill.inc.c | 4 +- src/battle/common/actor/buzzy_beetle.inc.c | 6 +- src/battle/common/actor/bzzap.inc.c | 4 +- src/battle/common/actor/cleft.inc.c | 2 +- src/battle/common/actor/clubba.inc.c | 2 +- src/battle/common/actor/crazee_dayzee.inc.c | 4 +- src/battle/common/actor/dark_koopa.inc.c | 2 +- src/battle/common/actor/dark_paratroopa.inc.c | 2 +- src/battle/common/actor/duplighost.inc.c | 4 +- .../common/actor/duplighost/ghost_bow.inc.c | 4 +- .../actor/duplighost/ghost_goombario.inc.c | 2 +- .../actor/duplighost/ghost_kooper.inc.c | 4 +- .../actor/duplighost/ghost_lakilester.inc.c | 2 +- .../actor/duplighost/ghost_parakarry.inc.c | 2 +- .../actor/duplighost/ghost_sushie.inc.c | 4 +- .../common/actor/duplighost/ghost_watt.inc.c | 6 +- src/battle/common/actor/ember.inc.c | 6 +- src/battle/common/actor/forest_fuzzy.inc.c | 4 +- src/battle/common/actor/frost_piranha.inc.c | 6 +- src/battle/common/actor/fuzzy.inc.c | 2 +- src/battle/common/actor/gloomba.inc.c | 2 +- src/battle/common/actor/goomba.inc.c | 2 +- src/battle/common/actor/gray_magikoopa.inc.c | 6 +- src/battle/common/actor/green_magikoopa.inc.c | 6 +- src/battle/common/actor/groove_guy.inc.c | 6 +- src/battle/common/actor/gulpit.inc.c | 4 +- src/battle/common/actor/hurt_plant.inc.c | 6 +- src/battle/common/actor/hyper_cleft.inc.c | 6 +- src/battle/common/actor/hyper_goomba.inc.c | 6 +- .../common/actor/hyper_paragoomba.inc.c | 20 +- src/battle/common/actor/jungle_fuzzy.inc.c | 4 +- src/battle/common/actor/koopa_troopa.inc.c | 4 +- src/battle/common/actor/koopatrol.inc.c | 12 +- src/battle/common/actor/lakitu.inc.c | 4 +- src/battle/common/actor/lava_bubble.inc.c | 6 +- src/battle/common/actor/m_bush.inc.c | 2 +- src/battle/common/actor/magikoopa.inc.c | 16 +- src/battle/common/actor/medi_guy.inc.c | 2 +- src/battle/common/actor/paragloomba.inc.c | 12 +- src/battle/common/actor/paragoomba.inc.c | 10 +- src/battle/common/actor/paratroopa.inc.c | 4 +- src/battle/common/actor/piranha_plant.inc.c | 6 +- src/battle/common/actor/pokey.inc.c | 6 +- src/battle/common/actor/pokey_mummy.inc.c | 2 +- src/battle/common/actor/putrid_piranha.inc.c | 6 +- src/battle/common/actor/pyro_guy.inc.c | 2 +- src/battle/common/actor/red_magikoopa.inc.c | 6 +- src/battle/common/actor/ruff_puff.inc.c | 2 +- src/battle/common/actor/shy_guy_base.inc.c | 4 +- src/battle/common/actor/sky_guy.inc.c | 4 +- src/battle/common/actor/slot_machine.inc.c | 2 +- src/battle/common/actor/spear_guy.inc.c | 8 +- src/battle/common/actor/spike_top.inc.c | 6 +- src/battle/common/actor/spiked_gloomba.inc.c | 2 +- src/battle/common/actor/spiked_goomba.inc.c | 2 +- src/battle/common/actor/spiny.inc.c | 2 +- src/battle/common/actor/spy_guy.inc.c | 4 +- src/battle/common/actor/stone_chomp.inc.c | 2 +- src/battle/common/actor/swooper.inc.c | 4 +- src/battle/common/actor/swoopula.inc.c | 4 +- src/battle/common/actor/white_clubba.inc.c | 2 +- src/battle/common/actor/white_magikoopa.inc.c | 8 +- .../common/actor/yellow_magikoopa.inc.c | 6 +- src/battle/common/move/HammerSupport.inc.c | 2 +- src/battle/common/move/JumpSupport.inc.c | 10 +- src/battle/common/move/StarPowerSupport.inc.c | 12 +- src/battle/common/move/UseItem.inc.c | 4 +- src/battle/move/hammer/mega_quake.c | 4 +- src/battle/move/hammer/power_quake.c | 4 +- src/battle/move/hammer/quake_hammer.c | 4 +- src/battle/move/hammer/spin_smash.c | 6 +- src/battle/move/item/dizzy_dial.c | 6 +- src/battle/move/item/food.c | 2 +- src/battle/move/item/hustle_drink.c | 2 +- src/battle/move/item/sleepy_sheep.c | 2 +- src/battle/move/jump/attack.c | 38 +- src/battle/move/jump/auto_jump.c | 12 +- src/battle/move/jump/auto_multibounce.c | 6 +- src/battle/move/jump/d_down_jump.c | 12 +- src/battle/move/jump/demo_power_bounce.c | 22 +- src/battle/move/jump/dizzy_stomp.c | 12 +- src/battle/move/jump/earthquake_jump.c | 30 +- src/battle/move/jump/multibounce.c | 12 +- src/battle/move/jump/power_bounce.c | 22 +- src/battle/move/jump/shrink_stomp.c | 12 +- src/battle/move/jump/sleep_stomp.c | 12 +- src/battle/move/star_power/peach_focus.c | 4 +- src/battle/move/star_power/peach_focus_alt.c | 2 +- src/battle/partner/bombette.c | 16 +- src/battle/partner/bow.c | 34 +- src/battle/partner/goombario.c | 42 +- src/battle/partner/kooper.c | 22 +- src/battle/partner/lakilester.c | 30 +- src/battle/partner/parakarry.c | 26 +- src/battle/partner/sushie.c | 18 +- src/battle/partner/twink.c | 6 +- src/battle/partner/watt.c | 20 +- src/battle/player_events.c | 22 +- src/battle/standard_events.c | 12 +- src/effects/flashing_box_shockwave.c | 142 +++-- src/effects/lightning.c | 7 +- ver/ique/symbol_addrs.txt | 4 +- ver/pal/undefined_syms.txt | 4 +- ver/us/symbol_addrs.txt | 36 +- 178 files changed, 1208 insertions(+), 1197 deletions(-) diff --git a/include/effects.h b/include/effects.h index 8c3e5e13ed..e3caefd92b 100644 --- a/include/effects.h +++ b/include/effects.h @@ -1259,24 +1259,27 @@ typedef struct SmallGoldSparkleFXData { /* 0x20 */ s32 unk_20; } SmallGoldSparkleFXData; // size = 0x24 -typedef struct FlashingBoxShockwaveFXData { - /* 0x00 */ s32 unk_00; +enum ShockOverlayFXTypes { + FX_SHOCK_OVERLAY_SHOCK_HIT = 0, + FX_SHOCK_OVERLAY_LIGHTNING_WORLD = 1, + FX_SHOCK_OVERLAY_MEGA_SHOCK = 2, + FX_SHOCK_OVERLAY_LIGHTNING_BATTLE = 3, +}; + +typedef struct ShockOverlayFXData { + /* 0x00 */ s32 type; /* 0x04 */ Vec3f pos; /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; /* 0x18 */ s32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; + /* 0x1C */ s32 timeLeft; + /* 0x20 */ s32 lifetime; /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ s32 unk_30; - /* 0x34 */ s32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ s32 unk_44; -} FlashingBoxShockwaveFXData; // size = 0x48 + /* 0x28 */ f32 scaleX; + /* 0x2C */ f32 scaleY; + /* 0x30 */ Color3i primCol; + /* 0x3C */ Color3i envCol; +} ShockOverlayFXData; // size = 0x48 typedef struct BalloonFXData { /* 0x00 */ s32 unk_00; @@ -2532,7 +2535,7 @@ typedef union { struct GatherMagicFXData* gatherMagic; struct AttackResultTextFXData* attackResultText; struct SmallGoldSparkleFXData* smallGoldSparkle; - struct FlashingBoxShockwaveFXData* flashingBoxShockwave; + struct ShockOverlayFXData* flashingBoxShockwave; struct BalloonFXData* balloon; struct FloatingRockFXData* floatingRock; struct ChompDropFXData* chompDrop; diff --git a/include/enums.h b/include/enums.h index ccf25defc6..a663bb2bc3 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4783,93 +4783,93 @@ enum CameraControlType { CAM_CONTROL_CONSTAIN_BETWEEN_POINTS = 6, }; -enum BtlCameraPreset { - BTL_CAM_RESET = 0, // unused? - BTL_CAM_INTERRUPT = 1, // forces camera motion to end - 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_ACTOR_GOAL = 7, - BTL_CAM_PRESET_08 = 8, - BTL_CAM_SLOW_DEFAULT = 9, // unused, same as BTL_CAM_DEFAULT but takes 4x as long - BTL_CAM_PRESET_10 = 10, - BTL_CAM_PRESET_11 = 11, - BTL_CAM_PRESET_12 = 12, // unused? - BTL_CAM_PRESET_13 = 13, - BTL_CAM_PRESET_14 = 14, // FOCUS_ON_TARGET? - BTL_CAM_PRESET_15 = 15, - BTL_CAM_PRESET_16 = 16, // unused? - BTL_CAM_PRESET_17 = 17, // unused? - BTL_CAM_PRESET_18 = 18, // unused? - BTL_CAM_PRESET_19 = 19, - BTL_CAM_PRESET_20 = 20, // unused? - BTL_CAM_PRESET_21 = 21, // unused? - BTL_CAM_PLAYER_ENTRY = 22, - BTL_CAM_VICTORY = 23, // closeup on party while star points are tallied - BTL_CAM_PRESET_24 = 24, - BTL_CAM_PRESET_25 = 25, // closeup on player used when running away or being defeated - BTL_CAM_PLAYER_ATTACK_APPROACH = 26, - BTL_CAM_PRESET_27 = 27, - BTL_CAM_PRESET_28 = 28, - BTL_CAM_PRESET_29 = 29, - BTL_CAM_PLAYER_HIT_SPIKE = 30, // player hurt via spike contact - BTL_CAM_PLAYER_HIT_HAZARD = 31, // player hurt via burn or shock contact - BTL_CAM_PLAYER_CHARGE_UP = 32, - BTL_CAM_PLAYER_STATUS_AFFLICTED = 33, - BTL_CAM_PRESET_34 = 34, - BTL_CAM_PRESET_35 = 35, - BTL_CAM_PRESET_36 = 36, // unused? - BTL_CAM_PRESET_37 = 37, - BTL_CAM_PRESET_38 = 38, - BTL_CAM_PRESET_39 = 39, - BTL_CAM_PRESET_40 = 40, - BTL_CAM_PRESET_41 = 41, // unused? - BTL_CAM_PRESET_42 = 42, // unused? - BTL_CAM_PLAYER_AIM_HAMMER = 43, - BTL_CAM_PLAYER_HAMMER_STRIKE = 44, - BTL_CAM_PRESET_45 = 45, // unused? - BTL_CAM_PRESET_46 = 46, - BTL_CAM_PARTNER_APPROACH = 47, // used by Goombario and Watt (power shock only) - BTL_CAM_PRESET_48 = 48, - BTL_CAM_PRESET_49 = 49, // unused? - BTL_CAM_PRESET_50 = 50, - BTL_CAM_PRESET_51 = 51, - BTL_CAM_PRESET_52 = 52, - BTL_CAM_PRESET_53 = 53, - BTL_CAM_PARTNER_INJURED = 54, // closeup on partner after being injured - BTL_CAM_PRESET_55 = 55, - BTL_CAM_PRESET_56 = 56, // unused? - BTL_CAM_PRESET_57 = 57, // unused? - BTL_CAM_PRESET_58 = 58, // unused? - BTL_CAM_PRESET_59 = 59, - BTL_CAM_PRESET_60 = 60, // unused? - BTL_CAM_PRESET_61 = 61, - BTL_CAM_PRESET_62 = 62, - BTL_CAM_ENEMY_APPROACH = 63, // (very common) - BTL_CAM_PRESET_64 = 64, // unused? - BTL_CAM_DEFAULT_UNUSED = 65, // unused, same as BTL_CAM_DEFAULT but takes slightly longer - 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, // below actor - BTL_CAM_MODEY_MINUS_1 = -1, // use target Y? - BTL_CAM_MODEY_0 = 0, // use actor Y? - BTL_CAM_MODEY_1 = 1, // use average +enum BattleCamPreset { + BTL_CAM_RESET = 0x00, // unused? + BTL_CAM_INTERRUPT = 0x01, // forces camera motion to end + BTL_CAM_DEFAULT = 0x02, + BTL_CAM_PRESET_03 = 0x03, + BTL_CAM_PRESET_04 = 0x04, + BTL_CAM_PRESET_05 = 0x05, + BTL_CAM_PRESET_UNUSED_06 = 0x06, + BTL_CAM_ACTOR_GOAL = 0x07, + BTL_CAM_PRESET_08 = 0x08, + BTL_CAM_SLOW_DEFAULT = 0x09, // unused, same as BTL_CAM_DEFAULT but takes 4x as long + BTL_CAM_PRESET_0A = 0x0A, + BTL_CAM_PRESET_0B = 0x0B, + BTL_CAM_PRESET_UNUSED_0C = 0x0C, + BTL_CAM_PRESET_0D = 0x0D, + BTL_CAM_PRESET_0E = 0x0E, // FOCUS_ON_TARGET? + BTL_CAM_PRESET_0F = 0x0F, + BTL_CAM_PRESET_UNUSED_10 = 0x10, + BTL_CAM_PRESET_UNUSED_11 = 0x11, + BTL_CAM_PRESET_UNUSED_12 = 0x12, + BTL_CAM_PRESET_13 = 0x13, + BTL_CAM_PRESET_UNUSED_14 = 0x14, + BTL_CAM_PRESET_UNUSED_15 = 0x15, + BTL_CAM_PLAYER_ENTRY = 0x16, + BTL_CAM_VICTORY = 0x17, // closeup on party while star points are tallied + BTL_CAM_PLAYER_DIES = 0x18, // closeup on player dying + BTL_CAM_PLAYER_FLEE = 0x19, // closeup on player while running away + BTL_CAM_PLAYER_ATTACK_APPROACH = 0x1A, + BTL_CAM_PRESET_1B = 0x1B, + BTL_CAM_PRESET_1C = 0x1C, + BTL_CAM_PRESET_1D = 0x1D, + BTL_CAM_PLAYER_HIT_SPIKE = 0x1E, // player hurt via spike contact + BTL_CAM_PLAYER_HIT_HAZARD = 0x1F, // player hurt via burn or shock contact + BTL_CAM_PLAYER_CHARGE_UP = 0x20, + BTL_CAM_PLAYER_STATUS_AFFLICTED = 0x21, + BTL_CAM_PRESET_22 = 0x22, + BTL_CAM_PRESET_23 = 0x23, + BTL_CAM_PRESET_UNUSED_24 = 0x24, + BTL_CAM_PRESET_25 = 0x25, + BTL_CAM_PRESET_26 = 0x26, + BTL_CAM_PRESET_27 = 0x27, + BTL_CAM_PRESET_28 = 0x28, + BTL_CAM_PRESET_UNUSED_29 = 0x29, + BTL_CAM_PRESET_UNUSED_2A = 0x2A, + BTL_CAM_PLAYER_AIM_HAMMER = 0x2B, + BTL_CAM_PLAYER_HAMMER_STRIKE = 0x2C, + BTL_CAM_PRESET_UNUSED_2D = 0x2D, + BTL_CAM_PRESET_2E = 0x2E, + BTL_CAM_PARTNER_APPROACH = 0x2F, // used by Goombario and Watt (power shock only) + BTL_CAM_CLOSER_PARTNER_APPROACH = 0x30, + BTL_CAM_PRESET_UNUSED_31 = 0x31, + BTL_CAM_PRESET_32 = 0x32, // goombario pre-jump 1 + BTL_CAM_PRESET_33 = 0x33, + BTL_CAM_PRESET_34 = 0x34, + BTL_CAM_PRESET_35 = 0x35, // goombario pre-jump 2 + BTL_CAM_PARTNER_INJURED = 0x36, // closeup on partner after being injured + BTL_CAM_PRESET_37 = 0x37, + BTL_CAM_PRESET_UNUSED_38 = 0x38, + BTL_CAM_PRESET_UNUSED_39 = 0x39, + BTL_CAM_PRESET_UNUSED_3A = 0x3A, + BTL_CAM_PRESET_3B = 0x3B, + BTL_CAM_PRESET_UNUSED_3C = 0x3C, + BTL_CAM_PARTNER_HIT_SPIKE = 0x3D, // partner hurt via spike contact + BTL_CAM_PARTNER_HIT_HAZARD = 0x3E, // partner hurt via burn or shock contact + BTL_CAM_ENEMY_APPROACH = 0x3F, // (very common) + BTL_CAM_PRESET_UNUSED_40 = 0x40, + BTL_CAM_DEFAULT_UNUSED = 0x41, // unused, same as BTL_CAM_DEFAULT but takes slightly longer + BTL_CAM_PRESET_42 = 0x42, // used just before contact from dive attacks (paragoomba, para jr troopa, etc) + BTL_CAM_PRESET_UNUSED_43 = 0x43, + BTL_CAM_PRESET_UNUSED_44 = 0x44, + BTL_CAM_PRESET_45 = 0x45, + BTL_CAM_PRESET_UNUSED_46 = 0x46, + BTL_CAM_PRESET_UNUSED_47 = 0x47, + BTL_CAM_PRESET_UNUSED_48 = 0x48, + BTL_CAM_STAR_SPIRIT = 0x49, +}; + +enum BattleCamTargetAdjustX { + BTL_CAM_XADJ_NONE = 0, // use actor X + BTL_CAM_XADJ_AVG = 1, // use average +}; + +enum BattleCamTargetAdjustY { + BTL_CAM_YADJ_SLIGHT = -2, // target y position is weighted 75% actor and 25% target: + BTL_CAM_YADJ_TARGET = -1, // use target Y + BTL_CAM_YADJ_NONE = 0, // use actor Y + BTL_CAM_YADJ_AVG = 1, // target y position is weighted 66% actor and 33% target: }; enum ModelAnimatorFlags { diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 9244db3605..b889d04d10 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -21,7 +21,7 @@ API_CALLABLE(MoveBattleCamOver); API_CALLABLE(SetBattleCamZoom); API_CALLABLE(AddBattleCamZoom); API_CALLABLE(FreezeBattleCam); -API_CALLABLE(func_8024EDA4); +API_CALLABLE(DisableBattleCamClampX); API_CALLABLE(ShowMessageBox); API_CALLABLE(ShowVariableMessageBox); API_CALLABLE(IsMessageBoxDisplayed); @@ -277,7 +277,7 @@ API_CALLABLE(GetPartAnimNotify); API_CALLABLE(InitAnimatedModels); API_CALLABLE(SetCamLookTarget); API_CALLABLE(PartnerYieldTurn); ///< YieldTurn copy -API_CALLABLE(func_8024ECF8); +API_CALLABLE(SetBattleCamTargetingModes); API_CALLABLE(UseBattleCamPresetImmediately); API_CALLABLE(UseBattleCamPresetWait); API_CALLABLE(HideHealthBar); @@ -318,8 +318,8 @@ extern EvtScript EVS_StartDefend; extern EvtScript EVS_RunAwayStart; extern EvtScript EVS_RunAwayFail; extern EvtScript EVS_PlayerDies; -extern EvtScript EVS_PlayEatFX; -extern EvtScript EVS_PlayDrinkFX; +extern EvtScript EVS_Unused_EatItem; +extern EvtScript EVS_Unused_DrinkItem; extern EvtScript EVS_UseLifeShroom; extern EvtScript EVS_MerleeRunOut; extern EvtScript EVS_MerleeAttackBonus; @@ -382,14 +382,14 @@ extern EvtScript EVS_BattleCam_Interrupt; extern EvtScript EVS_BattleCam_ResetNeutral; extern EvtScript EVS_BattleCam_ViewEnemies; extern EvtScript EVS_BattleCam_ViewEnemies_MaintainY; -extern EvtScript CamPreset_F; -extern EvtScript CamPreset_G; +extern EvtScript EVS_BattleCam_UnkF_Skippable; +extern EvtScript EVS_BattleCam_UnkG_Skippable; extern EvtScript EVS_BattleCam_FocusGoal; extern EvtScript EVS_BattleCam_FocusActor; -extern EvtScript CamPreset_J; +extern EvtScript EVS_BattleCam_SimpleLerp_Skippable; extern EvtScript EVS_BattleCam_FollowActorY; extern EvtScript EVS_BattleCam_FollowActorPos; -extern EvtScript CamPreset_M; -extern EvtScript EVS_BattleCam_SimpleLerp; +extern EvtScript EVS_BattleCam_UnkM_Skippable; +extern EvtScript EVS_BattleCam_SimpleLerp_Unskippable; #endif diff --git a/src/battle/actor_api.c b/src/battle/actor_api.c index 47e64fc08e..c4aa658dd6 100644 --- a/src/battle/actor_api.c +++ b/src/battle/actor_api.c @@ -3273,7 +3273,7 @@ API_CALLABLE(BoostAttack) { case 1: if (script->functionTemp[3] == 0) { fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_PRESET_13); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3397,7 +3397,7 @@ API_CALLABLE(BoostDefense) { case 1: if (script->functionTemp[3] == 0) { fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_PRESET_13); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3508,7 +3508,7 @@ API_CALLABLE(VanishActor) { case 1: if (script->functionTemp[3] == 0) { fx_radial_shimmer(3, x, y, z, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_PRESET_13); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { @@ -3614,7 +3614,7 @@ API_CALLABLE(ElectrifyActor) { case 1: if (script->functionTemp[3] == 0) { fx_snaking_static(8, x, y, z, 1.0f, 30); - btl_cam_use_preset_immediately(BTL_CAM_PRESET_19); + btl_cam_use_preset_immediately(BTL_CAM_PRESET_13); script->functionTemp[3] = 30; script->functionTemp[0] = 2; } else { diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 70613f89ba..e9bfcfa4c9 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -276,7 +276,7 @@ EvtScript N(EVS_Attack_SlamFist) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Set(LVar1, ANIM_BattleTubba_Anim06) ExecWait(N(EVS_DummyCheck)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) @@ -342,7 +342,7 @@ EvtScript N(EVS_Attack_SlamFist) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) @@ -366,7 +366,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Set(LVar1, ANIM_BattleTubba_Anim06) ExecWait(N(EVS_DummyCheck)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) @@ -449,7 +449,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index 330fe3ab58..f27d07a045 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -293,7 +293,7 @@ EvtScript N(EVS_HandleEvent) = { }; EvtScript N(EVS_FleeFromBattle) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(40) @@ -336,12 +336,12 @@ EvtScript N(EVS_TakeTurn) = { Call(GetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) BitwiseOrConst(LVar0, AVAL_Flag_TauntBow | AVAL_Flag_HidStatusBar) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(40) Call(ActorSpeak, MSG_CH3_00C3, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_PARTNER) Call(MoveBattleCamOver, 25) Wait(25) @@ -371,7 +371,7 @@ EvtScript N(EVS_TakeTurn) = { Call(GetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, LVar0) IfEq(LVar0, 0) Call(SetActorVar, ACTOR_SELF, AVAR_ChargeTaunt, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(40) @@ -412,7 +412,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim03) Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -507,7 +507,7 @@ EvtScript N(EVS_Attack_Leap) = { }; EvtScript N(EVS_Move_Charge) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 85, 50, 0) Call(SetBattleCamZoom, 280) Call(SetBattleCamOffsetZ, 0) @@ -553,7 +553,7 @@ EvtScript N(EVS_Move_Charge) = { EvtScript N(EVS_Attack_DarkSwarm) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 85, 50, 0) Call(SetBattleCamZoom, 280) Call(SetBattleCamOffsetZ, 0) @@ -616,7 +616,7 @@ EvtScript N(EVS_Attack_DarkSwarm) = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 300) diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index f87ea73f54..e1b3eb7622 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -168,7 +168,7 @@ EvtScript N(EVS_HandlePhase) = { IfEq(LVar0, 0) Call(EnableBattleStatusBar, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_CaughtYouTaunt, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 75) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -364,7 +364,7 @@ EvtScript N(EVS_TakeTurn) = { IfEq(LVar0, AVAL_Taunt_Ready) Call(EnableBattleStatusBar, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_InvunerableTaunt, AVAL_Taunt_Done) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 75) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -404,7 +404,7 @@ EvtScript N(EVS_Attack_SlamFist) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) IfNotFlag(LVar5, STATUS_FLAG_SHRINK) @@ -465,7 +465,7 @@ EvtScript N(EVS_Attack_SlamFist) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) @@ -491,7 +491,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 180) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -572,7 +572,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Set(LVarF, LVar0) Switch(LVarF) diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 4b9ddbb077..9d24a1b8e0 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -261,7 +261,7 @@ EvtScript N(EVS_Attack_SlamFist) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 150) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) IfNotFlag(LVar5, STATUS_FLAG_SHRINK) @@ -340,7 +340,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 180) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim07) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index cd976ffc29..b5c72cb484 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -1720,7 +1720,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = { Wait(15) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 20) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -1992,7 +1992,7 @@ EvtScript N(EVS_Move_ChargeForGround) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) ExecGetTID(N(EVS_UpdateChargedJitter), LVarA) Call(SetActorVar, ACTOR_SELF, AVAR_ChargedJitterScriptID, LVarA) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 400) @@ -2027,7 +2027,7 @@ EvtScript N(EVS_Move_ChargeForGround) = { EvtScript N(EVS_Attack_GroundLightning) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 400) @@ -2136,7 +2136,7 @@ EvtScript N(EVS_Move_ChargeForDirect) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) ExecGetTID(N(EVS_UpdateChargedJitter), LVarA) Call(SetActorVar, ACTOR_SELF, AVAR_ChargedJitterScriptID, LVarA) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 400) @@ -2176,7 +2176,7 @@ EvtScript N(EVS_Attack_DirectLightning) = { Call(AddBattleCamZoom, -100) Call(SetBattleCamOffsetZ, 50) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(N(StartRumbleWithParams), 70, 80) Thread Call(ShakeCam, CAM_BATTLE, 0, 40, Float(0.3)) @@ -2373,7 +2373,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { UseArray(N(RuffPuffDataBuffer)) Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 400) @@ -2790,7 +2790,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { DivF(LVarB, LVarA) Thread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 300) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 2e359b014d..dc5aeff59c 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -246,7 +246,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index eae6c9b735..056a2305d6 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -183,10 +183,10 @@ EvtScript N(EVS_TakeTurn) = { Wait(5) Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 400) Call(SetBattleCamOffsetZ, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, -10, 0, 0) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 4f61759c9e..58311cd931 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -378,7 +378,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -788,7 +788,7 @@ EvtScript N(EVS_Move_HealOne) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -868,7 +868,7 @@ EvtScript N(EVS_Move_HealAll) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1423,7 +1423,7 @@ EvtScript N(EVS_Move_MakeClone) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, LVarA, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 25) Wait(25) @@ -1539,7 +1539,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1652,7 +1652,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1765,7 +1765,7 @@ EvtScript N(EVS_Move_TryElectrify) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1883,7 +1883,7 @@ EvtScript N(EVS_Move_TryTransparent) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index 1cf2271d29..12f99813d3 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -683,7 +683,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.5)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Set(LVar1, 0) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 1361960294..ee69506703 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -609,7 +609,7 @@ EvtScript N(EVS_Attack_ThrowShell) = { Sub(LVar0, 1) Call(SetActorVar, ACTOR_SELF, AVAR_ShellsLeft, LVar0) // begin the attack - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(SetBattleCamZoom, 320) Call(SetBattleCamOffsetZ, 0) Call(BattleCamTargetActorPart, ACTOR_SELF, LVar9) @@ -696,7 +696,7 @@ EvtScript N(EVS_Attack_ThrowShell) = { }; EvtScript N(EVS_Attack_DropDebris) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 0) Call(BattleCamTargetActor, ACTOR_SELF) @@ -706,7 +706,7 @@ EvtScript N(EVS_Attack_DropDebris) = { Call(GetActorVar, ACTOR_SELF, AVAR_DebrisDropState, LVar0) IfEq(LVar0, 0) // first use only - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -961,14 +961,14 @@ EvtScript N(EVS_Move_SummonChomp) = { Call(GetStatusFlags, ACTOR_SELF, LVar0) Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar0) IfFalse(LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout) Call(ActorSpeak, MSG_CH2_00E6, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout, ANIM_Tutankoopa_Shout) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -978,14 +978,14 @@ EvtScript N(EVS_Move_SummonChomp) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Idle) Call(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetBattleCamZoom, 225) Call(SetBattleCamOffsetZ, -30) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetBattleCamZoom, 200) Call(SetBattleCamOffsetZ, 35) Call(MoveBattleCamOver, 40) @@ -1036,20 +1036,20 @@ EvtScript N(EVS_Move_SummonChomp) = { ExecWait(N(EVS_SummonedChompHop)) Call(GetActorVar, ACTOR_SELF, AVAR_HasSummoned, LVar5) IfFalse(LVar5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 160) Call(GetActorPos, LVarB, LVar0, LVar1, LVar2) Set(LVar1, 60) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(MoveBattleCamOver, 8) Loop(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 150) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(MoveBattleCamOver, 5) Wait(4) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_BITE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 200) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(MoveBattleCamOver, 5) @@ -1150,7 +1150,7 @@ EvtScript N(EVS_SummonedChompHop) = { EvtScript N(EVS_LevitateToHomePos) = { Call(SetActorVar, ACTOR_SELF, AVAR_Unknown, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_MAGIC) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Levitate) @@ -1194,7 +1194,7 @@ EvtScript N(EVS_GetBackUp) = { Wait(10) Call(GetActorVar, ACTOR_SELF, AVAR_Dialogue_Recover, LVar0) IfFalse(LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 9efe30c5bf..c9e55b9073 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -319,7 +319,7 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_WindBlast) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(SetBattleCamZoom, 180) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 120) @@ -396,7 +396,7 @@ EvtScript N(EVS_Attack_WindBlast) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(action_command_whirlwind_start, 0, 88 * DT, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -25, 60, 0) Call(SetBattleCamZoom, 460) Call(SetBattleCamOffsetZ, 0) @@ -461,7 +461,7 @@ EvtScript N(EVS_Attack_WindBlast) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(action_command_whirlwind_start, 0, 88 * DT, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -25, 60, 0) Call(SetBattleCamZoom, 460) Call(SetBattleCamOffsetZ, 0) @@ -649,7 +649,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { Call(SetPartFlagBits, ACTOR_SELF, PRT_FEATHER_3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EndThread Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Wait(10) IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -661,7 +661,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EndCaseGroup CaseDefault EndSwitch - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Thread Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -819,7 +819,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 240) Call(SetBattleCamOffsetZ, -10) Call(BattleCamTargetActor, ACTOR_SELF) @@ -848,7 +848,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Return EndCaseGroup CaseEq(HIT_RESULT_IMMUNE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 240) Call(SetBattleCamOffsetZ, -10) Call(BattleCamTargetActor, ACTOR_SELF) @@ -898,12 +898,12 @@ EvtScript N(EVS_Attack_GrappleDrop) = { CaseDefault EndSwitch Wait(10) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) + Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 360) Call(MoveBattleCamOver, 30) Thread Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 360) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Set(LVar1, 27) @@ -945,7 +945,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Call(SetupMashMeter, 1, 30, 0, 0, 0, 0) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim17) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 240) Call(SetBattleCamOffsetZ, -10) Call(BattleCamTargetActor, ACTOR_SELF) @@ -977,7 +977,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { Call(UseIdleAnimation, ACTOR_SELF, TRUE) Return EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 360) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Set(LVar1, 50) @@ -1042,7 +1042,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 240) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 60, 15, 0) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 4a29fb5a9e..dd8a44d870 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -590,7 +590,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) ExecWait(N(EVS_LeaveHome)) Call(SetActorYaw, ACTOR_SELF, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A) @@ -754,7 +754,7 @@ EvtScript N(EVS_Attack_DisableTackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) ExecWait(N(EVS_LeaveHome)) Call(SetActorYaw, ACTOR_SELF, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim0A) @@ -938,7 +938,7 @@ EvtScript N(EVS_Attack_DisableTackle) = { EvtScript N(EVS_Recover) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index 83cafec2ae..3ca9a73c6f 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -265,7 +265,7 @@ API_CALLABLE(N(DropBlock)) { EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Wait(30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim07) @@ -276,7 +276,7 @@ EvtScript N(EVS_TakeTurn) = { Add(LVar1, 40) PlayEffect(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 100, 0) Wait(20) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 80, 95, 15) Call(SetBattleCamZoom, 340) Call(MoveBattleCamOver, 60) @@ -314,7 +314,7 @@ EvtScript N(EVS_TakeTurn) = { Wait(20) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim08) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -80, 37, 5) Call(SetBattleCamZoom, 256) Call(MoveBattleCamOver, 1) @@ -368,7 +368,7 @@ EvtScript N(EVS_TakeTurn) = { EndSwitch Call(GetLastDamage, ACTOR_PARTNER, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -399,7 +399,7 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_PlayerTurnCount, LVar0) Switch(LVar0) CaseEq(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -407,7 +407,7 @@ EvtScript N(EVS_HandlePhase) = { Wait(20) Call(ActorSpeak, MSG_CH8_0093, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -56, -9, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -415,7 +415,7 @@ EvtScript N(EVS_HandlePhase) = { Wait(10) Call(ActorSpeak, MSG_CH8_0094, ACTOR_PARTNER, 1, ANIM_Twink_ShoutAngry, ANIM_Twink_Angry) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -66, -9, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -441,7 +441,7 @@ EvtScript N(EVS_CommentOnHit) = { Call(GetActorHP, ACTOR_SELF, LVar0) Switch(LVar0) CaseEq(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -454,7 +454,7 @@ EvtScript N(EVS_CommentOnHit) = { Call(UseBattleCamPreset, BTL_CAM_DEFAULT) CaseOrEq(9) CaseOrEq(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -477,7 +477,7 @@ EvtScript N(EVS_CommentOnHit) = { IfEq(LVar0, 2) BreakSwitch EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 69, 14, -18) Call(SetBattleCamZoom, 340) Call(SetBattleCamOffsetZ, 62) @@ -501,7 +501,7 @@ EvtScript N(EVS_CommentOnHit) = { EvtScript N(EVS_Death) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(HideHealthBar, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 60) Wait(10) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index 2c232da096..f8746afb3c 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -305,7 +305,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -483,7 +483,7 @@ EvtScript N(EVS_Init) = { EvtScript N(EVS_TakeTurn) = { Call(GetActorVar, ACTOR_SELF, AVAR_UsedTaunt, LVar0) IfEq(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -525,7 +525,7 @@ EvtScript N(EVS_GoombaBros_Death) = { Call(GetActorHP, ACTOR_RED_GOOMBA, LVar0) EndIf IfNe(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_RED_GOOMBA) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c index c88cbc1267..bd4476ba66 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c @@ -296,7 +296,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index 1adef892bc..e020c18472 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -391,13 +391,13 @@ EvtScript N(EVS_Attack_SpinSwipe) = { Call(SetBattleCamOffsetZ, 20) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(AddBattleCamZoom, -100) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetStatusFlags, ACTOR_SELF, LVar0) @@ -480,11 +480,11 @@ EvtScript N(EVS_Attack_SpinSwipe) = { }; EvtScript N(EVS_Attack_GroundStomp) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Wait(15) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Angry) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.8)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -661,7 +661,7 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, LVar0) IfEq(LVar0, FALSE) Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_RED_GOOMBA) Call(MoveBattleCamOver, 20) Wait(20) @@ -670,7 +670,7 @@ EvtScript N(EVS_HandlePhase) = { Call(ActorSpeak, MSG_CH0_00CB, ACTOR_RED_GOOMBA, PRT_MAIN, ANIM_GoombaBros_Red_Talk, ANIM_GoombaBros_Red_Talk) Call(EnableIdleScript, ACTOR_RED_GOOMBA, IDLE_SCRIPT_ENABLE) Call(UseIdleAnimation, ACTOR_RED_GOOMBA, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA) Call(MoveBattleCamOver, 10) Wait(10) @@ -679,13 +679,13 @@ EvtScript N(EVS_HandlePhase) = { Call(ActorSpeak, MSG_CH0_00CC, ACTOR_BLUE_GOOMBA, PRT_MAIN, ANIM_GoombaBros_Blue_Talk, ANIM_GoombaBros_Blue_Talk) Call(EnableIdleScript, ACTOR_BLUE_GOOMBA, IDLE_SCRIPT_ENABLE) Call(UseIdleAnimation, ACTOR_BLUE_GOOMBA, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_KING) Call(MoveBattleCamOver, 20) Wait(20) Call(ActorSpeak, MSG_CH0_00CD, ACTOR_KING, PRT_MAIN, ANIM_GoombaKing_Angry, ANIM_GoombaKing_Angry) Call(SetActorVar, ACTOR_SELF, AVAR_Scene_BeginBattle, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_PLAYER) Call(MoveBattleCamOver, 10) Wait(10) diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 6094749634..f558213c5f 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -358,7 +358,7 @@ EvtScript N(EVS_DropNutOnGoombas) = { IfNe(LVar0, FALSE) Return EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(BattleCamTargetActor, ACTOR_KING) Wait(20) Call(SetActorVar, ACTOR_SELF, AVAR_BigNutDropped, TRUE) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_1.c b/src/battle/area/kmr_part_2/actor/red_goomba_1.c index 14e96d6fe0..6cdfed944c 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_1.c @@ -303,7 +303,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -507,7 +507,7 @@ EvtScript N(EVS_GoombaBros_Death) = { Call(GetActorHP, ACTOR_BLUE_GOOMBA, LVar0) EndIf IfNe(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_BLUE_GOOMBA) Call(MoveBattleCamOver, 20) Wait(20) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_2.c b/src/battle/area/kmr_part_2/actor/red_goomba_2.c index 9f904c5e0e..50343965b0 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_2.c @@ -296,7 +296,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index 79936c12df..27ff140918 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 @@ -146,7 +146,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -193,7 +193,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) @@ -399,7 +399,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run) Call(SetActorSpeed, ACTOR_SELF, Float(8.0)) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index 8ae4e550e4..0d748751fc 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 @@ -336,7 +336,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -383,7 +383,7 @@ EvtScript N(EVS_JrTroopa_BaseDeath) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) @@ -592,7 +592,7 @@ EvtScript N(EVS_TakeTurn) = { IfNotFlag(LVar0, AVAL_Dialogue_LowHP) BitwiseOrConst(LVar0, AVAL_Dialogue_LowHP) Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(GetActorVar, ACTOR_SELF, AVAR_Form, LVar0) @@ -649,7 +649,7 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Transform_Flying) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH8_005E, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_TiredTalk) @@ -677,7 +677,7 @@ EvtScript N(EVS_Transform_Flying) = { EvtScript N(EVS_Transform_Mage) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH8_005F, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_Talk, ANIM_SpikedParaJrTroopa_Talk) @@ -712,7 +712,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Run) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -857,7 +857,7 @@ EvtScript N(EVS_Attack_Swoop) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_FlyFast) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -868,8 +868,8 @@ EvtScript N(EVS_Attack_Swoop) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -908,8 +908,8 @@ EvtScript N(EVS_Attack_Swoop) = { CaseDefault EndSwitch Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -950,7 +950,7 @@ EvtScript N(EVS_Attack_SpikeDive) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -1319,7 +1319,7 @@ EvtScript N(EVS_Move_HealSelf) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -1382,7 +1382,7 @@ EvtScript N(EVS_HandlePhase) = { IfNotFlag(LVar0, AVAL_Dialogue_Begin) BitwiseOrConst(LVar0, AVAL_Dialogue_Begin) Call(SetActorVar, ACTOR_SELF, AVAR_DialogueFlags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(ActorSpeak, MSG_CH8_005D, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTalk) @@ -1500,7 +1500,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) @@ -1553,7 +1553,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) 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 6cb3119025..c113b1bad8 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -134,7 +134,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -181,7 +181,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) @@ -314,7 +314,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run) Call(SetActorSpeed, ACTOR_SELF, Float(8.0)) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index b4151dde40..e3d4623b91 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 @@ -235,7 +235,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -589,7 +589,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) 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 a642f61218..5bf2c52bc6 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 @@ -214,7 +214,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -406,7 +406,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ParaJrTroopa_FlyFast) Call(SetGoalToTarget, ACTOR_SELF) @@ -418,8 +418,8 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -457,8 +457,8 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -514,7 +514,7 @@ EvtScript N(EVS_HandlePhase) = { IfFalse(LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_Transformed, TRUE) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamOffsetZ, 35) Call(MoveBattleCamOver, 30) @@ -580,7 +580,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) 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 e50e059408..541c11139d 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 @@ -213,7 +213,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EvtScript N(EVS_Cam_FocusOnGoompa) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Call(MoveBattleCamOver, 30) Call(BattleCamTargetActor, ACTOR_SELF) Return @@ -459,7 +459,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_SpikedParaJrTroopa_FlyFast) Call(SetGoalToTarget, ACTOR_SELF) @@ -471,8 +471,8 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_MISS) CaseOrEq(HIT_RESULT_LUCKY) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -510,8 +510,8 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -589,7 +589,7 @@ EvtScript N(EVS_HandlePhase) = { IfFalse(LVar0) Call(SetActorVar, ACTOR_SELF, AVAR_LostHalfHP, TRUE) Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamOffsetZ, 35) Call(MoveBattleCamOver, 30) @@ -688,7 +688,7 @@ EvtScript N(EVS_JrTroopa_Death) = { Call(PlaySound, SOUND_ACTOR_DEATH) Call(DropStarPoints, ACTOR_SELF) Call(SetActorYaw, ACTOR_SELF, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 260) Call(SetBattleCamOffsetZ, 15) Call(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c index 24dbef08cb..6d17e82392 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -383,7 +383,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -395,10 +395,10 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -445,10 +445,10 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c index 8f8825fb14..f55a340f34 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c @@ -311,7 +311,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/area/kpa2/actor/final_bowser_1.c b/src/battle/area/kpa2/actor/final_bowser_1.c index 47883410fd..0f3ad893b5 100644 --- a/src/battle/area/kpa2/actor/final_bowser_1.c +++ b/src/battle/area/kpa2/actor/final_bowser_1.c @@ -337,7 +337,7 @@ EvtScript N(EVS_HandleEvent) = { PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.5), 20, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, LVar4) @@ -347,7 +347,7 @@ EvtScript N(EVS_HandleEvent) = { Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_CH8_0085, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock, ANIM_BattleBowser_Mock) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_PLAYER) Call(MoveBattleCamOver, 20) Wait(20) @@ -608,7 +608,7 @@ EvtScript N(EVS_Recover) = { Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 97) @@ -617,7 +617,7 @@ EvtScript N(EVS_Recover) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 39) @@ -683,7 +683,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { IfEq(LVar0, 2) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 90) @@ -692,7 +692,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 36) @@ -881,14 +881,14 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(SetBattleCamOffsetZ, 54) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 240) Call(SetBattleCamOffsetZ, 21) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1100,14 +1100,14 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 160) Call(SetBattleCamOffsetZ, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1182,7 +1182,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 24) Add(LVar1, 97) @@ -1191,7 +1191,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 9) Add(LVar1, 39) @@ -1221,7 +1221,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, Float(0.4), LVarE, 0) EndIf Wait(25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamZoom, 530) Call(SetBattleCamOffsetZ, 0) @@ -1329,7 +1329,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 81) @@ -1337,7 +1337,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetBattleCamZoom, 400) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 56) @@ -1541,7 +1541,7 @@ EvtScript N(EVS_BurnHit) = { EvtScript N(EVS_Attack_LightningBlast) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/kpa2/actor/final_bowser_2.c b/src/battle/area/kpa2/actor/final_bowser_2.c index 8f3f33877a..45a1d4ef24 100644 --- a/src/battle/area/kpa2/actor/final_bowser_2.c +++ b/src/battle/area/kpa2/actor/final_bowser_2.c @@ -298,7 +298,7 @@ EvtScript N(EVS_HandlePhase) = { Call(EnableBattleStatusBar, FALSE) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 90) @@ -307,7 +307,7 @@ EvtScript N(EVS_HandlePhase) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 36) @@ -334,7 +334,7 @@ EvtScript N(EVS_HandlePhase) = { Call(EnableBattleStatusBar, FALSE) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 90) @@ -343,7 +343,7 @@ EvtScript N(EVS_HandlePhase) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 36) @@ -500,7 +500,7 @@ EvtScript N(EVS_HandleEvent) = { Else Set(LVar3, 36) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, LVar3) @@ -542,7 +542,7 @@ EvtScript N(EVS_Death) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 67) @@ -551,7 +551,7 @@ EvtScript N(EVS_Death) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 15) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 27) @@ -642,7 +642,7 @@ EvtScript N(EVS_Death) = { Call(SetActorSize, ACTOR_SELF, 52, 115) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 45) @@ -651,7 +651,7 @@ EvtScript N(EVS_Death) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 18) @@ -868,7 +868,7 @@ EvtScript N(EVS_Recover) = { Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 97) @@ -877,7 +877,7 @@ EvtScript N(EVS_Recover) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 39) @@ -1115,14 +1115,14 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(SetBattleCamOffsetZ, 54) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 240) Call(SetBattleCamOffsetZ, 21) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1334,14 +1334,14 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 160) Call(SetBattleCamOffsetZ, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1416,7 +1416,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 24) Add(LVar1, 97) @@ -1425,7 +1425,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 9) Add(LVar1, 39) @@ -1455,7 +1455,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, Float(0.4), LVarE, 0) EndIf Wait(25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamZoom, 530) Call(SetBattleCamOffsetZ, 0) @@ -1563,7 +1563,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 81) @@ -1571,7 +1571,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetBattleCamZoom, 400) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 56) @@ -1775,7 +1775,7 @@ EvtScript N(EVS_BurnHit) = { EvtScript N(EVS_Attack_LightningBlast) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/kpa2/actor/hallway_bowser.c b/src/battle/area/kpa2/actor/hallway_bowser.c index f3c6e648fa..7ef017e595 100644 --- a/src/battle/area/kpa2/actor/hallway_bowser.c +++ b/src/battle/area/kpa2/actor/hallway_bowser.c @@ -242,7 +242,7 @@ EvtScript N(EVS_HandlePhase) = { BitwiseOrConst(LVar0, AVAL_Flag_InitialTaunt) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -296,7 +296,7 @@ EvtScript N(EVS_HandleEvent) = { Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) @@ -408,7 +408,7 @@ EvtScript N(EVS_HandleEvent) = { BitwiseOrConst(LVar0, AVAL_Flag_StarBeamRemark) BitwiseOrConst(LVar0, AVAL_Flag_HasBeenDisenchanted) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_0075, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt) @@ -457,7 +457,7 @@ EvtScript N(EVS_BasicHit) = { IfNotFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) Call(FreezeBattleCam, TRUE) ExecWait(N(EVS_Hit)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) @@ -563,7 +563,7 @@ EvtScript N(EVS_Move_UseStarRod) = { IfNotFlag(LVar0, AVAL_Flag_UsedStarRod) BitwiseOrConst(LVar0, AVAL_Flag_UsedStarRod) Call(SetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -758,7 +758,7 @@ EvtScript N(EVS_Recover) = { Call(SetActorVar, ACTOR_SELF, AVAR_RecoversLeft, LVar0) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) @@ -767,7 +767,7 @@ EvtScript N(EVS_Recover) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 26) @@ -833,7 +833,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { IfEq(LVar0, 2) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 60) @@ -842,7 +842,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 6) Add(LVar1, 24) @@ -1029,14 +1029,14 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(SetBattleCamOffsetZ, 36) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 240) Call(SetBattleCamOffsetZ, 14) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1248,14 +1248,14 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(SetBattleCamZoom, 160) Call(SetBattleCamOffsetZ, 5) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) @@ -1332,7 +1332,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar3) IfNotFlag(LVar3, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 24) Add(LVar1, 65) @@ -1341,7 +1341,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(SetBattleCamOffsetZ, 0) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 9) Add(LVar1, 26) @@ -1371,7 +1371,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { PlayEffect(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, Float(0.4), LVarE, 0) EndIf Wait(25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamZoom, 530) Call(SetBattleCamOffsetZ, 0) @@ -1479,7 +1479,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfNotFlag(LVar0, STATUS_FLAG_SHRINK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 65) @@ -1487,7 +1487,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetBattleCamZoom, 400) Call(MoveBattleCamOver, 40) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 45) diff --git a/src/battle/area/kpa2/actor/intro_bowser.c b/src/battle/area/kpa2/actor/intro_bowser.c index 07cbb9beff..d107443bcf 100644 --- a/src/battle/area/kpa2/actor/intro_bowser.c +++ b/src/battle/area/kpa2/actor/intro_bowser.c @@ -199,7 +199,7 @@ EvtScript N(EVS_HandlePhase) = { IfEq(LVar0, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_PeachSpoke, TRUE) Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -115, 0, 0) Call(SetBattleCamZoom, 320) Call(SetBattleCamOffsetZ, 50) @@ -328,7 +328,7 @@ EvtScript N(EVS_TakeTurn) = { CaseEq(4) ExecWait(N(EVS_Attack_ClawSwipe)) CaseEq(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) @@ -345,7 +345,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(SetBattleCamZoom, 200) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Walk) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 40, 0, 0) @@ -401,7 +401,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EvtScript N(EVS_Attack_FireBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 30) Add(LVar1, 65) @@ -466,12 +466,12 @@ EvtScript N(EVS_Attack_FireBreath) = { }; EvtScript N(EVS_UseStarRod) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) Call(ActorSpeak, MSG_Intro_0058, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Talk, ANIM_BattleBowser_Idle) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) @@ -494,7 +494,7 @@ EvtScript N(EVS_UseStarRod) = { Call(SetGoalToTarget, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) ExecWait(N(EVS_StarRodCast)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) @@ -618,7 +618,7 @@ EvtScript N(EVS_StarRodCast) = { EndIf PlayEffect(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, Float(1.0), 15, 0) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar0, 15) Add(LVar1, 65) diff --git a/src/battle/area/kpa2/actor/unused_bowser.c b/src/battle/area/kpa2/actor/unused_bowser.c index c32a011e98..d05f12d570 100644 --- a/src/battle/area/kpa2/actor/unused_bowser.c +++ b/src/battle/area/kpa2/actor/unused_bowser.c @@ -290,7 +290,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) Wait(25) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) Wait(3) Call(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) @@ -350,7 +350,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(AddGoalPos, ACTOR_SELF, 80, 0, 0) Call(SetActorSpeed, ACTOR_SELF, Float(3.0)) Call(RunToGoal, ACTOR_SELF, 0, FALSE) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreJump) @@ -504,7 +504,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 8f97eadedf..f456aadebd 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -246,13 +246,13 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Fire) Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) Wait(1) Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) Wait(15) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) + Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_13) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) CaseOrEq(HIT_RESULT_MISS) diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index 479accfd79..6ad658d46b 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -400,13 +400,13 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) IfEq(LVar0, VINE_1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 40, 30, 0) Call(SetBattleCamZoom, 270) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 30) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 110, 35, 0) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 20) @@ -478,7 +478,7 @@ EvtScript N(EVS_Move_SummonPetit) = { Thread Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 30) @@ -809,7 +809,7 @@ EvtScript N(EVS_Attack_SpitPetit) = { Wait(8) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Sub(LVar1, 25) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 30) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 414db3054b..b00946c31f 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -1140,7 +1140,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetActorVar, ACTOR_SELF, AVAR_Common_StunTurnsLeft, LVar0) IfLe(LVar0, 0) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 80, 70, 0) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 30) @@ -1188,7 +1188,7 @@ EvtScript N(EVS_Attack_SpitFire) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Thread Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 80, 70, 0) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 30) @@ -1270,7 +1270,7 @@ EvtScript N(EVS_Attack_FireBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Thread Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 80, 70, 0) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 30) @@ -1415,7 +1415,7 @@ EvtScript N(EVS_Death) = { Call(GetActorVar, ACTOR_BUD_2, AVAR_Bud_WhichVine, LVar0) Call(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) Call(CancelEnemyTurn, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamZoom, 360) Call(SetBattleCamOffsetZ, 0) @@ -1508,7 +1508,7 @@ EvtScript N(EVS_Death) = { EndLoop EndThread Wait(35) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamZoom, 360) Call(SetBattleCamOffsetZ, -45) @@ -1522,7 +1522,7 @@ EvtScript N(EVS_Death) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) Call(ForceHomePos, ACTOR_SELF, 61, 61, 0) Wait(65) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 240) @@ -1550,13 +1550,13 @@ EvtScript N(EVS_Death) = { Add(LVar1, 10) PlayEffect(EFFECT_EMOTE, EMOTE_QUESTION, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) Wait(50) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamZoom, 360) Call(SetBattleCamOffsetZ, -60) Call(MoveBattleCamOver, 30) Wait(40) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamZoom, 200) Call(SetBattleCamOffsetZ, -60) @@ -1568,7 +1568,7 @@ EvtScript N(EVS_Death) = { Wait(40) Call(UseIdleAnimation, ACTOR_PLAYER, TRUE) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 30, 90, 0) Call(SetBattleCamZoom, 460) Call(SetBattleCamOffsetZ, 0) @@ -1580,7 +1580,7 @@ EvtScript N(EVS_Death) = { EndThread ChildThread Wait(50) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 90, 90, 0) Call(SetBattleCamZoom, 360) Call(SetBattleCamOffsetZ, 0) diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index a572a6c6cf..5bc0e1987e 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -260,7 +260,7 @@ EvtScript N(EVS_TakeTurn) = { Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) IfGe(LVar1, 41) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 380) Call(SetBattleCamOffsetZ, -20) Call(BattleCamTargetActor, ACTOR_SELF) @@ -275,7 +275,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(FlyToGoal, ACTOR_SELF, 20, -12, EASING_LINEAR) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 380) Call(SetBattleCamOffsetZ, 0) Call(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index c400e8845e..cded10c7ec 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -585,7 +585,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(HPBarToHome, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -611,7 +611,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(SetBattleCamZoom, 430) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -742,7 +742,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_EnterShell) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ShellStill) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 7d554aa9e4..4bf7ea82d8 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -355,7 +355,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch) Wait(20) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) @@ -601,7 +601,7 @@ API_CALLABLE(N(AdjustFormationPriority)) { EvtScript N(EVS_Move_CopyPartner) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/area/mac/actor/lee_bow.inc.c b/src/battle/area/mac/actor/lee_bow.inc.c index 644269bb9c..9dda131dce 100644 --- a/src/battle/area/mac/actor/lee_bow.inc.c +++ b/src/battle/area/mac/actor/lee_bow.inc.c @@ -265,7 +265,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) EndThread Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Set(LVar0, 55) diff --git a/src/battle/area/mac/actor/lee_goombario.inc.c b/src/battle/area/mac/actor/lee_goombario.inc.c index 1d67ebb9a0..5948a4f24a 100644 --- a/src/battle/area/mac/actor/lee_goombario.inc.c +++ b/src/battle/area/mac/actor/lee_goombario.inc.c @@ -271,7 +271,7 @@ EvtScript N(EVS_HeadbonkFollowthrough) = { EvtScript N(EVS_ApproachPlayer) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) diff --git a/src/battle/area/mac/actor/lee_kooper.inc.c b/src/battle/area/mac/actor/lee_kooper.inc.c index bdc51866b2..0865021f9b 100644 --- a/src/battle/area/mac/actor/lee_kooper.inc.c +++ b/src/battle/area/mac/actor/lee_kooper.inc.c @@ -349,10 +349,10 @@ EvtScript N(EVS_TakeTurn) = { Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 75) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar0) Switch(LVar0) CaseEq(PARTNER_RANK_NORMAL) diff --git a/src/battle/area/mac/actor/lee_lakilester.inc.c b/src/battle/area/mac/actor/lee_lakilester.inc.c index e9748416bd..096fe81d73 100644 --- a/src/battle/area/mac/actor/lee_lakilester.inc.c +++ b/src/battle/area/mac/actor/lee_lakilester.inc.c @@ -228,7 +228,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) diff --git a/src/battle/area/mac/actor/lee_parakarry.inc.c b/src/battle/area/mac/actor/lee_parakarry.inc.c index f01592a4a3..c59b1d30c1 100644 --- a/src/battle/area/mac/actor/lee_parakarry.inc.c +++ b/src/battle/area/mac/actor/lee_parakarry.inc.c @@ -231,7 +231,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 20, 0, 0) diff --git a/src/battle/area/mac/actor/lee_sushie.inc.c b/src/battle/area/mac/actor/lee_sushie.inc.c index 60f47b0386..727c34b420 100644 --- a/src/battle/area/mac/actor/lee_sushie.inc.c +++ b/src/battle/area/mac/actor/lee_sushie.inc.c @@ -210,7 +210,7 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -231,7 +231,7 @@ EvtScript N(EVS_TakeTurn) = { Call(BattleCamTargetActor, ACTOR_SELF) Call(AddBattleCamZoom, -50) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense1) Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) diff --git a/src/battle/area/mac/actor/lee_watt.inc.c b/src/battle/area/mac/actor/lee_watt.inc.c index aff8a51e47..d38ff67e95 100644 --- a/src/battle/area/mac/actor/lee_watt.inc.c +++ b/src/battle/area/mac/actor/lee_watt.inc.c @@ -338,13 +338,13 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 40) Call(MoveBattleCamOver, 80) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Run) @@ -392,7 +392,7 @@ EvtScript N(EVS_TakeTurn) = { Set(LVarA, 40) Call(AddBattleCamZoom, -75) Call(MoveBattleCamOver, LVarA) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfFlag(LVar0, STATUS_FLAG_SHRINK) diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index 9e9651e836..29ea725d13 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -236,7 +236,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 70b0e4de8b..ca962bef35 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -248,7 +248,7 @@ EvtScript N(EVS_Attack_StrikeOnce) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -501,7 +501,7 @@ EvtScript N(EVS_HandlePhase) = { CaseEq(PHASE_PLAYER_BEGIN) Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0) IfEq(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Wait(10) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index b3198de23d..a8d20a7067 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Attack_StrikeOnce) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -892,7 +892,7 @@ EvtScript N(EVS_HandlePhase) = { Call(GetActorVar, ACTOR_SELF, AVAR_BattleCry, LVar0) IfEq(LVar0, FALSE) // 'To battle!' - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Wait(10) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index ccf240f66d..2797df1725 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -514,7 +514,7 @@ EvtScript N(EVS_TakeTurn) = { IfEq(LVar0, 1) Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 200) Call(SetBattleCamOffsetZ, 20) Call(BattleCamTargetActor, ACTOR_SELF) @@ -613,7 +613,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 200) Call(SetBattleCamOffsetZ, 20) Call(BattleCamTargetActor, ACTOR_SELF) @@ -669,7 +669,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -25, 60, 0) Call(SetBattleCamZoom, 460) Call(SetBattleCamOffsetZ, 0) @@ -694,7 +694,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EndSwitch EndCaseGroup CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -25, 60, 0) Call(SetBattleCamZoom, 460) Call(SetBattleCamOffsetZ, 0) @@ -765,7 +765,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(UseIdleAnimation, ACTOR_SELF, TRUE) Return Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -45, 60, 0) Call(SetBattleCamZoom, 460) Call(SetBattleCamOffsetZ, 0) @@ -830,7 +830,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { Call(SetBattleCamZoom, 280) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 50) diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index b51dec9e10..d69f257d60 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -306,7 +306,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Thread @@ -426,7 +426,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 320) diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index 0c7a113ece..8db18caaed 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -318,7 +318,7 @@ EvtScript N(EVS_Hit) = { IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainElectric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainElectric | AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 260) Call(SetBattleCamTarget, 85, 80, 0) Call(MoveBattleCamOver, 20) @@ -332,7 +332,7 @@ EvtScript N(EVS_Hit) = { IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainUnfair) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 260) Call(SetBattleCamTarget, 85, 80, 0) Call(MoveBattleCamOver, 20) @@ -346,7 +346,7 @@ EvtScript N(EVS_Hit) = { IfNotFlag(LVar0, AVAR_GeneralFlag_ComplainGeneric) BitwiseOrConst(LVar0, AVAR_GeneralFlag_ComplainUnfair | AVAR_GeneralFlag_ComplainGeneric) Call(SetActorVar, ACTOR_GENERAL, AVAR_General_Flags, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 260) Call(SetBattleCamTarget, 85, 80, 0) Call(MoveBattleCamOver, 20) @@ -425,7 +425,7 @@ EvtScript N(EVS_ManageTroopWaves) = { Call(SetActorVar, ACTOR_GENERAL, AVAR_General_WavesDefeated, 8) ExecWait(N(EVS_BeginWave_Tank)) Goto(LBL_DONE) - // ----------------------- begin unreachable code ----------------------- + // ----------------------- begin unreachable code ----------------------- // a second stilt phase? but nothing is summoned and AVAR_Tank_StiltPhase == AVAL_StiltPhase_Defeated Label(LBL_PHASE_BROKEN) Call(ActorExists, ACTOR_TANK, LVar0) @@ -471,7 +471,7 @@ EvtScript N(EVS_ManageTroopWaves) = { EndIf Wait(1) Goto(LBL_PHASE_UNUSED) - // ------------------------ end unreachable code ------------------------ + // ------------------------ end unreachable code ------------------------ Label(LBL_DONE) Return End @@ -538,7 +538,7 @@ EvtScript N(EVS_BeginWave_StiltGuys) = { EvtScript N(EVS_BeginWave_ShyStacks) = { Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(40) @@ -562,7 +562,7 @@ EvtScript N(EVS_BeginWave_ShyStacks) = { Wait(1) Goto(0) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_WAVE_B, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 320) @@ -611,11 +611,11 @@ EvtScript N(EVS_BeginWave_ShyStacks) = { }; EvtScript N(EVS_SummonStiltGuys) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(40) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorVar, ACTOR_GENERAL, AVAR_General_WavesDefeated, LVar0) IfEq(LVar0, 1) Call(ActorSpeak, MSG_CH4_006B, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0C, ANIM_GeneralGuy_Anim02) @@ -635,7 +635,7 @@ EvtScript N(EVS_SummonStiltGuys) = { Wait(1) Goto(1) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 50, 1, 0) Call(SetBattleCamZoom, 320) Call(SetBattleCamOffsetZ, 60) @@ -675,11 +675,11 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = { Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ModulateDarkness, TRUE) Exec(N(EVS_ManageDarkness)) Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_AVG, FALSE) Call(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1) Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) Call(SetActorYaw, ACTOR_GENERAL, 0) @@ -691,14 +691,14 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = { Call(LoadBattleSection, BTL_AREA_OMO2_5) Call(SummonEnemy, Ref(N(ShySquadReduxFormation)), TRUE) Wait(155) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 350) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 40) Wait(40) Call(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim03) Call(EndActorSpeech, ACTOR_GENERAL, PRT_MAIN, -1, -1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_WAVE_A) Call(MoveBattleCamOver, 30) @@ -736,7 +736,7 @@ EvtScript N(EVS_BeginWave_ShySquadRedux) = { EvtScript N(EVS_BeginWave_Tank) = { Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 60) Wait(60) @@ -779,7 +779,7 @@ EvtScript N(EVS_Death) = { Wait(15) PlayEffect(EFFECT_EXPLOSION, 2, 102, 40, 0, 0) Call(SetActorVar, ACTOR_SELF, AVAR_Tank_ShouldTetherGeneral, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_GENERAL) Call(MoveBattleCamOver, 60) Call(PlaySoundAtActor, ACTOR_TANK, SOUND_TOY_TANK_EXPLODE) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 880e311fc2..59ce9ee605 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -494,7 +494,7 @@ EvtScript N(EVS_HandlePhase) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS1) ExecWait(N(EVS_MoveSquadHome)) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 360) Call(SetBattleCamTarget, 72, 45, 0) Call(MoveBattleCamOver, 30) @@ -1126,7 +1126,7 @@ EvtScript N(EVS_Attack_Swarm) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 20) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -1300,7 +1300,7 @@ EvtScript N(EVS_Flee) = { Call(SetAnimation, ACTOR_SELF, LVar0, ANIM_ShySquadGuy_Anim08) Add(LVar0, 1) EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Wait(30) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 6233694cce..04a8a04d7c 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -673,7 +673,7 @@ EvtScript N(EVS_Attack_Leap) = { Call(SetBattleCamOffsetZ, 40) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_STILTS, ANIM_StiltGuy_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -1083,7 +1083,7 @@ EvtScript N(EVS_ShyGuy_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -1178,7 +1178,7 @@ EvtScript N(EVS_ShyGuy_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim09) Wait(20) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 62123c140f..e7960a63bc 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -1288,7 +1288,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorVar, ACTOR_SELF, AVAR_Anim_Attack, LVar0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0) Wait(20) diff --git a/src/battle/area/omo2_5/actor/shy_squad_redux.c b/src/battle/area/omo2_5/actor/shy_squad_redux.c index 9717dbbb93..95c16eed38 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_redux.c +++ b/src/battle/area/omo2_5/actor/shy_squad_redux.c @@ -721,7 +721,7 @@ EvtScript N(EVS_MemberShockReaction) = { Call(SetAnimation, ACTOR_SELF, LVar0, LVar1) Call(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) Call(GetActorSize, ACTOR_SELF, LVar4, LVar5) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar1, LVar2, LVar3, LVar5, LVar4, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_SHOCK_HIT, LVar1, LVar2, LVar3, LVar5, LVar4, 0) Call(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 0, 0) Call(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 1, 0) Wait(1) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index 4284bfcb81..dbb65d581b 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -312,7 +312,7 @@ EvtScript N(EVS_HandlePhase) = { IfNotFlag(LVar0, 1) BitwiseOrConst(LVar0, 1) Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamOffsetZ, 40) Call(MoveBattleCamOver, 30) @@ -536,7 +536,7 @@ EvtScript N(attackHeavyJump) = { Call(SetBattleCamZoom, 260) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 50) @@ -607,7 +607,7 @@ EvtScript N(attackHeavyJump) = { Call(SetBattleCamZoom, 320) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Thread Wait(5) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim10) @@ -642,11 +642,11 @@ EvtScript N(attackLightBeam) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(SetBattleCamZoom, 240) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 80) @@ -750,7 +750,7 @@ EvtScript N(extinguish) = { IfNotFlag(LVar0, 2) BitwiseOrConst(LVar0, 2) Call(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(SetBattleCamOffsetZ, 40) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) @@ -764,7 +764,7 @@ EvtScript N(extinguish) = { EndIf EndIf Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(SetBattleCamZoom, 230) Call(SetBattleCamOffsetZ, 25) Call(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index 146d26286a..abfb2ba2e3 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -936,7 +936,7 @@ EvtScript N(EVS_Attack_IcyBreath) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) Wait(10) @@ -1033,7 +1033,7 @@ EvtScript N(EVS_Attack_IceBolt) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) Wait(10) @@ -1225,7 +1225,7 @@ Formation N(CloneFormation) = { EvtScript N(EVS_Move_MakeClones) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1486,7 +1486,7 @@ EvtScript N(EVS_SummonBit) = { EvtScript N(EVS_Move_SummonBits) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1556,7 +1556,7 @@ EvtScript N(EVS_Attack_CloneBreath) = { BitwiseOrConst(LVar0, AVAL_Flag_SuspendHover) Call(SetActorVar, ACTOR_KING, AVAR_Flags, LVar0) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 35) Call(GetActorFlags, ACTOR_SELF, LVar0) @@ -1853,7 +1853,7 @@ EvtScript N(EVS_Attack_SpitBits) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) Wait(20) @@ -1997,7 +1997,7 @@ EvtScript N(EVS_Move_Recover) = { Call(UseIdleAnimation, LVarB, FALSE) Call(EnableIdleScript, LVarB, IDLE_SCRIPT_DISABLE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 50) Call(GetActorFlags, ACTOR_SELF, LVar0) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index d4d71bfa38..f98ee666c8 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -190,7 +190,7 @@ API_CALLABLE(N(UpdateMonstarImgFX)) { } return ApiStatus_BLOCK; - + #undef RGBA_BUF_SIZE } @@ -336,7 +336,7 @@ EvtScript N(EVS_ChargeUp) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(SetBattleCamZoom, 10) Call(SetBattleCamOffsetZ, 5) Call(BattleCamTargetActor, ACTOR_SELF) @@ -360,7 +360,7 @@ EvtScript N(EVS_Attack_StarStorm) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(SetActorVar, ACTOR_SELF, AVAR_HoverPaused, TRUE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 250) @@ -388,7 +388,7 @@ EvtScript N(EVS_Attack_StarStorm) = { EndThread Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) Call(N(StartRumbleWithParams), 80, 120) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 100) @@ -491,7 +491,7 @@ EvtScript N(EVS_HandlePhase) = { EvtScript N(EVS_TakeTurn) = { ExecWait(N(EVS_Attack_StarStorm)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 72) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index 8e71b84485..37ee833d95 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -399,14 +399,14 @@ EvtScript N(EVS_Attack_SpinDrop) = { IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 95) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 400) Call(MoveBattleCamOver, 130) Else Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 72) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 340) Call(MoveBattleCamOver, 130) @@ -512,7 +512,7 @@ EvtScript N(EVS_Attack_InkBlast) = { Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) Call(FallToGoal, ACTOR_SELF, 8) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Sub(LVar0, 30) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index 03c08ce072..f7ed3f5998 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -466,7 +466,7 @@ EvtScript N(EVS_TakeTurn) = { EndSwitch Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 50) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 325) Call(MoveBattleCamOver, 30) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index b6152c1c54..a6b58c8382 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -517,7 +517,7 @@ EvtScript N(EVS_Move_ChargeUp) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar1, 65) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 320) Call(MoveBattleCamOver, 50) @@ -553,14 +553,14 @@ EvtScript N(EVS_Attack_SpinDrop) = { IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 112) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 500) Call(MoveBattleCamOver, 130) Else Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 82) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 385) Call(MoveBattleCamOver, 130) @@ -651,14 +651,14 @@ EvtScript N(EVS_Attack_ChargedDrop) = { IfNotFlag(LVar0, STATUS_FLAG_SHRINK) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 112) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 500) Call(MoveBattleCamOver, 130) Else Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 82) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 385) Call(MoveBattleCamOver, 130) @@ -763,7 +763,7 @@ EvtScript N(EVS_Attack_InkBlast) = { Call(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) Call(FallToGoal, ACTOR_SELF, 8) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Sub(LVar0, 30) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) 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 40557300ca..146fa19da3 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -1542,7 +1542,7 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { Return EndIf Call(EnableBattleStatusBar, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 28, 75, -101) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 500) @@ -1558,7 +1558,7 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { Call(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 2) CaseEq(2) Call(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, PRT_TARGET, -1, -1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 85, 81, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 249) @@ -1570,7 +1570,7 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { Call(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 3) CaseEq(3) Call(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, PRT_TARGET, -1, -1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 85, 81, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 249) @@ -1594,7 +1594,7 @@ EvtScript N(EVS_FakeBowser_HandlePhase) = { CaseEq(PHASE_PLAYER_BEGIN) Call(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) IfNotFlag(LVar0, AFLAG_Boss_Dialogue_BowserReveal) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -4, 46, -2) Call(SetBattleCamYaw, 24) Call(SetBattleCamOffsetZ, 30) @@ -1746,7 +1746,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { Call(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch) EndThread Wait(30) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 70, 46, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 292) @@ -1866,7 +1866,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { Call(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) Call(GetHomePos, LVar1, LVar2, LVar3, LVar4) Call(SetBattleCamTarget, LVar2, LVar3, LVar4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamZoom, 400) Call(MoveBattleCamOver, LVar0) @@ -2243,7 +2243,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { Call(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) Call(GetHomePos, LVar1, LVar2, LVar3, LVar4) Call(SetBattleCamTarget, LVar2, LVar3, LVar4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamOffsetZ, 50) Call(SetBattleCamZoom, 400) Call(MoveBattleCamOver, 30) @@ -2498,7 +2498,7 @@ EvtScript N(EVS_TryFormingTower) = { Return End #undef VAR_STANDING_COUNT - #undef VAR_CUR_KOOPA_IDX + #undef VAR_CUR_KOOPA_IDX }; // count the number of standing koopa bros @@ -3048,7 +3048,7 @@ EvtScript N(EVS_KoopaBros_TakeTurn) = { EndLoop // zoom in to show the toppled koopa bros and have them try to get up IfEq(LFlag0, TRUE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 90, 0, 0) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 40) diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index 1e6e635849..e3689857c2 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -2210,7 +2210,7 @@ void btl_state_update_run_away(void) { gBattleStatus.flags2 |= BS_FLAGS2_PLAYER_TURN_USED; playerData->fleeAttempts++; - btl_cam_use_preset(BTL_CAM_PRESET_25); + btl_cam_use_preset(BTL_CAM_PLAYER_FLEE); btl_cam_target_actor(ACTOR_PLAYER); // calculate average escape chance @@ -2389,7 +2389,7 @@ void btl_state_update_defeat(void) { player->disableEffect->data.disableX->koDuration = 0; } - btl_cam_use_preset(BTL_CAM_PRESET_25); + btl_cam_use_preset(BTL_CAM_PLAYER_FLEE); btl_cam_target_actor(ACTOR_PLAYER); battleStatus->battlePhase = PHASE_DEATH; script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); @@ -2468,7 +2468,7 @@ void btl_state_update_change_partner(void) { partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; battleStatus->stateFreezeCount = 0; gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; - btl_cam_use_preset(BTL_CAM_PRESET_19); + btl_cam_use_preset(BTL_CAM_PRESET_13); btl_cam_set_target_pos(-89.0, 40.0, -99.0); btl_cam_set_zoom(372); btl_cam_set_zoffset(0); @@ -3874,7 +3874,7 @@ void btl_state_update_first_strike(void) { gBattleStatus.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE; gBattleStatus.flags1 &= ~BS_FLAGS1_PARTNER_ACTING; increment_status_bar_disabled(); - btl_cam_use_preset(BTL_CAM_PRESET_10); + btl_cam_use_preset(BTL_CAM_PRESET_0A); btl_cam_target_actor(ACTOR_PLAYER); reset_actor_turn_info(); // begin the partner turn script @@ -4077,7 +4077,7 @@ void btl_state_update_partner_striking_first(void) { gBattleStatus.flags2 |= BS_FLAGS2_IS_FIRST_STRIKE; gBattleStatus.flags1 |= BS_FLAGS1_PARTNER_ACTING; increment_status_bar_disabled(); - btl_cam_use_preset(BTL_CAM_PRESET_10); + btl_cam_use_preset(BTL_CAM_PRESET_0A); btl_cam_target_actor(ACTOR_PARTNER); reset_actor_turn_info(); // begin the partner turn script diff --git a/src/battle/camera.c b/src/battle/camera.c index e1fd0cd59e..6cc3c96e9a 100644 --- a/src/battle/camera.c +++ b/src/battle/camera.c @@ -2,7 +2,9 @@ #include "script_api/battle.h" #include "dx/debug_menu.h" +// lerp from a to b as alpha goes from 1.0 to 0.0 #define LERP(a, b, alpha) ((a) * (alpha) + (b) * (1.0f-(alpha))) + #define QUADRATIC_SINE_INTERP(alpha) (1.0f - sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2)) #define CUBIC_SINE_INTERP(alpha) (1.0f - sin_rad(sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2) * PI_S / 2)) @@ -22,12 +24,12 @@ static f32 BattleCam_InitialBoomOffsetY; static b8 BattleCam_DoneMoving; static s16 BattleCam_MoveTimeLeft; static s16 BattleCam_MoveTimeTotal; -static s8 BattleCam_ModeX; -static s8 BattleCam_ModeY; +static s8 BattleCam_AdjustTargetXMode; +static s8 BattleCam_AdjustTargetYMode; static b8 BattleCam_SetImmediately; static b8 BattleCam_UseLinearInterp; static b8 BattleCam_ClampPosX; -static s8 BattleCam_SpecialOffsetX; +static s8 BattleCam_ExtraOffsetX; static f32 BattleCam_InitialPosX; static f32 BattleCam_InitialPosY; static f32 BattleCam_InitialPosZ; @@ -126,46 +128,56 @@ b32 get_cam_subject_properties(CamSubjects* subjects, b32 usePart) { switch (actorClass) { case ACTOR_CLASS_PLAYER: - switch (BattleCam_ModeY) { - case BTL_CAM_MODEY_MINUS_2: + switch (BattleCam_AdjustTargetYMode) { + case BTL_CAM_YADJ_SLIGHT: + // final position is weighted 75% actor and 25% target: + // = a - (a - t) / 4 + // = (4a - a + t) / 4 + // = (3a + t) / 4 subjects->avgPos.y = subjects->actorPos.y - deltaY / 4; break; - case BTL_CAM_MODEY_MINUS_1: + case BTL_CAM_YADJ_TARGET: subjects->avgPos.y = subjects->targetPos.y; break; - case BTL_CAM_MODEY_0: + case BTL_CAM_YADJ_NONE: subjects->avgPos.y = subjects->actorPos.y; break; - case BTL_CAM_MODEY_1: + case BTL_CAM_YADJ_AVG: + // final position is weighted 66% actor and 33% target: + // = t + (a - t) / 2 + (a - t) / 6 + // = (6t + 3a - 3t + a - t) / 6 + // = (2t + 4a) / 6 subjects->avgPos.y = subjects->targetPos.y + deltaY / 2 + deltaY / 6; break; } break; case ACTOR_CLASS_PARTNER: - switch (BattleCam_ModeY) { - case BTL_CAM_MODEY_MINUS_1: + switch (BattleCam_AdjustTargetYMode) { + case BTL_CAM_YADJ_TARGET: subjects->avgPos.y = subjects->targetPos.y; break; - case BTL_CAM_MODEY_0: + case BTL_CAM_YADJ_NONE: subjects->avgPos.y = subjects->actorPos.y; break; - case BTL_CAM_MODEY_1: + case BTL_CAM_YADJ_AVG: + // same math as ACTOR_CLASS_PLAYER subjects->avgPos.y = subjects->targetPos.y + deltaY / 2 + deltaY / 6; break; } break; case ACTOR_CLASS_ENEMY: - switch (BattleCam_ModeY) { - case BTL_CAM_MODEY_MINUS_2: + switch (BattleCam_AdjustTargetYMode) { + case BTL_CAM_YADJ_SLIGHT: subjects->avgPos.y = subjects->actorPos.y; break; - case BTL_CAM_MODEY_MINUS_1: + case BTL_CAM_YADJ_TARGET: subjects->avgPos.y = subjects->targetPos.y; break; - case BTL_CAM_MODEY_0: + case BTL_CAM_YADJ_NONE: subjects->avgPos.y = subjects->actorPos.y; break; - case BTL_CAM_MODEY_1: + case BTL_CAM_YADJ_AVG: + // same math as ACTOR_CLASS_PLAYER subjects->avgPos.y = subjects->targetPos.y + deltaY / 2 + deltaY / 6; break; } @@ -182,7 +194,7 @@ API_CALLABLE(BattleCam_Update_Interrupt) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_F) { +API_CALLABLE(CamPresetUpdate_F_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; CamSubjects subjects; Vec3f prevPos; @@ -240,7 +252,7 @@ API_CALLABLE(CamPresetUpdate_F) { camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, subjects.avgPos.z, alpha); dist = dist2D(camera->lookAt_obj_target.x, camera->lookAt_obj_target.z, subjects.avgPos.x, subjects.avgPos.z); - //NOTE division by 8 here is only difference between this and CamPresetUpdate_M + //NOTE division by 8 here is only difference between this and CamPresetUpdate_M_Skippable adjustedSize = (subjects.actorSizeAvg + subjects.targetSizeAvg) / 8; extraLength = dist + adjustedSize - 64.0f; distToTarget = dist3D(prevPos.z, prevPos.y, prevPos.z, subjects.targetPos.x, subjects.targetPos.y, subjects.targetPos.z); @@ -260,7 +272,7 @@ API_CALLABLE(CamPresetUpdate_F) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_M) { +API_CALLABLE(CamPresetUpdate_M_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; CamSubjects subjects; Vec3f prevPos; @@ -335,10 +347,9 @@ API_CALLABLE(CamPresetUpdate_M) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_G) { +API_CALLABLE(CamPresetUpdate_G_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; CamSubjects subjects; - ActorPart* actorPart; f32 alpha; if (!get_cam_subject_properties(&subjects, TRUE)) { @@ -472,10 +483,10 @@ API_CALLABLE(BattleCam_Update_FocusActor) { alpha = CUBIC_SINE_INTERP(alpha); } - if (BattleCam_ModeX != BTL_CAM_MODEX_0) { - camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, actorX + BattleCam_SpecialOffsetX, alpha); + if (BattleCam_AdjustTargetXMode != BTL_CAM_XADJ_NONE) { + camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, actorX + BattleCam_ExtraOffsetX, alpha); } - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, actorY, alpha); } camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, actorZ, alpha); @@ -502,7 +513,6 @@ API_CALLABLE(BattleCam_Update_FocusGoal) { s32 actorID = BattleCam_SubjectActor & 0xFF; Actor* actor; f32 goalX, goalY, goalZ; - f32 averageX; f32 actorX, actorY; f32 actorSizeAvg; f32 alpha; @@ -548,19 +558,19 @@ API_CALLABLE(BattleCam_Update_FocusGoal) { return ApiStatus_DONE2; } - if (BattleCam_ModeY != BTL_CAM_MODEY_0) { + if (BattleCam_AdjustTargetYMode != BTL_CAM_YADJ_NONE) { f32 delta = actorY - goalY; goalY += delta / 2 + delta / 6.0f; } - if (BattleCam_ModeX != BTL_CAM_MODEX_0) { - averageX = (actorX + goalX) / 2; - if (averageX > 75.0f) { - averageX -= fabsf(75.0f - averageX); + if (BattleCam_AdjustTargetXMode != BTL_CAM_XADJ_NONE) { + goalX = (actorX + goalX) / 2; + if (goalX > 75.0f) { + goalX -= fabsf(75.0f - goalX); } } - averageX = clamp_edge_pos_x(averageX); + goalX = clamp_edge_pos_x(goalX); if (isInitialCall) { BattleCam_InitialPosX = camera->lookAt_obj_target.x; @@ -580,7 +590,7 @@ API_CALLABLE(BattleCam_Update_FocusGoal) { alpha = CUBIC_SINE_INTERP(alpha); } - camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, averageX, alpha); + camera->lookAt_obj_target.x = LERP(BattleCam_InitialPosX, goalX, alpha); camera->lookAt_obj_target.y = LERP(BattleCam_InitialPosY, goalY, alpha); camera->lookAt_obj_target.z = LERP(BattleCam_InitialPosZ, goalZ, alpha); @@ -599,7 +609,7 @@ API_CALLABLE(BattleCam_Update_FocusGoal) { } /// lerp all parameters from current to target values -API_CALLABLE(BattleCam_Update_SimpleLerp) { +API_CALLABLE(BattleCam_Update_SimpleLerp_Unskippable) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; @@ -640,7 +650,7 @@ API_CALLABLE(BattleCam_Update_SimpleLerp) { } /// lerp all parameters from current to default 'neutral position' values -API_CALLABLE(BattleCam_Update_ResetToNeutral) { +API_CALLABLE(BattleCam_Update_ResetToNeutral_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; @@ -795,7 +805,9 @@ API_CALLABLE(BattleCam_Update_ViewAllEnemies_MaintainY) { return ApiStatus_BLOCK; } -API_CALLABLE(CamPresetUpdate_J) { +/// lerp all parameters from current to target values +/// identical to BattleCam_Update_SimpleLerp_Unskippable, except BattleCam_SetImmediately can be used +API_CALLABLE(BattleCam_Update_SimpleLerp_Skippable) { Camera* camera = &gCameras[CAM_BATTLE]; f32 alpha; @@ -1016,20 +1028,21 @@ EvtScript EVS_BattleCam_Interrupt = { End }; -EvtScript CamPreset_F = { - Call(CamPresetUpdate_F) +EvtScript EVS_BattleCam_UnkF_Skippable = { + Call(CamPresetUpdate_F_Skippable) Return End }; -EvtScript CamPreset_M = { - Call(CamPresetUpdate_M) +EvtScript EVS_BattleCam_UnkM_Skippable = { + Call(CamPresetUpdate_M_Skippable) Return End }; -EvtScript CamPreset_G = { - Call(CamPresetUpdate_G) +// unused +EvtScript EVS_BattleCam_UnkG_Skippable = { + Call(CamPresetUpdate_G_Skippable) Return End }; @@ -1046,14 +1059,14 @@ EvtScript EVS_BattleCam_FocusGoal = { End }; -EvtScript EVS_BattleCam_SimpleLerp = { - Call(BattleCam_Update_SimpleLerp) +EvtScript EVS_BattleCam_SimpleLerp_Unskippable = { + Call(BattleCam_Update_SimpleLerp_Unskippable) Return End }; EvtScript EVS_BattleCam_ResetNeutral = { - Call(BattleCam_Update_ResetToNeutral) + Call(BattleCam_Update_ResetToNeutral_Skippable) Return End }; @@ -1070,8 +1083,8 @@ EvtScript EVS_BattleCam_ViewEnemies_MaintainY = { End }; -EvtScript CamPreset_J = { - Call(CamPresetUpdate_J) +EvtScript EVS_BattleCam_SimpleLerp_Skippable = { + Call(BattleCam_Update_SimpleLerp_Skippable) Return End }; @@ -1117,14 +1130,14 @@ void btl_cam_use_preset_impl(s32 id) { EvtScript* preset = NULL; Evt* newScript; - debug_printf("CAM: %X", id); + // debug_printf("CAM: %X", id); if (!BattleCam_IsFrozen) { BattleCam_ClampPosX = TRUE; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_UseLinearInterp = FALSE; - BattleCam_SpecialOffsetX = 0; + BattleCam_ExtraOffsetX = 0; switch (id) { case BTL_CAM_RESET: @@ -1160,18 +1173,18 @@ void btl_cam_use_preset_impl(s32 id) { preset = &EVS_BattleCam_ViewEnemies_MaintainY; break; case BTL_CAM_PRESET_05: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_06: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_UNUSED_06: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_G; + preset = &EVS_BattleCam_UnkG_Skippable; break; case BTL_CAM_ACTOR_GOAL: BattleCam_BoomLength = 300; @@ -1179,8 +1192,8 @@ void btl_cam_use_preset_impl(s32 id) { preset = &EVS_BattleCam_FocusGoal; break; case BTL_CAM_PRESET_08: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusActor; @@ -1193,39 +1206,39 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 120; preset = &EVS_BattleCam_ResetNeutral; break; - case BTL_CAM_PRESET_10: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_0A: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 15; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_11: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_0B: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_12: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_UNUSED_0C: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 30; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_13: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_0D: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1233,9 +1246,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_14: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_0E: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1243,9 +1256,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_15: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_0F: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1253,7 +1266,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_16: + case BTL_CAM_PRESET_UNUSED_10: BattleCam_BoomLength = 267; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1261,7 +1274,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_17: + case BTL_CAM_PRESET_UNUSED_11: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1269,7 +1282,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_18: + case BTL_CAM_PRESET_UNUSED_12: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1277,21 +1290,21 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FocusGoal; break; - case BTL_CAM_PRESET_19: + case BTL_CAM_PRESET_13: BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_20: + case BTL_CAM_PRESET_UNUSED_14: BattleCam_BoomOffsetY = 0; BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FollowActorY; break; - case BTL_CAM_PRESET_21: + case BTL_CAM_PRESET_UNUSED_15: BattleCam_BoomOffsetY = 0; BattleCam_MoveTimeLeft = 20; preset = &EVS_BattleCam_FollowActorPos; break; - case BTL_CAM_PRESET_25: + case BTL_CAM_PLAYER_FLEE: BattleCam_SubjectActor = ACTOR_PLAYER; BattleCam_BoomLength = 266; BattleCam_BoomPitch = 8; @@ -1299,12 +1312,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomOffsetY = 40; btl_cam_set_target_pos(-80.0f, 0.0f, 0.0f); BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_24: + case BTL_CAM_PLAYER_DIES: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 250; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1316,15 +1329,15 @@ void btl_cam_use_preset_impl(s32 id) { break; case BTL_CAM_VICTORY: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_BoomLength = 255; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 29; btl_cam_set_target_pos(-95.0f, 18.0f, 10.0f); BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; case BTL_CAM_PLAYER_ENTRY: BattleCam_SubjectActor = ACTOR_PLAYER; @@ -1333,60 +1346,60 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 0; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; case BTL_CAM_PLAYER_ATTACK_APPROACH: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 310; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_27: + case BTL_CAM_PRESET_1B: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 0; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 5; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_28: + case BTL_CAM_PRESET_1C: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 340; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 0; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 5; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; case BTL_CAM_PLAYER_HIT_SPIKE: case BTL_CAM_PLAYER_HIT_HAZARD: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -32; - BattleCam_SpecialOffsetX = 20; + BattleCam_ExtraOffsetX = 20; BattleCam_MoveTimeLeft = 15; preset = &EVS_BattleCam_FocusActor; break; case BTL_CAM_PLAYER_CHARGE_UP: - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosX = -65.0f; BattleCam_PosY = 30.0f; BattleCam_PosZ = 0.0f; @@ -1395,12 +1408,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 10; BattleCam_MoveTimeLeft = 10; - preset = &EVS_BattleCam_SimpleLerp; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; case BTL_CAM_PLAYER_STATUS_AFFLICTED: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1409,22 +1422,22 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 30; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_34: + case BTL_CAM_PRESET_22: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 280; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -4; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_35: + case BTL_CAM_PRESET_23: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 380; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1432,24 +1445,24 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ClampPosX = FALSE; BattleCam_UseLinearInterp = TRUE; BattleCam_MoveTimeLeft = 60; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_37: + case BTL_CAM_PRESET_25: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -4; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_36: + case BTL_CAM_PRESET_UNUSED_24: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1457,46 +1470,46 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ClampPosX = FALSE; BattleCam_UseLinearInterp = TRUE; BattleCam_MoveTimeLeft = 60; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_38: + case BTL_CAM_PRESET_26: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -4; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_39: + case BTL_CAM_PRESET_27: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 0; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_40: + case BTL_CAM_PRESET_28: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 360; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -4; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_41: - case BTL_CAM_PRESET_42: + case BTL_CAM_PRESET_UNUSED_29: + case BTL_CAM_PRESET_UNUSED_2A: BattleCam_BoomLength = 200; BattleCam_MoveTimeTotal = 7; BattleCam_DoneMoving = FALSE; @@ -1506,32 +1519,32 @@ void btl_cam_use_preset_impl(s32 id) { break; case BTL_CAM_PLAYER_AIM_HAMMER: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_MINUS_2; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_SLIGHT; BattleCam_BoomLength = 214; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; case BTL_CAM_PLAYER_HAMMER_STRIKE: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 8; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_45: + case BTL_CAM_PRESET_UNUSED_2D: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; BattleCam_PosZ = 0.0f; @@ -1540,11 +1553,11 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_MoveTimeLeft = 10; - preset = &EVS_BattleCam_SimpleLerp; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_46: + case BTL_CAM_PRESET_2E: BattleCam_SubjectActor = ACTOR_PLAYER; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; BattleCam_PosZ = 0.0f; @@ -1553,9 +1566,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 27; BattleCam_MoveTimeLeft = 10; - preset = &EVS_BattleCam_SimpleLerp; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_70: + case BTL_CAM_PRESET_UNUSED_46: BattleCam_BoomLength = 390; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1563,9 +1576,9 @@ void btl_cam_use_preset_impl(s32 id) { btl_cam_set_target_pos(-70.0f, 0.0f, 0.0f); BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 10; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_71: + case BTL_CAM_PRESET_UNUSED_47: BattleCam_BoomLength = 500; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1573,10 +1586,10 @@ void btl_cam_use_preset_impl(s32 id) { btl_cam_set_target_pos(0.0f, 0.0f, 0.0f); BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 40; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_69: - case BTL_CAM_PRESET_72: + case BTL_CAM_PRESET_45: + case BTL_CAM_PRESET_UNUSED_48: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1584,11 +1597,11 @@ void btl_cam_use_preset_impl(s32 id) { btl_cam_set_target_pos(-50.0f, 0.0f, 0.0f); BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_J; + preset = &EVS_BattleCam_SimpleLerp_Skippable; break; - case BTL_CAM_PRESET_73: - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + case BTL_CAM_STAR_SPIRIT: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosX = -75.0f; BattleCam_PosY = 150.0f; BattleCam_PosZ = 0.0f; @@ -1597,24 +1610,24 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 17; BattleCam_MoveTimeLeft = 1; - preset = &EVS_BattleCam_SimpleLerp; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; case BTL_CAM_PARTNER_APPROACH: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 310; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_48: + case BTL_CAM_CLOSER_PARTNER_APPROACH: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 250; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1622,12 +1635,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ClampPosX = FALSE; BattleCam_UseLinearInterp = TRUE; BattleCam_MoveTimeLeft = 120; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_49: + case BTL_CAM_PRESET_UNUSED_31: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1637,41 +1650,41 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 120; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_50: + case BTL_CAM_PRESET_32: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 0; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 5; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_29: - case BTL_CAM_PRESET_51: + case BTL_CAM_PRESET_1D: + case BTL_CAM_PRESET_33: BattleCam_BoomLength = 500; BattleCam_BoomOffsetY = 0; BattleCam_MoveTimeLeft = 50; preset = &EVS_BattleCam_ViewEnemies; break; - case BTL_CAM_PRESET_52: + case BTL_CAM_PRESET_34: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 280; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -4; BattleCam_ClampPosX = FALSE; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_53: + case BTL_CAM_PRESET_35: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 380; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1679,12 +1692,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ClampPosX = FALSE; BattleCam_UseLinearInterp = TRUE; BattleCam_MoveTimeLeft = 60; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; case BTL_CAM_PARTNER_INJURED: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1693,9 +1706,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 30; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_55: - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + case BTL_CAM_PRESET_37: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosX = -95.0f; BattleCam_PosY = 22.0f; BattleCam_PosZ = 0.0f; @@ -1704,33 +1717,33 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 10; BattleCam_MoveTimeLeft = 20; - preset = &EVS_BattleCam_SimpleLerp; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_56: + case BTL_CAM_PRESET_UNUSED_38: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -4; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_57: + case BTL_CAM_PRESET_UNUSED_39: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 320; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 0; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_M; + preset = &EVS_BattleCam_UnkM_Skippable; break; - case BTL_CAM_PRESET_58: - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + case BTL_CAM_PRESET_UNUSED_3A: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_PosX = 25.0f; BattleCam_PosY = 60.0f; BattleCam_PosZ = 0.0f; @@ -1739,12 +1752,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 10; BattleCam_MoveTimeLeft = 30; - preset = &EVS_BattleCam_SimpleLerp; + preset = &EVS_BattleCam_SimpleLerp_Unskippable; break; - case BTL_CAM_PRESET_59: + case BTL_CAM_PRESET_3B: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1754,10 +1767,10 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 60; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_60: + case BTL_CAM_PRESET_UNUSED_3C: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_0; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_NONE; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; @@ -1765,73 +1778,73 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 8; preset = &EVS_BattleCam_FocusActor; break; - case BTL_CAM_PRESET_61: - case BTL_CAM_PRESET_62: + case BTL_CAM_PARTNER_HIT_SPIKE: + case BTL_CAM_PARTNER_HIT_HAZARD: BattleCam_SubjectActor = ACTOR_PARTNER; - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = -32; - BattleCam_SpecialOffsetX = 20; + BattleCam_ExtraOffsetX = 20; BattleCam_MoveTimeLeft = 15; preset = &EVS_BattleCam_FocusActor; break; case BTL_CAM_ENEMY_APPROACH: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 27; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_64: - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_UNUSED_40: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 358; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_MoveTimeLeft = 10; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; case BTL_CAM_DEFAULT_UNUSED: BattleCam_BoomLength = 500; BattleCam_MoveTimeLeft = 50; preset = &EVS_BattleCam_ResetNeutral; break; - case BTL_CAM_PRESET_66: - BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_42: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_NONE; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 267; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_67: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_UNUSED_43: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 214; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_BoomOffsetY = 16; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; - case BTL_CAM_PRESET_68: - BattleCam_ModeX = BTL_CAM_MODEX_1; - BattleCam_ModeY = BTL_CAM_MODEY_1; + case BTL_CAM_PRESET_UNUSED_44: + BattleCam_AdjustTargetXMode = BTL_CAM_XADJ_AVG; + BattleCam_AdjustTargetYMode = BTL_CAM_YADJ_AVG; BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; BattleCam_BoomOffsetY = 16; BattleCam_BoomYaw = 0; BattleCam_MoveTimeLeft = 4; - preset = &CamPreset_F; + preset = &EVS_BattleCam_UnkF_Skippable; break; } @@ -2198,15 +2211,15 @@ API_CALLABLE(AddBattleCamZoom) { return ApiStatus_DONE2; } -API_CALLABLE(func_8024ECF8) { +API_CALLABLE(SetBattleCamTargetingModes) { Bytecode* args = script->ptrReadPos; if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - BattleCam_ModeY = evt_get_variable(script, *args++); - BattleCam_ModeX = evt_get_variable(script, *args++); + BattleCam_AdjustTargetYMode = evt_get_variable(script, *args++); + BattleCam_AdjustTargetXMode = evt_get_variable(script, *args++); BattleCam_UseLinearInterp = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -2216,7 +2229,7 @@ API_CALLABLE(FreezeBattleCam) { return ApiStatus_DONE2; } -API_CALLABLE(func_8024EDA4) { +API_CALLABLE(DisableBattleCamClampX) { BattleCam_ClampPosX = FALSE; return ApiStatus_DONE2; } diff --git a/src/battle/common/actor/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index 238d3a9f73..e553a5ec1c 100644 --- a/src/battle/common/actor/albino_dino.inc.c +++ b/src/battle/common/actor/albino_dino.inc.c @@ -260,7 +260,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) ExecGetTID(N(EVS_AddWalkQuakeFX), LVar9) Thread Loop(3) diff --git a/src/battle/common/actor/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index 45ba68d1f8..3bf88bbe95 100644 --- a/src/battle/common/actor/amazy_dayzee.inc.c +++ b/src/battle/common/actor/amazy_dayzee.inc.c @@ -239,7 +239,7 @@ EvtScript N(EVS_Attack_Sing) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 70) Set(LFlag0, FALSE) Label(0) @@ -333,7 +333,7 @@ EvtScript N(EVS_Attack_Sing) = { EvtScript N(EVS_Move_Flee) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 30) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index 978630ec76..d680e521f1 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -252,7 +252,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -347,7 +347,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09) Wait(20) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 0e1141c097..9074c6eb4d 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -518,7 +518,7 @@ EvtScript N(EVS_TakeTurn) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index a16624f1db..b5e690acc7 100644 --- a/src/battle/common/actor/bob_omb.inc.c +++ b/src/battle/common/actor/bob_omb.inc.c @@ -514,7 +514,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) Call(SetGoalToTarget, ACTOR_SELF) @@ -577,7 +577,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Buildup) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(GetActorSize, ACTOR_SELF, LVar3, LVar4) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_SHOCK_HIT, LVar0, LVar1, LVar2, LVar4, LVar3, 0) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) Wait(20) ExecWait(N(EVS_Explode)) @@ -624,7 +624,7 @@ EvtScript N(EVS_Attack_Blast) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) diff --git a/src/battle/common/actor/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index d2794cd0ed..74386018d0 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -423,13 +423,13 @@ EvtScript N(EVS_Attack_ShellToss) = { IfEq(LVar0, PHASE_FIRST_STRIKE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim16) Goto(100) EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim10) Wait(10) Thread @@ -660,14 +660,14 @@ EvtScript N(EVS_Attack_SpikeBounce) = { IfEq(LVar0, PHASE_FIRST_STRIKE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim17) Wait(10) Goto(100) EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim11) Wait(10) Thread @@ -1005,7 +1005,7 @@ EvtScript N(EVS_TryGettingUp_Smooth) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim06) Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 20) Call(BattleCamTargetActor, ACTOR_SELF) @@ -1138,7 +1138,7 @@ EvtScript N(EVS_TryGettingUp_Spiky) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim07) Call(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 20) Call(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/common/actor/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index c6163bf8e1..4d7fec2b6e 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -246,13 +246,13 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Fire) Call(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) Wait(1) Call(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) Wait(15) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) + Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_13) Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) CaseOrEq(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 7430fcc42b..74d8b7a105 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -582,7 +582,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(HPBarToHome, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -608,7 +608,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { Call(SetBattleCamZoom, 430) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -739,7 +739,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0C) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim06) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 39cbcd16ea..f5256d0c1c 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -338,7 +338,7 @@ EvtScript N(EVS_Attack_Sting) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 52, 10, 0) @@ -478,7 +478,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_1, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_2, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(SetPartSounds, ACTOR_SELF, PRT_SWARM_3, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) diff --git a/src/battle/common/actor/cleft.inc.c b/src/battle/common/actor/cleft.inc.c index f5f7bb1dd7..d700af5337 100644 --- a/src/battle/common/actor/cleft.inc.c +++ b/src/battle/common/actor/cleft.inc.c @@ -448,7 +448,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Thread Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 532bf50c93..ecf666d3f7 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -215,7 +215,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/crazee_dayzee.inc.c b/src/battle/common/actor/crazee_dayzee.inc.c index 9abaf488db..ae2e570b41 100644 --- a/src/battle/common/actor/crazee_dayzee.inc.c +++ b/src/battle/common/actor/crazee_dayzee.inc.c @@ -232,7 +232,7 @@ EvtScript N(EVS_Attack_Sing) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 70) Set(LFlag0, FALSE) Label(0) @@ -326,7 +326,7 @@ EvtScript N(EVS_Attack_Sing) = { EvtScript N(EVS_Move_Flee) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 30) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index c866ea7aad..7731e15054 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -613,7 +613,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index f278c0ab32..4e5ec6d3a4 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -1171,7 +1171,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index bd0823d2cf..2ceda40731 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -270,7 +270,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim07) Wait(20) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) @@ -596,7 +596,7 @@ API_CALLABLE(N(AdjustFormationPriority)) { EvtScript N(EVS_CopyPartner) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Wait(15) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) diff --git a/src/battle/common/actor/duplighost/ghost_bow.inc.c b/src/battle/common/actor/duplighost/ghost_bow.inc.c index 1b7e12f8e6..a2ee47f41f 100644 --- a/src/battle/common/actor/duplighost/ghost_bow.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bow.inc.c @@ -253,10 +253,10 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) EndThread Wait(15) - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH_A) Set(LVar0, 55) Loop(20) diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index b84eb62f97..913a755338 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -276,7 +276,7 @@ EvtScript N(EVS_HeadbonkFollowthrough) = { EvtScript N(EVS_ApproachPlayer) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) diff --git a/src/battle/common/actor/duplighost/ghost_kooper.inc.c b/src/battle/common/actor/duplighost/ghost_kooper.inc.c index 944a0ecd5e..f5a7d1cdae 100644 --- a/src/battle/common/actor/duplighost/ghost_kooper.inc.c +++ b/src/battle/common/actor/duplighost/ghost_kooper.inc.c @@ -358,10 +358,10 @@ EvtScript N(EVS_TakeTurn) = { Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 75) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar0) Switch(LVar0) CaseEq(PARTNER_RANK_NORMAL) diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index 607bc95981..cbf3c978a2 100644 --- a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c +++ b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c @@ -237,7 +237,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) diff --git a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c index 7c24ea8b15..a4295b9990 100644 --- a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c +++ b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c @@ -236,7 +236,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 20, 0, 0) diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index 10714c2d19..80fa8b89a4 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -215,7 +215,7 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 70, 0, 0) @@ -236,7 +236,7 @@ EvtScript N(EVS_TakeTurn) = { Call(BattleCamTargetActor, ACTOR_SELF) Call(AddBattleCamZoom, -50) Call(MoveBattleCamOver, 30) - Call(func_8024ECF8, BTL_CAM_MODEY_1, BTL_CAM_MODEX_1, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_AVG, BTL_CAM_XADJ_AVG, TRUE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense1) Wait(15) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) diff --git a/src/battle/common/actor/duplighost/ghost_watt.inc.c b/src/battle/common/actor/duplighost/ghost_watt.inc.c index 938e924691..94012b100e 100644 --- a/src/battle/common/actor/duplighost/ghost_watt.inc.c +++ b/src/battle/common/actor/duplighost/ghost_watt.inc.c @@ -338,13 +338,13 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 40) Call(MoveBattleCamOver, 80) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Run) @@ -392,7 +392,7 @@ EvtScript N(EVS_TakeTurn) = { Set(LVarA, 40) Call(AddBattleCamZoom, -75) Call(MoveBattleCamOver, LVarA) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE) Call(GetStatusFlags, ACTOR_SELF, LVar0) IfFlag(LVar0, STATUS_FLAG_SHRINK) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index b90c279ff0..fad83525db 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -468,7 +468,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -593,7 +593,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorVar, ACTOR_SELF, AVAR_StayNearGound, LVarA) IfEq(LVarA, TRUE) @@ -677,7 +677,7 @@ EvtScript N(EVS_Attack_AirSweep) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) diff --git a/src/battle/common/actor/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c index 4a0c7009b6..fd2e77687d 100644 --- a/src/battle/common/actor/forest_fuzzy.inc.c +++ b/src/battle/common/actor/forest_fuzzy.inc.c @@ -247,7 +247,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_Move_Clone) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 330) @@ -310,7 +310,7 @@ EvtScript N(EVS_Attack_Leech) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/frost_piranha.inc.c b/src/battle/common/actor/frost_piranha.inc.c index d5b775379a..cb5efaa4a4 100644 --- a/src/battle/common/actor/frost_piranha.inc.c +++ b/src/battle/common/actor/frost_piranha.inc.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Attack_Bite) = { Div(LVar3, 2) Div(LVar4, 2) Div(LVar5, 2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar3, LVar4, LVar5) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 40) @@ -293,7 +293,7 @@ EvtScript N(EVS_Attack_Bite) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) @@ -407,7 +407,7 @@ EvtScript N(EVS_Attack_FrostBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim03) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index 5b38154890..c416ec1b2f 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -241,7 +241,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/gloomba.inc.c b/src/battle/common/actor/gloomba.inc.c index 772229672c..ac0bbfbc17 100644 --- a/src/battle/common/actor/gloomba.inc.c +++ b/src/battle/common/actor/gloomba.inc.c @@ -295,7 +295,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 1f167a946d..60c6440dc9 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -304,7 +304,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 05740df617..a43198d2a0 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -637,7 +637,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Gray_Anim02) @@ -741,7 +741,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -840,7 +840,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 7d840f8b45..0bb668961e 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -639,7 +639,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Green_Anim02) @@ -743,7 +743,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -842,7 +842,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index bdf5e50579..12aee53f23 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -265,7 +265,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim04) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -357,7 +357,7 @@ EvtScript N(EVS_Attack_SleepySpin) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim10) @@ -595,7 +595,7 @@ EvtScript N(EVS_TakeTurn) = { }; EvtScript N(EVS_RandomSummon) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_11) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0B) Call(BattleCamTargetActor, ACTOR_SELF) Call(RandInt, 2, LVar1) Switch(LVar1) diff --git a/src/battle/common/actor/gulpit.inc.c b/src/battle/common/actor/gulpit.inc.c index 29ef85dae6..b0af34f67f 100644 --- a/src/battle/common/actor/gulpit.inc.c +++ b/src/battle/common/actor/gulpit.inc.c @@ -264,7 +264,7 @@ EvtScript N(EVS_Attack_Lick) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -336,7 +336,7 @@ EvtScript N(EVS_Attack_SpitRock) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorPos, LVarA, LVar0, LVar1, LVar2) Add(LVar0, 20) Sub(LVar2, 1) diff --git a/src/battle/common/actor/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index c2c3c02e75..080a40eff1 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -268,7 +268,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 1) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -282,7 +282,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim04) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 27) @@ -290,7 +290,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 45) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 20) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/hyper_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index d867fd15d1..b577038d07 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -153,7 +153,7 @@ EvtScript N(EVS_Move_Charge) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) IfEq(LVar0, AVAL_State_Normal) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -188,7 +188,7 @@ EvtScript N(EVS_Move_Charge) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -746,7 +746,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Thread Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index bef0ef6869..eb5a9f36ad 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Move_Charge) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_IsCharged, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -179,7 +179,7 @@ EvtScript N(EVS_Move_Charge) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) Wait(1) @@ -577,7 +577,7 @@ EvtScript N(EVS_Attack_Headbonk) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index 5c24b1f9b0..c8d522f285 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -221,7 +221,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetActorVar, ACTOR_SELF, AVAR_IsCharged, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -247,7 +247,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 30) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -674,7 +674,7 @@ EvtScript N(EVS_Attack_SkyDive) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Hyper_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -686,10 +686,10 @@ EvtScript N(EVS_Attack_SkyDive) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -736,10 +736,10 @@ EvtScript N(EVS_Attack_SkyDive) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -914,7 +914,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_IsCharged, LVar0) IfEq(LVar0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(20) @@ -947,7 +947,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) Wait(1) @@ -1344,7 +1344,7 @@ EvtScript N(EVS_Attack_Headbonk) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c index 518eb93c4d..2f59243ba6 100644 --- a/src/battle/common/actor/jungle_fuzzy.inc.c +++ b/src/battle/common/actor/jungle_fuzzy.inc.c @@ -251,7 +251,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_Move_Divide) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 330) @@ -314,7 +314,7 @@ EvtScript N(EVS_Attack_Leech) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index dada91fd35..cc75552887 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -523,7 +523,7 @@ EvtScript N(EVS_TakeTurn) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) @@ -542,7 +542,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ShellExit) Wait(8) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index bcea97715d..f48e979f43 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -694,7 +694,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim07) Wait(10) @@ -710,7 +710,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim06) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) @@ -729,7 +729,7 @@ EvtScript N(EVS_Attack_ShellToss) = { Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf IfEq(LVarA, HIT_RESULT_LUCKY) Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -813,7 +813,7 @@ EvtScript N(EVS_Attack_ChargedToss) = { Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) IfEq(LVar0, AVAL_State_Normal) // charge for attack - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) @@ -852,7 +852,7 @@ EvtScript N(EVS_Attack_ChargedToss) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Loop(20) Call(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) Wait(1) @@ -1056,7 +1056,7 @@ Formation N(BackupFormation) = { EvtScript N(EVS_Move_SummonBackup) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) diff --git a/src/battle/common/actor/lakitu.inc.c b/src/battle/common/actor/lakitu.inc.c index ec9cbcb11a..965e493770 100644 --- a/src/battle/common/actor/lakitu.inc.c +++ b/src/battle/common/actor/lakitu.inc.c @@ -275,7 +275,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lakitu_Anim03) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -397,7 +397,7 @@ EvtScript N(EVS_Move_SummonSpiny) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(SummonEnemy, Ref(N(SpinyFormation)), FALSE) Call(CopyStatusEffects, ACTOR_SELF, LVar0) diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index 73311ec2ad..b348279282 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -366,7 +366,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -491,7 +491,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorVar, ACTOR_SELF, AVAR_CanTackle, LVarA) IfEq(LVarA, TRUE) @@ -575,7 +575,7 @@ EvtScript N(EVS_Attack_ShootPlayer) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim03) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 30, 0, 0) diff --git a/src/battle/common/actor/m_bush.inc.c b/src/battle/common/actor/m_bush.inc.c index cdeb40e7e4..72aa6f718f 100644 --- a/src/battle/common/actor/m_bush.inc.c +++ b/src/battle/common/actor/m_bush.inc.c @@ -226,7 +226,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MBush_Anim04) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index c9f5632340..b7b7987452 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -408,7 +408,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -818,7 +818,7 @@ EvtScript N(EVS_Move_HealOne) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -898,7 +898,7 @@ EvtScript N(EVS_Move_HealAll) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1453,7 +1453,7 @@ EvtScript N(EVS_Move_MakeClone) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(UseIdleAnimation, LVarA, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 25) Wait(25) @@ -1569,7 +1569,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1682,7 +1682,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1795,7 +1795,7 @@ EvtScript N(EVS_Move_TryElectrify) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1913,7 +1913,7 @@ EvtScript N(EVS_Move_TryTransparent) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index e4de653337..0943aa5f71 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -259,7 +259,7 @@ EvtScript N(EVS_Attack_Swoop) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Thread SetF(LVar0, Float(0.0)) Loop(15) diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index 471d0dc068..3d2165f107 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -388,7 +388,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -400,10 +400,10 @@ EvtScript N(EVS_Flying_TakeTurn) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -450,10 +450,10 @@ EvtScript N(EVS_Flying_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -771,7 +771,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index b9fe98b5ca..e643ad33e2 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -385,7 +385,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetGoalToTarget, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) @@ -397,10 +397,10 @@ EvtScript N(EVS_TakeTurn) = { CaseOrEq(HIT_RESULT_LUCKY) Set(LVarA, LVar0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) @@ -447,10 +447,10 @@ EvtScript N(EVS_TakeTurn) = { EndCaseGroup CaseDefault Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_66) + Call(UseBattleCamPreset, BTL_CAM_PRESET_42) Call(SetBattleCamZoom, 300) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) Call(SetActorSpeed, ACTOR_SELF, Float(5.0)) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 6af5304f08..6eeb7d85f5 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -1080,7 +1080,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) Call(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ShellSpin) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) @@ -1099,7 +1099,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ShellExit) Wait(8) diff --git a/src/battle/common/actor/piranha_plant.inc.c b/src/battle/common/actor/piranha_plant.inc.c index b85eb875f1..f26a47b387 100644 --- a/src/battle/common/actor/piranha_plant.inc.c +++ b/src/battle/common/actor/piranha_plant.inc.c @@ -271,7 +271,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 1) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -285,7 +285,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SmallPiranha_Anim04) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) Wait(8) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) Add(LVar0, 20) @@ -293,7 +293,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetBattleCamTarget, LVar0, LVar1, LVar2) Call(SetBattleCamZoom, 350) Call(SetBattleCamOffsetZ, 45) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(MoveBattleCamOver, 20) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 7b27ca6f96..d98a100a82 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -496,7 +496,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetGoalToTarget, ACTOR_SELF) Call(GetActorVar, ACTOR_SELF, AVAR_PartsThrown, LVar0) Switch(LVar0) @@ -918,7 +918,7 @@ EvtScript N(EVS_SummonBackup) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle4) @@ -1043,7 +1043,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/pokey_mummy.inc.c b/src/battle/common/actor/pokey_mummy.inc.c index ff61c5c352..67bb178363 100644 --- a/src/battle/common/actor/pokey_mummy.inc.c +++ b/src/battle/common/actor/pokey_mummy.inc.c @@ -624,7 +624,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { Call(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_SELF) Call(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 4ba76fd23d..3b0c493e3c 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -273,7 +273,7 @@ EvtScript N(EVS_Attack_Bite) = { Div(LVar3, 2) Div(LVar4, 2) Div(LVar5, 2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, LVar3, LVar4, LVar5) Call(SetBattleCamZoom, 300) Call(SetBattleCamOffsetZ, 40) @@ -286,7 +286,7 @@ EvtScript N(EVS_Attack_Bite) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) @@ -401,7 +401,7 @@ EvtScript N(EVS_Attack_BadBreath) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim03) diff --git a/src/battle/common/actor/pyro_guy.inc.c b/src/battle/common/actor/pyro_guy.inc.c index a846fa957f..935b179b28 100644 --- a/src/battle/common/actor/pyro_guy.inc.c +++ b/src/battle/common/actor/pyro_guy.inc.c @@ -246,7 +246,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PyroGuy_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 4955654228..162c3eb060 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -638,7 +638,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Red_Anim02) @@ -742,7 +742,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -841,7 +841,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/ruff_puff.inc.c b/src/battle/common/actor/ruff_puff.inc.c index 060e508c0d..5eb0217895 100644 --- a/src/battle/common/actor/ruff_puff.inc.c +++ b/src/battle/common/actor/ruff_puff.inc.c @@ -242,7 +242,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_RuffPuff_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/shy_guy_base.inc.c b/src/battle/common/actor/shy_guy_base.inc.c index 35e9341dd1..38b83c756d 100644 --- a/src/battle/common/actor/shy_guy_base.inc.c +++ b/src/battle/common/actor/shy_guy_base.inc.c @@ -239,7 +239,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SHYGUY_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -334,7 +334,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SHYGUY_Anim09) Wait(20) diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index 37eeee9355..830eb96a3b 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -768,7 +768,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ShyGuy_Red_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -863,7 +863,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ShyGuy_Red_Anim09) Wait(20) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index b8b3e214ab..cddd2a5793 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -342,7 +342,7 @@ EvtScript N(EVS_Idle) = { #if !VERSION_PAL Call(FreezeBattleState, TRUE) #endif - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 0, 100, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 340) diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index 38513d30b4..6a063f42fa 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -538,7 +538,7 @@ EvtScript N(EVS_Attack_SpearStab) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim06) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -611,7 +611,7 @@ EvtScript N(EVS_Attack_SpearStab) = { EvtScript N(EVS_Move_SummonBackup) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1266,7 +1266,7 @@ EvtScript N(EVS_Attack_Tackle) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_SHY_GUY, ANIM_ShyGuy_Red_Anim03) Call(SetActorSpeed, ACTOR_SELF, Float(4.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -1361,7 +1361,7 @@ EvtScript N(EVS_Attack_Vault) = { Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) Call(SetAnimation, ACTOR_SELF, PRT_SHY_GUY, ANIM_ShyGuy_Red_Anim09) Wait(20) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index ba44bc0096..0874ce7724 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -583,7 +583,7 @@ EvtScript N(EVS_Ceiling_TakeTurn) = { Call(HPBarToHome, ACTOR_SELF) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) @@ -609,7 +609,7 @@ EvtScript N(EVS_Ceiling_TakeTurn) = { Call(SetBattleCamZoom, 430) Call(SetBattleCamOffsetZ, 20) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) EndIf Call(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) Switch(LVar0) @@ -741,7 +741,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0B) Wait(10) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0F) diff --git a/src/battle/common/actor/spiked_gloomba.inc.c b/src/battle/common/actor/spiked_gloomba.inc.c index 9c168caef3..316cd1195a 100644 --- a/src/battle/common/actor/spiked_gloomba.inc.c +++ b/src/battle/common/actor/spiked_gloomba.inc.c @@ -311,7 +311,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Dark_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 95fa6152cc..17c7c99e4b 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -313,7 +313,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Run) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 0, 0) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 55357d2e2a..fc2c86e009 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -409,7 +409,7 @@ EvtScript N(EVS_TakeTurn) = { EndIf Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(GetActorVar, ACTOR_SELF, AVAR_Toppled, LVar0) IfEq(LVar0, 0) diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index 5d76537591..7b4c014455 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -481,7 +481,7 @@ EvtScript N(EVS_Attack_Mallet) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim07) Call(SetActorSpeed, ACTOR_SELF, Float(6.0)) Call(SetGoalToTarget, ACTOR_SELF) @@ -499,7 +499,7 @@ EvtScript N(EVS_Attack_Mallet) = { Call(RunToGoal, ACTOR_SELF, 0, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim03) Wait(10) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Thread Wait(4) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MALLET_SWING) diff --git a/src/battle/common/actor/stone_chomp.inc.c b/src/battle/common/actor/stone_chomp.inc.c index c0cefc0d70..28c3093bc0 100644 --- a/src/battle/common/actor/stone_chomp.inc.c +++ b/src/battle/common/actor/stone_chomp.inc.c @@ -648,7 +648,7 @@ EvtScript N(EVS_TakeTurn) = { Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetActorJumpGravity, ACTOR_SELF, Float(0.5)) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) Set(LVar1, 0) diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index da1c518eee..2559f9d6ad 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -445,7 +445,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Anim02) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -535,7 +535,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Anim02) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index 947a006b35..511f8d5e2d 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -451,7 +451,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { Else Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) Call(SetGoalToTarget, ACTOR_SELF) Call(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -908,7 +908,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) Call(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) Call(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index dc491dccac..b1e624cbd8 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -218,7 +218,7 @@ EvtScript N(EVS_TakeTurn) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(GetBattlePhase, LVar0) IfEq(LVar0, PHASE_FIRST_STRIKE) Call(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 9599d0e940..d57c38d25e 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -670,7 +670,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_White_Anim02) @@ -774,7 +774,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -985,7 +985,7 @@ EvtScript N(EVS_Move_HealOne) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -1071,7 +1071,7 @@ EvtScript N(EVS_Move_HealAll) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 54c240f94c..2779b3ea67 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -637,7 +637,7 @@ EvtScript N(EVS_Attack_WandStrike) = { Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) Call(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) Call(BattleCamTargetActor, ACTOR_SELF) - Call(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_TARGET, BTL_CAM_XADJ_AVG, FALSE) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) Thread Call(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Yellow_Anim02) @@ -741,7 +741,7 @@ EvtScript N(EVS_Flee) = { Call(HideHealthBar, ACTOR_SELF) Call(GetLastEvent, ACTOR_SELF, LVar0) IfNe(LVar0, EVENT_SCARE_AWAY) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) @@ -842,7 +842,7 @@ EvtScript N(EVS_TakeTurn) = { Call(UseIdleAnimation, ACTOR_SELF, FALSE) Call(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) Call(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 15) Wait(15) diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index 798d5d3026..ff333a38d7 100644 --- a/src/battle/common/move/HammerSupport.inc.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -199,7 +199,7 @@ EvtScript N(EVS_Hammer_ReturnHome_B) = { EvtScript N(EVS_Hammer_ReturnHome_C) = { Call(PlayerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_29) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1D) Call(func_802693F0) Wait(20) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index 9931389198..439fe1fe24 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -187,7 +187,7 @@ EvtScript N(EVS_JumpSupport_F) = { EvtScript N(EVS_JumpSupport_G) = { Call(PlayerYieldTurn) Call(SetBattleFlagBits, BS_FLAGS1_EXECUTING_MOVE, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_29) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1D) Call(func_802693F0) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Sub(LVar0, 40) @@ -312,7 +312,7 @@ EvtScript N(EVS_JumpSupport_InitCommand) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -330,7 +330,7 @@ EvtScript N(EVS_JumpSupport_L) = { Add(LVarB, 14) Add(LVarB, -3) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_37) + Call(UseBattleCamPreset, BTL_CAM_PRESET_25) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(func_802752AC, LVarA, 0) @@ -356,7 +356,7 @@ EvtScript N(EVS_JumpSupport_M) = { Sub(LVarB, 4) Add(LVarB, -3) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_38) + Call(UseBattleCamPreset, BTL_CAM_PRESET_26) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioW2_Carried, ANIM_MarioB1_Stomp) Call(func_80275F00, LVarA, 0) @@ -373,7 +373,7 @@ EvtScript N(EVS_JumpSupport_M) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) Call(action_command_jump_start, 13, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_39) + Call(UseBattleCamPreset, BTL_CAM_PRESET_27) Call(func_80275F00, 15, 2) Goto(10) Else diff --git a/src/battle/common/move/StarPowerSupport.inc.c b/src/battle/common/move/StarPowerSupport.inc.c index 2912ab356a..79bc576d2a 100644 --- a/src/battle/common/move/StarPowerSupport.inc.c +++ b/src/battle/common/move/StarPowerSupport.inc.c @@ -89,7 +89,7 @@ API_CALLABLE(N(SetStarSpiritSize)) { EvtScript N(EVS_StarPower_WishForSpirit) = { Call(GetOwnerID, LVarA) IfEq(LVarA, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -112,7 +112,7 @@ EvtScript N(EVS_StarPower_WishForSpirit) = { Wait(30) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_WALK) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -144,7 +144,7 @@ EvtScript N(EVS_StarPower_WishForSpirit) = { EvtScript N(EVS_StarPower_WishForBeam) = { Call(GetOwnerID, LVarA) IfEq(LVarA, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -167,7 +167,7 @@ EvtScript N(EVS_StarPower_WishForBeam) = { Wait(30) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_WALK) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -199,7 +199,7 @@ EvtScript N(EVS_StarPower_WishForBeam) = { EvtScript N(EVS_StarPower_SpiritSummoned) = { Wait(8) Call(SetForegroundModelsVisible, FALSE) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) + Call(UseBattleCamPresetImmediately, BTL_CAM_STAR_SPIRIT) Call(MoveBattleCamOver, 1) Call(PlaySound, SOUND_STAR_SPIRIT_APPEAR_A) Call(CreateNpc, NPC_BTL_SPIRIT, LVar0) @@ -220,7 +220,7 @@ EvtScript N(EVS_StarPower_SpiritSummoned) = { Call(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) Thread Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) EndThread Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 50) diff --git a/src/battle/common/move/UseItem.inc.c b/src/battle/common/move/UseItem.inc.c index 8516eb746d..1c677ad5ee 100644 --- a/src/battle/common/move/UseItem.inc.c +++ b/src/battle/common/move/UseItem.inc.c @@ -4,7 +4,7 @@ /// Provide arg `TRUE` on `LVar1` to disable refunding. EvtScript N(UseItemWithEffect) = { IfEq(LVar1, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) @@ -45,7 +45,7 @@ EvtScript N(UseItemWithEffect) = { }; EvtScript N(UseItem) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -85, 1, 0) Call(SetBattleCamOffsetZ, 41) Call(SetBattleCamZoom, 248) diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c index bd90792c08..51c628e51a 100644 --- a/src/battle/move/hammer/mega_quake.c +++ b/src/battle/move/hammer/mega_quake.c @@ -143,7 +143,7 @@ EvtScript N(EVS_802A3238) = { EndSwitch Call(GetPlayerActionSuccess, LVar0) IfGt(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(MoveBattleCamOver, 5) Wait(15) SetF(LVar6, Float(0.0)) @@ -158,7 +158,7 @@ EvtScript N(EVS_802A3238) = { EndLoop Wait(10) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(MoveBattleCamOver, 50) EndIf Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c index 9fd5b6de44..e80e13053c 100644 --- a/src/battle/move/hammer/power_quake.c +++ b/src/battle/move/hammer/power_quake.c @@ -104,10 +104,10 @@ EvtScript N(EVS_802A3168) = { EndSwitch Call(GetPlayerActionSuccess, LVar0) IfGt(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(MoveBattleCamOver, 5) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(MoveBattleCamOver, 50) EndIf Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c index 7753559f7e..cbbd14cbe3 100644 --- a/src/battle/move/hammer/quake_hammer.c +++ b/src/battle/move/hammer/quake_hammer.c @@ -89,10 +89,10 @@ EvtScript N(EVS_802A3168) = { EndSwitch Call(GetPlayerActionSuccess, LVar0) IfGt(LVar0, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(MoveBattleCamOver, 5) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(MoveBattleCamOver, 50) EndIf Call(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c index 07d4186a44..20ce953203 100644 --- a/src/battle/move/hammer/spin_smash.c +++ b/src/battle/move/hammer/spin_smash.c @@ -134,7 +134,7 @@ EvtScript N(EVS_UseMove1_Impl) = { Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Swing) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(StartRumble, BTL_RUMBLE_PLAYER_MIN) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_1) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) @@ -256,7 +256,7 @@ EvtScript N(EVS_UseMove2_Impl) = { Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Swing) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(StartRumble, BTL_RUMBLE_PLAYER_LIGHT) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_2) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) @@ -376,7 +376,7 @@ EvtScript N(EVS_UseMove3_Impl) = { Wait(3) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Swing) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_46) + Call(UseBattleCamPreset, BTL_CAM_PRESET_2E) Call(StartRumble, BTL_RUMBLE_PLAYER_HEAVY) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_3) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index c0ddc464fd..b1a5720a0b 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -57,11 +57,11 @@ EvtScript N(EVS_UseItem) = { Wait(5) Call(AddBattleCamZoom, -250) Call(MoveBattleCamOver, 80) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Wait(80) Call(AddBattleCamZoom, 250) Call(MoveBattleCamOver, 3) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) EndThread Call(N(AnimateDizzyDialCameraFX)) Thread @@ -75,7 +75,7 @@ EvtScript N(EVS_UseItem) = { Wait(10) Call(UseBattleCamPreset, BTL_CAM_PRESET_03) Call(MoveBattleCamOver, 10) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, FALSE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, FALSE) EndThread Call(InitTargetIterator) Label(0) diff --git a/src/battle/move/item/food.c b/src/battle/move/item/food.c index 90eefcdd06..17286d3488 100644 --- a/src/battle/move/item/food.c +++ b/src/battle/move/item/food.c @@ -186,7 +186,7 @@ EvtScript N(EVS_UseItem) = { #define LV_IsDrink LVarD #define LV_NoRefund LVarE #define LV_IsHarmful LVarF - + Set(LV_NoRefund, LVar1) Call(GetMenuSelection, LVar0, LVar1, LVar2) Set(LV_ItemID, LVar1) diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index a1664be98a..915c702642 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -53,7 +53,7 @@ EvtScript N(EVS_UseItem) = { Call(N(func_802A123C_72619C)) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Add(LVar1, 20) - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HUSTLE_WHISTLE) diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index 147fea0783..37fb7ca8d9 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -290,7 +290,7 @@ EntityModelScript N(modelCommandList3) = { EvtScript N(EVS_UseItem) = { SetConst(LVarA, ITEM_SLEEPY_SHEEP) ExecWait(N(UseItemWithEffect)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -67, -15, -5) Call(SetBattleCamOffsetZ, 45) Call(SetBattleCamZoom, 169) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index abb20d7149..297e5ab041 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -94,10 +94,10 @@ EvtScript N(EVS_UseMove_Normal) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -146,10 +146,10 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -201,10 +201,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -252,7 +252,7 @@ EvtScript N(EVS_FirstStrike_Normal) = { Call(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) + Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) @@ -281,14 +281,14 @@ EvtScript N(EVS_FirstStrike_Super) = { Call(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) Call(SetGoalToTarget, ACTOR_PLAYER) ExecWait(N(EVS_JumpSupport_C)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_37) + Call(UseBattleCamPreset, BTL_CAM_PRESET_25) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(func_802752AC, LVarA, 0) Wait(7) Call(func_802752AC, 3, 1) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) + Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_22) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) ExecWait(N(EVS_JumpSupport_E)) @@ -304,7 +304,7 @@ EvtScript N(EVS_FirstStrike_Ultra) = { Call(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) Call(SetGoalToTarget, ACTOR_PLAYER) ExecWait(N(EVS_JumpSupport_D)) - Call(UseBattleCamPreset, BTL_CAM_PRESET_38) + Call(UseBattleCamPreset, BTL_CAM_PRESET_26) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp) Call(func_80275F00, LVarA, 0) @@ -364,10 +364,10 @@ EvtScript N(EVS_UseBerserker_Normal) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -416,10 +416,10 @@ EvtScript N(EVS_UseBerserker_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -473,10 +473,10 @@ EvtScript N(EVS_UseBerserker_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -503,7 +503,7 @@ EvtScript N(EVS_UseMove_Tutorial) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(AddGoalPos, ACTOR_PLAYER, -5, 10, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) @@ -548,10 +548,10 @@ EvtScript N(EVS_UseMove_Tutorial) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index 44990e6f69..9a0c3d8ed0 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -67,10 +67,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -119,10 +119,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -174,10 +174,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 7044c3007e..c76e0a5362 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -77,7 +77,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Add(LVarF, 1) Set(LFlag0, FALSE) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PRESET_28) Call(GetTargetListLength, LVar0) Sub(LVar0, 1) IfEq(LVarF, LVar0) @@ -231,7 +231,7 @@ EvtScript N(EVS_UseMove_ImplB) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PRESET_28) Call(action_command_jump_start, 37, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) @@ -378,7 +378,7 @@ EvtScript N(EVS_UseMove_ImplC) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PRESET_28) Call(action_command_jump_start, 25, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index beadf330b4..53ade1af4d 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -76,10 +76,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -134,10 +134,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -195,10 +195,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 40487e88bd..d77e5fd047 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -67,7 +67,7 @@ EvtScript N(EVS_UseMove_ImplA) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -97,10 +97,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarE) Set(LVarD, 0) @@ -108,10 +108,10 @@ EvtScript N(EVS_UseMove_ImplA) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -203,7 +203,7 @@ EvtScript N(EVS_UseMove_ImplB) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -238,10 +238,10 @@ EvtScript N(EVS_UseMove_ImplB) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -339,7 +339,7 @@ EvtScript N(EVS_UseMove_ImplC) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -374,10 +374,10 @@ EvtScript N(EVS_UseMove_ImplC) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index 0bbd17190d..1aef2d4cb0 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -54,10 +54,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -106,10 +106,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -161,10 +161,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index 93bb0d6b28..3bc37e9e0d 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -64,7 +64,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Set(LVarB, LVarA) Add(LVarB, 2) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -121,20 +121,20 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarE) Set(LVarF, 0) Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -284,7 +284,7 @@ EvtScript N(EVS_UseMove_ImplB) = { Set(LVarB, LVarA) Add(LVarB, 2) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -341,20 +341,20 @@ EvtScript N(EVS_UseMove_ImplB) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarE) Set(LVarF, 0) Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -510,7 +510,7 @@ EvtScript N(EVS_UseMove_ImplC) = { Set(LVarB, LVarA) Add(LVarB, 2) Call(action_command_jump_start, LVarB, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -567,20 +567,20 @@ EvtScript N(EVS_UseMove_ImplC) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarE) Set(LVarF, 0) Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 97f8681a0a..ec19cb6a70 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -38,7 +38,7 @@ EvtScript N(EVS_UseMove_Basic) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -90,7 +90,7 @@ EvtScript N(EVS_UseMove_Basic) = { Add(LVarF, 1) Set(LFlag0, FALSE) Label(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PRESET_28) Call(GetTargetListLength, LVar0) Sub(LVar0, 1) IfEq(LVarF, LVar0) @@ -189,7 +189,7 @@ EvtScript N(EVS_UseMove_Super) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -253,7 +253,7 @@ EvtScript N(EVS_UseMove_Super) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PRESET_28) Call(action_command_jump_start, 37, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) @@ -345,7 +345,7 @@ EvtScript N(EVS_UseMove_Ultra) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -409,7 +409,7 @@ EvtScript N(EVS_UseMove_Ultra) = { IfEq(LFlag0, TRUE) Call(ShowActionHud, FALSE) EndIf - Call(UseBattleCamPreset, BTL_CAM_PRESET_40) + Call(UseBattleCamPreset, BTL_CAM_PRESET_28) Call(action_command_jump_start, 25, 3) Call(ChooseNextTarget, ITER_NEXT, LVar0) Call(SetGoalToTarget, ACTOR_PLAYER) diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index 4836b11a51..ad25a0e241 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -86,7 +86,7 @@ EvtScript N(EVS_UseMove_ImplA) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -116,10 +116,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarE) Call(N(IncrementHitCounter)) @@ -128,10 +128,10 @@ EvtScript N(EVS_UseMove_ImplA) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -228,7 +228,7 @@ EvtScript N(EVS_UseMove_ImplB) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -264,10 +264,10 @@ EvtScript N(EVS_UseMove_ImplB) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) @@ -370,7 +370,7 @@ EvtScript N(EVS_UseMove_ImplC) = { ExecWait(N(EVS_JumpSupport_Approach)) ExecWait(N(EVS_JumpSupport_B)) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_34) + Call(UseBattleCamPreset, BTL_CAM_PRESET_22) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) Call(func_80274A18, LVarA, 0) @@ -406,10 +406,10 @@ EvtScript N(EVS_UseMove_ImplC) = { Set(LFlag0, FALSE) Label(10) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(DifficultyTable))) diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index df6de406b3..0a70759a74 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -54,10 +54,10 @@ EvtScript N(EVS_UseMove_Basic) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -106,10 +106,10 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -161,10 +161,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index abe4772eec..af8e64bc5b 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -54,10 +54,10 @@ EvtScript N(EVS_UseMove_Basic) = { EndCaseGroup EndSwitch ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -106,10 +106,10 @@ EvtScript N(EVS_UseMove_Super) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_27) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1B) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -161,10 +161,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EndSwitch Call(GetActionResult, LVarF) ChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_28) + Call(UseBattleCamPreset, BTL_CAM_PRESET_1C) Wait(5) Call(SetGoalToTarget, ACTOR_PLAYER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_35) + Call(UseBattleCamPreset, BTL_CAM_PRESET_23) EndChildThread Call(CloseActionCommandInfo) Call(LoadActionCommand, ACTION_COMMAND_JUMP) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index 12e9dcf985..bb798d4a23 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -23,7 +23,7 @@ API_CALLABLE(N(IncreaseTwinkDefense)) { } EvtScript N(EVS_UsePower) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Run) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -43,7 +43,7 @@ EvtScript N(EVS_UsePower) = { Call(SetActorYaw, ACTOR_PLAYER, 150) Wait(1) Call(SetActorYaw, ACTOR_PLAYER, 180) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -105, -7, 0) Call(SetBattleCamZoom, 213) Call(MoveBattleCamOver, 60) diff --git a/src/battle/move/star_power/peach_focus_alt.c b/src/battle/move/star_power/peach_focus_alt.c index 391e81def3..64df3550cf 100644 --- a/src/battle/move/star_power/peach_focus_alt.c +++ b/src/battle/move/star_power/peach_focus_alt.c @@ -27,7 +27,7 @@ API_CALLABLE(N(RestoreStarPower)) { } EvtScript N(EVS_UsePower) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_SpreadArms) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index eb2601b1ab..6fbd3351eb 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -433,7 +433,7 @@ EvtScript N(EVS_HandleEvent) = { CaseEq(EVENT_BURN_CONTACT) Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_61) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_SPIKE) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) Add(LVar1, 40) @@ -505,7 +505,7 @@ EvtScript N(EVS_HandleEvent) = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -735,7 +735,7 @@ EvtScript N(returnHome2) = { EvtScript N(EVS_ReturnHome) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Backfire2) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 40) @@ -809,7 +809,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(action_command_body_slam_init) Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_48) + Call(UseBattleCamPreset, BTL_CAM_CLOSER_PARTNER_APPROACH) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PARTNER) Call(AddGoalPos, ACTOR_PARTNER, -40, 0, 0) @@ -943,7 +943,7 @@ EvtScript N(EVS_Attack_BodySlam) = { Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) Call(RunToGoal, ACTOR_PARTNER, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Thread Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 15, 0) Set(LVar0, 0) @@ -1044,7 +1044,7 @@ EvtScript N(EVS_Attack_Bomb) = { Call(SetupMashMeter, 5, 35, 60, 80, 99, 100) EndSwitch Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_48) + Call(UseBattleCamPreset, BTL_CAM_CLOSER_PARTNER_APPROACH) Call(GetMenuSelection, LVar0, LVar1, LVar2) Switch(LVar2) CaseEq(MOVE_BOMB) @@ -1299,7 +1299,7 @@ EvtScript N(EVS_Attack_Bomb) = { Call(UseBattleCamPreset, BTL_CAM_PRESET_04) Call(MoveBattleCamOver, 10) Else - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndIf Set(LVar0, 0) Switch(LVar0) @@ -1349,7 +1349,7 @@ EvtScript N(EVS_Attack_FirstStrike) = { Set(LVar1, 0) Call(SetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LRAW_BOMBETTE_FUSE) - Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_11) + Call(UseBattleCamPresetImmediately, BTL_CAM_PRESET_0B) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 1) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_AboutToExplode) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index ff1da6031a..663f00f421 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -428,7 +428,7 @@ EvtScript N(returnHome2) = { EvtScript N(EVS_ReturnHome) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) Thread Set(LVar0, 200) @@ -502,12 +502,12 @@ EvtScript N(smack) = { Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamZoom, 180) Call(MoveBattleCamOver, 30) Call(SetBattleCamOffsetZ, 9) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) Wait(15) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) Set(LVar0, 55) @@ -655,7 +655,7 @@ EvtScript N(smack) = { EvtScript N(outtaSight) = { Call(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_NO_INACTIVE_ANIM, TRUE) Call(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_USING_IDLE_ANIM, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -129, 28, 0) Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamZoom, 260) @@ -758,12 +758,12 @@ EvtScript N(spook) = { Call(SetActionHudPrepareTime, 20) Wait(10) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_15) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0F) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamOffsetZ, 4) Call(AddBattleCamZoom, -150) Call(MoveBattleCamOver, 20) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) EndThread Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar0, 40) @@ -806,56 +806,56 @@ EvtScript N(spook) = { IfEq(LVar2, 7) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 8) EndIf CaseGt(70) IfEq(LVar2, 6) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 7) EndIf CaseGt(60) IfEq(LVar2, 5) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 6) EndIf CaseGt(50) IfEq(LVar2, 4) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 5) EndIf CaseGt(40) IfEq(LVar2, 3) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 4) EndIf CaseGt(30) IfEq(LVar2, 2) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 3) EndIf CaseGt(20) IfEq(LVar2, 1) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 2) EndIf CaseGt(10) IfEq(LVar2, 0) Call(AddBattleCamZoom, -20) Call(MoveBattleCamOver, 20) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Set(LVar2, 1) EndIf EndSwitch @@ -952,7 +952,7 @@ EvtScript N(spook) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch Wait(30) Thread @@ -1013,12 +1013,12 @@ EvtScript N(fanSmack) = { Call(AddGoalPos, ACTOR_PARTNER, -25, -10, 0) Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) EndThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamZoom, 180) Call(MoveBattleCamOver, 30) Call(SetBattleCamOffsetZ, 9) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) Wait(15) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) Set(LVar0, 55) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 8b52ea07af..bc9d89a353 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -736,7 +736,7 @@ EvtScript N(EVS_HandlePhase) = { CaseEq(PHASE_PLAYER_BEGIN) IfFalse(GF_Tutorial_SwapTurnOrder) Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 20) Wait(10) @@ -775,7 +775,7 @@ EvtScript N(EVS_HandlePhase) = { EvtScript N(EVS_ReturnHome) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) Thread Wait(4) @@ -939,9 +939,9 @@ EvtScript N(EVS_Attack_Headbonk1) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -991,10 +991,10 @@ EvtScript N(EVS_Attack_Headbonk1) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_PRESET_32) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_PRESET_35) EndThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -1044,9 +1044,9 @@ EvtScript N(EVS_Attack_Headbonk2) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1096,10 +1096,10 @@ EvtScript N(EVS_Attack_Headbonk2) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_PRESET_32) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_PRESET_35) EndThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -1151,9 +1151,9 @@ EvtScript N(EVS_Attack_Headbonk3) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(action_command_jump_start, LVarA, 3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1203,10 +1203,10 @@ EvtScript N(EVS_Attack_Headbonk3) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_PRESET_32) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_PRESET_35) EndThread Call(GetActionResult, LVarF) Call(CloseActionCommandInfo) @@ -1271,9 +1271,9 @@ EvtScript N(EVS_Move_Multibonk) = { Wait(5) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) Wait(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(action_command_jump_start, LVarA, 1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1323,10 +1323,10 @@ EvtScript N(EVS_Move_Multibonk) = { EndCaseGroup EndSwitch Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_PRESET_32) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_PRESET_35) EndThread Call(GetActionResult, LVarF) Set(LVarD, 0) @@ -1334,10 +1334,10 @@ EvtScript N(EVS_Move_Multibonk) = { Set(LFlag0, FALSE) Label(10) Thread - Call(UseBattleCamPreset, BTL_CAM_PRESET_50) + Call(UseBattleCamPreset, BTL_CAM_PRESET_32) Wait(5) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_53) + Call(UseBattleCamPreset, BTL_CAM_PRESET_35) EndThread Call(CloseActionCommandInfo) Call(SetActionDifficultyTable, Ref(N(actionCommandTable))) @@ -1481,7 +1481,7 @@ EvtScript N(EVS_Move_Tattle) = { }; EvtScript N(EVS_Move_Charge) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_55) + Call(UseBattleCamPreset, BTL_CAM_PRESET_37) Wait(10) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_PreHeadbonk) Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index aba4d6b805..3fc8958290 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -500,7 +500,7 @@ EvtScript N(returnHomeOnMiss) = { EvtScript N(EVS_ReturnHome) = { Call(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(PartnerYieldTurn) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 30) @@ -571,7 +571,7 @@ EvtScript N(shellToss) = { Call(SetActionQuality, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PRESET_3B) Set(LVar9, 0) Set(LVar1, 0) Loop(50 * DT) @@ -736,7 +736,7 @@ EvtScript N(powerShell) = { BreakLoop EndIf EndLoop - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PRESET_3B) Call(action_command_hammer_start, 0, 47, 3) Call(SetActionQuality, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) @@ -838,7 +838,7 @@ EvtScript N(powerShell) = { CaseGt(0) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch EndIf Set(LFlag0, TRUE) @@ -861,7 +861,7 @@ EvtScript N(powerShell) = { CaseGt(0) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch EndIf Label(11) @@ -897,7 +897,7 @@ EvtScript N(dizzyShell) = { Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Wait(15) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PRESET_3B) Call(MoveBattleCamOver, 75 * DT) Set(LVarD, 75 * DT) Set(LVarA, LVarD) @@ -993,7 +993,7 @@ EvtScript N(dizzyShell) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch EndIf Set(LFlag0, TRUE) @@ -1030,7 +1030,7 @@ EvtScript N(dizzyShell) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch EndIf Label(11) @@ -1069,7 +1069,7 @@ EvtScript N(fireShell) = { Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) Wait(15) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PRESET_3B) Call(MoveBattleCamOver, 75 * DT) Set(LVarD, 75 * DT) Set(LVarC, LVarD) @@ -1239,7 +1239,7 @@ EvtScript N(fireShell) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch EndIf Set(LFlag0, TRUE) @@ -1263,7 +1263,7 @@ EvtScript N(fireShell) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch EndIf Label(11) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index a3b261d93f..542c718375 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -355,7 +355,7 @@ EvtScript N(returnHome2) = { EvtScript N(EVS_ReturnHome) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) Call(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) @@ -846,7 +846,7 @@ EvtScript N(EVS_Move_SpinyFlip) = { Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 47, 46, 12) Call(SetBattleCamOffsetZ, 7) Call(SetBattleCamZoom, 416) @@ -946,7 +946,7 @@ EvtScript N(EVS_Move_SpinyFlip) = { CaseEq(1) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch Wait(15) Switch(LVar0) @@ -976,7 +976,7 @@ EvtScript N(EVS_Move_SpinySurge) = { Call(SetupMashMeter, 4, 40, 70, 99, 100, 0) EndSwitch Call(SetActionHudPrepareTime, 10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 45, 60, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 400) @@ -1091,7 +1091,7 @@ EvtScript N(EVS_Move_SpinySurge) = { CaseGt(0) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch Wait(6) Label(12) @@ -1124,12 +1124,12 @@ EvtScript N(cloudNine_normal) = { Call(SetActionHudPrepareTime, 50) Call(InitTargetIterator) Call(SetGoalToHome, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_10) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0A) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamOffsetZ, 17) Call(SetBattleCamZoom, 300) Call(MoveBattleCamOver, 30) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) Wait(10) Thread Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1164,7 +1164,7 @@ EvtScript N(cloudNine_normal) = { Call(action_command_water_block_start, 0, 97, 3) Call(AddBattleCamZoom, -75) Call(MoveBattleCamOver, 100) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Wait(100) Wait(3) Call(AddBattleCamZoom, 50) @@ -1244,12 +1244,12 @@ EvtScript N(cloudNine_immobile) = { Call(N(RemoveCloudNineFX)) Call(InitTargetIterator) Call(SetGoalToHome, ACTOR_PARTNER) - Call(UseBattleCamPreset, BTL_CAM_PRESET_10) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0A) Call(BattleCamTargetActor, ACTOR_SELF) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 300) Call(MoveBattleCamOver, 30) - Call(func_8024EDA4) + Call(DisableBattleCamClampX) Wait(10) Set(LVar0, 0) Loop(10) @@ -1279,7 +1279,7 @@ EvtScript N(cloudNine_immobile) = { Call(action_command_water_block_start, 0, 97, 3) Call(AddBattleCamZoom, -75) Call(MoveBattleCamOver, 100) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Wait(100) Wait(3) Call(AddBattleCamZoom, 50) @@ -1718,7 +1718,7 @@ EvtScript N(EVS_Move_Hurricane) = { Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Call(SetActionHudPrepareTime, 15) Call(SetDamageSource, DMG_SRC_HURRICANE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -45, 54, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 280) @@ -1734,12 +1734,12 @@ EvtScript N(EVS_Move_Hurricane) = { Call(action_command_hurricane_start, 0, 147 * DT, 3, LVar0) Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 20, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 35, 54, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 430) Call(MoveBattleCamOver, 150 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_HURRICANE_WIND) Thread Call(N(ProcessHurricane)) @@ -1762,7 +1762,7 @@ EvtScript N(EVS_Move_Hurricane) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch Call(InitTargetIterator) Label(10) diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 453469c8fa..de4938210b 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -905,7 +905,7 @@ EvtScript N(returnHome2) = { EvtScript N(EVS_ReturnHome) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(SetActorJumpGravity, ACTOR_PARTNER, Float(1.0)) Call(AddGoalPos, ACTOR_PARTNER, -30, 0, 0) @@ -936,7 +936,7 @@ EvtScript N(skyDive) = { Call(LoadActionCommand, ACTION_COMMAND_JUMP) Call(action_command_jump_init) Call(SetActionDifficultyTable, Ref(N(actionCommandTable))) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(BattleCamTargetActor, ACTOR_SELF) Call(InitTargetIterator) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) @@ -948,7 +948,7 @@ EvtScript N(skyDive) = { Wait(3) Call(action_command_jump_start, 32, 3) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_PREDIVE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_FlyFast) Call(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) Call(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) @@ -957,7 +957,7 @@ EvtScript N(skyDive) = { Wait(3) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_PreDive) EndChildThread - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(AddGoalPos, ACTOR_PARTNER, -26, 25, 0) Call(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_DIVE) @@ -1029,7 +1029,7 @@ EvtScript N(shellShot) = { EndIf Switch(LVar0) CaseEq(1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1037,7 +1037,7 @@ EvtScript N(shellShot) = { Call(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) CaseEq(-1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1046,7 +1046,7 @@ EvtScript N(shellShot) = { Call(FlyToGoal, ACTOR_PARTNER, 7, 0, 0x00000064) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) CaseEq(0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1055,7 +1055,7 @@ EvtScript N(shellShot) = { Call(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) CaseEq(-2) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(MoveBattleCamOver, 5) Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetGoalToTarget, ACTOR_PARTNER) @@ -1105,7 +1105,7 @@ EvtScript N(airLift) = { Call(SetGoalToTarget, ACTOR_PARTNER) Call(GetDistanceToGoal, ACTOR_PARTNER, LVar0) Div(LVar0, 4) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetBattleCamOffsetZ, 8) Call(MoveBattleCamOver, LVar0) Sub(LVar0, 12) @@ -1127,7 +1127,7 @@ EvtScript N(airLift) = { Call(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) IfEq(LVar0, HIT_RESULT_MISS) Call(CloseActionCommandInfo) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 20) Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1187,7 +1187,7 @@ EvtScript N(airLift) = { CaseDefault Call(GetOwnerTarget, LVar0, LVar1) Call(DispatchEvent, LVar0, EVENT_AIR_LIFT_FAILED) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 20) Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1212,7 +1212,7 @@ EvtScript N(airRaid) = { Call(action_command_air_raid_init) Call(SetupMashMeter, 4, 25, 50, 75, 100, 0) Call(SetActionHudPrepareTime, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_14) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0E) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 30) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1283,7 +1283,7 @@ EvtScript N(airRaid) = { CaseGt(99) Call(UseBattleCamPreset, BTL_CAM_PRESET_04) CaseDefault - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) EndSwitch ChildThread Wait(10) diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 4dd688a83d..2feadeb60a 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -657,7 +657,7 @@ EvtScript N(returnHome2) = { EvtScript N(EVS_ReturnHome) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Fall) Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 15) @@ -692,7 +692,7 @@ EvtScript N(restoreFromSquirt2) = { EvtScript N(restoreFromSquirt) = { Call(PartnerYieldTurn) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -747,7 +747,7 @@ EvtScript N(bellyFlop) = { Call(action_command_hammer_start, 0, 57, 3) Call(SetActionQuality, 0) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Tense1) - Call(UseBattleCamPreset, BTL_CAM_PRESET_59) + Call(UseBattleCamPreset, BTL_CAM_PRESET_3B) Set(LVar0, 30) Loop(60) Wait(1) @@ -762,7 +762,7 @@ EvtScript N(bellyFlop) = { EndLoop Thread Call(GetPartnerActionSuccess, LVar0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(MoveBattleCamOver, 20) EndThread Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Jump) @@ -920,7 +920,7 @@ EvtScript N(bellyFlop) = { Switch(LVar0) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) ExecWait(N(EVS_ReturnHome)) EndCaseGroup CaseOrEq(HIT_RESULT_NICE) @@ -946,7 +946,7 @@ EvtScript N(squirt) = { CaseEq(2) Call(SetupMashMeter, 5, 20, 40, 60, 80, 100) EndSwitch - Call(UseBattleCamPreset, BTL_CAM_PRESET_13) + Call(UseBattleCamPreset, BTL_CAM_PRESET_0D) Call(BattleCamTargetActor, ACTOR_SELF) Call(MoveBattleCamOver, 40) Call(InitTargetIterator) @@ -1036,7 +1036,7 @@ EvtScript N(squirt) = { EvtScript N(waterBlock) = { Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) Call(InitTargetIterator) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -95, 26, 10) Call(SetBattleCamOffsetZ, 11) Call(SetBattleCamZoom, 238) @@ -1067,7 +1067,7 @@ EvtScript N(waterBlock) = { Goto(10) EndIf Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_SpitArc) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -95, 27, 10) Call(SetBattleCamOffsetZ, 11) Call(SetBattleCamZoom, 277) @@ -1143,7 +1143,7 @@ EvtScript N(tidalWave) = { Call(action_command_tidal_wave_init) Call(SetupMashMeter, 5, 20, 30, 60, 80, 100) Call(InitTargetIterator) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -65, 53, 10) Call(SetBattleCamOffsetZ, 16) Call(SetBattleCamZoom, 214) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index f7af63f76e..1c6e189083 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -232,7 +232,7 @@ EvtScript N(EVS_ExecuteAction) = { Call(EnableIdleScript, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) Call(UseIdleAnimation, ACTOR_PARTNER, FALSE) Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_TWINK_FLY_A, SOUND_TWINK_FLY_B) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(BattleCamTargetActor, ACTOR_SELF) Call(InitTargetIterator) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) @@ -242,14 +242,14 @@ EvtScript N(EVS_ExecuteAction) = { Call(FlyToGoal, ACTOR_PARTNER, 0, -10, EASING_COS_IN_OUT) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Idle) Wait(3) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Cringe) Call(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) Call(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) Wait(2) Call(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_ACTOR_JUMP) - Call(UseBattleCamPreset, BTL_CAM_PRESET_52) + Call(UseBattleCamPreset, BTL_CAM_PRESET_34) Call(AddGoalPos, ACTOR_PARTNER, -40, 15, 0) Call(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) Call(GetActorVar, ACTOR_SELF, AVAR_Twink_PowerLevel, LVarF) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index eb296c700f..b24da997ed 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -721,7 +721,7 @@ EvtScript N(returnHome2) = { }; EvtScript N(EVS_ReturnHome) = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_51) + Call(UseBattleCamPreset, BTL_CAM_PRESET_33) Call(SetGoalToHome, ACTOR_PARTNER) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) Call(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) @@ -775,7 +775,7 @@ EvtScript N(EVS_Attack_ElectroDash) = { Call(action_command_body_slam_init) Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_48) + Call(UseBattleCamPreset, BTL_CAM_CLOSER_PARTNER_APPROACH) Call(InitTargetIterator) Call(SetGoalToTarget, ACTOR_PARTNER) Call(AddGoalPos, ACTOR_PARTNER, -20, 0, 0) @@ -1095,7 +1095,7 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -125, 42, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 340) @@ -1115,7 +1115,7 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = { Call(action_command_water_block_start, 0, 100 * DT, 3) Call(AddBattleCamZoom, -75) Call(MoveBattleCamOver, 100 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Thread Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) @@ -1178,7 +1178,7 @@ EvtScript N(EVS_TurboCharge_ImmobilePlayer) = { Call(SetActionHudPrepareTime, 0) Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Wait(5) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -125, 42, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 340) @@ -1198,7 +1198,7 @@ EvtScript N(EVS_TurboCharge_ImmobilePlayer) = { Call(action_command_water_block_start, 0, 100 * DT, 3) Call(AddBattleCamZoom, -100) Call(MoveBattleCamOver, 100 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Thread Call(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) @@ -1261,7 +1261,7 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(action_command_mega_shock_init) Call(SetupMashMeter, 1, 100, 0, 0, 0, 0) Call(SetActionHudPrepareTime, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -54, 63, 10) Call(SetBattleCamOffsetZ, 15) Call(SetBattleCamZoom, 314) @@ -1293,7 +1293,7 @@ EvtScript N(EVS_Attack_MegaShock) = { PlayEffect(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, Float(1.3), 90 * DT, 0) Call(AddBattleCamZoom, -100) Call(MoveBattleCamOver, 90 * DT) - Call(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) + Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE) Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) Call(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_ATTACK) Call(N(WattFXDisable)) @@ -1314,10 +1314,10 @@ EvtScript N(EVS_Attack_MegaShock) = { Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Add(LVar1, 12) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_MEGA_DISCHARGE) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_MEGA_SHOCK, LVar0, LVar1, LVar2, 0, 0, 0) Wait(10) Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_MEGA_CHARGE_WAVE) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_MEGA_SHOCK, LVar0, LVar1, LVar2, 0, 0, 0) EndThread Thread Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBiggest) diff --git a/src/battle/player_events.c b/src/battle/player_events.c index 411bb611e6..b0b4e0d78e 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -1293,7 +1293,7 @@ EvtScript EVS_RunAwayFail = { EvtScript EVS_PlayerDies = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying) - Call(UseBattleCamPreset, BTL_CAM_PRESET_24) + Call(UseBattleCamPreset, BTL_CAM_PLAYER_DIES) Wait(15) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_SPINNING) @@ -1337,9 +1337,9 @@ EvtScript EVS_PlayerDies = { End }; -EvtScript D_80287404 = { +EvtScript EVS_Unused_UseItemWithEffect = { IfEq(LVar1, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_69) + Call(UseBattleCamPreset, BTL_CAM_PRESET_45) Wait(10) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) @@ -1379,8 +1379,8 @@ EvtScript D_80287404 = { End }; -EvtScript D_80287708 = { - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) +EvtScript EVS_Unused_UseItem = { + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, -85, 1, 0) Call(SetBattleCamOffsetZ, 41) Call(SetBattleCamZoom, 248) @@ -1400,7 +1400,7 @@ EvtScript D_80287708 = { End }; -EvtScript D_80287834 = { +EvtScript EVS_Unused_PlayerGoHome = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(SetGoalToHome, ACTOR_PLAYER) Call(SetActorSpeed, ACTOR_PLAYER, Float(8.0)) @@ -1412,7 +1412,7 @@ EvtScript D_80287834 = { End }; -EvtScript EVS_PlayEatFX = { +EvtScript EVS_Unused_EatItem = { Thread Loop(4) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) @@ -1425,7 +1425,7 @@ EvtScript EVS_PlayEatFX = { End }; -EvtScript EVS_PlayDrinkFX = { +EvtScript EVS_Unused_DrinkItem = { Thread Loop(4) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) @@ -1595,7 +1595,7 @@ EvtScript EVS_MerleeAttackBonus = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(BattleMerleeFadeStageToBlack) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 0, 80, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 246) @@ -1644,7 +1644,7 @@ EvtScript EVS_MerleeDefenseBonus = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(BattleMerleeFadeStageToBlack) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 0, 80, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 246) @@ -1698,7 +1698,7 @@ EvtScript EVS_MerleeExpBonus = { Call(UseIdleAnimation, ACTOR_PLAYER, FALSE) Call(BattleMerleeFadeStageToBlack) Wait(10) - Call(UseBattleCamPreset, BTL_CAM_PRESET_19) + Call(UseBattleCamPreset, BTL_CAM_PRESET_13) Call(SetBattleCamTarget, 0, 80, 0) Call(SetBattleCamOffsetZ, 0) Call(SetBattleCamZoom, 246) diff --git a/src/battle/standard_events.c b/src/battle/standard_events.c index dc997c2338..be67e3d0d0 100644 --- a/src/battle/standard_events.c +++ b/src/battle/standard_events.c @@ -125,7 +125,7 @@ EvtScript EVS_Partner_BurnContact = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -174,7 +174,7 @@ EvtScript EVS_Partner_SpikeContact = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_61) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_SPIKE) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -225,7 +225,7 @@ EvtScript EVS_Partner_BombetteSpikeContact = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_61) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_SPIKE) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -280,7 +280,7 @@ EvtScript EVS_Partner_ShockHit = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -333,7 +333,7 @@ EvtScript EVS_Partner_UnusedShockHit = { Call(SetActorRotation, ACTOR_SELF, 0, 0, 0) Call(SetActorScale, ACTOR_SELF, Float(1.0), Float(1.0), Float(1.0)) Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - Call(UseBattleCamPreset, BTL_CAM_PRESET_62) + Call(UseBattleCamPreset, BTL_CAM_PARTNER_HIT_HAZARD) Call(SetAnimation, ACTOR_PARTNER, -1, LVarA) Call(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) Sub(LVar0, 60) @@ -1600,7 +1600,7 @@ EvtScript EVS_Enemy_ShockHit_Impl = { SetF(LVar5, LVar3) DivF(LVar5, Float(20.0)) AddF(LVar1, LVar5) - PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3) + PlayEffect(EFFECT_FLASHING_BOX_SHOCKWAVE, FX_SHOCK_OVERLAY_SHOCK_HIT, LVar0, LVar1, LVar2, LVar4, LVar3) Call(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) Call(HideHealthBar, ACTOR_SELF) Call(HPBarToCurrent, ACTOR_SELF) diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c index 3aa7c372e1..fade8aa653 100644 --- a/src/effects/flashing_box_shockwave.c +++ b/src/effects/flashing_box_shockwave.c @@ -12,16 +12,16 @@ void flashing_box_shockwave_render(EffectInstance* effect); void flashing_box_shockwave_appendGfx(void* effect); EffectInstance* flashing_box_shockwave_main( - s32 arg0, - f32 arg1, - f32 arg2, - f32 arg3, - f32 arg4, - f32 arg5 + s32 type, + f32 posX, + f32 posY, + f32 posZ, + f32 sizeX, + f32 sizeY ) { EffectBlueprint bp; EffectInstance* effect; - FlashingBoxShockwaveFXData* data; + ShockOverlayFXData* data; s32 numParts = 1; bp.init = flashing_box_shockwave_init; @@ -36,41 +36,44 @@ EffectInstance* flashing_box_shockwave_main( data = effect->data.flashingBoxShockwave = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.flashingBoxShockwave != NULL); - data->unk_1C = 30; + data->type = type; + data->pos.x = posX; + data->pos.y = posY; + data->pos.z = posZ; + + data->lifetime = 0; + data->timeLeft = 30; + data->unk_10 = 255; data->unk_14 = 255; data->unk_18 = 255; - data->unk_00 = arg0; - data->unk_20 = 0; - data->pos.x = arg1; - data->pos.y = arg2; - data->pos.z = arg3; - if (arg0 == 2) { + + if (type == FX_SHOCK_OVERLAY_MEGA_SHOCK) { data->unk_24 = 1.0f; } else { - data->unk_24 = 0; + data->unk_24 = 0.0f; } - data->unk_28 = arg4 * 0.5; - data->unk_2C = arg5 * 0.5; - - switch (arg0) { - case 0: - case 1: - case 3: - data->unk_30 = 255; - data->unk_34 = 255; - data->unk_38 = 0; - data->unk_3C = 255; - data->unk_40 = 255; - data->unk_44 = 255; + data->scaleX = sizeX * 0.5; + data->scaleY = sizeY * 0.5; + + switch (type) { + case FX_SHOCK_OVERLAY_SHOCK_HIT: + case FX_SHOCK_OVERLAY_LIGHTNING_WORLD: + case FX_SHOCK_OVERLAY_LIGHTNING_BATTLE: + data->primCol.r = 255; + data->primCol.g = 255; + data->primCol.b = 0; + data->envCol.r = 255; + data->envCol.g = 255; + data->envCol.b = 255; break; - default: - data->unk_30 = 70; - data->unk_34 = 180; - data->unk_38 = 120; - data->unk_3C = 255; - data->unk_40 = 255; - data->unk_44 = 255; + case FX_SHOCK_OVERLAY_MEGA_SHOCK: + data->primCol.r = 70; + data->primCol.g = 180; + data->primCol.b = 120; + data->envCol.r = 255; + data->envCol.g = 255; + data->envCol.b = 255; break; } @@ -81,40 +84,35 @@ void flashing_box_shockwave_init(EffectInstance* effect) { } void flashing_box_shockwave_update(EffectInstance* effect) { - FlashingBoxShockwaveFXData* data = effect->data.flashingBoxShockwave; - s32 unk_00 = data->unk_00; - s32 unk_1C; - s32 unk_20; + ShockOverlayFXData* data = effect->data.flashingBoxShockwave; - if (data->unk_1C < 100) { - data->unk_1C--; + if (data->timeLeft < 100) { + data->timeLeft--; } - data->unk_20++; + data->lifetime++; - if (data->unk_1C < 0) { + if (data->timeLeft < 0) { remove_effect(effect); return; } - unk_1C = data->unk_1C; - unk_20 = data->unk_20; - - if (unk_00 == 2) { - if (unk_20 < 21) { + if (data->type == FX_SHOCK_OVERLAY_MEGA_SHOCK) { + if (data->lifetime < 21) { data->unk_24 *= 1.1; } } else { + // interp toward 8.0 data->unk_24 += (8.0 - data->unk_24) * 0.05; } data->unk_14 *= 0.9; - if (unk_1C < 5) { + if (data->timeLeft < 5) { data->unk_18 *= 0.8; } - if (unk_20 >= 7) { + if (data->lifetime >= 7) { data->unk_10 -= 13; if (data->unk_10 < 0) { data->unk_10 = 0; @@ -135,46 +133,46 @@ void flashing_box_shockwave_render(EffectInstance* effect) { } void flashing_box_shockwave_appendGfx(void* effect) { - FlashingBoxShockwaveFXData* data = ((EffectInstance*)effect)->data.flashingBoxShockwave; - s32 unk_00 = data->unk_00; - s32 unk_20 = data->unk_20; - Matrix4f sp18; - Matrix4f sp58; - Matrix4f sp98; + ShockOverlayFXData* data = ((EffectInstance*)effect)->data.flashingBoxShockwave; + s32 type = data->type; + s32 time = data->lifetime; + Matrix4f mtxTransform; + Matrix4f mtxUnkScale; + Matrix4f mtxCamRot; - guRotateF(sp98, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); + guRotateF(mtxCamRot, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - guMtxCatF(sp98, sp18, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); + guMtxCatF(mtxCamRot, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, data->unk_18); - gDPSetEnvColor(gMainGfxPos++, data->unk_3C, data->unk_40, data->unk_44, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, data->unk_18); + gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, 0); - if ((unk_00 == 0 || unk_00 == 1) && unk_20 % 2) { - guScaleF(sp18, data->unk_28, data->unk_2C, 15.0f / 14); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + if ((type == FX_SHOCK_OVERLAY_SHOCK_HIT || type == FX_SHOCK_OVERLAY_LIGHTNING_WORLD) && time % 2) { + guScaleF(mtxTransform, data->scaleX, data->scaleY, 15.0f / 14); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000600_3936A0); - gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, unk_20 * 8, unk_20 * 8, unk_20 * 8 + 128, unk_20 * 8 + 128); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, time * 8, time * 8, time * 8 + 128, time * 8 + 128); gSPDisplayList(gMainGfxPos++, D_090008E8_393988); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - if (unk_00 >= 1 && unk_00 <= 3) { - if (unk_00 == 1) { + if (type == FX_SHOCK_OVERLAY_LIGHTNING_WORLD || type == FX_SHOCK_OVERLAY_LIGHTNING_BATTLE || type == FX_SHOCK_OVERLAY_MEGA_SHOCK) { + if (type == FX_SHOCK_OVERLAY_LIGHTNING_WORLD) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 0, data->unk_14); } - guTranslateF(sp18, 0.0f, data->unk_2C, 0.0f); - guScaleF(sp58, data->unk_24 * 0.25, data->unk_24 * 0.25, 1.0f); - guMtxCatF(sp58, sp18, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, 0.0f, data->scaleY, 0.0f); + guScaleF(mtxUnkScale, data->unk_24 * 0.25, data->unk_24 * 0.25, 1.0f); + guMtxCatF(mtxUnkScale, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000950_3939F0); diff --git a/src/effects/lightning.c b/src/effects/lightning.c index 57cc6e4ca0..42e3b0b2ae 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -98,15 +98,12 @@ EffectInstance* lightning_main( } if (arg0 >= 3) { - s32 effectArg0; - load_effect(EFFECT_FLASHING_BOX_SHOCKWAVE); if (gGameStatusPtr->isBattle == TRUE) { - effectArg0 = 3; + flashing_box_shockwave_main(FX_SHOCK_OVERLAY_LIGHTNING_BATTLE, arg1, arg2, arg3, arg4, arg5); } else { - effectArg0 = 1; + flashing_box_shockwave_main(FX_SHOCK_OVERLAY_LIGHTNING_WORLD, arg1, arg2, arg3, arg4, arg5); } - flashing_box_shockwave_main(effectArg0, arg1, arg2, arg3, arg4, arg5); } return effect; diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index a3853fd96f..7155654bbb 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -3757,7 +3757,7 @@ BattleCamTargetActor = 0x8024EB24; DispatchDamagePlayerEvent = 0x802748DC; dispatch_event_actor = 0x80277120; EVS_UseMystery = 0x80293E00; -func_8024ECF8 = 0x8024ECF8; +SetBattleCamTargetingModes = 0x8024ECF8; ItemAfflictEnemy = 0x80252AFC; ItemSpookEnemy = 0x802528E4; MultiplyByActorScale = 0x80253F9C; @@ -3796,7 +3796,7 @@ EVS_Partner_ShockHit = 0x80295704; EVS_Partner_SpikeContact = 0x80294FA4; FallToGoal = 0x80279BAC; FlyToGoal = 0x8027B5E4; -func_8024EDA4 = 0x8024EDA4; +DisableBattleCamClampX = 0x8024EDA4; func_80269118 = 0x802690D8; func_80269160 = 0x80269120; func_80269600 = 0x802695C0; diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index d5236de482..1e4583726e 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -335,9 +335,9 @@ BattleCamTargetActorPart = 0x8024EB24; MoveBattleCamOver = 0x8024EBA8; SetBattleCamZoom = 0x8024EC0C; AddBattleCamZoom = 0x8024EC4C; -func_8024ECF8 = 0x8024EC98; +SetBattleCamTargetingModes = 0x8024EC98; FreezeBattleCam = 0x8024ED18; -func_8024EDA4 = 0x8024ED44; +DisableBattleCamClampX = 0x8024ED44; btl_set_popup_duration = 0x8024FA64; ShowMessageBox = 0x80251474; ShowVariableMessageBox = 0x802514CC; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 62fc1f8f75..277a2be252 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -6509,16 +6509,16 @@ btl_state_draw_enemy_striking_first = 0x80248AA4; // type:func rom:0x177384 btl_state_update_end_demo_battle = 0x80248B08; // type:func rom:0x1773E8 btl_state_draw_end_demo_battle = 0x80248D78; // type:func rom:0x177658 BattleCam_Update_Interrupt = 0x80248DD0; // type:func rom:0x1776B0 -CamPresetUpdate_F = 0x80248DE4; // type:func rom:0x1776C4 -CamPresetUpdate_M = 0x80249804; // type:func rom:0x1780E4 -CamPresetUpdate_G = 0x8024A214; // type:func rom:0x178AF4 +CamPresetUpdate_F_Skippable = 0x80248DE4; // type:func rom:0x1776C4 +CamPresetUpdate_M_Skippable = 0x80249804; // type:func rom:0x1780E4 +CamPresetUpdate_G_Skippable = 0x8024A214; // type:func rom:0x178AF4 BattleCam_Update_FocusActor = 0x8024A990; // type:func rom:0x179270 BattleCam_Update_FocusGoal = 0x8024AFE4; // type:func rom:0x1798C4 -BattleCam_Update_SimpleLerp = 0x8024B5FC; // type:func rom:0x179EDC -BattleCam_Update_ResetToNeutral = 0x8024B9A0; // type:func rom:0x17A280 +BattleCam_Update_SimpleLerp_Unskippable = 0x8024B5FC; // type:func rom:0x179EDC +BattleCam_Update_ResetToNeutral_Skippable = 0x8024B9A0; // type:func rom:0x17A280 BattleCam_Update_ViewAllEnemies = 0x8024BDA4; // type:func rom:0x17A684 BattleCam_Update_ViewAllEnemies_MaintainY = 0x8024C180; // type:func rom:0x17AA60 -CamPresetUpdate_J = 0x8024C570; // type:func rom:0x17AE50 +BattleCam_Update_SimpleLerp_Skippable = 0x8024C570; // type:func rom:0x17AE50 BattleCam_Update_FollowActorY = 0x8024C944; // type:func rom:0x17B224 BattleCam_Update_FollowActorPos = 0x8024CB68; // type:func rom:0x17B448 BattleCam_Init = 0x8024CE9C; // type:func rom:0x17B77C @@ -6552,9 +6552,9 @@ BattleCamTargetActorPart = 0x8024EB84; // type:func rom:0x17D464 MoveBattleCamOver = 0x8024EC08; // type:func rom:0x17D4E8 SetBattleCamZoom = 0x8024EC6C; // type:func rom:0x17D54C AddBattleCamZoom = 0x8024ECAC; // type:func rom:0x17D58C -func_8024ECF8 = 0x8024ECF8; // type:func rom:0x17D5D8 +SetBattleCamTargetingModes = 0x8024ECF8; // type:func rom:0x17D5D8 FreezeBattleCam = 0x8024ED78; // type:func rom:0x17D658 -func_8024EDA4 = 0x8024EDA4; // type:func rom:0x17D684 +DisableBattleCamClampX = 0x8024EDA4; // type:func rom:0x17D684 btl_popup_messages_init = 0x8024EDC0; // type:func rom:0x17D6A0 btl_popup_messages_delete = 0x8024EDEC; // type:func rom:0x17D6CC btl_popup_messages_update = 0x8024EE48; // type:func rom:0x17D728 @@ -7179,16 +7179,16 @@ BtlBringPartnerOut = 0x80280B6C; // rom:0x1AF44C BattleCam_IsFrozen = 0x80280CE0; // rom:0x1AF5C0 BattleCam_CurrentPresetID = 0x80280CE4; // rom:0x1AF5C4 EVS_BattleCam_Interrupt = 0x80280CE8; // rom:0x1AF5C8 -CamPreset_F = 0x80280D04; // rom:0x1AF5E4 -CamPreset_M = 0x80280D20; // rom:0x1AF600 -CamPreset_G = 0x80280D3C; // rom:0x1AF61C +EVS_BattleCam_UnkF_Skippable = 0x80280D04; // rom:0x1AF5E4 +EVS_BattleCam_UnkM_Skippable = 0x80280D20; // rom:0x1AF600 +EVS_BattleCam_UnkG_Skippable = 0x80280D3C; // rom:0x1AF61C EVS_BattleCam_FocusActor = 0x80280D58; // rom:0x1AF638 EVS_BattleCam_FocusGoal = 0x80280D74; // rom:0x1AF654 -EVS_BattleCam_SimpleLerp = 0x80280D90; // rom:0x1AF670 +EVS_BattleCam_SimpleLerp_Unskippable = 0x80280D90; // rom:0x1AF670 EVS_BattleCam_ResetNeutral = 0x80280DAC; // rom:0x1AF68C EVS_BattleCam_ViewEnemies = 0x80280DC8; // rom:0x1AF6A8 EVS_BattleCam_ViewEnemies_MaintainY = 0x80280DE4; // rom:0x1AF6C4 -CamPreset_J = 0x80280E00; // rom:0x1AF6E0 +EVS_BattleCam_SimpleLerp_Skippable = 0x80280E00; // rom:0x1AF6E0 EVS_BattleCam_FollowActorY = 0x80280E1C; // rom:0x1AF6FC EVS_BattleCam_FollowActorPos = 0x80280E38; // rom:0x1AF718 EVS_BattleCam_Reset = 0x80280E54; // rom:0x1AF734 @@ -25904,8 +25904,8 @@ ShopOwnerPrintState = 0x80286538; // EVS_RunAwayStart = 0x802868BC; // EVS_RunAwayFail = 0x80287078; // EVS_PlayerDies = 0x80287128; // -EVS_PlayEatFX = 0x802878D0; // -EVS_PlayDrinkFX = 0x80287948; // +EVS_Unused_EatItem = 0x802878D0; // +EVS_Unused_DrinkItem = 0x80287948; // EVS_UseLifeShroom = 0x802879C0; // EVS_MerleeRunOut = 0x80288398; // EVS_MerleeAttackBonus = 0x80288400; // @@ -25979,12 +25979,12 @@ BattleCam_InitialBoomOffsetY = 0x8029F298; // BattleCam_DoneMoving = 0x8029F29C; // BattleCam_MoveTimeLeft = 0x8029F29E; // BattleCam_MoveTimeTotal = 0x8029F2A0; // -BattleCam_ModeY = 0x8029F2A2; // -BattleCam_ModeX = 0x8029F2A3; // +BattleCam_AdjustTargetYMode = 0x8029F2A2; // +BattleCam_AdjustTargetXMode = 0x8029F2A3; // BattleCam_SetImmediately = 0x8029F2A4; // BattleCam_UseLinearInterp = 0x8029F2A5; // BattleCam_ClampPosX = 0x8029F2A6; // -BattleCam_SpecialOffsetX = 0x8029F2A7; // +BattleCam_ExtraOffsetX = 0x8029F2A7; // BattleCam_InitialPosX = 0x8029F2A8; // BattleCam_InitialPosY = 0x8029F2AC; // BattleCam_InitialPosZ = 0x8029F2B0; //