From c8548d500268ea6ac42fe5df2a063a5d0269ea8e Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Sat, 29 Apr 2023 03:19:30 -0400 Subject: [PATCH] btl cam modes (#1035) * some btl cam * couple things --------- Co-authored-by: HailSanta --- include/enums.h | 10 ++-- src/101b90_len_8f0.c | 53 ++++++++++-------- src/battle/area/arn/actor/hyper_cleft.c | 4 +- src/battle/area/arn/actor/hyper_paragoomba.c | 8 +-- src/battle/area/arn/actor/hypergoomba.c | 4 +- src/battle/area/arn/actor/tubba_blubba.c | 8 +-- src/battle/area/arn/actor/tubbas_heart.c | 2 +- src/battle/area/dgb/actor/tubba_blubba.c | 8 +-- src/battle/area/dig/actor/tubba_blubba.c | 4 +- src/battle/area/flo/actor/amazy_dayzee.c | 2 +- src/battle/area/flo/actor/crazee_dayzee.c | 2 +- src/battle/area/flo/actor/lakitu.c | 2 +- src/battle/area/flo/actor/ruff_puff.c | 2 +- src/battle/area/flo2/actor/huff_n_puff.c | 4 +- src/battle/area/flo2/actor/spike.c | 2 +- src/battle/area/hos/actor/goombario_tutor.c | 2 +- .../area/isk_part_1/actor/pokey_mummy.c | 2 +- .../area/isk_part_1/actor/stone_chomp.c | 2 +- .../area/isk_part_2/actor/chain_chomp.c | 2 +- src/battle/area/iwa/actor/buzzar.c | 8 +-- src/battle/area/iwa/actor/cleft.c | 2 +- src/battle/area/jan/actor/hurt_plant.c | 2 +- src/battle/area/jan/actor/jungle_fuzzy.c | 2 +- src/battle/area/jan/actor/m_bush.c | 2 +- src/battle/area/jan/actor/spear_guy.c | 6 +- src/battle/area/kgr/actor/fuzzipede.c | 4 +- .../area/kmr_part_2/actor/blue_goomba.c | 2 +- .../area/kmr_part_2/actor/blue_goomba2.c | 2 +- .../area/kmr_part_2/actor/goomba_king.c | 4 +- src/battle/area/kmr_part_2/actor/red_goomba.c | 2 +- .../area/kmr_part_2/actor/red_goomba2.c | 2 +- .../area/kmr_part_3/actor/egg_jr_troopa.c | 2 +- .../area/kmr_part_3/actor/final_jr_troopa.c | 4 +- src/battle/area/kmr_part_3/actor/jr_troopa.c | 2 +- .../area/kmr_part_3/actor/para_jr_troopa.c | 2 +- src/battle/area/kmr_part_3/actor/paragoomba.c | 4 +- .../area/kmr_part_3/actor/spiked_goomba.c | 2 +- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 2 +- src/battle/area/kpa/actor/bony_beetle.c | 8 +-- src/battle/area/kpa2/actor/bowser.c | 6 +- src/battle/area/kpa2/actor/bowser_intro.c | 2 +- src/battle/area/kpa2/actor/bowser_phase_1.c | 8 +-- src/battle/area/kpa2/actor/bowser_phase_2.c | 8 +-- src/battle/area/kpa2/actor/bowser_phase_3.c | 8 +-- src/battle/area/kpa3/actor/anti_guy.c | 4 +- src/battle/area/kpa4/actor/bombshell_bill.c | 2 +- src/battle/area/kzn/actor/lava_bubble.c | 6 +- src/battle/area/mac/actor/chan.c | 6 +- src/battle/area/mac/actor/lee.c | 12 ++-- src/battle/area/mac/actor/master1.c | 2 +- src/battle/area/mac/actor/master2.c | 2 +- src/battle/area/mac/actor/master3.c | 2 +- src/battle/area/mim/actor/forest_fuzzy.c | 2 +- src/battle/area/mim/actor/piranha_plant.c | 2 +- src/battle/area/nok/actor/kent_c_koopa.c | 2 +- src/battle/area/omo/actor/anti_guy.c | 4 +- src/battle/area/omo/actor/blue_shy_guy.c | 4 +- src/battle/area/omo/actor/green_shy_guy.c | 4 +- src/battle/area/omo/actor/groove_guy.c | 4 +- src/battle/area/omo/actor/pink_shy_guy.c | 4 +- src/battle/area/omo/actor/pyro_guy.c | 2 +- src/battle/area/omo/actor/sky_guy.c | 4 +- src/battle/area/omo/actor/spy_guy.c | 2 +- src/battle/area/omo/actor/yellow_shy_guy.c | 4 +- src/battle/area/omo2_2/actor/stilt_guy.c | 6 +- src/battle/area/omo2_3/actor/shy_stack.c | 2 +- src/battle/area/omo2_5/actor/shy_squad_dup.c | 2 +- .../area/omo3/actor/big_lantern_ghost.c | 4 +- src/battle/area/pra/actor/albino_dino.c | 2 +- src/battle/area/sam/actor/frost_piranha.c | 4 +- src/battle/area/sam/actor/gulpit.c | 4 +- src/battle/area/tik/actor/dark_koopa.c | 4 +- src/battle/area/tik/actor/dark_paratroopa.c | 4 +- src/battle/area/tik/actor/gloomba.c | 2 +- src/battle/area/tik/actor/paragloomba.c | 4 +- src/battle/area/tik/actor/spiked_gloomba.c | 2 +- src/battle/area/trd_part_1/actor/bob_omb.c | 4 +- .../area/trd_part_1/actor/bullet_bill.c | 2 +- src/battle/common/actor/bandit.inc.c | 2 +- src/battle/common/actor/buzzy_beetle.inc.c | 4 +- src/battle/common/actor/bzzap.inc.c | 4 +- src/battle/common/actor/clubba.inc.c | 2 +- src/battle/common/actor/duplighost.inc.c | 2 +- src/battle/common/actor/ember.inc.c | 6 +- src/battle/common/actor/fuzzy.inc.c | 2 +- src/battle/common/actor/ghost_bombette.inc.c | 2 +- src/battle/common/actor/ghost_goombario.inc.c | 2 +- .../common/actor/ghost_lakilester.inc.c | 2 +- src/battle/common/actor/ghost_parakarry.inc.c | 2 +- src/battle/common/actor/ghost_sushie.inc.c | 2 +- src/battle/common/actor/goomba.inc.c | 2 +- src/battle/common/actor/gray_magikoopa.inc.c | 2 +- src/battle/common/actor/green_magikoopa.inc.c | 2 +- src/battle/common/actor/koopa_troopa.inc.c | 2 +- src/battle/common/actor/koopatrol.inc.c | 4 +- src/battle/common/actor/medi_guy.inc.c | 6 +- src/battle/common/actor/paragoomba.inc.c | 4 +- src/battle/common/actor/paratroopa.inc.c | 2 +- src/battle/common/actor/pokey.inc.c | 4 +- src/battle/common/actor/putrid_piranha.inc.c | 4 +- src/battle/common/actor/red_magikoopa.inc.c | 2 +- src/battle/common/actor/red_shy_guy.inc.c | 4 +- src/battle/common/actor/spike_top.inc.c | 4 +- src/battle/common/actor/spiked_goomba.inc.c | 2 +- src/battle/common/actor/spiny.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 | 2 +- .../common/actor/yellow_magikoopa.inc.c | 2 +- src/battle/common/move/JumpSupport.inc.c | 2 +- src/battle/move/jump/attack.c | 14 ++--- src/battle/move/jump/auto_jump.c | 6 +- src/battle/move/jump/auto_multibounce.c | 12 ++-- src/battle/move/jump/d_down_jump.c | 6 +- src/battle/move/jump/demo_power_bounce.c | 6 +- src/battle/move/jump/dizzy_stomp.c | 6 +- src/battle/move/jump/mega_jump.c | 6 +- src/battle/move/jump/multibounce.c | 12 ++-- src/battle/move/jump/power_bounce.c | 6 +- src/battle/move/jump/power_jump.c | 6 +- src/battle/move/jump/shrink_stomp.c | 6 +- src/battle/move/jump/sleep_stomp.c | 6 +- src/battle/move/jump/super_jump.c | 6 +- src/battle/partner/goombario.c | 2 +- src/battle/partner/watt.c | 4 +- src/battle_cam.c | 55 ++++++++++--------- src/sprite.h | 6 ++ ver/us/symbol_addrs.txt | 12 ++-- 129 files changed, 312 insertions(+), 298 deletions(-) diff --git a/include/enums.h b/include/enums.h index e64a19deee..088d2494d1 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2208,6 +2208,8 @@ enum ActorPartTargetFlags { ACTOR_PART_TARGET_FLAG_4 = 0x04, }; + + enum PlayerSprites { SPR_Mario1 = 0x1, SPR_Mario1_Back = 0x2, @@ -5652,7 +5654,7 @@ enum BtlCameraPreset { BTL_CAM_PLAYER_HAMMER_STRIKE = 44, BTL_CAM_PRESET_45 = 45, // unused? BTL_CAM_PRESET_46 = 46, - BTL_CAM_PRESET_47 = 47, + 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, @@ -5668,7 +5670,7 @@ enum BtlCameraPreset { BTL_CAM_PRESET_60 = 60, // unused? BTL_CAM_PRESET_61 = 61, BTL_CAM_PRESET_62 = 62, - BTL_CAM_PRESET_63 = 63, + BTL_CAM_ENEMY_APPROACH = 63, // (very common) BTL_CAM_PRESET_64 = 64, // unused? BTL_CAM_PRESET_65 = 65, // unused? BTL_CAM_PRESET_66 = 66, @@ -6065,12 +6067,12 @@ typedef enum ImgFXType { IMGFX_SET_WHITE_FADE = 0x9, IMGFX_SET_CREDITS_FADE = 0xA, IMGFX_COLOR_BUF_SET_MULTIPLY = 0xB, - IMGFX_COLOR_BUF_SET_MODULATE = 0xC, + IMGFX_COLOR_BUF_SET_MODULATE = 0xC, // used for color cycling on Monstar's outline IMGFX_HOLOGRAM = 0xD, // ghostly star spirits and merlar (args: ???, staticAmt, ???, alphaAmt) IMGFX_FILL_COLOR = 0xE, // used to create boss silhouettes in chapter introduction sceens IMGFX_OVERLAY = 0xF, IMGFX_OVERLAY_XLU = 0x10, // unused? - IMGFX_ALLOC_COLOR_BUF = 0x11, // args: count + IMGFX_ALLOC_COLOR_BUF = 0x11, // (args: count) creates buffer to set color of 'count' vertices } ImgFXType; typedef enum ImgFXAnim { diff --git a/src/101b90_len_8f0.c b/src/101b90_len_8f0.c index e33f88cfb6..8f5be0243e 100644 --- a/src/101b90_len_8f0.c +++ b/src/101b90_len_8f0.c @@ -14,15 +14,15 @@ extern HeapNode heap_generalHead; extern HeapNode heap_spriteHead; BSS s32 spr_asset_entry[2]; -BSS s32 D_802DFEB8[101]; -BSS s32 PlayerRasterSetsLoaded; -BSS s32 PlayerRasterBufferSetOffsets[13]; +BSS s32 PlayerRasterLoadDescBuffer[101]; //NOTE: maximum rasters supported for a single player sprite is 101 +BSS s32 PlayerRasterLoadDescNumLoaded; +BSS s32 PlayerRasterLoadDescBeginSpriteIndex[SPR_Peach3]; //TODO size linked to number of player sprites BSS s32 D_802D0084[3]; // unused? -BSS s32 D_802E0090[0x2E0]; // correct length? +BSS s32 PlayerRasterLoadDesc[0x2E0]; // correct length? -BSS s32 PlayerRasterHeader[3]; -BSS s32 D_802E0C1C; -BSS s32 D_802E0C20[14]; +BSS PlayerRastersHeader PlayerRasterHeader; +BSS s32 D_802E0C1C; // unused +BSS s32 PlayerSpriteRasterSets[SPR_Peach3 + 1]; //TODO size linked to number of player sprites BSS s32 PlayerRasterCacheSize; BSS s32 PlayerRasterMaxSize; BSS s32 SpriteDataHeader[3]; @@ -123,11 +123,13 @@ SpriteAnimData* spr_load_sprite(s32 idx, s32 isPlayerSprite, s32 useTailAlloc) { } if (isPlayerSprite) { - PlayerRasterBufferSetOffsets[idx] = PlayerRasterSetsLoaded; - count = D_802E0C20[idx + 1] - D_802E0C20[idx]; - nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader[1] + sizeof(u32) * D_802E0C20[idx], D_802DFEB8, sizeof(D_802DFEB8)); + PlayerRasterLoadDescBeginSpriteIndex[idx] = PlayerRasterLoadDescNumLoaded; + count = PlayerSpriteRasterSets[idx + 1] - PlayerSpriteRasterSets[idx]; + // load a range of raster loading desciptors to a buffer and copy contents into PlayerRasterLoadDesc + nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader.loadDescriptors + sizeof(u32) * PlayerSpriteRasterSets[idx], + PlayerRasterLoadDescBuffer, sizeof(PlayerRasterLoadDescBuffer)); for (i = 0; i < count; i++) { - D_802E0090[PlayerRasterSetsLoaded++] = D_802DFEB8[i]; + PlayerRasterLoadDesc[PlayerRasterLoadDescNumLoaded++] = PlayerRasterLoadDescBuffer[i]; } } @@ -168,17 +170,17 @@ void spr_init_player_raster_cache(s32 cacheSize, s32 maxRasterSize) { PlayerRasterCache[i].spriteIndex = 0xFF; } - for (i = 0; i < ARRAY_COUNT(PlayerRasterBufferSetOffsets); i++) { - PlayerRasterBufferSetOffsets[i] = 0; + for (i = 0; i < ARRAY_COUNT(PlayerRasterLoadDescBeginSpriteIndex); i++) { + PlayerRasterLoadDescBeginSpriteIndex[i] = 0; } - PlayerRasterSetsLoaded = 0; + PlayerRasterLoadDescNumLoaded = 0; nuPiReadRom(SpriteDataHeader[0], &PlayerRasterHeader, sizeof(PlayerRasterHeader)); - nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader[0], D_802E0C20, sizeof(D_802E0C20)); + nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader.indexRanges, PlayerSpriteRasterSets, sizeof(PlayerSpriteRasterSets)); } IMG_PTR spr_get_player_raster(s32 rasterIndex, s32 playerSpriteID) { - PlayerSpriteCacheEntry* temp_s0; - u32 temp_a2; + PlayerSpriteCacheEntry* cacheEntry; + u32 playerRasterInfo; s32 idx = -1; s32 i; @@ -197,13 +199,16 @@ IMG_PTR spr_get_player_raster(s32 rasterIndex, s32 playerSpriteID) { return NULL; } - temp_s0 = &PlayerRasterCache[idx]; - temp_s0->rasterIndex = rasterIndex; - temp_s0->spriteIndex = playerSpriteID; - temp_s0->lazyDeleteTime = 2; - temp_a2 = D_802E0090[PlayerRasterBufferSetOffsets[playerSpriteID] + rasterIndex]; - nuPiReadRom(SpriteDataHeader[0] + (temp_a2 & 0xFFFFF), temp_s0->raster, (temp_a2 >> 0x10) & 0xFFF0); - return temp_s0->raster; + cacheEntry = &PlayerRasterCache[idx]; + cacheEntry->rasterIndex = rasterIndex; + cacheEntry->spriteIndex = playerSpriteID; + cacheEntry->lazyDeleteTime = 2; + + // each player raster load descriptor has image size (in bytes) and relative offset packed into one word + // upper three nibbles give size / 16, lower 5 give offset + playerRasterInfo = PlayerRasterLoadDesc[PlayerRasterLoadDescBeginSpriteIndex[playerSpriteID] + rasterIndex]; + nuPiReadRom(SpriteDataHeader[0] + (playerRasterInfo & 0xFFFFF), cacheEntry->raster, (playerRasterInfo >> 0x10) & 0xFFF0); + return cacheEntry->raster; } void spr_update_player_raster_cache(void) { diff --git a/src/battle/area/arn/actor/hyper_cleft.c b/src/battle/area/arn/actor/hyper_cleft.c index 944bc439f5..95ff1d0a90 100644 --- a/src/battle/area/arn/actor/hyper_cleft.c +++ b/src/battle/area/arn/actor/hyper_cleft.c @@ -169,7 +169,7 @@ EvtScript N(80220DC0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 30) @@ -725,7 +725,7 @@ EvtScript N(80223310) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 30) diff --git a/src/battle/area/arn/actor/hyper_paragoomba.c b/src/battle/area/arn/actor/hyper_paragoomba.c index 77146d7d5f..f473c0173f 100644 --- a/src/battle/area/arn/actor/hyper_paragoomba.c +++ b/src/battle/area/arn/actor/hyper_paragoomba.c @@ -227,7 +227,7 @@ EvtScript N(8021B678) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 30) @@ -654,7 +654,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Run) @@ -925,7 +925,7 @@ EvtScript N(8021E218) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_LOOP(20) @@ -1322,7 +1322,7 @@ EvtScript N(takeTurn_8021FE6C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) diff --git a/src/battle/area/arn/actor/hypergoomba.c b/src/battle/area/arn/actor/hypergoomba.c index d00564c95e..72105b9263 100644 --- a/src/battle/area/arn/actor/hypergoomba.c +++ b/src/battle/area/arn/actor/hypergoomba.c @@ -159,7 +159,7 @@ EvtScript N(802189D4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_LOOP(20) @@ -556,7 +556,7 @@ EvtScript N(takeTurn_8021A628) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 9ebe5d96f1..1862ce735d 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -263,7 +263,7 @@ EvtScript N(takeTurn_802264AC) = { EvtScript N(80226558) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -329,7 +329,7 @@ EvtScript N(80226558) = { EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -353,7 +353,7 @@ EvtScript N(80226558) = { EvtScript N(80226B88) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -436,7 +436,7 @@ EvtScript N(80226B88) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index 3bc19d6d5f..5365504cf8 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -387,7 +387,7 @@ EvtScript N(takeTurn_802245C8) = { EvtScript N(80224B3C) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim03) diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index fcf78c0656..04e85f286f 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -386,7 +386,7 @@ EvtScript N(takeTurn_80219750) = { EvtScript N(80219D88) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -447,7 +447,7 @@ EvtScript N(80219D88) = { EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -473,7 +473,7 @@ EvtScript N(80219D88) = { EvtScript N(8021A36C) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 180) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -554,7 +554,7 @@ EvtScript N(8021A36C) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 424dc4f1ce..5099c3c7b7 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -243,7 +243,7 @@ EvtScript N(takeTurn) = { EvtScript N(attackFistDrop) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -322,7 +322,7 @@ EvtScript N(attackFistDrop) = { EvtScript N(attackBodyCrush) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 180) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/flo/actor/amazy_dayzee.c b/src/battle/area/flo/actor/amazy_dayzee.c index 39cc6b6490..14f621de1c 100644 --- a/src/battle/area/flo/actor/amazy_dayzee.c +++ b/src/battle/area/flo/actor/amazy_dayzee.c @@ -231,7 +231,7 @@ EvtScript N(attackPainfulSong) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, ACTOR_SELF, -20, LVar1, LVar2) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 70) diff --git a/src/battle/area/flo/actor/crazee_dayzee.c b/src/battle/area/flo/actor/crazee_dayzee.c index 3261673688..1d56cb05ec 100644 --- a/src/battle/area/flo/actor/crazee_dayzee.c +++ b/src/battle/area/flo/actor/crazee_dayzee.c @@ -224,7 +224,7 @@ EvtScript N(attackPainfulSong) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, ACTOR_SELF, -20, LVar1, LVar2) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 70) diff --git a/src/battle/area/flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c index ec05bfcf86..662201b6f8 100644 --- a/src/battle/area/flo/actor/lakitu.c +++ b/src/battle/area/flo/actor/lakitu.c @@ -260,7 +260,7 @@ EvtScript N(attackSpinyFlip) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) diff --git a/src/battle/area/flo/actor/ruff_puff.c b/src/battle/area/flo/actor/ruff_puff.c index 37197818e4..292f0a89ba 100644 --- a/src/battle/area/flo/actor/ruff_puff.c +++ b/src/battle/area/flo/actor/ruff_puff.c @@ -233,7 +233,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TuffPuff_Run) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 8b7753dc60..173805e263 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -1500,7 +1500,7 @@ EvtScript N(nextTurn) = { EvtScript N(attackBodySlam) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(AddBattleCamZoom, -200) EVT_CALL(SetBattleCamOffsetZ, -30) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -2390,7 +2390,7 @@ EvtScript N(electicCharge_copy) = { EvtScript N(attackDirectLightning) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(SetBattleCamOffsetZ, 50) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 3aead8175a..5791e826bf 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -238,7 +238,7 @@ EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index b236b64ef3..2e0f1dfcb3 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -162,7 +162,7 @@ EvtScript N(takeTurn_80219444) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 400) EVT_CALL(SetBattleCamOffsetZ, 40) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/isk_part_1/actor/pokey_mummy.c b/src/battle/area/isk_part_1/actor/pokey_mummy.c index bec37c5faa..1431f10536 100644 --- a/src/battle/area/isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area/isk_part_1/actor/pokey_mummy.c @@ -587,7 +587,7 @@ EvtScript N(8021A6C8) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_2EC, SOUND_2EC) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area/isk_part_1/actor/stone_chomp.c b/src/battle/area/isk_part_1/actor/stone_chomp.c index 0f0a3915ef..49107ee2bd 100644 --- a/src/battle/area/isk_part_1/actor/stone_chomp.c +++ b/src/battle/area/isk_part_1/actor/stone_chomp.c @@ -727,7 +727,7 @@ EvtScript N(takeTurn_80222ED0) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) 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 5778d2290e..815953709c 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -775,7 +775,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index c213aa7938..2ff44f5848 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -718,7 +718,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EVT_END }; -EvtScript N(EVS_LiftMarioario) = { +EvtScript N(EVS_LiftMario) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(ANIM_Buzzar_Anim01) @@ -766,7 +766,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -929,7 +929,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(action_command_break_free_start, 0, 60 * DT, 30, 3) - EVT_EXEC_GET_TID(N(EVS_LiftMarioario), LVarA) + EVT_EXEC_GET_TID(N(EVS_LiftMario), LVarA) EVT_WAIT(62) EVT_CALL(GetActionSuccessCopy, LVar0) EVT_IF_GT(LVar0, 0) @@ -1015,7 +1015,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/iwa/actor/cleft.c b/src/battle/area/iwa/actor/cleft.c index f8c0b2d091..ef8f71d874 100644 --- a/src/battle/area/iwa/actor/cleft.c +++ b/src/battle/area/iwa/actor/cleft.c @@ -433,7 +433,7 @@ EvtScript N(80219BA0) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 30) diff --git a/src/battle/area/jan/actor/hurt_plant.c b/src/battle/area/jan/actor/hurt_plant.c index 2ffead49c1..c0863c1d86 100644 --- a/src/battle/area/jan/actor/hurt_plant.c +++ b/src/battle/area/jan/actor/hurt_plant.c @@ -259,7 +259,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim04) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 1) diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index 8232cac589..1ee47821fd 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -299,7 +299,7 @@ EvtScript N(divide) = { EvtScript N(leechAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) diff --git a/src/battle/area/jan/actor/m_bush.c b/src/battle/area/jan/actor/m_bush.c index 6c0bc35cdf..6f6b52ad12 100644 --- a/src/battle/area/jan/actor/m_bush.c +++ b/src/battle/area/jan/actor/m_bush.c @@ -217,7 +217,7 @@ EvtScript N(takeTurn_80221F78) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MBush_Anim04) diff --git a/src/battle/area/jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c index 13c27a0651..9873edb484 100644 --- a/src/battle/area/jan/actor/spear_guy.c +++ b/src/battle/area/jan/actor/spear_guy.c @@ -511,7 +511,7 @@ EvtScript N(spearStab) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim06) @@ -1238,7 +1238,7 @@ EvtScript N(8021C628) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -1333,7 +1333,7 @@ EvtScript N(8021CD50) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index b6f652fc77..acc5dd7044 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -561,7 +561,7 @@ EvtScript N(8021A6D8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_EXEC_WAIT(N(8021A2E8)) @@ -727,7 +727,7 @@ EvtScript N(8021B22C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_EXEC_WAIT(N(8021A2E8)) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba.c b/src/battle/area/kmr_part_2/actor/blue_goomba.c index b0b04ee2a8..41564750e5 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba.c @@ -288,7 +288,7 @@ EvtScript N(takeTurn_8021A5A0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Blue_Run) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba2.c b/src/battle/area/kmr_part_2/actor/blue_goomba2.c index e178626450..4b91ae2b17 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba2.c @@ -286,7 +286,7 @@ EvtScript N(takeTurn_8021E0F0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Blue_Run) 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 2702ede207..8fa6f9bfe4 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -365,14 +365,14 @@ EvtScript N(takeTurn_80221530) = { EvtScript N(80221680) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(SetBattleCamOffsetZ, 20) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba.c b/src/battle/area/kmr_part_2/actor/red_goomba.c index e8847a38bb..fb501e5d6e 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba.c @@ -288,7 +288,7 @@ EvtScript N(takeTurn_8021C3B0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Red_Run) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba2.c b/src/battle/area/kmr_part_2/actor/red_goomba2.c index 045027004e..ec7dd9e1b3 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba2.c @@ -286,7 +286,7 @@ EvtScript N(takeTurn_8021FAF0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaBros_Red_Run) 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 f0c2de22db..0ac6170bf5 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 @@ -384,7 +384,7 @@ EvtScript N(takeTurn_80225314) = { EVT_WAIT(20) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) 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 677aaf4e2d..41d8f836ae 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 @@ -666,7 +666,7 @@ EvtScript N(8022E198) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -812,7 +812,7 @@ EvtScript N(8022ED10) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) 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 3047fd00dd..93188d1d51 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -291,7 +291,7 @@ EvtScript N(takeTurn_802234A4) = { EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Run) 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 546101a1c0..27228fed48 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 @@ -392,7 +392,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area/kmr_part_3/actor/paragoomba.c b/src/battle/area/kmr_part_3/actor/paragoomba.c index 6147948b06..77727bfb25 100644 --- a/src/battle/area/kmr_part_3/actor/paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/paragoomba.c @@ -370,7 +370,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Run) @@ -759,7 +759,7 @@ EvtScript N(takeTurn_8021E788) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Run) diff --git a/src/battle/area/kmr_part_3/actor/spiked_goomba.c b/src/battle/area/kmr_part_3/actor/spiked_goomba.c index ec2db00b05..066630e3cb 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/spiked_goomba.c @@ -301,7 +301,7 @@ EvtScript N(takeTurn_8021B19C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Run) 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 5217a54363..1e765e3a87 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 @@ -442,7 +442,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area/kpa/actor/bony_beetle.c b/src/battle/area/kpa/actor/bony_beetle.c index ba3ac2ec07..96e5a64fc0 100644 --- a/src/battle/area/kpa/actor/bony_beetle.c +++ b/src/battle/area/kpa/actor/bony_beetle.c @@ -415,13 +415,13 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim16) EVT_GOTO(100) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim10) @@ -652,14 +652,14 @@ EvtScript N(attackSpikeBounce) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim17) EVT_WAIT(10) EVT_GOTO(100) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim11) diff --git a/src/battle/area/kpa2/actor/bowser.c b/src/battle/area/kpa2/actor/bowser.c index c5b465ebad..bc624db05b 100644 --- a/src/battle/area/kpa2/actor/bowser.c +++ b/src/battle/area/kpa2/actor/bowser.c @@ -263,7 +263,7 @@ EvtScript N(normalAttack) = { EvtScript N(attackClawSwipe) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -325,7 +325,7 @@ EvtScript N(attackClawSwipe) = { EvtScript N(attackHeavyJump) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -420,7 +420,7 @@ EvtScript N(attackFlameBreath) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 150) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index 530ab0ef55..85c8ede25a 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -331,7 +331,7 @@ EvtScript N(takeTurn) = { EvtScript N(attackClawSwipe) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index 0c469ce1d3..14cfc116f3 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -994,14 +994,14 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(SetBattleCamOffsetZ, 36) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(SetBattleCamOffsetZ, 14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1214,13 +1214,13 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 160) EVT_CALL(SetBattleCamOffsetZ, 5) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index 67516c63c8..a19569bbb4 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -847,14 +847,14 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(SetBattleCamOffsetZ, 54) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(SetBattleCamOffsetZ, 21) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1067,13 +1067,13 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 160) EVT_CALL(SetBattleCamOffsetZ, 5) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index b5673de582..459c842be8 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -1080,14 +1080,14 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(SetBattleCamOffsetZ, 54) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(SetBattleCamOffsetZ, 21) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1300,13 +1300,13 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 160) EVT_CALL(SetBattleCamOffsetZ, 5) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/kpa3/actor/anti_guy.c b/src/battle/area/kpa3/actor/anti_guy.c index fc5ffeb566..def48e7060 100644 --- a/src/battle/area/kpa3/actor/anti_guy.c +++ b/src/battle/area/kpa3/actor/anti_guy.c @@ -229,7 +229,7 @@ EvtScript N(bumpAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -324,7 +324,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index ee30258c8c..792f80002f 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -232,7 +232,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BulletBill_Gold_Anim04) diff --git a/src/battle/area/kzn/actor/lava_bubble.c b/src/battle/area/kzn/actor/lava_bubble.c index 4d18588cfe..f9b789c0b6 100644 --- a/src/battle/area/kzn/actor/lava_bubble.c +++ b/src/battle/area/kzn/actor/lava_bubble.c @@ -344,7 +344,7 @@ EvtScript N(fireTackle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim03) @@ -462,7 +462,7 @@ EvtScript N(fireballs_Partner) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -546,7 +546,7 @@ EvtScript N(fireballs_Player) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim03) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index 96cc3d52c3..c1b8df2016 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -564,7 +564,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) @@ -587,7 +587,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_END_IF EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetBattlePhase, LVar0) - EVT_IF_EQ(LVar0, 1) + EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) EVT_CALL(SetBattleCamZoom, 430) EVT_CALL(SetBattleCamOffsetZ, 20) @@ -721,7 +721,7 @@ EvtScript N(takeTurn_Chan) = { EVT_RETURN EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_EnterShell) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 83b72ac1a6..76dee0b651 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -258,7 +258,7 @@ EvtScript N(flyingTackle) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_Crouch) @@ -716,7 +716,7 @@ EvtScript N(8021F08C) = { }; EvtScript N(8021F514) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1808,7 +1808,7 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -2179,7 +2179,7 @@ EvtScript N(80223B74) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) @@ -3450,7 +3450,7 @@ EvtScript N(handleEvent_80226B54) = { EvtScript N(takeTurn_802270BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -3942,7 +3942,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index f5d573c3c9..f250887a10 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -219,7 +219,7 @@ EvtScript N(takeTurn_8022AA54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Run) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 17fb6615fe..dca5f6fe43 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -229,7 +229,7 @@ EvtScript N(8022B8C0) = { EvtScript N(singleStrike2) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 7c052972d6..c069b98e3c 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -254,7 +254,7 @@ EvtScript N(8022DC44) = { EvtScript N(singleStrike3) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun) diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c index 578f8e4f05..acbe25b6cd 100644 --- a/src/battle/area/mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -297,7 +297,7 @@ EvtScript N(80218C48) = { EvtScript N(80219054) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) diff --git a/src/battle/area/mim/actor/piranha_plant.c b/src/battle/area/mim/actor/piranha_plant.c index 02ea18f991..6632734853 100644 --- a/src/battle/area/mim/actor/piranha_plant.c +++ b/src/battle/area/mim/actor/piranha_plant.c @@ -263,7 +263,7 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim04) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 1) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 9adaae1caa..139df48481 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -801,7 +801,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 280) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/area/omo/actor/anti_guy.c b/src/battle/area/omo/actor/anti_guy.c index 816c7293d3..fb94a2cc78 100644 --- a/src/battle/area/omo/actor/anti_guy.c +++ b/src/battle/area/omo/actor/anti_guy.c @@ -233,7 +233,7 @@ EvtScript N(802220FC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -328,7 +328,7 @@ EvtScript N(80222824) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo/actor/blue_shy_guy.c b/src/battle/area/omo/actor/blue_shy_guy.c index 822e3d5330..f58ad2034f 100644 --- a/src/battle/area/omo/actor/blue_shy_guy.c +++ b/src/battle/area/omo/actor/blue_shy_guy.c @@ -234,7 +234,7 @@ EvtScript N(8021B504) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -329,7 +329,7 @@ EvtScript N(8021BC2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo/actor/green_shy_guy.c b/src/battle/area/omo/actor/green_shy_guy.c index 8b9105ce23..c4c4683f26 100644 --- a/src/battle/area/omo/actor/green_shy_guy.c +++ b/src/battle/area/omo/actor/green_shy_guy.c @@ -234,7 +234,7 @@ EvtScript N(80220604) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -329,7 +329,7 @@ EvtScript N(80220D2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c index 4a5e1be891..a78c1747af 100644 --- a/src/battle/area/omo/actor/groove_guy.c +++ b/src/battle/area/omo/actor/groove_guy.c @@ -252,7 +252,7 @@ EvtScript N(basicAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim04) @@ -344,7 +344,7 @@ EvtScript N(sleepySpin) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) diff --git a/src/battle/area/omo/actor/pink_shy_guy.c b/src/battle/area/omo/actor/pink_shy_guy.c index 086f43085f..ff912741d7 100644 --- a/src/battle/area/omo/actor/pink_shy_guy.c +++ b/src/battle/area/omo/actor/pink_shy_guy.c @@ -234,7 +234,7 @@ EvtScript N(8021EB04) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -329,7 +329,7 @@ EvtScript N(8021F22C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo/actor/pyro_guy.c b/src/battle/area/omo/actor/pyro_guy.c index 4d23dfea1a..c006fe21a8 100644 --- a/src/battle/area/omo/actor/pyro_guy.c +++ b/src/battle/area/omo/actor/pyro_guy.c @@ -240,7 +240,7 @@ EvtScript N(handleEvent_8022CE60) = { EvtScript N(takeTurn_8022D344) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_PyroGuy_Anim03) diff --git a/src/battle/area/omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c index 767a136d52..a8d776e5ee 100644 --- a/src/battle/area/omo/actor/sky_guy.c +++ b/src/battle/area/omo/actor/sky_guy.c @@ -749,7 +749,7 @@ EvtScript N(8022B7EC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -844,7 +844,7 @@ EvtScript N(8022BF14) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo/actor/spy_guy.c b/src/battle/area/omo/actor/spy_guy.c index 2873dea832..34ad9f405f 100644 --- a/src/battle/area/omo/actor/spy_guy.c +++ b/src/battle/area/omo/actor/spy_guy.c @@ -460,7 +460,7 @@ EvtScript N(hammerAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim07) diff --git a/src/battle/area/omo/actor/yellow_shy_guy.c b/src/battle/area/omo/actor/yellow_shy_guy.c index 46d4dd756d..f3c072a880 100644 --- a/src/battle/area/omo/actor/yellow_shy_guy.c +++ b/src/battle/area/omo/actor/yellow_shy_guy.c @@ -234,7 +234,7 @@ EvtScript N(8021D004) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -329,7 +329,7 @@ EvtScript N(8021D72C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index c3823fdc1c..ba5713971f 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -643,7 +643,7 @@ EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamOffsetZ, 40) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) @@ -1054,7 +1054,7 @@ EvtScript N(shy_guy_attack1) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -1149,7 +1149,7 @@ EvtScript N(shy_guy_attack2) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index fd246b82ca..af5e385e92 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -1245,7 +1245,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/area/omo2_5/actor/shy_squad_dup.c b/src/battle/area/omo2_5/actor/shy_squad_dup.c index 74c9ed62fa..65934097aa 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_dup.c +++ b/src/battle/area/omo2_5/actor/shy_squad_dup.c @@ -1059,7 +1059,7 @@ EvtScript N(attack) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index cd27ab44fb..469ef5d807 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -530,7 +530,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 260) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) @@ -601,7 +601,7 @@ EvtScript N(attackHeavyJump) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 320) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/area/pra/actor/albino_dino.c b/src/battle/area/pra/actor/albino_dino.c index d18a781580..0bf42fadb5 100644 --- a/src/battle/area/pra/actor/albino_dino.c +++ b/src/battle/area/pra/actor/albino_dino.c @@ -237,7 +237,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_EXEC_GET_TID(N(stamp), LVar9) diff --git a/src/battle/area/sam/actor/frost_piranha.c b/src/battle/area/sam/actor/frost_piranha.c index 39c0f265bf..7f3b676c54 100644 --- a/src/battle/area/sam/actor/frost_piranha.c +++ b/src/battle/area/sam/actor/frost_piranha.c @@ -284,7 +284,7 @@ EvtScript N(attack_bite) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim17) EVT_WAIT(8) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim03) @@ -398,7 +398,7 @@ EvtScript N(attack_icy_breath) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim03) diff --git a/src/battle/area/sam/actor/gulpit.c b/src/battle/area/sam/actor/gulpit.c index 310e34fa31..ec077b8f54 100644 --- a/src/battle/area/sam/actor/gulpit.c +++ b/src/battle/area/sam/actor/gulpit.c @@ -247,7 +247,7 @@ EvtScript N(attack_lick) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) @@ -319,7 +319,7 @@ EvtScript N(attack_rock) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/area/tik/actor/dark_koopa.c b/src/battle/area/tik/actor/dark_koopa.c index c0b7a9de5e..e7ff7964dd 100644 --- a/src/battle/area/tik/actor/dark_koopa.c +++ b/src/battle/area/tik/actor/dark_koopa.c @@ -576,7 +576,7 @@ EvtScript N(attackShellToss) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellEnter) @@ -692,7 +692,7 @@ EvtScript N(attackDizzyTornado) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) diff --git a/src/battle/area/tik/actor/dark_paratroopa.c b/src/battle/area/tik/actor/dark_paratroopa.c index 48549254af..723d406cdc 100644 --- a/src/battle/area/tik/actor/dark_paratroopa.c +++ b/src/battle/area/tik/actor/dark_paratroopa.c @@ -1126,7 +1126,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellEnter) @@ -1242,7 +1242,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) diff --git a/src/battle/area/tik/actor/gloomba.c b/src/battle/area/tik/actor/gloomba.c index 0f6e48df26..4dd9267aca 100644 --- a/src/battle/area/tik/actor/gloomba.c +++ b/src/battle/area/tik/actor/gloomba.c @@ -287,7 +287,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_Run) diff --git a/src/battle/area/tik/actor/paragloomba.c b/src/battle/area/tik/actor/paragloomba.c index b6cb13c446..f27fbf6907 100644 --- a/src/battle/area/tik/actor/paragloomba.c +++ b/src/battle/area/tik/actor/paragloomba.c @@ -375,7 +375,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Run) @@ -758,7 +758,7 @@ EvtScript N(takeTurn_gloomba) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_Run) diff --git a/src/battle/area/tik/actor/spiked_gloomba.c b/src/battle/area/tik/actor/spiked_gloomba.c index 54b94723fa..8d99698573 100644 --- a/src/battle/area/tik/actor/spiked_gloomba.c +++ b/src/battle/area/tik/actor/spiked_gloomba.c @@ -303,7 +303,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Dark_Run) diff --git a/src/battle/area/trd_part_1/actor/bob_omb.c b/src/battle/area/trd_part_1/actor/bob_omb.c index 5caca4d6a7..5cc00a7b6a 100644 --- a/src/battle/area/trd_part_1/actor/bob_omb.c +++ b/src/battle/area/trd_part_1/actor/bob_omb.c @@ -502,7 +502,7 @@ EvtScript N(handleEvent_8021B4A8) = { EvtScript N(tackleAttack) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -612,7 +612,7 @@ EvtScript N(tackleAttack) = { EvtScript N(blastAttack) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, 0x80000001) diff --git a/src/battle/area/trd_part_1/actor/bullet_bill.c b/src/battle/area/trd_part_1/actor/bullet_bill.c index 11aeb458e3..76d5fabaa2 100644 --- a/src/battle/area/trd_part_1/actor/bullet_bill.c +++ b/src/battle/area/trd_part_1/actor/bullet_bill.c @@ -233,7 +233,7 @@ EvtScript N(takeTurn_802197C0) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BulletBill_Anim04) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 01adc5c294..58a2e6deed 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -499,7 +499,7 @@ EvtScript N(takeTurn) = { EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 5254b56516..93d275eaa0 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -561,7 +561,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) @@ -718,7 +718,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim0C) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index ee1fac0da8..1695d0d243 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -321,7 +321,7 @@ EvtScript N(attackThornStab) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bzzap_Anim03) @@ -461,7 +461,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_FLY, 0, 0) diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 0afe99e5fc..167e604aaf 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -204,7 +204,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 37c860015a..933186ec3a 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -240,7 +240,7 @@ EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Duplighost_Anim07) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 48d1b2ce81..3c1378a630 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -445,7 +445,7 @@ EvtScript N(8021BE64) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim03) @@ -563,7 +563,7 @@ EvtScript N(8021C654) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -647,7 +647,7 @@ EvtScript N(8021CBC8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim03) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index c81de1ddbf..6e4edde5fe 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -231,7 +231,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) diff --git a/src/battle/common/actor/ghost_bombette.inc.c b/src/battle/common/actor/ghost_bombette.inc.c index 33bc14876e..a1d0563abd 100644 --- a/src/battle/common/actor/ghost_bombette.inc.c +++ b/src/battle/common/actor/ghost_bombette.inc.c @@ -244,7 +244,7 @@ EvtScript N(bombette_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index 9d8eb0eee4..97c29aa452 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -289,7 +289,7 @@ EvtScript N(goombario_returnBack) = { }; EvtScript N(goombario_runToPlayer) = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/ghost_lakilester.inc.c b/src/battle/common/actor/ghost_lakilester.inc.c index 854dcc7078..3af1c74738 100644 --- a/src/battle/common/actor/ghost_lakilester.inc.c +++ b/src/battle/common/actor/ghost_lakilester.inc.c @@ -231,7 +231,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) diff --git a/src/battle/common/actor/ghost_parakarry.inc.c b/src/battle/common/actor/ghost_parakarry.inc.c index 1e5af7bce5..1302a392aa 100644 --- a/src/battle/common/actor/ghost_parakarry.inc.c +++ b/src/battle/common/actor/ghost_parakarry.inc.c @@ -230,7 +230,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) diff --git a/src/battle/common/actor/ghost_sushie.inc.c b/src/battle/common/actor/ghost_sushie.inc.c index 9f02242a97..35e35eb2b8 100644 --- a/src/battle/common/actor/ghost_sushie.inc.c +++ b/src/battle/common/actor/ghost_sushie.inc.c @@ -209,7 +209,7 @@ EvtScript N(sushie_handleEvent) = { EvtScript N(sushie_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index a0caf2c064..f5c944b2f3 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -285,7 +285,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Run) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index b975817b16..c0ec5eb6cc 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -619,7 +619,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index e74151694a..cdf80e7fd7 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -621,7 +621,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 69b7a731b6..90ce333937 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -492,7 +492,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellEnter) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index bbea1b82c6..37c2ebb9cb 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -687,7 +687,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_WAIT(10) @@ -845,7 +845,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_LOOP(20) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 5e3b0672ce..379568671d 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -248,7 +248,7 @@ EvtScript N(flyingAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_THREAD @@ -358,7 +358,7 @@ EvtScript N(healOneAlly) = { EVT_SET(LVarA, LVar0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(GetOwnerID, LVar0) EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) @@ -372,7 +372,7 @@ EvtScript N(healOneAlly) = { EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim01) EVT_WAIT(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, LVarA) EVT_CALL(GetEnemyMaxHP, LVarA, LVar4) EVT_MUL(LVar4, 60) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 3933329801..b09627cdbd 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -370,7 +370,7 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Run) @@ -762,7 +762,7 @@ EvtScript N(takeTurn_8021D6E8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Run) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index fe96d1a2b9..2ae530bd14 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -1049,7 +1049,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellEnter) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index b1c1af5706..32fcee78ba 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -467,7 +467,7 @@ EvtScript N(timberAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -999,7 +999,7 @@ EvtScript N(attackHeadDive) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_2EC, SOUND_2EC) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 698aeec9ad..2100f0bbd0 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -274,7 +274,7 @@ EvtScript N(bite) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(8) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim03) @@ -389,7 +389,7 @@ EvtScript N(breath) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim03) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index cc550e4daf..7163501708 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -619,7 +619,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index abd8d797d9..a91f66cf1a 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -228,7 +228,7 @@ EvtScript N(bumpAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -323,7 +323,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 1e5915dc15..67c979539e 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -564,7 +564,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) @@ -722,7 +722,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_RETURN EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim0B) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index dda3c9775d..05773b228f 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -301,7 +301,7 @@ EvtScript N(takeTurn_8021F1BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Run) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 1798307d0b..5db82e3a6f 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -391,7 +391,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 3f70d1e946..dfe8208aa8 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -429,7 +429,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) @@ -519,7 +519,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index aff2c12e9e..32e783d131 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -434,7 +434,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) @@ -891,7 +891,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 2d08a6e776..1b04e00298 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -206,7 +206,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(GetBattlePhase, LVar0) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 9a8b43b708..9bd6c70565 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -624,7 +624,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index f48ea054f4..0a3f6ef90c 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -618,7 +618,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) + EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index 97d13e7537..f7aa10e1f5 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -252,7 +252,7 @@ EvtScript N(EVS_JumpSupport_I) = { EVT_END }; -EvtScript N(EVS_JumpSupport_J) = { +EvtScript N(EVS_JumpSupport_Miss) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_Mario1_SpinFall) EVT_CALL(PlayerLandJump) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_SpinFall) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index 5b2830a2e7..fb57145692 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -64,7 +64,7 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_CALL(GetActionCommandMode, LVar0) @@ -118,7 +118,7 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -173,7 +173,7 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -337,7 +337,7 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -388,7 +388,7 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -445,7 +445,7 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -518,7 +518,7 @@ EvtScript N(EVS_802A4018) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_CALL(GetActionCommandMode, LVar0) diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index 0d2e71df3a..9fe9a61eb5 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -42,7 +42,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -93,7 +93,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -148,7 +148,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 90340db63c..bdc234b2e2 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -30,7 +30,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), FALSE) @@ -102,7 +102,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -172,7 +172,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), FALSE) @@ -249,7 +249,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -319,7 +319,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), FALSE) @@ -389,7 +389,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index bb6a64c07f..0023ac3b4a 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -46,7 +46,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_CALL(DidActionSucceed, LVarA) @@ -105,7 +105,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -166,7 +166,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 2678bd4041..6a585c955e 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -72,7 +72,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -208,7 +208,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -344,7 +344,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index cb4aa5b921..8a14c1f619 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -29,7 +29,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -80,7 +80,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -135,7 +135,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c index c8a65da834..82dc010d38 100644 --- a/src/battle/move/jump/mega_jump.c +++ b/src/battle/move/jump/mega_jump.c @@ -49,7 +49,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) @@ -77,7 +77,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) @@ -105,7 +105,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 6d4cd21fcc..e40b320101 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -43,7 +43,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), FALSE) @@ -115,7 +115,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -194,7 +194,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), FALSE) @@ -271,7 +271,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -350,7 +350,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), FALSE) @@ -420,7 +420,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index 7465990020..09c272f958 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -91,7 +91,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -233,7 +233,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -375,7 +375,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/power_jump.c b/src/battle/move/jump/power_jump.c index d10a751d6d..82abbab739 100644 --- a/src/battle/move/jump/power_jump.c +++ b/src/battle/move/jump/power_jump.c @@ -43,7 +43,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) @@ -71,7 +71,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) @@ -99,7 +99,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index 3b5720226c..ec85be6efc 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -29,7 +29,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -80,7 +80,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -135,7 +135,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index bfb5cad0af..85d9f3ce78 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -29,7 +29,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -80,7 +80,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) @@ -135,7 +135,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c index 0586b8df75..4ae15caffe 100644 --- a/src/battle/move/jump/super_jump.c +++ b/src/battle/move/jump/super_jump.c @@ -45,7 +45,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) @@ -73,7 +73,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_EXEC_WAIT(N(EVS_802A26B4)) @@ -101,7 +101,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index ff710869f6..acb033b90a 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -895,7 +895,7 @@ EvtScript N(runToTarget) = { EVT_SET(LVar3, LVar0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_47) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PARTNER_APPROACH) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Run) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 29b95fd718..7043a89d1d 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -969,7 +969,7 @@ EvtScript N(powerShock) = { EVT_IF_FLAG(LVar0, ACTOR_FLAG_UPSIDE_DOWN) EVT_SET(LocalFlag(15), 1) EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_47) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PARTNER_APPROACH) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -1017,7 +1017,7 @@ EvtScript N(powerShock) = { EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 5) EVT_CALL(N(PowerShockFX), LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_47) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PARTNER_APPROACH) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 5) EVT_THREAD diff --git a/src/battle_cam.c b/src/battle_cam.c index b4dcbeb026..296c21f837 100644 --- a/src/battle_cam.c +++ b/src/battle_cam.c @@ -1466,31 +1466,31 @@ void btl_cam_use_preset_impl(s32 id) { preset = &CamPreset_B; break; case BTL_CAM_DEFAULT: - if (BattleCam_CurrentPresetID != id) { - BattleCam_BoomLength = 500; - BattleCam_MoveTimeLeft = 30; - preset = &EVS_BattleCam_Default; - break; + if (BattleCam_CurrentPresetID == id) { + return; } - return; + BattleCam_BoomLength = 500; + BattleCam_MoveTimeLeft = 30; + preset = &EVS_BattleCam_Default; + break; case BTL_CAM_PRESET_03: - if (BattleCam_CurrentPresetID != id) { - BattleCam_BoomLength = 480; - BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_D; - break; + if (BattleCam_CurrentPresetID == id) { + return; } - return; + BattleCam_BoomLength = 480; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 0; + preset = &CamPreset_D; + break; case BTL_CAM_PRESET_04: - if (BattleCam_CurrentPresetID != id) { - BattleCam_BoomLength = 500; - BattleCam_MoveTimeLeft = 10; - BattleCam_BoomZOffset = 0; - preset = &CamPreset_E; - break; + if (BattleCam_CurrentPresetID == id) { + return; } - return; + BattleCam_BoomLength = 500; + BattleCam_MoveTimeLeft = 10; + BattleCam_BoomZOffset = 0; + preset = &CamPreset_E; + break; case BTL_CAM_PRESET_05: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; @@ -1529,9 +1529,10 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; + BattleCam_BoomZOffset = 15; BattleCam_BoomYaw = 0; + preset = &CamPreset_F; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; break; @@ -1922,24 +1923,24 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 166; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 1; - preset = &CamPreset_N; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 17; + preset = &CamPreset_N; BattleCam_ModeY = BTL_CAM_MODEY_0; BattleCam_ModeX = BTL_CAM_MODEX_0; - BattleCam_PosZ = 0.0f; BattleCam_PosX = -75.0f; BattleCam_PosY = 150.0f; + BattleCam_PosZ = 0.0f; break; - case BTL_CAM_PRESET_47: + case BTL_CAM_PARTNER_APPROACH: BattleCam_BoomLength = 310; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; + preset = &CamPreset_M; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_M; - BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PARTNER; D_8029F2A6 = FALSE; break; @@ -2110,7 +2111,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_TargetActor = ACTOR_PARTNER; preset = &CamPreset_I; break; - case BTL_CAM_PRESET_63: + case BTL_CAM_ENEMY_APPROACH: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; diff --git a/src/sprite.h b/src/sprite.h index 1269071bf9..d445ad98b2 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -86,6 +86,12 @@ typedef struct SpriteInstance { /* 0x10 */ s32 notifyValue; } SpriteInstance; // size = 0x14 +typedef struct PlayerRastersHeader { + /* 0x00 */ s32 indexRanges; + /* 0x04 */ s32 loadDescriptors; + /* 0x08 */ s32 imageData; +} PlayerRastersHeader; // size = 0xC + typedef struct PlayerSpriteSet { /// Number of cache entries. /* 0x00 */ s32 cacheSize; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 67bacd9e97..0c8dbdb98e 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -14601,7 +14601,7 @@ EVS_JumpSupport_E = 0x802A15D8; // type:data rom:0x7661F8 D_802A17C4 = 0x802A17C4; // type:data rom:0x7663E4 EVS_JumpSupport_H = 0x802A1B9C; // type:data rom:0x7667BC EVS_JumpSupport_I = 0x802A1D88; // type:data rom:0x7669A8 -EVS_JumpSupport_J = 0x802A1FEC; // type:data rom:0x766C0C +EVS_JumpSupport_Miss = 0x802A1FEC; // type:data rom:0x766C0C EVS_JumpSupport_K = 0x802A2184; // type:data rom:0x766DA4 EVS_JumpSupport_L = 0x802A2230; // type:data rom:0x766E50 EVS_JumpSupport_M = 0x802A2384; // type:data rom:0x766FA4 @@ -27194,13 +27194,13 @@ D_802DFE9C = 0x802DFE9C; // type:data D_802DFEA0 = 0x802DFEA0; // type:data SpriteUpdateNotifyValue = 0x802DFEAC; // type:data spr_asset_entry = 0x802DFEB0; // type:data -D_802DFEB8 = 0x802DFEB8; // type:data -PlayerRasterSetsLoaded = 0x802E004C; // type:data -PlayerRasterBufferSetOffsets = 0x802E0050; // type:data -D_802E0090 = 0x802E0090; // type:data +PlayerRasterLoadDescBuffer = 0x802DFEB8; // type:data +PlayerRasterLoadDescNumLoaded = 0x802E004C; // type:data +PlayerRasterLoadDescBeginSpriteIndex = 0x802E0050; // type:data +PlayerRasterLoadDesc = 0x802E0090; // type:data PlayerRasterHeader = 0x802E0C10; // type:data D_802E0C14 = 0x802E0C14; // type:data -D_802E0C20 = 0x802E0C20; // type:data +PlayerSpriteRasterSets = 0x802E0C20; // type:data PlayerRasterCacheSize = 0x802E0C58; // type:data PlayerRasterMaxSize = 0x802E0C5C; // type:data SpriteDataHeader = 0x802E0C60; // type:data