From cedc446607f66e25e1cf817dbb5153dfeac0120a Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 27 Sep 2025 21:55:19 -0400 Subject: [PATCH] fix misnamed fear status --- include/enums.h | 12 +++++----- include/macros.h | 4 ++-- src/battle/190B20.c | 8 +++---- src/battle/1A5830.c | 2 +- src/battle/actor_api.c | 4 ++-- src/battle/actor_rendering.c | 8 +++---- src/battle/actors.c | 4 ++-- src/battle/area/arn/actor/tubba_blubba.c | 6 ++--- src/battle/area/arn/actor/tubbas_heart.c | 8 +++---- src/battle/area/dgb/actor/tubba_blubba.c | 6 ++--- src/battle/area/dig/actor/tubba_blubba.c | 6 ++--- src/battle/area/flo2/actor/huff_n_puff.c | 10 ++++---- src/battle/area/flo2/actor/monty_mole_boss.c | 6 ++--- src/battle/area/flo2/actor/spike.c | 6 ++--- src/battle/area/flo2/actor/tuff_puff.c | 8 +++---- src/battle/area/hos/actor/goombario_tutor.c | 4 ++-- src/battle/area/hos/actor/magikoopa.c | 20 ++++++++-------- .../area/isk_part_2/actor/chain_chomp.c | 4 ++-- src/battle/area/isk_part_2/actor/tutankoopa.c | 4 ++-- src/battle/area/iwa/actor/buzzar.c | 4 ++-- src/battle/area/kgr/actor/fuzzipede.c | 8 +++---- src/battle/area/kkj/actor/kammy_koopa.c | 4 ++-- .../area/kmr_part_2/actor/blue_goomba_1.c | 8 +++---- .../area/kmr_part_2/actor/blue_goomba_2.c | 8 +++---- .../area/kmr_part_2/actor/goomba_king.c | 4 ++-- .../area/kmr_part_2/actor/goomnut_tree.c | 4 ++-- .../area/kmr_part_2/actor/red_goomba_1.c | 8 +++---- .../area/kmr_part_2/actor/red_goomba_2.c | 8 +++---- .../area/kmr_part_3/actor/egg_jr_troopa.c | 4 ++-- .../area/kmr_part_3/actor/final_jr_troopa.c | 12 +++++----- src/battle/area/kmr_part_3/actor/jr_troopa.c | 4 ++-- .../area/kmr_part_3/actor/mage_jr_troopa.c | 4 ++-- .../area/kmr_part_3/actor/para_jr_troopa.c | 4 ++-- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 4 ++-- .../kmr_part_3/actor/tutorial_paragoomba.c | 12 +++++----- .../kmr_part_3/actor/tutorial_spiked_goomba.c | 8 +++---- src/battle/area/kpa2/actor/final_bowser_1.c | 8 +++---- src/battle/area/kpa2/actor/final_bowser_2.c | 8 +++---- src/battle/area/kpa2/actor/hallway_bowser.c | 8 +++---- src/battle/area/kpa2/actor/intro_bowser.c | 8 +++---- src/battle/area/kpa2/actor/unused_bowser.c | 4 ++-- src/battle/area/kpa4/actor/bombshell_bill.c | 4 ++-- .../area/kpa4/actor/bombshell_blaster.c | 4 ++-- src/battle/area/kzn2/actor/lava_bud.c | 4 ++-- src/battle/area/kzn2/actor/lava_piranha.c | 4 ++-- src/battle/area/kzn2/actor/petit_piranha.c | 4 ++-- .../area/kzn2/actor/petit_piranha_bomb.c | 4 ++-- src/battle/area/mac/actor/chan.c | 10 ++++---- src/battle/area/mac/actor/lee.c | 4 ++-- src/battle/area/mac/actor/lee_bombette.inc.c | 6 ++--- src/battle/area/mac/actor/lee_bow.inc.c | 6 ++--- src/battle/area/mac/actor/lee_goombario.inc.c | 6 ++--- src/battle/area/mac/actor/lee_kooper.inc.c | 8 +++---- .../area/mac/actor/lee_lakilester.inc.c | 6 ++--- src/battle/area/mac/actor/lee_parakarry.inc.c | 6 ++--- src/battle/area/mac/actor/lee_sushie.inc.c | 6 ++--- src/battle/area/mac/actor/lee_watt.inc.c | 6 ++--- src/battle/area/mac/actor/master1.c | 4 ++-- src/battle/area/mac/actor/master2.c | 4 ++-- src/battle/area/mac/actor/master3.c | 4 ++-- src/battle/area/nok/actor/kent_c_koopa.c | 6 ++--- src/battle/area/omo2/actor/general_guy.c | 8 +++---- src/battle/area/omo2/actor/light_bulb.c | 4 ++-- src/battle/area/omo2/actor/toy_tank.c | 4 ++-- src/battle/area/omo2_1/actor/shy_squad.c | 6 ++--- src/battle/area/omo2_2/actor/stilt_guy.c | 12 +++++----- src/battle/area/omo2_3/actor/shy_stack.c | 12 +++++----- src/battle/area/omo2_4/actor/signal_guy.c | 4 ++-- .../area/omo2_5/actor/shy_squad_redux.c | 4 ++-- src/battle/area/omo2_6/actor/shy_squad_stub.c | 6 ++--- .../area/omo3/actor/big_lantern_ghost.c | 6 ++--- src/battle/area/pra2/actor/crystal_bit.c | 4 ++-- src/battle/area/pra2/actor/crystal_king.c | 8 +++---- src/battle/area/sam2/actor/monstar.c | 4 ++-- src/battle/area/tik2/actor/blooper.c | 4 ++-- src/battle/area/tik2/actor/blooper_baby.c | 4 ++-- src/battle/area/tik2/actor/electro_blooper.c | 8 +++---- src/battle/area/tik2/actor/super_blooper.c | 8 +++---- .../trd_part_2/actor/common_koopa_bros.inc.c | 4 ++-- .../area/trd_part_2/actor/fake_bowser.c | 4 ++-- src/battle/area/trd_part_3/actor/eldstar.c | 4 ++-- src/battle/btl_states_actions.c | 6 ++--- src/battle/btl_states_menus.c | 8 +++---- src/battle/common/actor/albino_dino.inc.c | 8 +++---- src/battle/common/actor/amazy_dayzee.inc.c | 6 ++--- src/battle/common/actor/anti_guy.inc.c | 6 ++--- src/battle/common/actor/bandit.inc.c | 8 +++---- src/battle/common/actor/bill_blaster.inc.c | 4 ++-- src/battle/common/actor/bob_omb.inc.c | 12 +++++----- src/battle/common/actor/bony_beetle.inc.c | 12 +++++----- src/battle/common/actor/bullet_bill.inc.c | 4 ++-- src/battle/common/actor/buzzy_beetle.inc.c | 10 ++++---- src/battle/common/actor/bzzap.inc.c | 6 ++--- src/battle/common/actor/cleft.inc.c | 8 +++---- src/battle/common/actor/clubba.inc.c | 6 ++--- src/battle/common/actor/crazee_dayzee.inc.c | 6 ++--- src/battle/common/actor/dark_koopa.inc.c | 14 +++++------ src/battle/common/actor/dark_paratroopa.inc.c | 24 +++++++++---------- src/battle/common/actor/dry_bones.inc.c | 10 ++++---- src/battle/common/actor/duplighost.inc.c | 6 ++--- .../actor/duplighost/ghost_bombette.inc.c | 6 ++--- .../common/actor/duplighost/ghost_bow.inc.c | 6 ++--- .../actor/duplighost/ghost_goombario.inc.c | 6 ++--- .../actor/duplighost/ghost_kooper.inc.c | 8 +++---- .../actor/duplighost/ghost_lakilester.inc.c | 6 ++--- .../actor/duplighost/ghost_parakarry.inc.c | 6 ++--- .../actor/duplighost/ghost_sushie.inc.c | 6 ++--- .../common/actor/duplighost/ghost_watt.inc.c | 6 ++--- src/battle/common/actor/ember.inc.c | 6 ++--- src/battle/common/actor/forest_fuzzy.inc.c | 6 ++--- src/battle/common/actor/frost_piranha.inc.c | 4 ++-- src/battle/common/actor/fuzzy.inc.c | 6 ++--- src/battle/common/actor/gloomba.inc.c | 8 +++---- src/battle/common/actor/goomba.inc.c | 8 +++---- src/battle/common/actor/gray_magikoopa.inc.c | 12 +++++----- src/battle/common/actor/green_magikoopa.inc.c | 12 +++++----- src/battle/common/actor/groove_guy.inc.c | 6 ++--- src/battle/common/actor/gulpit.inc.c | 6 ++--- src/battle/common/actor/gulpit_rocks.inc.c | 4 ++-- src/battle/common/actor/hammer_bro.inc.c | 6 ++--- src/battle/common/actor/hurt_plant.inc.c | 6 ++--- src/battle/common/actor/hyper_cleft.inc.c | 10 ++++---- src/battle/common/actor/hyper_goomba.inc.c | 10 ++++---- .../common/actor/hyper_paragoomba.inc.c | 20 ++++++++-------- src/battle/common/actor/jungle_fuzzy.inc.c | 6 ++--- src/battle/common/actor/koopa_troopa.inc.c | 10 ++++---- src/battle/common/actor/koopatrol.inc.c | 16 ++++++------- src/battle/common/actor/lakitu.inc.c | 6 ++--- src/battle/common/actor/lava_bubble.inc.c | 6 ++--- src/battle/common/actor/m_bush.inc.c | 6 ++--- src/battle/common/actor/magikoopa.inc.c | 20 ++++++++-------- src/battle/common/actor/medi_guy.inc.c | 6 ++--- src/battle/common/actor/monty_mole.inc.c | 6 ++--- src/battle/common/actor/paragloomba.inc.c | 16 ++++++------- src/battle/common/actor/paragoomba.inc.c | 12 +++++----- src/battle/common/actor/paratroopa.inc.c | 20 ++++++++-------- src/battle/common/actor/piranha_plant.inc.c | 6 ++--- src/battle/common/actor/pokey.inc.c | 12 +++++----- src/battle/common/actor/pokey_mummy.inc.c | 12 +++++----- src/battle/common/actor/putrid_piranha.inc.c | 4 ++-- src/battle/common/actor/pyro_guy.inc.c | 6 ++--- src/battle/common/actor/red_magikoopa.inc.c | 12 +++++----- src/battle/common/actor/ruff_puff.inc.c | 4 ++-- src/battle/common/actor/shy_guy_base.inc.c | 6 ++--- src/battle/common/actor/sky_guy.inc.c | 18 +++++++------- src/battle/common/actor/slot_machine.inc.c | 4 ++-- src/battle/common/actor/spear_guy.inc.c | 22 ++++++++--------- src/battle/common/actor/spike_top.inc.c | 10 ++++---- src/battle/common/actor/spiked_gloomba.inc.c | 8 +++---- src/battle/common/actor/spiked_goomba.inc.c | 8 +++---- src/battle/common/actor/spiny.inc.c | 8 +++---- src/battle/common/actor/spy_guy.inc.c | 8 +++---- src/battle/common/actor/stone_chomp.inc.c | 4 ++-- src/battle/common/actor/swooper.inc.c | 8 +++---- src/battle/common/actor/swoopula.inc.c | 8 +++---- src/battle/common/actor/whacka.inc.c | 6 ++--- src/battle/common/actor/white_clubba.inc.c | 6 ++--- src/battle/common/actor/white_magikoopa.inc.c | 12 +++++----- .../common/actor/yellow_magikoopa.inc.c | 12 +++++----- src/battle/dmg_item.c | 4 ++-- src/battle/dmg_partner.c | 10 ++++---- src/battle/dmg_player.c | 4 ++-- src/battle/partner/bombette.c | 4 ++-- src/battle/partner/bow.c | 10 ++++---- src/battle/partner/goombario.c | 4 ++-- src/battle/partner/goompa.c | 4 ++-- src/battle/partner/kooper.c | 4 ++-- src/battle/partner/lakilester.c | 4 ++-- src/battle/partner/parakarry.c | 4 ++-- src/battle/partner/sushie.c | 4 ++-- src/battle/partner/twink.c | 4 ++-- src/battle/partner/watt.c | 4 ++-- src/battle/player_events.c | 4 ++-- src/battle/standard_events.c | 4 ++-- src/status_icons.c | 4 ++-- 175 files changed, 626 insertions(+), 626 deletions(-) diff --git a/include/enums.h b/include/enums.h index a36ff0137d..a7a772f875 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2225,7 +2225,7 @@ enum StatusKeys { STATUS_END = 0x00000000, STATUS_KEY_NORMAL = 0x00000001, STATUS_KEY_DEFAULT = 0x00000002, - STATUS_KEY_FEAR = 0x00000003, + STATUS_KEY_UNUSED = 0x00000003, STATUS_KEY_DIZZY = 0x00000004, STATUS_KEY_PARALYZE = 0x00000005, STATUS_KEY_SLEEP = 0x00000006, @@ -2257,7 +2257,7 @@ enum StatusKeys { STATUS_TURN_MOD_SLEEP = 0x00000020, STATUS_TURN_MOD_STATIC = 0x00000021, STATUS_TURN_MOD_FROZEN = 0x00000022, - STATUS_TURN_MOD_FEAR = 0x00000023, + STATUS_TURN_MOD_UNUSED = 0x00000023, STATUS_TURN_MOD_DIZZY = 0x00000024, STATUS_TURN_MOD_POISON = 0x00000025, STATUS_TURN_MOD_PARALYZE = 0x00000026, @@ -2841,14 +2841,14 @@ enum StatusFlags { STATUS_FLAG_SLEEP = 0x00001000, STATUS_FLAG_STATIC = 0x00002000, STATUS_FLAG_FROZEN = 0x00004000, - STATUS_FLAG_FEAR = 0x00008000, + STATUS_FLAG_UNUSED = 0x00008000, // an unused 'disabling' status like sleep, paralyze, or dizzy STATUS_FLAG_PARALYZE = 0x00010000, STATUS_FLAG_POISON = 0x00020000, STATUS_FLAG_DIZZY = 0x00040000, STATUS_FLAG_SHRINK = 0x00080000, STATUS_FLAG_STONE = 0x00100000, STATUS_FLAG_STOP = 0x00200000, - STATUS_FLAG_400000 = 0x00400000, + STATUS_FLAG_FEAR = 0x00400000, // used only by Bow's Spook attack to trigger enemy fleeing. note: fright jar uses DAMAGE_TYPE_FEAR instead. STATUS_FLAG_KO = 0x01000000, STATUS_FLAG_GLOWING = 0x02000000, STATUS_FLAG_TRANSPARENT = 0x04000000, @@ -2856,14 +2856,14 @@ enum StatusFlags { STATUS_FLAG_DEFENSE_BOOST = 0x10000000, STATUS_FLAG_CHILL_OUT = 0x20000000, STATUS_FLAG_RIGHT_ON = 0x40000000, - STATUS_FLAG_80000000 = 0x80000000, + STATUS_FLAG_USE_DURATION = 0x80000000, // indicates the status being inflicted should derive duration from BattleStatus::statusDuration }; // general combination of flags for checking if an enemy is immobilized #define STATUS_FLAGS_IMMOBILIZED \ (STATUS_FLAG_SLEEP \ | STATUS_FLAG_FROZEN \ - | STATUS_FLAG_FEAR \ + | STATUS_FLAG_UNUSED \ | STATUS_FLAG_PARALYZE \ | STATUS_FLAG_DIZZY \ | STATUS_FLAG_STONE \ diff --git a/include/macros.h b/include/macros.h index 65e7f88e2e..f60f39c982 100644 --- a/include/macros.h +++ b/include/macros.h @@ -232,8 +232,8 @@ typedef s32 Difficulty2D[AC_DIFFICULTY_LEN][2]; #define STATUS_KEY_IGNORE_RES 0xFE #define STATUS_KEY_NEVER 0xFF -#define DMG_STATUS_KEY(typeFlag, duration, chance) (STATUS_FLAG_80000000 | typeFlag | (duration << 8) | chance) -#define DMG_STATUS_ALWAYS(typeFlag, duration) (STATUS_FLAG_80000000 | STATUS_FLAG_RIGHT_ON | typeFlag | (duration << 8)) +#define DMG_STATUS_KEY(typeFlag, duration, chance) (STATUS_FLAG_USE_DURATION | typeFlag | (duration << 8) | chance) +#define DMG_STATUS_ALWAYS(typeFlag, duration) (STATUS_FLAG_USE_DURATION | STATUS_FLAG_RIGHT_ON | typeFlag | (duration << 8)) #define DMG_STATUS_IGNORE_RES(typeFlag, duration) (STATUS_KEY_IGNORE_RES | typeFlag | (duration << 8)) #define _RDP_WHOLE(x) (((s32)(x * 65536.0) >> 16) & 0xFFFF) diff --git a/src/battle/190B20.c b/src/battle/190B20.c index 7c16922367..68bd05a78c 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -2160,7 +2160,7 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { EffectInstance* effect; switch (statusTypeKey) { - case STATUS_KEY_FEAR: + case STATUS_KEY_UNUSED: case STATUS_KEY_DIZZY: case STATUS_KEY_PARALYZE: case STATUS_KEY_SLEEP: @@ -2205,9 +2205,9 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { case STATUS_KEY_DIZZY: create_status_debuff(target->hudElementDataIndex, STATUS_KEY_DIZZY); return true; - case STATUS_KEY_FEAR: + case STATUS_KEY_UNUSED: set_actor_pal_adjustment(target, ACTOR_PAL_ADJUST_FEAR); - create_status_debuff(target->hudElementDataIndex, STATUS_KEY_FEAR); + create_status_debuff(target->hudElementDataIndex, STATUS_KEY_UNUSED); return true; case STATUS_KEY_POISON: set_actor_pal_adjustment(target, ACTOR_PAL_ADJUST_POISON); @@ -2642,7 +2642,7 @@ s32 try_inflict_status(Actor* actor, s32 statusTypeKey, s32 statusKey) { } if (duration > 0) { - if (battleStatus->curAttackStatus < 0) { + if (battleStatus->curAttackStatus & STATUS_FLAG_USE_DURATION) { duration = battleStatus->statusDuration; duration += lookup_status_duration_mod(actor->statusTable, statusKey); inflict_status(actor, statusTypeKey, duration); diff --git a/src/battle/1A5830.c b/src/battle/1A5830.c index e66c5a0cbb..14c667f605 100644 --- a/src/battle/1A5830.c +++ b/src/battle/1A5830.c @@ -633,7 +633,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { statusInflicted = one; statusInflicted2 = one; } - if (battleStatus->curAttackStatus & STATUS_FLAG_FEAR && try_inflict_status(target, STATUS_KEY_FEAR, STATUS_TURN_MOD_FEAR)) { + if (battleStatus->curAttackStatus & STATUS_FLAG_UNUSED && try_inflict_status(target, STATUS_KEY_UNUSED, STATUS_TURN_MOD_UNUSED)) { statusInflicted = one; statusInflicted2 = one; } diff --git a/src/battle/actor_api.c b/src/battle/actor_api.c index b20f30368e..b800a7b6e6 100644 --- a/src/battle/actor_api.c +++ b/src/battle/actor_api.c @@ -2845,8 +2845,8 @@ API_CALLABLE(GetStatusFlags) { if (debuff == STATUS_KEY_DIZZY) { flags |= STATUS_FLAG_DIZZY; } - if (debuff == STATUS_KEY_FEAR) { - flags |= STATUS_FLAG_FEAR; + if (debuff == STATUS_KEY_UNUSED) { + flags |= STATUS_FLAG_UNUSED; } if (debuff == STATUS_KEY_POISON) { flags |= STATUS_FLAG_POISON; diff --git a/src/battle/actor_rendering.c b/src/battle/actor_rendering.c index 52582bf9ef..0c4ac24c18 100644 --- a/src/battle/actor_rendering.c +++ b/src/battle/actor_rendering.c @@ -1047,7 +1047,7 @@ void appendGfx_npc_actor(bool isPartner, s32 actorIndex) { } palChanged = true; } - if (actor->debuff == STATUS_KEY_FEAR) { + if (actor->debuff == STATUS_KEY_UNUSED) { if (!palChanged) { set_actor_pal_adjustment(actor, ACTOR_PAL_ADJUST_FEAR); } @@ -1085,9 +1085,9 @@ void appendGfx_npc_actor(bool isPartner, s32 actorIndex) { part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_DIZZY); animChanged = true; } - } else if (actor->debuff == STATUS_KEY_FEAR) { + } else if (actor->debuff == STATUS_KEY_UNUSED) { if (!animChanged) { - part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_FEAR); + part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_UNUSED); animChanged = true; } } else if (actor->debuff == STATUS_KEY_SLEEP) { @@ -1638,7 +1638,7 @@ void appendGfx_player_actor(void* arg0) { && !((partner != nullptr) && (partner->flags & ACTOR_FLAG_NO_ATTACK)) ) { if (!(gBattleStatus.flags2 & BS_FLAGS2_NO_PLAYER_PAL_ADJUST)) { - if ((player->debuff != STATUS_KEY_FEAR) + if ((player->debuff != STATUS_KEY_UNUSED) && (player->debuff != STATUS_KEY_PARALYZE) && (player->debuff != STATUS_KEY_FROZEN) && (player->debuff != STATUS_KEY_STOP) diff --git a/src/battle/actors.c b/src/battle/actors.c index 85ce1ac674..f040ccab55 100644 --- a/src/battle/actors.c +++ b/src/battle/actors.c @@ -137,7 +137,7 @@ s32 bPlayerStatusTable[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -147,7 +147,7 @@ s32 bPlayerStatusTable[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 649c235256..f98f3c76ef 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -35,7 +35,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_BattleTubba_Anim00, STATUS_KEY_PARALYZE, ANIM_BattleTubba_Anim00, STATUS_KEY_DIZZY, ANIM_BattleTubba_Anim18, - STATUS_KEY_FEAR, ANIM_BattleTubba_Anim00, + STATUS_KEY_UNUSED, ANIM_BattleTubba_Anim00, STATUS_END, }; @@ -51,7 +51,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 80, STATUS_KEY_SHRINK, 90, @@ -61,7 +61,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index d4731b3d42..e449cd74f6 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -50,7 +50,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_TubbasHeart_Anim00, STATUS_KEY_DIZZY, ANIM_TubbasHeart_Anim0D, STATUS_KEY_DIZZY, ANIM_TubbasHeart_Anim0D, - STATUS_KEY_FEAR, ANIM_TubbasHeart_Anim0A, + STATUS_KEY_UNUSED, ANIM_TubbasHeart_Anim0A, STATUS_END, }; @@ -65,7 +65,7 @@ s32 N(ChargedAnims)[] = { STATUS_KEY_PARALYZE, ANIM_TubbasHeart_Anim00, STATUS_KEY_DIZZY, ANIM_TubbasHeart_Anim0D, STATUS_KEY_DIZZY, ANIM_TubbasHeart_Anim0D, - STATUS_KEY_FEAR, ANIM_TubbasHeart_Anim0A, + STATUS_KEY_UNUSED, ANIM_TubbasHeart_Anim0A, STATUS_END, }; @@ -81,7 +81,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 90, @@ -91,7 +91,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index 2fe44d1af6..fc6cfc586e 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -41,7 +41,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_BattleTubba_Anim00, STATUS_KEY_DIZZY, ANIM_BattleTubba_Anim00, STATUS_KEY_DIZZY, ANIM_BattleTubba_Anim00, - STATUS_KEY_FEAR, ANIM_BattleTubba_Anim00, + STATUS_KEY_UNUSED, ANIM_BattleTubba_Anim00, STATUS_END, }; @@ -57,7 +57,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -67,7 +67,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 388dd1b7cb..263b0582e2 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -40,7 +40,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_BattleTubba_Anim00, STATUS_KEY_DIZZY, ANIM_BattleTubba_Anim00, STATUS_KEY_DIZZY, ANIM_BattleTubba_Anim00, - STATUS_KEY_FEAR, ANIM_BattleTubba_Anim00, + STATUS_KEY_UNUSED, ANIM_BattleTubba_Anim00, STATUS_END, }; @@ -56,7 +56,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 80, STATUS_KEY_SHRINK, 90, @@ -66,7 +66,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 0c104cb33a..2f3d4de020 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -311,7 +311,7 @@ s32 N(BodyAnims)[] = { STATUS_KEY_PARALYZE, ANIM_HuffNPuff_Anim01, STATUS_KEY_DIZZY, ANIM_HuffNPuff_Anim01, STATUS_KEY_DIZZY, ANIM_HuffNPuff_Anim01, - STATUS_KEY_FEAR, ANIM_HuffNPuff_Anim01, + STATUS_KEY_UNUSED, ANIM_HuffNPuff_Anim01, STATUS_END, }; @@ -326,7 +326,7 @@ s32 N(FaceAnims)[] = { STATUS_KEY_PARALYZE, ANIM_HuffNPuff_Anim02, STATUS_KEY_DIZZY, ANIM_HuffNPuff_Anim02, STATUS_KEY_DIZZY, ANIM_HuffNPuff_Anim02, - STATUS_KEY_FEAR, ANIM_HuffNPuff_Anim02, + STATUS_KEY_UNUSED, ANIM_HuffNPuff_Anim02, STATUS_END, }; @@ -341,7 +341,7 @@ s32 N(ArmAnims)[] = { STATUS_KEY_PARALYZE, ANIM_HuffNPuff_Anim03, STATUS_KEY_DIZZY, ANIM_HuffNPuff_Anim03, STATUS_KEY_DIZZY, ANIM_HuffNPuff_Anim03, - STATUS_KEY_FEAR, ANIM_HuffNPuff_Anim03, + STATUS_KEY_UNUSED, ANIM_HuffNPuff_Anim03, STATUS_END, }; @@ -381,7 +381,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -391,7 +391,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c index b40f3c11b1..44ea3ffb93 100644 --- a/src/battle/area/flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -38,7 +38,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 10, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -127,7 +127,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_MontyMole_Dark_Anim01, STATUS_KEY_PARALYZE, ANIM_MontyMole_Dark_Anim00, STATUS_KEY_DIZZY, ANIM_MontyMole_Dark_Anim14, - STATUS_KEY_FEAR, ANIM_MontyMole_Dark_Anim14, + STATUS_KEY_UNUSED, ANIM_MontyMole_Dark_Anim14, STATUS_END, }; diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 3ed3dbe1f7..9ee8eedffb 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -26,7 +26,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleLakilester_Idle, STATUS_KEY_PARALYZE, ANIM_BattleLakilester_Still, STATUS_KEY_DIZZY, ANIM_BattleLakilester_Injured, - STATUS_KEY_FEAR, ANIM_BattleLakilester_Idle, + STATUS_KEY_UNUSED, ANIM_BattleLakilester_Idle, STATUS_END, }; @@ -47,7 +47,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 50, @@ -57,7 +57,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c index d414d3e8ea..a05e24ed2c 100644 --- a/src/battle/area/flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -36,7 +36,7 @@ s32 N(SmallAnims)[] = { STATUS_KEY_PARALYZE, ANIM_TuffPuff_Anim00, STATUS_KEY_DIZZY, ANIM_TuffPuff_Anim02, STATUS_KEY_DIZZY, ANIM_TuffPuff_Anim02, - STATUS_KEY_FEAR, ANIM_TuffPuff_Anim02, + STATUS_KEY_UNUSED, ANIM_TuffPuff_Anim02, STATUS_END, }; @@ -51,7 +51,7 @@ s32 N(LargeAnims)[] = { STATUS_KEY_PARALYZE, ANIM_TuffPuff_Anim01, STATUS_KEY_DIZZY, ANIM_TuffPuff_Anim03, STATUS_KEY_DIZZY, ANIM_TuffPuff_Anim03, - STATUS_KEY_FEAR, ANIM_TuffPuff_Anim03, + STATUS_KEY_UNUSED, ANIM_TuffPuff_Anim03, STATUS_END, }; @@ -71,7 +71,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -81,7 +81,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index 891e310e0a..d51970d5cc 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -55,7 +55,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 450a0b2f1b..25d7133d2b 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -86,7 +86,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -96,7 +96,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -111,7 +111,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -121,7 +121,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -238,7 +238,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_Anim07, STATUS_END, }; @@ -251,7 +251,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Anim07, STATUS_END, }; @@ -1269,7 +1269,7 @@ s32 N(CloneStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -1279,7 +1279,7 @@ s32 N(CloneStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -1294,7 +1294,7 @@ s32 N(FlyingCloneStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -1304,7 +1304,7 @@ s32 N(FlyingCloneStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, 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 620ab08491..9e5464f33c 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -104,7 +104,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 75, @@ -114,7 +114,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 7273849526..5f4d0b0a59 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -118,7 +118,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 30, STATUS_KEY_SHRINK, 60, @@ -128,7 +128,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index f5a6b9eeb8..2d15fc5d2f 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -77,7 +77,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 70, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 70, STATUS_KEY_SHRINK, 75, @@ -87,7 +87,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 2a5e8332a4..30401de106 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -46,7 +46,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Fuzzipede_Anim04, STATUS_KEY_PARALYZE, ANIM_Fuzzipede_Anim00, STATUS_KEY_DIZZY, ANIM_Fuzzipede_Anim26, - STATUS_KEY_FEAR, ANIM_Fuzzipede_Anim26, + STATUS_KEY_UNUSED, ANIM_Fuzzipede_Anim26, STATUS_END, }; @@ -59,7 +59,7 @@ s32 N(HangingAnims)[] = { STATUS_KEY_STATIC, ANIM_Fuzzipede_Anim06, STATUS_KEY_PARALYZE, ANIM_Fuzzipede_Anim02, STATUS_KEY_DIZZY, ANIM_Fuzzipede_Anim27, - STATUS_KEY_FEAR, ANIM_Fuzzipede_Anim27, + STATUS_KEY_UNUSED, ANIM_Fuzzipede_Anim27, STATUS_END, }; @@ -75,7 +75,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 50, @@ -85,7 +85,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index aed75b55c0..7fe60a8e03 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -60,7 +60,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index 7767f26c3b..3fe6f8e682 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -38,7 +38,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -103,7 +103,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Blue_Idle, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Blue_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Blue_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Blue_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Blue_Dizzy, STATUS_END, }; @@ -117,7 +117,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Blue_Run, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Blue_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Blue_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Blue_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Blue_Dizzy, STATUS_END, }; diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c index 1cbe5d37f6..73e9144e23 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c @@ -29,7 +29,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -39,7 +39,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -94,7 +94,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Blue_Idle, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Blue_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Blue_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Blue_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Blue_Dizzy, STATUS_END, }; @@ -108,7 +108,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Blue_Run, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Blue_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Blue_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Blue_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Blue_Dizzy, STATUS_END, }; 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 4e3025299f..1831257801 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -96,7 +96,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -106,7 +106,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, -1, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 34628b9f94..fb403ba69e 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_1.c b/src/battle/area/kmr_part_2/actor/red_goomba_1.c index 90d09e9628..f571c3f56f 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_1.c @@ -37,7 +37,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -47,7 +47,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -102,7 +102,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Red_Idle, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Red_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Red_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Red_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Red_Dizzy, STATUS_END, }; @@ -115,7 +115,7 @@ s32 N(IdleAnimations_8021B810)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Red_Run, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Red_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Red_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Red_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Red_Dizzy, STATUS_END, }; diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_2.c b/src/battle/area/kmr_part_2/actor/red_goomba_2.c index 588312d647..f24f788681 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_2.c @@ -29,7 +29,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -39,7 +39,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -94,7 +94,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Red_Idle, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Red_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Red_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Red_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Red_Dizzy, STATUS_END, }; @@ -108,7 +108,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_GoombaBros_Red_Run, STATUS_KEY_PARALYZE, ANIM_GoombaBros_Red_Still, STATUS_KEY_DIZZY, ANIM_GoombaBros_Red_Dizzy, - STATUS_KEY_FEAR, ANIM_GoombaBros_Red_Dizzy, + STATUS_KEY_UNUSED, ANIM_GoombaBros_Red_Dizzy, STATUS_END, }; 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 47fd688d4f..f6747d0c2e 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 @@ -67,7 +67,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -77,7 +77,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, 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 c948b46261..06cadc848d 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 @@ -134,7 +134,7 @@ s32 N(BaseStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 40, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 60, @@ -144,7 +144,7 @@ s32 N(BaseStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -2, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -159,7 +159,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 50, @@ -169,7 +169,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -184,7 +184,7 @@ s32 N(MageStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 40, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 50, @@ -194,7 +194,7 @@ s32 N(MageStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -2, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, 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 4455847d76..bfe050032c 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -55,7 +55,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -65,7 +65,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 79314796c8..648332cbf8 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -91,7 +91,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 45, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 45, STATUS_KEY_SHRINK, 60, @@ -101,7 +101,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, 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 6b9f0d2e98..573e5311b8 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 @@ -70,7 +70,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 80, @@ -80,7 +80,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index 96257c46aa..f9b6088154 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 @@ -69,7 +69,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 45, STATUS_KEY_SHRINK, 60, @@ -79,7 +79,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c index 5b5d27ae15..92ce6ef536 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -45,7 +45,7 @@ s32 N(DownedStatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -55,7 +55,7 @@ s32 N(DownedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -70,7 +70,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 80, + STATUS_KEY_UNUSED, 80, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -80,7 +80,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -171,7 +171,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Idle, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Dizzy, STATUS_END, }; @@ -184,7 +184,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Run, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Dizzy, STATUS_END, }; diff --git a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c index 66ff383dfc..1748676d91 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 80, + STATUS_KEY_UNUSED, 80, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -96,7 +96,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikedGoomba_Idle, STATUS_KEY_PARALYZE, ANIM_SpikedGoomba_Still, STATUS_KEY_DIZZY, ANIM_SpikedGoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_SpikedGoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_SpikedGoomba_Dizzy, STATUS_END, }; @@ -109,7 +109,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikedGoomba_Run, STATUS_KEY_PARALYZE, ANIM_SpikedGoomba_Still, STATUS_KEY_DIZZY, ANIM_SpikedGoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_SpikedGoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_SpikedGoomba_Dizzy, STATUS_END, }; diff --git a/src/battle/area/kpa2/actor/final_bowser_1.c b/src/battle/area/kpa2/actor/final_bowser_1.c index 0300ebcfee..f8c1dd1953 100644 --- a/src/battle/area/kpa2/actor/final_bowser_1.c +++ b/src/battle/area/kpa2/actor/final_bowser_1.c @@ -94,7 +94,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -104,7 +104,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -119,7 +119,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -129,7 +129,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kpa2/actor/final_bowser_2.c b/src/battle/area/kpa2/actor/final_bowser_2.c index 2a5b5bffaa..ad5d33011e 100644 --- a/src/battle/area/kpa2/actor/final_bowser_2.c +++ b/src/battle/area/kpa2/actor/final_bowser_2.c @@ -97,7 +97,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -107,7 +107,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -122,7 +122,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -132,7 +132,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kpa2/actor/hallway_bowser.c b/src/battle/area/kpa2/actor/hallway_bowser.c index b8a22d0fb1..e546341f01 100644 --- a/src/battle/area/kpa2/actor/hallway_bowser.c +++ b/src/battle/area/kpa2/actor/hallway_bowser.c @@ -101,7 +101,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 30, STATUS_KEY_SHRINK, 50, @@ -111,7 +111,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -126,7 +126,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -136,7 +136,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kpa2/actor/intro_bowser.c b/src/battle/area/kpa2/actor/intro_bowser.c index ce4191f815..b3ced150e2 100644 --- a/src/battle/area/kpa2/actor/intro_bowser.c +++ b/src/battle/area/kpa2/actor/intro_bowser.c @@ -68,7 +68,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -78,7 +78,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -93,7 +93,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -103,7 +103,7 @@ s32 N(BoostedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kpa2/actor/unused_bowser.c b/src/battle/area/kpa2/actor/unused_bowser.c index fc41e94d37..bb13c1aa2a 100644 --- a/src/battle/area/kpa2/actor/unused_bowser.c +++ b/src/battle/area/kpa2/actor/unused_bowser.c @@ -61,7 +61,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 30, STATUS_KEY_SHRINK, 50, @@ -71,7 +71,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 1e07d321cc..b88128c1bd 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -38,7 +38,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 100, @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kpa4/actor/bombshell_blaster.c b/src/battle/area/kpa4/actor/bombshell_blaster.c index 8cd3026187..ea44ffeaf1 100644 --- a/src/battle/area/kpa4/actor/bombshell_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_blaster.c @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 50, @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index e096af4bc7..10fc0f13ba 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -112,7 +112,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 0, @@ -122,7 +122,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 81e64a6dfd..c67d6197b7 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -213,7 +213,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 25, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 0, @@ -223,7 +223,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index bd506c489f..19dc96a1f6 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 0, @@ -59,7 +59,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/kzn2/actor/petit_piranha_bomb.c b/src/battle/area/kzn2/actor/petit_piranha_bomb.c index eb8a32c83c..6d81339f93 100644 --- a/src/battle/area/kzn2/actor/petit_piranha_bomb.c +++ b/src/battle/area/kzn2/actor/petit_piranha_bomb.c @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index e6244e2f9c..27b49014ff 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -53,7 +53,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 50, @@ -63,7 +63,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -118,7 +118,7 @@ s32 N(UprightAnims)[] = { STATUS_KEY_STATIC, ANIM_Chan_Idle, STATUS_KEY_PARALYZE, ANIM_Chan_Still, STATUS_KEY_DIZZY, ANIM_Chan_Dizzy, - STATUS_KEY_FEAR, ANIM_Chan_Dizzy, + STATUS_KEY_UNUSED, ANIM_Chan_Dizzy, STATUS_END, }; @@ -131,7 +131,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Chan_Idle, STATUS_KEY_PARALYZE, ANIM_Chan_Still, STATUS_KEY_DIZZY, ANIM_Chan_Dizzy, - STATUS_KEY_FEAR, ANIM_Chan_Dizzy, + STATUS_KEY_UNUSED, ANIM_Chan_Dizzy, STATUS_END, }; @@ -143,7 +143,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STOP, ANIM_Chan_ToppledStill, STATUS_KEY_STATIC, ANIM_Chan_Toppled, STATUS_KEY_DIZZY, ANIM_Chan_ToppledDizzy, - STATUS_KEY_FEAR, ANIM_Chan_ToppledDizzy, + STATUS_KEY_UNUSED, ANIM_Chan_ToppledDizzy, STATUS_END, }; diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 2aff372876..de05c0fb23 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -163,7 +163,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 75, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -173,7 +173,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, -1, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/mac/actor/lee_bombette.inc.c b/src/battle/area/mac/actor/lee_bombette.inc.c index aed8a810a3..23be8709ea 100644 --- a/src/battle/area/mac/actor/lee_bombette.inc.c +++ b/src/battle/area/mac/actor/lee_bombette.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleBombette_Idle, STATUS_KEY_PARALYZE, ANIM_BattleBombette_Still, STATUS_KEY_DIZZY, ANIM_BattleBombette_Injured, - STATUS_KEY_FEAR, ANIM_BattleBombette_Injured, + STATUS_KEY_UNUSED, ANIM_BattleBombette_Injured, STATUS_END, }; @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_bow.inc.c b/src/battle/area/mac/actor/lee_bow.inc.c index f4b01e8314..9996f08adf 100644 --- a/src/battle/area/mac/actor/lee_bow.inc.c +++ b/src/battle/area/mac/actor/lee_bow.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleBow_Idle, STATUS_KEY_PARALYZE, ANIM_BattleBow_Still, STATUS_KEY_DIZZY, ANIM_BattleBow_Injured, - STATUS_KEY_FEAR, ANIM_BattleBow_Injured, + STATUS_KEY_UNUSED, ANIM_BattleBow_Injured, STATUS_END, }; @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_goombario.inc.c b/src/battle/area/mac/actor/lee_goombario.inc.c index e88f20ef9d..b34cd17764 100644 --- a/src/battle/area/mac/actor/lee_goombario.inc.c +++ b/src/battle/area/mac/actor/lee_goombario.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleGoombario_Idle, STATUS_KEY_PARALYZE, ANIM_BattleGoombario_Still, STATUS_KEY_DIZZY, ANIM_BattleGoombario_Injured, - STATUS_KEY_FEAR, ANIM_BattleGoombario_Injured, + STATUS_KEY_UNUSED, ANIM_BattleGoombario_Injured, STATUS_END, }; @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_kooper.inc.c b/src/battle/area/mac/actor/lee_kooper.inc.c index b90d522866..8537180cfe 100644 --- a/src/battle/area/mac/actor/lee_kooper.inc.c +++ b/src/battle/area/mac/actor/lee_kooper.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleKooper_Idle, STATUS_KEY_PARALYZE, ANIM_BattleKooper_Still, STATUS_KEY_DIZZY, ANIM_BattleKooper_Injured, - STATUS_KEY_FEAR, ANIM_BattleKooper_Injured, + STATUS_KEY_UNUSED, ANIM_BattleKooper_Injured, STATUS_END, }; @@ -28,7 +28,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleKooper_Toppled, STATUS_KEY_PARALYZE, ANIM_BattleKooper_StillToppled, STATUS_KEY_DIZZY, ANIM_BattleKooper_Toppled, - STATUS_KEY_FEAR, ANIM_BattleKooper_Toppled, + STATUS_KEY_UNUSED, ANIM_BattleKooper_Toppled, STATUS_END, }; @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -59,7 +59,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_lakilester.inc.c b/src/battle/area/mac/actor/lee_lakilester.inc.c index f7c1a499d6..22acd6f3dd 100644 --- a/src/battle/area/mac/actor/lee_lakilester.inc.c +++ b/src/battle/area/mac/actor/lee_lakilester.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleLakilester_Idle, STATUS_KEY_PARALYZE, ANIM_BattleLakilester_Still, STATUS_KEY_DIZZY, ANIM_BattleLakilester_Injured, - STATUS_KEY_FEAR, ANIM_BattleLakilester_Idle, + STATUS_KEY_UNUSED, ANIM_BattleLakilester_Idle, STATUS_END, }; @@ -36,7 +36,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -46,7 +46,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_parakarry.inc.c b/src/battle/area/mac/actor/lee_parakarry.inc.c index 6b64d19eef..7f0995d107 100644 --- a/src/battle/area/mac/actor/lee_parakarry.inc.c +++ b/src/battle/area/mac/actor/lee_parakarry.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleParakarry_Idle, STATUS_KEY_PARALYZE, ANIM_BattleParakarry_Still, STATUS_KEY_DIZZY, ANIM_BattleParakarry_Idle, - STATUS_KEY_FEAR, ANIM_BattleParakarry_Idle, + STATUS_KEY_UNUSED, ANIM_BattleParakarry_Idle, STATUS_END, }; @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_sushie.inc.c b/src/battle/area/mac/actor/lee_sushie.inc.c index bd95332b9e..86d20c224a 100644 --- a/src/battle/area/mac/actor/lee_sushie.inc.c +++ b/src/battle/area/mac/actor/lee_sushie.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleSushie_Idle, STATUS_KEY_PARALYZE, ANIM_BattleSushie_Still, STATUS_KEY_DIZZY, ANIM_BattleSushie_Injured, - STATUS_KEY_FEAR, ANIM_BattleSushie_Injured, + STATUS_KEY_UNUSED, ANIM_BattleSushie_Injured, STATUS_END, }; @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/lee_watt.inc.c b/src/battle/area/mac/actor/lee_watt.inc.c index 98916f64f9..2f284c8dea 100644 --- a/src/battle/area/mac/actor/lee_watt.inc.c +++ b/src/battle/area/mac/actor/lee_watt.inc.c @@ -15,7 +15,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleWatt_Idle, STATUS_KEY_PARALYZE, ANIM_BattleWatt_Still, STATUS_KEY_DIZZY, ANIM_BattleWatt_Injured, - STATUS_KEY_FEAR, ANIM_BattleWatt_Injured, + STATUS_KEY_UNUSED, ANIM_BattleWatt_Injured, STATUS_END, }; @@ -32,7 +32,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index e1059223aa..74a15b46dc 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 40, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 60, @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, -1, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 020061d790..ee9888666f 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -67,7 +67,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 30, STATUS_KEY_SHRINK, 40, @@ -77,7 +77,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, -1, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index c3f4acda68..abe7cb58d7 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -74,7 +74,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 20, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 20, STATUS_KEY_SHRINK, 20, @@ -84,7 +84,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -2, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, -2, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index f38e32902c..d404c2bbe0 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -58,7 +58,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_KentCKoopa_Anim00, STATUS_KEY_PARALYZE, ANIM_KentCKoopa_Anim00, STATUS_KEY_DIZZY, ANIM_KentCKoopa_Anim14, - STATUS_KEY_FEAR, ANIM_KentCKoopa_Anim00, + STATUS_KEY_UNUSED, ANIM_KentCKoopa_Anim00, STATUS_END, }; @@ -97,7 +97,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 30, STATUS_KEY_SHRINK, 40, @@ -107,7 +107,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index d08bf11dd6..75bac252af 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -59,7 +59,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, -1, @@ -128,7 +128,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_GeneralGuy_Anim00, STATUS_KEY_DIZZY, ANIM_GeneralGuy_Anim00, STATUS_KEY_DIZZY, ANIM_GeneralGuy_Anim00, - STATUS_KEY_FEAR, ANIM_GeneralGuy_Anim00, + STATUS_KEY_UNUSED, ANIM_GeneralGuy_Anim00, STATUS_END, }; @@ -145,7 +145,7 @@ s32 N(PanicAnims)[] = { STATUS_KEY_STATIC, ANIM_GeneralGuy_Anim00, STATUS_KEY_PARALYZE, ANIM_GeneralGuy_Anim00, STATUS_KEY_DIZZY, ANIM_GeneralGuy_Anim00, - STATUS_KEY_FEAR, ANIM_GeneralGuy_Anim00, + STATUS_KEY_UNUSED, ANIM_GeneralGuy_Anim00, STATUS_END, }; diff --git a/src/battle/area/omo2/actor/light_bulb.c b/src/battle/area/omo2/actor/light_bulb.c index 1bdeb813f5..e02f360939 100644 --- a/src/battle/area/omo2/actor/light_bulb.c +++ b/src/battle/area/omo2/actor/light_bulb.c @@ -43,7 +43,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -53,7 +53,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index f70b634ffb..c377190007 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -87,7 +87,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -97,7 +97,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index a6f15e2de1..077369e391 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -99,7 +99,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -109,7 +109,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -346,7 +346,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_ShySquadGuy_Anim00, STATUS_KEY_DIZZY, ANIM_ShySquadGuy_Anim13, STATUS_KEY_DIZZY, ANIM_ShySquadGuy_Anim13, - STATUS_KEY_FEAR, ANIM_ShySquadGuy_Anim00, + STATUS_KEY_UNUSED, ANIM_ShySquadGuy_Anim00, STATUS_END, }; diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 1cd2109ea0..69f05cc435 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -66,7 +66,7 @@ s32 N(StiltAnims)[] = { STATUS_KEY_PARALYZE, ANIM_StiltGuy_Anim00, STATUS_KEY_PARALYZE, ANIM_StiltGuy_Anim00, STATUS_KEY_DIZZY, ANIM_StiltGuy_Anim00, - STATUS_KEY_FEAR, ANIM_StiltGuy_Anim00, + STATUS_KEY_UNUSED, ANIM_StiltGuy_Anim00, STATUS_END, }; @@ -93,7 +93,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 60, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -103,7 +103,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -118,7 +118,7 @@ s32 N(UnusedStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -128,7 +128,7 @@ s32 N(UnusedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -941,7 +941,7 @@ s32 N(ShyGuyAnims)[] = { STATUS_KEY_STATIC, ANIM_ShyGuy_Red_Anim01, STATUS_KEY_PARALYZE, ANIM_ShyGuy_Red_Anim00, STATUS_KEY_DIZZY, ANIM_ShyGuy_Red_Anim13, - STATUS_KEY_FEAR, ANIM_ShyGuy_Red_Anim13, + STATUS_KEY_UNUSED, ANIM_ShyGuy_Red_Anim13, STATUS_END, }; diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index c832d1cbd2..8be40da690 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -86,7 +86,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 60, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -96,7 +96,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -309,7 +309,7 @@ s32 N(FourStackAnims)[] = { STATUS_KEY_PARALYZE, ANIM_ShyStackGuy_Anim00, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0C, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0C, - STATUS_KEY_FEAR, ANIM_ShyStackGuy_Anim00, + STATUS_KEY_UNUSED, ANIM_ShyStackGuy_Anim00, STATUS_END, }; @@ -324,7 +324,7 @@ s32 N(ThreeStackAnims)[] = { STATUS_KEY_PARALYZE, ANIM_ShyStackGuy_Anim01, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0D, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0D, - STATUS_KEY_FEAR, ANIM_ShyStackGuy_Anim01, + STATUS_KEY_UNUSED, ANIM_ShyStackGuy_Anim01, STATUS_END, }; @@ -339,7 +339,7 @@ s32 N(TwoStackAnims)[] = { STATUS_KEY_PARALYZE, ANIM_ShyStackGuy_Anim02, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0E, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0E, - STATUS_KEY_FEAR, ANIM_ShyStackGuy_Anim02, + STATUS_KEY_UNUSED, ANIM_ShyStackGuy_Anim02, STATUS_END, }; @@ -354,7 +354,7 @@ s32 N(OneStackAnims)[] = { STATUS_KEY_PARALYZE, ANIM_ShyStackGuy_Anim03, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0F, STATUS_KEY_DIZZY, ANIM_ShyStackGuy_Anim0F, - STATUS_KEY_FEAR, ANIM_ShyStackGuy_Anim03, + STATUS_KEY_UNUSED, ANIM_ShyStackGuy_Anim03, STATUS_END, }; diff --git a/src/battle/area/omo2_4/actor/signal_guy.c b/src/battle/area/omo2_4/actor/signal_guy.c index e3ff836b86..e08b3f6b43 100644 --- a/src/battle/area/omo2_4/actor/signal_guy.c +++ b/src/battle/area/omo2_4/actor/signal_guy.c @@ -28,7 +28,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -38,7 +38,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/omo2_5/actor/shy_squad_redux.c b/src/battle/area/omo2_5/actor/shy_squad_redux.c index effcd15b62..4917cb8ff6 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_redux.c +++ b/src/battle/area/omo2_5/actor/shy_squad_redux.c @@ -83,7 +83,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -93,7 +93,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/omo2_6/actor/shy_squad_stub.c b/src/battle/area/omo2_6/actor/shy_squad_stub.c index 79b77506ea..a159e407fb 100644 --- a/src/battle/area/omo2_6/actor/shy_squad_stub.c +++ b/src/battle/area/omo2_6/actor/shy_squad_stub.c @@ -46,7 +46,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -56,7 +56,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -209,7 +209,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_TankGuy_Anim00, STATUS_KEY_DIZZY, ANIM_TankGuy_Anim01, STATUS_KEY_DIZZY, ANIM_TankGuy_Anim01, - STATUS_KEY_FEAR, ANIM_TankGuy_Anim00, + STATUS_KEY_UNUSED, ANIM_TankGuy_Anim00, STATUS_END, }; diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index e77dde9a8a..e8ed34a0ea 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -61,7 +61,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 60, STATUS_KEY_SHRINK, 0, @@ -71,7 +71,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, 0, @@ -140,7 +140,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_PARALYZE, ANIM_BigLanternGhost_Anim00, STATUS_KEY_PARALYZE, ANIM_BigLanternGhost_Anim00, STATUS_KEY_DIZZY, ANIM_BigLanternGhost_Anim0D, - STATUS_KEY_FEAR, ANIM_BigLanternGhost_Anim0D, + STATUS_KEY_UNUSED, ANIM_BigLanternGhost_Anim0D, STATUS_END, }; diff --git a/src/battle/area/pra2/actor/crystal_bit.c b/src/battle/area/pra2/actor/crystal_bit.c index b11728402c..7a08b944c8 100644 --- a/src/battle/area/pra2/actor/crystal_bit.c +++ b/src/battle/area/pra2/actor/crystal_bit.c @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -54,7 +54,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index dfcad94036..f200ba3dbc 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -78,7 +78,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 40, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 0, @@ -88,7 +88,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -1163,7 +1163,7 @@ s32 N(CloneStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 40, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 0, @@ -1173,7 +1173,7 @@ s32 N(CloneStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index 55248fffb3..af67192e93 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -55,7 +55,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index b9a1ebe90c..49033cffd1 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -142,7 +142,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 90, @@ -152,7 +152,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index b1e25e6941..06dff9f75a 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -147,7 +147,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 0, @@ -157,7 +157,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 137f94900f..769df68429 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -154,7 +154,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 60, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 80, @@ -164,7 +164,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -179,7 +179,7 @@ s32 N(ChargedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 70, @@ -189,7 +189,7 @@ s32 N(ChargedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index 86ae655e21..93f9421082 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -165,7 +165,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 60, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 70, @@ -175,7 +175,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -190,7 +190,7 @@ s32 N(EnragedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -200,7 +200,7 @@ s32 N(EnragedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c index 662f9e01a2..468a50a32d 100644 --- a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c +++ b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c @@ -29,7 +29,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, THIS_DIZZY_CHANCE, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, THIS_PARALYZE_CHANCE, STATUS_KEY_SHRINK, 100, @@ -39,7 +39,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 6068a9c8d2..c0d1024d18 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -89,7 +89,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -99,7 +99,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index 81c66dc700..c260a3a202 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index f13baaa4a6..c59a482655 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -1299,7 +1299,7 @@ void btl_state_update_9(void) { actor->flags &= ~ACTOR_FLAG_SKIP_TURN; if (actor->debuff != 0) { - if (actor->debuff == STATUS_KEY_FEAR + if (actor->debuff == STATUS_KEY_UNUSED || actor->debuff == STATUS_KEY_DIZZY || actor->debuff == STATUS_KEY_PARALYZE || actor->debuff == STATUS_KEY_SLEEP @@ -2236,7 +2236,7 @@ void btl_state_update_run_away(void) { if (!(enemy->flags & ACTOR_FLAG_NO_DMG_APPLY)) { f32 escapeChance = enemy->actorBlueprint->escapeChance; - if (enemy->debuff == STATUS_KEY_FEAR || + if (enemy->debuff == STATUS_KEY_UNUSED || enemy->debuff == STATUS_KEY_DIZZY || enemy->debuff == STATUS_KEY_PARALYZE || enemy->debuff == STATUS_KEY_SLEEP || @@ -3490,7 +3490,7 @@ void btl_state_update_next_enemy(void) { if (enemy->debuff == STATUS_KEY_SLEEP) { skipEnemy = true; } - if (enemy->debuff == STATUS_KEY_FEAR) { + if (enemy->debuff == STATUS_KEY_UNUSED) { skipEnemy = true; } if (enemy->debuff == STATUS_KEY_DIZZY) { diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index f6a6ef1228..4840be06e6 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -2469,7 +2469,7 @@ s32 can_switch_to_player(void) { if (debuff == STATUS_KEY_SLEEP) { playerCantMove = true; } - if (debuff == STATUS_KEY_FEAR) { + if (debuff == STATUS_KEY_UNUSED) { playerCantMove = true; } if (debuff == STATUS_KEY_DIZZY) { @@ -2513,7 +2513,7 @@ s32 btl_menu_can_player_move(void) { if (debuff == STATUS_KEY_SLEEP) { playerCantMove = true; } - if (debuff == STATUS_KEY_FEAR) { + if (debuff == STATUS_KEY_UNUSED) { playerCantMove = true; } if (debuff == STATUS_KEY_DIZZY) { @@ -2565,7 +2565,7 @@ s32 can_switch_to_partner(void) { if (partnerDebuff == STATUS_KEY_SLEEP) { partnerCantMove = true; } - if (partnerDebuff == STATUS_KEY_FEAR) { + if (partnerDebuff == STATUS_KEY_UNUSED) { partnerCantMove = true; } if (partnerDebuff == STATUS_KEY_PARALYZE) { @@ -5064,7 +5064,7 @@ void btl_state_update_twink_menu(void) { if (player->debuff == STATUS_KEY_SLEEP) { shouldSkipTurn = true; } - if (player->debuff == STATUS_KEY_FEAR) { + if (player->debuff == STATUS_KEY_UNUSED) { shouldSkipTurn = true; } if (player->debuff == STATUS_KEY_DIZZY) { diff --git a/src/battle/common/actor/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index f07614a8dd..a18d134d0b 100644 --- a/src/battle/common/actor/albino_dino.inc.c +++ b/src/battle/common/actor/albino_dino.inc.c @@ -41,7 +41,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_AlbinoDino_Idle, STATUS_KEY_PARALYZE, ANIM_AlbinoDino_Still, STATUS_KEY_DIZZY, ANIM_AlbinoDino_Still, - STATUS_KEY_FEAR, ANIM_AlbinoDino_Still, + STATUS_KEY_UNUSED, ANIM_AlbinoDino_Still, STATUS_END, }; @@ -58,7 +58,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 75, @@ -68,7 +68,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -316,7 +316,7 @@ EvtScript N(EVS_TakeTurn) = { KillThread(LVar9) Wait(2) Call(SetGoalToTarget, ACTOR_SELF) - // invalid status field has 24% chance, but no status and doesn't have STATUS_FLAG_80000000 set + // invalid status field has 24% chance, but no status and doesn't have STATUS_FLAG_USE_DURATION set Call(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 24, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index 1948d030ea..a255ff2b31 100644 --- a/src/battle/common/actor/amazy_dayzee.inc.c +++ b/src/battle/common/actor/amazy_dayzee.inc.c @@ -30,7 +30,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 10, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 10, STATUS_KEY_SHRINK, 10, @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, 0, @@ -95,7 +95,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Dayzee_Amazy_Anim01, STATUS_KEY_PARALYZE, ANIM_Dayzee_Amazy_Anim00, STATUS_KEY_DIZZY, ANIM_Dayzee_Amazy_Anim0B, - STATUS_KEY_FEAR, ANIM_Dayzee_Amazy_Anim0B, + STATUS_KEY_UNUSED, ANIM_Dayzee_Amazy_Anim0B, STATUS_END, }; diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index e3c1b7b97e..bc55602d2d 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -43,7 +43,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, PARALYZE_CHANCE, STATUS_KEY_SHRINK, 50, @@ -53,7 +53,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, -1, @@ -108,7 +108,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_ShyGuy_Black_Anim01, STATUS_KEY_PARALYZE, ANIM_ShyGuy_Black_Anim00, STATUS_KEY_DIZZY, ANIM_ShyGuy_Black_Anim13, - STATUS_KEY_FEAR, ANIM_ShyGuy_Black_Anim13, + STATUS_KEY_UNUSED, ANIM_ShyGuy_Black_Anim13, STATUS_END, }; diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 2514890174..746e9ad607 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -38,7 +38,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Bandit_Idle, STATUS_KEY_PARALYZE, ANIM_Bandit_Still, STATUS_KEY_DIZZY, ANIM_Bandit_Dizzy, - STATUS_KEY_FEAR, ANIM_Bandit_Dizzy, + STATUS_KEY_UNUSED, ANIM_Bandit_Dizzy, STATUS_END, }; @@ -51,7 +51,7 @@ s32 N(HoldingAnims)[] = { STATUS_KEY_STATIC, ANIM_Bandit_IdleHolding, STATUS_KEY_PARALYZE, ANIM_Bandit_StillHolding, STATUS_KEY_DIZZY, ANIM_Bandit_Dizzy, - STATUS_KEY_FEAR, ANIM_Bandit_Dizzy, + STATUS_KEY_UNUSED, ANIM_Bandit_Dizzy, STATUS_END, }; @@ -72,7 +72,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 20, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 50, + STATUS_KEY_UNUSED, 50, STATUS_KEY_STATIC, 30, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 90, @@ -82,7 +82,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/bill_blaster.inc.c b/src/battle/common/actor/bill_blaster.inc.c index 76b4074251..db62152bea 100644 --- a/src/battle/common/actor/bill_blaster.inc.c +++ b/src/battle/common/actor/bill_blaster.inc.c @@ -39,7 +39,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 50, @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index 11f39282ec..fe9660a18a 100644 --- a/src/battle/common/actor/bob_omb.inc.c +++ b/src/battle/common/actor/bob_omb.inc.c @@ -33,7 +33,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Bobomb_Idle, STATUS_KEY_PARALYZE, ANIM_Bobomb_Still, STATUS_KEY_DIZZY, ANIM_Bobomb_Dizzy, - STATUS_KEY_FEAR, ANIM_Bobomb_Dizzy, + STATUS_KEY_UNUSED, ANIM_Bobomb_Dizzy, STATUS_END, }; @@ -46,7 +46,7 @@ s32 N(IgnitedAnims)[] = { STATUS_KEY_STATIC, ANIM_Bobomb_IdleLit, STATUS_KEY_PARALYZE, ANIM_Bobomb_StillLit, STATUS_KEY_DIZZY, ANIM_Bobomb_DizzyLit, - STATUS_KEY_FEAR, ANIM_Bobomb_DizzyLit, + STATUS_KEY_UNUSED, ANIM_Bobomb_DizzyLit, STATUS_END, }; @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 80, STATUS_KEY_SHRINK, 90, @@ -72,7 +72,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -87,7 +87,7 @@ s32 N(IgnitedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 40, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 0, @@ -97,7 +97,7 @@ s32 N(IgnitedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index 45b94c4a5e..4572ad08ca 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -48,7 +48,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BonyBeetle_Anim04, STATUS_KEY_PARALYZE, ANIM_BonyBeetle_Anim00, STATUS_KEY_DIZZY, ANIM_BonyBeetle_Anim26, - STATUS_KEY_FEAR, ANIM_BonyBeetle_Anim26, + STATUS_KEY_UNUSED, ANIM_BonyBeetle_Anim26, STATUS_END, }; @@ -61,7 +61,7 @@ s32 N(SpikyAnims)[] = { STATUS_KEY_STATIC, ANIM_BonyBeetle_Anim05, STATUS_KEY_PARALYZE, ANIM_BonyBeetle_Anim01, STATUS_KEY_DIZZY, ANIM_BonyBeetle_Anim27, - STATUS_KEY_FEAR, ANIM_BonyBeetle_Anim27, + STATUS_KEY_UNUSED, ANIM_BonyBeetle_Anim27, STATUS_END, }; @@ -74,7 +74,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_BonyBeetle_Anim06, STATUS_KEY_PARALYZE, ANIM_BonyBeetle_Anim02, STATUS_KEY_DIZZY, ANIM_BonyBeetle_Anim28, - STATUS_KEY_FEAR, ANIM_BonyBeetle_Anim28, + STATUS_KEY_UNUSED, ANIM_BonyBeetle_Anim28, STATUS_END, }; @@ -87,7 +87,7 @@ s32 N(ToppledSpikyAnims)[] = { STATUS_KEY_STATIC, ANIM_BonyBeetle_Anim07, STATUS_KEY_PARALYZE, ANIM_BonyBeetle_Anim03, STATUS_KEY_DIZZY, ANIM_BonyBeetle_Anim29, - STATUS_KEY_FEAR, ANIM_BonyBeetle_Anim29, + STATUS_KEY_UNUSED, ANIM_BonyBeetle_Anim29, STATUS_END, }; @@ -108,7 +108,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -118,7 +118,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index 8abcec6002..7048bac7e0 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -38,7 +38,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 100, @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 79222d3123..e56514a706 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -51,7 +51,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 90, @@ -61,7 +61,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -116,7 +116,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_BuzzyBeetle_Anim01, STATUS_KEY_PARALYZE, ANIM_BuzzyBeetle_Anim00, STATUS_KEY_DIZZY, ANIM_BuzzyBeetle_Anim0A, - STATUS_KEY_FEAR, ANIM_BuzzyBeetle_Anim0A, + STATUS_KEY_UNUSED, ANIM_BuzzyBeetle_Anim0A, STATUS_END, }; @@ -129,7 +129,7 @@ s32 N(CeilingAnims)[] = { STATUS_KEY_STATIC, ANIM_BuzzyBeetle_Anim0F, STATUS_KEY_PARALYZE, ANIM_BuzzyBeetle_Anim0E, STATUS_KEY_DIZZY, ANIM_BuzzyBeetle_Anim15, - STATUS_KEY_FEAR, ANIM_BuzzyBeetle_Anim15, + STATUS_KEY_UNUSED, ANIM_BuzzyBeetle_Anim15, STATUS_END, }; @@ -141,7 +141,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STOP, ANIM_BuzzyBeetle_Anim1A, STATUS_KEY_STATIC, ANIM_BuzzyBeetle_Anim02, STATUS_KEY_DIZZY, ANIM_BuzzyBeetle_Anim1C, - STATUS_KEY_FEAR, ANIM_BuzzyBeetle_Anim1C, + STATUS_KEY_UNUSED, ANIM_BuzzyBeetle_Anim1C, STATUS_END, }; diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index c41a0da336..80f329a365 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -32,7 +32,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Bzzap_Anim01, STATUS_KEY_PARALYZE, ANIM_Bzzap_Anim00, STATUS_KEY_DIZZY, ANIM_Bzzap_Anim0A, - STATUS_KEY_FEAR, ANIM_Bzzap_Anim0A, + STATUS_KEY_UNUSED, ANIM_Bzzap_Anim0A, STATUS_END, }; @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -58,7 +58,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/cleft.inc.c b/src/battle/common/actor/cleft.inc.c index 94495f3589..1448a3c1a1 100644 --- a/src/battle/common/actor/cleft.inc.c +++ b/src/battle/common/actor/cleft.inc.c @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 75, @@ -55,7 +55,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -110,7 +110,7 @@ s32 N(UprightAnims)[] = { STATUS_KEY_STATIC, ANIM_Cleft_Anim02, STATUS_KEY_PARALYZE, ANIM_Cleft_Anim00, STATUS_KEY_DIZZY, ANIM_Cleft_Anim0E, - STATUS_KEY_FEAR, ANIM_Cleft_Anim0E, + STATUS_KEY_UNUSED, ANIM_Cleft_Anim0E, STATUS_END, }; @@ -123,7 +123,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_Cleft_Anim05, STATUS_KEY_PARALYZE, ANIM_Cleft_Anim01, STATUS_KEY_DIZZY, ANIM_Cleft_Anim0F, - STATUS_KEY_FEAR, ANIM_Cleft_Anim0F, + STATUS_KEY_UNUSED, ANIM_Cleft_Anim0F, STATUS_END, }; diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 8366ae8a8d..8db903e13f 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -26,7 +26,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleClubba_Anim01, STATUS_KEY_PARALYZE, ANIM_BattleClubba_Anim00, STATUS_KEY_DIZZY, ANIM_BattleClubba_Anim05, - STATUS_KEY_FEAR, ANIM_BattleClubba_Anim05, + STATUS_KEY_UNUSED, ANIM_BattleClubba_Anim05, STATUS_END, }; @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/crazee_dayzee.inc.c b/src/battle/common/actor/crazee_dayzee.inc.c index 77afc4e9c0..2a2ee42d07 100644 --- a/src/battle/common/actor/crazee_dayzee.inc.c +++ b/src/battle/common/actor/crazee_dayzee.inc.c @@ -30,7 +30,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 30, STATUS_KEY_SHRINK, 30, @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -95,7 +95,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Dayzee_Anim01, STATUS_KEY_PARALYZE, ANIM_Dayzee_Anim00, STATUS_KEY_DIZZY, ANIM_Dayzee_Anim0B, - STATUS_KEY_FEAR, ANIM_Dayzee_Anim0B, + STATUS_KEY_UNUSED, ANIM_Dayzee_Anim0B, STATUS_END, }; diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index 2128dc6913..aab05c6f3e 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -54,7 +54,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -64,7 +64,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -119,7 +119,7 @@ s32 N(KoopaAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -132,7 +132,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Walk, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -145,7 +145,7 @@ s32 N(HyperAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Scramble, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -158,7 +158,7 @@ s32 N(HyperShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Walk, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -171,7 +171,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_ToppleStruggle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_ToppleStill, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_ToppleStunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_ToppleStunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_ToppleStunned, STATUS_END, }; diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index ea176ed413..1ee2b5502e 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -74,7 +74,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -84,7 +84,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -99,7 +99,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -109,7 +109,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -188,7 +188,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_ParaTroopa_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_ParaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_ParaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_ParaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_ParaTroopa_Dark_Stunned, STATUS_END, }; @@ -201,7 +201,7 @@ s32 N(FlyingShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_ParaTroopa_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_ParaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_ParaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_ParaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_ParaTroopa_Dark_Stunned, STATUS_END, }; @@ -214,7 +214,7 @@ s32 N(WingAnims)[] = { STATUS_KEY_STATIC, ANIM_ParaTroopa_Dark_WingsStill, STATUS_KEY_PARALYZE, ANIM_ParaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_ParaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_ParaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_ParaTroopa_Dark_Stunned, STATUS_END, }; @@ -679,7 +679,7 @@ s32 N(KoopaAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -692,7 +692,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Walk, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -705,7 +705,7 @@ s32 N(HyperAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Scramble, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -718,7 +718,7 @@ s32 N(HyperShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_Walk, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; @@ -731,7 +731,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Dark_ToppleStruggle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Dark_ToppleStill, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Dark_ToppleStunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Dark_ToppleStunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Dark_ToppleStunned, STATUS_END, }; diff --git a/src/battle/common/actor/dry_bones.inc.c b/src/battle/common/actor/dry_bones.inc.c index 2d6dca91c8..e61172376c 100644 --- a/src/battle/common/actor/dry_bones.inc.c +++ b/src/battle/common/actor/dry_bones.inc.c @@ -35,7 +35,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_DryBones_Anim02, STATUS_KEY_PARALYZE, ANIM_DryBones_Anim00, STATUS_KEY_DIZZY, ANIM_DryBones_Anim0D, - STATUS_KEY_FEAR, ANIM_DryBones_Anim0D, + STATUS_KEY_UNUSED, ANIM_DryBones_Anim0D, STATUS_END, }; @@ -70,7 +70,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 60, @@ -80,7 +80,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -95,7 +95,7 @@ s32 N(CollapsedStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -105,7 +105,7 @@ s32 N(CollapsedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 95a20890f2..3c855fef8d 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -47,7 +47,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Duplighost_Anim02, STATUS_KEY_PARALYZE, ANIM_Duplighost_Anim00, STATUS_KEY_DIZZY, ANIM_Duplighost_Anim0E, - STATUS_KEY_FEAR, ANIM_Duplighost_Anim0E, + STATUS_KEY_UNUSED, ANIM_Duplighost_Anim0E, STATUS_END, }; @@ -73,7 +73,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 75, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -83,7 +83,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_bombette.inc.c b/src/battle/common/actor/duplighost/ghost_bombette.inc.c index f4ff59d39d..b09b947598 100644 --- a/src/battle/common/actor/duplighost/ghost_bombette.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bombette.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleBombette_Idle, STATUS_KEY_PARALYZE, ANIM_BattleBombette_Still, STATUS_KEY_DIZZY, ANIM_BattleBombette_Injured, - STATUS_KEY_FEAR, ANIM_BattleBombette_Injured, + STATUS_KEY_UNUSED, ANIM_BattleBombette_Injured, STATUS_END, }; @@ -34,7 +34,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_bow.inc.c b/src/battle/common/actor/duplighost/ghost_bow.inc.c index 8dbf06f45c..562ac6bdb9 100644 --- a/src/battle/common/actor/duplighost/ghost_bow.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bow.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleBow_Idle, STATUS_KEY_PARALYZE, ANIM_BattleBow_Still, STATUS_KEY_DIZZY, ANIM_BattleBow_Injured, - STATUS_KEY_FEAR, ANIM_BattleBow_Injured, + STATUS_KEY_UNUSED, ANIM_BattleBow_Injured, STATUS_END, }; @@ -34,7 +34,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index b437b4dbe4..f1fd1a8054 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleGoombario_Idle, STATUS_KEY_PARALYZE, ANIM_BattleGoombario_Still, STATUS_KEY_DIZZY, ANIM_BattleGoombario_Injured, - STATUS_KEY_FEAR, ANIM_BattleGoombario_Injured, + STATUS_KEY_UNUSED, ANIM_BattleGoombario_Injured, STATUS_END, }; @@ -34,7 +34,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_kooper.inc.c b/src/battle/common/actor/duplighost/ghost_kooper.inc.c index e7f31ed032..f210fe6074 100644 --- a/src/battle/common/actor/duplighost/ghost_kooper.inc.c +++ b/src/battle/common/actor/duplighost/ghost_kooper.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleKooper_Idle, STATUS_KEY_PARALYZE, ANIM_BattleKooper_Still, STATUS_KEY_DIZZY, ANIM_BattleKooper_Injured, - STATUS_KEY_FEAR, ANIM_BattleKooper_Injured, + STATUS_KEY_UNUSED, ANIM_BattleKooper_Injured, STATUS_END, }; @@ -31,7 +31,7 @@ s32 N(ToppleAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleKooper_Toppled, STATUS_KEY_PARALYZE, ANIM_BattleKooper_StillToppled, STATUS_KEY_DIZZY, ANIM_BattleKooper_Toppled, - STATUS_KEY_FEAR, ANIM_BattleKooper_Toppled, + STATUS_KEY_UNUSED, ANIM_BattleKooper_Toppled, STATUS_END, }; @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index 630f32e4ed..fb20b919a7 100644 --- a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c +++ b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleLakilester_Idle, STATUS_KEY_PARALYZE, ANIM_BattleLakilester_Still, STATUS_KEY_DIZZY, ANIM_BattleLakilester_Injured, - STATUS_KEY_FEAR, ANIM_BattleLakilester_Idle, + STATUS_KEY_UNUSED, ANIM_BattleLakilester_Idle, STATUS_END, }; @@ -39,7 +39,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c index b913a64364..7687a7c425 100644 --- a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c +++ b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleParakarry_Idle, STATUS_KEY_PARALYZE, ANIM_BattleParakarry_Still, STATUS_KEY_DIZZY, ANIM_BattleParakarry_Idle, - STATUS_KEY_FEAR, ANIM_BattleParakarry_Idle, + STATUS_KEY_UNUSED, ANIM_BattleParakarry_Idle, STATUS_END, }; @@ -34,7 +34,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index 9ce1384739..e1f1930c7f 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -18,7 +18,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleSushie_Idle, STATUS_KEY_PARALYZE, ANIM_BattleSushie_Still, STATUS_KEY_DIZZY, ANIM_BattleSushie_Injured, - STATUS_KEY_FEAR, ANIM_BattleSushie_Injured, + STATUS_KEY_UNUSED, ANIM_BattleSushie_Injured, STATUS_END, }; @@ -34,7 +34,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/duplighost/ghost_watt.inc.c b/src/battle/common/actor/duplighost/ghost_watt.inc.c index 1ff3427e00..431773c436 100644 --- a/src/battle/common/actor/duplighost/ghost_watt.inc.c +++ b/src/battle/common/actor/duplighost/ghost_watt.inc.c @@ -19,7 +19,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleWatt_Idle, STATUS_KEY_PARALYZE, ANIM_BattleWatt_Still, STATUS_KEY_DIZZY, ANIM_BattleWatt_Injured, - STATUS_KEY_FEAR, ANIM_BattleWatt_Injured, + STATUS_KEY_UNUSED, ANIM_BattleWatt_Injured, STATUS_END, }; @@ -36,7 +36,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -46,7 +46,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index e758596884..476dda1cb3 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -47,7 +47,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 90, @@ -57,7 +57,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -160,7 +160,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_LavaBubble_Blue_Anim01, STATUS_KEY_PARALYZE, ANIM_LavaBubble_Blue_Anim00, STATUS_KEY_DIZZY, ANIM_LavaBubble_Blue_Anim0A, - STATUS_KEY_FEAR, ANIM_LavaBubble_Blue_Anim0A, + STATUS_KEY_UNUSED, ANIM_LavaBubble_Blue_Anim0A, STATUS_END, }; diff --git a/src/battle/common/actor/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c index cf4035210c..8c87f51bb0 100644 --- a/src/battle/common/actor/forest_fuzzy.inc.c +++ b/src/battle/common/actor/forest_fuzzy.inc.c @@ -36,7 +36,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 90, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 70, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -46,7 +46,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -101,7 +101,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Fuzzy_Forest_Idle, STATUS_KEY_PARALYZE, ANIM_Fuzzy_Forest_Still, STATUS_KEY_DIZZY, ANIM_Fuzzy_Forest_Stunned, - STATUS_KEY_FEAR, ANIM_Fuzzy_Forest_Stunned, + STATUS_KEY_UNUSED, ANIM_Fuzzy_Forest_Stunned, STATUS_END, }; diff --git a/src/battle/common/actor/frost_piranha.inc.c b/src/battle/common/actor/frost_piranha.inc.c index 3875c281e8..77a2f1fb87 100644 --- a/src/battle/common/actor/frost_piranha.inc.c +++ b/src/battle/common/actor/frost_piranha.inc.c @@ -47,7 +47,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -57,7 +57,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index 821d2e87b5..bf6d0ee00e 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -32,7 +32,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 90, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 70, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -97,7 +97,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Fuzzy_Idle, STATUS_KEY_PARALYZE, ANIM_Fuzzy_Still, STATUS_KEY_DIZZY, ANIM_Fuzzy_Stunned, - STATUS_KEY_FEAR, ANIM_Fuzzy_Stunned, + STATUS_KEY_UNUSED, ANIM_Fuzzy_Stunned, STATUS_END, }; diff --git a/src/battle/common/actor/gloomba.inc.c b/src/battle/common/actor/gloomba.inc.c index 079d6b28b3..f0b4aea45b 100644 --- a/src/battle/common/actor/gloomba.inc.c +++ b/src/battle/common/actor/gloomba.inc.c @@ -30,7 +30,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 80, @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -95,7 +95,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_Goomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Dark_Dizzy, STATUS_END, }; @@ -108,7 +108,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Dark_Run, STATUS_KEY_PARALYZE, ANIM_Goomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Dark_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 06b11e5a80..9d4dfc2d74 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -35,7 +35,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -102,7 +102,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Idle, STATUS_KEY_PARALYZE, ANIM_Goomba_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Dizzy, STATUS_END, }; @@ -116,7 +116,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Run, STATUS_KEY_PARALYZE, ANIM_Goomba_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 2544816cbd..564d86e564 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -58,7 +58,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -73,7 +73,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -83,7 +83,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -200,7 +200,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_Gray_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_Gray_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_Gray_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_Gray_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_Gray_Anim07, STATUS_END, }; @@ -213,7 +213,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_Gray_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_Gray_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_Gray_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_Gray_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Gray_Anim07, STATUS_END, }; diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 9f7056c794..3d916a76d4 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -60,7 +60,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -75,7 +75,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -85,7 +85,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -202,7 +202,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_Green_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_Green_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_Green_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_Green_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_Green_Anim07, STATUS_END, }; @@ -215,7 +215,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_Green_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_Green_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_Green_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_Green_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Green_Anim07, STATUS_END, }; diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index 9b3042e240..405ccd46bd 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -45,7 +45,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_GrooveGuy_Anim01, STATUS_KEY_PARALYZE, ANIM_GrooveGuy_Anim00, STATUS_KEY_DIZZY, ANIM_GrooveGuy_Anim07, - STATUS_KEY_FEAR, ANIM_GrooveGuy_Anim07, + STATUS_KEY_UNUSED, ANIM_GrooveGuy_Anim07, STATUS_END, }; @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -72,7 +72,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/gulpit.inc.c b/src/battle/common/actor/gulpit.inc.c index fa360e391a..388938f532 100644 --- a/src/battle/common/actor/gulpit.inc.c +++ b/src/battle/common/actor/gulpit.inc.c @@ -35,7 +35,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Gulpit_Anim01, STATUS_KEY_PARALYZE, ANIM_Gulpit_Anim00, STATUS_KEY_DIZZY, ANIM_Gulpit_Anim0E, - STATUS_KEY_FEAR, ANIM_Gulpit_Anim0E, + STATUS_KEY_UNUSED, ANIM_Gulpit_Anim0E, STATUS_END, }; @@ -61,7 +61,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 10, STATUS_KEY_PARALYZE, 80, STATUS_KEY_SHRINK, 75, @@ -71,7 +71,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/gulpit_rocks.inc.c b/src/battle/common/actor/gulpit_rocks.inc.c index df18c7095a..a0935d4ea5 100644 --- a/src/battle/common/actor/gulpit_rocks.inc.c +++ b/src/battle/common/actor/gulpit_rocks.inc.c @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index 93778be380..b85e8dcfa1 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -36,7 +36,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_HammerBros_Anim02, STATUS_KEY_PARALYZE, ANIM_HammerBros_Anim00, STATUS_KEY_DIZZY, ANIM_HammerBros_Anim12, - STATUS_KEY_FEAR, ANIM_HammerBros_Anim12, + STATUS_KEY_UNUSED, ANIM_HammerBros_Anim12, STATUS_END, }; @@ -57,7 +57,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 70, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 70, STATUS_KEY_SHRINK, 70, @@ -67,7 +67,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index ee31f6cec7..60419e62f3 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -26,7 +26,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_HurtPlant_Anim02, STATUS_KEY_PARALYZE, ANIM_HurtPlant_Anim00, STATUS_KEY_DIZZY, ANIM_HurtPlant_Anim09, - STATUS_KEY_FEAR, ANIM_HurtPlant_Anim09, + STATUS_KEY_UNUSED, ANIM_HurtPlant_Anim09, STATUS_END, }; @@ -43,7 +43,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -53,7 +53,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/hyper_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index d5204be02a..4de7768889 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 90, @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -117,7 +117,7 @@ s32 N(HyperAnims)[] = { STATUS_KEY_STATIC, ANIM_Cleft_Hyper_Anim04, STATUS_KEY_PARALYZE, ANIM_Cleft_Hyper_Anim00, STATUS_KEY_DIZZY, ANIM_Cleft_Hyper_Anim0E, - STATUS_KEY_FEAR, ANIM_Cleft_Hyper_Anim0E, + STATUS_KEY_UNUSED, ANIM_Cleft_Hyper_Anim0E, STATUS_END, }; @@ -377,7 +377,7 @@ s32 N(UprightAnims)[] = { STATUS_KEY_STATIC, ANIM_Cleft_Hyper_Anim02, STATUS_KEY_PARALYZE, ANIM_Cleft_Hyper_Anim00, STATUS_KEY_DIZZY, ANIM_Cleft_Hyper_Anim0E, - STATUS_KEY_FEAR, ANIM_Cleft_Hyper_Anim0E, + STATUS_KEY_UNUSED, ANIM_Cleft_Hyper_Anim0E, STATUS_END, }; @@ -390,7 +390,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_Cleft_Hyper_Anim05, STATUS_KEY_PARALYZE, ANIM_Cleft_Hyper_Anim01, STATUS_KEY_DIZZY, ANIM_Cleft_Hyper_Anim0F, - STATUS_KEY_FEAR, ANIM_Cleft_Hyper_Anim0F, + STATUS_KEY_UNUSED, ANIM_Cleft_Hyper_Anim0F, STATUS_END, }; diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index 300099c810..e6123fdea5 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 80, @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -109,7 +109,7 @@ s32 N(HyperAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Hyper_Sleep, STATUS_KEY_PARALYZE, ANIM_Goomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Hyper_Dizzy, STATUS_END, }; @@ -352,7 +352,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Hyper_Idle, STATUS_KEY_PARALYZE, ANIM_Goomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Hyper_Dizzy, STATUS_END, }; @@ -365,7 +365,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Hyper_Run, STATUS_KEY_PARALYZE, ANIM_Goomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Hyper_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index 9d4f3854be..2554171417 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -61,7 +61,7 @@ s32 N(DownedStatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 80, @@ -71,7 +71,7 @@ s32 N(DownedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -86,7 +86,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 80, @@ -96,7 +96,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -187,7 +187,7 @@ s32 N(ChargedFlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Hyper_Miss, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Hyper_Dizzy, STATUS_END, }; @@ -438,7 +438,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Hyper_Idle, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Hyper_Dizzy, STATUS_END, }; @@ -451,7 +451,7 @@ s32 N(FlyingShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Hyper_Run, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Hyper_Dizzy, STATUS_END, }; @@ -857,7 +857,7 @@ s32 N(DownedChargedAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Hyper_Sleep, STATUS_KEY_PARALYZE, ANIM_Goomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Hyper_Dizzy, STATUS_END, }; @@ -1120,7 +1120,7 @@ s32 N(DownedAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Hyper_Idle, STATUS_KEY_PARALYZE, ANIM_Goomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Hyper_Dizzy, STATUS_END, }; @@ -1133,7 +1133,7 @@ s32 N(DownedShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Hyper_Run, STATUS_KEY_PARALYZE, ANIM_Goomba_Hyper_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Hyper_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Hyper_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Hyper_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c index c72552337e..691e4d461f 100644 --- a/src/battle/common/actor/jungle_fuzzy.inc.c +++ b/src/battle/common/actor/jungle_fuzzy.inc.c @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 70, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -105,7 +105,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Fuzzy_Jungle_Idle, STATUS_KEY_PARALYZE, ANIM_Fuzzy_Jungle_Still, STATUS_KEY_DIZZY, ANIM_Fuzzy_Jungle_Stunned, - STATUS_KEY_FEAR, ANIM_Fuzzy_Jungle_Stunned, + STATUS_KEY_UNUSED, ANIM_Fuzzy_Jungle_Stunned, STATUS_END, }; diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 65f0f11fd5..2c798811c6 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -46,7 +46,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 90, @@ -56,7 +56,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -111,7 +111,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Idle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Stunned, STATUS_END, }; @@ -124,7 +124,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Walk, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Stunned, STATUS_END, }; @@ -137,7 +137,7 @@ s32 N(FlippedAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_ToppleStruggle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_ToppleStill, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_ToppleStunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_ToppleStunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_ToppleStunned, STATUS_END, }; diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 29df9255aa..a17456ff0e 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -39,7 +39,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Koopatrol_Anim01, STATUS_KEY_PARALYZE, ANIM_Koopatrol_Anim00, STATUS_KEY_DIZZY, ANIM_Koopatrol_Anim13, - STATUS_KEY_FEAR, ANIM_Koopatrol_Anim13, + STATUS_KEY_UNUSED, ANIM_Koopatrol_Anim13, STATUS_END, }; @@ -52,7 +52,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Koopatrol_Anim03, STATUS_KEY_PARALYZE, ANIM_Koopatrol_Anim00, STATUS_KEY_DIZZY, ANIM_Koopatrol_Anim13, - STATUS_KEY_FEAR, ANIM_Koopatrol_Anim13, + STATUS_KEY_UNUSED, ANIM_Koopatrol_Anim13, STATUS_END, }; @@ -65,7 +65,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_Koopatrol_Anim0F, STATUS_KEY_PARALYZE, ANIM_Koopatrol_Anim10, STATUS_KEY_DIZZY, ANIM_Koopatrol_Anim14, - STATUS_KEY_FEAR, ANIM_Koopatrol_Anim14, + STATUS_KEY_UNUSED, ANIM_Koopatrol_Anim14, STATUS_END, }; @@ -78,7 +78,7 @@ s32 N(ChargedAnims)[] = { STATUS_KEY_STATIC, ANIM_Koopatrol_Anim06, STATUS_KEY_PARALYZE, ANIM_Koopatrol_Anim06, STATUS_KEY_DIZZY, ANIM_Koopatrol_Anim06, - STATUS_KEY_FEAR, ANIM_Koopatrol_Anim06, + STATUS_KEY_UNUSED, ANIM_Koopatrol_Anim06, STATUS_END, }; @@ -106,7 +106,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 70, @@ -116,7 +116,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -130,7 +130,7 @@ s32 N(ChargedStatusTable)[] = { STATUS_KEY_SLEEP, 0, STATUS_KEY_POISON, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -139,7 +139,7 @@ s32 N(ChargedStatusTable)[] = { STATUS_TURN_MOD_SLEEP, 0, STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/lakitu.inc.c b/src/battle/common/actor/lakitu.inc.c index 6204b5917d..33c1390823 100644 --- a/src/battle/common/actor/lakitu.inc.c +++ b/src/battle/common/actor/lakitu.inc.c @@ -36,7 +36,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Lakitu_Anim01, STATUS_KEY_PARALYZE, ANIM_Lakitu_Anim00, STATUS_KEY_DIZZY, ANIM_Lakitu_Anim09, - STATUS_KEY_FEAR, ANIM_Lakitu_Anim09, + STATUS_KEY_UNUSED, ANIM_Lakitu_Anim09, STATUS_END, }; @@ -63,7 +63,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 75, @@ -73,7 +73,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index 1bb0ee5f52..c7865e16a6 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 75, @@ -58,7 +58,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -161,7 +161,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_LavaBubble_Anim01, STATUS_KEY_PARALYZE, ANIM_LavaBubble_Anim00, STATUS_KEY_DIZZY, ANIM_LavaBubble_Anim0A, - STATUS_KEY_FEAR, ANIM_LavaBubble_Anim0A, + STATUS_KEY_UNUSED, ANIM_LavaBubble_Anim0A, STATUS_END, }; diff --git a/src/battle/common/actor/m_bush.inc.c b/src/battle/common/actor/m_bush.inc.c index 2e2d9f9b61..c9271f3cbe 100644 --- a/src/battle/common/actor/m_bush.inc.c +++ b/src/battle/common/actor/m_bush.inc.c @@ -26,7 +26,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_MBush_Anim02, STATUS_KEY_PARALYZE, ANIM_MBush_Anim01, STATUS_KEY_DIZZY, ANIM_MBush_Anim09, - STATUS_KEY_FEAR, ANIM_MBush_Anim09, + STATUS_KEY_UNUSED, ANIM_MBush_Anim09, STATUS_END, }; @@ -43,7 +43,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -53,7 +53,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 37cb87c6a4..c0e6df41f2 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -89,7 +89,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 60, @@ -99,7 +99,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -114,7 +114,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 60, @@ -124,7 +124,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, -1, STATUS_TURN_MOD_SHRINK, -1, @@ -241,7 +241,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_Anim07, STATUS_END, }; @@ -254,7 +254,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Anim07, STATUS_END, }; @@ -1299,7 +1299,7 @@ s32 N(CloneStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -1309,7 +1309,7 @@ s32 N(CloneStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -1324,7 +1324,7 @@ s32 N(FlyingCloneStatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -1334,7 +1334,7 @@ s32 N(FlyingCloneStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 9ed73d7902..c901617695 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -31,7 +31,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_MediGuy_Anim01, STATUS_KEY_PARALYZE, ANIM_MediGuy_Anim00, STATUS_KEY_DIZZY, ANIM_MediGuy_Anim0A, - STATUS_KEY_FEAR, ANIM_MediGuy_Anim0A, + STATUS_KEY_UNUSED, ANIM_MediGuy_Anim0A, STATUS_END, }; @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -58,7 +58,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index fb71deb20b..a4a5989a96 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -37,7 +37,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 10, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 90, @@ -47,7 +47,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -126,7 +126,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_MontyMole_Anim01, STATUS_KEY_PARALYZE, ANIM_MontyMole_Anim00, STATUS_KEY_DIZZY, ANIM_MontyMole_Anim14, - STATUS_KEY_FEAR, ANIM_MontyMole_Anim14, + STATUS_KEY_UNUSED, ANIM_MontyMole_Anim14, STATUS_END, }; diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index 969df82f6f..1fc587a0c3 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -50,7 +50,7 @@ s32 N(DownedFlyingStatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 80, @@ -60,7 +60,7 @@ s32 N(DownedFlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -75,7 +75,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 80, + STATUS_KEY_UNUSED, 80, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 80, @@ -85,7 +85,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -176,7 +176,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Dark_Dizzy, STATUS_END, }; @@ -189,7 +189,7 @@ s32 N(FlyingShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Dark_Run, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Dark_Dizzy, STATUS_END, }; @@ -571,7 +571,7 @@ s32 N(DownedAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_Goomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Dark_Dizzy, STATUS_END, }; @@ -584,7 +584,7 @@ s32 N(DownedShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Goomba_Dark_Run, STATUS_KEY_PARALYZE, ANIM_Goomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_Goomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_Goomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_Goomba_Dark_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 37aa1ec96c..6d9c2766a2 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -47,7 +47,7 @@ s32 N(DownedStatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -57,7 +57,7 @@ s32 N(DownedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -72,7 +72,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 80, + STATUS_KEY_UNUSED, 80, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -82,7 +82,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -173,7 +173,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Idle, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Dizzy, STATUS_END, }; @@ -186,7 +186,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_Paragoomba_Run, STATUS_KEY_PARALYZE, ANIM_Paragoomba_Still, STATUS_KEY_DIZZY, ANIM_Paragoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_Paragoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_Paragoomba_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index e3cd8b0400..79b10d9d6f 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -67,7 +67,7 @@ s32 N(DownedStatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 90, @@ -77,7 +77,7 @@ s32 N(DownedStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -92,7 +92,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 90, @@ -102,7 +102,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -181,7 +181,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_ParaTroopa_Idle, STATUS_KEY_PARALYZE, ANIM_ParaTroopa_Still, STATUS_KEY_DIZZY, ANIM_ParaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_ParaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_ParaTroopa_Stunned, STATUS_END, }; @@ -194,7 +194,7 @@ s32 N(FlyingShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_ParaTroopa_Idle, STATUS_KEY_PARALYZE, ANIM_ParaTroopa_Still, STATUS_KEY_DIZZY, ANIM_ParaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_ParaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_ParaTroopa_Stunned, STATUS_END, }; @@ -207,7 +207,7 @@ s32 N(WingAnims)[] = { STATUS_KEY_STATIC, ANIM_ParaTroopa_WingsStill, STATUS_KEY_PARALYZE, ANIM_ParaTroopa_Still, STATUS_KEY_DIZZY, ANIM_ParaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_ParaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_ParaTroopa_Stunned, STATUS_END, }; @@ -670,7 +670,7 @@ s32 N(DownedAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Idle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Stunned, STATUS_END, }; @@ -683,7 +683,7 @@ s32 N(DownedShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_Walk, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_Still, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_Stunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_Stunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_Stunned, STATUS_END, }; @@ -696,7 +696,7 @@ s32 N(DownedFlippedAnims)[] = { STATUS_KEY_STATIC, ANIM_KoopaTroopa_ToppleStruggle, STATUS_KEY_PARALYZE, ANIM_KoopaTroopa_ToppleStill, STATUS_KEY_DIZZY, ANIM_KoopaTroopa_ToppleStunned, - STATUS_KEY_FEAR, ANIM_KoopaTroopa_ToppleStunned, + STATUS_KEY_UNUSED, ANIM_KoopaTroopa_ToppleStunned, STATUS_END, }; diff --git a/src/battle/common/actor/piranha_plant.inc.c b/src/battle/common/actor/piranha_plant.inc.c index b59940a816..18d9188232 100644 --- a/src/battle/common/actor/piranha_plant.inc.c +++ b/src/battle/common/actor/piranha_plant.inc.c @@ -26,7 +26,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_SmallPiranha_Anim01, STATUS_KEY_PARALYZE, ANIM_SmallPiranha_Anim00, STATUS_KEY_DIZZY, ANIM_SmallPiranha_Anim01, - STATUS_KEY_FEAR, ANIM_SmallPiranha_Anim01, + STATUS_KEY_UNUSED, ANIM_SmallPiranha_Anim01, STATUS_END, }; @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 80, @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 03e9c6bfc7..ee27ed5e65 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -70,7 +70,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 90, @@ -80,7 +80,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -193,7 +193,7 @@ s32 N(FourPartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Still4, STATUS_KEY_PARALYZE, ANIM_Pokey_Still4, STATUS_KEY_DIZZY, ANIM_Pokey_Dizzy4, - STATUS_KEY_FEAR, ANIM_Pokey_Dizzy4, + STATUS_KEY_UNUSED, ANIM_Pokey_Dizzy4, STATUS_END, }; @@ -204,7 +204,7 @@ s32 N(ThreePartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Still3, STATUS_KEY_PARALYZE, ANIM_Pokey_Still3, STATUS_KEY_DIZZY, ANIM_Pokey_Dizzy3, - STATUS_KEY_FEAR, ANIM_Pokey_Dizzy3, + STATUS_KEY_UNUSED, ANIM_Pokey_Dizzy3, STATUS_END, }; @@ -215,7 +215,7 @@ s32 N(TwoPartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Still2, STATUS_KEY_PARALYZE, ANIM_Pokey_Still2, STATUS_KEY_DIZZY, ANIM_Pokey_Dizzy2, - STATUS_KEY_FEAR, ANIM_Pokey_Dizzy2, + STATUS_KEY_UNUSED, ANIM_Pokey_Dizzy2, STATUS_END, }; @@ -226,7 +226,7 @@ s32 N(OnePartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Still1, STATUS_KEY_PARALYZE, ANIM_Pokey_Still1, STATUS_KEY_DIZZY, ANIM_Pokey_Dizzy1, - STATUS_KEY_FEAR, ANIM_Pokey_Dizzy1, + STATUS_KEY_UNUSED, ANIM_Pokey_Dizzy1, STATUS_END, }; diff --git a/src/battle/common/actor/pokey_mummy.inc.c b/src/battle/common/actor/pokey_mummy.inc.c index 5606b23f4c..602772aada 100644 --- a/src/battle/common/actor/pokey_mummy.inc.c +++ b/src/battle/common/actor/pokey_mummy.inc.c @@ -65,7 +65,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 90, @@ -75,7 +75,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -188,7 +188,7 @@ s32 N(FourPartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Mummy_Still4, STATUS_KEY_PARALYZE, ANIM_Pokey_Mummy_Still4, STATUS_KEY_DIZZY, ANIM_Pokey_Mummy_Dizzy4, - STATUS_KEY_FEAR, ANIM_Pokey_Mummy_Dizzy4, + STATUS_KEY_UNUSED, ANIM_Pokey_Mummy_Dizzy4, STATUS_END, }; @@ -199,7 +199,7 @@ s32 N(ThreePartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Mummy_Still3, STATUS_KEY_PARALYZE, ANIM_Pokey_Mummy_Still3, STATUS_KEY_DIZZY, ANIM_Pokey_Mummy_Dizzy3, - STATUS_KEY_FEAR, ANIM_Pokey_Mummy_Dizzy3, + STATUS_KEY_UNUSED, ANIM_Pokey_Mummy_Dizzy3, STATUS_END, }; @@ -210,7 +210,7 @@ s32 N(TwoPartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Mummy_Still2, STATUS_KEY_PARALYZE, ANIM_Pokey_Mummy_Still2, STATUS_KEY_DIZZY, ANIM_Pokey_Mummy_Dizzy2, - STATUS_KEY_FEAR, ANIM_Pokey_Mummy_Dizzy2, + STATUS_KEY_UNUSED, ANIM_Pokey_Mummy_Dizzy2, STATUS_END, }; @@ -221,7 +221,7 @@ s32 N(OnePartAnims)[] = { STATUS_KEY_STOP, ANIM_Pokey_Mummy_Still1, STATUS_KEY_PARALYZE, ANIM_Pokey_Mummy_Still1, STATUS_KEY_DIZZY, ANIM_Pokey_Mummy_Dizzy1, - STATUS_KEY_FEAR, ANIM_Pokey_Mummy_Dizzy1, + STATUS_KEY_UNUSED, ANIM_Pokey_Mummy_Dizzy1, STATUS_END, }; diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index f9c63fc33d..aaf773dc61 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -46,7 +46,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -56,7 +56,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/pyro_guy.inc.c b/src/battle/common/actor/pyro_guy.inc.c index 43a0f40086..2c5b90d64d 100644 --- a/src/battle/common/actor/pyro_guy.inc.c +++ b/src/battle/common/actor/pyro_guy.inc.c @@ -28,7 +28,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_PyroGuy_Anim01, STATUS_KEY_PARALYZE, ANIM_PyroGuy_Anim00, STATUS_KEY_DIZZY, ANIM_PyroGuy_Anim08, - STATUS_KEY_FEAR, ANIM_PyroGuy_Anim08, + STATUS_KEY_UNUSED, ANIM_PyroGuy_Anim08, STATUS_END, }; @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -60,7 +60,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 7279fd8b6f..a45cf62514 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -59,7 +59,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -74,7 +74,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -84,7 +84,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -201,7 +201,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_Red_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_Red_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_Red_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_Red_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_Red_Anim07, STATUS_END, }; @@ -214,7 +214,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_Red_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_Red_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_Red_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_Red_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Red_Anim07, STATUS_END, }; diff --git a/src/battle/common/actor/ruff_puff.inc.c b/src/battle/common/actor/ruff_puff.inc.c index c21b6430e6..05584f0ba8 100644 --- a/src/battle/common/actor/ruff_puff.inc.c +++ b/src/battle/common/actor/ruff_puff.inc.c @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 90, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 70, STATUS_KEY_PARALYZE, 40, STATUS_KEY_SHRINK, 75, @@ -52,7 +52,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/shy_guy_base.inc.c b/src/battle/common/actor/shy_guy_base.inc.c index cd347713c8..55240c1760 100644 --- a/src/battle/common/actor/shy_guy_base.inc.c +++ b/src/battle/common/actor/shy_guy_base.inc.c @@ -30,7 +30,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -40,7 +40,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -95,7 +95,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_SHYGUY_Anim01, STATUS_KEY_PARALYZE, ANIM_SHYGUY_Anim00, STATUS_KEY_DIZZY, ANIM_SHYGUY_Anim13, - STATUS_KEY_FEAR, ANIM_SHYGUY_Anim13, + STATUS_KEY_UNUSED, ANIM_SHYGUY_Anim13, STATUS_END, }; diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index e51071752b..e2635ae2b9 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -49,7 +49,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_SkyGuy_Anim01, STATUS_KEY_PARALYZE, ANIM_SkyGuy_Anim00, STATUS_KEY_DIZZY, ANIM_SkyGuy_Anim05, - STATUS_KEY_FEAR, ANIM_SkyGuy_Anim05, + STATUS_KEY_UNUSED, ANIM_SkyGuy_Anim05, STATUS_END, }; @@ -62,7 +62,7 @@ s32 N(YellowBalloonAnims)[] = { STATUS_KEY_STATIC, ANIM_SkyGuy_Anim10, STATUS_KEY_PARALYZE, ANIM_SkyGuy_Anim0D, STATUS_KEY_DIZZY, ANIM_SkyGuy_Anim10, - STATUS_KEY_FEAR, ANIM_SkyGuy_Anim10, + STATUS_KEY_UNUSED, ANIM_SkyGuy_Anim10, STATUS_END, }; @@ -75,7 +75,7 @@ s32 N(RedBalloonAnims)[] = { STATUS_KEY_STATIC, ANIM_SkyGuy_Anim0F, STATUS_KEY_PARALYZE, ANIM_SkyGuy_Anim0C, STATUS_KEY_DIZZY, ANIM_SkyGuy_Anim0F, - STATUS_KEY_FEAR, ANIM_SkyGuy_Anim0F, + STATUS_KEY_UNUSED, ANIM_SkyGuy_Anim0F, STATUS_END, }; @@ -88,7 +88,7 @@ s32 N(BlueBalloonAnims)[] = { STATUS_KEY_STATIC, ANIM_SkyGuy_Anim11, STATUS_KEY_PARALYZE, ANIM_SkyGuy_Anim0E, STATUS_KEY_DIZZY, ANIM_SkyGuy_Anim11, - STATUS_KEY_FEAR, ANIM_SkyGuy_Anim11, + STATUS_KEY_UNUSED, ANIM_SkyGuy_Anim11, STATUS_END, }; @@ -116,7 +116,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -126,7 +126,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -141,7 +141,7 @@ s32 N(StatusTable_802296D0)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -151,7 +151,7 @@ s32 N(StatusTable_802296D0)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -623,7 +623,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_ShyGuy_Red_Anim01, STATUS_KEY_PARALYZE, ANIM_ShyGuy_Red_Anim00, STATUS_KEY_DIZZY, ANIM_ShyGuy_Red_Anim13, - STATUS_KEY_FEAR, ANIM_ShyGuy_Red_Anim13, + STATUS_KEY_UNUSED, ANIM_ShyGuy_Red_Anim13, STATUS_END, }; diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index 2e9ac23553..9c6bb564dc 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -71,7 +71,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -81,7 +81,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index cab71b8e53..439812a106 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -53,7 +53,7 @@ s32 N(SpearForwardAnims)[] = { STATUS_KEY_STATIC, ANIM_SpearGuy_Anim04, STATUS_KEY_PARALYZE, ANIM_SpearGuy_Anim02, STATUS_KEY_DIZZY, ANIM_SpearGuy_Anim0F, - STATUS_KEY_FEAR, ANIM_SpearGuy_Anim0F, + STATUS_KEY_UNUSED, ANIM_SpearGuy_Anim0F, STATUS_END, }; @@ -66,7 +66,7 @@ s32 N(SpearUpwardAnims)[] = { STATUS_KEY_STATIC, ANIM_SpearGuy_Anim03, STATUS_KEY_PARALYZE, ANIM_SpearGuy_Anim01, STATUS_KEY_DIZZY, ANIM_SpearGuy_Anim0F, - STATUS_KEY_FEAR, ANIM_SpearGuy_Anim0F, + STATUS_KEY_UNUSED, ANIM_SpearGuy_Anim0F, STATUS_END, }; @@ -99,7 +99,7 @@ s32 N(SpearGuyStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -109,7 +109,7 @@ s32 N(SpearGuyStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -124,7 +124,7 @@ s32 N(ShyGuyStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -134,7 +134,7 @@ s32 N(ShyGuyStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -273,7 +273,7 @@ EvtScript N(EVS_SelectAnim) = { Call(GetActorVar, ACTOR_SELF, AVAR_State, LVarA) IfEq(LVarA, AVAL_State_SpearForward) Call(GetStatusFlags, ACTOR_SELF, LVarB) - IfFlag(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) + IfFlag(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_UNUSED | STATUS_FLAG_DIZZY) Else Set(LVar1, LVar2) EndIf @@ -288,7 +288,7 @@ EvtScript N(EVS_Idle) = { Switch(LVar0) CaseEq(AVAL_State_SpearForward) Call(GetStatusFlags, ACTOR_SELF, LVar0) - IfFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) + IfFlag(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_UNUSED | STATUS_FLAG_DIZZY) Call(SetIdleAnimations, ACTOR_SELF, PRT_SPEAR_GUY, Ref(N(SpearUpwardAnims))) Call(SetPartEventBits, ACTOR_SELF, PRT_SPEAR_GUY, ACTOR_EVENT_FLAG_SPIKY_TOP, true) Call(SetPartEventBits, ACTOR_SELF, PRT_SPEAR_GUY, ACTOR_EVENT_FLAG_SPIKY_FRONT, false) @@ -341,7 +341,7 @@ EvtScript N(EVS_HandleEvent) = { Call(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) IfEq(LVar0, AVAL_State_SpearForward) Call(GetStatusFlags, ACTOR_SELF, LVarB) - IfFlag(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) + IfFlag(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_UNUSED | STATUS_FLAG_DIZZY) SetConst(LVar0, PRT_SPEAR_GUY) SetConst(LVar1, ANIM_SpearGuy_Anim0A) SetConst(LVar2, ANIM_SpearGuy_Anim0C) @@ -360,7 +360,7 @@ EvtScript N(EVS_HandleEvent) = { Call(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) IfEq(LVar0, AVAL_State_SpearForward) Call(GetStatusFlags, ACTOR_SELF, LVarB) - IfFlag(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) + IfFlag(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_UNUSED | STATUS_FLAG_DIZZY) SetConst(LVar0, PRT_SPEAR_GUY) SetConst(LVar1, ANIM_SpearGuy_Anim0A) SetConst(LVar2, ANIM_SpearGuy_Anim0C) @@ -1122,7 +1122,7 @@ s32 N(ShyGuyAnims)[] = { STATUS_KEY_STATIC, ANIM_ShyGuy_Red_Anim01, STATUS_KEY_PARALYZE, ANIM_ShyGuy_Red_Anim00, STATUS_KEY_DIZZY, ANIM_ShyGuy_Red_Anim13, - STATUS_KEY_FEAR, ANIM_ShyGuy_Red_Anim13, + STATUS_KEY_UNUSED, ANIM_ShyGuy_Red_Anim13, STATUS_END, }; diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 3aded62c67..c4537b90b1 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -51,7 +51,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -61,7 +61,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -116,7 +116,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikeTop_Anim03, STATUS_KEY_PARALYZE, ANIM_SpikeTop_Anim00, STATUS_KEY_DIZZY, ANIM_SpikeTop_Anim1E, - STATUS_KEY_FEAR, ANIM_SpikeTop_Anim1E, + STATUS_KEY_UNUSED, ANIM_SpikeTop_Anim1E, STATUS_END, }; @@ -129,7 +129,7 @@ s32 N(CeilingAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikeTop_Anim04, STATUS_KEY_PARALYZE, ANIM_SpikeTop_Anim01, STATUS_KEY_DIZZY, ANIM_SpikeTop_Anim1F, - STATUS_KEY_FEAR, ANIM_SpikeTop_Anim1F, + STATUS_KEY_UNUSED, ANIM_SpikeTop_Anim1F, STATUS_END, }; @@ -141,7 +141,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STOP, ANIM_SpikeTop_Anim02, STATUS_KEY_STATIC, ANIM_SpikeTop_Anim05, STATUS_KEY_DIZZY, ANIM_SpikeTop_Anim20, - STATUS_KEY_FEAR, ANIM_SpikeTop_Anim20, + STATUS_KEY_UNUSED, ANIM_SpikeTop_Anim20, STATUS_END, }; diff --git a/src/battle/common/actor/spiked_gloomba.inc.c b/src/battle/common/actor/spiked_gloomba.inc.c index 39f3a730e1..535c3c6c51 100644 --- a/src/battle/common/actor/spiked_gloomba.inc.c +++ b/src/battle/common/actor/spiked_gloomba.inc.c @@ -31,7 +31,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 80, + STATUS_KEY_UNUSED, 80, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 80, @@ -41,7 +41,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -96,7 +96,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikedGoomba_Dark_Idle, STATUS_KEY_PARALYZE, ANIM_SpikedGoomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_SpikedGoomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_SpikedGoomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_SpikedGoomba_Dark_Dizzy, STATUS_END, }; @@ -109,7 +109,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikedGoomba_Dark_Run, STATUS_KEY_PARALYZE, ANIM_SpikedGoomba_Dark_Still, STATUS_KEY_DIZZY, ANIM_SpikedGoomba_Dark_Dizzy, - STATUS_KEY_FEAR, ANIM_SpikedGoomba_Dark_Dizzy, + STATUS_KEY_UNUSED, ANIM_SpikedGoomba_Dark_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index d00a1644df..de6b998d10 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -32,7 +32,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 80, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 80, + STATUS_KEY_UNUSED, 80, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -97,7 +97,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikedGoomba_Idle, STATUS_KEY_PARALYZE, ANIM_SpikedGoomba_Still, STATUS_KEY_DIZZY, ANIM_SpikedGoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_SpikedGoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_SpikedGoomba_Dizzy, STATUS_END, }; @@ -110,7 +110,7 @@ s32 N(ShuffleAnims)[] = { STATUS_KEY_STATIC, ANIM_SpikedGoomba_Run, STATUS_KEY_PARALYZE, ANIM_SpikedGoomba_Still, STATUS_KEY_DIZZY, ANIM_SpikedGoomba_Dizzy, - STATUS_KEY_FEAR, ANIM_SpikedGoomba_Dizzy, + STATUS_KEY_UNUSED, ANIM_SpikedGoomba_Dizzy, STATUS_END, }; diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index d2b172677a..f8e687ac6e 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -35,7 +35,7 @@ s32 N(UprightAnims)[] = { STATUS_KEY_STATIC, ANIM_Spiny_Anim01, STATUS_KEY_PARALYZE, ANIM_Spiny_Anim00, STATUS_KEY_DIZZY, ANIM_Spiny_Anim12, - STATUS_KEY_FEAR, ANIM_Spiny_Anim12, + STATUS_KEY_UNUSED, ANIM_Spiny_Anim12, STATUS_END, }; @@ -48,7 +48,7 @@ s32 N(ToppledAnims)[] = { STATUS_KEY_STATIC, ANIM_Spiny_Anim02, STATUS_KEY_PARALYZE, ANIM_Spiny_Anim15, STATUS_KEY_DIZZY, ANIM_Spiny_Anim13, - STATUS_KEY_FEAR, ANIM_Spiny_Anim13, + STATUS_KEY_UNUSED, ANIM_Spiny_Anim13, STATUS_END, }; @@ -74,7 +74,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -84,7 +84,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index e6179d8d7f..eed20f9355 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -43,7 +43,7 @@ s32 N(MalletAnims)[] = { STATUS_KEY_STATIC, ANIM_SpyGuy_Anim03, STATUS_KEY_PARALYZE, ANIM_SpyGuy_Anim01, STATUS_KEY_DIZZY, ANIM_SpyGuy_Anim12, - STATUS_KEY_FEAR, ANIM_SpyGuy_Anim12, + STATUS_KEY_UNUSED, ANIM_SpyGuy_Anim12, STATUS_END, }; @@ -56,7 +56,7 @@ s32 N(SlingshotAnims)[] = { STATUS_KEY_STATIC, ANIM_SpyGuy_Anim02, STATUS_KEY_PARALYZE, ANIM_SpyGuy_Anim00, STATUS_KEY_DIZZY, ANIM_SpyGuy_Anim12, - STATUS_KEY_FEAR, ANIM_SpyGuy_Anim12, + STATUS_KEY_UNUSED, ANIM_SpyGuy_Anim12, STATUS_END, }; @@ -78,7 +78,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -88,7 +88,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/stone_chomp.inc.c b/src/battle/common/actor/stone_chomp.inc.c index b2fa9159de..2441871a8f 100644 --- a/src/battle/common/actor/stone_chomp.inc.c +++ b/src/battle/common/actor/stone_chomp.inc.c @@ -93,7 +93,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 75, @@ -103,7 +103,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index e3d96f60de..a6520d11b6 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -35,7 +35,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 90, @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -100,7 +100,7 @@ s32 N(CeilingAnims)[] = { STATUS_KEY_STATIC, ANIM_Swooper_Anim0C, STATUS_KEY_PARALYZE, ANIM_Swooper_Anim0B, STATUS_KEY_DIZZY, ANIM_Swooper_Anim10, - STATUS_KEY_FEAR, ANIM_Swooper_Anim10, + STATUS_KEY_UNUSED, ANIM_Swooper_Anim10, STATUS_END, }; @@ -113,7 +113,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_Swooper_Anim02, STATUS_KEY_PARALYZE, ANIM_Swooper_Anim01, STATUS_KEY_DIZZY, ANIM_Swooper_Anim14, - STATUS_KEY_FEAR, ANIM_Swooper_Anim14, + STATUS_KEY_UNUSED, ANIM_Swooper_Anim14, STATUS_END, }; diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index eacfe72403..9784294b0d 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -39,7 +39,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 60, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 80, STATUS_KEY_PARALYZE, 80, STATUS_KEY_SHRINK, 75, @@ -49,7 +49,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 1, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -104,7 +104,7 @@ s32 N(CeilingAnims)[] = { STATUS_KEY_STATIC, ANIM_Swooper_Gray_Anim0C, STATUS_KEY_PARALYZE, ANIM_Swooper_Gray_Anim0B, STATUS_KEY_DIZZY, ANIM_Swooper_Gray_Anim10, - STATUS_KEY_FEAR, ANIM_Swooper_Gray_Anim10, + STATUS_KEY_UNUSED, ANIM_Swooper_Gray_Anim10, STATUS_END, }; @@ -117,7 +117,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_Swooper_Gray_Anim02, STATUS_KEY_PARALYZE, ANIM_Swooper_Gray_Anim01, STATUS_KEY_DIZZY, ANIM_Swooper_Gray_Anim14, - STATUS_KEY_FEAR, ANIM_Swooper_Gray_Anim14, + STATUS_KEY_UNUSED, ANIM_Swooper_Gray_Anim14, STATUS_END, }; diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index ac1a530737..5e5d331ca8 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -28,7 +28,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_Whacka_Idle, STATUS_KEY_PARALYZE, ANIM_Whacka_Still, STATUS_KEY_DIZZY, ANIM_Whacka_Idle, - STATUS_KEY_FEAR, ANIM_Whacka_Idle, + STATUS_KEY_UNUSED, ANIM_Whacka_Idle, STATUS_END, }; @@ -44,7 +44,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 0, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 0, STATUS_KEY_SHRINK, 0, @@ -54,7 +54,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 1449ab3795..b1d779dff9 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -27,7 +27,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_STATIC, ANIM_BattleClubba_Frost_Anim01, STATUS_KEY_PARALYZE, ANIM_BattleClubba_Frost_Anim00, STATUS_KEY_DIZZY, ANIM_BattleClubba_Frost_Anim05, - STATUS_KEY_FEAR, ANIM_BattleClubba_Frost_Anim05, + STATUS_KEY_UNUSED, ANIM_BattleClubba_Frost_Anim05, STATUS_END, }; @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, @@ -55,7 +55,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index ccde0a39f8..4b2df867a8 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -47,7 +47,7 @@ s32 N(StatusTable_Ground)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -57,7 +57,7 @@ s32 N(StatusTable_Ground)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -72,7 +72,7 @@ s32 N(StatusTable_Flying)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -82,7 +82,7 @@ s32 N(StatusTable_Flying)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -199,7 +199,7 @@ s32 N(IdleAnimations_80223D70)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_White_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_White_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_White_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_White_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_White_Anim07, STATUS_END, }; @@ -212,7 +212,7 @@ s32 N(IdleAnimations_80223DBC)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_White_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_White_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_White_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_White_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_White_Anim07, STATUS_END, }; diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 473a4fb3a2..c00dbd3e13 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -47,7 +47,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -57,7 +57,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -72,7 +72,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 0, + STATUS_KEY_UNUSED, 0, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 80, @@ -82,7 +82,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -199,7 +199,7 @@ s32 N(GroundAnims)[] = { STATUS_KEY_STATIC, ANIM_Magikoopa_Yellow_Anim01, STATUS_KEY_PARALYZE, ANIM_Magikoopa_Yellow_Anim00, STATUS_KEY_DIZZY, ANIM_Magikoopa_Yellow_Anim07, - STATUS_KEY_FEAR, ANIM_Magikoopa_Yellow_Anim07, + STATUS_KEY_UNUSED, ANIM_Magikoopa_Yellow_Anim07, STATUS_END, }; @@ -212,7 +212,7 @@ s32 N(FlyingAnims)[] = { STATUS_KEY_STATIC, ANIM_FlyingMagikoopa_Yellow_Anim01, STATUS_KEY_PARALYZE, ANIM_FlyingMagikoopa_Yellow_Anim00, STATUS_KEY_DIZZY, ANIM_FlyingMagikoopa_Yellow_Anim07, - STATUS_KEY_FEAR, ANIM_FlyingMagikoopa_Yellow_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Yellow_Anim07, STATUS_END, }; diff --git a/src/battle/dmg_item.c b/src/battle/dmg_item.c index f6519043e2..7cc6da87f6 100644 --- a/src/battle/dmg_item.c +++ b/src/battle/dmg_item.c @@ -356,7 +356,7 @@ HitResult calc_item_damage_enemy(void) { INFLICT_STATUS(SLEEP); INFLICT_STATUS(STOP); INFLICT_STATUS(STATIC); - INFLICT_STATUS(FEAR); + INFLICT_STATUS(UNUSED); INFLICT_STATUS(PARALYZE); INFLICT_STATUS(DIZZY); @@ -377,7 +377,7 @@ HitResult calc_item_damage_enemy(void) { if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR)) { if (rand_int(99) < temp - && (target->debuff != STATUS_KEY_FEAR + && (target->debuff != STATUS_KEY_UNUSED && target->debuff != STATUS_KEY_DIZZY && target->debuff != STATUS_KEY_PARALYZE && target->debuff != STATUS_KEY_SLEEP diff --git a/src/battle/dmg_partner.c b/src/battle/dmg_partner.c index d6ae0ad077..97023c75ed 100644 --- a/src/battle/dmg_partner.c +++ b/src/battle/dmg_partner.c @@ -665,7 +665,7 @@ HitResult calc_partner_damage_enemy(void) { INFLICT_STATUS(SLEEP); INFLICT_STATUS(STOP); INFLICT_STATUS(STATIC); - INFLICT_STATUS(FEAR); + INFLICT_STATUS(UNUSED); INFLICT_STATUS(PARALYZE); INFLICT_STATUS(DIZZY); @@ -679,9 +679,9 @@ HitResult calc_partner_damage_enemy(void) { statusChanceOrDefense = (battleStatus->statusChance * statusChanceOrDefense) / 100; - if (battleStatus->curAttackStatus & STATUS_FLAG_400000) { + if (battleStatus->curAttackStatus & STATUS_FLAG_FEAR) { if (rand_int(99) < statusChanceOrDefense) { - if (!(target->debuff == STATUS_KEY_FEAR + if (!(target->debuff == STATUS_KEY_UNUSED || target->debuff == STATUS_KEY_DIZZY || target->debuff == STATUS_KEY_PARALYZE || target->debuff == STATUS_KEY_SLEEP @@ -726,9 +726,9 @@ HitResult calc_partner_damage_enemy(void) { statusChanceOrDefense = (battleStatus->statusChance * statusChanceOrDefense) / 100; if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { - if (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR) { + if (battleStatus->curAttackElement & ) { if (rand_int(99) < statusChanceOrDefense) { - if (!(target->debuff == STATUS_KEY_FEAR || + if (!(target->debuff == STATUS_KEY_UNUSED || target->debuff == STATUS_KEY_DIZZY || target->debuff == STATUS_KEY_PARALYZE || target->debuff == STATUS_KEY_SLEEP || diff --git a/src/battle/dmg_player.c b/src/battle/dmg_player.c index e4aeddf0ea..ab10de9fff 100644 --- a/src/battle/dmg_player.c +++ b/src/battle/dmg_player.c @@ -672,7 +672,7 @@ HitResult calc_player_damage_enemy(void) { if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR && rand_int(99) < (target->actorBlueprint->escapeChance * battleStatus->statusChance) / 100 - && (target->debuff != STATUS_KEY_FEAR + && (target->debuff != STATUS_KEY_UNUSED && target->debuff != STATUS_KEY_DIZZY && target->debuff != STATUS_KEY_PARALYZE && target->debuff != STATUS_KEY_SLEEP @@ -876,7 +876,7 @@ HitResult calc_player_damage_enemy(void) { INFLICT_STATUS(SLEEP); INFLICT_STATUS(STOP); INFLICT_STATUS(STATIC); - INFLICT_STATUS(FEAR); + INFLICT_STATUS(UNUSED); INFLICT_STATUS(PARALYZE); INFLICT_STATUS(DIZZY); diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 8b400c9658..b33e7fe119 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -279,7 +279,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -289,7 +289,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 4ee0c83fa7..02edbbc3ba 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -85,7 +85,7 @@ API_CALLABLE(N(ModifyBowPos)) { API_CALLABLE(N(IsPlayerImmobile)) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; - s32 isImmobile = playerActor->debuff == STATUS_KEY_FEAR + s32 isImmobile = playerActor->debuff == STATUS_KEY_UNUSED || playerActor->debuff == STATUS_KEY_DIZZY || playerActor->debuff == STATUS_KEY_PARALYZE || playerActor->debuff == STATUS_KEY_SLEEP @@ -172,7 +172,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -182,7 +182,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -936,9 +936,9 @@ EvtScript N(spook) = { Call(SetDamageSource, DMG_SRC_SPOOK) Switch(LVarF) CaseGt(99) - Call(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) + Call(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_FEAR, LVarF, 0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) CaseDefault - Call(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_NO_RATING | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) + Call(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_FEAR, LVarF, 0, BS_FLAGS1_NO_RATING | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EndSwitch Label(10) Wait(5) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index e6fdaf53ec..10fa75ed9d 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -503,7 +503,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -513,7 +513,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/goompa.c b/src/battle/partner/goompa.c index 41b2364486..bfed22b361 100644 --- a/src/battle/partner/goompa.c +++ b/src/battle/partner/goompa.c @@ -43,7 +43,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -53,7 +53,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index fbc49e48d6..972fd2300f 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -214,7 +214,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -224,7 +224,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index cdd5d3836e..5987f417b4 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -109,7 +109,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -119,7 +119,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 572d9534c4..d4d8072070 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -639,7 +639,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -649,7 +649,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index cbeddcd1b5..38620bf495 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -410,7 +410,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -420,7 +420,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index cdcec5e701..a71693ae93 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -55,7 +55,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -65,7 +65,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index ab7dc4965e..1ebe081bdb 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -469,7 +469,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_FEAR, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, @@ -479,7 +479,7 @@ s32 N(StatusTable)[] = { STATUS_TURN_MOD_POISON, 0, STATUS_TURN_MOD_FROZEN, 0, STATUS_TURN_MOD_DIZZY, 0, - STATUS_TURN_MOD_FEAR, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, diff --git a/src/battle/player_events.c b/src/battle/player_events.c index 9d0d9b6ea0..bec8a64e07 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -61,7 +61,7 @@ void btl_set_player_idle_anims(void) { API_CALLABLE(IsPlayerImmobile) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; - s32 isImmobile = playerActor->debuff == STATUS_KEY_FEAR + s32 isImmobile = playerActor->debuff == STATUS_KEY_UNUSED || playerActor->debuff == STATUS_KEY_DIZZY || playerActor->debuff == STATUS_KEY_PARALYZE || playerActor->debuff == STATUS_KEY_SLEEP @@ -95,7 +95,7 @@ API_CALLABLE(TryPlayerLucky) { sfx_play_sound(SOUND_LUCKY); script->varTable[0] = false; - if (player->debuff == STATUS_KEY_FEAR + if (player->debuff == STATUS_KEY_UNUSED || player->debuff == STATUS_KEY_DIZZY || player->debuff == STATUS_KEY_PARALYZE || player->debuff == STATUS_KEY_SLEEP diff --git a/src/battle/standard_events.c b/src/battle/standard_events.c index 367ed1644e..777f0f955d 100644 --- a/src/battle/standard_events.c +++ b/src/battle/standard_events.c @@ -2094,8 +2094,8 @@ EvtScript EVS_Enemy_BlowAway = { Set(LFlag0, true) EndIf EndIf - IfFlag(LVar2, STATUS_FLAG_FEAR) - IfFlag(LVar5, STATUS_FLAG_FEAR) + IfFlag(LVar2, STATUS_FLAG_UNUSED) + IfFlag(LVar5, STATUS_FLAG_UNUSED) Set(LFlag0, true) EndIf EndIf diff --git a/src/status_icons.c b/src/status_icons.c index db877d9855..d57e44cf80 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -381,7 +381,7 @@ void update_all_status_icons(void* data) { case STATUS_KEY_DIZZY: elementID = icon->status1.activeElementHID = hud_element_create(&HES_DizzyBegin); break; - case STATUS_KEY_FEAR: + case STATUS_KEY_UNUSED: elementID = icon->status1.activeElementHID = hud_element_create(&HES_WeakenedLoop); break; case STATUS_KEY_STOP: @@ -419,7 +419,7 @@ void update_all_status_icons(void* data) { case STATUS_KEY_DIZZY: hud_element_set_script(icon->status1.removingElementHID, &HES_DizzyEnd); break; - case STATUS_KEY_FEAR: + case STATUS_KEY_UNUSED: hud_element_set_script(icon->status1.removingElementHID, &HES_WeakenedLoop); break; case STATUS_KEY_STOP: