From cedc446607f66e25e1cf817dbb5153dfeac0120a Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 27 Sep 2025 21:55:19 -0400 Subject: [PATCH 01/18] 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 a36ff0137de..a7a772f875c 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 65e7f88e2ee..f60f39c982b 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 7c16922367e..68bd05a78c6 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 e66c5a0cbbb..14c667f605a 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 b20f30368ec..b800a7b6e6f 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 52582bf9efa..0c4ac24c189 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 85ce1ac6747..f040ccab55a 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 649c2352569..f98f3c76ef5 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 d4731b3d429..e449cd74f6e 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 2fe44d1af67..fc6cfc586ea 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 388dd1b7cb8..263b0582e20 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 0c104cb33ab..2f3d4de0200 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 b40f3c11b1a..44ea3ffb935 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 3ed3dbe1f79..9ee8eedffb6 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 d414d3e8ea8..a05e24ed2c2 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 891e310e0a8..d51970d5ccc 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 450a0b2f1b6..25d7133d2b8 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 620ab08491f..9e5464f33c2 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 72738495260..5f4d0b0a594 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 f5a6b9eeb8a..2d15fc5d2f1 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 2a5e8332a43..30401de1068 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 aed75b55c07..7fe60a8e03b 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 7767f26c3be..3fe6f8e6829 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 1cbe5d37f61..73e9144e23e 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 4e3025299f6..18312578015 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 34628b9f94d..fb403ba69e5 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 90d09e9628b..f571c3f56f1 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 588312d647f..f24f7886816 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 47fd688d4fc..f6747d0c2e9 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 c948b462614..06cadc848d9 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 4455847d76d..bfe050032c0 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 79314796c8d..648332cbf8f 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 6b9f0d2e981..573e5311b8b 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 96257c46aa2..f9b60881547 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 5b5d27ae153..92ce6ef5361 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 66ff383dfcc..1748676d91b 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 0300ebcfeea..f8c1dd1953f 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 2a5b5bffaa9..ad5d33011e2 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 b8a22d0fb1d..e546341f014 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 ce4191f815c..b3ced150e2a 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 fc41e94d373..bb13c1aa2ab 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 1e07d321cc3..b88128c1bda 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 8cd30261871..ea44ffeaf1b 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 e096af4bc78..10fc0f13bac 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 81e64a6dfdd..c67d6197b73 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 bd506c489f9..19dc96a1f6b 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 eb8a32c83ce..6d81339f93d 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 e6244e2f9c2..27b49014ff8 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 2aff3728762..de05c0fb23d 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 aed8a810a34..23be8709eaa 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 f4b01e83148..9996f08adf5 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 e88f20ef9df..b34cd17764b 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 b90d522866a..8537180cfe4 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 f7c1a499d68..22acd6f3dd2 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 6b64d19eefe..7f0995d1076 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 bd95332b9ea..86d20c224a6 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 98916f64f9f..2f284c8deae 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 e1059223aab..74a15b46dcf 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 020061d7903..ee9888666f1 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 c3f4acda682..abe7cb58d7f 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 f38e32902c5..d404c2bbe01 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 d08bf11dd6c..75bac252afa 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 1bdeb813f56..e02f360939f 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 f70b634ffb1..c3771900071 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 a6f15e2de1b..077369e3913 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 1cd2109ea04..69f05cc435d 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 c832d1cbd27..8be40da6906 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 e3ff836b863..e08b3f6b434 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 effcd15b623..4917cb8ff67 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 79b77506eab..a159e407fb3 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 e77dde9a8a2..e8ed34a0ead 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 b11728402ca..7a08b944c84 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 dfcad94036e..f200ba3dbc9 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 55248fffb37..af67192e93b 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 b9a1ebe90c9..49033cffd18 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 b1e25e69419..06dff9f75ad 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 137f94900fb..769df68429c 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 86ae655e215..93f9421082b 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 662f9e01a2d..468a50a32d0 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 6068a9c8d25..c0d1024d18a 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 81c66dc700c..c260a3a202b 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 f13baaa4a69..c59a4826551 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 f6a6ef12283..4840be06e64 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 f07614a8dd4..a18d134d0b5 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 1948d030ead..a255ff2b31e 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 e3c1b7b97ef..bc55602d2d2 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 25148901742..746e9ad6078 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 76b4074251a..db62152bead 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 11f39282ec7..fe9660a18a8 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 45b94c4a5e2..4572ad08ca1 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 8abcec60029..7048bac7e00 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 79222d3123e..e56514a7069 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 c41a0da3367..80f329a3656 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 94495f3589a..1448a3c1a14 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 8366ae8a8d6..8db903e13fb 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 77afc4e9c0d..2a2ee42d071 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 2128dc6913e..aab05c6f3e0 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 ea176ed4133..1ee2b5502e5 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 2d6dca91c82..e61172376cf 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 95a20890f2c..3c855fef8d4 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 f4ff59d39d7..b09b947598f 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 8dbf06f45c3..562ac6bdb99 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 b437b4dbe46..f1fd1a80549 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 e7f31ed0324..f210fe60749 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 630f32e4ed0..fb20b919a7a 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 b913a643647..7687a7c4256 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 9ce1384739a..e1f1930c7f9 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 1ff3427e002..431773c4366 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 e7585968848..476dda1cb3c 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 cf4035210c4..8c87f51bb08 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 3875c281e83..77a2f1fb871 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 821d2e87b53..bf6d0ee00eb 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 079d6b28b37..f0b4aea45bd 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 06b11e5a80f..9d4dfc2d748 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 2544816cbdb..564d86e564b 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 9f7056c7944..3d916a76d46 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 9b3042e240d..405ccd46bd8 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 fa360e391a4..388938f5325 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 df18c7095aa..a0935d4ea54 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 93778be380b..b85e8dcfa19 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 ee31f6cec79..60419e62f3e 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 d5204be02a9..4de7768889f 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 300099c810f..e6123fdea5a 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 9d4f3854be6..2554171417c 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 c72552337ec..691e4d461f2 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 65f0f11fd55..2c798811c6b 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 29df9255aa8..a17456ff0e5 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 6204b5917d9..33c13908231 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 1bb0ee5f520..c7865e16a64 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 2e2d9f9b61b..c9271f3cbe3 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 37cb87c6a46..c0e6df41f23 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 9ed73d7902e..c901617695f 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 fb71deb20ba..a4a5989a96b 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 969df82f6fb..1fc587a0c36 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 37aa1ec96cd..6d9c2766a22 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 e3cd8b04008..79b10d9d6f3 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 b59940a816f..18d91882329 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 03e9c6bfc76..ee27ed5e650 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 5606b23f4ca..602772aada5 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 f9c63fc33de..aaf773dc61d 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 43a0f40086c..2c5b90d64d4 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 7279fd8b6f5..a45cf625144 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 c21b6430e63..05584f0ba82 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 cd347713c82..55240c17607 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 e51071752bb..e2635ae2b9c 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 2e9ac235539..9c6bb564dc1 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 cab71b8e531..439812a106d 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 3aded62c67e..c4537b90b15 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 39f3a730e1e..535c3c6c510 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 d00a1644dff..de6b998d10e 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 d2b172677ab..f8e687ac6e8 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 e6179d8d7f7..eed20f9355d 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 b2fa9159dec..2441871a8f7 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 e3d96f60dee..a6520d11b69 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 eacfe72403d..9784294b0de 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 ac1a5307372..5e5d331ca81 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 1449ab3795d..b1d779dff93 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 ccde0a39f8b..4b2df867a84 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 473a4fb3a2a..c00dbd3e13e 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 f6519043e28..7cc6da87f67 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 d6ae0ad0777..97023c75ed3 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 e4aeddf0ea1..ab10de9fffd 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 8b400c96587..b33e7fe119d 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 4ee0c83fa79..02edbbc3baf 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 e6fdaf53ec6..10fa75ed9dd 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 41b2364486b..bfed22b361e 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 fbc49e48d65..972fd2300f3 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 cdd5d3836ee..5987f417b46 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 572d9534c47..d4d80720704 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 cbeddcd1b58..38620bf4959 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 cdcec5e701b..a71693ae939 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 ab7dc4965ee..1ebe081bdb0 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 9d0d9b6ea05..bec8a64e07d 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 367ed1644ee..777f0f955d0 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 db877d9855e..d57e44cf800 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: From f0aa9efad8cf2ebc761774c0e099b369829aef80 Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 22 Nov 2025 19:12:40 -0500 Subject: [PATCH 02/18] first pass --- .vscode/extensions.json | 1 + include/common_structs.h | 17 +- include/enums.h | 25 +- include/functions.h | 8 +- include/macros.h | 8 + src/7BB60.c | 6 +- src/7E9D0.c | 2 +- src/8a860_len_3f30.c | 24 +- src/battle/16C8E0.c | 102 ++--- src/battle/190B20.c | 6 +- src/battle/action_cmd/air_lift.c | 6 +- src/battle/action_cmd/air_raid.c | 6 +- src/battle/action_cmd/body_slam.c | 8 +- src/battle/action_cmd/bomb.c | 6 +- src/battle/action_cmd/break_free.c | 8 +- src/battle/action_cmd/dizzy_shell.c | 6 +- src/battle/action_cmd/fire_shell.c | 6 +- src/battle/action_cmd/flee.c | 10 +- src/battle/action_cmd/hammer.c | 14 +- src/battle/action_cmd/hurricane.c | 8 +- src/battle/action_cmd/jump.c | 4 +- src/battle/action_cmd/mega_shock.c | 8 +- src/battle/action_cmd/power_shock.c | 8 +- src/battle/action_cmd/smack.c | 6 +- src/battle/action_cmd/spiny_surge.c | 6 +- src/battle/action_cmd/spook.c | 6 +- src/battle/action_cmd/squirt.c | 4 +- src/battle/action_cmd/stop_leech.c | 4 +- src/battle/action_cmd/three_chances.c | 16 +- src/battle/action_cmd/tidal_wave.c | 4 +- src/battle/action_cmd/unused_flee.c | 6 +- src/battle/action_cmd/unused_mash_a.c | 6 +- src/battle/action_cmd/whirlwind.c | 8 +- src/battle/actor_api.c | 10 +- src/battle/area/dig/script/dig_04.c | 8 +- src/battle/area/hos/actor/goombario_tutor.c | 12 +- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 2 +- src/battle/area/trd_part_3/actor/eldstar.c | 2 +- src/battle/battle.c | 12 +- src/battle/btl_states_actions.c | 114 +++--- src/battle/btl_states_menus.c | 157 ++++---- src/battle/dmg_partner.c | 2 +- src/battle/level_up.c | 24 +- src/battle/move/item/mystery.c | 2 +- src/battle/move/item/strange_cake.c | 2 +- src/battle/move/jump/attack.c | 6 +- src/battle/player_events.c | 4 +- src/battle/popup_messages.c | 68 ++-- src/battle/states_flowchart.md | 363 ++++++++++++++++++ src/battle_ui_gfx.c | 14 +- src/filemenu/filemenu_common.c | 2 +- src/filemenu/filemenu_createfile.c | 2 +- src/filemenu/filemenu_main.c | 2 +- src/filemenu/filemenu_selectlanguage.c | 2 +- src/global_hud_scripts.c | 60 +-- src/hud_element.c | 154 ++++---- src/hud_element.h | 34 +- src/inventory.c | 38 +- src/item_entity.c | 2 +- src/menu_hud_scripts.c | 12 +- src/pause/pause_badges.c | 2 +- src/pause/pause_items.c | 2 +- src/pause/pause_main.c | 4 +- src/pause/pause_map.c | 2 +- src/pause/pause_partners.c | 2 +- src/pause/pause_stats.c | 2 +- src/pause/pause_tabs.c | 2 +- src/state_intro.c | 4 +- src/status_icons.c | 20 +- src/world/area_kkj/kkj_19/baking.c | 4 +- src/world/area_mgm/mgm_01/npc.c | 2 +- src/world/area_mgm/mgm_02/npc.c | 4 +- src/world/area_obk/obk_07/phonograph.c | 6 +- src/world/partner/goombario.c | 18 +- src/world/script_api/shops.c | 2 +- tools/disasm_hud_element_animation.py | 2 +- ver/jp/symbol_addrs.txt | 2 +- ver/us/symbol_addrs.txt | 20 +- 78 files changed, 976 insertions(+), 597 deletions(-) create mode 100644 src/battle/states_flowchart.md diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 09fea3e1afa..1ae059eb37d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,7 @@ "recommendations": [ "ms-vscode.cpptools", "nanaian.vscode-star-rod", + "bierner.markdown-mermaid", "notskm.clang-tidy", "EditorConfig.EditorConfig", "xaver.clang-format" diff --git a/include/common_structs.h b/include/common_structs.h index 3d526360a89..367e45ee7d5 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -30,6 +30,7 @@ typedef s8 b8; typedef s32 HitID; typedef u32 AnimID; typedef s32 HudElemID; +typedef s32 MsgID; typedef struct { u8 r, g, b, a; @@ -898,9 +899,9 @@ typedef struct BattleStatus { /* */ void* varTablePtr[16]; /* */ }; /* 0x048 */ s8 curSubmenu; - /* 0x049 */ s8 unk_49; + /* 0x049 */ s8 lastSelectedAbility; /* 0x04A */ s8 curPartnerSubmenu; - /* 0x04B */ s8 unk_4B; + /* 0x04B */ s8 lastPartnerPowerSelection; /* 0x04C */ s8 lastPlayerMenuSelection[16]; /* 0x05C */ s8 lastPartnerMenuSelection[16]; /* 0x06C */ s16 cancelTargetMenuSubstate; // might be more generally for returning from nested 'inner' state @@ -931,8 +932,8 @@ typedef struct BattleStatus { /* 0x08F */ char unk_8F[1]; /* 0x090 */ s16 unk_90; /* 0x092 */ s8 reflectFlags; - /* 0x093 */ s8 unk_93; - /* 0x094 */ s8 unk_94; + /* 0x093 */ s8 nextActorOrdinal; + /* 0x094 */ s8 cancelTurnMode; /* 0x095 */ s8 waitForState; /* 0x096 */ s8 hammerCharge; /* 0x097 */ s8 jumpCharge; @@ -996,8 +997,8 @@ typedef struct BattleStatus { /* 0x1A6 */ s8 curTargetPart2; /* 0x1A7 */ s8 battlePhase; /* 0x1A8 */ s16 attackerActorID; - /* 0x1AA */ s16 unk_1AA; - /* 0x1AC */ s8 unk_1AC; + /* 0x1AA */ s16 lastSelectedItem; // itemID of most recently selected item + /* 0x1AC */ s8 lastSelectedPartner; // partnerID of most recently selected partner /* 0x1AD */ char unk_1AD; /* 0x1AE */ s16 submenuIcons[24]; /* icon IDs */ /* 0x1DE */ u8 submenuMoves[24]; /* move IDs */ @@ -1893,7 +1894,7 @@ typedef struct Actor { /* 0x00C */ ActorState state; /* 0x0C8 */ ActorMovement fly; /* 0x124 */ char unk_124[16]; - /* 0x134 */ u8 unk_134; + /* 0x134 */ u8 ordinal; // unique identifier for actor, holds a value of N for the Nth actor spawned /* 0x135 */ u8 footStepCounter; /* 0x136 */ u8 actorType; /* 0x137 */ char unk_137; @@ -1933,7 +1934,7 @@ typedef struct Actor { /* 0x1E0 */ s32 idleScriptID; /* 0x1E4 */ s32 takeTurnScriptID; /* 0x1E8 */ s32 handleEventScriptID; - /* 0x1EC */ s32 handleBatttlePhaseScriptID; + /* 0x1EC */ s32 handlePhaseScriptID; /* 0x1F0 */ s8 lastEventType; /* 0x1F1 */ s8 turnPriority; /* 0x1F2 */ s8 enemyIndex; /* actorID = this | 200 */ diff --git a/include/enums.h b/include/enums.h index a7a772f875c..8c866f3877b 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2043,6 +2043,13 @@ enum DamageSources { DMG_SRC_INK_BLAST = 26, }; +enum GearRank { + GEAR_RANK_NONE = -1, + GEAR_RANK_NORMAL = 0, + GEAR_RANK_SUPER = 1, + GEAR_RANK_ULTRA = 2, +}; + enum PartnerRank { PARTNER_RANK_NORMAL = 0, PARTNER_RANK_SUPER = 1, @@ -2194,7 +2201,7 @@ enum Events { EVENT_SHOCK_HIT = 0x0000002F, EVENT_30 = 0x00000030, EVENT_RECOVER_STATUS = 0x00000031, - EVENT_32 = 0x00000032, + EVENT_RECOVER_FROZEN = 0x00000032, EVENT_33 = 0x00000033, EVENT_RECOVER_FROM_KO = 0x00000034, EVENT_END_FIRST_STRIKE = 0x00000035, @@ -2225,7 +2232,7 @@ enum StatusKeys { STATUS_END = 0x00000000, STATUS_KEY_NORMAL = 0x00000001, STATUS_KEY_DEFAULT = 0x00000002, - STATUS_KEY_UNUSED = 0x00000003, + STATUS_KEY_UNUSED = 0x00000003, STATUS_KEY_DIZZY = 0x00000004, STATUS_KEY_PARALYZE = 0x00000005, STATUS_KEY_SLEEP = 0x00000006, @@ -2257,7 +2264,7 @@ enum StatusKeys { STATUS_TURN_MOD_SLEEP = 0x00000020, STATUS_TURN_MOD_STATIC = 0x00000021, STATUS_TURN_MOD_FROZEN = 0x00000022, - STATUS_TURN_MOD_UNUSED = 0x00000023, + STATUS_TURN_MOD_UNUSED = 0x00000023, STATUS_TURN_MOD_DIZZY = 0x00000024, STATUS_TURN_MOD_POISON = 0x00000025, STATUS_TURN_MOD_PARALYZE = 0x00000026, @@ -3655,9 +3662,9 @@ enum BattleStatusReflectionFlags { }; enum BattleStates { - BATTLE_STATE_NEGATIVE_1 = -1, - BATTLE_STATE_0 = 0, - BATTLE_STATE_NORMAL_START = 1, + BATTLE_STATE_INVALID = -1, // may have been part of a debug state at some point, unused + BATTLE_STATE_NONE = 0, + BATTLE_STATE_START = 1, BATTLE_STATE_FIRST_STRIKE = 2, BATTLE_STATE_PARTNER_FIRST_STRIKE = 3, BATTLE_STATE_ENEMY_FIRST_STRIKE = 4, @@ -3665,7 +3672,7 @@ enum BattleStates { BATTLE_STATE_END_TURN = 6, BATTLE_STATE_BEGIN_PLAYER_TURN = 7, BATTLE_STATE_BEGIN_PARTNER_TURN = 8, - BATTLE_STATE_9 = 9, // can be reached from BATTLE_STATE_PARTNER_MOVE if partner == nullptr + BATTLE_STATE_TRANSFER_TURN = 9, BATTLE_STATE_SWITCH_TO_PLAYER = 10, BATTLE_STATE_SWITCH_TO_PARTNER = 11, BATTLE_STATE_PREPARE_MENU = 12, @@ -3698,7 +3705,7 @@ enum BattleSubStates { // shared BTL_SUBSTATE_INIT = 0, - // BATTLE_STATE_NORMAL_START + // BATTLE_STATE_START BTL_SUBSTATE_NORMAL_START_INIT = 0, // loads assets, initializes state, and runs OnBattleInit script BTL_SUBSTATE_NORMAL_START_CREATE_ENEMIES = 1, BTL_SUBSTATE_NORMAL_START_CHECK_FIRST_STRIKE = 4, // wait for actor scripts to finish @@ -3758,7 +3765,7 @@ enum BattleSubStates { BTL_SUBSTATE_BEGIN_PARTNER_TURN_END_DELAY = 10, BTL_SUBSTATE_BEGIN_PARTNER_TURN_RESET_STATE = 100, - // BATTLE_STATE_9 + // BATTLE_STATE_TRANSFER_TURN BTL_SUBSTATE_9_INIT = 0, BTL_SUBSTATE_9_1 = 1, BTL_SUBSTATE_9_2 = 2, diff --git a/include/functions.h b/include/functions.h index ada41fdf9e4..73798770402 100644 --- a/include/functions.h +++ b/include/functions.h @@ -334,8 +334,8 @@ void btl_state_update_begin_partner_turn(void); void btl_state_draw_begin_partner_turn(void); void btl_state_update_switch_to_partner(void); void btl_state_draw_switch_to_partner(void); -void btl_state_update_9(void); -void btl_state_draw_9(void); +void btl_state_update_transfer_turn(void); +void btl_state_draw_transfer_turn(void); void btl_state_update_prepare_menu(void); void btl_state_draw_prepare_menu(void); void btl_state_update_end_turn(void); @@ -982,8 +982,8 @@ void reset_player_blur(void); void force_disable_player_blur(void); void force_disable_player_blur_immediately(void); -void func_8023E104(void); -void func_8023E11C(void); +void btl_start_blinking_starpoints(void); +void btl_stop_blinking_starpoints(void); void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partID); diff --git a/include/macros.h b/include/macros.h index 31a8b2fc9b8..32afae55133 100644 --- a/include/macros.h +++ b/include/macros.h @@ -116,6 +116,14 @@ typedef s32 Difficulty2D[AC_DIFFICULTY_LEN][2]; #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 +#define SCREEN_INSET_X 12 +#define SCREEN_INSET_Y 20 + +#define SCREEN_XMIN (SCREEN_INSET_X) +#define SCREEN_XMAX (SCREEN_WIDTH - SCREEN_INSET_X) +#define SCREEN_YMIN (SCREEN_INSET_Y) +#define SCREEN_YMAX (SCREEN_HEIGHT - SCREEN_INSET_Y) + #define LAST_DEMO_SCENE_IDX 18 #define WORLD_ENTITY_HEAP_SIZE 0x17FF0 diff --git a/src/7BB60.c b/src/7BB60.c index 07a50a5125f..e2de0eca6e6 100644 --- a/src/7BB60.c +++ b/src/7BB60.c @@ -1097,13 +1097,13 @@ void check_input_midair_jump(void) { && gPlayerStatus.pressedButtons & BUTTON_A ) { switch (gPlayerData.bootsLevel) { - case 0: + case GEAR_RANK_NORMAL: break; - case 1: + case GEAR_RANK_SUPER: set_action_state(ACTION_STATE_SPIN_JUMP); gPlayerStatus.flags |= PS_FLAG_FLYING; break; - case 2: + case GEAR_RANK_ULTRA: set_action_state(ACTION_STATE_TORNADO_JUMP); gPlayerStatus.flags |= PS_FLAG_FLYING; break; diff --git a/src/7E9D0.c b/src/7E9D0.c index e0145b1b497..c336b8dd220 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -463,7 +463,7 @@ bool check_input_hammer(void) { return false; } - if (playerData->hammerLevel == -1) { + if (playerData->hammerLevel == GEAR_RANK_NONE) { return false; } diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index f62db28c7d6..621ff69be82 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -251,7 +251,7 @@ void destroy_popup_menu(void) { gPopupState = POPUP_STATE_MINUS_4; } -void func_800F16CC(void) { +void show_popup_menu(void) { if (PopupNotBattle) { switch (gPopupMenu->popupType) { case POPUP_MENU_USE_ITEM: @@ -421,7 +421,7 @@ s32 popup_menu_update(void) { D_8010D68C = 0; hid = hud_element_create(&HES_EmptyBar); PopupMenu_EmptybarHID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); if (gPopupMenu->popupType != POPUP_MENU_THROW_AWAY_ITEM) { hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); @@ -431,48 +431,48 @@ s32 popup_menu_update(void) { hid = hud_element_create(gPopupMenu->ptrIcon[0]); PopupMenu_EntryIconHID = hid; hud_element_set_scale(hid, 0.45f); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hid = hud_element_create(&HES_AnimatedHandPointer); PopupMenu_CursorHID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hid = hud_element_create(&HES_GreenArrowUp); PopupMenu_UpArrowHID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hid = hud_element_create(&HES_GreenArrowDown); PopupMenu_DownArrowHID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE) { PopupMenu_TitleIconHID = hud_element_create(&HES_StatusStarPiece); hid = PopupMenu_TitleIconHID; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); } if (gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { PopupMenu_TitleIconHID = hud_element_create(&HES_StatusStarPiece); hid = PopupMenu_TitleIconHID; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); } if (gPopupMenu->popupType == POPUP_MENU_SELL_ITEM) { PopupMenu_TitleIconHID = hud_element_create(&HES_StatusCoin); hid = PopupMenu_TitleIconHID; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); } if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { PopupMenu_TimesHID = hud_element_create(&HES_MenuTimes); hid = PopupMenu_TimesHID; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); } if (gPopupMenu->popupType == one || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { PopupMenu_PartnerLevelHID = hud_element_create(D_80109890[0]); hid = PopupMenu_PartnerLevelHID; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); } @@ -2365,6 +2365,6 @@ void create_battle_popup_menu(PopupMenu* popup) { gPopupWorker = create_worker_frontUI((void (*) (void)) popup_menu_update, nullptr); } -void func_800F52BC(void) { +void flush_popup_menu(void) { popup_menu_update(); } diff --git a/src/battle/16C8E0.c b/src/battle/16C8E0.c index 5bc1cd35505..36d39c43b29 100644 --- a/src/battle/16C8E0.c +++ b/src/battle/16C8E0.c @@ -6,10 +6,10 @@ #include "sprite.h" #include "effects.h" -f32 D_802809F0 = 0.0f; -s8 D_802809F4 = 0; -s8 D_802809F5 = 0; -s16 D_802809F6 = -1; +f32 StarPointsIncrementInterp = 0.0f; +b8 BtlStarPointsBlinking = false; +s8 StarPointsBlinkTimer = 0; +s16 EndDemoWhiteOut = -1; s16 DemoBattleBeginDelay = 0; u16 gTattleBgTextureYOffset = 0; @@ -149,14 +149,14 @@ void get_stick_input_radial(f32* angle, f32* magnitude) { *magnitude = mag; } -void func_8023E104(void) { - D_802809F4 = 1; - D_802809F5 = 0; +void btl_start_blinking_starpoints(void) { + BtlStarPointsBlinking = true; + StarPointsBlinkTimer = 0; } -void func_8023E11C(void) { - D_802809F4 = 0; - D_802809F5 = 0; +void btl_stop_blinking_starpoints(void) { + BtlStarPointsBlinking = false; + StarPointsBlinkTimer = 0; } void initialize_battle(void) { @@ -181,7 +181,7 @@ void initialize_battle(void) { battleStatus->inputBufferPos = 0; battleStatus->holdInputBufferPos = 0; - battleStatus->waitForState = BATTLE_STATE_0; + battleStatus->waitForState = BATTLE_STATE_NONE; for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { battleStatus->enemyActors[i] = nullptr; @@ -211,23 +211,23 @@ void initialize_battle(void) { create_action_command_ui_worker(); set_windows_visible(WINDOW_GROUP_BATTLE); HPBarHID = hud_element_create(&HES_HPBar); - hud_element_set_flags(HPBarHID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HPBarHID, HUD_ELEMENT_FLAG_MANUAL_RENDER); for (i = 0; i < ARRAY_COUNT(BtlStarPointTensHIDs); i++) { hid = BtlStarPointTensHIDs[i] = hud_element_create(&HES_Item_StarPoint); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_depth(hid, 20); } for (i = 0; i < ARRAY_COUNT(BtlStarPointShinesHIDs); i++) { hid = BtlStarPointShinesHIDs[i] = hud_element_create(&HES_StatusSPShine); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_depth(hid, 20); } for (i = 0; i < ARRAY_COUNT(BtlStarPointOnesHIDs); i++) { hid = BtlStarPointOnesHIDs[i] = hud_element_create(&HES_SmallStarPoint); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_depth(hid, 20); } @@ -302,12 +302,12 @@ void btl_update(void) { } cond = true; - if (battleStatus->waitForState == BATTLE_STATE_0 || battleStatus->waitForState != gBattleState) { + if (battleStatus->waitForState == BATTLE_STATE_NONE || battleStatus->waitForState != gBattleState) { switch (gBattleState) { - case BATTLE_STATE_NEGATIVE_1: - case BATTLE_STATE_0: + case BATTLE_STATE_INVALID: + case BATTLE_STATE_NONE: return; - case BATTLE_STATE_NORMAL_START: + case BATTLE_STATE_START: btl_state_update_normal_start(); cond = false; break; @@ -317,8 +317,8 @@ void btl_update(void) { case BATTLE_STATE_BEGIN_PARTNER_TURN: btl_state_update_begin_partner_turn(); break; - case BATTLE_STATE_9: - btl_state_update_9(); + case BATTLE_STATE_TRANSFER_TURN: + btl_state_update_transfer_turn(); break; case BATTLE_STATE_BEGIN_TURN: btl_state_update_begin_turn(); @@ -459,29 +459,29 @@ void btl_update(void) { } } - if (cond || D_802809F6 != -1) { - if (D_802809F6 == -1) { + if (cond || EndDemoWhiteOut != -1) { + if (EndDemoWhiteOut == -1) { if (gGameStatusPtr->demoState == DEMO_STATE_CHANGE_MAP) { u8 paramType; f32 paramAmount; get_screen_overlay_params(SCREEN_LAYER_FRONT, ¶mType, ¶mAmount); if (paramType == (u8) OVERLAY_NONE) { - D_802809F6 = 0; + EndDemoWhiteOut = 0; set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 0.0f); } } - } else if (D_802809F6 == 255) { + } else if (EndDemoWhiteOut == 255) { if (gBattleState != BATTLE_STATE_END_DEMO_BATTLE) { btl_set_state(BATTLE_STATE_END_DEMO_BATTLE); } } else { - D_802809F6 += 10; - if (D_802809F6 > 255) { - D_802809F6 = 255; + EndDemoWhiteOut += 10; + if (EndDemoWhiteOut > 255) { + EndDemoWhiteOut = 255; } - set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, D_802809F6); + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, EndDemoWhiteOut); set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); startup_set_fade_screen_alpha(255); startup_set_fade_screen_color(224); @@ -504,12 +504,12 @@ void btl_draw_ui(void) { changed = true; } else { switch (state) { - case BATTLE_STATE_NEGATIVE_1: + case BATTLE_STATE_INVALID: btl_update_starpoints_display(); btl_draw_enemy_health_bars(); draw_status_ui(); return; - case BATTLE_STATE_0: + case BATTLE_STATE_NONE: return; } } @@ -519,7 +519,7 @@ void btl_draw_ui(void) { if (!changed) { switch (state) { - case BATTLE_STATE_NORMAL_START: + case BATTLE_STATE_START: btl_state_draw_normal_start(); break; case BATTLE_STATE_BEGIN_PLAYER_TURN: @@ -528,8 +528,8 @@ void btl_draw_ui(void) { case BATTLE_STATE_BEGIN_PARTNER_TURN: btl_state_draw_begin_partner_turn(); break; - case BATTLE_STATE_9: - btl_state_draw_9(); + case BATTLE_STATE_TRANSFER_TURN: + btl_state_draw_transfer_turn(); break; case BATTLE_STATE_BEGIN_TURN: btl_state_draw_begin_turn(); @@ -634,7 +634,7 @@ void btl_render_actors(void) { Actor* actor; s32 i; - if (gBattleState != BATTLE_STATE_0) { + if (gBattleState != BATTLE_STATE_NONE) { btl_popup_messages_draw_world_geometry(); if (battleStatus->initBattleCallback != nullptr) { battleStatus->initBattleCallback(); @@ -957,7 +957,7 @@ NOP_FIX void btl_update_starpoints_display(void) { BattleStatus* battleStatus = &gBattleStatus; - s32 cond; + bool showStarPoints; s32 i; if (gBattleStatus.flags1 & BS_FLAGS1_ACTORS_VISIBLE) { @@ -975,27 +975,27 @@ void btl_update_starpoints_display(void) { } } - cond = true; - if (D_802809F4 != 0) { - if (D_802809F5 > 8) { - if (D_802809F5 <= 12) { - cond = false; + showStarPoints = true; + if (BtlStarPointsBlinking) { + if (StarPointsBlinkTimer > 8) { + if (StarPointsBlinkTimer <= 12) { + showStarPoints = false; } else { - D_802809F5 = 0; + StarPointsBlinkTimer = 0; } } - D_802809F5++; + StarPointsBlinkTimer ++; } - if (cond) { + if (showStarPoints) { s32 posX, posY; s32 tens, ones; s32 id; f32 one = 1.0f; battleStatus->incrementStarPointDelay--; - D_802809F0 -= 1.0; - if (D_802809F0 <= 0.0f) { + StarPointsIncrementInterp -= 1.0; + if (StarPointsIncrementInterp <= 0.0f) { s32 pendingStarPoints; if (battleStatus->pendingStarPoints > 0) { @@ -1011,12 +1011,12 @@ void btl_update_starpoints_display(void) { pendingStarPoints = 1; } - D_802809F0 = (f32) battleStatus->incrementStarPointDelay / pendingStarPoints; - if (D_802809F0 < 1.0) { - D_802809F0 = 1.0f; + StarPointsIncrementInterp = (f32) battleStatus->incrementStarPointDelay / pendingStarPoints; + if (StarPointsIncrementInterp < 1.0) { + StarPointsIncrementInterp = 1.0f; } - if (D_802809F0 > 6.0) { - D_802809F0 = 6.0f; + if (StarPointsIncrementInterp > 6.0) { + StarPointsIncrementInterp = 6.0f; } } diff --git a/src/battle/190B20.c b/src/battle/190B20.c index 68bd05a78c6..467d8af5ebe 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -1292,7 +1292,7 @@ void load_player_actor(void) { ASSERT(player != nullptr); - player->unk_134 = battleStatus->unk_93++; + player->ordinal = battleStatus->nextActorOrdinal++; player->footStepCounter = 0; player->flags = 0; player->actorBlueprint = &bPlayerActorBlueprint; @@ -1536,7 +1536,7 @@ void load_partner_actor(void) { ASSERT(partnerActor != nullptr); actorBP->level = playerData->partners[playerData->curPartner].level; - partnerActor->unk_134 = battleStatus->unk_93++; + partnerActor->ordinal = battleStatus->nextActorOrdinal++; partnerActor->footStepCounter = 0; partnerActor->actorBlueprint = actorBP; partnerActor->actorType = actorBP->type; @@ -1782,7 +1782,7 @@ Actor* create_actor(Formation formation) { ASSERT(actor != nullptr); - actor->unk_134 = battleStatus->unk_93++; + actor->ordinal = battleStatus->nextActorOrdinal++; actor->footStepCounter = 0; actor->actorBlueprint = formationActor; actor->actorType = formationActor->type; diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index c5dee5da88d..bbb3c8d2337 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -59,19 +59,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index e66aa57aebf..3c46478b5df 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -57,19 +57,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_STICK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index e7e4b21d76f..f1827f9e487 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -45,25 +45,25 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_FillGaugeResult); acs->hudElemIDs[HIDX_FRAME] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingWait); acs->hudElemIDs[HIDX_LIGHT] = hid; hud_element_set_render_pos(hid, acs->hudPosX + 41, acs->hudPosY + 22); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 65e688d8385..d2bffaad2b2 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -52,19 +52,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index ac253f3914e..e38d209db5a 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -47,25 +47,25 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_RunningAway); acs->hudElemIDs[HIDX_RUN_AWAY] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_RunAwayOK); acs->hudElemIDs[HIDX_OK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index fa5888570bc..58a48d688c0 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -51,19 +51,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 36dd1c355cc..635aa0daa98 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -56,19 +56,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_STICK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index 20225826ce8..6da10714286 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -52,25 +52,25 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_RunningAway); acs->hudElemIDs[HIDX_RUN_AWAY] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_RunAwayOK); acs->hudElemIDs[HIDX_OK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); offsetX = 29 - ((100 - acs->escapeThreshold) * 60) / 100; hud_element_set_render_pos(acs->hudElemIDs[HIDX_OK], acs->hudPosX - offsetX, acs->hudPosY + 17); @@ -80,7 +80,7 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 987138d6c53..bcc6cca1907 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -40,43 +40,43 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_TimingBar1Chance); acs->hudElemIDs[HIDX_FRAME] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 10); hid = hud_element_create(&HES_TimingWait); acs->hudElemIDs[HIDX_WAIT] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_TimingCharge4a); acs->hudElemIDs[HIDX_CHARGE_A] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_TimingCharge4b); acs->hudElemIDs[HIDX_CHARGE_B] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_TimingCharge4c); acs->hudElemIDs[HIDX_CHARGE_C] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_StickHoldLeft); acs->hudElemIDs[HIDX_STICK] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_RightOn); acs->hudElemIDs[HIDX_RIGHT_ON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hud_element_set_alpha(hid, 255); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 7085818721a..40e957811a9 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -46,13 +46,13 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_A_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_BButton); acs->hudElemIDs[HIDX_B_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -60,13 +60,13 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index affd65c2fc2..799419b245a 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -33,14 +33,14 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hud_element_set_alpha(hid, 255); hid = hud_element_create(&HES_RightOn); acs->hudElemIDs[HIDX_RIGHT_ON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hud_element_set_alpha(hid, 255); diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index e8d12fd0b26..2b70a3b3195 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -49,13 +49,13 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_A_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); hid = hud_element_create(&HES_BButton); acs->hudElemIDs[HIDX_B_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -63,13 +63,13 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 0a2a916294f..a6fadb430e4 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -65,7 +65,7 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -73,19 +73,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_RunAwayOK); acs->hudElemIDs[HIDX_OK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); offsetX = 29 - ((100 - acs->escapeThreshold) * 60) / 100; hud_element_set_render_pos(acs->hudElemIDs[HIDX_100_PCT], acs->hudPosX - offsetX, acs->hudPosY + 17); diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index a7a5ac6ad22..a9af0c9e2a2 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -58,19 +58,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_STICK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index bdc956e524c..49672d0bd85 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -52,19 +52,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_STICK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 70309b57931..a3ebb1b15e3 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -50,19 +50,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_STICK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 1e4d171f433..2352ac6198b 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -47,7 +47,7 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -55,7 +55,7 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 123428b200f..9446959a1be 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -43,7 +43,7 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -51,7 +51,7 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/three_chances.c b/src/battle/action_cmd/three_chances.c index 6bff1be34cc..a8b940513dd 100644 --- a/src/battle/action_cmd/three_chances.c +++ b/src/battle/action_cmd/three_chances.c @@ -117,7 +117,7 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -125,43 +125,43 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_FRAME] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingWait); acs->hudElemIDs[HIDX_LIGHT_1] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingWait); acs->hudElemIDs[HIDX_LIGHT_2] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingWait); acs->hudElemIDs[HIDX_LIGHT_3] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingOK); acs->hudElemIDs[HIDX_RATING_1] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingOK); acs->hudElemIDs[HIDX_RATING_2] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_TimingOK); acs->hudElemIDs[HIDX_RATING_3] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); acs->hudElemIDs[HIDX_DIGIT] = hud_element_create(DigitScripts[1]); hud_element_set_render_pos(acs->hudElemIDs[HIDX_DIGIT], acs->hudPosX, acs->hudPosY); diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index dc03308bbd2..74cf083657c 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -62,14 +62,14 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); for (i = HIDX_FIRST_BUTTON; i < ARRAY_COUNT(acs->hudElemIDs) - 1; i++) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[i] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); } return ApiStatus_DONE2; diff --git a/src/battle/action_cmd/unused_flee.c b/src/battle/action_cmd/unused_flee.c index 81822f7a89f..7e326ea6605 100644 --- a/src/battle/action_cmd/unused_flee.c +++ b/src/battle/action_cmd/unused_flee.c @@ -49,7 +49,7 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -58,13 +58,13 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_RunAwayOK); acs->hudElemIDs[HIDX_OK] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; diff --git a/src/battle/action_cmd/unused_mash_a.c b/src/battle/action_cmd/unused_mash_a.c index 4c2c241b32f..74276a08e0f 100644 --- a/src/battle/action_cmd/unused_mash_a.c +++ b/src/battle/action_cmd/unused_mash_a.c @@ -52,19 +52,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_BUTTON] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_100pct); acs->hudElemIDs[HIDX_100_PCT] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 2bcbad756bb..464b478ee5a 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -101,7 +101,7 @@ API_CALLABLE(N(init)) { hid = hud_element_create(&HES_AButton); acs->hudElemIDs[HIDX_BUTTON] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY); hud_element_set_render_depth(hid, 0); @@ -109,19 +109,19 @@ API_CALLABLE(N(init)) { acs->hudElemIDs[HIDX_METER] = hid; hud_element_set_render_pos(hid, acs->hudPosX, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_Whirlwind7); acs->hudElemIDs[HIDX_DIGIT] = hid; hud_element_set_render_pos(hid, acs->hudPosX + 54, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_WhirlwindBubble); acs->hudElemIDs[HIDX_BUBBLE] = hid; hud_element_set_render_pos(hid, acs->hudPosX + 60, acs->hudPosY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/actor_api.c b/src/battle/actor_api.c index b800a7b6e6f..869134de008 100644 --- a/src/battle/actor_api.c +++ b/src/battle/actor_api.c @@ -2289,15 +2289,15 @@ API_CALLABLE(WaitForState) { if (isInitialCall) { waitForState = evt_get_variable(script, *args++); - if (waitForState == BATTLE_STATE_0) { - battleStatus->waitForState = BATTLE_STATE_0; + if (waitForState == BATTLE_STATE_NONE) { + battleStatus->waitForState = BATTLE_STATE_NONE; return ApiStatus_DONE2; } battleStatus->waitForState = waitForState; } waitForState = battleStatus->waitForState; - if (waitForState == BATTLE_STATE_0) { + if (waitForState == BATTLE_STATE_NONE) { return ApiStatus_DONE2; } @@ -2315,10 +2315,10 @@ API_CALLABLE(CancelEnemyTurn) { switch (cancelMode) { case 0: - battleStatus->unk_94 = 1; + battleStatus->cancelTurnMode = 1; break; case 1: - battleStatus->unk_94 = -1; + battleStatus->cancelTurnMode = -1; break; } diff --git a/src/battle/area/dig/script/dig_04.c b/src/battle/area/dig/script/dig_04.c index 5dec9240d72..bbec7dfb695 100644 --- a/src/battle/area/dig/script/dig_04.c +++ b/src/battle/area/dig/script/dig_04.c @@ -5,17 +5,17 @@ API_CALLABLE(N(SetupDemoPlayerMove)) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; - s32 selectedItemID; + s32 itemID; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; battleStatus->moveArgument = ITEM_THUNDER_RAGE; - selectedItemID = battleStatus->moveArgument; + itemID = battleStatus->moveArgument; battleStatus->selectedMoveID = 0; battleStatus->curAttackElement = 0; - playerData->invItems[0] = selectedItemID; - battleStatus->curTargetListFlags = gItemTable[selectedItemID].targetFlags | TARGET_FLAG_PRIMARY_ONLY; + playerData->invItems[0] = itemID; + battleStatus->curTargetListFlags = gItemTable[itemID].targetFlags | TARGET_FLAG_PRIMARY_ONLY; create_current_pos_target_list(player); player->selectedTargetIndex = 0; diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index d51970d5ccc..9c93270e4bc 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -325,7 +325,7 @@ EvtScript N(EVS_ManageTutorial) = { Call(SetGoalToHome, ACTOR_PARTNER) Call(FlyToGoal, ACTOR_PARTNER, 20, 20, EASING_COS_IN_OUT) Call(SetActionCommandMode, AC_MODE_TUTORIAL) - Call(WaitForState, BATTLE_STATE_0) + Call(WaitForState, BATTLE_STATE_NONE) Call(SetBattleFlagBits2, BS_FLAGS2_DOING_JUMP_TUTORIAL, true) Loop(0) Call(GetActionCommandMode, LVar0) @@ -362,14 +362,14 @@ EvtScript N(EVS_ManageTutorial) = { Call(UseIdleAnimation, ACTOR_PARTNER, false) Call(ActorSpeak, MSG_HOS_001D, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) Call(UseIdleAnimation, ACTOR_PARTNER, true) - Call(WaitForState, BATTLE_STATE_9) + Call(WaitForState, BATTLE_STATE_TRANSFER_TURN) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Wait(15) Call(UseIdleAnimation, ACTOR_PARTNER, false) Call(ActorSpeak, MSG_HOS_001E, ACTOR_ENEMY0, 1, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle) Call(UseIdleAnimation, ACTOR_PARTNER, true) Call(SetActionCommandMode, AC_MODE_TUTORIAL) - Call(WaitForState, BATTLE_STATE_0) + Call(WaitForState, BATTLE_STATE_NONE) Loop(0) Call(GetActionCommandMode, LVar0) IfNe(LVar0, AC_MODE_TUTORIAL) @@ -427,7 +427,7 @@ EvtScript N(EVS_ManageTutorial) = { Call(EndActorSpeech, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) Call(UseIdleAnimation, ACTOR_PARTNER, true) Call(SetActionCommandMode, AC_MODE_LEARNED) - Call(WaitForState, BATTLE_STATE_0) + Call(WaitForState, BATTLE_STATE_NONE) Wait(5) Call(SetActionCommandMode, AC_MODE_TUTORIAL) Loop(0) @@ -482,7 +482,7 @@ EvtScript N(EVS_ManageTutorial) = { Call(ActorSpeak, MSG_HOS_0025, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) Call(UseIdleAnimation, ACTOR_PARTNER, true) Call(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_ATTACK, true) - Call(WaitForState, BATTLE_STATE_0) + Call(WaitForState, BATTLE_STATE_NONE) Call(WaitForState, BATTLE_STATE_PLAYER_MENU) Call(ShowBattleChoice, MSG_Choice_001D) Call(EndActorSpeech, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) @@ -537,7 +537,7 @@ EvtScript N(EVS_ManageTutorial) = { Call(UseIdleAnimation, ACTOR_PARTNER, false) Call(ActorSpeak, MSG_HOS_002C, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) Label(100) - Call(WaitForState, BATTLE_STATE_0) + Call(WaitForState, BATTLE_STATE_NONE) Call(SetBattleState, BATTLE_STATE_END_TRAINING_BATTLE) Call(N(SetPartnerGoombario)) Wait(10000) 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 f9b60881547..406f9e61b02 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 @@ -564,7 +564,7 @@ API_CALLABLE(N(ShowPointerHudElem)) { hud_element_set_render_pos(hid, posX, posY); hud_element_set_scale(hid, 1.5f); - hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_DISABLED); evt_set_variable(script, *args++, hid); load_tattle_flags(ACTOR_TYPE_JR_TROOPA_4); return ApiStatus_DONE2; diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index c260a3a202b..2bb2c98e2ab 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -339,7 +339,7 @@ EvtScript N(EVS_ManageTutorial) = { Call(N(StopBlinkingSP)) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) Call(ActorSpeak, MSG_CH1_011D, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) - Call(WaitForState, BATTLE_STATE_0) + Call(WaitForState, BATTLE_STATE_NONE) Call(SetBattleState, BATTLE_STATE_END_TRAINING_BATTLE) Wait(10000) Return diff --git a/src/battle/battle.c b/src/battle/battle.c index f09367ce051..8e07f85d2a5 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -103,10 +103,10 @@ BattleArea gBattleAreas[] = { void reset_battle_status(void) { gGameStatusPtr->demoBattleFlags = 0; - gBattleState = BATTLE_STATE_0; + gBattleState = BATTLE_STATE_NONE; D_800DC4E0 = 1; gBattleSubState = BTL_SUBSTATE_INIT; - gLastDrawBattleState = BATTLE_STATE_0; + gLastDrawBattleState = BATTLE_STATE_NONE; D_800DC4F0 = 0; D_800DC4D4 = 0; gCurrentBattlePtr = nullptr; @@ -140,15 +140,15 @@ void load_battle_section(void) { gCurrentStagePtr = &(*battleArea->stages)[gCurrentStageID]; } - btl_set_state(BATTLE_STATE_NORMAL_START); - gLastDrawBattleState = BATTLE_STATE_0; + btl_set_state(BATTLE_STATE_START); + gLastDrawBattleState = BATTLE_STATE_NONE; } void load_battle(s32 battleID) { gCurrentBattleID = battleID; set_game_mode(GAME_MODE_BATTLE); - gBattleState = BATTLE_STATE_0; - gLastDrawBattleState = BATTLE_STATE_0; + gBattleState = BATTLE_STATE_NONE; + gLastDrawBattleState = BATTLE_STATE_NONE; gBattleSubState = BTL_SUBSTATE_INIT; } diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index c59a4826551..c9664b9e518 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -11,7 +11,7 @@ extern StageListRow* gCurrentStagePtr; -extern s16 D_802809F6; +extern s16 EndDemoWhiteOut; extern s16 DemoBattleBeginDelay; extern s32 BattleScreenFadeAmt; extern EvtScript EVS_OnBattleInit; @@ -251,9 +251,9 @@ void btl_state_update_normal_start(void) { battleStatus->preUpdateCallback = nullptr; battleStatus->initBattleCallback = nullptr; battleStatus->curSubmenu = 0; - battleStatus->unk_49 = 0; + battleStatus->lastSelectedAbility = 0; battleStatus->curPartnerSubmenu = 0; - battleStatus->unk_4B = 0; + battleStatus->lastPartnerPowerSelection = 0; battleStatus->totalStarPoints = 0; battleStatus->pendingStarPoints = 0; battleStatus->incrementStarPointDelay = 0; @@ -280,7 +280,7 @@ void btl_state_update_normal_start(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_CAN_FLEE; } battleStatus->endBattleFadeOutRate = 10; - battleStatus->waitForState = BATTLE_STATE_0; + battleStatus->waitForState = BATTLE_STATE_NONE; battleStatus->hammerLossTurns = -1; battleStatus->jumpLossTurns = -1; battleStatus->itemLossTurns = -1; @@ -300,8 +300,8 @@ void btl_state_update_normal_start(void) { battleStatus->darknessMode = BTL_DARKNESS_STATE_NONE; battleStatus->unk_433 = -1; battleStatus->hustleTurns = 0; - battleStatus->unk_93 = 0; - battleStatus->unk_94 = 0; + battleStatus->nextActorOrdinal = 0; + battleStatus->cancelTurnMode = 0; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; @@ -640,7 +640,7 @@ void btl_state_update_begin_turn(void) { battleStatus->battlePhase = PHASE_PLAYER_BEGIN; script = start_script(enemy->handlePhaseSource, EVT_PRIORITY_A, 0); enemy->handlePhaseScript = script; - enemy->handleBatttlePhaseScriptID = script->id; + enemy->handlePhaseScriptID = script->id; script->owner1.actorID = i | ACTOR_ENEMY0; } } @@ -651,7 +651,7 @@ void btl_state_update_begin_turn(void) { battleStatus->battlePhase = PHASE_PLAYER_BEGIN; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; } } @@ -663,11 +663,11 @@ void btl_state_update_begin_turn(void) { cond = false; for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { enemy = battleStatus->enemyActors[i]; - if (enemy != nullptr && enemy->handlePhaseSource != nullptr && does_script_exist(enemy->handleBatttlePhaseScriptID)) { + if (enemy != nullptr && enemy->handlePhaseSource != nullptr && does_script_exist(enemy->handlePhaseScriptID)) { cond = true; } } - if (partner != nullptr && partner->handlePhaseSource != nullptr && does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (partner != nullptr && partner->handlePhaseSource != nullptr && does_script_exist(partner->handlePhaseScriptID)) { cond = true; } @@ -747,13 +747,13 @@ void btl_state_update_begin_player_turn(void) { script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_OUTTA_SIGHT; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; } } break; case BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_OUTTA_SIGHT: - if (!does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (!does_script_exist(partner->handlePhaseScriptID)) { battleStatus->outtaSightActive = 0; gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_CHECK_WATER_BLOCK; gBattleStatus.flags2 |= BS_FLAGS2_PARTNER_TURN_USED; @@ -942,7 +942,7 @@ void btl_state_update_begin_player_turn(void) { sfx_play_sound(SOUND_FROZEN_SHATTER); player->icePillarEffect->flags |= FX_INSTANCE_FLAG_DISMISS; player->icePillarEffect = nullptr; - dispatch_event_player(EVENT_32); + dispatch_event_player(EVENT_RECOVER_FROZEN); } else { dispatch_event_player(EVENT_RECOVER_STATUS); } @@ -1110,11 +1110,11 @@ void btl_state_update_begin_partner_turn(void) { btl_cam_move(5); gBattleSubState = BTL_SUBSTATE_BEGIN_PARTNER_TURN_RESET_STATE; } else { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); return; } } else { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); return; } } @@ -1176,14 +1176,14 @@ void btl_state_update_begin_partner_turn(void) { battleStatus->battlePhase = PHASE_ENEMY_BEGIN; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; } gBattleSubState = BTL_SUBSTATE_BEGIN_PARTNER_TURN_AWAIT_TURN_SCRIPT; } if (gBattleSubState == BTL_SUBSTATE_BEGIN_PARTNER_TURN_AWAIT_TURN_SCRIPT) { - if (partner->handlePhaseSource == nullptr || !does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (partner->handlePhaseSource == nullptr || !does_script_exist(partner->handlePhaseScriptID)) { gBattleSubState = BTL_SUBSTATE_BEGIN_PARTNER_TURN_END_DELAY; } } @@ -1198,7 +1198,7 @@ void btl_state_update_begin_partner_turn(void) { btl_set_state(BATTLE_STATE_SWITCH_TO_PARTNER); } else { gBattleStatus.flags2 |= BS_FLAGS2_PARTNER_TURN_USED; - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); } } } @@ -1236,7 +1236,7 @@ void btl_state_update_switch_to_partner(void) { void btl_state_draw_switch_to_partner(void) { } -void btl_state_update_9(void) { +void btl_state_update_transfer_turn(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; Actor* partner = battleStatus->partnerActor; @@ -1503,7 +1503,7 @@ void btl_state_update_9(void) { battleStatus->battlePhase = PHASE_PLAYER_END; script = start_script(actor->handlePhaseSource, EVT_PRIORITY_A, 0); actor->handlePhaseScript = script; - actor->handleBatttlePhaseScriptID = script->id; + actor->handlePhaseScriptID = script->id; script->owner1.enemyID = i | ACTOR_CLASS_ENEMY; } } @@ -1515,7 +1515,7 @@ void btl_state_update_9(void) { if (gBattleSubState == BTL_SUBSTATE_9_6) { for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { actor = battleStatus->enemyActors[i]; - if (actor != nullptr && actor->handlePhaseSource != nullptr && does_script_exist(actor->handleBatttlePhaseScriptID)) { + if (actor != nullptr && actor->handlePhaseSource != nullptr && does_script_exist(actor->handlePhaseScriptID)) { waitingForScript = true; } } @@ -1529,7 +1529,7 @@ void btl_state_update_9(void) { } } -void btl_state_draw_9(void) { +void btl_state_draw_transfer_turn(void) { } void btl_state_update_prepare_menu(void) { @@ -1681,7 +1681,7 @@ void btl_state_update_end_turn(void) { battleStatus->battlePhase = PHASE_ENEMY_END; script = start_script(actor->handlePhaseSource, EVT_PRIORITY_A, 0); actor->handlePhaseScript = script; - actor->handleBatttlePhaseScriptID = script->id; + actor->handlePhaseScriptID = script->id; script->owner1.enemyID = i | ACTOR_ENEMY0; } } @@ -1690,7 +1690,7 @@ void btl_state_update_end_turn(void) { battleStatus->battlePhase = PHASE_ENEMY_END; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; } gBattleSubState = BTL_SUBSTATE_END_TURN_AWAIT_SCRIPTS; @@ -1702,12 +1702,12 @@ void btl_state_update_end_turn(void) { for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { actor = battleStatus->enemyActors[i]; - if (actor != nullptr && actor->handlePhaseSource != nullptr && does_script_exist(actor->handleBatttlePhaseScriptID)) { + if (actor != nullptr && actor->handlePhaseSource != nullptr && does_script_exist(actor->handlePhaseScriptID)) { cond = true; } } - if (partner != nullptr && partner->handlePhaseSource != nullptr && does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (partner != nullptr && partner->handlePhaseSource != nullptr && does_script_exist(partner->handlePhaseScriptID)) { cond = true; } @@ -1762,14 +1762,14 @@ void btl_state_update_victory(void) { battleStatus->battlePhase = PHASE_ENEMY_BEGIN; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; gBattleSubState = BTL_SUBSTATE_VICTORY_AWAIT_OUTTA_SIGHT; } break; case BTL_SUBSTATE_VICTORY_AWAIT_OUTTA_SIGHT: - if (!does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (!does_script_exist(partner->handlePhaseScriptID)) { battleStatus->outtaSightActive = 0; gBattleSubState = BTL_SUBSTATE_VICTORY_RECOVER_STATUS; } @@ -2017,13 +2017,13 @@ void btl_state_update_end_training_battle(void) { battleStatus->battlePhase = PHASE_ENEMY_BEGIN; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; gBattleSubState = BTL_SUBSTATE_END_TRAINING_AWAIT_OUTTA_SIGHT; } break; case BTL_SUBSTATE_END_TRAINING_RESET_CAM: //@bug should be BTL_SUBSTATE_END_TRAINING_AWAIT_OUTTA_SIGHT - if (!does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (!does_script_exist(partner->handlePhaseScriptID)) { battleStatus->outtaSightActive = false; gBattleSubState = BTL_SUBSTATE_END_TRAINING_RESET_CAM; } @@ -2148,7 +2148,7 @@ void btl_state_update_end_battle(void) { s16 areaID; s16 mapID; - btl_set_state(BATTLE_STATE_0); + btl_set_state(BATTLE_STATE_NONE); gLastDrawBattleState = gBattleState; get_map_IDs_by_name("gv_01", &areaID, &mapID); gGameStatusPtr->areaID = areaID; @@ -2156,7 +2156,7 @@ void btl_state_update_end_battle(void) { gGameStatusPtr->entryID = gv_01_ENTRY_0; set_game_mode(GAME_MODE_GAME_OVER); } else { - btl_set_state(BATTLE_STATE_0); + btl_set_state(BATTLE_STATE_NONE); gLastDrawBattleState = gBattleState; func_8003E514(1); set_game_mode(GAME_MODE_END_BATTLE); @@ -2282,7 +2282,7 @@ void btl_state_update_run_away(void) { gBattleSubState = BTL_SUBSTATE_RUN_AWAY_DONE; } else { status_bar_start_blinking_starpoints(); - func_8023E104(); + btl_start_blinking_starpoints(); D_8029F264 = 0; D_8029F24C = 0; BattleScreenFadeAmt = 0; @@ -2323,7 +2323,7 @@ void btl_state_update_run_away(void) { RunAwayRewardStep--; } else { status_bar_stop_blinking_starpoints(); - func_8023E11C(); + btl_stop_blinking_starpoints(); gBattleSubState = BTL_SUBSTATE_RUN_AWAY_DONE; } } @@ -2361,7 +2361,7 @@ void btl_state_update_run_away(void) { && (partner == nullptr || !does_script_exist(partner->takeTurnScriptID)) && battleStatus->stateFreezeCount == 0 ) { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); } break; } @@ -2517,7 +2517,7 @@ void btl_state_update_change_partner(void) { break; } btl_delete_actor(partner); - playerData->curPartner = battleStatus->unk_1AC; + playerData->curPartner = battleStatus->lastSelectedPartner; load_partner_actor(); partner = battleStatus->partnerActor; partner->scale.x = 0.1f; @@ -2556,7 +2556,7 @@ void btl_state_update_change_partner(void) { battleStatus->battlePhase = PHASE_PLAYER_BEGIN; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); partner->handlePhaseScript = script; - partner->handleBatttlePhaseScriptID = script->id; + partner->handlePhaseScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; } } @@ -2565,7 +2565,7 @@ void btl_state_update_change_partner(void) { case BTL_SUBSTATE_CHANGE_PARTNER_AWAIT_PHASE: partner = battleStatus->partnerActor; if (partner != nullptr) { - if (partner->handlePhaseSource != nullptr && does_script_exist(partner->handleBatttlePhaseScriptID)) { + if (partner->handlePhaseSource != nullptr && does_script_exist(partner->handlePhaseScriptID)) { break; } } @@ -3092,8 +3092,8 @@ void btl_state_update_end_player_turn(void) { gBattleStatus.flags2 |= BS_FLAGS2_PLAYER_TURN_USED; } - if (battleStatus->unk_94 < 0) { - battleStatus->unk_94 = 0; + if (battleStatus->cancelTurnMode < 0) { + battleStatus->cancelTurnMode = 0; battleStatus->itemUsesLeft = 0; btl_set_state(BATTLE_STATE_END_TURN); return; @@ -3139,7 +3139,7 @@ void btl_state_update_end_player_turn(void) { if (!(gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE)) { btl_set_state(BATTLE_STATE_BEGIN_PARTNER_TURN); } else { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); } } } @@ -3164,7 +3164,7 @@ void btl_state_update_partner_move(void) { switch (gBattleSubState) { case BTL_SUBSTATE_PARTNER_MOVE_INIT: if (partner == nullptr) { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); break; } battleStatus->stateFreezeCount = 0; @@ -3427,11 +3427,11 @@ void btl_state_update_end_partner_turn(void) { battleStatus->flags1 &= ~BS_FLAGS1_PARTNER_ACTING; battleStatus->flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; - if (battleStatus->unk_94 < 0) { - battleStatus->unk_94 = 0; + if (battleStatus->cancelTurnMode < 0) { + battleStatus->cancelTurnMode = 0; btl_set_state(BATTLE_STATE_END_TURN); } else { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); } } } @@ -3536,14 +3536,14 @@ void btl_state_update_next_enemy(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; gBattleStatus.flags2 |= BS_FLAGS2_HIDE_BUFF_COUNTERS; - D_8029F244 = enemy->unk_134; + D_8029F244 = enemy->ordinal; if (enemy->handlePhaseSource != nullptr) { Evt* onTurnChanceScript; battleStatus->battlePhase = PHASE_ENEMY_BEGIN; onTurnChanceScript = start_script(enemy->handlePhaseSource, EVT_PRIORITY_A, 0); enemy->handlePhaseScript = onTurnChanceScript; - enemy->handleBatttlePhaseScriptID = onTurnChanceScript->id; + enemy->handlePhaseScriptID = onTurnChanceScript->id; onTurnChanceScript->owner1.actorID = battleStatus->activeEnemyActorID; } gBattleSubState = BTL_SUBSTATE_NEXT_ENEMY_DONE; @@ -3552,12 +3552,12 @@ void btl_state_update_next_enemy(void) { if (battleStatus->stateFreezeCount == 0) { enemy = get_actor(battleStatus->activeEnemyActorID); - if (enemy == nullptr || enemy->unk_134 != D_8029F244) { + if (enemy == nullptr || enemy->ordinal != D_8029F244) { btl_set_state(BATTLE_STATE_NEXT_ENEMY); } else { - if (enemy->handlePhaseSource == nullptr || !does_script_exist(enemy->handleBatttlePhaseScriptID)) { - if (battleStatus->unk_94 < 0) { - battleStatus->unk_94 = 0; + if (enemy->handlePhaseSource == nullptr || !does_script_exist(enemy->handlePhaseScriptID)) { + if (battleStatus->cancelTurnMode < 0) { + battleStatus->cancelTurnMode = 0; btl_set_state(BATTLE_STATE_END_TURN); } else { btl_set_state(BATTLE_STATE_ENEMY_MOVE); @@ -4016,7 +4016,7 @@ void btl_state_update_first_strike(void) { } void btl_state_draw_first_stike(void) { - if (D_802809F6 == -1 && D_8029F254) { + if (EndDemoWhiteOut == -1 && D_8029F254) { if (BattleScreenFadeAmt == 0) { set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); } else { @@ -4413,7 +4413,7 @@ void btl_state_update_end_demo_battle(void) { switch (gBattleSubState) { case BTL_SUBSTATE_END_DEMO_BATTLE_INIT: BattleScreenFadeAmt = 0; - if (D_802809F6 == -1) { + if (EndDemoWhiteOut == -1) { if (DemoBattleBeginDelay != 0) { DemoBattleBeginDelay--; break; @@ -4422,7 +4422,7 @@ void btl_state_update_end_demo_battle(void) { gBattleSubState = BTL_SUBSTATE_END_DEMO_BATTLE_FADE_OUT; break; case BTL_SUBSTATE_END_DEMO_BATTLE_FADE_OUT: - switch (D_802809F6) { + switch (EndDemoWhiteOut) { case 255: gBattleSubState = BTL_SUBSTATE_END_DEMO_BATTLE_EXEC_STAGE_SCRIPT; return; @@ -4484,11 +4484,11 @@ void btl_state_update_end_demo_battle(void) { decrement_status_bar_disabled(); } - if (D_802809F6 != -1) { + if (EndDemoWhiteOut != -1) { gGameStatusPtr->nextDemoScene = LAST_DEMO_SCENE_IDX; } - btl_set_state(BATTLE_STATE_0); + btl_set_state(BATTLE_STATE_NONE); gLastDrawBattleState = gBattleState; set_game_mode(GAME_MODE_END_BATTLE); break; @@ -4498,7 +4498,7 @@ void btl_state_update_end_demo_battle(void) { const static f32 padding[] = { 0.0f, 0.0f, 0.0f }; void btl_state_draw_end_demo_battle(void) { - if (D_802809F6 == -1) { + if (EndDemoWhiteOut == -1) { set_screen_overlay_color(SCREEN_LAYER_FRONT, 0, 0, 0); set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, BattleScreenFadeAmt); } diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index 4840be06e64..1b8755fdd0f 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -529,8 +529,11 @@ void btl_menu_strats_show_error(void* data, s32 x, s32 y); void func_80263300(void); void func_80263268(void); void btl_init_menu_partner(void); -void func_800F52BC(void); -void func_800F16CC(void); + +// forces an update step for the popup menu +void flush_popup_menu(void); + +void show_popup_menu(void); void btl_init_menu_boots(void); void btl_init_menu_hammer(void); @@ -612,10 +615,10 @@ s32 btl_main_menu_update(void) { D_802AD010[i] = hid = hud_element_create(BattleMenu_HudScripts[i]); hud_element_set_render_depth(hid, 5); #if VERSION_PAL - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); #else hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); #endif hud_element_set_scale(hid, 0.75f); @@ -624,9 +627,9 @@ s32 btl_main_menu_update(void) { hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 10); #if VERSION_PAL - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); #else - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); #endif @@ -637,9 +640,9 @@ s32 btl_main_menu_update(void) { hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 7); #if VERSION_PAL - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); #else - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); #endif @@ -650,7 +653,7 @@ s32 btl_main_menu_update(void) { hud_element_set_render_pos(hid, 40, 212); hud_element_set_tint(hid, 0, 91, 127); hud_element_set_transform_rotation_pivot(hid, 16, -16); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(hid, 240); @@ -660,7 +663,7 @@ s32 btl_main_menu_update(void) { hud_element_set_render_pos(hid, 39, 212); hud_element_set_tint(hid, 0, 91, 127); hud_element_set_transform_rotation_pivot(hid, 16, -16); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(hid, 240); @@ -673,9 +676,9 @@ s32 btl_main_menu_update(void) { hud_element_set_transform_rotation(hid, 0.0f, 0.0f, -45.0f); hud_element_set_alpha(hid, 200); #if VERSION_PAL - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); #else - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); #endif @@ -684,26 +687,26 @@ s32 btl_main_menu_update(void) { hud_element_set_render_depth(hid, 0); hud_element_set_render_pos(hid, 97, 208); hud_element_set_tint(hid, 255, 255, 255); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(hid, 230); D_802AD050 = hid = hud_element_create(&HES_SwapZ); hud_element_set_render_depth(hid, 5); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, 94, 209); D_802AD054 = hid = hud_element_create(&HES_SwapArrowLeft); hud_element_set_render_depth(hid, 5); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, 81, 210); D_802AD058 = hid = hud_element_create(&HES_SwapArrowRight); hud_element_set_render_depth(hid, 5); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, 102, 210); D_802AD00A = 100; D_802AD001 = 3; @@ -1250,33 +1253,33 @@ s32 btl_submenu_moves_update(void) { hid = hud_element_create(battle_menu_moveOptionIconScripts[BattleMenu_Moves_OptionIndexMap[i]]); BattleMenu_Moves_OptionIDs[i] = hid; hud_element_set_scale(hid, 0.45f); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); } hid = hud_element_create(&HES_AnimatedHandPointer); BattleMenu_Moves_CursorID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, BattleMenu_Moves_PosX, BattleMenu_Moves_PosY); hid = hud_element_create(&HES_GreenArrowUp); BattleMenu_Moves_UpArrowID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 39, BattleMenu_Moves_PosY - 7); hid = hud_element_create(&HES_GreenArrowDown); BattleMenu_Moves_DownArrowID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 39, BattleMenu_Moves_PosY + 78); if (!BattleMenu_UsingSpiritsSubmenu) { hid = hud_element_create(&HES_StatusFlower); BattleMenu_Moves_TitleID = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); } else { hid = hud_element_create(&HES_MenuStarPower); BattleMenu_Moves_TitleID = hid; hud_element_set_scale(hid, 0.75f); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); } hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 56, BattleMenu_Moves_PosY); @@ -1344,7 +1347,7 @@ s32 btl_submenu_moves_update(void) { } #endif } - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 56, BattleMenu_Moves_PosY); } @@ -2111,21 +2114,21 @@ s32 btl_update_strats_menu(void) { for (i = 0; i < D_802AD66C; i++) { D_802AD628[i] = hid = hud_element_create(D_802AD640[i]); hud_element_set_scale(hid, 0.45f); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); } D_802AD618 = hid = hud_element_create(&HES_AnimatedHandPointer); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); x = D_802AD63C; //! required to match y = D_802AD63E; hud_element_set_render_pos(hid, x, y); HID_GreenArrowUp = hid = hud_element_create(&HES_GreenArrowUp); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, D_802AD63C + 39, D_802AD63E - 7); HID_GreenArrowDown = hid = hud_element_create(&HES_GreenArrowDown); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, D_802AD63C + 39, D_802AD63E + 78); D_802AD614 = MSG_PAL_STANDARD; @@ -3107,8 +3110,8 @@ void btl_state_update_player_menu(void) { btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->unk_49 = BattleMenu_Moves_OptionIndices[submenuResult - 1]; - battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_49]; + battleStatus->lastSelectedAbility = BattleMenu_Moves_OptionIndices[submenuResult - 1]; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastSelectedAbility]; if (battleStatus->curSubmenu == BTL_MENU_TYPE_JUMP) { battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_JUMP] = battle_menu_moveOptionActive; } @@ -3143,8 +3146,8 @@ void btl_state_update_player_menu(void) { } battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CANCEL; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CHOSEN; - battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_49]; - battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->unk_49]].flags; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastSelectedAbility]; + battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastSelectedAbility]].flags; currentSubmenu = battleStatus->curSubmenu; switch (currentSubmenu) { case BTL_MENU_TYPE_JUMP: @@ -3302,7 +3305,7 @@ void btl_state_update_player_menu(void) { initialPos = battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP]; popup->initialPos = initialPos; create_battle_popup_menu(popup); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET; break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET: @@ -3317,9 +3320,9 @@ void btl_state_update_player_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CHOSEN; - battleStatus->unk_1AA = popup->userIndex[popup->result - 1]; + battleStatus->lastSelectedItem = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; - battleStatus->moveArgument = battleStatus->unk_1AA; + battleStatus->moveArgument = battleStatus->lastSelectedItem; battleStatus->curTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_PRIMARY_ONLY; battleStatus->curAttackElement = 0; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1; @@ -3332,7 +3335,7 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { - func_800F16CC(); + show_popup_menu(); func_802A2C58(); func_802A1098(); battleStatus->selectedMoveID = 0; @@ -3351,7 +3354,7 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL: - func_800F16CC(); + show_popup_menu(); func_802A2C58(); func_802A1098(); btl_submenu_moves_update(); @@ -3399,7 +3402,7 @@ void btl_state_update_player_menu(void) { popup->titleNumber = 0; popup->initialPos = initialPos; create_battle_popup_menu(popup); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_2; break; case BTL_SUBSTATE_PLAYER_MENU_ITEMS_2: @@ -3414,9 +3417,9 @@ void btl_state_update_player_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ITEMS_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ITEMS_6; - battleStatus->unk_1AA = popup->userIndex[popup->result - 1]; + battleStatus->lastSelectedItem = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; - battleStatus->moveArgument = battleStatus->unk_1AA; + battleStatus->moveArgument = battleStatus->lastSelectedItem; battleStatus->selectedMoveID = MOVE_ITEMS; battleStatus->curTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_PRIMARY_ONLY; battleStatus->curAttackElement = 0; @@ -3429,7 +3432,7 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_ITEMS_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { - func_800F16CC(); + show_popup_menu(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_4; } else { @@ -3444,7 +3447,7 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_ITEMS_5: - func_800F16CC(); + show_popup_menu(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_4; break; @@ -3511,7 +3514,7 @@ void btl_state_update_player_menu(void) { btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->unk_49 = BattleMenu_Moves_OptionIndices[submenuResult - 1]; + battleStatus->lastSelectedAbility = BattleMenu_Moves_OptionIndices[submenuResult - 1]; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER] = battle_menu_moveOptionActive; func_802A27D0(); func_802A1030(); @@ -3528,9 +3531,9 @@ void btl_state_update_player_menu(void) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_6; battleStatus->moveCategory = BTL_MENU_TYPE_STAR_POWERS; - battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_49]; - battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->unk_49]].flags; - battleStatus->moveArgument = battleStatus->unk_49; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastSelectedAbility]; + battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastSelectedAbility]].flags; + battleStatus->moveArgument = battleStatus->lastSelectedAbility; if (playerData->starBeamLevel == 2 && battleStatus->moveArgument == 8) { battleStatus->moveArgument++; } @@ -3610,7 +3613,7 @@ void btl_state_update_player_menu(void) { initialPos = battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP]; popup->initialPos = initialPos; create_battle_popup_menu(popup); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_2; } } @@ -3623,9 +3626,9 @@ void btl_state_update_player_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_DIPPING_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_DIPPING_6; - battleStatus->unk_1AA = popup->userIndex[popup->result - 1]; + battleStatus->lastSelectedItem = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; - battleStatus->moveArgument = battleStatus->unk_1AA; + battleStatus->moveArgument = battleStatus->lastSelectedItem; battleStatus->curTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_PRIMARY_ONLY; battleStatus->curAttackElement = 0; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1; @@ -3650,7 +3653,7 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_5: - func_800F16CC(); + show_popup_menu(); D_802ACC60 = 5; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_4; break; @@ -3676,7 +3679,7 @@ void btl_state_update_player_menu(void) { if (jumpTargetCount <= 0 && hammerTargetCount <= 0) { battleStatus->moveCategory = BTL_MENU_TYPE_DO_NOTHING; - battleStatus->waitForState = BATTLE_STATE_0; + battleStatus->waitForState = BATTLE_STATE_NONE; btl_set_state(BATTLE_STATE_END_PLAYER_TURN); } else { jumpChance = 50; @@ -3866,7 +3869,7 @@ void btl_state_update_player_menu(void) { popup->dipMode = 0; popup->titleNumber = 0; create_battle_popup_menu(popup); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2: @@ -3881,11 +3884,11 @@ void btl_state_update_player_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_6; - battleStatus->unk_1AC = popup->userIndex[popup->result - 1]; + battleStatus->lastSelectedPartner = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; battleStatus->selectedMoveID = MOVE_UNUSED_37; battleStatus->curTargetListFlags = TARGET_FLAG_2; - battleStatus->moveArgument = battleStatus->unk_1AC; + battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_PARTNER] = popup->result - 1; hide_popup_menu(); func_802A4718(); @@ -3896,7 +3899,7 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { - func_800F16CC(); + show_popup_menu(); func_802A4A10(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4; @@ -3916,7 +3919,7 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5: - func_800F16CC(); + show_popup_menu(); func_802A4A10(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4; @@ -4010,7 +4013,7 @@ void btl_state_update_partner_menu(void) { battleStatus->selectedMoveID = MOVE_NONE; battleStatus->curAttackElement = 0; if (!can_switch_to_partner()) { - btl_set_state(BATTLE_STATE_9); + btl_set_state(BATTLE_STATE_TRANSFER_TURN); } else { btl_cam_use_preset(BTL_CAM_DEFAULT); battleStatus->flags1 |= BS_FLAGS1_MENU_OPEN; @@ -4307,7 +4310,7 @@ void btl_state_update_partner_menu(void) { btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->unk_4B = entryIdx - 1; + battleStatus->lastPartnerPowerSelection = entryIdx - 1; func_802A27D0(); func_802A1030(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3; @@ -4322,7 +4325,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4; } else if (btl_main_menu_update() != 0) { battleStatus->moveCategory = BTL_MENU_TYPE_ABILITY; - battleStatus->selectedMoveID = BattleMenu_Moves_OptionIndices[battleStatus->unk_4B]; + battleStatus->selectedMoveID = BattleMenu_Moves_OptionIndices[battleStatus->lastPartnerPowerSelection]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY] = battle_menu_moveOptionActive; battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5; @@ -4381,7 +4384,7 @@ void btl_state_update_partner_menu(void) { initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER_ITEM]; popupMenu->initialPos = initialPos; create_battle_popup_menu(popupMenu); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_2; break; case BTL_SUBSTATE_PARTNER_MENU_ITEMS_2: @@ -4396,9 +4399,9 @@ void btl_state_update_partner_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ITEMS_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ITEMS_6; - battleStatus->unk_1AA = popupMenu->userIndex[popupMenu->result - 1]; + battleStatus->lastSelectedItem = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; - battleStatus->moveArgument = battleStatus->unk_1AA; + battleStatus->moveArgument = battleStatus->lastSelectedItem; battleStatus->curTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_PRIMARY_ONLY; battleStatus->curAttackElement = 0; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER_ITEM] = popupMenu->result - 1; @@ -4410,7 +4413,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_ITEMS_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popupMenu->result == POPUP_RESULT_CHOOSING) { - func_800F16CC(); + show_popup_menu(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_4; } else if (btl_main_menu_update() != 0) { @@ -4423,7 +4426,7 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_ITEMS_5: - func_800F16CC(); + show_popup_menu(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_4; break; @@ -4459,7 +4462,7 @@ void btl_state_update_partner_menu(void) { popupMenu->dipMode = 0; popupMenu->titleNumber = 0; create_battle_popup_menu(popupMenu); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2; break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2: @@ -4476,11 +4479,11 @@ void btl_state_update_partner_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_6; - battleStatus->unk_1AC = popupMenu->userIndex[popupMenu->result - 1]; + battleStatus->lastSelectedPartner = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; battleStatus->selectedMoveID = MOVE_UNUSED_37; battleStatus->curTargetListFlags = TARGET_FLAG_2; - battleStatus->moveArgument = battleStatus->unk_1AC; + battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; hide_popup_menu(); func_802A1030(); @@ -4490,7 +4493,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && (popupMenu->result == POPUP_RESULT_CHOOSING)) { - func_800F16CC(); + show_popup_menu(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4; } else if (btl_main_menu_update() != 0) { @@ -4505,7 +4508,7 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5: - func_800F16CC(); + show_popup_menu(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4; break; @@ -4561,7 +4564,7 @@ void btl_state_update_partner_menu(void) { btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->unk_4B = BattleMenu_Moves_OptionIndices[entryIdx - 1]; + battleStatus->lastPartnerPowerSelection = BattleMenu_Moves_OptionIndices[entryIdx - 1]; func_802A27D0(); func_802A1030(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_3; @@ -4578,9 +4581,9 @@ void btl_state_update_partner_menu(void) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_6; battleStatus->moveCategory = BTL_MENU_TYPE_STAR_POWERS; - battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_4B]; - battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->unk_4B]].flags; - battleStatus->moveArgument = battleStatus->unk_4B; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastPartnerPowerSelection]; + battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastPartnerPowerSelection]].flags; + battleStatus->moveArgument = battleStatus->lastPartnerPowerSelection; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER] = battle_menu_moveOptionActive; btl_set_state(BATTLE_STATE_SELECT_TARGET); } @@ -4736,7 +4739,7 @@ void btl_state_update_partner_menu(void) { popupMenu->dipMode = 0; popupMenu->titleNumber = 0; create_battle_popup_menu(popupMenu); - func_800F52BC(); + flush_popup_menu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2: @@ -4751,11 +4754,11 @@ void btl_state_update_partner_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_6; - battleStatus->unk_1AC = popupMenu->userIndex[popupMenu->result - 1]; + battleStatus->lastSelectedPartner = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; battleStatus->selectedMoveID = MOVE_UNUSED_37; battleStatus->curTargetListFlags = TARGET_FLAG_2; - battleStatus->moveArgument = battleStatus->unk_1AC; + battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; hide_popup_menu(); func_802A4718(); @@ -4766,7 +4769,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popupMenu->result == POPUP_RESULT_CHOOSING) { - func_800F16CC(); + show_popup_menu(); func_802A4A10(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4; @@ -4786,7 +4789,7 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5: - func_800F16CC(); + show_popup_menu(); func_802A4A10(); func_802A1098(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4; diff --git a/src/battle/dmg_partner.c b/src/battle/dmg_partner.c index 97023c75ed3..650f62d3b98 100644 --- a/src/battle/dmg_partner.c +++ b/src/battle/dmg_partner.c @@ -726,7 +726,7 @@ HitResult calc_partner_damage_enemy(void) { statusChanceOrDefense = (battleStatus->statusChance * statusChanceOrDefense) / 100; if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { - if (battleStatus->curAttackElement & ) { + if (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR) { if (rand_int(99) < statusChanceOrDefense) { if (!(target->debuff == STATUS_KEY_UNUSED || target->debuff == STATUS_KEY_DIZZY || diff --git a/src/battle/level_up.c b/src/battle/level_up.c index 2a835050952..e3e2d62977c 100644 --- a/src/battle/level_up.c +++ b/src/battle/level_up.c @@ -824,22 +824,22 @@ void btl_state_update_celebration(void) { hid = hud_element_create(&HES_level_up_heart); LevelUpStatEmblemIDs[0] = hid; hud_element_set_render_pos(hid, 310, 140); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hid = hud_element_create(&HES_level_up_flower); LevelUpStatEmblemIDs[1] = hid; hud_element_set_render_pos(hid, 158, 340); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hid = hud_element_create(&HES_level_up_leaves); LevelUpStatEmblemIDs[3] = hid; hud_element_set_render_pos(hid, 158, 340); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hid = hud_element_create(&HES_level_up_badge); LevelUpStatEmblemIDs[2] = hid; hud_element_set_render_pos(hid, 6, 140); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); #if VERSION_PAL hid = hud_element_create(levelup_stat_scripts[0][gCurrentLanguage]); @@ -848,13 +848,13 @@ void btl_state_update_celebration(void) { #endif LevelUpStatTextIDs[LVL_UP_FP][LVL_UP_TITLE] = hid; hud_element_set_render_pos(hid, 160, 317); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); for (i = 1; i < ARRAY_COUNT(LevelUpStatTextIDs[LVL_UP_FP]); i++) { hid = hud_element_create(HES_LevelUpDigits[LVL_UP_FP][0]); LevelUpStatTextIDs[LVL_UP_FP][i] = hid; hud_element_set_render_pos(hid, 160, 317); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); } #if VERSION_PAL @@ -864,13 +864,13 @@ void btl_state_update_celebration(void) { #endif LevelUpStatTextIDs[LVL_UP_HP][LVL_UP_TITLE] = hid; hud_element_set_render_pos(hid, 312, 117); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); for (i = 1; i < ARRAY_COUNT(LevelUpStatTextIDs[LVL_UP_HP]); i++) { hid = hud_element_create(HES_LevelUpDigits[LVL_UP_HP][0]); LevelUpStatTextIDs[LVL_UP_HP][i] = hid; hud_element_set_render_pos(hid, 312, 117); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); } #if VERSION_PAL @@ -880,13 +880,13 @@ void btl_state_update_celebration(void) { #endif LevelUpStatTextIDs[LVL_UP_BP][LVL_UP_TITLE] = hid; hud_element_set_render_pos(hid, 8, 117); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); for (i = 1; i < ARRAY_COUNT(LevelUpStatTextIDs[LVL_UP_BP]); i++) { hid = hud_element_create(HES_LevelUpDigits[LVL_UP_BP][0]); LevelUpStatTextIDs[LVL_UP_BP][i] = hid; hud_element_set_render_pos(hid, 8, 117); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); } CantLevelUpStat[MENU_HP] = false; @@ -1097,7 +1097,7 @@ void btl_state_update_celebration(void) { hud_element_set_transform_rotation(hid, 0.0f, 0.0f, 180.0f); hud_element_set_transform_scale(hid, 1.0f, 1.5f, 1.0f); hud_element_set_alpha(hid, 200); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); #if VERSION_PAL LevelUpSelectTextID = hid = hud_element_create(HES_LevelUpUpgradeLanguages[gCurrentLanguage]); @@ -1105,7 +1105,7 @@ void btl_state_update_celebration(void) { LevelUpSelectTextID = hid = hud_element_create(&HES_level_up_select_one_to_upgrade); #endif hud_element_set_render_pos(hid, 0, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); battleStatus->curSubmenu = 1; CelebrateSubstateTime = 10; diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index c8f61d3764c..1b8a9638501 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -137,7 +137,7 @@ API_CALLABLE(N(func_802A13E4_72C994)) { for (i = 0; i < ARRAY_COUNT(D_802A25C8); i++) { hid = hud_element_create(gItemHudScripts[gItemTable[D_802A25FC[i]].hudElemID].enabled); D_802A25C8[i] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); } D_802A25E4 = 1; return ApiStatus_BLOCK; diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index 96d7206edfb..74da64fa8bf 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -90,7 +90,7 @@ API_CALLABLE(N(func_802A13E4_7316E4)) { for (i = 0; i < ARRAY_COUNT(D_802A2DD8); i++) { hid = hud_element_create(N(D_802A2848_732B48)[N(D_802A2858_732B58)[i]]); D_802A2DD8[i] = hid; - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); } D_802A2DEC = 1; diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index 5ff3f2acbcc..cdc0285b130 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -11,13 +11,13 @@ API_CALLABLE(N(GetJumpDamage)) { script->varTable[15] = 1; switch (gPlayerData.bootsLevel) { - case 0: + case GEAR_RANK_NORMAL: script->varTable[15] = 1; break; - case 1: + case GEAR_RANK_SUPER: script->varTable[15] = 2; break; - case 2: + case GEAR_RANK_ULTRA: script->varTable[15] = 3; break; } diff --git a/src/battle/player_events.c b/src/battle/player_events.c index bec8a64e07d..16b8a45b02c 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -917,7 +917,7 @@ EvtScript EVS_StartDefend = { EvtScript EVS_Player_HandleEvent = { Call(GetLastEvent, ACTOR_PLAYER, LVarF) Switch(LVarF) - CaseNe(EVENT_32) + CaseNe(EVENT_RECOVER_FROZEN) Call(UseIdleAnimation, ACTOR_PLAYER, false) EndSwitch Call(InterruptActionCommand) @@ -1057,7 +1057,7 @@ EvtScript EVS_Player_HandleEvent = { Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) Call(PlayerRunToGoal, 0) Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - CaseEq(EVENT_32) + CaseEq(EVENT_RECOVER_FROZEN) Wait(10) Call(UseIdleAnimation, ACTOR_PLAYER, false) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.8)) diff --git a/src/battle/popup_messages.c b/src/battle/popup_messages.c index f613046aa5a..454f8269106 100644 --- a/src/battle/popup_messages.c +++ b/src/battle/popup_messages.c @@ -808,122 +808,122 @@ void btl_update_message_popup(void* data) { switch (popup->messageIndex) { case BTL_MSG_ACTION_TIP_MASH_LEFT: HID_BattleMessage1 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_ACTION_TIP_HOLD_LEFT_TIMED: HID_BattleMessage1 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_TimingReady); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); break; case BTL_MSG_ACTION_TIP_HOLD_LEFT_AIM: HID_BattleMessage1 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_AimTarget); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); hud_element_create_transform_B(HID_BattleMessage2); break; case BTL_MSG_ACTION_TIP_UNUSED_1: HID_BattleMessage1 = hud_element_create(&HES_CUpButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_CDownButton); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); HID_BattleMessage3 = hud_element_create(&HES_CLeftButton); - hud_element_set_flags(HID_BattleMessage3, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage3, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage3, -100, -100); HID_BattleMessage4 = hud_element_create(&HES_CRightButton); - hud_element_set_flags(HID_BattleMessage4, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage4, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage4, -100, -100); break; case BTL_MSG_ACTION_TIP_UNUSED_2: HID_BattleMessage1 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_ACTION_TIP_PRESS_BUTTONS_SHOWN: HID_BattleMessage1 = hud_element_create(&HES_AButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_BButton); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); HID_BattleMessage3 = hud_element_create(&HES_CDownButton); - hud_element_set_flags(HID_BattleMessage3, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage3, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage3, -100, -100); break; case BTL_MSG_ACTION_TIP_NOT_USED_1: HID_BattleMessage1 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_ACTION_TIP_PRESS_WITH_TIMING: HID_BattleMessage1 = hud_element_create(&HES_TimingReady); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_AButton); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); break; case BTL_MSG_ACTION_TIP_NOT_USED_2: HID_BattleMessage1 = hud_element_create(&HES_AButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_BButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_ACTION_TIP_MASH_BOTH: HID_BattleMessage1 = hud_element_create(&HES_AButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_BButton); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); break; case BTL_MSG_ACTION_TIP_HOLD_THEN_RELEASE: HID_BattleMessage1 = hud_element_create(&HES_TimingReady); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_AButtonDown); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); break; case BTL_MSG_ACTION_TIP_MOVE_TO_AIM: HID_BattleMessage1 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); HID_BattleMessage2 = hud_element_create(&HES_AimTarget); - hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage2, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage2, -100, -100); hud_element_create_transform_B(HID_BattleMessage2); HID_BattleMessage3 = hud_element_create(&HES_AimReticle); - hud_element_set_flags(HID_BattleMessage3, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage3, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage3, -100, -100); hud_element_create_transform_B(HID_BattleMessage3); break; case BTL_MSG_ACTION_TIP_BREAK_FREE: case BTL_MSG_ACTION_TIP_REDUCE_DAMAGE: HID_BattleMessage1 = hud_element_create(&HES_AButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); // fallthrough case BTL_MSG_ACTION_TIP_PRESS_BEFORE_LANDING: @@ -934,7 +934,7 @@ void btl_update_message_popup(void* data) { case BTL_MSG_ACTION_TIP_UNUSED_4: case BTL_MSG_ACTION_TIP_NOT_USED_3: HID_BattleMessage1 = hud_element_create(&HES_AButton); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; } @@ -1149,37 +1149,37 @@ void btl_update_message_popup(void* data) { switch (popup->messageIndex) { case BTL_MSG_HAMMER_DISABLED_1: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuHammer1); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_HAMMER_DISABLED_2: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuHammer2); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_HAMMER_DISABLED_3: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuHammer3); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_JUMP_DISABLED_1: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuBoots1); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_JUMP_DISABLED_2: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuBoots2); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_JUMP_DISABLED_3: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuBoots3); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; case BTL_MSG_ITEMS_DISABLED: HID_BattleMessage1 = hud_element_create(&HES_Item_MenuItems); - hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(HID_BattleMessage1, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; } diff --git a/src/battle/states_flowchart.md b/src/battle/states_flowchart.md new file mode 100644 index 00000000000..9d72c30065b --- /dev/null +++ b/src/battle/states_flowchart.md @@ -0,0 +1,363 @@ +# Battle States + +This document describes the battle state machine using a series of flowcharts. +Each node represents a state, and arrows represent transitions. +Bold arrows highlight the typical or most common transition paths. +The full state machine will be presented at the end, after we build up the major components. + +## Initiating Battles + +All battles begin in `BATTLE_STATE_START`, set during `load_battle_section`. After all actors are created, +this state checks whether the battle was initiated with a 'first strike' and selects the appropriate opening state. +Unless the battle ends with the first strike, the battle loop will begin with the first visit to `BATTLE_STATE_BEGIN_TURN`. + +```mermaid +flowchart TD + NormalStart[Start] + FS_Player[First Strike] + FS_Partner[Partner First Strike] + FS_Enemy[Enemy First Strike] + BeginTurn[Begin Turn] + + NormalStart ==> BeginTurn + NormalStart --> FS_Enemy + NormalStart --> FS_Player + FS_Player --> FS_Partner + FS_Player --> BeginTurn + FS_Partner --> BeginTurn + FS_Enemy --> BeginTurn +``` +## Ending Battles + +Battles are ended in `BATTLE_STATE_END_BATTLE` where the game mode is changed. + +A battle ends when one of the following conditions is met: +1. The player is defeated (Defeat) +2. All enemies are defeated (Victory) +3. Run Away is successful (Flee) + +The first two conditions are checked at certain points during multiple battle states; typically when an actor begins or +their turn, finishes using a move, or when control is being transfered to another actor. A full table of which states +may trigger which ending is presented here: + +| State | Checks Victory | Checks Defeat | +|-------|:--------------:|:--------------:| +| FIRST_STRIKE | X | X | +| PARTNER_FIRST_STRIKE | X | X | +| ENEMY_FIRST_STRIKE | X | X | +| BEGIN_TURN | X | | +| BEGIN_PLAYER_TURN | X | X | +| BEGIN_PARTNER_TURN | X | X | +| PLAYER_MOVE | | X | +| PARTNER_MOVE | | X | +| END_PLAYER_TURN | X | | +| END_PARTNER_TURN | X | | +| TRANSFER_TURN | X | X | +| ENEMY_MOVE | X | X | + +Defeat is detected via `btl_check_player_defeated`, which initiates a transition to `BATTLE_STATE_DEFEAT` when +the player has zero HP. + +Victory is detected via `btl_check_enemies_defeated`, which initiates a transition to `BATTLE_STATE_VICTORY` when +no valid defeatable enemies are left. + +Some battles are scripted to end when certain conditions are met (see final_bowser_1 in kpa2). +This is done by setting `ACTOR_FLAG_NO_DMG_APPLY` to the boss actor and then setting `BS_FLAGS1_BATTLE_FLED`. +This counts as the enemy fleeing. On the next victory check, `btl_check_enemies_defeated` will find no enemies +left and trigger a Victory. + +```mermaid +flowchart TD + PlayerDefeated([Player Defeated]) + EnemiesDefeated([All Enemies Defeated]) + BattleMenu([Strategies Menu]) + Transfer([Transfer Turn]) + RunAway[Run Away] + Victory[Victory] + Defeat[Defeat] + EndBattle[End Battle] + Celebration[Celebration] + + EnemiesDefeated --> Victory + PlayerDefeated ---> Defeat + BattleMenu ---> RunAway + + RunAway --> |Failed| Transfer + RunAway --> EndBattle + + Celebration --> EndBattle + Defeat --> EndBattle + + Victory --> |Skip Celebration| EndBattle + Victory --> Celebration +``` + +## Basic Turn Loop + +Each turn has phases where the player may act, the partner may act, and the enemies act. If the player or partner +cannot act, their phase is skipped. They can also change the order in which their actions occur via swap. After the +partner acts, the `BATTLE_STATE_TRANSFER_TURN` state is used to select the next actor. This allows a player to go +after the partner and supports the swapped positions in a Peach battle. + +**Note:** the nodes in this chart are simplified pseudo-states which do not correspond to literal battle states. +We'll go over the full state machine in a coming section. + +```mermaid +flowchart TD + BeginTurn[Begin Turn] + BeginPlayer[Begin Player] + PlayerMenu[Player Menu] + PlayerActs[Player Acts] + BeginPartner[Begin Partner] + PartnerMenu[Partner Menu] + PartnerActs[Partner Acts] + TransferTurn[Transfer Turn] + EnemiesAct[Enemies Act] + EndTurn[End Turn] + + BeginTurn ==> BeginPlayer + BeginPlayer --> |Player Can't Act| BeginPartner + + BeginPlayer ==> PlayerMenu + PlayerMenu ==> PlayerActs + PlayerMenu ---> |Swap| BeginPartner + PlayerActs ==> BeginPartner + + + BeginPartner --> |Partner Can't Act| TransferTurn + BeginPartner ==> PartnerMenu + PartnerMenu ==> PartnerActs + PartnerMenu ---> |Swap| BeginPlayer + PartnerActs ==> TransferTurn + TransferTurn ==> EnemiesAct + TransferTurn --> |Player Can Act| BeginPlayer + TransferTurn --> |Partner Can Act| BeginPartner + EnemiesAct ==> EndTurn + EndTurn ==> BeginTurn +``` + +## Enemy Actors + +Each turn ends with the Enemy phase, where each enemy actor has an opportunity to act. Since their actions are +determined by their move scripts, this portion of the battle state machine is very simple. An enemy is selected +in `BATTLE_STATE_NEXT_ENEMY` and takes their turn with `BATTLE_STATE_ENEMY_MOVE`. This is repeated until all +enemies have acted, and then the turn ends. + +```mermaid +flowchart TD + TransferTurn[Transfer Turn] + NextEnemy[Next Enemy] + EnemyMove[Enemy Move] + EndTurn[End Turn] + + TransferTurn ==> NextEnemy + NextEnemy ==> EnemyMove + EnemyMove ==> NextEnemy + NextEnemy ==> |All Done| EndTurn +``` + +## Player and Partner Actors + +Player and partner actors both perform actions during the first part of each turn. Since the player controls these +actors, their state machines are much more complicated than the enemies'. +Both use roughly the following states: + +```mermaid +flowchart TD + Begin[Begin] + SwitchThis[Switch to Actor] + PrepareMenu[Prepare Menu] + Menu[Menu] + SelectTarget[Select Target] + Move[Move] + ChangePartner[Change Partner] + SwitchToOther([Switch to Other]) + SwitchFromOther([Switch from Other]) + End[End] + + Begin ==> SwitchThis + Begin --> |Can't Act| End + + SwitchFromOther --> |Swap| SwitchThis + SwitchThis ==> PrepareMenu + PrepareMenu ===> Menu + + Menu -----> |Do Nothing| End + Menu --> |Swap| SwitchToOther + Menu ---> ChangePartner + Menu ==> SelectTarget + + SelectTarget ==> Move + SelectTarget --> |Cancel| Menu + + Move ==> End + + End --> |Extra Action| PrepareMenu + + ChangePartner --> |Quick Change| PrepareMenu + ChangePartner --> End +``` + +## Full State Machine + +This chart combines all the components we've introduced. +The full turn loop is evident as the state machine loops through `BATTLE_STATE_BEGIN_TURN` from `BATTLE_STATE_END_TURN` +once per turn. + +Note: this chart leaves out edges pertaining to Peach battles, which have their own menu states, exchange BeginPlayer +and BeginPartner, and route through TransferTurn after player actions (as partner actions usually do). + +```mermaid +flowchart TD + subgraph SG_Start[ ] + NormalStart[Start] + FS_Player[First Strike] + FS_Partner[Partner First Strike] + FS_Enemy[Enemy First Strike] + end + BeginTurn[Begin Turn] + EndTurn[End Turn] + TransferTurn[Transfer Turn] + BeginPlayer[Begin Player Turn] + BeginPartner[Begin Partner Turn] + subgraph SG_Player[ ] + SwitchPlayer[Switch to Player] + PrepareMenu1["Prepare Menu (Player)"] + PlayerMenu[Player Menu] + %% PeachMenu[Peach Menu] + SelectTarget1[Select Target] + PlayerMove[Player Move] + ChangePartner1[Change Partner] + RunAway[Run Away] + Defend[Defend] + EndPlayer[End Player Turn] + end + subgraph SG_Partner[ ] + SwitchPartner[Switch to Partner] + PrepareMenu2["Prepare Menu (Partner)"] + PartnerMenu[Partner Menu] + %% TwinkMenu[Twink Menu] + SelectTarget2["Select Target (Partner)"] + PartnerMove[Partner Move] + ChangePartner2[Change Partner] + EndPartner[End Partner Turn] + end + subgraph SG_Enemy[ ] + NextEnemy[Next Enemy] + EnemyMove[Enemy Move] + end + + subgraph SG_End[ ] + PlayerDefeated([Player Defeated]) + EnemiesDefeated([All Enemies Defeated]) + Victory[Victory] + Celebration[Celebration] + Defeat[Defeat] + EndBattle[End Battle] + EndDemo[End Demo] + EndTraining[End Training] + end + + NormalStart ==> BeginTurn + NormalStart --> FS_Enemy + NormalStart --> FS_Player + FS_Player --> FS_Partner + FS_Player --> BeginTurn + FS_Partner --> BeginTurn + FS_Enemy --> BeginTurn + + BeginTurn ==> BeginPlayer + BeginTurn --> |Debug Option| RunAway + + NextEnemy ==> EnemyMove + EnemyMove ==> NextEnemy + NextEnemy ==> EndTurn + + EndTurn ==> BeginTurn + + BeginPlayer --> |Can't Act| BeginPartner + BeginPlayer ==> SwitchPlayer + + PlayerMove ==> EndPlayer + + EndPlayer --> |Turn Canceled| EndTurn + EndPlayer --> |Hustled / Dipping| PrepareMenu1 + EndPlayer ==> BeginPartner + + BeginPartner --> |Can't Act| TransferTurn + BeginPartner ==> SwitchPartner + + %% exists only as a sanity check in partner_move to ensure partner is not NULL + %% PartnerMove --> |Invalid Partner| TransferTurn + + PartnerMove ==> EndPartner + + EndPartner ==> TransferTurn + EndPartner -->|Turn Canceled| EndTurn + + TransferTurn --> SwitchPlayer + TransferTurn --> SwitchPartner + TransferTurn ==> NextEnemy + + SwitchPlayer ==> PrepareMenu1 + SwitchPartner ==> PrepareMenu2 + + PrepareMenu1 ==> PlayerMenu + PrepareMenu2 ==> PartnerMenu + + PlayerMenu --> |Can't Act / Do Nothing| EndPlayer + PlayerMenu --> |Swap| SwitchPartner + PlayerMenu --> |Single Option| PlayerMove + PlayerMenu ===> SelectTarget1 + PlayerMenu --> ChangePartner1 + PlayerMenu --> RunAway + PlayerMenu --> Defend + Defend --> EndPlayer + + PartnerMenu --> |Can't Act| TransferTurn + PartnerMenu --> |Swap| SwitchPlayer + PartnerMenu ===> SelectTarget2 + PartnerMenu --> ChangePartner2 + PartnerMenu --> |Do Nothing| EndPartner + + %% exists in code, but not available in-game + %% PartnerMenu --> RunAway + + SelectTarget1 ==> PlayerMove + SelectTarget1 ---> |Cancel| PlayerMenu + + ChangePartner1 --> |Quick Change| PrepareMenu1 + ChangePartner1 --> EndPlayer + + SelectTarget2 ==> PartnerMove + SelectTarget2 ---> |Cancel| PartnerMenu + + ChangePartner2 --> |Quick Change| PrepareMenu2 + ChangePartner2 --> EndPartner + + %% BATTLE END STATES + + EndDemo --> EndBattle + EndTraining --> EndBattle + + RunAway --------> EndBattle + RunAway --> |Failure| TransferTurn + + EnemiesDefeated --> Victory + Victory --> |Skip Celebration| EndBattle + Victory --> Celebration + Celebration --> |Possible Level Up| EndBattle + + PlayerDefeated ---> Defeat + Defeat --> EndBattle + + %% leave out all Peach-related complications + %% EndPlayer --> |PEACH| TransferTurn + %% BeginPlayer --> |PEACH| BeginPartner + %% BeginPartner --> |PEACH| BeginPlayer + %% PlayerMenu --> |PEACH| PeachMenu + %% PartnerMenu --> |PEACH| TwinkMenu + %% PeachMenu --> SelectTarget + %% TwinkMenu --> SelectTarget + %% TwinkMenu --> |Can't Act| EndPlayer +``` diff --git a/src/battle_ui_gfx.c b/src/battle_ui_gfx.c index 264fad65320..3013b7e6129 100644 --- a/src/battle_ui_gfx.c +++ b/src/battle_ui_gfx.c @@ -857,9 +857,9 @@ HudScript HES_AimBlinkA = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_Restart @@ -870,11 +870,11 @@ HudScript HES_AimBlinkB = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_Restart hs_End @@ -884,10 +884,10 @@ HudScript HES_AimBlinkC = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_Restart hs_End diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 0fa051447b6..197c38256f3 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -1032,7 +1032,7 @@ void filemenu_init(s32 mode) { for (i = 0; i < ARRAY_COUNT(filemenu_cursorHIDs); i++) { filemenu_cursorHIDs[i] = hud_element_create(filemenu_cursor_hudElemScripts[i]); - hud_element_set_flags(filemenu_cursorHIDs[i], HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(filemenu_cursorHIDs[i], HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); } filemenu_cursorHID = filemenu_cursorHIDs[0]; diff --git a/src/filemenu/filemenu_createfile.c b/src/filemenu/filemenu_createfile.c index 2d82882f879..3d543a91eff 100644 --- a/src/filemenu/filemenu_createfile.c +++ b/src/filemenu/filemenu_createfile.c @@ -347,7 +347,7 @@ void filemenu_choose_name_init(MenuPanel* menu) { for (i = 0; i < ARRAY_COUNT(filemenu_createfile_hudScripts); i++) { filemenu_createfile_HIDs[i] = hud_element_create(filemenu_createfile_hudScripts[i]); - hud_element_set_flags(filemenu_createfile_HIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(filemenu_createfile_HIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(filemenu_createfile_windowBPs); i++) { diff --git a/src/filemenu/filemenu_main.c b/src/filemenu/filemenu_main.c index e190d8a3d85..8785f9dd558 100644 --- a/src/filemenu/filemenu_main.c +++ b/src/filemenu/filemenu_main.c @@ -761,7 +761,7 @@ void filemenu_main_init(MenuPanel* menu) { for (i = 0; i < ARRAY_COUNT(filemenu_mainHIDs); i++) { filemenu_mainHIDs[i] = hud_element_create(filemenu_main_hudScripts[gCurrentLanguage][i]); - hud_element_set_flags(filemenu_mainHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(filemenu_mainHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(filemenu_main_windowBPs); i++) { diff --git a/src/filemenu/filemenu_selectlanguage.c b/src/filemenu/filemenu_selectlanguage.c index b1dd6eb3670..fb2e1badd14 100644 --- a/src/filemenu/filemenu_selectlanguage.c +++ b/src/filemenu/filemenu_selectlanguage.c @@ -209,7 +209,7 @@ void filemenu_selectlanguage_init(MenuPanel* menu) { for (i = 0; i < ARRAY_COUNT(PauseLanguageHudScripts); i++) { PauseLanguageHIDs[i] = hud_element_create(PauseLanguageHudScripts[i]); - hud_element_set_flags(PauseLanguageHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(PauseLanguageHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(D_filemenu_8024F1D8); i++) { diff --git a/src/global_hud_scripts.c b/src/global_hud_scripts.c index 1b95bd0651c..d0b949a8de0 100644 --- a/src/global_hud_scripts.c +++ b/src/global_hud_scripts.c @@ -1851,9 +1851,9 @@ HudScript HES_GreenArrowDown = { hs_SetVisible hs_SetCustomSize(16, 8) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(9, ui_green_arrow_down) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(6, ui_green_arrow_down) hs_Restart hs_End @@ -1863,9 +1863,9 @@ HudScript HES_GreenArrowUp = { hs_SetVisible hs_SetCustomSize(16, 8) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(9, ui_green_arrow_up) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(6, ui_green_arrow_up) hs_Restart hs_End @@ -2062,7 +2062,7 @@ HudScript HES_StatusCoin = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_op_15(0) + hs_SetVariable(0) hs_SetCI(3, ui_status_coin_0) hs_SetCI(3, ui_status_coin_1) hs_SetCI(3, ui_status_coin_4) @@ -2072,7 +2072,7 @@ HudScript HES_StatusCoin = { hs_SetCI(3, ui_status_coin_8) hs_SetCI(3, ui_status_coin_9) hs_RandomRestart(100, 70) - hs_op_15(1) + hs_SetVariable(1) hs_SetCI(3, ui_status_coin_0) hs_SetCI(2, ui_status_coin_1) hs_SetCI(1, ui_status_coin_2) @@ -2140,9 +2140,9 @@ HudScript HES_Peril = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_PERIL) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_peril) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_peril) hs_Restart hs_End @@ -2153,9 +2153,9 @@ HudScript HES_Danger = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_DANGER) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_danger) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_danger) hs_Restart hs_End @@ -2165,9 +2165,9 @@ HudScript HES_Refund = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_40x24) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(8, ui_battle_status_refund) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(4, ui_battle_status_refund) hs_Restart hs_End @@ -2184,9 +2184,9 @@ HudScript HES_Peril_de = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_PERIL) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_peril_de) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_peril_de) hs_Restart hs_End @@ -2197,9 +2197,9 @@ HudScript HES_Danger_de = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_DANGER) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_danger_de) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_danger_de) hs_Restart hs_End @@ -2209,9 +2209,9 @@ HudScript HES_Refund_de = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_40x24) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(8, ui_battle_status_refund_de) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(4, ui_battle_status_refund_de) hs_Restart hs_End @@ -2227,9 +2227,9 @@ HudScript HES_Peril_fr = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_PERIL) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_peril_fr) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_peril_fr) hs_Restart hs_End @@ -2240,9 +2240,9 @@ HudScript HES_Danger_fr = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_DANGER) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_danger_fr) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_danger_fr) hs_Restart hs_End @@ -2252,9 +2252,9 @@ HudScript HES_Refund_fr = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_40x24) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(8, ui_battle_status_refund_fr) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(4, ui_battle_status_refund_fr) hs_Restart hs_End @@ -2270,9 +2270,9 @@ HudScript HES_Peril_es = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_PERIL) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_peril_es) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_peril_es) hs_Restart hs_End @@ -2283,9 +2283,9 @@ HudScript HES_Danger_es = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_DANGER) - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(15, ui_battle_status_danger_es) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(10, ui_battle_status_danger_es) hs_Restart hs_End @@ -2295,9 +2295,9 @@ HudScript HES_Refund_es = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_40x24) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(8, ui_battle_status_refund_es) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(4, ui_battle_status_refund_es) hs_Restart hs_End diff --git a/src/hud_element.c b/src/hud_element.c index 00b72355734..480bf39cad5 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -165,7 +165,7 @@ void hud_element_load_script(HudElement* hudElement, HudScript* anim) { case HUD_ELEMENT_OP_AddTexelOffsetY: case HUD_ELEMENT_OP_SetScale: case HUD_ELEMENT_OP_SetAlpha: - case HUD_ELEMENT_OP_op_15: + case HUD_ELEMENT_OP_SetVariable: case HUD_ELEMENT_OP_RandomBranch: case HUD_ELEMENT_OP_SetFlags: case HUD_ELEMENT_OP_ClearFlags: @@ -782,9 +782,9 @@ void update_hud_elements(void) { if (elem->updateTimer == 0) { while (hud_element_update(elem) != 0); } - if (elem->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { - elem->unkImgScale[0] += elem->deltaSizeX; - elem->unkImgScale[1] += elem->deltaSizeY; + if (elem->flags & HUD_ELEMENT_FLAG_RESIZING) { + elem->dynamicSize[0] += elem->deltaSizeX; + elem->dynamicSize[1] += elem->deltaSizeY; } i++; } else { @@ -857,7 +857,7 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->imageAddr += hudElement->memOffset; } - if (hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { + if (hudElement->flags & HUD_ELEMENT_FLAG_RESIZING) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; @@ -872,16 +872,16 @@ s32 hud_element_update(HudElement* hudElement) { drawHeight = hudElement->customDrawSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAG_200)) { - hudElement->flags |= HUD_ELEMENT_FLAG_200; - hudElement->unkImgScale[0] = imageWidth; - hudElement->unkImgScale[1] = imageHeight; + if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZE_DIR)) { + hudElement->flags |= HUD_ELEMENT_FLAG_RESIZE_DIR; + hudElement->dynamicSize[0] = imageWidth; + hudElement->dynamicSize[1] = imageHeight; hudElement->deltaSizeX = ((f32)drawWidth - (f32)imageWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)drawHeight - (f32)imageHeight) / (f32)hudElement->updateTimer; } else { - hudElement->flags &= ~HUD_ELEMENT_FLAG_200; - hudElement->unkImgScale[0] = drawWidth; - hudElement->unkImgScale[1] = drawHeight; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZE_DIR; + hudElement->dynamicSize[0] = drawWidth; + hudElement->dynamicSize[1] = drawHeight; hudElement->deltaSizeX = ((f32)imageWidth - (f32)drawWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)imageHeight - (f32)drawHeight) / (f32)hudElement->updateTimer; } @@ -898,7 +898,7 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->paletteAddr += hudElement->memOffset; } - if (hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { + if (hudElement->flags & HUD_ELEMENT_FLAG_RESIZING) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; @@ -913,16 +913,16 @@ s32 hud_element_update(HudElement* hudElement) { drawHeight = hudElement->customDrawSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAG_200)) { - hudElement->flags |= HUD_ELEMENT_FLAG_200; - hudElement->unkImgScale[0] = imageWidth; - hudElement->unkImgScale[1] = imageHeight; + if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZE_DIR)) { + hudElement->flags |= HUD_ELEMENT_FLAG_RESIZE_DIR; + hudElement->dynamicSize[0] = imageWidth; + hudElement->dynamicSize[1] = imageHeight; hudElement->deltaSizeX = ((f32)drawWidth - (f32)imageWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)drawHeight - (f32)imageHeight) / (f32)hudElement->updateTimer; } else { - hudElement->flags &= ~HUD_ELEMENT_FLAG_200; - hudElement->unkImgScale[0] = drawWidth; - hudElement->unkImgScale[1] = drawHeight; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZE_DIR; + hudElement->dynamicSize[0] = drawWidth; + hudElement->dynamicSize[1] = drawHeight; hudElement->deltaSizeX = ((f32)imageWidth - (f32)drawWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)imageHeight - (f32)drawHeight) / (f32)hudElement->updateTimer; } @@ -961,7 +961,7 @@ s32 hud_element_update(HudElement* hudElement) { nextPos += 3; hudElement->readPos = (HudScript*)nextPos; - if (hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { + if (hudElement->flags & HUD_ELEMENT_FLAG_RESIZING) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; @@ -976,16 +976,16 @@ s32 hud_element_update(HudElement* hudElement) { drawHeight = hudElement->customDrawSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAG_200)) { - hudElement->flags |= HUD_ELEMENT_FLAG_200; - hudElement->unkImgScale[0] = imageWidth; - hudElement->unkImgScale[1] = imageHeight; + if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZE_DIR)) { + hudElement->flags |= HUD_ELEMENT_FLAG_RESIZE_DIR; + hudElement->dynamicSize[0] = imageWidth; + hudElement->dynamicSize[1] = imageHeight; hudElement->deltaSizeX = ((f32)drawWidth - (f32)imageWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)drawHeight - (f32)imageHeight) / (f32)hudElement->updateTimer; } else { - hudElement->flags &= ~HUD_ELEMENT_FLAG_200; - hudElement->unkImgScale[0] = drawWidth; - hudElement->unkImgScale[1] = drawHeight; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZE_DIR; + hudElement->dynamicSize[0] = drawWidth; + hudElement->dynamicSize[1] = drawHeight; hudElement->deltaSizeX = ((f32)imageWidth - (f32)drawWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)imageHeight - (f32)drawHeight) / (f32)hudElement->updateTimer; } @@ -1014,7 +1014,7 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->readPos = (HudScript*)nextPos; hudElement->drawSizePreset = sizePreset; hudElement->tileSizePreset = sizePreset; - hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZING; hudElement->flags &= ~HUD_ELEMENT_FLAG_REPEATED; return true; case HUD_ELEMENT_OP_SetSizesAutoScale: @@ -1039,7 +1039,7 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->widthScale = X10(xScaled); hudElement->heightScale = X10(yScaled); - hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZING; hudElement->flags |= HUD_ELEMENT_FLAG_REPEATED; return true; case HUD_ELEMENT_OP_SetSizesFixedScale: @@ -1051,9 +1051,9 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->readPos = (HudScript*)nextPos; hudElement->tileSizePreset = tileSizePreset; hudElement->drawSizePreset = drawSizePreset; - hudElement->flags |= HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags |= HUD_ELEMENT_FLAG_RESIZING; hudElement->flags &= ~HUD_ELEMENT_FLAG_REPEATED; - hudElement->flags &= ~HUD_ELEMENT_FLAG_200; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZE_DIR; return true; case HUD_ELEMENT_OP_AddTexelOffsetX: s1 = *nextPos++; @@ -1109,7 +1109,7 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->heightScale = X10(yScaled); hudElement->readPos = (HudScript*)nextPos; - hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZING; hudElement->flags |= HUD_ELEMENT_FLAG_REPEATED | HUD_ELEMENT_FLAG_SCALED; return true; case HUD_ELEMENT_OP_SetAlpha: @@ -1135,14 +1135,14 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->heightScale = X10(1); hudElement->drawSizePreset = 0; hudElement->tileSizePreset = 0; - hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZING; hudElement->flags &= ~HUD_ELEMENT_FLAG_REPEATED; hudElement->flags |= HUD_ELEMENT_FLAG_CUSTOM_SIZE; return true; - case HUD_ELEMENT_OP_op_15: + case HUD_ELEMENT_OP_SetVariable: s1 = *nextPos++; hudElement->readPos = (HudScript*)nextPos; - hudElement->flags &= ~(HUD_ELEMENT_FLAG_1000000 | HUD_ELEMENT_FLAG_2000000 | HUD_ELEMENT_FLAG_4000000 | HUD_ELEMENT_FLAG_8000000); + hudElement->flags &= ~HUD_ELEMENT_VARIABLE_MASK; hudElement->flags |= s1 << 24; return true; case HUD_ELEMENT_OP_RandomBranch: @@ -1195,7 +1195,7 @@ void render_hud_elements_backUI(void) { if (hudElement != nullptr) { s32 flags = hudElement->flags; if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000 | HUD_ELEMENT_FLAG_40000000))) { + if (!(flags & (HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_HIDDEN | HUD_ELEMENT_FLAG_BATTLE_CAM))) { if (!(flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0) { sortedElements[count++] = i; } @@ -1222,7 +1222,7 @@ void render_hud_elements_backUI(void) { break; } - if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZING)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; @@ -1276,11 +1276,11 @@ void render_hud_elements_backUI(void) { texSizeY = hudElement->customImageSize.y; } - drawSizeX = hudElement->unkImgScale[0]; - drawSizeY = hudElement->unkImgScale[1]; + drawSizeX = hudElement->dynamicSize[0]; + drawSizeY = hudElement->dynamicSize[1]; - offsetX = -hudElement->unkImgScale[0] / 2; - offsetY = -hudElement->unkImgScale[1] / 2; + offsetX = -hudElement->dynamicSize[0] / 2; + offsetY = -hudElement->dynamicSize[1] / 2; xScaled = (f32) drawSizeX / (f32) texSizeX; yScaled = (f32) drawSizeY / (f32) texSizeY; @@ -1315,7 +1315,7 @@ void render_hud_elements_frontUI(void) { if (hudElement != nullptr) { s32 flags = hudElement->flags; if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { + if (!(flags & (HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_HIDDEN))) { if ((flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0) { sortedElements[count++] = i; } @@ -1337,7 +1337,7 @@ void render_hud_elements_frontUI(void) { for (i = 0; i < count; i++) { hudElement = (*gHudElements)[sortedElements[i]]; - if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZING)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; @@ -1391,11 +1391,11 @@ void render_hud_elements_frontUI(void) { texSizeY = hudElement->customImageSize.y; } - drawSizeX = hudElement->unkImgScale[0]; - drawSizeY = hudElement->unkImgScale[1]; + drawSizeX = hudElement->dynamicSize[0]; + drawSizeY = hudElement->dynamicSize[1]; - offsetX = -hudElement->unkImgScale[0] / 2; - offsetY = -hudElement->unkImgScale[1] / 2; + offsetX = -hudElement->dynamicSize[0] / 2; + offsetY = -hudElement->dynamicSize[1] / 2; xScaled = (f32) drawSizeX / (f32) texSizeX; yScaled = (f32) drawSizeY / (f32) texSizeY; @@ -1444,7 +1444,7 @@ void render_hud_element(HudElement* hudElement) { gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } - if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZING)) { xScaleFactor = 1.0f; yScaleFactor = 1.0f; } else { @@ -1455,9 +1455,9 @@ void render_hud_element(HudElement* hudElement) { xScaleFactor = hudElement->customImageSize.x; yScaleFactor = hudElement->customImageSize.y; } - xScaleFactor /= hudElement->unkImgScale[0]; + xScaleFactor /= hudElement->dynamicSize[0]; xScaleFactor = 1.0f / xScaleFactor; - yScaleFactor /= hudElement->unkImgScale[1]; + yScaleFactor /= hudElement->dynamicSize[1]; yScaleFactor = 1.0f / yScaleFactor; } @@ -1551,12 +1551,12 @@ void render_hud_element(HudElement* hudElement) { } break; case 2: - transform->unk_30[D_80159180].vtx[0] = D_8014F0C8[0]; - transform->unk_30[D_80159180].vtx[1] = D_8014F0C8[1]; - transform->unk_30[D_80159180].vtx[2] = D_8014F0C8[2]; - transform->unk_30[D_80159180].vtx[3] = D_8014F0C8[3]; + transform->quadBuffers[D_80159180].vtx[0] = D_8014F0C8[0]; + transform->quadBuffers[D_80159180].vtx[1] = D_8014F0C8[1]; + transform->quadBuffers[D_80159180].vtx[2] = D_8014F0C8[2]; + transform->quadBuffers[D_80159180].vtx[3] = D_8014F0C8[3]; - vtx2 = transform->unk_30[D_80159180].vtx; + vtx2 = transform->quadBuffers[D_80159180].vtx; vtx = vtx2; vtx2->v.ob[0] = -width / 2; @@ -1605,7 +1605,7 @@ void render_hud_element(HudElement* hudElement) { G_TX_NOLOD, G_TX_NOLOD); gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); - gSPVertex(gMainGfxPos++, &transform->unk_30[D_80159180], 4, 0); + gSPVertex(gMainGfxPos++, &transform->quadBuffers[D_80159180], 4, 0); gSP1Triangle(gMainGfxPos++, 0, 1, 2, 0); gSP1Triangle(gMainGfxPos++, 0, 2, 3, 0); break; @@ -1640,7 +1640,7 @@ void render_transformed_hud_elements(void) { continue; } - if (flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) { + if (flags & (HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_HIDDEN)) { continue; } @@ -1648,11 +1648,11 @@ void render_transformed_hud_elements(void) { continue; } - if (flags & HUD_ELEMENT_FLAG_40000000) { + if (flags & HUD_ELEMENT_FLAG_BATTLE_CAM) { continue; } - if (flags & HUD_ELEMENT_FLAG_FRONTUI || hudElement->drawSizePreset < 0 || flags & HUD_ELEMENT_FLAG_80) { + if (flags & HUD_ELEMENT_FLAG_FRONTUI || hudElement->drawSizePreset < 0 || flags & HUD_ELEMENT_FLAG_MANUAL_RENDER) { continue; } @@ -1702,7 +1702,7 @@ void render_transformed_hud_elements(void) { continue; } - if (flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) { + if (flags & (HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_HIDDEN)) { continue; } @@ -1711,11 +1711,11 @@ void render_transformed_hud_elements(void) { } // different from CAM_HUD pass - if (!(flags & HUD_ELEMENT_FLAG_40000000)) { + if (!(flags & HUD_ELEMENT_FLAG_BATTLE_CAM)) { continue; } - if (flags & HUD_ELEMENT_FLAG_FRONTUI || hudElement->drawSizePreset < 0 || flags & HUD_ELEMENT_FLAG_80) { + if (flags & HUD_ELEMENT_FLAG_FRONTUI || hudElement->drawSizePreset < 0 || flags & HUD_ELEMENT_FLAG_MANUAL_RENDER) { continue; } @@ -1824,7 +1824,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { return; } - if (elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) { + if (elem->flags & (HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_HIDDEN)) { return; } @@ -1832,7 +1832,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { return; } - if (elem->flags & HUD_ELEMENT_FLAG_FRONTUI || elem->drawSizePreset < 0 || !(elem->flags & HUD_ELEMENT_FLAG_80)) { + if (elem->flags & HUD_ELEMENT_FLAG_FRONTUI || elem->drawSizePreset < 0 || !(elem->flags & HUD_ELEMENT_FLAG_MANUAL_RENDER)) { return; } @@ -1864,7 +1864,7 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { s32 preset; if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAG_DISABLED)) { - if (!(elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) && (elem->drawSizePreset >= 0)) { + if (!(elem->flags & (HUD_ELEMENT_FLAG_INVISIBLE | HUD_ELEMENT_FLAG_HIDDEN)) && (elem->drawSizePreset >= 0)) { if (clipMode != HUD_ELEMENT_DRAW_NEXT) { if (clipMode == HUD_ELEMENT_DRAW_FIRST_WITH_CLIPPING) { gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); @@ -1883,7 +1883,7 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); } - if (!(elem->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_RESIZING)) { if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { preset = elem->tileSizePreset; texSizeX = gHudElementSizes[preset].width; @@ -1934,11 +1934,11 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { texSizeY = elem->customImageSize.y; } - drawSizeX = elem->unkImgScale[0]; - drawSizeY = elem->unkImgScale[1]; + drawSizeX = elem->dynamicSize[0]; + drawSizeY = elem->dynamicSize[1]; - offsetX = -elem->unkImgScale[0] / 2; - offsetY = -elem->unkImgScale[1] / 2; + offsetX = -elem->dynamicSize[0] / 2; + offsetY = -elem->dynamicSize[1] / 2; xScaled = (f32) drawSizeX / (f32) texSizeX; yScaled = (f32) drawSizeY / (f32) texSizeY; @@ -1989,7 +1989,7 @@ void hud_element_set_script(s32 id, HudScript* anim) { hudElement->worldPosOffset.y = 0; hudElement->flags &= ~HUD_ELEMENT_FLAG_ANIMATION_FINISHED; hudElement->uniformScale = 1.0f; - hudElement->flags &= ~(HUD_ELEMENT_FLAG_SCALED | HUD_ELEMENT_FLAG_TRANSPARENT | HUD_ELEMENT_FLAG_FIXEDSCALE | HUD_ELEMENT_FLAG_REPEATED); + hudElement->flags &= ~(HUD_ELEMENT_FLAG_SCALED | HUD_ELEMENT_FLAG_TRANSPARENT | HUD_ELEMENT_FLAG_RESIZING | HUD_ELEMENT_FLAG_REPEATED); hud_element_load_script(hudElement, anim); while (hud_element_update(hudElement) != 0) {} @@ -2101,7 +2101,7 @@ void hud_element_set_scale(s32 index, f32 scale) { } elem->sizeX = drawSizeX * scale; elem->sizeY = drawSizeY * scale; - elem->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + elem->flags &= ~HUD_ELEMENT_FLAG_RESIZING; elem->flags |= HUD_ELEMENT_FLAG_REPEATED | HUD_ELEMENT_FLAG_SCALED; xScaled = ((f32) drawSizeX / (f32) imgSizeX) * scale; @@ -2122,7 +2122,7 @@ void hud_element_use_preset_size(s32 id, s8 sizePreset) { hudElement->tileSizePreset = sizePreset; hudElement->drawSizePreset = sizePreset; hudElement->uniformScale = 1.0f; - hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_RESIZING; hudElement->flags &= ~(HUD_ELEMENT_FLAG_SCALED | HUD_ELEMENT_FLAG_REPEATED); } @@ -2133,7 +2133,7 @@ s32 func_80144E4C(s32 id) { void func_80144E74(s32 id, s32 arg1) { HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; - hudElement->flags &= ~(HUD_ELEMENT_FLAG_1000000 | HUD_ELEMENT_FLAG_2000000 | HUD_ELEMENT_FLAG_4000000 | HUD_ELEMENT_FLAG_8000000); + hudElement->flags &= ~HUD_ELEMENT_VARIABLE_MASK; hudElement->flags |= arg1 << 24; } @@ -2204,7 +2204,7 @@ void hud_element_create_transform_C(s32 id) { element->hudTransform = transform; ASSERT(transform != nullptr); - element->flags |= HUD_ELEMENT_FLAG_40000000 | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM; + element->flags |= HUD_ELEMENT_FLAG_BATTLE_CAM | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM; transform->imgfxIdx = 0; transform->pos.x = 0.0f; transform->pos.y = 0.0f; @@ -2228,7 +2228,7 @@ void hud_element_free_transform(s32 id) { heap_free(hudElement->hudTransform); hudElement->hudTransform = nullptr; - hudElement->flags &= ~(HUD_ELEMENT_FLAG_40000000 | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM); + hudElement->flags &= ~(HUD_ELEMENT_FLAG_BATTLE_CAM | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM); } void hud_element_set_transform_pos(s32 id, f32 x, f32 y, f32 z) { diff --git a/src/hud_element.h b/src/hud_element.h index 069a834ed95..3fa1be70ee8 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -30,7 +30,7 @@ enum { HUD_ELEMENT_OP_UseIA8, HUD_ELEMENT_OP_SetCustomSize, HUD_ELEMENT_OP_RandomRestart, - HUD_ELEMENT_OP_op_15, + HUD_ELEMENT_OP_SetVariable, HUD_ELEMENT_OP_op_16, HUD_ELEMENT_OP_RandomBranch, HUD_ELEMENT_OP_SetFlags, @@ -71,13 +71,13 @@ enum HudElementFlags { HUD_ELEMENT_FLAG_INITIALIZED = 0x00000001, HUD_ELEMENT_FLAG_DISABLED = 0x00000002, HUD_ELEMENT_FLAG_ANIMATION_FINISHED = 0x00000004, - HUD_ELEMENT_FLAG_8 = 0x00000008, + HUD_ELEMENT_FLAG_8 = 0x00000008, // unused HUD_ELEMENT_FLAG_SCALED = 0x00000010, HUD_ELEMENT_FLAG_TRANSPARENT = 0x00000020, HUD_ELEMENT_FLAG_FRONTUI = 0x00000040, - HUD_ELEMENT_FLAG_80 = 0x00000080, - HUD_ELEMENT_FLAG_FIXEDSCALE = 0x00000100, - HUD_ELEMENT_FLAG_200 = 0x00000200, + HUD_ELEMENT_FLAG_MANUAL_RENDER = 0x00000080, // user has responsibility for rendering + HUD_ELEMENT_FLAG_RESIZING = 0x00000100, + HUD_ELEMENT_FLAG_RESIZE_DIR = 0x00000200, HUD_ELEMENT_FLAG_BATTLE = 0x00000400, HUD_ELEMENT_FLAG_REPEATED = 0x00000800, HUD_ELEMENT_FLAG_FLIPX = 0x00001000, @@ -89,17 +89,13 @@ enum HudElementFlags { HUD_ELEMENT_FLAG_DELETE = 0x00040000, HUD_ELEMENT_FLAG_FMT_IA8 = 0x00080000, HUD_ELEMENT_FLAG_CUSTOM_SIZE = 0x00100000, - HUD_ELEMENT_FLAG_200000 = 0x00200000, + HUD_ELEMENT_FLAG_INVISIBLE = 0x00200000, // do not render HUD_ELEMENT_FLAG_MEMOFFSET = 0x00400000, HUD_ELEMENT_FLAG_ANTIALIASING = 0x00800000, - HUD_ELEMENT_FLAG_1000000 = 0x01000000, - HUD_ELEMENT_FLAG_2000000 = 0x02000000, - HUD_ELEMENT_FLAG_4000000 = 0x04000000, - HUD_ELEMENT_FLAG_8000000 = 0x08000000, - HUD_ELEMENT_FLAG_10000000 = 0x10000000, + HUD_ELEMENT_VARIABLE_MASK = 0x0F000000, // users and scripts can read/write a value at this nibble + HUD_ELEMENT_FLAG_HIDDEN = 0x10000000, // same effect as HUD_ELEMENT_FLAG_INVISIBLE, allows two independent controls over visiblity HUD_ELEMENT_FLAG_DROP_SHADOW = 0x20000000, - HUD_ELEMENT_FLAG_40000000 = 0x40000000, - HUD_ELEMENT_FLAG_80000000 = 0x80000000, + HUD_ELEMENT_FLAG_BATTLE_CAM = 0x40000000, }; enum { @@ -174,7 +170,7 @@ typedef struct HudTransform { /* 0x10 */ Vec3f rot; /* 0x1C */ Vec3f scale; /* 0x28 */ Vec2s pivot; - /* 0x30 */ VtxRect unk_30[3]; + /* 0x30 */ VtxRect quadBuffers[3]; } HudTransform; // size = 0xF0 typedef struct HudElement { @@ -182,13 +178,13 @@ typedef struct HudElement { /* 0x04 */ HudScript* readPos; /* 0x08 */ HudScript* anim; /* 0x0C */ HudScript* loopStartPos; - /* 0x10 */ u8* imageAddr; + /* 0x10 */ IMG_PTR imageAddr; /* 0x14 */ u8* paletteAddr; /* 0x18 */ s32 memOffset; /* 0x1C */ HudTransform* hudTransform; /* 0x20 */ f32 deltaSizeX; /* 0x24 */ f32 deltaSizeY; - /* 0x28 */ f32 unkImgScale[2]; + /* 0x28 */ f32 dynamicSize[2]; /* 0x30 */ f32 uniformScale; /* 0x34 */ s32 widthScale; ///< X10 /* 0x38 */ s32 heightScale; ///< X10 @@ -257,7 +253,7 @@ extern HudScript* wPartnerHudScripts[]; /// Restarts the loop if cutoff < rand_int(max) #define hs_RandomRestart(max, cutoff) HUD_ELEMENT_OP_RandomRestart, max, cutoff, -#define hs_op_15(arg0) HUD_ELEMENT_OP_op_15, arg0, +#define hs_SetVariable(arg0) HUD_ELEMENT_OP_SetVariable, arg0, #define hs_RandomBranch(args...) HUD_ELEMENT_OP_RandomBranch, (sizeof((s32[]){args})/sizeof(s32)), args, #define hs_SetFlags(arg0) HUD_ELEMENT_OP_SetFlags, arg0, #define hs_ClearFlags(arg0) HUD_ELEMENT_OP_ClearFlags, arg0, @@ -395,7 +391,7 @@ extern HudScript* wPartnerHudScripts[]; hs_SetVisible \ hs_SetTileSize(HUD_ELEMENT_SIZE_24x24) \ hs_Loop \ - hs_op_15(0) \ + hs_SetVariable(0) \ hs_SetIcon(3, anim_coin_0) \ hs_SetIcon(3, anim_coin_1) \ hs_SetIcon(3, anim_coin_4) \ @@ -405,7 +401,7 @@ extern HudScript* wPartnerHudScripts[]; hs_SetIcon(3, anim_coin_8) \ hs_SetIcon(3, anim_coin_9) \ hs_RandomRestart(100, 70) \ - hs_op_15(1) \ + hs_SetVariable(1) \ hs_SetIcon(3, anim_coin_0) \ hs_SetIcon(2, anim_coin_1) \ hs_SetIcon(1, anim_coin_2) \ diff --git a/src/inventory.c b/src/inventory.c index e6f3e470098..3e703abc2b0 100644 --- a/src/inventory.c +++ b/src/inventory.c @@ -57,7 +57,7 @@ void clear_player_data(void) { ShowingCoinCounter = false; HidingCoinCounter = false; - playerData->hammerLevel = -1; + playerData->hammerLevel = GEAR_RANK_NONE; playerData->curHP = 10; playerData->curMaxHP = 10; playerData->hardMaxHP = 10; @@ -66,7 +66,7 @@ void clear_player_data(void) { playerData->hardMaxFP = 5; playerData->maxBP = 3; playerData->level = 1; - playerData->bootsLevel = 0; + playerData->bootsLevel = GEAR_RANK_NORMAL; playerData->hasActionCommands = false; playerData->coins = 0; playerData->fortressKeyCount = 0; @@ -386,16 +386,16 @@ void initialize_status_bar(void) { break; } - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); #else statusBar->hpIconHIDs[0] = hid = hud_element_create(&HES_StatusHP); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); #endif statusBar->hpIconHIDs[1] = hid = hud_element_create(&HES_StatusHeart); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); #if VERSION_PAL @@ -414,52 +414,52 @@ void initialize_status_bar(void) { break; } - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); #else statusBar->fpIconHIDs[0] = hid = hud_element_create(&HES_StatusFP); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); #endif statusBar->fpIconHIDs[1] = hid = hud_element_create(&HES_StatusFlower); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->coinIconHID = hid = hud_element_create(&HES_StatusCoin); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->coinSparkleHID = hid = hud_element_create(&HES_Item_CoinSparkleRandom); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->spIconHID = hid = hud_element_create(&HES_StatusStarPoint); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->spShineHID = hid = hud_element_create(&HES_StatusSPShine); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->hpTimesHID = hid = hud_element_create(&HES_StatusTimes); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->fpTimesHID = hid = hud_element_create(&HES_StatusTimes); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->spTimesHID = hid = hud_element_create(&HES_StatusTimes); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->coinTimesHID = hid = hud_element_create(&HES_StatusTimes); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); statusBar->starIconHID = hid = hud_element_create(&HES_StatusStar1); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); star_power_shimmer_init(); @@ -1225,10 +1225,10 @@ void show_coin_counter(void) { set_window_properties(WIN_CURRENCY_COUNTER, 32, 164, 64, 20, WINDOW_PRIORITY_21, coin_counter_draw_content, 0, -1); set_window_update(WIN_CURRENCY_COUNTER, (s32)basic_window_update); statusBar->coinCountTimesHID = hid = hud_element_create(&HES_MenuTimes); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); statusBar->coinCountIconHID = hid = hud_element_create(&HES_StatusCoin); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hid, 255, 255, 255); statusBar->coinCounterHideDelay = 0; diff --git a/src/item_entity.c b/src/item_entity.c index 8e838e355c1..0eaeed1d56a 100644 --- a/src/item_entity.c +++ b/src/item_entity.c @@ -2153,7 +2153,7 @@ void update_item_entity_pickup(ItemEntity* item) { } ItemPickupIconHID = hud_element_create(gItemHudScripts[gItemTable[item->itemID].hudElemID].enabled); - hud_element_set_flags(ItemPickupIconHID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(ItemPickupIconHID, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(ItemPickupIconHID, -100, -100); item->state = ITEM_PICKUP_STATE_SHOW_GOT_ITEM; diff --git a/src/menu_hud_scripts.c b/src/menu_hud_scripts.c index 2583d1c6d21..ad9581ca5ab 100644 --- a/src/menu_hud_scripts.c +++ b/src/menu_hud_scripts.c @@ -292,9 +292,9 @@ HudScript HES_FilenameCaret = { hs_SetVisible hs_SetCustomSize(16, 16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(9, ui_files_filename_caret) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(6, ui_files_filename_caret) hs_Restart hs_End @@ -458,9 +458,9 @@ HudScript HES_DescMsgPrev = { hs_SetVisible hs_SetCustomSize(16, 16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(9, ui_pause_desc_msg_prev) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(6, ui_pause_desc_msg_prev) hs_Restart hs_End @@ -470,9 +470,9 @@ HudScript HES_DescMsgNext = { hs_SetVisible hs_SetCustomSize(16, 16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAG_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(9, ui_pause_desc_msg_next) - hs_SetFlags(HUD_ELEMENT_FLAG_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_INVISIBLE) hs_SetCI(6, ui_pause_desc_msg_next) hs_Restart hs_End diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c index 861877e6207..2430c9c07f8 100644 --- a/src/pause/pause_badges.c +++ b/src/pause/pause_badges.c @@ -970,7 +970,7 @@ void pause_badges_init(MenuPanel* panel) { for (i = 0; i < ARRAY_COUNT(gPauseBadgesIconIDs); i++) { gPauseBadgesIconIDs[i] = hud_element_create(gPauseBadgesElements[gCurrentLanguage][i]); - hud_element_set_flags(gPauseBadgesIconIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPauseBadgesIconIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(gPauseBadgesWindowBPs); i++) { diff --git a/src/pause/pause_items.c b/src/pause/pause_items.c index d56e8029918..a947cc96ea5 100644 --- a/src/pause/pause_items.c +++ b/src/pause/pause_items.c @@ -540,7 +540,7 @@ void pause_items_init(MenuPanel* panel) { for (i = 0; i < ARRAY_COUNT(gPauseItemsHIDs); i++) { gPauseItemsHIDs[i] = hud_element_create(gPauseItemsHudScripts[i]); - hud_element_set_flags(gPauseItemsHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPauseItemsHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(gPauseItemsWindowBPs); i++) { diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index f94cf61c7e2..cf4fa9200f6 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -623,9 +623,9 @@ void pause_init(void) { for (i = 0; i < ARRAY_COUNT(gPauseHudScripts); i++) { gPauseCommonHIDs[i] = hud_element_create(gPauseHudScripts[i]); if (gPauseHudScripts[i] == &HES_AnimatedCursorHand) { - hud_element_set_flags(gPauseCommonHIDs[i], HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPauseCommonHIDs[i], HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); } else { - hud_element_set_flags(gPauseCommonHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPauseCommonHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } } diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c index 54f85fae812..162ca5c7b7b 100644 --- a/src/pause/pause_map.c +++ b/src/pause/pause_map.c @@ -327,7 +327,7 @@ void pause_map_init(MenuPanel* tab) { for (i = 0; i < ARRAY_COUNT(PauseMapHudScripts); i++) { PauseMapHIDs[i] = hud_element_create(PauseMapHudScripts[i]); - hud_element_set_flags(PauseMapHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(PauseMapHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(PauseMapWindowBPs); i++) { diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index 98929f9fa55..19667761ffc 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -647,7 +647,7 @@ void pause_partners_init(MenuPanel* panel) { for (i = 0; i < ARRAY_COUNT(gPausePartnersHudScripts[0]); i++) { gPausePartnersHIDs[i] = hud_element_create(gPausePartnersHudScripts[gCurrentLanguage][i]); - hud_element_set_flags(gPausePartnersHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPausePartnersHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(gPausePartnersWindowBPs); i++) { diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index 94d5145ce5a..89a47618151 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -695,7 +695,7 @@ void pause_stats_init(MenuPanel* panel) { for (i = 0; i < ARRAY_COUNT(gPauseStatsIconIDs); i++) { gPauseStatsIconIDs[i] = hud_element_create(gStatsMenuElements[i]); - hud_element_set_flags(gPauseStatsIconIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPauseStatsIconIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(gStatsMenuWindowBPs); i++) { diff --git a/src/pause/pause_tabs.c b/src/pause/pause_tabs.c index edf9c3a5d87..7bacfe0bff9 100644 --- a/src/pause/pause_tabs.c +++ b/src/pause/pause_tabs.c @@ -385,7 +385,7 @@ void pause_tabs_init(MenuPanel* tab) { for (i = 0; i < ARRAY_COUNT(gPauseTabsHudScripts[0]); i++) { gPauseTabsHIDs[i] = hud_element_create(gPauseTabsHudScripts[gCurrentLanguage][i]); - hud_element_set_flags(gPauseTabsHIDs[i], HUD_ELEMENT_FLAG_80); + hud_element_set_flags(gPauseTabsHIDs[i], HUD_ELEMENT_FLAG_MANUAL_RENDER); } for (i = 0; i < ARRAY_COUNT(gPauseTabsWindowBPs); i++) { diff --git a/src/state_intro.c b/src/state_intro.c index 26e7b00fa45..f886e4617f4 100644 --- a/src/state_intro.c +++ b/src/state_intro.c @@ -202,8 +202,8 @@ void state_step_intro(void) { playerData->curMaxFP = 5; playerData->hardMaxFP = 5; playerData->maxBP = 2; - playerData->bootsLevel = 0; - playerData->hammerLevel = -1; + playerData->bootsLevel = GEAR_RANK_NORMAL; + playerData->hammerLevel = GEAR_RANK_NONE; playerData->fortressKeyCount = 0; playerData->level = 0; diff --git a/src/status_icons.c b/src/status_icons.c index d57e44cf800..c7b5e8be765 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -401,7 +401,7 @@ void update_all_status_icons(void* data) { break; } hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_MANUAL_RENDER); icon->status1.activeTask = STATUS_ICON_TASK_DRAW; } @@ -465,7 +465,7 @@ void update_all_status_icons(void* data) { } hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_MANUAL_RENDER); icon->status2.activeTask = STATUS_ICON_TASK_DRAW; } @@ -507,7 +507,7 @@ void update_all_status_icons(void* data) { } hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_MANUAL_RENDER); icon->status3.activeTask = STATUS_ICON_TASK_DRAW; } @@ -541,7 +541,7 @@ void update_all_status_icons(void* data) { if (icon->status4.activeTask == STATUS_ICON_TASK_LOAD) { elementID = icon->status4.activeElementHID = hud_element_create(&HES_WeakenedBegin); hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_MANUAL_RENDER); icon->status4.activeTask = STATUS_ICON_TASK_DRAW; } @@ -1187,7 +1187,7 @@ void create_status_icon_boost_jump(s32 iconID) { statusIcon->boostJump.active = true; hid = hud_element_create(&HES_BoostJumpBegin); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); statusIcon->boostJump.activeElementID = hid; } } @@ -1219,7 +1219,7 @@ void create_status_icon_boost_hammer(s32 iconID) { statusIcon->boostHammer.active = true; hid = hud_element_create(&HES_BoostHammerBegin); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); statusIcon->boostHammer.activeElementID = hid; } } @@ -1251,7 +1251,7 @@ void create_status_icon_boost_partner(s32 iconID) { statusIcon->boostPartner.active = true; hid = hud_element_create(&HES_BoostPartner); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); statusIcon->boostPartner.activeElementID = hid; } } @@ -1280,7 +1280,7 @@ void create_status_icon_surprise(s32 iconID) { statusIcon->surprise.active = true; hid = hud_element_create(&HES_Surprise); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); statusIcon->surprise.activeElementID = hid; } } @@ -1326,7 +1326,7 @@ void create_status_icon_peril(s32 iconID) { hid = hud_element_create(&HES_Peril); #endif hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); statusIcon->peril.activeElementID = hid; } } @@ -1372,7 +1372,7 @@ void create_status_icon_danger(s32 iconID) { hid = hud_element_create(&HES_Danger); #endif hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); statusIcon->danger.activeElementID = hid; } } diff --git a/src/world/area_kkj/kkj_19/baking.c b/src/world/area_kkj/kkj_19/baking.c index 9c2186a204c..a0a5516de75 100644 --- a/src/world/area_kkj/kkj_19/baking.c +++ b/src/world/area_kkj/kkj_19/baking.c @@ -93,13 +93,13 @@ API_CALLABLE(N(RunMixingMinigame)) { N(MixingGameHudElems)[0] = hid; hud_element_set_render_pos(hid, N(MixingGameUIBaseX), N(MixingGameUIBaseY)); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = hud_element_create(&HES_BlueMeter); N(MixingGameHudElems)[1] = hid; hud_element_set_render_pos(hid, N(MixingGameUIBaseX), N(MixingGameUIBaseY) + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); hid = N(MixingGameHudElems)[0]; hud_element_set_alpha(hid, 255); diff --git a/src/world/area_mgm/mgm_01/npc.c b/src/world/area_mgm/mgm_01/npc.c index a5b27c9dba5..85ee8871f44 100644 --- a/src/world/area_mgm/mgm_01/npc.c +++ b/src/world/area_mgm/mgm_01/npc.c @@ -634,7 +634,7 @@ API_CALLABLE(N(CreateMinigame)) { hid = hud_element_create(&HES_StatusCoin); data->hudElemID = hid; - hud_element_set_flags(data->hudElemID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(data->hudElemID, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(data->hudElemID, 255, 255, 255); data->scoreWindowPosX = SCREEN_WIDTH + 1; diff --git a/src/world/area_mgm/mgm_02/npc.c b/src/world/area_mgm/mgm_02/npc.c index 09c48e35060..03c3bf66281 100644 --- a/src/world/area_mgm/mgm_02/npc.c +++ b/src/world/area_mgm/mgm_02/npc.c @@ -213,14 +213,14 @@ API_CALLABLE(N(CreateScoreDisplay)) { hidButton = hud_element_create(&HES_AButton); data->buttonHID = hidButton; hud_element_set_render_depth(hidButton, 0); - hud_element_set_flags(hidButton, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hidButton, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_tint(hidButton, 255, 255, 255); hud_element_set_script(hidButton, &HES_AButton); hidMeter = hud_element_create(&HES_BlueMeter); data->meterHID = hidMeter; hud_element_set_render_depth(hidMeter, 0); - hud_element_set_flags(hidMeter, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(hidMeter, HUD_ELEMENT_FLAG_MANUAL_RENDER); } return ApiStatus_BLOCK; diff --git a/src/world/area_obk/obk_07/phonograph.c b/src/world/area_obk/obk_07/phonograph.c index c867c2e34d4..2a41fa5a7fb 100644 --- a/src/world/area_obk/obk_07/phonograph.c +++ b/src/world/area_obk/obk_07/phonograph.c @@ -355,17 +355,17 @@ API_CALLABLE(N(CreatePhonographHudData)) { data->buttonHID = hid = hud_element_create(&HES_AButton); hud_element_set_render_pos(hid, data->hudBaseX, data->hudBaseY); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); data->meterHID = hid = hud_element_create(&HES_BlueMeter); hud_element_set_render_pos(hid, data->hudBaseX, data->hudBaseY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); data->okHID = hid = hud_element_create(&HES_RunAwayOK); hud_element_set_render_pos(hid, data->hudBaseX, data->hudBaseY + 28); hud_element_set_render_depth(hid, 0); - hud_element_set_flags(hid, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index f1c05c32733..1c2cb2775f2 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -315,42 +315,42 @@ API_CALLABLE(N(SelectTattleMsg)) { switch (temp) { case ENTITY_TYPE_HAMMER2_BLOCK: case ENTITY_TYPE_HAMMER2_BLOCK_TINY: - if (gPlayerData.hammerLevel >= 1) { + if (gPlayerData.hammerLevel >= GEAR_RANK_SUPER) { msgID = MSG_EntityTattle_HammerBlock2_CanBreak; } break; case ENTITY_TYPE_HAMMER3_BLOCK: case ENTITY_TYPE_HAMMER3_BLOCK_TINY: - if (gPlayerData.hammerLevel >= 2) { + if (gPlayerData.hammerLevel >= GEAR_RANK_ULTRA) { msgID = MSG_EntityTattle_HammerBlock3_CanBreak; } break; case ENTITY_TYPE_WOODEN_CRATE: - if (gPlayerData.bootsLevel == 1) { + if (gPlayerData.bootsLevel == GEAR_RANK_SUPER) { msgID = MSG_EntityTattle_WoodenCrate_SpinJump; - } else if (gPlayerData.bootsLevel == 2) { + } else if (gPlayerData.bootsLevel == GEAR_RANK_ULTRA) { msgID = MSG_EntityTattle_WoodenCrate_TornadoJump; } break; case ENTITY_TYPE_BOARDED_FLOOR: - if (gPlayerData.bootsLevel == 1) { + if (gPlayerData.bootsLevel == GEAR_RANK_SUPER) { msgID = MSG_EntityTattle_BoardedFloor_SpinJump; - } else if (gPlayerData.bootsLevel == 2) { + } else if (gPlayerData.bootsLevel == GEAR_RANK_ULTRA) { msgID = MSG_EntityTattle_BoardedFloor_TornadoJump; } break; case ENTITY_TYPE_HUGE_BLUE_SWITCH: - if (gPlayerData.bootsLevel >= 2) { + if (gPlayerData.bootsLevel >= GEAR_RANK_ULTRA) { msgID = MSG_EntityTattle_BigSwitch_TornadoJump; } break; case ENTITY_TYPE_GREEN_STOMP_SWITCH: - if (gPlayerData.bootsLevel >= 2) { + if (gPlayerData.bootsLevel >= GEAR_RANK_ULTRA) { msgID = MSG_EntityTattle_FloorSwitch_TornadoJump; } break; case ENTITY_TYPE_STAR_BOX_LAUNCHER: - if (gPlayerData.bootsLevel >= 2) { + if (gPlayerData.bootsLevel >= GEAR_RANK_ULTRA) { msgID = MSG_EntityTattle_JackInTheBox_TornadoJump; } break; diff --git a/src/world/script_api/shops.c b/src/world/script_api/shops.c index 517446b9c72..4906be69b3f 100644 --- a/src/world/script_api/shops.c +++ b/src/world/script_api/shops.c @@ -961,7 +961,7 @@ API_CALLABLE(MakeShop) { } shop->costHID = hud_element_create(&HES_Item_Coin); - hud_element_set_flags(shop->costHID, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(shop->costHID, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_clear_flags(shop->costHID, HUD_ELEMENT_FLAG_FILTER_TEX); get_worker(create_worker_frontUI(nullptr, draw_shop_items)); set_window_properties(WIN_SHOP_ITEM_NAME, 100, 66, 120, 28, WINDOW_PRIORITY_0, shop_draw_item_name, nullptr, -1); diff --git a/tools/disasm_hud_element_animation.py b/tools/disasm_hud_element_animation.py index 421899d8a84..25abef28f60 100755 --- a/tools/disasm_hud_element_animation.py +++ b/tools/disasm_hud_element_animation.py @@ -124,7 +124,7 @@ def print(self): elif op == 0x14: print(f"{indent}hs_RandomRestart({next(buf)}, {next(buf)})") elif op == 0x15: - print(f"{indent}hs_op_15({next(buf)})") + print(f"{indent}hs_SetVariable({next(buf)})") elif op == 0x17: count = next(buf) args = [] diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index ea8a5b6bbf6..07cacecb9fc 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -787,7 +787,7 @@ status_bar_ignore_changes = 0x800E9834; // type:func rom:0x82CE4 status_bar_is_ignoring_changes = 0x800E9874; // type:func rom:0x82D24 HES_HandPointer = 0x80104B90; // rom:0x9E040 status_bar_respond_to_changes = 0x800E9864; // type:func rom:0x82D14 -func_800F52BC = 0x800F5450; // type:func rom:0x8E900 +flush_popup_menu = 0x800F5450; // type:func rom:0x8E900 popup_menu_update = 0x800F19A0; // type:func rom:0x8AE50 gCollisionStatus = 0x8015F4D0; disable_npc_blur = 0x8003AA6C; // type:func rom:0x15E6C diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 3aecd9f419f..cf051426a69 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3027,7 +3027,7 @@ star_power_shimmer_update = 0x800F0D80; // type:func rom:0x8A230 star_power_shimmer_draw = 0x800F102C; // type:func rom:0x8A4DC hide_popup_menu = 0x800F13B0; // type:func rom:0x8A860 destroy_popup_menu = 0x800F1538; // type:func rom:0x8A9E8 -func_800F16CC = 0x800F16CC; // type:func rom:0x8AB7C +show_popup_menu = 0x800F16CC; // type:func rom:0x8AB7C piEventBuf = 0x800AF8A8; // rom:0x8ACA8 piAccessBuf = 0x800AF8B0; // rom:0x8ACB0 tmp_task = 0x800AF8C0; // rom:0x8ACC0 @@ -3071,7 +3071,7 @@ popup_draw_star_pieces_content = 0x800F4D28; // type:func rom:0x8E1D8 create_standard_popup_menu = 0x800F4E40; // type:func rom:0x8E2F0 create_shop_popup_menu = 0x800F4FC4; // type:func rom:0x8E474 create_battle_popup_menu = 0x800F513C; // type:func rom:0x8E5EC -func_800F52BC = 0x800F52BC; // type:func rom:0x8E76C +flush_popup_menu = 0x800F52BC; // type:func rom:0x8E76C draw_box = 0x800F52E0; // type:func rom:0x8E790 gCollisionData = 0x800B42E0; // rom:0x8F6E0 size:0x10 nuGfxMesgQ = 0x800B42F0; // rom:0x8F6F0 @@ -6433,8 +6433,8 @@ filemenu_8024C0A4 = 0x8024C0A4; // rom:0x16C904 filemenu_mainHIDs = 0x8024C0B0; // rom:0x16C910 filemenu_createfile_HIDs = 0x8024C100; // rom:0x16C960 filemenu_filename = 0x8024C110; // rom:0x16C970 -func_8023E104 = 0x8023E104; // type:func rom:0x16C9E4 -func_8023E11C = 0x8023E11C; // type:func rom:0x16C9FC +btl_start_blinking_starpoints = 0x8023E104; // type:func rom:0x16C9E4 +btl_stop_blinking_starpoints = 0x8023E11C; // type:func rom:0x16C9FC initialize_battle = 0x8023E130; // type:func rom:0x16CA10 func_8023E3FC = 0x8023E3FC; // type:func rom:0x16CCDC update_nonplayer_actor_shadows = 0x8023E404; // type:func rom:0x16CCE4 @@ -6465,8 +6465,8 @@ btl_state_update_begin_partner_turn = 0x80242BB0; // type:func rom:0x171490 btl_state_draw_begin_partner_turn = 0x80242EF8; // type:func rom:0x1717D8 btl_state_update_switch_to_partner = 0x80242F00; // type:func rom:0x1717E0 btl_state_draw_switch_to_partner = 0x80242FD8; // type:func rom:0x1718B8 -btl_state_update_9 = 0x80242FE0; // type:func rom:0x1718C0 -btl_state_draw_9 = 0x80243910; // type:func rom:0x1721F0 +btl_state_update_transfer_turn = 0x80242FE0; // type:func rom:0x1718C0 +btl_state_draw_transfer_turn = 0x80243910; // type:func rom:0x1721F0 btl_state_update_prepare_menu = 0x80243918; // type:func rom:0x1721F8 btl_state_draw_prepare_menu = 0x802439D0; // type:func rom:0x1722B0 btl_state_update_end_turn = 0x802439D8; // type:func rom:0x1722B8 @@ -7167,10 +7167,10 @@ PartnerYieldTurn = 0x80280818; // type:func rom:0x1AF0F8 GetDamageIntensity = 0x80280840; // type:func rom:0x1AF120 AddEffectOffset = 0x80280880; // type:func rom:0x1AF160 LoadStarPowerScript = 0x80280950; // type:func rom:0x1AF230 -D_802809F0 = 0x802809F0; // rom:0x1AF2D0 -D_802809F4 = 0x802809F4; // rom:0x1AF2D4 -D_802809F5 = 0x802809F5; // rom:0x1AF2D5 -D_802809F6 = 0x802809F6; // rom:0x1AF2D6 +StarPointsIncrementInterp = 0x802809F0; // rom:0x1AF2D0 +BtlStarPointsBlinking = 0x802809F4; // rom:0x1AF2D4 +StarPointsBlinkTimer = 0x802809F5; // rom:0x1AF2D5 +EndDemoWhiteOut = 0x802809F6; // rom:0x1AF2D6 DemoBattleBeginDelay = 0x802809F8; // rom:0x1AF2D8 gTattleBgTextureYOffset = 0x802809FA; // rom:0x1AF2DA bHPDigitHudScripts = 0x802809FC; // rom:0x1AF2DC From 16e4a3e1da9adb701455f08eb55bcccf1c112214 Mon Sep 17 00:00:00 2001 From: z64a Date: Sun, 23 Nov 2025 00:55:17 -0500 Subject: [PATCH 03/18] pt 2 --- include/dead.h | 2 +- include/npc.h | 2 +- include/script_api/battle.h | 4 +- include/variables.h | 2 +- src/23680.c | 2 +- src/7B440.c | 2 +- src/battle/16C8E0.c | 4 +- src/battle/btl_states_actions.c | 4 +- src/battle/btl_states_menus.c | 30 +-- src/battle/level_up.c | 4 +- src/battle/popup_messages.c | 6 +- src/bss/engine2_pre_bss.c | 2 +- src/evt/npc_api.c | 6 +- src/evt/player_api.c | 2 +- src/hud_element.c | 216 +++++++++--------- src/hud_element.h | 16 +- src/move_table.yaml | 6 +- src/npc.c | 2 +- src/windows.c | 22 +- src/world/actions.c | 4 +- src/world/common/enemy/ai/AvoidPlayerAI.inc.c | 4 +- src/world/common/enemy/ai/CleftAI.inc.c | 2 +- src/world/common/enemy/ai/GuardAI.inc.c | 2 +- .../common/enemy/ai/States_PatrolAI.inc.c | 6 +- src/world/partner/bombette.c | 4 +- src/world/partner/kooper.c | 6 +- src/world/partner/lakilester.c | 2 +- src/world/partner/parakarry.c | 2 +- src/world/partners.c | 14 +- tools/ignored_funcs.txt | 2 +- ver/ique/symbol_addrs.txt | 14 +- ver/jp/symbol_addrs.txt | 36 +-- ver/jp/undefined_syms.txt | 2 +- ver/us/symbol_addrs.txt | 44 ++-- ver/us/undefined_syms.txt | 2 +- 35 files changed, 240 insertions(+), 240 deletions(-) diff --git a/include/dead.h b/include/dead.h index 1955455d06b..c7c0b598b87 100644 --- a/include/dead.h +++ b/include/dead.h @@ -71,7 +71,7 @@ #define sfx_play_sound_with_params dead_sfx_play_sound_with_params #define sfx_get_spatialized_sound_params dead_sfx_get_spatialized_sound_params #define npc_test_move_simple_without_slipping dead_npc_test_move_simple_without_slipping -#define spawn_surface_effects dead_spawn_surface_effects +#define npc_surface_spawn_fx dead_npc_surface_spawn_fx #define get_item_entity dead_get_item_entity #define gOverrideFlags dead_gOverrideFlags #define set_message_text_var dead_set_message_text_var diff --git a/include/npc.h b/include/npc.h index cb94f8f8b13..cad46eacfda 100644 --- a/include/npc.h +++ b/include/npc.h @@ -596,7 +596,7 @@ void npc_imgfx_update(Npc* npc); void npc_set_imgfx_params(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); -void spawn_surface_effects(Npc* npc, SurfaceInteractMode mode); +void npc_surface_spawn_fx(Npc* npc, SurfaceInteractMode mode); void spawn_default_surface_effects(Npc* npc, SurfaceInteractMode mode); diff --git a/include/script_api/battle.h b/include/script_api/battle.h index f55bf1025df..893bfb6e26a 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -311,8 +311,8 @@ extern EvtScript EVS_Peach_HandlePhase; extern EvtScript EVS_ExecuteMarioAction; extern EvtScript EVS_ExecutePeachAction; extern EvtScript EVS_Player_HandleEvent; -extern EvtScript BtlPutPartnerAway; -extern EvtScript BtlBringPartnerOut; +extern EvtScript EVS_BtlPutPartnerAway; +extern EvtScript EVS_BtlBringPartnerOut; extern EvtScript EVS_MarioEnterStage; extern EvtScript EVS_PeachEnterStage; extern EvtScript EVS_PlayerFirstStrike; diff --git a/include/variables.h b/include/variables.h index b0cf0da231d..83cec6b9ac3 100644 --- a/include/variables.h +++ b/include/variables.h @@ -41,7 +41,7 @@ extern HiddenPanelsData gCurrentHiddenPanels; extern BackgroundHeader gBackgroundImage; -extern f32 D_800F7B74; +extern f32 DefaultMoveSpeed; extern CollisionData gZoneCollisionData; diff --git a/src/23680.c b/src/23680.c index ec8fde0f831..1631628e4b3 100644 --- a/src/23680.c +++ b/src/23680.c @@ -813,7 +813,7 @@ void basic_ai_chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume } } - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (npc->moveSpeed > 8.0 && !(gGameStatusPtr->frameCounter % 5)) { diff --git a/src/7B440.c b/src/7B440.c index 3908ddc527d..cf826270309 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -91,7 +91,7 @@ void reset_player_status(void) { } // TODO required to match - floatsTemp = &(&D_800F7B74)[-1]; // index of 0 does not work + floatsTemp = &(&DefaultMoveSpeed)[-1]; // index of 0 does not work playerStatus->walkSpeed = *floatsTemp++ * one; playerStatus->runSpeed = *floatsTemp++ * one; playerStatus->maxJumpSpeed = *floatsTemp++ * one; diff --git a/src/battle/16C8E0.c b/src/battle/16C8E0.c index 36d39c43b29..1cf11648f63 100644 --- a/src/battle/16C8E0.c +++ b/src/battle/16C8E0.c @@ -50,7 +50,7 @@ HudScript* bHPDigitHudScripts[] = { s32 BattleScreenFadeAmt = 255; -EvtScript BtlPutPartnerAway = { +EvtScript EVS_BtlPutPartnerAway = { Call(DispatchEvent, ACTOR_PARTNER, EVENT_PUT_PARTNER_AWAY) ChildThread SetF(LVar0, Float(1.0)) @@ -76,7 +76,7 @@ EvtScript BtlPutPartnerAway = { End }; -EvtScript BtlBringPartnerOut = { +EvtScript EVS_BtlBringPartnerOut = { ChildThread SetF(LVar0, Float(0.1)) Loop(20) diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index c9664b9e518..b22163471f8 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -2503,7 +2503,7 @@ void btl_state_update_change_partner(void) { break; } deduct_current_move_fp(); - script = start_script(&BtlPutPartnerAway, EVT_PRIORITY_A, 0); + script = start_script(&EVS_BtlPutPartnerAway, EVT_PRIORITY_A, 0); battleStatus->controlScript = script; battleStatus->controlScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; @@ -2540,7 +2540,7 @@ void btl_state_update_change_partner(void) { partner->takeTurnScript = nullptr; } - script = start_script(&BtlBringPartnerOut, EVT_PRIORITY_A, 0); + script = start_script(&EVS_BtlBringPartnerOut, EVT_PRIORITY_A, 0); battleStatus->controlScript = script; battleStatus->controlScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index 1b8755fdd0f..c02671edf2d 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -846,16 +846,16 @@ void btl_main_menu_draw(void) { switch (BattleMenuState) { case BTL_MENU_STATE_UNK_1: - func_80144218(-1); + hud_element_draw_complex_hud_first(-1); id = D_802AD048; hud_element_set_transform_rotation(id, 0.0f, 0.0f, 0.0f); hud_element_set_alpha(id, (D_802AD006 * 254) / 255); hud_element_set_render_pos(id, BASE_X - D_802AD00A, D_802AD00A + 212); - func_80144238(id); + hud_element_draw_complex_hud_next(id); id = D_802AD044; hud_element_set_alpha(id, (D_802AD006 * 254) / 255); hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); - func_80144238(id); + hud_element_draw_complex_hud_next(id); break; case BTL_MENU_STATE_OPENED_SUBMENU: case BTL_MENU_STATE_ACCEPT_INPUT: @@ -863,7 +863,7 @@ void btl_main_menu_draw(void) { case BTL_MENU_STATE_UNK_14: case BTL_MENU_STATE_UNK_1E: opacity = (D_802AD006 * BattleMenuAlpha) / 255; - func_80144218(-1); + hud_element_draw_complex_hud_first(-1); theta = (D_802AD100 - BattleMenu_CurPos) * 28; cond = false; @@ -908,7 +908,7 @@ void btl_main_menu_draw(void) { hud_element_set_scale(id, 1.0f); } - func_80144238(id); + hud_element_draw_complex_hud_next(id); if (i == BattleMenu_HomePos + BattleMenu_CurPos) { x = 0.0f; y = 0.0f; @@ -925,7 +925,7 @@ void btl_main_menu_draw(void) { } else { hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } - func_80144238(id); + hud_element_draw_complex_hud_next(id); } } theta = (D_802AD100 - BattleMenu_CurPos) * 28; @@ -941,7 +941,7 @@ void btl_main_menu_draw(void) { hud_element_set_transform_scale(id, 1.0f, 1.8f, 1.0f); hud_element_set_alpha(id, (opacity * 200) / 255); hud_element_set_render_pos(id, 79, 176); - func_80144238(id); + hud_element_draw_complex_hud_next(id); id = D_802AD048; theta = (D_802AD100 - BattleMenu_CurPos) * 28; @@ -951,13 +951,13 @@ void btl_main_menu_draw(void) { hud_element_set_scale(id, 0.95f); hud_element_set_alpha(id, (opacity * 254) / 255); hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); - func_80144238(id); + hud_element_draw_complex_hud_next(id); id = D_802AD044; hud_element_set_alpha(id, (opacity * 254) / 255); hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); hud_element_set_scale(id, 1.0f); - func_80144238(id); + hud_element_draw_complex_hud_next(id); theta = BattleMenu_WheelAngle; for (i = 0; i < BattleMenu_NumOptions; i++, theta += 28.0f) { @@ -3794,7 +3794,7 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6; btl_state_update_player_menu(); battleStatus->moveCategory = BTL_MENU_TYPE_RUN_AWAY; - battleStatus->selectedMoveID = MOVE_UNUSED_39; + battleStatus->selectedMoveID = MOVE_RUN_AWAY; btl_set_state(BATTLE_STATE_RUN_AWAY); break; case 9: @@ -3807,7 +3807,7 @@ void btl_state_update_player_menu(void) { case 4: gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6; btl_state_update_player_menu(); - battleStatus->selectedMoveID = MOVE_UNUSED_DEFEND_PLUS; + battleStatus->selectedMoveID = MOVE_DEFEND; battleStatus->moveCategory = BTL_MENU_TYPE_DEFEND; btl_set_state(BATTLE_STATE_DEFEND); break; @@ -3886,7 +3886,7 @@ void btl_state_update_player_menu(void) { battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_6; battleStatus->lastSelectedPartner = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; - battleStatus->selectedMoveID = MOVE_UNUSED_37; + battleStatus->selectedMoveID = MOVE_CHANGE_PARTNER; battleStatus->curTargetListFlags = TARGET_FLAG_2; battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_PARTNER] = popup->result - 1; @@ -4481,7 +4481,7 @@ void btl_state_update_partner_menu(void) { battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_6; battleStatus->lastSelectedPartner = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; - battleStatus->selectedMoveID = MOVE_UNUSED_37; + battleStatus->selectedMoveID = MOVE_CHANGE_PARTNER; battleStatus->curTargetListFlags = TARGET_FLAG_2; battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; @@ -4683,7 +4683,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6; btl_state_update_partner_menu(); battleStatus->moveCategory = entryIdx; - battleStatus->selectedMoveID = MOVE_UNUSED_39; + battleStatus->selectedMoveID = MOVE_RUN_AWAY; btl_set_state(BATTLE_STATE_RUN_AWAY); break; case 10: @@ -4756,7 +4756,7 @@ void btl_state_update_partner_menu(void) { battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_6; battleStatus->lastSelectedPartner = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; - battleStatus->selectedMoveID = MOVE_UNUSED_37; + battleStatus->selectedMoveID = MOVE_CHANGE_PARTNER; battleStatus->curTargetListFlags = TARGET_FLAG_2; battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; diff --git a/src/battle/level_up.c b/src/battle/level_up.c index e3e2d62977c..24404434b3d 100644 --- a/src/battle/level_up.c +++ b/src/battle/level_up.c @@ -1597,10 +1597,10 @@ void btl_state_draw_celebration(void) { } } - func_80144218(-1); + hud_element_draw_complex_hud_first(-1); id = LevelUpSpotlightID; hud_element_set_transform_rotation(id, 0.0f, 0.0f, rotZ); - func_80144238(id); + hud_element_draw_complex_hud_next(id); break; case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_UPGRADE: case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_FADE_OUT: diff --git a/src/battle/popup_messages.c b/src/battle/popup_messages.c index 454f8269106..ef93ef347c7 100644 --- a/src/battle/popup_messages.c +++ b/src/battle/popup_messages.c @@ -1546,7 +1546,7 @@ void btl_message_popup_draw_content(void* data, s32 x, s32 y) { hud_element_set_render_pos(HID_BattleMessage2, x + TIP_X_HLA2, y + TIP_Y_HLA2); hud_element_set_scale(HID_BattleMessage2, 0.8f); hud_element_set_alpha(HID_BattleMessage2, opacity); - func_80144218(HID_BattleMessage2); + hud_element_draw_complex_hud_first(HID_BattleMessage2); break; #if VERSION_JP case BTL_MSG_ACTION_TIP_UNUSED_1: @@ -1668,12 +1668,12 @@ void btl_message_popup_draw_content(void* data, s32 x, s32 y) { hud_element_set_render_pos(HID_BattleMessage2, x + TIP_X_MTA2, y + TIP_Y_MTA2); hud_element_set_scale(HID_BattleMessage2, TIP_SCALE1); hud_element_set_alpha(HID_BattleMessage2, opacity); - func_80144218(HID_BattleMessage2); + hud_element_draw_complex_hud_first(HID_BattleMessage2); hud_element_set_render_pos(HID_BattleMessage3, x + TIP_X_MTA3, y + 15); hud_element_set_scale(HID_BattleMessage3, TIP_SCALE2); hud_element_set_alpha(HID_BattleMessage3, opacity); - func_80144218(HID_BattleMessage3); + hud_element_draw_complex_hud_first(HID_BattleMessage3); break; #if VERSION_JP case BTL_MSG_ACTION_TIP_UNUSED_4: diff --git a/src/bss/engine2_pre_bss.c b/src/bss/engine2_pre_bss.c index ed596a11623..1d6c333aba9 100644 --- a/src/bss/engine2_pre_bss.c +++ b/src/bss/engine2_pre_bss.c @@ -8,7 +8,7 @@ #ifndef SHIFT BSS SpriteShadingProfile* gAuxSpriteShadingProfile; -BSS s32 gHudElementsNumber; +BSS s32 HudElemCount; BSS ModelCustomGfxBuilderList* gCurrentCustomModelGfxBuildersPtr; BSS s32 D_801512BC; BSS s32 entity_numEntities; diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index ab2ccde77e2..ad4fc9a1b88 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -269,9 +269,9 @@ API_CALLABLE(NpcMoveTo) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (npc->moveSpeed < 4.0) { - spawn_surface_effects(npc, SURFACE_INTERACT_WALK); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_WALK); } else { - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); } dist = dist2D(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z); @@ -351,7 +351,7 @@ ApiStatus _npc_jump_to(Evt* script, s32 isInitialCall, s32 snapYaw) { npc->pos.y = npc->moveToPos.y; npc->pos.z = npc->moveToPos.z; npc->flags &= ~NPC_FLAG_JUMPING; - spawn_surface_effects(npc, SURFACE_INTERACT_LAND); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_LAND); return ApiStatus_DONE1; } return ApiStatus_BLOCK; diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 571d5102fe1..40bdb1ab56c 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -318,7 +318,7 @@ ApiStatus player_jump(Evt* script, s32 isInitialCall, s32 mode) { anim = ANIM_Mario1_TiredIdle; } suggest_player_anim_allow_backward(anim); - spawn_surface_effects(playerNpc, SURFACE_INTERACT_LAND); + npc_surface_spawn_fx(playerNpc, SURFACE_INTERACT_LAND); } if (mode == 0 || mode == 2) { diff --git a/src/hud_element.c b/src/hud_element.c index 480bf39cad5..1ab651f1984 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -11,14 +11,14 @@ typedef struct HudElementSize { s16 size; } HudElementSize; -u8* gHudElementAuxCache = nullptr; -s32 gHudElementCacheCapacity = 0x11000; +u8* HudElemAuxCache = nullptr; +s32 HudElemCacheCapacity = 0x11000; HudScript HES_Empty = { hs_End }; -HudElementSize gHudElementSizes[] = { +HudElementSize HudElemSizes[] = { { 8, 8, 32 }, { 16, 16, 128 }, { 24, 24, 288 }, @@ -48,14 +48,14 @@ HudElementSize gHudElementSizes[] = { }; s16 D_8014F068[] = { 34, 32, 0, 40, 40, 968, 0, 0 }; -Gfx gHudElementsDLBackUI[] = { +Gfx HudElemBackInitGfx[] = { gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), gsDPPipeSync(), gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE), gsDPSetAlphaCompare(G_AC_NONE), gsSPEndDisplayList() }; -Gfx gHudElementsDLFrontUI[] = { +Gfx HudElemFrontInitGfx[] = { gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), gsDPPipeSync(), gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE), @@ -63,7 +63,7 @@ Gfx gHudElementsDLFrontUI[] = { gsSPEndDisplayList() }; -Vtx D_8014F0C8[] = { +Vtx HudElemTemplateQuad[] = { { .v = { .ob = { -12, 0, 0}, @@ -98,9 +98,9 @@ Vtx D_8014F0C8[] = { } }; -Lights1 HudElementLights = gdSPDefLights1(255, 255, 255, 0, 0, 0, 0, 0, 0); +Lights1 HudElemLights = gdSPDefLights1(255, 255, 255, 0, 0, 0, 0, 0, 0); -s32 gHudElementsNumber; +s32 HudElemCount; HudCacheEntry* gHudElementCacheTableRaster; HudCacheEntry* gHudElementCacheTablePalette; s32* gHudElementCacheSize; @@ -119,7 +119,7 @@ BSS s32 gHudElementCacheSizeBattle; BSS s32 D_80158578[2]; BSS HudCacheEntry gHudElementCacheTableRasterBattle[192]; BSS HudCacheEntry gHudElementCacheTablePaletteBattle[192]; -BSS s32 D_80159180; +BSS s32 FrameQuadIndex; void hud_element_setup_cam(void); @@ -191,13 +191,13 @@ void hud_element_load_script(HudElement* hudElement, HudScript* anim) { entry->id = raster; entry->data = &gHudElementCacheBuffer[*gHudElementCacheSize]; if (gGameStatusPtr->context == CONTEXT_WORLD) { - capacity = gHudElementCacheCapacity; + capacity = HudElemCacheCapacity; } else { - capacity = gHudElementCacheCapacity / 2; + capacity = HudElemCacheCapacity / 2; } - ASSERT(capacity > *gHudElementCacheSize + gHudElementSizes[preset].size); - nuPiReadRom((s32)icon_ROM_START + raster, entry->data, gHudElementSizes[preset].size); - *gHudElementCacheSize += gHudElementSizes[preset].size; + ASSERT(capacity > *gHudElementCacheSize + HudElemSizes[preset].size); + nuPiReadRom((s32)icon_ROM_START + raster, entry->data, HudElemSizes[preset].size); + *gHudElementCacheSize += HudElemSizes[preset].size; if (gGameStatusPtr->context == CONTEXT_WORLD) { *pos = i; } else { @@ -227,9 +227,9 @@ void hud_element_load_script(HudElement* hudElement, HudScript* anim) { entry->id = palette; entry->data = &gHudElementCacheBuffer[*gHudElementCacheSize]; if (gGameStatusPtr->context == CONTEXT_WORLD) { - capacity = gHudElementCacheCapacity; + capacity = HudElemCacheCapacity; } else { - capacity = gHudElementCacheCapacity / 2; + capacity = HudElemCacheCapacity / 2; } ASSERT(capacity > *gHudElementCacheSize + 32); nuPiReadRom((s32)icon_ROM_START + palette, entry->data, 32); @@ -623,7 +623,7 @@ void hud_element_clear_cache(void) { } if (gGameStatusPtr->context == CONTEXT_WORLD) { - gHudElementCacheBuffer = general_heap_malloc(gHudElementCacheCapacity); + gHudElementCacheBuffer = general_heap_malloc(HudElemCacheCapacity); ASSERT(gHudElementCacheBuffer); gHudElementCacheBufferWorld = gHudElementCacheBuffer; *gHudElementCacheSize = 0; @@ -634,11 +634,11 @@ void hud_element_clear_cache(void) { entryPalette[i].id = -1; } } else { - if (gHudElementAuxCache == nullptr) { - gHudElementCacheBuffer = general_heap_malloc(gHudElementCacheCapacity / 2); + if (HudElemAuxCache == nullptr) { + gHudElementCacheBuffer = general_heap_malloc(HudElemCacheCapacity / 2); ASSERT(gHudElementCacheBuffer); } else { - gHudElementCacheBuffer = gHudElementAuxCache; + gHudElementCacheBuffer = HudElemAuxCache; } gHudElementCacheBufferBattle = gHudElementCacheBuffer; *gHudElementCacheSize = 0; @@ -654,8 +654,8 @@ void hud_element_clear_cache(void) { (*gHudElements)[i] = nullptr; } - gHudElementsNumber = 0; - D_80159180 = 0; + HudElemCount = 0; + FrameQuadIndex = 0; hud_element_setup_cam(); } @@ -689,8 +689,8 @@ void init_hud_element_list(void) { gHudElementCacheBuffer = gHudElementCacheBufferBattle; } - gHudElementsNumber = 0; - D_80159180 = 0; + HudElemCount = 0; + FrameQuadIndex = 0; } void hud_element_setup_cam(void) { @@ -726,7 +726,7 @@ s32 hud_element_create(HudScript* anim) { ASSERT(id < ARRAY_COUNT(*gHudElements)); (*gHudElements)[id] = hudElement = heap_malloc(sizeof(*hudElement)); - gHudElementsNumber++; + HudElemCount++; ASSERT(hudElement != nullptr); @@ -861,10 +861,10 @@ s32 hud_element_update(HudElement* hudElement) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; - imageWidth = gHudElementSizes[tileSizePreset].width; - imageHeight = gHudElementSizes[tileSizePreset].height; - drawWidth = gHudElementSizes[drawSizePreset].width; - drawHeight = gHudElementSizes[drawSizePreset].height; + imageWidth = HudElemSizes[tileSizePreset].width; + imageHeight = HudElemSizes[tileSizePreset].height; + drawWidth = HudElemSizes[drawSizePreset].width; + drawHeight = HudElemSizes[drawSizePreset].height; } else { imageWidth = hudElement->customImageSize.x; imageHeight = hudElement->customImageSize.y; @@ -902,10 +902,10 @@ s32 hud_element_update(HudElement* hudElement) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; - imageWidth = gHudElementSizes[tileSizePreset].width; - imageHeight = gHudElementSizes[tileSizePreset].height; - drawWidth = gHudElementSizes[drawSizePreset].width; - drawHeight = gHudElementSizes[drawSizePreset].height; + imageWidth = HudElemSizes[tileSizePreset].width; + imageHeight = HudElemSizes[tileSizePreset].height; + drawWidth = HudElemSizes[drawSizePreset].width; + drawHeight = HudElemSizes[drawSizePreset].height; } else { imageWidth = hudElement->customImageSize.x; imageHeight = hudElement->customImageSize.y; @@ -965,10 +965,10 @@ s32 hud_element_update(HudElement* hudElement) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; - imageWidth = gHudElementSizes[tileSizePreset].width; - imageHeight = gHudElementSizes[tileSizePreset].height; - drawWidth = gHudElementSizes[drawSizePreset].width; - drawHeight = gHudElementSizes[drawSizePreset].height; + imageWidth = HudElemSizes[tileSizePreset].width; + imageHeight = HudElemSizes[tileSizePreset].height; + drawWidth = HudElemSizes[drawSizePreset].width; + drawHeight = HudElemSizes[drawSizePreset].height; } else { imageWidth = hudElement->customImageSize.x; imageHeight = hudElement->customImageSize.y; @@ -1025,10 +1025,10 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->tileSizePreset = tileSizePreset; hudElement->drawSizePreset = arg2; - imageWidth = gHudElementSizes[tileSizePreset].width; - imageHeight = gHudElementSizes[tileSizePreset].height; - drawWidth = gHudElementSizes[arg2].width; - drawHeight = gHudElementSizes[arg2].height; + imageWidth = HudElemSizes[tileSizePreset].width; + imageHeight = HudElemSizes[tileSizePreset].height; + drawWidth = HudElemSizes[arg2].width; + drawHeight = HudElemSizes[arg2].height; xScaled = (f32) drawWidth / (f32) imageWidth; yScaled = (f32) drawHeight / (f32) imageHeight; @@ -1085,10 +1085,10 @@ s32 hud_element_update(HudElement* hudElement) { uniformScale /= 65536; hudElement->uniformScale = uniformScale; if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - imageWidth = gHudElementSizes[hudElement->tileSizePreset].width; - imageHeight = gHudElementSizes[hudElement->tileSizePreset].height; - drawWidth = gHudElementSizes[hudElement->drawSizePreset].width; - drawHeight = gHudElementSizes[hudElement->drawSizePreset].height; + imageWidth = HudElemSizes[hudElement->tileSizePreset].width; + imageHeight = HudElemSizes[hudElement->tileSizePreset].height; + drawWidth = HudElemSizes[hudElement->drawSizePreset].width; + drawHeight = HudElemSizes[hudElement->drawSizePreset].height; } else { imageWidth = hudElement->customImageSize.x; imageHeight = hudElement->customImageSize.y; @@ -1183,11 +1183,11 @@ void render_hud_elements_backUI(void) { s32 drawSizeX, drawSizeY, offsetX, offsetY; HudElement* hudElement; - D_80159180++; - if (D_80159180 > 2) { - D_80159180 = 0; + FrameQuadIndex++; + if (FrameQuadIndex > 2) { + FrameQuadIndex = 0; } - gSPDisplayList(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(gHudElementsDLBackUI)); + gSPDisplayList(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(HudElemBackInitGfx)); count = 0; for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { @@ -1224,8 +1224,8 @@ void render_hud_elements_backUI(void) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZING)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; - texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; + texSizeX = HudElemSizes[hudElement->tileSizePreset].width; + texSizeY = HudElemSizes[hudElement->tileSizePreset].height; } else { texSizeX = hudElement->customImageSize.x; texSizeY = hudElement->customImageSize.y; @@ -1233,8 +1233,8 @@ void render_hud_elements_backUI(void) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_SCALED)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - drawSizeX = gHudElementSizes[hudElement->drawSizePreset].width; - drawSizeY = gHudElementSizes[hudElement->drawSizePreset].height; + drawSizeX = HudElemSizes[hudElement->drawSizePreset].width; + drawSizeY = HudElemSizes[hudElement->drawSizePreset].height; offsetX = -drawSizeX / 2; offsetY = -drawSizeY / 2; } else { @@ -1269,8 +1269,8 @@ void render_hud_elements_backUI(void) { f32 xScaled, yScaled; if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; - texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; + texSizeX = HudElemSizes[hudElement->tileSizePreset].width; + texSizeY = HudElemSizes[hudElement->tileSizePreset].height; } else { texSizeX = hudElement->customImageSize.x; texSizeY = hudElement->customImageSize.y; @@ -1307,7 +1307,7 @@ void render_hud_elements_frontUI(void) { s32 drawSizeX, drawSizeY, offsetX, offsetY; HudElement* hudElement; - gSPDisplayList(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(gHudElementsDLFrontUI)); + gSPDisplayList(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(HudElemFrontInitGfx)); count = 0; for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { @@ -1339,8 +1339,8 @@ void render_hud_elements_frontUI(void) { hudElement = (*gHudElements)[sortedElements[i]]; if (!(hudElement->flags & HUD_ELEMENT_FLAG_RESIZING)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; - texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; + texSizeX = HudElemSizes[hudElement->tileSizePreset].width; + texSizeY = HudElemSizes[hudElement->tileSizePreset].height; } else { texSizeX = hudElement->customImageSize.x; texSizeY = hudElement->customImageSize.y; @@ -1348,8 +1348,8 @@ void render_hud_elements_frontUI(void) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_SCALED)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - drawSizeX = gHudElementSizes[hudElement->drawSizePreset].width; - drawSizeY = gHudElementSizes[hudElement->drawSizePreset].height; + drawSizeX = HudElemSizes[hudElement->drawSizePreset].width; + drawSizeY = HudElemSizes[hudElement->drawSizePreset].height; offsetX = -drawSizeX / 2; offsetY = -drawSizeY / 2; } else { @@ -1384,8 +1384,8 @@ void render_hud_elements_frontUI(void) { f32 xScaled, yScaled; if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - texSizeX = gHudElementSizes[hudElement->drawSizePreset].width; - texSizeY = gHudElementSizes[hudElement->drawSizePreset].height; + texSizeX = HudElemSizes[hudElement->drawSizePreset].width; + texSizeY = HudElemSizes[hudElement->drawSizePreset].height; } else { texSizeX = hudElement->customImageSize.x; texSizeY = hudElement->customImageSize.y; @@ -1414,7 +1414,7 @@ void render_hud_elements_frontUI(void) { } } -void render_hud_element(HudElement* hudElement) { +void render_complex_hud_element(HudElement* hudElement) { Matrix4f sp20; Matrix4f sp60; Matrix4f spA0; @@ -1449,8 +1449,8 @@ void render_hud_element(HudElement* hudElement) { yScaleFactor = 1.0f; } else { if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - xScaleFactor = gHudElementSizes[hudElement->tileSizePreset].width; - yScaleFactor = gHudElementSizes[hudElement->tileSizePreset].height; + xScaleFactor = HudElemSizes[hudElement->tileSizePreset].width; + yScaleFactor = HudElemSizes[hudElement->tileSizePreset].height; } else { xScaleFactor = hudElement->customImageSize.x; yScaleFactor = hudElement->customImageSize.y; @@ -1462,8 +1462,8 @@ void render_hud_element(HudElement* hudElement) { } if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - width = gHudElementSizes[hudElement->tileSizePreset].width; - height = gHudElementSizes[hudElement->tileSizePreset].height; + width = HudElemSizes[hudElement->tileSizePreset].width; + height = HudElemSizes[hudElement->tileSizePreset].height; } else { width = hudElement->customImageSize.x; height = hudElement->customImageSize.y; @@ -1551,12 +1551,12 @@ void render_hud_element(HudElement* hudElement) { } break; case 2: - transform->quadBuffers[D_80159180].vtx[0] = D_8014F0C8[0]; - transform->quadBuffers[D_80159180].vtx[1] = D_8014F0C8[1]; - transform->quadBuffers[D_80159180].vtx[2] = D_8014F0C8[2]; - transform->quadBuffers[D_80159180].vtx[3] = D_8014F0C8[3]; + transform->quadBuffers[FrameQuadIndex].vtx[0] = HudElemTemplateQuad[0]; + transform->quadBuffers[FrameQuadIndex].vtx[1] = HudElemTemplateQuad[1]; + transform->quadBuffers[FrameQuadIndex].vtx[2] = HudElemTemplateQuad[2]; + transform->quadBuffers[FrameQuadIndex].vtx[3] = HudElemTemplateQuad[3]; - vtx2 = transform->quadBuffers[D_80159180].vtx; + vtx2 = transform->quadBuffers[FrameQuadIndex].vtx; vtx = vtx2; vtx2->v.ob[0] = -width / 2; @@ -1605,7 +1605,7 @@ void render_hud_element(HudElement* hudElement) { G_TX_NOLOD, G_TX_NOLOD); gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); - gSPVertex(gMainGfxPos++, &transform->quadBuffers[D_80159180], 4, 0); + gSPVertex(gMainGfxPos++, &transform->quadBuffers[FrameQuadIndex], 4, 0); gSP1Triangle(gMainGfxPos++, 0, 1, 2, 0); gSP1Triangle(gMainGfxPos++, 0, 2, 3, 0); break; @@ -1678,13 +1678,13 @@ void render_transformed_hud_elements(void) { gDPPipeSync(gMainGfxPos++); gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, HudElementLights); + gSPSetLights1(gMainGfxPos++, HudElemLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); for (i = 0; i < count; i++) { - render_hud_element((*gHudElements)[sortedElements[i]]); + render_complex_hud_element((*gHudElements)[sortedElements[i]]); } } } @@ -1741,13 +1741,13 @@ void render_transformed_hud_elements(void) { gDPPipeSync(gMainGfxPos++); gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, HudElementLights); + gSPSetLights1(gMainGfxPos++, HudElemLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); for (i = 0; i < count; i++) { - render_hud_element((*gHudElements)[sortedElements[i]]); + render_complex_hud_element((*gHudElements)[sortedElements[i]]); } } } @@ -1755,7 +1755,7 @@ void render_transformed_hud_elements(void) { } while (0); } -void func_80143C48(s32 elemID, s32 arg1, s32 camID) { +void immediately_render_complex_hud_element(s32 elemID, s32 arg1, s32 camID) { Camera* camera = &gCameras[camID]; if (arg1 > 0) { @@ -1799,7 +1799,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, HudElementLights); + gSPSetLights1(gMainGfxPos++, HudElemLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); @@ -1836,24 +1836,24 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { return; } - render_hud_element(elem); + render_complex_hud_element(elem); } } -void func_80144218(s32 id) { - func_80143C48(id, 1, CAM_HUD); +void hud_element_draw_complex_hud_first(s32 id) { + immediately_render_complex_hud_element(id, 1, CAM_HUD); } -void func_80144238(s32 id) { - func_80143C48(id, 0, CAM_HUD); +void hud_element_draw_complex_hud_next(s32 id) { + immediately_render_complex_hud_element(id, 0, CAM_HUD); } -void func_80144258(s32 id) { - func_80143C48(id, 1, CAM_BATTLE); +void hud_element_draw_complex_battle_first(s32 id) { + immediately_render_complex_hud_element(id, 1, CAM_BATTLE); } -void func_80144278(s32 id) { - func_80143C48(id, 0, CAM_BATTLE); +void hud_element_draw_complex_battle_next(s32 id) { + immediately_render_complex_hud_element(id, 0, CAM_BATTLE); } void draw_hud_element_internal(s32 id, s32 clipMode) { @@ -1886,8 +1886,8 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { if (!(elem->flags & HUD_ELEMENT_FLAG_RESIZING)) { if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { preset = elem->tileSizePreset; - texSizeX = gHudElementSizes[preset].width; - texSizeY = gHudElementSizes[preset].height; + texSizeX = HudElemSizes[preset].width; + texSizeY = HudElemSizes[preset].height; } else { texSizeX = elem->customImageSize.x; texSizeY = elem->customImageSize.y; @@ -1895,8 +1895,8 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { if (!(elem->flags & HUD_ELEMENT_FLAG_SCALED)) { if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - drawSizeX = gHudElementSizes[elem->drawSizePreset].width; - drawSizeY = gHudElementSizes[elem->drawSizePreset].height; + drawSizeX = HudElemSizes[elem->drawSizePreset].width; + drawSizeY = HudElemSizes[elem->drawSizePreset].height; } else { drawSizeX = elem->customDrawSize.x; drawSizeY = elem->customDrawSize.y; @@ -1927,8 +1927,8 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { preset = elem->tileSizePreset; - texSizeX = gHudElementSizes[preset].width; - texSizeY = gHudElementSizes[preset].height; + texSizeX = HudElemSizes[preset].width; + texSizeY = HudElemSizes[preset].height; } else { texSizeX = elem->customImageSize.x; texSizeY = elem->customImageSize.y; @@ -2010,7 +2010,7 @@ void hud_element_free(s32 id) { heap_free((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]); (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK] = nullptr; - gHudElementsNumber--; + HudElemCount--; } void hud_element_set_render_pos(s32 id, s32 x, s32 y) { @@ -2044,7 +2044,7 @@ void ALT_clear_hud_element_cache(void) { if (gGameStatusPtr->context == CONTEXT_WORLD) { heap_free(gHudElementCacheBuffer); - gHudElementCacheBuffer = heap_malloc(gHudElementCacheCapacity); + gHudElementCacheBuffer = heap_malloc(HudElemCacheCapacity); ASSERT(gHudElementCacheBuffer); gHudElementCacheBufferWorld = gHudElementCacheBuffer; *gHudElementCacheSize = 0; @@ -2058,12 +2058,12 @@ void ALT_clear_hud_element_cache(void) { gHudElementCacheTablePaletteWorld[i].id = -1; } } else { - if (gHudElementAuxCache == nullptr) { + if (HudElemAuxCache == nullptr) { heap_free(gHudElementCacheBuffer); - gHudElementCacheBuffer = heap_malloc(gHudElementCacheCapacity / 2); + gHudElementCacheBuffer = heap_malloc(HudElemCacheCapacity / 2); ASSERT(gHudElementCacheBuffer); } else { - gHudElementCacheBuffer = gHudElementAuxCache; + gHudElementCacheBuffer = HudElemAuxCache; } gHudElementCacheBufferBattle = gHudElementCacheBuffer; *gHudElementCacheSize = 0; @@ -2089,10 +2089,10 @@ void hud_element_set_scale(s32 index, f32 scale) { elem->uniformScale = scale; if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { - imgSizeX = gHudElementSizes[elem->tileSizePreset].width; - imgSizeY = gHudElementSizes[elem->tileSizePreset].height; - drawSizeX = gHudElementSizes[elem->drawSizePreset].width; - drawSizeY = gHudElementSizes[elem->drawSizePreset].height; + imgSizeX = HudElemSizes[elem->tileSizePreset].width; + imgSizeY = HudElemSizes[elem->tileSizePreset].height; + drawSizeX = HudElemSizes[elem->drawSizePreset].width; + drawSizeY = HudElemSizes[elem->drawSizePreset].height; } else { imgSizeX = elem->customImageSize.x; imgSizeY = elem->customImageSize.y; @@ -2126,11 +2126,11 @@ void hud_element_use_preset_size(s32 id, s8 sizePreset) { hudElement->flags &= ~(HUD_ELEMENT_FLAG_SCALED | HUD_ELEMENT_FLAG_REPEATED); } -s32 func_80144E4C(s32 id) { +s32 hud_element_get_variable(s32 id) { return ((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags >> 24) & 0xF; } -void func_80144E74(s32 id, s32 arg1) { +void hud_element_set_variable(s32 id, s32 arg1) { HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; hudElement->flags &= ~HUD_ELEMENT_VARIABLE_MASK; @@ -2279,10 +2279,10 @@ void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID) { } void hud_element_set_aux_cache(void* base, s32 size) { - gHudElementAuxCache = (u8*)base; + HudElemAuxCache = (u8*)base; if (base == nullptr) { - gHudElementCacheCapacity = 0x11000; + HudElemCacheCapacity = 0x11000; } else { - gHudElementCacheCapacity = size; + HudElemCacheCapacity = size; } } diff --git a/src/hud_element.h b/src/hud_element.h index 3fa1be70ee8..7c6cf18f77b 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -468,15 +468,15 @@ void render_hud_elements_backUI(void); void render_hud_elements_frontUI(void); -void render_hud_element(HudElement* hudElement); +void render_complex_hud_element(HudElement* hudElement); void render_transformed_hud_elements(void); -void func_80143C48(s32 arg0, s32 arg1, s32 camID); -void func_80144218(s32 arg0); -void func_80144238(s32 arg0); -void func_80144258(s32 arg0); -void func_80144278(s32 arg0); +void immediately_render_complex_hud_element(s32 arg0, s32 arg1, s32 camID); +void hud_element_draw_complex_hud_first(s32 arg0); +void hud_element_draw_complex_hud_next(s32 arg0); +void hud_element_draw_complex_battle_first(s32 arg0); +void hud_element_draw_complex_battle_next(s32 arg0); void draw_hud_element_internal(s32 id, s32 clipMode); void hud_element_draw_clipped(s32 id); @@ -510,9 +510,9 @@ void hud_element_set_scale(s32 index, f32 scale); void hud_element_use_preset_size(s32 id, s8 size); -s32 func_80144E4C(s32 id); +s32 hud_element_get_variable(s32 id); -void func_80144E74(s32 id, s32 arg1); +void hud_element_set_variable(s32 id, s32 arg1); /// @param opacity 0 = invisible; 255 = opaque void hud_element_set_alpha(s32 id, s32 opacity); diff --git a/src/move_table.yaml b/src/move_table.yaml index dba4b520761..47da3e3d36b 100644 --- a/src/move_table.yaml +++ b/src/move_table.yaml @@ -439,7 +439,7 @@ actionTip: BTL_MSG_ACTION_TIP_NOT_USED_3 costFP: 2 costBP: 2 -- Unused_DefendPlus: +- Defend: nameMsg: MSG_MoveName_DefendPlus fullDescMsg: MSG_ItemFullDesc_DefendPlus shortDescMsg: MSG_ItemShortDesc_DefendPlus @@ -493,7 +493,7 @@ actionTip: NONE costFP: 6 costBP: 3 -- Unused_37: +- ChangePartner: nameMsg: (s32) "つうじょう" fullDescMsg: MSG_NONE shortDescMsg: MSG_NONE @@ -511,7 +511,7 @@ actionTip: NONE costFP: 0 costBP: 4 -- Unused_39: +- RunAway: nameMsg: (s32) "つうじょう" fullDescMsg: MSG_NONE shortDescMsg: MSG_NONE diff --git a/src/npc.c b/src/npc.c index a2ee1b439b9..1f8bf6cb0e9 100644 --- a/src/npc.c +++ b/src/npc.c @@ -2207,7 +2207,7 @@ void npc_set_imgfx_params(Npc* npc, s32 imgfxType, s32 arg2, s32 arg3, s32 arg4, //TODO begin split for npc_surfaces -void spawn_surface_effects(Npc* npc, SurfaceInteractMode mode) { +void npc_surface_spawn_fx(Npc* npc, SurfaceInteractMode mode) { PartnerStatus* temp = &gPartnerStatus; if (!(npc->flags & NPC_FLAG_INVISIBLE) && (npc->flags & NPC_FLAG_TOUCHES_GROUND)) { diff --git a/src/windows.c b/src/windows.c index ad8e5a15b3b..394c1ab7231 100644 --- a/src/windows.c +++ b/src/windows.c @@ -49,63 +49,63 @@ SimpleWindowUpdateData gSimpleWindowUpdates[] = { .darkening = 0, .opacity = 0 }, - { + [WINDOW_UPDATE_SHOW] { .flags = 0, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, - { + [WINDOW_UPDATE_HIDE] { .flags = 0, .windowFlagsSet = WINDOW_FLAG_HIDDEN, .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, - { + [WINDOW_UPDATE_HIER_UPDATE] { .flags = SIMPLE_WINDOW_UPDATE_1, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, - { + [WINDOW_UPDATE_DARKENED] { .flags = SIMPLE_WINDOW_UPDATE_DARKENING, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 100, .opacity = 0 }, - { + [WINDOW_UPDATE_TRANSPARENT] { .flags = SIMPLE_WINDOW_UPDATE_DARKENING, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, - { + [WINDOW_UPDATE_OPAQUE] { .flags = SIMPLE_WINDOW_UPDATE_OPACITY, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 184 }, - { + [WINDOW_UPDATE_SHOW_TRANSPARENT] { .flags = SIMPLE_WINDOW_UPDATE_OPACITY, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 255 }, - { + [WINDOW_UPDATE_SHOW_DARKENED] { .flags = SIMPLE_WINDOW_UPDATE_OPACITY, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 184 }, - { + [WINDOW_UPDATE_9] { .flags = SIMPLE_WINDOW_UPDATE_DARKENING, .windowFlagsSet = 0, .windowFlagsUnset = WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION, @@ -115,7 +115,7 @@ SimpleWindowUpdateData gSimpleWindowUpdates[] = { {}, {}, {}, - {} + {}, }; u8 gWindowAppearScales[] = { 50, 80, 100, 105, 100 }; @@ -272,7 +272,7 @@ void render_windows(s32* windowsArray, s32 parent, s32 flags, s32 baseX, s32 bas width = childWindow->width; height = childWindow->height; - if (fpUpdateIdx > 0 && fpUpdateIdx < 14) { + if (fpUpdateIdx > 0 && fpUpdateIdx < ARRAY_COUNT(gSimpleWindowUpdates)) { SimpleWindowUpdateData* updateData = &gSimpleWindowUpdates[fpUpdateIdx]; childWindow->flags |= updateData->windowFlagsSet; childWindow->flags &= ~updateData->windowFlagsUnset; diff --git a/src/world/actions.c b/src/world/actions.c index 657e8bb4b5c..0bf033d5f8f 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -46,8 +46,8 @@ f32 GravityParamsStartJump[] = { 15.7566404343f, -7.38624f, 3.44693994522f, -0.7 f32 GravityParamsStartFall[] = { 0.154342994094f, -0.350080013275f, -0.182262003422f, 0.0115200001746f }; // default move speeds -f32 D_800F7B70 = 2.0f; // walk -f32 D_800F7B74 = 4.0f; // run +f32 DefaultWalkSpeed = 2.0f; // walk +f32 DefaultMoveSpeed = 4.0f; // run f32 D_800F7B78 = 32.0f; // max jump f32 D_800F7B7C = -32.0f; // ??? diff --git a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c index f0a0d16e211..fa14321f0fc 100644 --- a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c +++ b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c @@ -132,9 +132,9 @@ void N(AvoidPlayerAI_Chase)(Evt* script, MobileAISettings* npcAISettings, EnemyD } else { if (npc->curAnim != enemy->animList[ENEMY_ANIM_INDEX_MELEE_PRE]) { if (npc->moveSpeed < 4.0) { - spawn_surface_effects(npc, SURFACE_INTERACT_WALK); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_WALK); } else { - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); } npc_move_heading(npc, npc->moveSpeed, npc->yaw); } diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index ba3fed86fbb..e27dff17043 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -185,7 +185,7 @@ void N(CleftAI_Tackle)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol f32 posX, posY, posZ; s32 phi_s1 = false; - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (is_point_outside_territory(enemy->territory->wander.detectShape, diff --git a/src/world/common/enemy/ai/GuardAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c index a7347f59144..c7de1eca865 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -121,7 +121,7 @@ void N(GuardAI_Chase)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolum script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; } else { npc_move_heading(npc, npc->moveSpeed, npc->yaw); - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); npc->duration--; if (npc->duration == 0) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; diff --git a/src/world/common/enemy/ai/States_PatrolAI.inc.c b/src/world/common/enemy/ai/States_PatrolAI.inc.c index a256fe0806b..f1e4b548fd1 100644 --- a/src/world/common/enemy/ai/States_PatrolAI.inc.c +++ b/src/world/common/enemy/ai/States_PatrolAI.inc.c @@ -69,9 +69,9 @@ void N(PatrolAI_Move)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu if (npc->turnAroundYawAdjustment == 0) { if (npc->moveSpeed < 4.0) { - spawn_surface_effects(npc, SURFACE_INTERACT_WALK); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_WALK); } else { - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); } //TODO strange match -- index and array are backwards! x = script->AI_PATROL_GOAL_INDEX[enemy->territory->patrol.points].x; @@ -218,7 +218,7 @@ void N(PatrolAI_Chase)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol npc->duration = 25; script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; } else { - spawn_surface_effects(npc, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_RUN); npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (npc->duration > 0) { npc->duration--; diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index ad9a103c962..128471c97c0 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -334,7 +334,7 @@ API_CALLABLE(N(UseAbility)) { if (script->functionTemp[1] < 45) { if (!(npc->flags & NPC_FLAG_COLLDING_WITH_WORLD) && !N(MovementBlocked)) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); - spawn_surface_effects(npc, SURFACE_INTERACT_WALK); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_WALK); } else { N(MovementBlocked) = true; } @@ -424,7 +424,7 @@ API_CALLABLE(N(UseAbility)) { break; } exec_ShakeCam1(0, 0, 20); - spawn_surface_effects(npc, SURFACE_INTERACT_LAND); + npc_surface_spawn_fx(npc, SURFACE_INTERACT_LAND); collisionStatus->bombetteExploded = 0; collisionStatus->bombetteExplosionPos.x = npc->pos.x; collisionStatus->bombetteExplosionPos.y = npc->pos.y; diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 3fbbf8fd02a..6194a60fd6b 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -459,7 +459,7 @@ API_CALLABLE(N(UseAbility)) { kooper->pos.y = posY; kooper->pos.z = posZ; kooper->planarFlyDist += kooper->moveSpeed; - spawn_surface_effects(kooper, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(kooper, SURFACE_INTERACT_RUN); kooper->moveSpeed += 2.0; if (kooper->moveSpeed > 14.0) { @@ -526,7 +526,7 @@ API_CALLABLE(N(UseAbility)) { kooper->pos.z = posZ; kooper->planarFlyDist += kooper->moveSpeed; - spawn_surface_effects(kooper, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(kooper, SURFACE_INTERACT_RUN); kooper->moveSpeed -= 6.0; if (kooper->moveSpeed < 0.01) { @@ -560,7 +560,7 @@ API_CALLABLE(N(UseAbility)) { kooper->yaw = angleToStartPos + get_clamped_angle_diff(kooper->yaw, angleToStartPos) * 0.125f; npc_move_heading(kooper, -kooper->moveSpeed, kooper->yaw); kooper->planarFlyDist -= kooper->moveSpeed; - spawn_surface_effects(kooper, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(kooper, SURFACE_INTERACT_RUN); kooper->moveSpeed += 4.0/3.0; if (kooper->moveSpeed > 14.0) { diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 41a9e5697e8..3fb94982dbc 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -464,7 +464,7 @@ void N(update_riding_physics)(Npc* lakilester) { lakilester->pos.z += (z - lakilester->pos.z) / 5.0f; } - spawn_surface_effects(lakilester, SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(lakilester, SURFACE_INTERACT_RUN); } else { moveAngle = 90.0f; diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 364a381fe09..dc1b3bcdd3a 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -535,7 +535,7 @@ API_CALLABLE(N(UseAbility)) { parakarry->pos.y = playerStatus->pos.y + 32.0f; y = parakarry->pos.y; parakarry->pos.y = playerStatus->pos.y; - spawn_surface_effects(parakarry, SURFACE_INTERACT_WALK); + npc_surface_spawn_fx(parakarry, SURFACE_INTERACT_WALK); parakarry->pos.y = y; if (hitAbove) { diff --git a/src/world/partners.c b/src/world/partners.c index 9b9ab35a9bb..38d3a9f5943 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -1292,7 +1292,7 @@ void partner_walking_follow_player(Npc* partner) { } partner->yaw = yaw; npc_move_heading(partner, partner->moveSpeed, partner->yaw); - spawn_surface_effects(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); surfaceType = get_collider_flags(partner->curFloor); if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA @@ -1409,7 +1409,7 @@ void partner_walking_follow_player(Npc* partner) { partner->jumpVel = 0.0f; partner->pos.y = y; partner->yaw = atan2(x, z, playerStatus->pos.x, playerStatus->pos.z); - spawn_surface_effects(partner, SURFACE_INTERACT_LAND); + npc_surface_spawn_fx(partner, SURFACE_INTERACT_LAND); wPartnerFollowState = 0; distance = dist2D(partner->pos.x, partner->pos.z, partner->moveToPos.x, partner->moveToPos.z); if (distance < 5.0) { @@ -1485,7 +1485,7 @@ void partner_walking_follow_player(Npc* partner) { } partner->yaw = yaw; npc_move_heading(partner, partner->moveSpeed, yaw); - spawn_surface_effects(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); distance = 1000.0f; x = partner->pos.x; z = partner->pos.z; @@ -1604,7 +1604,7 @@ void partner_walking_follow_player(Npc* partner) { partner->moveSpeed = wPartnerMoveSpeed; partner->yaw = D_800F8034; npc_move_heading(partner, partner->moveSpeed, partner->yaw); - spawn_surface_effects(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); } else { partner_clear_player_tracking(partner); partner->moveSpeed = 0.0f; @@ -1665,7 +1665,7 @@ void partner_walking_follow_player(Npc* partner) { partner->jumpVel = 0.0f; partner->pos.y = y; partner->yaw = atan2(x, z, playerStatus->pos.x, playerStatus->pos.z); - spawn_surface_effects(partner, SURFACE_INTERACT_LAND); + npc_surface_spawn_fx(partner, SURFACE_INTERACT_LAND); wPartnerFollowState = 50; } break; @@ -2344,7 +2344,7 @@ s32 partner_get_out(Npc* partner) { partner->pos.z = partner->moveToPos.z; if (partner->flags & NPC_FLAG_GROUNDED) { if (!wPartner->isFlying) { - spawn_surface_effects(partner, SURFACE_INTERACT_LAND); + npc_surface_spawn_fx(partner, SURFACE_INTERACT_LAND); } } return true; @@ -2559,7 +2559,7 @@ void partner_move_to_goal(Npc* partner, s32 isFlying) { npc_move_heading(partner, partner->moveSpeed, partner->yaw); } - spawn_surface_effects(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); + npc_surface_spawn_fx(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); } else { partner->flags &= ~NPC_FLAG_IGNORE_WORLD_COLLISION; partner->curAnim = gPartnerAnimations[wCurrentPartnerId].idle; diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index dbcbb0d0cc6..9176a4c52ec 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -252,7 +252,7 @@ dead_dma_copy = 0x8002AA2C; dead_get_entity_by_index = 0x80118BB0; dead_cos_rad = 0x8002B4C0; dead_fx_sun = 0x80077BD0; -dead_spawn_surface_effects = 0x80041080; +dead_npc_surface_spawn_fx = 0x80041080; dead_set_max_star_power = 0x800F1D9C; dead_sync_status_bar = 0x800F1730; dead_get_npc_by_index = 0x8003C43C; diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index bddf3d60b4f..eb5260d7363 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -502,7 +502,7 @@ appendGfx_shading_palette = 0x80147148; mdl_project_tex_coords = 0x8011a70c; msg_get_print_char_width = 0x80123ff0; msg_copy_to_print_buffer = 0x8012294c; -render_hud_element = 0x8014138c; +render_complex_hud_element = 0x8014138c; get_model_from_list_index = 0x80119110; mdl_get_vertex_count = 0x8011a408; gMatrixListPos = 0x80072e60; @@ -515,7 +515,7 @@ MsgCharImgTitle = 0x802ed970; MsgCharImgSubtitle = 0x802f39d0; sfx_play_sound_with_params = 0x80148248; heap_malloc = 0x8002a9b4; -D_80159180 = 0x8015b500; +FrameQuadIndex = 0x8015b500; D_80159B50 = 0x8015bed0; gOverrideFlags = 0x80099228; ItemSpawnWithinPlayerPickupDelay = 0x80158926; @@ -570,9 +570,9 @@ nuPiReadRom = 0x8005eb40; gCurrentCameraID = 0x80076070; clamp_angle = 0x800297f4; add_vec2D_polar = 0x80029c6c; -gHudElementSizes = 0x8014d75c; +HudElemSizes = 0x8014d75c; imgfx_update = 0x8013922c; -D_8014F0C8 = 0x8014d858; +HudElemTemplateQuad = 0x8014d858; nuGfxCfb_ptr = 0x80099224; SpriteShadingPalette = 0x8015bc00; gCameras = 0x800b07d0; @@ -616,7 +616,7 @@ enable_npc_blur = 0x8003a3d4; disable_npc_blur = 0x8003a45c; set_npc_yaw = 0x8003a9f0; npc_set_imgfx_params = 0x8003ccd4; -spawn_surface_effects = 0x8003cd10; +npc_surface_spawn_fx = 0x8003cd10; check_conversation_trigger = 0x8004288c; is_starting_conversation = 0x800437f8; get_collider_flags = 0x8005b458; @@ -4321,8 +4321,8 @@ set_screen_overlay_params_back = 0x80136534; get_screen_overlay_params = 0x80136550; set_screen_overlay_color = 0x801365A0; set_screen_overlay_center = 0x801365DC; -func_80144218 = 0x801429A8; -func_80144238 = 0x801429C8; +hud_element_draw_complex_hud_first = 0x801429A8; +hud_element_draw_complex_hud_next = 0x801429C8; hud_element_get_script = 0x80143040; hud_element_get_render_pos = 0x8014313C; hud_element_set_render_depth = 0x8014316C; diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 07cacecb9fc..a6c465803e5 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -955,7 +955,7 @@ fx_underwater = 0x80071B50; // type:func rom:0x4CF50 bgm_set_battle_song = 0x8015003C; // type:func rom:0xE4ECC get_npc_safe = 0x8003A808; // type:func rom:0x15C08 set_global_flag = 0x8014A500; // type:func rom:0xDF390 -spawn_surface_effects = 0x8003D320; // type:func rom:0x18720 +npc_surface_spawn_fx = 0x8003D320; // type:func rom:0x18720 fx_effect_63 = 0x80071D90; // type:func rom:0x4D190 add_star_pieces = 0x800EA110; // type:func rom:0x835C0 npc_set_imgfx_params = 0x8003D2E4; // type:func rom:0x186E4 @@ -2571,26 +2571,26 @@ imgfx_appendGfx_mesh_grid = 0x80142B64; // type:func rom:0xD79F4 imgfx_appendGfx_mesh_anim = 0x801433A0; // type:func rom:0xD8230 imgfx_appendGfx_mesh_strip = 0x801439B4; // type:func rom:0xD8844 imgfx_load_anim = 0x801412D0; // type:func rom:0xD6160 -gHudElementAuxCache = 0x80154060; // rom:0xE8EF0 -gHudElementCacheCapacity = 0x80154064; // rom:0xE8EF4 +HudElemAuxCache = 0x80154060; // rom:0xE8EF0 +HudElemCacheCapacity = 0x80154064; // rom:0xE8EF4 HES_Empty = 0x80154068; // rom:0xE8EF8 -gHudElementSizes = 0x8015406C; // rom:0xE8EFC +HudElemSizes = 0x8015406C; // rom:0xE8EFC D_8014F068 = 0x80154108; // rom:0xE8F98 -gHudElementsDLBackUI = 0x80154118; // rom:0xE8FA8 -gHudElementsDLFrontUI = 0x80154140; // rom:0xE8FD0 -D_8014F0C8 = 0x80154168; // rom:0xE8FF8 -HudElementLights = 0x801541A8; // rom:0xE9038 +HudElemBackInitGfx = 0x80154118; // rom:0xE8FA8 +HudElemFrontInitGfx = 0x80154140; // rom:0xE8FD0 +HudElemTemplateQuad = 0x80154168; // rom:0xE8FF8 +HudElemLights = 0x801541A8; // rom:0xE9038 hud_element_load_script = 0x80144400; // type:func rom:0xD9290 hud_element_draw_rect = 0x801447B4; // type:func rom:0xD9644 hud_element_setup_cam = 0x801464A8; // type:func rom:0xDB338 init_hud_element_list = 0x801463B0; // type:func rom:0xDB240 hud_element_update = 0x801467B4; // type:func rom:0xDB644 -render_hud_element = 0x80147CAC; // type:func rom:0xDCB3C -func_80143C48 = 0x80148CF8; // type:func rom:0xDDB88 -func_80144218 = 0x801492C8; // type:func rom:0xDE158 -func_80144238 = 0x801492E8; // type:func rom:0xDE178 -func_80144258 = 0x80149308; // type:func rom:0xDE198 -func_80144278 = 0x80149328; // type:func rom:0xDE1B8 +render_complex_hud_element = 0x80147CAC; // type:func rom:0xDCB3C +immediately_render_complex_hud_element = 0x80148CF8; // type:func rom:0xDDB88 +hud_element_draw_complex_hud_first = 0x801492C8; // type:func rom:0xDE158 +hud_element_draw_complex_hud_next = 0x801492E8; // type:func rom:0xDE178 +hud_element_draw_complex_battle_first = 0x80149308; // type:func rom:0xDE198 +hud_element_draw_complex_battle_next = 0x80149328; // type:func rom:0xDE1B8 draw_hud_element_internal = 0x80149348; // type:func rom:0xDE1D8 hud_element_draw_without_clipping = 0x80149890; // type:func rom:0xDE720 hud_element_get_script = 0x80149960; // type:func rom:0xDE7F0 @@ -2602,8 +2602,8 @@ hud_element_clear_flags = 0x80149ADC; // type:func rom:0xDE96C ALT_clear_hud_element_cache = 0x80149B0C; // type:func rom:0xDE99C hud_element_set_scale = 0x80149CD0; // type:func rom:0xDEB60 hud_element_use_preset_size = 0x80149EA4; // type:func rom:0xDED34 -func_80144E4C = 0x80149EFC; // type:func rom:0xDED8C -func_80144E74 = 0x80149F24; // type:func rom:0xDEDB4 +hud_element_get_variable = 0x80149EFC; // type:func rom:0xDED8C +hud_element_set_variable = 0x80149F24; // type:func rom:0xDEDB4 hud_element_set_alpha = 0x80149F60; // type:func rom:0xDEDF0 hud_element_create_transform_A = 0x80149FD8; // type:func rom:0xDEE68 hud_element_create_transform_B = 0x8014A088; // type:func rom:0xDEF18 @@ -2717,7 +2717,7 @@ drawbox_message_delegate = 0x8012CD90; // type:func rom:0xC1C20 appendGfx_msg_prim_rect = 0x80131B80; // type:func rom:0xC6A10 msg_get_glyph = 0x80133A58; // type:func rom:0xC88E8 gAuxSpriteShadingProfile = 0x80156310; -gHudElementsNumber = 0x80156314; +HudElemCount = 0x80156314; gCurrentCustomModelGfxBuildersPtr = 0x80156318; D_801512BC = 0x8015631C; entity_numEntities = 0x80156320; @@ -2897,7 +2897,7 @@ gHudElementCacheSizeBattle = 0x8015D4F4; D_80158578 = 0x8015D4F8; gHudElementCacheTableRasterBattle = 0x8015D500; gHudElementCacheTablePaletteBattle = 0x8015DB00; -D_80159180 = 0x8015E100; +FrameQuadIndex = 0x8015E100; wTriggerList = 0x8015E110; bTriggerList = 0x8015E210; gCurrentTriggerListPtr = 0x8015E310; diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index df1503ef4fe..fa505cd2bd3 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -58,7 +58,7 @@ dead_get_npc_unsafe = get_npc_unsafe + 0x3880; dead_get_npc_safe = get_npc_safe + 0x389C; dead_disable_npc_shadow = disable_npc_shadow + 0x389C; dead_set_npc_yaw = set_npc_yaw + 0x38C0; -dead_spawn_surface_effects = spawn_surface_effects + 0x38D0; +dead_npc_surface_spawn_fx = npc_surface_spawn_fx + 0x38D0; dead_get_enemy = get_enemy + 0x3CBC; dead_SetEncounterStatusFlags = SetEncounterStatusFlags + 0x3F50; dead_IsStartingConversation = IsStartingConversation + 0x3F50; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index cf051426a69..071aeb19040 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -311,7 +311,7 @@ npc_find_standing_on_entity = 0x8003D1D4; // type:func rom:0x185D4 npc_get_collider_below = 0x8003D2F8; // type:func rom:0x186F8 npc_imgfx_update = 0x8003D3BC; // type:func rom:0x187BC npc_set_imgfx_params = 0x8003D624; // type:func rom:0x18A24 -spawn_surface_effects = 0x8003D660; // type:func rom:0x18A60 +npc_surface_spawn_fx = 0x8003D660; // type:func rom:0x18A60 spawn_default_surface_effects = 0x8003D788; // type:func rom:0x18B88 spawn_flower_surface_effects = 0x8003DA38; // type:func rom:0x18E38 spawn_cloud_surface_effects = 0x8003DC38; // type:func rom:0x19038 @@ -3100,8 +3100,8 @@ D_800F7B48 = 0x800F7B48; // rom:0x90FF8 D_800F7B4C = 0x800F7B4C; // rom:0x90FFC GravityParamsStartJump = 0x800F7B50; // rom:0x91000 GravityParamsStartFall = 0x800F7B60; // rom:0x91010 -D_800F7B70 = 0x800F7B70; // rom:0x91020 -DefaultMoveSpeeds = 0x800F7B74; // rom:0x91024 +DefaultWalkSpeed = 0x800F7B70; // rom:0x91020 +DefaultMoveSpeed = 0x800F7B74; // rom:0x91024 D_800F7B80 = 0x800F7B80; // rom:0x91030 D_800F7B84 = 0x800F7B84; // rom:0x91034 D_800F7B90 = 0x800F7B90; // rom:0x91040 @@ -4312,13 +4312,13 @@ update_hud_elements = 0x80141610; // type:func rom:0xD7D10 hud_element_update = 0x80141704; // type:func rom:0xD7E04 render_hud_elements_backUI = 0x80142210; // type:func rom:0xD8910 render_hud_elements_frontUI = 0x8014271C; // type:func rom:0xD8E1C -render_hud_element = 0x80142BFC; // type:func rom:0xD92FC +render_complex_hud_element = 0x80142BFC; // type:func rom:0xD92FC render_transformed_hud_elements = 0x801436B4; // type:func rom:0xD9DB4 -func_80143C48 = 0x80143C48; // type:func rom:0xDA348 -func_80144218 = 0x80144218; // type:func rom:0xDA918 -func_80144238 = 0x80144238; // type:func rom:0xDA938 -func_80144258 = 0x80144258; // type:func rom:0xDA958 -func_80144278 = 0x80144278; // type:func rom:0xDA978 +immediately_render_complex_hud_element = 0x80143C48; // type:func rom:0xDA348 +hud_element_draw_complex_hud_first = 0x80144218; // type:func rom:0xDA918 +hud_element_draw_complex_hud_next = 0x80144238; // type:func rom:0xDA938 +hud_element_draw_complex_battle_first = 0x80144258; // type:func rom:0xDA958 +hud_element_draw_complex_battle_next = 0x80144278; // type:func rom:0xDA978 draw_hud_element_internal = 0x80144298; // type:func rom:0xDA998 hud_element_draw_clipped = 0x801447A8; // type:func rom:0xDAEA8 hud_element_draw_next = 0x801447C4; // type:func rom:0xDAEC4 @@ -4335,8 +4335,8 @@ hud_element_clear_flags = 0x80144A2C; // type:func rom:0xDB12C ALT_clear_hud_element_cache = 0x80144A5C; // type:func rom:0xDB15C hud_element_set_scale = 0x80144C20; // type:func rom:0xDB320 hud_element_use_preset_size = 0x80144DF4; // type:func rom:0xDB4F4 -func_80144E4C = 0x80144E4C; // type:func rom:0xDB54C -func_80144E74 = 0x80144E74; // type:func rom:0xDB574 +hud_element_get_variable = 0x80144E4C; // type:func rom:0xDB54C +hud_element_set_variable = 0x80144E74; // type:func rom:0xDB574 hud_element_set_alpha = 0x80144EB0; // type:func rom:0xDB5B0 hud_element_set_tint = 0x80144EFC; // type:func rom:0xDB5FC hud_element_create_transform_A = 0x80144F28; // type:func rom:0xDB628 @@ -4595,15 +4595,15 @@ ImgFXVtxBufferCapacity = 0x8014EE60; // rom:0xE5560 D_8014EE68 = 0x8014EE68; // rom:0xE5568 ImgFXRenderModes = 0x8014EE98; // rom:0xE5598 ImgFXAnimOffsets = 0x8014EF64; // rom:0xE5664 -gHudElementAuxCache = 0x8014EFC0; // rom:0xE56C0 -gHudElementCacheCapacity = 0x8014EFC4; // rom:0xE56C4 +HudElemAuxCache = 0x8014EFC0; // rom:0xE56C0 +HudElemCacheCapacity = 0x8014EFC4; // rom:0xE56C4 HES_Empty = 0x8014EFC8; // rom:0xE56C8 -gHudElementSizes = 0x8014EFCC; // rom:0xE56CC +HudElemSizes = 0x8014EFCC; // rom:0xE56CC D_8014F068 = 0x8014F068; // rom:0xE5768 -gHudElementsDLBackUI = 0x8014F078; // rom:0xE5778 -gHudElementsDLFrontUI = 0x8014F0A0; // rom:0xE57A0 -D_8014F0C8 = 0x8014F0C8; // rom:0xE57C8 -HudElementLights = 0x8014F108; // rom:0xE5808 +HudElemBackInitGfx = 0x8014F078; // rom:0xE5778 +HudElemFrontInitGfx = 0x8014F0A0; // rom:0xE57A0 +HudElemTemplateQuad = 0x8014F0C8; // rom:0xE57C8 +HudElemLights = 0x8014F108; // rom:0xE5808 D_8014F110 = 0x8014F110; // rom:0xE5810 gCloudyFlowerFieldsBg = 0x8014F120; // rom:0xE5820 gSunnyFlowerFieldsBg = 0x8014F128; // rom:0xE5828 @@ -4761,7 +4761,7 @@ D_80151278 = 0x80151278; // rom:0xE7978 D_80151280 = 0x80151280; // rom:0xE7980 D_80151288 = 0x80151288; // rom:0xE7988 sort_scripts = 0x802C3000; // type:func rom:0xE79B0 -gHudElementsNumber = 0x801512B4; // rom:0xE79B4 +HudElemCount = 0x801512B4; // rom:0xE79B4 gCurrentCustomModelGfxBuildersPtr = 0x801512B8; // rom:0xE79B8 D_801512BC = 0x801512BC; // rom:0xE79BC entity_numEntities = 0x801512C0; // rom:0xE79C0 @@ -5159,7 +5159,7 @@ SetInterpCamParams = 0x802CABE8; // type:func rom:0xEF598 SetNoInterpCamParams = 0x802CACC0; // type:func rom:0xEF670 SetCamBGColor = 0x802CAD98; // type:func rom:0xEF748 SetCamLookTarget = 0x802CAE50; // type:func rom:0xEF800 -D_80159180 = 0x80159180; // rom:0xEF880 +FrameQuadIndex = 0x80159180; // rom:0xEF880 wTriggerList = 0x80159190; // rom:0xEF890 SetCamTarget = 0x802CAF2C; // type:func rom:0xEF8DC bTriggerList = 0x80159290; // rom:0xEF990 @@ -7175,8 +7175,8 @@ DemoBattleBeginDelay = 0x802809F8; // rom:0x1AF2D8 gTattleBgTextureYOffset = 0x802809FA; // rom:0x1AF2DA bHPDigitHudScripts = 0x802809FC; // rom:0x1AF2DC BattleScreenFadeAmt = 0x80280A30; // rom:0x1AF310 -BtlPutPartnerAway = 0x80280A34; // rom:0x1AF314 -BtlBringPartnerOut = 0x80280B6C; // rom:0x1AF44C +EVS_BtlPutPartnerAway = 0x80280A34; // rom:0x1AF314 +EVS_BtlBringPartnerOut = 0x80280B6C; // rom:0x1AF44C BattleCam_IsFrozen = 0x80280CE0; // rom:0x1AF5C0 BattleCam_CurrentPresetID = 0x80280CE4; // rom:0x1AF5C4 EVS_BattleCam_Interrupt = 0x80280CE8; // rom:0x1AF5C8 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 8f8016489da..c316078d359 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -68,7 +68,7 @@ dead_get_npc_unsafe = get_npc_unsafe + 0x39D0; dead_get_npc_safe = get_npc_safe + 0x39EC; dead_disable_npc_shadow = disable_npc_shadow + 0x39EC; dead_set_npc_yaw = set_npc_yaw + 0x3A10; -dead_spawn_surface_effects = spawn_surface_effects + 0x3A20; +dead_npc_surface_spawn_fx = npc_surface_spawn_fx + 0x3A20; dead_get_enemy = get_enemy + 0x3E0C; dead_SetEncounterStatusFlags = SetEncounterStatusFlags + 0x40A0; dead_IsStartingConversation = IsStartingConversation + 0x40A0; From 75f850c0a8958fca32d81e13dcd688dcfd25c697 Mon Sep 17 00:00:00 2001 From: z64a Date: Sun, 23 Nov 2025 18:03:48 -0500 Subject: [PATCH 04/18] pt 3 --- src/state_battle.c | 55 +++++++++++++++++++++-------------------- src/state_file_select.c | 3 ++- src/state_pause.c | 3 ++- src/world/world.c | 3 ++- ver/us/symbol_addrs.txt | 6 ++--- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/state_battle.c b/src/state_battle.c index 94080407112..e3467a50239 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -21,9 +21,9 @@ s32 D_800778AC[] = { }; #endif -BSS s8 D_800A0900; -BSS s32 D_800A0904; -BSS s32 D_800A0908; +BSS s8 BattleTransitionDelay; +BSS s32 SavedWorldAnimFlags; +BSS s32 SavedWorldFreezeMode; #if defined(SHIFT) || VERSION_IQUE #define shim_battle_heap_create_obfuscated battle_heap_create @@ -32,29 +32,29 @@ BSS s32 D_800A0908; extern ShapeFile gMapShapeData; void state_init_battle(void) { - D_800A0900 = 5; + BattleTransitionDelay = 5; } void state_step_battle(void) { - u32 currentBattleSelection; + u32 currentBattleArea; u32 currentBattleIndex; - if (D_800A0900 == 5) { + if (BattleTransitionDelay == 5) { if (nuGfxCfb[1] != nuGfxCfb_ptr) { return; } - D_800A0900--; + BattleTransitionDelay--; gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; nuContRmbForceStop(); } - if (D_800A0900 >= 0) { - if (D_800A0900 > 0) { - D_800A0900--; + if (BattleTransitionDelay >= 0) { + if (BattleTransitionDelay > 0) { + BattleTransitionDelay--; return; } - D_800A0900 = -1; + BattleTransitionDelay = -1; nuGfxSetCfb(bFrameBuffers, 2); nuContRmbForceStopEnd(); sfx_stop_env_sounds(); @@ -69,11 +69,11 @@ void state_step_battle(void) { sfx_clear_env_sounds(0); - currentBattleSelection = UNPACK_BTL_AREA(gCurrentBattleID); + currentBattleArea = UNPACK_BTL_AREA(gCurrentBattleID); currentBattleIndex = UNPACK_BTL_INDEX(gCurrentBattleID); if (gGameStatusPtr->peachFlags & PEACH_FLAG_IS_PEACH || - (currentBattleSelection == BTL_AREA_KKJ && currentBattleIndex == 0)) { + (currentBattleArea == BTL_AREA_KKJ && currentBattleIndex == 0)) { gGameStatusPtr->peachFlags |= PEACH_FLAG_IS_PEACH; spr_init_sprites(PLAYER_SPRITES_PEACH_BATTLE); } else { @@ -98,13 +98,13 @@ void state_step_battle(void) { initialize_battle(); btl_save_world_cameras(); load_battle_section(); - D_800A0904 = gPlayerStatusPtr->animFlags; + SavedWorldAnimFlags = gPlayerStatusPtr->animFlags; gPlayerStatusPtr->animFlags &= ~PA_FLAG_PULSE_STONE_VISIBLE; - D_800A0908 = get_time_freeze_mode(); + SavedWorldFreezeMode = get_time_freeze_mode(); set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; - if (D_800A0900 >= 0) { + if (BattleTransitionDelay >= 0) { return; } } @@ -120,7 +120,7 @@ void state_step_battle(void) { void state_drawUI_battle(void) { draw_encounter_ui(); - if (D_800A0900 < 0) { + if (BattleTransitionDelay < 0) { btl_draw_ui(); } } @@ -128,7 +128,7 @@ void state_drawUI_battle(void) { void state_init_end_battle(void) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; nuContRmbForceStop(); - D_800A0900 = 5; + BattleTransitionDelay = 5; } void state_step_end_battle(void) { @@ -137,10 +137,10 @@ void state_step_end_battle(void) { MapSettings* mapSettings; MapConfig* mapConfig; - if (D_800A0900 >= 0) { - D_800A0900--; - if (D_800A0900 == 0) { - D_800A0900 = -1; + if (BattleTransitionDelay >= 0) { + BattleTransitionDelay--; + if (BattleTransitionDelay == 0) { + BattleTransitionDelay = -1; nuGfxSetCfb(bFrameBuffers, 3); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; nuContRmbForceStopEnd(); @@ -170,7 +170,7 @@ void state_step_end_battle(void) { if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { npc_reload_all(); - playerStatus->animFlags = D_800A0904; + playerStatus->animFlags = SavedWorldAnimFlags; set_game_mode(GAME_MODE_DEMO); } else { void* mapShape; @@ -192,16 +192,17 @@ void state_step_end_battle(void) { if (mapSettings->background != nullptr) { set_background(mapSettings->background); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } mdl_load_all_textures(mapSettings->modelTreeRoot, get_asset_offset(wMapTexName, &sizeTemp), sizeTemp); mdl_calculate_model_sizes(); npc_reload_all(); - playerStatus->animFlags = D_800A0904; - if (D_800A0908 != 0) { - set_time_freeze_mode(D_800A0908); + playerStatus->animFlags = SavedWorldAnimFlags; + if (SavedWorldFreezeMode != 0) { + set_time_freeze_mode(SavedWorldFreezeMode); } set_game_mode(GAME_MODE_WORLD); } diff --git a/src/state_file_select.c b/src/state_file_select.c index 507662183bd..d4e7a20d371 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -427,7 +427,8 @@ void state_step_exit_language_select(void) { if (bgHeader != nullptr) { set_background(bgHeader); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } mdl_calculate_model_sizes(); diff --git a/src/state_pause.c b/src/state_pause.c index b9cecb5706f..136c5bf28a5 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -253,7 +253,8 @@ void state_step_unpause(void) { if (mapSettings->background != nullptr) { set_background(mapSettings->background); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } gGameStatusPtr->backgroundDarkness = gGameStatusPtr->savedBackgroundDarkness; diff --git a/src/world/world.c b/src/world/world.c index 30eaaf76fe4..7b87cedf930 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -216,7 +216,8 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { if (mapSettings->background != nullptr) { set_background(mapSettings->background); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } gCurrentCameraID = CAM_DEFAULT; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 071aeb19040..7b4e97be1cd 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2714,9 +2714,9 @@ D_800A08E8 = 0x800A08E8; // rom:0x7BCE8 D_800A08EC = 0x800A08EC; // rom:0x7BCEC gameMode = 0x800A08F0; // rom:0x7BCF0 D_800A08F4 = 0x800A08F4; // rom:0x7BCF4 -D_800A0900 = 0x800A0900; // rom:0x7BD00 -D_800A0904 = 0x800A0904; // rom:0x7BD04 -D_800A0908 = 0x800A0908; // rom:0x7BD08 +BattleTransitionDelay = 0x800A0900; // rom:0x7BD00 +SavedWorldAnimFlags = 0x800A0904; // rom:0x7BD04 +SavedWorldFreezeMode = 0x800A0908; // rom:0x7BD08 D_800A090C = 0x800A090C; // rom:0x7BD0C gLogosImages = 0x800A0910; // rom:0x7BD10 gLogosImage3 = 0x800A0914; // rom:0x7BD14 From f5ce7426a6b0c230288555a7bc4bfd4f9b42c46a Mon Sep 17 00:00:00 2001 From: z64a Date: Sun, 23 Nov 2025 18:08:58 -0500 Subject: [PATCH 05/18] pt 3 --- include/filemenu.h | 2 +- src/battle/190B20.c | 4 +- src/battle/btl_states_actions.c | 170 +-- src/battle/btl_states_menus.c | 2050 +++++++++++++++---------------- src/battle/popup_messages.c | 12 +- src/evt/demo_api.c | 48 +- src/evt/script_list.c | 4 +- src/filemenu/filemenu_common.c | 12 +- src/filemenu/filemenu_info.c | 6 +- src/filemenu/filemenu_main.c | 16 +- src/filemenu/filemenu_yesno.c | 8 +- src/world/action/step_up.c | 6 +- src/world/action/walk.c | 4 +- ver/us/symbol_addrs.txt | 282 ++--- 14 files changed, 1312 insertions(+), 1312 deletions(-) diff --git a/include/filemenu.h b/include/filemenu.h index 3525812c79c..21534b4846b 100644 --- a/include/filemenu.h +++ b/include/filemenu.h @@ -72,7 +72,7 @@ extern s32 filemenu_pressedButtons; extern HudElemID filemenu_cursorHID; extern s32 filemenu_heldButtons; extern s8 filemenu_filename_pos; -extern s32 filemenu_loadedFileIdx; +extern s32 filemenu_CopyFromFileIdx; extern s8 filemenu_currentMenu; extern s32 filemenu_8024C09C; extern HudElemID filemenu_cursorHIDs[1]; diff --git a/src/battle/190B20.c b/src/battle/190B20.c index 467d8af5ebe..b2b34cdbdb0 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -629,7 +629,7 @@ s32 func_8026324C(Actor* actor, Actor* targetActor) { return func_80263064(actor, targetActor, true); } -void func_80263268(void) { +void btl_check_can_change_partner(void) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; Actor* partner = battleStatus->partnerActor; @@ -664,7 +664,7 @@ void func_80263268(void) { } } -void func_80263300(void) { +void btl_init_menu_items(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; PlayerData* playerData = &gPlayerData; diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index b22163471f8..c8672ddf3aa 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -20,12 +20,12 @@ extern EvtScript EVS_Mario_OnActorCreate; extern EvtScript EVS_Peach_OnActorCreate; BSS s32 BattleEnemiesCreated; -BSS u8 D_8029F244; -BSS s32 BattleSubStateDelay; // generic delay time usable for various substates +BSS u8 NextEnemyWaitingOrdinal; +BSS s32 BattleSubstateDelay; // generic delay time usable for various substates BSS s32 D_8029F24C; BSS s32 RunAwayRewardStep; -BSS bool D_8029F254; -BSS s32 D_8029F258; +BSS bool BattleSkipActorTurn; +BSS s32 BattleStatusUpdateDelay; BSS s32 RunAwayRewardTotal; BSS s32 RunAwayRewardIncrement; BSS s32 D_8029F264; @@ -473,7 +473,7 @@ void btl_state_update_normal_start(void) { } BattleScreenFadeAmt = 305; - BattleSubStateDelay = 0; + BattleSubstateDelay = 0; gBattleSubState = BTL_SUBSTATE_NORMAL_START_FADE_IN; break; } @@ -484,8 +484,8 @@ void btl_state_update_normal_start(void) { break; } - BattleSubStateDelay++; - if (BattleSubStateDelay == 15) { + BattleSubstateDelay++; + if (BattleSubstateDelay == 15) { btl_cam_use_preset(BTL_CAM_DEFAULT); } @@ -737,8 +737,8 @@ void btl_state_update_begin_player_turn(void) { } battleStatus->stateFreezeCount = 0; - D_8029F254 = false; - D_8029F258 = 0; + BattleSkipActorTurn = false; + BattleStatusUpdateDelay = 0; if (battleStatus->outtaSightActive == 0) { gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_CHECK_WATER_BLOCK; @@ -883,7 +883,7 @@ void btl_state_update_begin_player_turn(void) { return; } - D_8029F254 = false; + BattleSkipActorTurn = false; player->disableDismissTimer = 0; player->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS | ACTOR_FLAG_USING_IDLE_ANIM; @@ -933,9 +933,9 @@ void btl_state_update_begin_player_turn(void) { if (player->debuff != 0) { if (player->debuff < 9) { - D_8029F254 = true; + BattleSkipActorTurn = true; } - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; player->debuffDuration--; if (player->debuffDuration <= 0) { if (player->debuff == STATUS_KEY_FROZEN) { @@ -975,7 +975,7 @@ void btl_state_update_begin_player_turn(void) { if (enemy->chillOutTurns == 0) { enemy->chillOutAmount = 0; remove_status_chill_out(enemy->hudElementDataIndex); - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; } } } @@ -1042,12 +1042,12 @@ void btl_state_update_begin_player_turn(void) { return; } - if (D_8029F258 != 0) { - D_8029F258--; + if (BattleStatusUpdateDelay != 0) { + BattleStatusUpdateDelay--; return; } - if (!D_8029F254) { + if (!BattleSkipActorTurn) { btl_set_state(BATTLE_STATE_SWITCH_TO_PLAYER); } else{ btl_set_state(BATTLE_STATE_BEGIN_PARTNER_TURN); @@ -1102,7 +1102,7 @@ void btl_state_update_begin_partner_turn(void) { if (gBattleSubState == BTL_SUBSTATE_BEGIN_PARTNER_TURN_INIT) { if (partner == nullptr) { - D_8029F254 = true; + BattleSkipActorTurn = true; gBattleSubState = BTL_SUBSTATE_BEGIN_PARTNER_TURN_END_DELAY; } else if ((battleStatus->flags2 & (BS_FLAGS2_PARTNER_TURN_USED | BS_FLAGS2_PLAYER_TURN_USED)) != (BS_FLAGS2_PARTNER_TURN_USED | BS_FLAGS2_PLAYER_TURN_USED)) { if (!(partner->flags & ACTOR_FLAG_NO_ATTACK)) { @@ -1121,20 +1121,20 @@ void btl_state_update_begin_partner_turn(void) { if (gBattleSubState == BTL_SUBSTATE_BEGIN_PARTNER_TURN_RESET_STATE) { if (btl_cam_is_moving_done()) { - D_8029F258 = 0; + BattleStatusUpdateDelay = 0; reset_actor_turn_info(); partner = battleStatus->partnerActor; battleStatus->actionResult = ACTION_RESULT_NONE; battleStatus->blockResult = BLOCK_RESULT_NONE; - D_8029F254 = false; + BattleSkipActorTurn = false; gBattleStatus.flags1 |= BS_FLAGS1_PARTNER_ACTING; gBattleStatus.flags2 |= BS_FLAGS1_PLAYER_IN_BACK; partner->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS; if (partner->koStatus != 0) { partner->koDuration--; - D_8029F254 = true; - D_8029F258 = 20; + BattleSkipActorTurn = true; + BattleStatusUpdateDelay = 20; if (partner->koDuration > 0) { partner->disableEffect->data.disableX->koDuration = partner->koDuration; } else { @@ -1189,12 +1189,12 @@ void btl_state_update_begin_partner_turn(void) { } if (gBattleSubState == BTL_SUBSTATE_BEGIN_PARTNER_TURN_END_DELAY) { - if (D_8029F258 != 0) { - D_8029F258--; + if (BattleStatusUpdateDelay != 0) { + BattleStatusUpdateDelay--; return; } gBattleStatus.flags2 &= ~BS_FLAGS2_NO_PLAYER_PAL_ADJUST; - if (!D_8029F254) { + if (!BattleSkipActorTurn) { btl_set_state(BATTLE_STATE_SWITCH_TO_PARTNER); } else { gBattleStatus.flags2 |= BS_FLAGS2_PARTNER_TURN_USED; @@ -1269,7 +1269,7 @@ void btl_state_update_transfer_turn(void) { } gBattleSubState = BTL_SUBSTATE_9_1; - D_8029F258 = 0; + BattleStatusUpdateDelay = 0; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; @@ -1313,7 +1313,7 @@ void btl_state_update_transfer_turn(void) { actor->debuff = 0; remove_status_debuff(actor->hudElementDataIndex); dispatch_event_actor(actor, EVENT_RECOVER_STATUS); - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; } } @@ -1322,7 +1322,7 @@ void btl_state_update_transfer_turn(void) { if (actor->staticDuration <= 0) { actor->staticStatus = 0; remove_status_static(actor->hudElementDataIndex); - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; } } @@ -1331,7 +1331,7 @@ void btl_state_update_transfer_turn(void) { if (actor->transparentDuration <= 0) { actor->transparentStatus = 0; remove_status_transparent(actor->hudElementDataIndex); - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; } } @@ -1339,7 +1339,7 @@ void btl_state_update_transfer_turn(void) { actor->stoneDuration--; if (actor->stoneDuration <= 0) { actor->stoneStatus = 0; - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; } } @@ -1355,7 +1355,7 @@ void btl_state_update_transfer_turn(void) { if (actor->debuff == STATUS_KEY_POISON) { gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; dispatch_damage_event_actor_0(actor, 1, EVENT_HIT); - D_8029F258 = 20; + BattleStatusUpdateDelay = 20; } } } @@ -1466,8 +1466,8 @@ void btl_state_update_transfer_turn(void) { } if (gBattleSubState == BTL_SUBSTATE_9_4) { - if (D_8029F258 != 0) { - D_8029F258--; + if (BattleStatusUpdateDelay != 0) { + BattleStatusUpdateDelay--; } else { if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_DEF_BOOST) { battleStatus->merleeDefenseBoost = 3; @@ -1757,7 +1757,7 @@ void btl_state_update_victory(void) { gBattleSubState = BTL_SUBSTATE_VICTORY_RECOVER_STATUS; } else { if (battleStatus->outtaSightActive > 0) { - D_8029F254 = true; + BattleSkipActorTurn = true; } battleStatus->battlePhase = PHASE_ENEMY_BEGIN; script = start_script(partner->handlePhaseSource, EVT_PRIORITY_A, 0); @@ -1890,13 +1890,13 @@ void btl_state_update_victory(void) { } } gBattleSubState = BTL_SUBSTATE_VICTORY_AWAIT_MERLEE; - BattleSubStateDelay = 0; + BattleSubstateDelay = 0; gBattleStatus.flags1 &= ~BS_FLAGS1_MENU_OPEN; } if (gBattleSubState == BTL_SUBSTATE_VICTORY_AWAIT_MERLEE) { - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { if (player->takeTurnScript == nullptr || !does_script_exist(player->takeTurnScriptID)) { player->takeTurnScript = nullptr; @@ -2033,12 +2033,12 @@ void btl_state_update_end_training_battle(void) { switch (gBattleSubState) { case BTL_SUBSTATE_END_TRAINING_RESET_CAM: btl_cam_use_preset(BTL_CAM_DEFAULT); - BattleSubStateDelay = 30; + BattleSubstateDelay = 30; gBattleSubState = BTL_SUBSTATE_END_TRAINING_DONE; break; case BTL_SUBSTATE_END_TRAINING_DONE: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; return; } if (playerData->trainingsDone < 9999) { @@ -2353,8 +2353,8 @@ void btl_state_update_run_away(void) { gBattleSubState = BTL_SUBSTATE_RUN_AWAY_AWAIT_POST_FAILURE; break; case BTL_SUBSTATE_RUN_AWAY_AWAIT_POST_FAILURE: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; return; } if (!does_script_exist(player->takeTurnScriptID) @@ -2494,12 +2494,12 @@ void btl_state_update_change_partner(void) { } battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = -1; - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_CHANGE_PARTNER_EXEC_PUT_AWAY; case BTL_SUBSTATE_CHANGE_PARTNER_EXEC_PUT_AWAY: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; break; } deduct_current_move_fp(); @@ -2678,12 +2678,12 @@ void btl_state_update_player_move(void) { } } } - BattleSubStateDelay = 2; + BattleSubstateDelay = 2; gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_SHOW_TIP_DELAY; break; case BTL_SUBSTATE_PLAYER_MOVE_SHOW_TIP_DELAY: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_EXECUTE_MOVE; } @@ -2880,13 +2880,13 @@ void btl_state_update_player_move(void) { if (!btl_is_popup_displayed()) { btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_POST_ENEMY_STATUS_POPUP; } break; case BTL_SUBSTATE_PLAYER_MOVE_POST_ENEMY_STATUS_POPUP: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS; } @@ -2938,13 +2938,13 @@ void btl_state_update_player_move(void) { if (!btl_is_popup_displayed()) { btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_POST_PLAYER_STATUS_POPUP; } break; case BTL_SUBSTATE_PLAYER_MOVE_POST_PLAYER_STATUS_POPUP: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_AWAIT_DONE; } @@ -3314,12 +3314,12 @@ void btl_state_update_partner_move(void) { } btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_POST_PARTNER_STATUS_POPUP; break; case BTL_SUBSTATE_PARTNER_MOVE_POST_PARTNER_STATUS_POPUP: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_CHECK_ENEMY_STATUS; } @@ -3391,13 +3391,13 @@ void btl_state_update_partner_move(void) { if (btl_is_popup_displayed() == false) { btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_POST_ENEMY_STATUS_POPUP; } break; case BTL_SUBSTATE_PARTNER_MOVE_POST_ENEMY_STATUS_POPUP: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_PARTNER_MOVE_DONE; } @@ -3536,7 +3536,7 @@ void btl_state_update_next_enemy(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; gBattleStatus.flags2 |= BS_FLAGS2_HIDE_BUFF_COUNTERS; - D_8029F244 = enemy->ordinal; + NextEnemyWaitingOrdinal = enemy->ordinal; if (enemy->handlePhaseSource != nullptr) { Evt* onTurnChanceScript; @@ -3552,7 +3552,7 @@ void btl_state_update_next_enemy(void) { if (battleStatus->stateFreezeCount == 0) { enemy = get_actor(battleStatus->activeEnemyActorID); - if (enemy == nullptr || enemy->ordinal != D_8029F244) { + if (enemy == nullptr || enemy->ordinal != NextEnemyWaitingOrdinal) { btl_set_state(BATTLE_STATE_NEXT_ENEMY); } else { if (enemy->handlePhaseSource == nullptr || !does_script_exist(enemy->handlePhaseScriptID)) { @@ -3745,13 +3745,13 @@ void btl_state_update_enemy_move(void) { if (!btl_is_popup_displayed()) { btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_POST_PLAYER_POPUP_DELAY; } break; case BTL_SUBSTATE_ENEMY_MOVE_POST_PLAYER_POPUP_DELAY: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_CHECK_PARTNER; break; @@ -3780,13 +3780,13 @@ void btl_state_update_enemy_move(void) { if (!btl_is_popup_displayed()) { btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - BattleSubStateDelay = 10; + BattleSubstateDelay = 10; gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_POST_PARTNER_POPUP_DELAY; } break; case BTL_SUBSTATE_ENEMY_MOVE_POST_PARTNER_POPUP_DELAY: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { gBattleSubState = BTL_SUBSTATE_ENEMY_MOVE_DONE; } @@ -3814,7 +3814,7 @@ void btl_state_update_first_strike(void) { switch (gBattleSubState) { case BTL_SUBSTATE_FIRST_STRIKE_INIT: - D_8029F254 = false; + BattleSkipActorTurn = false; btl_merlee_on_first_strike(); if (playerData->playerFirstStrikes < 9999) { playerData->playerFirstStrikes++; @@ -3894,14 +3894,14 @@ void btl_state_update_first_strike(void) { player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; - BattleSubStateDelay = 3; + BattleSubstateDelay = 3; gBattleSubState = BTL_SUBSTATE_FIRST_STRIKE_AWAIT_SCRIPTS; break; case BTL_SUBSTATE_FIRST_STRIKE_AWAIT_SCRIPTS: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { - D_8029F254 = true; + BattleSkipActorTurn = true; } // wait for player move script @@ -4016,7 +4016,7 @@ void btl_state_update_first_strike(void) { } void btl_state_draw_first_stike(void) { - if (EndDemoWhiteOut == -1 && D_8029F254) { + if (EndDemoWhiteOut == -1 && BattleSkipActorTurn) { if (BattleScreenFadeAmt == 0) { set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); } else { @@ -4048,7 +4048,7 @@ void btl_state_update_partner_striking_first(void) { switch (gBattleSubState) { case BTL_SUBSTATE_PARTNER_FIRST_STRIKE_INIT: - D_8029F254 = false; + BattleSkipActorTurn = false; // setup dummy 'menu selection' for partner move level = partner->actorBlueprint->level; switch (playerData->curPartner) { @@ -4097,14 +4097,14 @@ void btl_state_update_partner_striking_first(void) { partner->takeTurnScript = script; partner->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PARTNER; - BattleSubStateDelay = 3; + BattleSubstateDelay = 3; gBattleSubState = BTL_SUBSTATE_PARTNER_FIRST_STRIKE_AWAIT_SCRIPTS; break; case BTL_SUBSTATE_PARTNER_FIRST_STRIKE_AWAIT_SCRIPTS: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { - D_8029F254 = true; + BattleSkipActorTurn = true; } // wait for partner move script if (partner->takeTurnScript != nullptr && does_script_exist(partner->takeTurnScriptID)) { @@ -4200,7 +4200,7 @@ void btl_state_update_partner_striking_first(void) { } void btl_state_draw_partner_striking_first(void) { - if (D_8029F254) { + if (BattleSkipActorTurn) { if (BattleScreenFadeAmt == 0) { set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); } else { @@ -4237,7 +4237,7 @@ void btl_state_update_enemy_striking_first(void) { battleStatus->curDamageSource = DMG_SRC_DEFAULT; playerData->enemyFirstStrikes++; battleStatus->flags1 &= ~BS_FLAGS1_MENU_OPEN; - D_8029F254 = false; + BattleSkipActorTurn = false; player->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; if (partner != nullptr) { partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; @@ -4301,16 +4301,16 @@ void btl_state_update_enemy_striking_first(void) { battleStatus->battlePhase = PHASE_FIRST_STRIKE; script = start_script(actor->takeTurnSource, EVT_PRIORITY_A, 0); actor->takeTurnScript = script; - BattleSubStateDelay = 3; + BattleSubstateDelay = 3; actor->takeTurnScriptID = script->id; gBattleSubState = BTL_SUBSTATE_ENEMY_FIRST_STRIKE_AWAIT_SCRIPTS; script->owner1.actorID = battleStatus->activeEnemyActorID; break; case BTL_SUBSTATE_ENEMY_FIRST_STRIKE_AWAIT_SCRIPTS: - if (BattleSubStateDelay != 0) { - BattleSubStateDelay--; + if (BattleSubstateDelay != 0) { + BattleSubstateDelay--; } else { - D_8029F254 = true; + BattleSkipActorTurn = true; } // wait for current enemy TakeTurn script to finish @@ -4390,7 +4390,7 @@ void btl_state_update_enemy_striking_first(void) { } void btl_state_draw_enemy_striking_first(void) { - if (D_8029F254) { + if (BattleSkipActorTurn) { if (BattleScreenFadeAmt == 0) { set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); } else { diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index c02671edf2d..238faae5159 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -148,9 +148,9 @@ extern HudScript HES_SwapZ; extern IconHudScriptPair gItemHudScripts[]; #if !VERSION_JP -s16 D_802AB340[] = { 28, 40 }; +s16 ErrorMessageHeight[] = { 28, 40 }; -s16 D_802AB344[] = { 0, -2 }; +s16 ErrorMessageAdjustY[] = { 0, -2 }; #endif #if VERSION_PAL @@ -185,26 +185,26 @@ HudScript* D_PAL_802AB53C[][4] = { HudScript* D_PAL_802AB56C[] = { &HES_NotEnoughPOW, &HES_NotEnoughPOW_de, &HES_NotEnoughPOW_fr, &HES_NotEnoughPOW_es }; #endif -IconHudScriptPair battle_menu_JumpHudScripts[] = { +IconHudScriptPair BootsHudScripts[] = { { &HES_MenuBoots1Disabled, &HES_MenuBoots1Disabled }, { &HES_MenuBoots1, &HES_MenuBoots1Disabled }, { &HES_MenuBoots2, &HES_MenuBoots2Disabled }, { &HES_MenuBoots3, &HES_MenuBoots3Disabled }, }; -IconHudScriptPair battle_menu_HammerHudScripts[] = { +IconHudScriptPair HammerHudScripts[] = { { &HES_MenuHammer1Disabled, &HES_MenuHammer1Disabled }, { &HES_MenuHammer1, &HES_MenuHammer1Disabled }, { &HES_MenuHammer2, &HES_MenuHammer2Disabled }, { &HES_MenuHammer3, &HES_MenuHammer3Disabled }, }; -IconHudScriptPair battle_menu_ItemHudScripts = { &HES_MenuItem, &HES_MenuItemDisabled }; +IconHudScriptPair ItemsHudScripts = { &HES_MenuItem, &HES_MenuItemDisabled }; -IconHudScriptPair battle_menu_StarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; +IconHudScriptPair StarPowersHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; //TODO retype to IconHudScriptPair[] -HudScript* battle_menu_StarPowerMovesHudScripts[] = { +HudScript* StarPowerMovesHudScripts[] = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled, &HES_Eldstar, &HES_EldstarDisabled, &HES_Mamar, &HES_MamarDisabled, @@ -219,7 +219,7 @@ HudScript* battle_menu_StarPowerMovesHudScripts[] = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled, }; -HudScript* battle_menu_PartnerHudScripts[] = { +HudScript* PartnerHudScripts[] = { &HES_Partner0, &HES_Goombario, &HES_Kooper, &HES_Bombette, &HES_Parakarry, &HES_Partner0, &HES_Watt, &HES_Sushie, &HES_Lakilester, &HES_Bow, &HES_PartnerA, &HES_PartnerA, @@ -233,17 +233,17 @@ HudScript* battle_menu_DisabledPartnerHudScripts[] = { &HES_PartnerADisabled, &HES_PartnerADisabled, &HES_PartnerADisabled, &HES_PartnerADisabled }; -IconHudScriptPair battle_menu_StrategiesHudScript = { &HES_MenuStrategies, &HES_MenuStrategiesDisabled }; +IconHudScriptPair StrategiesHudScripts = { &HES_MenuStrategies, &HES_MenuStrategiesDisabled }; -IconHudScriptPair battle_menu_DoNothingHudScripts = { &HES_MenuDoNothing, &HES_MenuDoNothingDisabled }; +IconHudScriptPair DoNothingHudScripts = { &HES_MenuDoNothing, &HES_MenuDoNothingDisabled }; -IconHudScriptPair battle_menu_FleeHudScripts = { &HES_MenuFlee, &HES_MenuFleeDisabled }; +IconHudScriptPair FleeHudScripts = { &HES_MenuFlee, &HES_MenuFleeDisabled }; #if VERSION_JP IconHudScriptPair battle_menu_PouchHudScripts = { &HES_MenuPouch, &HES_MenuPouchDisabled }; #endif -s32 BattleMenu_LeftJustMessages[] = { +s32 LeftJustMenuMessages[] = { #if VERSION_JP MSG_Menus_JP_0049, MSG_Menus_JP_0048, @@ -264,7 +264,7 @@ s32 BattleMenu_LeftJustMessages[] = { MSG_Menus_Focus, }; -s32 BattleMenu_CenteredMessages[] = { +s32 CenteredBattleMessages[] = { MSG_Menus_Jump_Centered, MSG_Menus_Hammer_Centered, MSG_Menus_Items_Centered, @@ -294,7 +294,7 @@ s32 BattleMenu_CategoryForSubmenu[] = { [BTL_MENU_TYPE_PARTNER_FOCUS] 0x37 }; -AnimID BattleMenu_PartnerThinkAnims[] = { +AnimID PartnerThinkAnims[] = { [PARTNER_GOOMBARIO] ANIM_BattleGoombario_Think, [PARTNER_KOOPER] ANIM_BattleKooper_Think, [PARTNER_BOMBETTE] ANIM_BattleBombette_Think, @@ -310,7 +310,7 @@ AnimID BattleMenu_PartnerThinkAnims[] = { 0x00000000 }; -AnimID BattleMenu_PartnerIdleAnims[] = { +AnimID PartnerIdleAnims[] = { [PARTNER_GOOMBARIO] ANIM_BattleGoombario_Walk, [PARTNER_KOOPER] ANIM_BattleKooper_Walk, [PARTNER_BOMBETTE] ANIM_BattleBombette_Walk, @@ -326,7 +326,7 @@ AnimID BattleMenu_PartnerIdleAnims[] = { 0x00000000 }; -HudScript* battle_menu_PartnerMoveHudScripts[10][10] = { +HudScript* PartnerMoveHudScripts[10][10] = { [PARTNER_GOOMBARIO] { &HES_Goombario, &HES_GoombarioDisabled, &HES_MoveDiamond, &HES_MoveDiamond_disabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, [PARTNER_KOOPER] { &HES_Kooper, &HES_KooperDisabled, &HES_MoveDiamond, &HES_MoveDiamond_disabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, [PARTNER_BOMBETTE] { &HES_Bombette, &HES_BombetteDisabled, &HES_MoveDiamond, &HES_MoveDiamond_disabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, @@ -338,15 +338,15 @@ HudScript* battle_menu_PartnerMoveHudScripts[10][10] = { [PARTNER_BOW] { &HES_Bow, &HES_BowDisabled, &HES_MoveDiamond, &HES_MoveDiamond_disabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, }; -IconHudScriptPair battle_menu_PeachStarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; +IconHudScriptPair PeachStarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; -s32 D_802AB728[] = { +s32 PeachMenuMessages[] = { MSG_Menus_Focus_Centered, }; -IconHudScriptPair battle_menu_TwinkStarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; +IconHudScriptPair TwinkStarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; -s32 D_802AB734[] = { +s32 TwinkMenuMessages[] = { MSG_Menus_Dash_Centered, }; @@ -374,121 +374,121 @@ BSS s32 BattleMenu_TargetPointerAlpha; BSS s32 BattleMenu_TargetNameOffsetX; // used to animate the position of the target name box BSS s32 BattleMenu_SwapDelay; // delay before the player and partner can swap after the main menu is opened BSS s32 BattleMenu_TargetHudElems[MAX_ENEMY_ACTORS]; -BSS PopupMenu D_802ACCD0; +BSS PopupMenu BattlePopupMenu; BSS s8 BattleMenuState; -BSS s8 D_802AD001; +BSS s8 BattleMenu_ReelAppearTimer; BSS s8 BattleMenu_CurPos; BSS s8 BattleMenu_PrevPos; -BSS s8 D_802AD004; -BSS s16 D_802AD006; +BSS s8 BattleMenu_WheelMoving; +BSS s16 BattleMenu_ReelAlpha; BSS s16 BattleMenuAlpha; -BSS s16 D_802AD00A; +BSS s16 BattleMenu_ReelHidePercent; #if !VERSION_IQUE && !VERSION_PAL BSS s16 D_802AD00C; // unused? #endif -BSS s32 D_802AD010[6]; -BSS s32 D_802AD028[6]; -BSS s32 D_802AD040; -BSS s32 D_802AD044; -BSS s32 D_802AD048; -BSS s32 D_802AD04C; -BSS s32 D_802AD050; -BSS s32 D_802AD054; -BSS s32 D_802AD058; -BSS s32 D_802AD05C; +BSS s32 HID_OptionIcons[6]; +BSS s32 HID_Spotlights[6]; +BSS s32 HID_HighlightSpot; +BSS s32 HID_ProjectorReelA; +BSS s32 HID_ProjectorReelB; +BSS s32 HID_ProjectorBeam; +BSS s32 HID_SwapZ; +BSS s32 HID_SwapArrowLeft; +BSS s32 HID_SwapArrowRight; +BSS s32 HID_SwapBackground; BSS s32 BattleMenu_BasePosX; BSS s32 BattleMenu_BasePosY; -BSS s8 BattleMenuDisableMsg; +BSS s8 BattleMenu_ErrorCode; BSS s8 BattleMenu_MinIdx; BSS s8 BattleMenu_MaxIdx; BSS s8 BattleMenu_HomePos; BSS f32 BattleMenu_WheelAngle; -BSS f32 D_802AD070; +BSS f32 BattleMenu_WheelSpeed; #if !VERSION_IQUE BSS s32 D_802AD074; // unused? #endif -BSS HudScript* BattleMenu_HudScripts[6]; -BSS s32 BattleMenu_TitleMessages[6]; +BSS HudScript* WheelOptionHudScript[6]; +BSS s32 WheelOptionName[6]; BSS s32 D_802AD0A8; -BSS s32 BattleMenu_NumOptions; -BSS s32 D_802AD0B0; +BSS s32 WheelOptionCount; +BSS s32 BattleMenu_PrevSelected; #if !VERSION_IQUE BSS s32 D_802AD0B4; // unused? #endif -BSS s32 battle_menu_submenuIDs[6]; -BSS s32 BattleMenu_OptionEnabled[6]; -BSS s32 battle_menu_isMessageDisabled[6]; -BSS s32 D_802AD100; +BSS s32 WheelOptionSubmenu[6]; +BSS s32 WheelOptionEnabled[6]; +BSS s32 WheelOptionError[6]; +BSS s32 BattleMenu_WheelBase; BSS s32 BattleMenu_ShowSwapIcons; -BSS s8 battle_menu_moveState; -BSS s8 battle_menu_moveCursorPos; -BSS s8 D_802AD10A; -BSS s8 D_802AD10B; -BSS s8 battle_menu_moveScrollLine; -BSS s8 D_802AD10D; -BSS s8 D_802AD10E; -BSS s8 D_802AD10F; -BSS s16 battle_menu_moveScrollOffset; -BSS s16 D_802AD112; -BSS s16 BattleMenu_Moves_TextColor; -BSS s16 BattleMenu_Moves_TextAlpha; -BSS HudElemID BattleMenu_Moves_CursorID; -BSS HudElemID BattleMenu_Moves_UpArrowID; -BSS HudElemID BattleMenu_Moves_DownArrowID; +BSS s8 MovesMenuState; +BSS s8 MovesCursorPos; +BSS s8 MovesPrevCursorPos; +BSS s8 MovesErrorTimer; +BSS s8 MovesVisibleStart; +BSS s8 MovesVisibleEnd; +BSS s8 MovesMenuLines; +BSS s8 MovesDescVisible; +BSS s16 MovesScrollOffset; +BSS s16 MovesCursorOffset; +BSS s16 MovesTextColor; +BSS s16 MovesTextAlpha; +BSS HudElemID HID_MovesCursor; +BSS HudElemID HID_MovesArrowUp; +BSS HudElemID HID_MovesArrowDown; #if !VERSION_IQUE BSS s32 D_802AD124; // unused? #endif -BSS HudElemID BattleMenu_Moves_OptionIDs[24]; -BSS HudElemID BattleMenu_Moves_TitleID; +BSS HudElemID MovesOptionHIDs[24]; +BSS HudElemID HID_MovesTitle; #if !VERSION_IQUE BSS s32 D_802AD18C; // unused? #endif -BSS HudElemID BattleMenu_Moves_OptionCostUnitIDs[24]; -BSS s16 BattleMenu_Moves_PosX; -BSS s16 BattleMenu_Moves_PosY; +BSS HudElemID MovesOptionCostHIDs[24]; +BSS s16 MovesMenuPosX; +BSS s16 MovesMenuPosY; #if !VERSION_IQUE BSS s32 D_802AD1F4; // unused? #endif -BSS s32 BattleMenu_Moves_OptionIndexMap[24]; -BSS s32 D_802AD258; +BSS s32 MovesOptionIndexMap[24]; +BSS s32 MovesErrorCode; #if !VERSION_IQUE BSS s32 D_802AD25C; // unused? #endif -BSS HudScript* battle_menu_moveOptionIconScripts[24]; -BSS s32 battle_menu_moveOptionNames[24]; -BSS s32 battle_menu_moveOptionDisplayCosts[24]; -BSS s32 battle_menu_moveOptionDisplayCostReductions[24]; -BSS s32 battle_menu_moveOptionDisplayCostReductionColors[24]; -BSS s32 battle_menu_moveOptionBPCosts[24]; -BSS s32 BattleMenu_UsingSpiritsSubmenu; -BSS s32 BattleMenu_Moves_OptionCount; -BSS s32 D_802AD4A8; +BSS HudScript* MovesOptionHudScripts[24]; +BSS s32 MovesOptionNames[24]; +BSS s32 MovesOptionDisplayCosts[24]; +BSS s32 MovesOptionDiscounts[24]; +BSS s32 MovesOptionDiscountColors[24]; +BSS s32 MovesOptionBPCosts[24]; +BSS s32 UsingSpiritsSubmenu; +BSS s32 MovesOptionCount; +BSS s32 MovesPrevSelected; #if !VERSION_IQUE BSS s32 D_802AD4AC; // unused? #endif -BSS s32 BattleMenu_Moves_OptionIndices[24]; -BSS s32 BattleMenu_Moves_OptionEnabled[24]; -BSS s32 BattleMenu_Moves_OptionDescMessages[24]; -BSS s8 BattleMenu_Moves_OptionSortPriority[24]; -BSS s8 BattleMenu_Moves_OptionCantUseMessages[24]; -BSS s32 battle_menu_moveOptionActive; -BSS s8 BattleSubmenuStratsState; -BSS s8 StratsMenuPos; -BSS s8 OldStratsMenuPos; +BSS s32 MovesOptionIndices[24]; +BSS s32 MovesOptionEnabled[24]; +BSS s32 MovesOptionDesc[24]; +BSS s8 MovesOptionSortPriority[24]; +BSS s8 MovesOptionError[24]; +BSS s32 SelectedMovesIndex; +BSS s8 StratsMenuState; +BSS s8 StratsCursorPos; +BSS s8 StratsPrevCursorPos; BSS s8 ShowingErrorMessage; -BSS s8 D_802AD608; -BSS s8 D_802AD609; +BSS s8 StratsVisibleStart; +BSS s8 StratsVisibleEnd; BSS s8 StratsMenuLines; -BSS s8 D_802AD60B; -BSS s16 D_802AD60C; -BSS s16 D_802AD60E; -BSS s16 D_802AD610; -BSS s16 D_802AD612; -BSS s8 D_802AD614; -BSS s32 D_802AD618; -BSS HudElemID HID_GreenArrowUp; -BSS HudElemID HID_GreenArrowDown; -BSS s32 D_802AD624; +BSS s8 StratsDescVisible; +BSS s16 StratsScrollOffset; +BSS s16 StratsCursorOffset; +BSS s16 StratsErrorCode; +BSS s16 StratsErrorTimer; +BSS s8 StratsTextColor; +BSS s32 HID_StratsCursor; +BSS HudElemID HID_StratsArrowUp; +BSS HudElemID HID_StratsArrowDown; +BSS s32 StratsTextAlpha; #if VERSION_IQUE #define TABMAX 5 @@ -496,21 +496,21 @@ BSS s32 D_802AD624; #define TABMAX 6 #endif -BSS s32 D_802AD628[5]; -BSS s16 D_802AD63C; -BSS s16 D_802AD63E; -BSS HudScript* D_802AD640[TABMAX]; -BSS s32 D_802AD658[5]; // msg IDs -BSS s32 D_802AD66C; -BSS s32 StratsMenuLastPos; +BSS s32 StratsOptionHIDs[5]; +BSS s16 StratsMenuPosX; +BSS s16 StratsMenuPosY; +BSS HudScript* StratsOptionHudScripts[TABMAX]; +BSS s32 StratsOptionNames[5]; // msg IDs +BSS s32 StratsOptionCount; +BSS s32 StratsPrevSelected; #if !VERSION_IQUE BSS s32 D_802AD674; // unused? #endif -BSS s32 D_802AD678[TABMAX]; -BSS s32 D_802AD690[TABMAX]; // strats options enabled -BSS s32 D_802AD6A8[TABMAX]; -BSS s32 D_802AD6C0[5]; +BSS s32 StratsOptionMenuTypes[TABMAX]; +BSS s32 StratsOptionEnabled[TABMAX]; // strats options enabled +BSS s32 StratsOptionError[TABMAX]; +BSS s32 StratsOptionMessage[5]; BSS s32 D_802AD6D4; void create_battle_popup_menu(PopupMenu* popup); @@ -526,8 +526,8 @@ void btl_menu_strats_show_title(void* data, s32 x, s32 y); void btl_menu_strats_show_desc(void* data, s32 x, s32 y); void btl_menu_strats_show_error(void* data, s32 x, s32 y); -void func_80263300(void); -void func_80263268(void); +void btl_init_menu_items(void); +void btl_check_can_change_partner(void); void btl_init_menu_partner(void); // forces an update step for the popup menu @@ -539,33 +539,33 @@ void btl_init_menu_boots(void); void btl_init_menu_hammer(void); void btl_main_menu_init(void) { - D_802AD006 = 255; + BattleMenu_ReelAlpha = 255; BattleMenuAlpha = 255; BattleMenuState = BTL_MENU_STATE_CREATE; - BattleMenuDisableMsg = -1; + BattleMenu_ErrorCode = -1; } // btl_main_menu_hide? (after begin targeting) -void func_802A1030(void) { - D_802AD001 = 3; +void btl_main_menu_hide(void) { + BattleMenu_ReelAppearTimer = 3; BattleMenuState = BTL_MENU_STATE_UNK_A; } // (after submenu closed/cancelled) -void func_802A1050(void) { +void btl_main_menu_resume_choose(void) { BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; - D_802AD006 = 255; + BattleMenu_ReelAlpha = 255; BattleMenuAlpha = 255; } // btl_main_menu_show? (canceling targeting -> main menu) -void func_802A1078(void) { +void btl_main_menu_restore_choose(void) { BattleMenuAlpha = 255; BattleMenuState = BTL_MENU_STATE_UNK_14; } // btl_main_menu_show? (canceling targeting -> submenu) -void func_802A1098(void) { +void btl_main_menu_restore_submenu(void) { BattleMenuAlpha = 100; BattleMenuState = BTL_MENU_STATE_UNK_1E; } @@ -573,22 +573,22 @@ void func_802A1098(void) { void btl_main_menu_destroy(void) { s32 i; - for (i = 0; i < BattleMenu_NumOptions; i++) { - s32* icons1 = D_802AD010; - s32* icons2 = D_802AD028; + for (i = 0; i < WheelOptionCount; i++) { + s32* icons1 = HID_OptionIcons; + s32* icons2 = HID_Spotlights; hud_element_free(icons1[i]); hud_element_free(icons2[i]); } - hud_element_free(D_802AD040); - hud_element_free(D_802AD044); - hud_element_free(D_802AD048); - hud_element_free(D_802AD04C); - hud_element_free(D_802AD05C); - hud_element_free(D_802AD050); - hud_element_free(D_802AD054); - hud_element_free(D_802AD058); + hud_element_free(HID_HighlightSpot); + hud_element_free(HID_ProjectorReelA); + hud_element_free(HID_ProjectorReelB); + hud_element_free(HID_ProjectorBeam); + hud_element_free(HID_SwapBackground); + hud_element_free(HID_SwapZ); + hud_element_free(HID_SwapArrowLeft); + hud_element_free(HID_SwapArrowRight); } s32 btl_main_menu_update(void) { @@ -603,16 +603,16 @@ s32 btl_main_menu_update(void) { case BTL_MENU_STATE_CREATE: BattleMenu_BasePosX = 54; BattleMenu_BasePosY = 173; - D_802AD070 = 0.3f; - D_802AD004 = 0; - BattleMenu_HomePos = D_802AD0B0; + BattleMenu_WheelSpeed = 0.3f; + BattleMenu_WheelMoving = 0; + BattleMenu_HomePos = BattleMenu_PrevSelected; BattleMenu_MinIdx = 0; - BattleMenu_MinIdx -= D_802AD0B0; - BattleMenu_MaxIdx = BattleMenu_NumOptions - 1; - BattleMenu_MaxIdx -= D_802AD0B0; + BattleMenu_MinIdx -= BattleMenu_PrevSelected; + BattleMenu_MaxIdx = WheelOptionCount - 1; + BattleMenu_MaxIdx -= BattleMenu_PrevSelected; - for (i = 0; i < BattleMenu_NumOptions; i++) { - D_802AD010[i] = hid = hud_element_create(BattleMenu_HudScripts[i]); + for (i = 0; i < WheelOptionCount; i++) { + HID_OptionIcons[i] = hid = hud_element_create(WheelOptionHudScript[i]); hud_element_set_render_depth(hid, 5); #if VERSION_PAL hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER | HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_DISABLED); @@ -623,7 +623,7 @@ s32 btl_main_menu_update(void) { #endif hud_element_set_scale(hid, 0.75f); - D_802AD028[i] = hid = hud_element_create(&HES_ProjectorSpot); + HID_Spotlights[i] = hid = hud_element_create(&HES_ProjectorSpot); hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 10); #if VERSION_PAL @@ -636,7 +636,7 @@ s32 btl_main_menu_update(void) { } - D_802AD040 = hid = hud_element_create(&HES_ProjectorSpot); + HID_HighlightSpot = hid = hud_element_create(&HES_ProjectorSpot); hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 7); #if VERSION_PAL @@ -647,7 +647,7 @@ s32 btl_main_menu_update(void) { hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); #endif - D_802AD044 = hid = hud_element_create(&HES_ProjectorReel); + HID_ProjectorReelA = hid = hud_element_create(&HES_ProjectorReel); hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 0); hud_element_set_render_pos(hid, 40, 212); @@ -657,7 +657,7 @@ s32 btl_main_menu_update(void) { hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(hid, 240); - D_802AD048 = hid = hud_element_create(&HES_ProjectorReel); + HID_ProjectorReelB = hid = hud_element_create(&HES_ProjectorReel); hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 2); hud_element_set_render_pos(hid, 39, 212); @@ -667,7 +667,7 @@ s32 btl_main_menu_update(void) { hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(hid, 240); - D_802AD04C = hid = hud_element_create(&HES_ProjectorBeam); + HID_ProjectorBeam = hid = hud_element_create(&HES_ProjectorBeam); hud_element_create_transform_B(hid); hud_element_set_render_depth(hid, 20); hud_element_set_render_pos(hid, 78, 178); @@ -683,7 +683,7 @@ s32 btl_main_menu_update(void) { hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DISABLED); #endif - D_802AD05C = hid = hud_element_create(&HES_SwapBackground); + HID_SwapBackground = hid = hud_element_create(&HES_SwapBackground); hud_element_set_render_depth(hid, 0); hud_element_set_render_pos(hid, 97, 208); hud_element_set_tint(hid, 255, 255, 255); @@ -691,56 +691,56 @@ s32 btl_main_menu_update(void) { hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(hid, 230); - D_802AD050 = hid = hud_element_create(&HES_SwapZ); + HID_SwapZ = hid = hud_element_create(&HES_SwapZ); hud_element_set_render_depth(hid, 5); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, 94, 209); - D_802AD054 = hid = hud_element_create(&HES_SwapArrowLeft); + HID_SwapArrowLeft = hid = hud_element_create(&HES_SwapArrowLeft); hud_element_set_render_depth(hid, 5); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, 81, 210); - D_802AD058 = hid = hud_element_create(&HES_SwapArrowRight); + HID_SwapArrowRight = hid = hud_element_create(&HES_SwapArrowRight); hud_element_set_render_depth(hid, 5); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); hud_element_set_render_pos(hid, 102, 210); - D_802AD00A = 100; - D_802AD001 = 3; + BattleMenu_ReelHidePercent = 100; + BattleMenu_ReelAppearTimer = 3; BattleMenuState = BTL_MENU_STATE_UNK_1; - BattleMenu_WheelAngle = theta = D_802AD100 * 28; + BattleMenu_WheelAngle = theta = BattleMenu_WheelBase * 28; break; case BTL_MENU_STATE_UNK_1: - D_802AD00A = (D_802AD001 * 100) / 3; + BattleMenu_ReelHidePercent = (BattleMenu_ReelAppearTimer * 100) / 3; - switch (D_802AD001) { + switch (BattleMenu_ReelAppearTimer) { case 1: - if (D_802AD001 == 1) { - hid = D_802AD04C; + if (BattleMenu_ReelAppearTimer == 1) { + hid = HID_ProjectorBeam; hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_DISABLED); } default: - D_802AD001--; + BattleMenu_ReelAppearTimer--; break; case 0: BattleMenu_CurPos = 0; BattleMenu_PrevPos = 0; - BattleMenu_WheelAngle = theta = D_802AD100 * 28; - for (i = 0; i < BattleMenu_NumOptions; i++, theta += 28.0f) { + BattleMenu_WheelAngle = theta = BattleMenu_WheelBase * 28; + for (i = 0; i < WheelOptionCount; i++, theta += 28.0f) { x = 0.0f; y = 0.0f; add_vec2D_polar(&x, &y, 87.0f, theta); l = BattleMenu_BasePosX + x; t = BattleMenu_BasePosY + y; - hid = D_802AD010[i]; + hid = HID_OptionIcons[i]; hud_element_set_render_pos(hid, l, t); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - hid = D_802AD028[i]; + hid = HID_Spotlights[i]; hud_element_set_render_pos(hid, l, t); hud_element_set_alpha(hid, 100); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_DISABLED); @@ -748,12 +748,12 @@ s32 btl_main_menu_update(void) { x = 0.0f; y = 0.0f; - theta = D_802AD100 * 28; + theta = BattleMenu_WheelBase * 28; add_vec2D_polar(&x, &y, 87.0f, theta); l = BattleMenu_BasePosX + x; t = BattleMenu_BasePosY + y; - hid = D_802AD040; + hid = HID_HighlightSpot; hud_element_set_render_pos(hid, l, t); hud_element_set_alpha(hid, 180); hud_element_set_scale(hid, 0.85f); @@ -764,17 +764,17 @@ s32 btl_main_menu_update(void) { break; case BTL_MENU_STATE_ACCEPT_INPUT: if (battleStatus->curButtonsPressed & BUTTON_A) { - if (BattleMenu_OptionEnabled[BattleMenu_CurPos + BattleMenu_HomePos] == true) { + if (WheelOptionEnabled[BattleMenu_CurPos + BattleMenu_HomePos] == true) { sfx_play_sound(SOUND_MENU_NEXT); BattleMenuState = BTL_MENU_STATE_OPENED_SUBMENU; } else { sfx_play_sound(SOUND_MENU_ERROR); - BattleMenuDisableMsg = battle_menu_isMessageDisabled[BattleMenu_CurPos + BattleMenu_HomePos]; + BattleMenu_ErrorCode = WheelOptionError[BattleMenu_CurPos + BattleMenu_HomePos]; BattleMenuState = BTL_MENU_STATE_SHOW_DISABLED_POPUP; } } else { BattleMenu_PrevPos = BattleMenu_CurPos; - if (D_802AD004 == 0) { + if (BattleMenu_WheelMoving == 0) { if ((battleStatus->curButtonsHeld & (BUTTON_STICK_LEFT | BUTTON_STICK_UP)) && BattleMenu_MinIdx < BattleMenu_CurPos) { @@ -788,7 +788,7 @@ s32 btl_main_menu_update(void) { } if (BattleMenu_PrevPos != BattleMenu_CurPos) { - D_802AD004 = 1; + BattleMenu_WheelMoving = 1; sfx_play_sound(SOUND_MENU_CHANGE_TAB); } } @@ -797,31 +797,31 @@ s32 btl_main_menu_update(void) { BattleMenuAlpha = 100; return BattleMenu_CurPos + BattleMenu_HomePos + 1; case BTL_MENU_STATE_UNK_A: - D_802AD001 = 0; - D_802AD006 = 0; + BattleMenu_ReelAppearTimer = 0; + BattleMenu_ReelAlpha = 0; BattleMenuState = BTL_MENU_STATE_UNK_B; return BattleMenu_CurPos + BattleMenu_HomePos + 1; case BTL_MENU_STATE_UNK_B: return BattleMenu_CurPos + BattleMenu_HomePos + 1; case BTL_MENU_STATE_UNK_14: - D_802AD001 = 3; - D_802AD006 = 255; + BattleMenu_ReelAppearTimer = 3; + BattleMenu_ReelAlpha = 255; BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; return BattleMenu_CurPos + BattleMenu_HomePos + 1; case BTL_MENU_STATE_UNK_1E: - D_802AD001 = 3; - D_802AD006 = 255; + BattleMenu_ReelAppearTimer = 3; + BattleMenu_ReelAlpha = 255; BattleMenuState = BTL_MENU_STATE_OPENED_SUBMENU; break; case BTL_MENU_STATE_SHOW_DISABLED_POPUP: - btl_show_battle_message(BattleMenuDisableMsg, 90); + btl_show_battle_message(BattleMenu_ErrorCode, 90); BattleMenuState = BTL_MENU_STATE_AWAIT_DISABLED_POPUP; break; case BTL_MENU_STATE_AWAIT_DISABLED_POPUP: if (btl_is_popup_displayed()) { break; } - BattleMenuDisableMsg = -1; + BattleMenu_ErrorCode = -1; BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; break; } @@ -847,14 +847,14 @@ void btl_main_menu_draw(void) { switch (BattleMenuState) { case BTL_MENU_STATE_UNK_1: hud_element_draw_complex_hud_first(-1); - id = D_802AD048; + id = HID_ProjectorReelB; hud_element_set_transform_rotation(id, 0.0f, 0.0f, 0.0f); - hud_element_set_alpha(id, (D_802AD006 * 254) / 255); - hud_element_set_render_pos(id, BASE_X - D_802AD00A, D_802AD00A + 212); + hud_element_set_alpha(id, (BattleMenu_ReelAlpha * 254) / 255); + hud_element_set_render_pos(id, BASE_X - BattleMenu_ReelHidePercent, BattleMenu_ReelHidePercent + 212); hud_element_draw_complex_hud_next(id); - id = D_802AD044; - hud_element_set_alpha(id, (D_802AD006 * 254) / 255); - hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); + id = HID_ProjectorReelA; + hud_element_set_alpha(id, (BattleMenu_ReelAlpha * 254) / 255); + hud_element_set_render_pos(id, 40 - BattleMenu_ReelHidePercent, BattleMenu_ReelHidePercent + 212); hud_element_draw_complex_hud_next(id); break; case BTL_MENU_STATE_OPENED_SUBMENU: @@ -862,19 +862,19 @@ void btl_main_menu_draw(void) { case BTL_MENU_STATE_UNK_A: case BTL_MENU_STATE_UNK_14: case BTL_MENU_STATE_UNK_1E: - opacity = (D_802AD006 * BattleMenuAlpha) / 255; + opacity = (BattleMenu_ReelAlpha * BattleMenuAlpha) / 255; hud_element_draw_complex_hud_first(-1); - theta = (D_802AD100 - BattleMenu_CurPos) * 28; + theta = (BattleMenu_WheelBase - BattleMenu_CurPos) * 28; cond = false; if (BattleMenu_WheelAngle > theta) { - BattleMenu_WheelAngle -= D_802AD070; + BattleMenu_WheelAngle -= BattleMenu_WheelSpeed; if (BattleMenu_WheelAngle < theta) { BattleMenu_WheelAngle = theta; cond = true; } } else if (BattleMenu_WheelAngle < theta) { - BattleMenu_WheelAngle += D_802AD070; + BattleMenu_WheelAngle += BattleMenu_WheelSpeed; if (BattleMenu_WheelAngle > theta) { BattleMenu_WheelAngle = theta; cond = true; @@ -884,18 +884,18 @@ void btl_main_menu_draw(void) { } if (!cond) { - D_802AD070 = (D_802AD070 * (D_802AD070 + 1.0) * (D_802AD070 + 1.0)); + BattleMenu_WheelSpeed = (BattleMenu_WheelSpeed * (BattleMenu_WheelSpeed + 1.0) * (BattleMenu_WheelSpeed + 1.0)); } else { - D_802AD004 = 0; - D_802AD070 = 0.3f; + BattleMenu_WheelMoving = 0; + BattleMenu_WheelSpeed = 0.3f; } theta = BattleMenu_WheelAngle; - for (i = 0; i < BattleMenu_NumOptions; i++, theta += 28.0f) { + for (i = 0; i < WheelOptionCount; i++, theta += 28.0f) { x = 0.0f; y = 0.0f; add_vec2D_polar(&x, &y, 87.0f, theta); - id = D_802AD028[i]; + id = HID_Spotlights[i]; x = BattleMenu_BasePosX + x; y = BattleMenu_BasePosY + y; hud_element_set_transform_pos(id, x, -y, 0.0f); @@ -915,7 +915,7 @@ void btl_main_menu_draw(void) { add_vec2D_polar(&x, &y, 87.0f, 56.0f); x = BattleMenu_BasePosX + x; y = BattleMenu_BasePosY + y; - id = D_802AD040; + id = HID_HighlightSpot; hud_element_set_transform_pos(id, x, -y, 0.0f); hud_element_set_render_pos(id, 0, 0); hud_element_set_alpha(id, (opacity * 180) / 255); @@ -928,13 +928,13 @@ void btl_main_menu_draw(void) { hud_element_draw_complex_hud_next(id); } } - theta = (D_802AD100 - BattleMenu_CurPos) * 28; + theta = (BattleMenu_WheelBase - BattleMenu_CurPos) * 28; scale = (fabsf(fabsf((BattleMenu_WheelAngle - theta) * (45.0 / 28.0)) - 22.5) / 22.5) + 0.01; if (cond) { scale = 1.0f; } - id = D_802AD04C; + id = HID_ProjectorBeam; hud_element_set_transform_rotation_pivot(id, 0, 0); hud_element_set_transform_rotation(id, 0.0f, 0.0f, -43.0f); hud_element_set_scale(id, scale); @@ -943,31 +943,31 @@ void btl_main_menu_draw(void) { hud_element_set_render_pos(id, 79, 176); hud_element_draw_complex_hud_next(id); - id = D_802AD048; - theta = (D_802AD100 - BattleMenu_CurPos) * 28; + id = HID_ProjectorReelB; + theta = (BattleMenu_WheelBase - BattleMenu_CurPos) * 28; scale = (BattleMenu_WheelAngle - theta) * (45.0 / 28.0); hud_element_set_transform_rotation(id, 0.0f, 0.0f, -scale); hud_element_set_transform_rotation_pivot(id, 18, -20); hud_element_set_scale(id, 0.95f); hud_element_set_alpha(id, (opacity * 254) / 255); - hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); + hud_element_set_render_pos(id, 40 - BattleMenu_ReelHidePercent, BattleMenu_ReelHidePercent + 212); hud_element_draw_complex_hud_next(id); - id = D_802AD044; + id = HID_ProjectorReelA; hud_element_set_alpha(id, (opacity * 254) / 255); - hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); + hud_element_set_render_pos(id, 40 - BattleMenu_ReelHidePercent, BattleMenu_ReelHidePercent + 212); hud_element_set_scale(id, 1.0f); hud_element_draw_complex_hud_next(id); theta = BattleMenu_WheelAngle; - for (i = 0; i < BattleMenu_NumOptions; i++, theta += 28.0f) { + for (i = 0; i < WheelOptionCount; i++, theta += 28.0f) { x = 0.0f; y = 0.0f; add_vec2D_polar(&x, &y, 87.0f, theta); l = x = BattleMenu_BasePosX + x; t = y = BattleMenu_BasePosY + y; btl_draw_prim_quad(0, 0, 0, 0, l - 12, t - 12, 24, 24); - id = D_802AD010[i]; + id = HID_OptionIcons[i]; hud_element_set_render_pos(id, l, t); hud_element_set_alpha(id, (opacity * 180) / 255); if (i == BattleMenu_HomePos + BattleMenu_CurPos) { @@ -980,7 +980,7 @@ void btl_main_menu_draw(void) { l = BattleMenu_BasePosX + 20; t = BattleMenu_BasePosY - 34; btl_draw_prim_quad(0, 0, 0, 0, l + 26, t, 48, 16); - draw_msg(BattleMenu_TitleMessages[BattleMenu_CurPos + BattleMenu_HomePos], l, t, opacity, MSG_PAL_35, 0); + draw_msg(WheelOptionName[BattleMenu_CurPos + BattleMenu_HomePos], l, t, opacity, MSG_PAL_35, 0); } if ((gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) || (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE)) { @@ -988,16 +988,16 @@ void btl_main_menu_draw(void) { } if (BattleMenu_ShowSwapIcons) { - id = D_802AD05C; + id = HID_SwapBackground; hud_element_set_alpha(id, (opacity * 200) / 255); hud_element_draw_clipped(id); - id = D_802AD050; + id = HID_SwapZ; hud_element_set_alpha(id, opacity); hud_element_draw_clipped(id); - id = D_802AD054; + id = HID_SwapArrowLeft; hud_element_set_alpha(id, opacity); hud_element_draw_clipped(id); - id = D_802AD058; + id = HID_SwapArrowRight; hud_element_set_alpha(id, opacity); hud_element_draw_clipped(id); } @@ -1005,57 +1005,57 @@ void btl_main_menu_draw(void) { } } -// Very similar to func_802A45D8 - maybe can be used to reduce fake matches there -void func_802A2684(void) { - if (D_802AD4A8 >= BattleMenu_Moves_OptionCount) { - D_802AD4A8 = BattleMenu_Moves_OptionCount - 1; +// Very similar to btl_menu_strats_init - maybe can be used to reduce fake matches there +void btl_submenu_moves_init(void) { + if (MovesPrevSelected >= MovesOptionCount) { + MovesPrevSelected = MovesOptionCount - 1; } - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_0; - battle_menu_moveScrollLine = 0; - battle_menu_moveCursorPos = D_802AD4A8; - D_802AD10A = D_802AD4A8; - D_802AD10E = BattleMenu_Moves_OptionCount; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_0; + MovesVisibleStart = 0; + MovesCursorPos = MovesPrevSelected; + MovesPrevCursorPos = MovesPrevSelected; + MovesMenuLines = MovesOptionCount; - if (D_802AD10E > 6) { - D_802AD10E = 6; + if (MovesMenuLines > 6) { + MovesMenuLines = 6; } - D_802AD10D = 6; - if (BattleMenu_Moves_OptionCount < 6) { - D_802AD10D = BattleMenu_Moves_OptionCount; + MovesVisibleEnd = 6; + if (MovesOptionCount < 6) { + MovesVisibleEnd = MovesOptionCount; } - BattleMenu_Moves_TextAlpha = 255; - D_802AD10F = 1; + MovesTextAlpha = 255; + MovesDescVisible = 1; - if (D_802AD10A < 0) { - battle_menu_moveScrollLine = D_802AD10A; + if (MovesPrevCursorPos < 0) { + MovesVisibleStart = MovesPrevCursorPos; } - if (D_802AD10A >= D_802AD10D) { - battle_menu_moveScrollLine = D_802AD10A + 1 - D_802AD10E; + if (MovesPrevCursorPos >= MovesVisibleEnd) { + MovesVisibleStart = MovesPrevCursorPos + 1 - MovesMenuLines; } - D_802AD10D = battle_menu_moveScrollLine + 6; - if (D_802AD10D > BattleMenu_Moves_OptionCount) { - D_802AD10D = BattleMenu_Moves_OptionCount; + MovesVisibleEnd = MovesVisibleStart + 6; + if (MovesVisibleEnd > MovesOptionCount) { + MovesVisibleEnd = MovesOptionCount; } - battle_menu_moveScrollOffset = -battle_menu_moveScrollLine * 13; - D_802AD112 = (D_802AD10A - battle_menu_moveScrollLine) * 13; - battle_menu_moveOptionActive = 0; + MovesScrollOffset = -MovesVisibleStart * 13; + MovesCursorOffset = (MovesPrevCursorPos - MovesVisibleStart) * 13; + SelectedMovesIndex = 0; } -void func_802A27D0(void) { - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_A; +void btl_submenu_moves_hide(void) { + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_A; } -void func_802A27E4(void) { +void btl_submenu_moves_destroy(void) { s32 i; set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_HIDE); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_HIDE); } else { @@ -1065,46 +1065,46 @@ void func_802A27E4(void) { set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - hud_element_free(BattleMenu_Moves_OptionIDs[i]); + for (i = 0; i < MovesOptionCount; i++) { + hud_element_free(MovesOptionHIDs[i]); } - hud_element_free(BattleMenu_Moves_CursorID); - hud_element_free(BattleMenu_Moves_UpArrowID); - hud_element_free(BattleMenu_Moves_DownArrowID); - hud_element_free(BattleMenu_Moves_TitleID); + hud_element_free(HID_MovesCursor); + hud_element_free(HID_MovesArrowUp); + hud_element_free(HID_MovesArrowDown); + hud_element_free(HID_MovesTitle); - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - hud_element_free(BattleMenu_Moves_OptionCostUnitIDs[i]); + for (i = 0; i < MovesOptionCount; i++) { + hud_element_free(MovesOptionCostHIDs[i]); } } -void func_802A2910(void) { +void btl_submenu_moves_resume_choose(void) { s32* moveOptionIconIDs; s32* moveOptionCostUnitIconIDs; s32 i; - moveOptionIconIDs = BattleMenu_Moves_OptionIDs; + moveOptionIconIDs = MovesOptionHIDs; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { + for (i = 0; i < MovesOptionCount; i++) { hud_element_set_tint(moveOptionIconIDs[i], 255, 255, 255); } - hud_element_set_tint(BattleMenu_Moves_CursorID, 255, 255, 255); - hud_element_set_tint(BattleMenu_Moves_UpArrowID, 255, 255, 255); - hud_element_set_tint(BattleMenu_Moves_DownArrowID, 255, 255, 255); - hud_element_set_tint(BattleMenu_Moves_TitleID, 255, 255, 255); + hud_element_set_tint(HID_MovesCursor, 255, 255, 255); + hud_element_set_tint(HID_MovesArrowUp, 255, 255, 255); + hud_element_set_tint(HID_MovesArrowDown, 255, 255, 255); + hud_element_set_tint(HID_MovesTitle, 255, 255, 255); - moveOptionCostUnitIconIDs = BattleMenu_Moves_OptionCostUnitIDs; + moveOptionCostUnitIconIDs = MovesOptionCostHIDs; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { + for (i = 0; i < MovesOptionCount; i++) { hud_element_set_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - hud_element_set_script(BattleMenu_Moves_CursorID, &HES_AnimatedHandPointer); + hud_element_set_script(HID_MovesCursor, &HES_AnimatedHandPointer); set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_TRANSPARENT); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_TRANSPARENT); } else { @@ -1113,20 +1113,20 @@ void func_802A2910(void) { } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - BattleMenu_Moves_TextColor = MSG_PAL_STANDARD; - D_802AD10F = 1; - BattleMenu_Moves_TextAlpha = 255; - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesTextColor = MSG_PAL_STANDARD; + MovesDescVisible = 1; + MovesTextAlpha = 255; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; } -void func_802A2AB8(void) { +void btl_submenu_moves_restore_choose(void) { s32* moveOptionIconIDs; s32* moveOptionCostUnitIconIDs; s32 i; set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_TRANSPARENT); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_TRANSPARENT); } else { @@ -1135,32 +1135,32 @@ void func_802A2AB8(void) { } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - moveOptionIconIDs = BattleMenu_Moves_OptionIDs; + moveOptionIconIDs = MovesOptionHIDs; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { + for (i = 0; i < MovesOptionCount; i++) { hud_element_set_tint(moveOptionIconIDs[i], 255, 255, 255); } - hud_element_set_tint(BattleMenu_Moves_CursorID, 255, 255, 255); - hud_element_set_tint(BattleMenu_Moves_UpArrowID, 255, 255, 255); - hud_element_set_tint(BattleMenu_Moves_DownArrowID, 255, 255, 255); - hud_element_set_tint(BattleMenu_Moves_TitleID, 255, 255, 255); + hud_element_set_tint(HID_MovesCursor, 255, 255, 255); + hud_element_set_tint(HID_MovesArrowUp, 255, 255, 255); + hud_element_set_tint(HID_MovesArrowDown, 255, 255, 255); + hud_element_set_tint(HID_MovesTitle, 255, 255, 255); - moveOptionCostUnitIconIDs = BattleMenu_Moves_OptionCostUnitIDs; + moveOptionCostUnitIconIDs = MovesOptionCostHIDs; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { + for (i = 0; i < MovesOptionCount; i++) { hud_element_set_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - hud_element_set_script(BattleMenu_Moves_CursorID, &HES_AnimatedHandPointer); - BattleMenu_Moves_TextColor = MSG_PAL_STANDARD; - D_802AD10F = 1; - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_14; + hud_element_set_script(HID_MovesCursor, &HES_AnimatedHandPointer); + MovesTextColor = MSG_PAL_STANDARD; + MovesDescVisible = 1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_14; } -void func_802A2C58(void) { +void btl_submenu_moves_restore_locked(void) { set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_1E; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1E; } #if VERSION_PAL @@ -1211,82 +1211,82 @@ s32 btl_submenu_moves_update(void) { s32 i; s32 j; - switch (battle_menu_moveState) { + switch (MovesMenuState) { case BTL_SUBMENU_MOVES_STATE_UNK_0: - battle_menu_moveScrollOffset = -battle_menu_moveScrollLine * 13; - D_802AD112 = (battle_menu_moveCursorPos - battle_menu_moveScrollLine) * 13; - BattleMenu_Moves_PosX = POS_X; - BattleMenu_Moves_PosY = 68; + MovesScrollOffset = -MovesVisibleStart * 13; + MovesCursorOffset = (MovesCursorPos - MovesVisibleStart) * 13; + MovesMenuPosX = POS_X; + MovesMenuPosY = 68; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - BattleMenu_Moves_OptionIndexMap[i] = i; + for (i = 0; i < MovesOptionCount; i++) { + MovesOptionIndexMap[i] = i; } - if (!BattleMenu_UsingSpiritsSubmenu) { - for (i = 0; i < (BattleMenu_Moves_OptionCount - 1); i++) { - for (j = i + 1; j < BattleMenu_Moves_OptionCount; j++) { + if (!UsingSpiritsSubmenu) { + for (i = 0; i < (MovesOptionCount - 1); i++) { + for (j = i + 1; j < MovesOptionCount; j++) { do { - s32 temp1 = BattleMenu_Moves_OptionIndexMap[i]; - s32 temp2 = BattleMenu_Moves_OptionIndexMap[j]; + s32 temp1 = MovesOptionIndexMap[i]; + s32 temp2 = MovesOptionIndexMap[j]; - if (BattleMenu_Moves_OptionSortPriority[temp1] < BattleMenu_Moves_OptionSortPriority[temp2]) { + if (MovesOptionSortPriority[temp1] < MovesOptionSortPriority[temp2]) { continue; } if ( - BattleMenu_Moves_OptionSortPriority[temp1] != BattleMenu_Moves_OptionSortPriority[temp2] || - (battle_menu_moveOptionDisplayCosts[temp1] >= battle_menu_moveOptionDisplayCosts[temp2]) && - (battle_menu_moveOptionDisplayCosts[temp1] != battle_menu_moveOptionDisplayCosts[temp2] || - battle_menu_moveOptionBPCosts[temp1] >= battle_menu_moveOptionBPCosts[temp2]) + MovesOptionSortPriority[temp1] != MovesOptionSortPriority[temp2] || + (MovesOptionDisplayCosts[temp1] >= MovesOptionDisplayCosts[temp2]) && + (MovesOptionDisplayCosts[temp1] != MovesOptionDisplayCosts[temp2] || + MovesOptionBPCosts[temp1] >= MovesOptionBPCosts[temp2]) ) { - s32 swapTmp = BattleMenu_Moves_OptionIndexMap[i]; - BattleMenu_Moves_OptionIndexMap[i] = BattleMenu_Moves_OptionIndexMap[j]; - BattleMenu_Moves_OptionIndexMap[j] = swapTmp; + s32 swapTmp = MovesOptionIndexMap[i]; + MovesOptionIndexMap[i] = MovesOptionIndexMap[j]; + MovesOptionIndexMap[j] = swapTmp; } } while (0); } } } - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - hid = hud_element_create(battle_menu_moveOptionIconScripts[BattleMenu_Moves_OptionIndexMap[i]]); - BattleMenu_Moves_OptionIDs[i] = hid; + for (i = 0; i < MovesOptionCount; i++) { + hid = hud_element_create(MovesOptionHudScripts[MovesOptionIndexMap[i]]); + MovesOptionHIDs[i] = hid; hud_element_set_scale(hid, 0.45f); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); } hid = hud_element_create(&HES_AnimatedHandPointer); - BattleMenu_Moves_CursorID = hid; + HID_MovesCursor = hid; hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); - hud_element_set_render_pos(hid, BattleMenu_Moves_PosX, BattleMenu_Moves_PosY); + hud_element_set_render_pos(hid, MovesMenuPosX, MovesMenuPosY); hid = hud_element_create(&HES_GreenArrowUp); - BattleMenu_Moves_UpArrowID = hid; + HID_MovesArrowUp = hid; hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); - hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 39, BattleMenu_Moves_PosY - 7); + hud_element_set_render_pos(hid, MovesMenuPosX + 39, MovesMenuPosY - 7); hid = hud_element_create(&HES_GreenArrowDown); - BattleMenu_Moves_DownArrowID = hid; + HID_MovesArrowDown = hid; hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); - hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 39, BattleMenu_Moves_PosY + 78); + hud_element_set_render_pos(hid, MovesMenuPosX + 39, MovesMenuPosY + 78); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { hid = hud_element_create(&HES_StatusFlower); - BattleMenu_Moves_TitleID = hid; + HID_MovesTitle = hid; hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); } else { hid = hud_element_create(&HES_MenuStarPower); - BattleMenu_Moves_TitleID = hid; + HID_MovesTitle = hid; hud_element_set_scale(hid, 0.75f); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); } - hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 56, BattleMenu_Moves_PosY); + hud_element_set_render_pos(hid, MovesMenuPosX + 56, MovesMenuPosY); - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - if (!BattleMenu_UsingSpiritsSubmenu) { + for (i = 0; i < MovesOptionCount; i++) { + if (!UsingSpiritsSubmenu) { #if VERSION_PAL - switch (battle_menu_moveOptionDisplayCostReductionColors[i]) { + switch (MovesOptionDiscountColors[i]) { case 0: hid = 0; break; @@ -1298,26 +1298,26 @@ s32 btl_submenu_moves_update(void) { break; } hid = hud_element_create(D_PAL_802AB4FC[hid][gCurrentLanguage]); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; #else - switch (battle_menu_moveOptionDisplayCostReductionColors[i]) { + switch (MovesOptionDiscountColors[i]) { case 0: hid = hud_element_create(&HES_FPCost); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; break; case 1: hid = hud_element_create(&HES_FPCostReduced); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; break; default: hid = hud_element_create(&HES_FPCostReducedTwice); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; break; } #endif } else { #if VERSION_PAL - switch (battle_menu_moveOptionDisplayCostReductionColors[i]) { + switch (MovesOptionDiscountColors[i]) { case 0: hid = 0; break; @@ -1329,38 +1329,38 @@ s32 btl_submenu_moves_update(void) { break; } hid = hud_element_create(D_PAL_802AB53C[hid][gCurrentLanguage]); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; #else - switch (battle_menu_moveOptionDisplayCostReductionColors[i]) { + switch (MovesOptionDiscountColors[i]) { case 0: hid = hud_element_create(&HES_POWCost); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; break; case 1: hid = hud_element_create(&HES_POWCostReduced); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; break; default: hid = hud_element_create(&HES_POWCostReducedTwice); - BattleMenu_Moves_OptionCostUnitIDs[i] = hid; + MovesOptionCostHIDs[i] = hid; break; } #endif } hud_element_set_flags(hid, HUD_ELEMENT_FLAG_MANUAL_RENDER); - hud_element_set_render_pos(hid, BattleMenu_Moves_PosX + 56, BattleMenu_Moves_PosY); + hud_element_set_render_pos(hid, MovesMenuPosX + 56, MovesMenuPosY); } - BattleMenu_Moves_TextColor = MSG_PAL_STANDARD; + MovesTextColor = MSG_PAL_STANDARD; - moveX = BattleMenu_Moves_PosX; - moveY = BattleMenu_Moves_PosY; + moveX = MovesMenuPosX; + moveY = MovesMenuPosY; #if VERSION_JP - set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, 140, (D_802AD10E * 13) + 28, 0, btl_menu_moves_draw_content, nullptr, -1); + set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, 140, (MovesMenuLines * 13) + 28, 0, btl_menu_moves_draw_content, nullptr, -1); #endif - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { #if !VERSION_JP - set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, MOVES_OPTIONS_W, (D_802AD10E * 13) + 28, 0, btl_menu_moves_draw_content, nullptr, -1); + set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, MOVES_OPTIONS_W, (MovesMenuLines * 13) + 28, 0, btl_menu_moves_draw_content, nullptr, -1); #endif set_window_properties(WIN_BTL_MOVES_TITLE, moveX + MOVES_TITLE_X, moveY - 6, MOVES_TITLE_W, 16, 1, btl_menu_moves_show_title, nullptr, -1); set_window_properties(WIN_BTL_MOVES_ICON, moveX + MOVES_ICON_X, moveY - 12, 32, 32, 1, btl_menu_moves_show_icon, nullptr, -1); @@ -1368,7 +1368,7 @@ s32 btl_submenu_moves_update(void) { s16 new_var; #if !VERSION_JP - set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, STAR_SPIRITS_OPTIONS_W, (D_802AD10E * 13) + 28, 0, btl_menu_moves_draw_content, nullptr, -1); + set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, STAR_SPIRITS_OPTIONS_W, (MovesMenuLines * 13) + 28, 0, btl_menu_moves_draw_content, nullptr, -1); #endif new_var = moveY; // todo required to match set_window_properties(WIN_BTL_SPIRITS_TITLE, moveX + STAR_SPIRITS_TITLE_X, new_var - 6, STAR_SPIRITS_TITLE_W, 16, 1, btl_menu_moves_show_title, 0, -1); @@ -1376,10 +1376,10 @@ s32 btl_submenu_moves_update(void) { } moveX = POS_X; - moveY = BattleMenu_Moves_PosY; + moveY = MovesMenuPosY; set_window_properties(WIN_BTL_DESC_BOX, moveX, 186, WIDTH_3, 32, WINDOW_PRIORITY_20, btl_menu_moves_show_desc, nullptr, -1); set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_SHOW); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_SHOW); } else { @@ -1390,12 +1390,12 @@ s32 btl_submenu_moves_update(void) { do { cond = false; - if (battle_menu_moveCursorPos >= (battle_menu_moveScrollLine + D_802AD10D) - 1) { - battle_menu_moveScrollLine++; - if (battle_menu_moveScrollLine > BattleMenu_Moves_OptionCount - 6) { - battle_menu_moveScrollLine = BattleMenu_Moves_OptionCount - 6; - if (battle_menu_moveScrollLine < 0) { - battle_menu_moveScrollLine = 0; + if (MovesCursorPos >= (MovesVisibleStart + MovesVisibleEnd) - 1) { + MovesVisibleStart++; + if (MovesVisibleStart > MovesOptionCount - 6) { + MovesVisibleStart = MovesOptionCount - 6; + if (MovesVisibleStart < 0) { + MovesVisibleStart = 0; } } else { cond = true; @@ -1403,101 +1403,101 @@ s32 btl_submenu_moves_update(void) { } } while (cond); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_1; - D_802AD10D = battle_menu_moveScrollLine + 6; - battle_menu_moveScrollOffset = -battle_menu_moveScrollLine * 13; - D_802AD112 = (battle_menu_moveCursorPos - battle_menu_moveScrollLine) * 13; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesVisibleEnd = MovesVisibleStart + 6; + MovesScrollOffset = -MovesVisibleStart * 13; + MovesCursorOffset = (MovesCursorPos - MovesVisibleStart) * 13; break; case BTL_SUBMENU_MOVES_STATE_UNK_1: - D_802AD10A = battle_menu_moveCursorPos; + MovesPrevCursorPos = MovesCursorPos; if (battleStatus->curButtonsHeld & (BUTTON_STICK_UP | BUTTON_Z)) { - if (battle_menu_moveCursorPos > 0) { - battle_menu_moveCursorPos--; + if (MovesCursorPos > 0) { + MovesCursorPos--; } else if (battleStatus->curButtonsPressed & (BUTTON_STICK_UP | BUTTON_Z)) { - battle_menu_moveCursorPos--; + MovesCursorPos--; } } if (battleStatus->curButtonsHeld & (BUTTON_STICK_DOWN | BUTTON_R)) { - if (battle_menu_moveCursorPos < BattleMenu_Moves_OptionCount - 1) { - battle_menu_moveCursorPos++; + if (MovesCursorPos < MovesOptionCount - 1) { + MovesCursorPos++; } else if (battleStatus->curButtonsPressed & (BUTTON_STICK_DOWN | BUTTON_R)) { - battle_menu_moveCursorPos++; + MovesCursorPos++; } } - if (battle_menu_moveCursorPos < 0) { - battle_menu_moveCursorPos = BattleMenu_Moves_OptionCount - 1; + if (MovesCursorPos < 0) { + MovesCursorPos = MovesOptionCount - 1; } - if (BattleMenu_Moves_OptionCount - 1 < battle_menu_moveCursorPos) { - battle_menu_moveCursorPos = 0; + if (MovesOptionCount - 1 < MovesCursorPos) { + MovesCursorPos = 0; } - if (D_802AD10A != battle_menu_moveCursorPos) { - hud_element_set_scale(BattleMenu_Moves_OptionIDs[D_802AD10A], 0.45f); + if (MovesPrevCursorPos != MovesCursorPos) { + hud_element_set_scale(MovesOptionHIDs[MovesPrevCursorPos], 0.45f); sfx_play_sound(SOUND_MENU_CHANGE_SELECTION); } - if (battle_menu_moveCursorPos < battle_menu_moveScrollLine + 1) { - battle_menu_moveScrollLine--; - if (battle_menu_moveScrollLine < 0) { - battle_menu_moveScrollLine = 0; + if (MovesCursorPos < MovesVisibleStart + 1) { + MovesVisibleStart--; + if (MovesVisibleStart < 0) { + MovesVisibleStart = 0; } } - if (battle_menu_moveCursorPos >= (D_802AD10D - 1)) { - battle_menu_moveScrollLine++; - if (battle_menu_moveScrollLine > BattleMenu_Moves_OptionCount - 6) { - battle_menu_moveScrollLine = BattleMenu_Moves_OptionCount - 6; - if (battle_menu_moveScrollLine < 0) { - battle_menu_moveScrollLine = 0; + if (MovesCursorPos >= (MovesVisibleEnd - 1)) { + MovesVisibleStart++; + if (MovesVisibleStart > MovesOptionCount - 6) { + MovesVisibleStart = MovesOptionCount - 6; + if (MovesVisibleStart < 0) { + MovesVisibleStart = 0; } } } - D_802AD10D = battle_menu_moveScrollLine + 6; + MovesVisibleEnd = MovesVisibleStart + 6; if (battleStatus->curButtonsPressed & BUTTON_A) { - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos]] == 1) { + if (MovesOptionEnabled[MovesOptionIndexMap[MovesCursorPos]] == 1) { sfx_play_sound(SOUND_MENU_NEXT); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE; } else { sfx_play_sound(SOUND_MENU_ERROR); - D_802AD258 = 0; - temp_v0_14 = BattleMenu_Moves_OptionCantUseMessages[BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos]]; + MovesErrorCode = 0; + temp_v0_14 = MovesOptionError[MovesOptionIndexMap[MovesCursorPos]]; if (temp_v0_14 != 0) { - D_802AD258 = temp_v0_14; + MovesErrorCode = temp_v0_14; } - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_28; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_28; } break; } if (battleStatus->curButtonsPressed & BUTTON_B) { sfx_play_sound(SOUND_MENU_BACK); - func_802A27E4(); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_TWO; + btl_submenu_moves_destroy(); + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_TWO; } break; case BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE: - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - hid = BattleMenu_Moves_OptionIDs[i]; + for (i = 0; i < MovesOptionCount; i++) { + hid = MovesOptionHIDs[i]; hud_element_set_tint(hid, 160, 160, 160); } - hud_element_set_tint(BattleMenu_Moves_CursorID, 160, 160, 160); - hud_element_set_tint(BattleMenu_Moves_UpArrowID, 160, 160, 160); - hud_element_set_tint(BattleMenu_Moves_DownArrowID, 160, 160, 160); - hud_element_set_tint(BattleMenu_Moves_TitleID, 160, 160, 160); + hud_element_set_tint(HID_MovesCursor, 160, 160, 160); + hud_element_set_tint(HID_MovesArrowUp, 160, 160, 160); + hud_element_set_tint(HID_MovesArrowDown, 160, 160, 160); + hud_element_set_tint(HID_MovesTitle, 160, 160, 160); - for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { - hid = BattleMenu_Moves_OptionCostUnitIDs[i]; + for (i = 0; i < MovesOptionCount; i++) { + hid = MovesOptionCostHIDs[i]; hud_element_set_tint(hid, 160, 160, 160); } - hud_element_set_script(BattleMenu_Moves_CursorID, &HES_HandPointer); - BattleMenu_Moves_TextColor = MSG_PAL_0D; + hud_element_set_script(HID_MovesCursor, &HES_HandPointer); + MovesTextColor = MSG_PAL_0D; set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_DARKENED); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_DARKENED); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_DARKENED); } else { @@ -1505,15 +1505,15 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_DARKENED); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { status_bar_stop_blinking_fp(); } else { status_bar_stop_blinking_sp(); } - battle_menu_moveOptionActive = battle_menu_moveCursorPos; - return BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos] + 1; + SelectedMovesIndex = MovesCursorPos; + return MovesOptionIndexMap[MovesCursorPos] + 1; case BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_TWO: - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { status_bar_stop_blinking_fp(); } else { status_bar_stop_blinking_sp(); @@ -1521,7 +1521,7 @@ s32 btl_submenu_moves_update(void) { return 255; case BTL_SUBMENU_MOVES_STATE_UNK_A: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_HIDE); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_HIDE); } else { @@ -1529,20 +1529,20 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_HIDE); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { status_bar_stop_blinking_fp(); } else { status_bar_stop_blinking_sp(); } - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_B; - battle_menu_moveOptionActive = battle_menu_moveCursorPos; - return BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos] + 1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_B; + SelectedMovesIndex = MovesCursorPos; + return MovesOptionIndexMap[MovesCursorPos] + 1; case BTL_SUBMENU_MOVES_STATE_UNK_B: - battle_menu_moveOptionActive = battle_menu_moveCursorPos; - return BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos] + 1; + SelectedMovesIndex = MovesCursorPos; + return MovesOptionIndexMap[MovesCursorPos] + 1; case BTL_SUBMENU_MOVES_STATE_UNK_14: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_SHOW); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_SHOW); } else { @@ -1550,12 +1550,12 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_SHOW); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_1; - battle_menu_moveOptionActive = battle_menu_moveCursorPos; - return BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos] + 1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; + SelectedMovesIndex = MovesCursorPos; + return MovesOptionIndexMap[MovesCursorPos] + 1; case BTL_SUBMENU_MOVES_STATE_UNK_1E: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_9); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_9); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_9); } else { @@ -1563,15 +1563,15 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_9); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE; break; case BTL_SUBMENU_MOVES_STATE_UNK_28: - battle_menu_moveOptionActive = -1; - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_29; + SelectedMovesIndex = -1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_29; return -1; case BTL_SUBMENU_MOVES_STATE_UNK_29: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_HIDE); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_HIDE); } else { @@ -1581,8 +1581,8 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); msgID = MSG_Menus_Battle_CantSelectNow; - if (D_802AD258 == 0) { - if (!BattleMenu_UsingSpiritsSubmenu) { + if (MovesErrorCode == 0) { + if (!UsingSpiritsSubmenu) { msgID = MSG_Menus_NotEnoughFP; } else { msgID = MSG_Menus_NotEnoughStarPower; @@ -1594,23 +1594,23 @@ s32 btl_submenu_moves_update(void) { #if VERSION_JP set_window_properties(WIN_BTL_POPUP, moveX, 80, msgWidth, 28, 20, btl_menu_moves_show_error, nullptr, -1); #else - set_window_properties(WIN_BTL_POPUP, moveX, 80, msgWidth, D_802AB340[get_msg_lines(msgID) - 1], 20, btl_menu_moves_show_error, nullptr, -1); + set_window_properties(WIN_BTL_POPUP, moveX, 80, msgWidth, ErrorMessageHeight[get_msg_lines(msgID) - 1], 20, btl_menu_moves_show_error, nullptr, -1); #endif set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_SHOW); - D_802AD10B = 60; - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_2A; + MovesErrorTimer = 60; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_2A; return -1; case BTL_SUBMENU_MOVES_STATE_UNK_2A: if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) { - D_802AD10B = 0; + MovesErrorTimer = 0; } - if (D_802AD10B != 0) { - D_802AD10B--; + if (MovesErrorTimer != 0) { + MovesErrorTimer--; return -1; } set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_SHOW); - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_MOVES_ICON, WINDOW_UPDATE_SHOW); } else { @@ -1618,7 +1618,7 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_SHOW); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; break; } return 0; @@ -1677,7 +1677,7 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { s32 id; s32 i; - switch (battle_menu_moveState) { + switch (MovesMenuState) { case -1: case 1: case 10: @@ -1685,19 +1685,19 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { case 30: case 40: case 41: - yPos = -battle_menu_moveScrollLine * 13; - var_t0 = battle_menu_moveScrollOffset; + yPos = -MovesVisibleStart * 13; + var_t0 = MovesScrollOffset; temp_f6 = (yPos - var_t0) * 0.5; if (temp_f6 == 0) { var_t0 = yPos; } else { var_t0 += temp_f6; } - battle_menu_moveScrollOffset = var_t0; + MovesScrollOffset = var_t0; xPos = x + 2; yPos = y + 18; - var_t0 = yPos + 1 + (D_802AD10E * 13); + var_t0 = yPos + 1 + (MovesMenuLines * 13); gDPSetScissor( gMainGfxPos++, G_SC_NON_INTERLACE, xPos, @@ -1707,40 +1707,40 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { ); xPos = x + X_VAR255; - yPos = y + 19 + battle_menu_moveScrollOffset; + yPos = y + 19 + MovesScrollOffset; idx = 0; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++, idx++) { - if (i >= battle_menu_moveScrollLine - 1 && battle_menu_moveScrollLine + D_802AD10E >= i) { - palette = BattleMenu_Moves_TextColor; + for (i = 0; i < MovesOptionCount; i++, idx++) { + if (i >= MovesVisibleStart - 1 && MovesVisibleStart + MovesMenuLines >= i) { + palette = MovesTextColor; - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { palette = MSG_PAL_0B; } - if (battle_menu_moveOptionNames[BattleMenu_Moves_OptionIndexMap[idx]] >= 0) { + if (MovesOptionNames[MovesOptionIndexMap[idx]] >= 0) { draw_msg( - battle_menu_moveOptionNames[BattleMenu_Moves_OptionIndexMap[idx]], - xPos, yPos - MOVE_TEXT_Y, BattleMenu_Moves_TextAlpha, palette, 1 + MovesOptionNames[MovesOptionIndexMap[idx]], + xPos, yPos - MOVE_TEXT_Y, MovesTextAlpha, palette, 1 ); } #if VERSION_JP - a0 = battle_menu_moveOptionDisplayCostReductions[BattleMenu_Moves_OptionIndexMap[idx]]; - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { - v0 = battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]]; + a0 = MovesOptionDiscounts[MovesOptionIndexMap[idx]]; + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { + v0 = MovesOptionDisplayCosts[MovesOptionIndexMap[idx]]; } else { - v0 = battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]]; + v0 = MovesOptionDisplayCosts[MovesOptionIndexMap[idx]]; } #else - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { - a0 = battle_menu_moveOptionDisplayCostReductions[BattleMenu_Moves_OptionIndexMap[idx]]; + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { + a0 = MovesOptionDiscounts[MovesOptionIndexMap[idx]]; do {} while (0); - v0 = battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]]; + v0 = MovesOptionDisplayCosts[MovesOptionIndexMap[idx]]; } else { - a0 = battle_menu_moveOptionDisplayCostReductions[BattleMenu_Moves_OptionIndexMap[idx]]; + a0 = MovesOptionDiscounts[MovesOptionIndexMap[idx]]; do {} while (0); - v0 = battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]]; + v0 = MovesOptionDisplayCosts[MovesOptionIndexMap[idx]]; } #endif num = v0 - a0; @@ -1749,28 +1749,28 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { num = 1; } - if (!BattleMenu_UsingSpiritsSubmenu ) { - if (i == battle_menu_moveCursorPos) { - if (num == 0 || BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { + if (!UsingSpiritsSubmenu ) { + if (i == MovesCursorPos) { + if (num == 0 || MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { status_bar_stop_blinking_fp(); } else { status_bar_start_blinking_fp(); } } } else { - if (i == battle_menu_moveCursorPos) { - if (num == 0 || BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { + if (i == MovesCursorPos) { + if (num == 0 || MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { status_bar_stop_blinking_sp(); } else { - a0 = battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]]; + a0 = MovesOptionDisplayCosts[MovesOptionIndexMap[idx]]; status_bar_start_blinking_sp_bars( - battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]] + MovesOptionDisplayCosts[MovesOptionIndexMap[idx]] ); } } } - switch (battle_menu_moveOptionDisplayCostReductionColors[i]) { + switch (MovesOptionDiscountColors[i]) { case 0: palette = MSG_PAL_STANDARD; break; @@ -1782,20 +1782,20 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { break; } - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { palette = MSG_PAL_0B; } - if (battle_menu_moveOptionDisplayCosts[BattleMenu_Moves_OptionIndexMap[idx]] != 0) { + if (MovesOptionDisplayCosts[MovesOptionIndexMap[idx]] != 0) { #if VERSION_JP draw_number( - num, xPos + 91, yPos, DRAW_NUMBER_CHARSET_THIN, palette, BattleMenu_Moves_TextAlpha, + num, xPos + 91, yPos, DRAW_NUMBER_CHARSET_THIN, palette, MovesTextAlpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT ); - id = BattleMenu_Moves_OptionCostUnitIDs[idx]; - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { - if (!BattleMenu_UsingSpiritsSubmenu) { + id = MovesOptionCostHIDs[idx]; + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { + if (!UsingSpiritsSubmenu) { hud_element_set_script(id, &HES_NotEnoughFP); } else { hud_element_set_script(id, &HES_NotEnoughPOW); @@ -1804,31 +1804,31 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { yRenderPos = yPos + 7; hud_element_set_render_pos(id, xPos + 100, yRenderPos); #else - id = BattleMenu_Moves_OptionCostUnitIDs[idx]; + id = MovesOptionCostHIDs[idx]; - if (!BattleMenu_UsingSpiritsSubmenu) { + if (!UsingSpiritsSubmenu) { draw_number( - num, xPos + FP_COST_X, yPos, DRAW_NUMBER_CHARSET_THIN, palette, BattleMenu_Moves_TextAlpha, + num, xPos + FP_COST_X, yPos, DRAW_NUMBER_CHARSET_THIN, palette, MovesTextAlpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT ); - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { hud_element_set_script(id, HUD_NOT_ENOUGH_FP); } yRenderPos = yPos + 7; hud_element_set_render_pos(id, xPos + HUD_FP_COST_X, yRenderPos); } else { draw_number( - num, xPos + SP_COST_X, yPos, DRAW_NUMBER_CHARSET_THIN, palette, BattleMenu_Moves_TextAlpha, + num, xPos + SP_COST_X, yPos, DRAW_NUMBER_CHARSET_THIN, palette, MovesTextAlpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT ); - if (BattleMenu_Moves_OptionEnabled[BattleMenu_Moves_OptionIndexMap[idx]] <= 0) { + if (MovesOptionEnabled[MovesOptionIndexMap[idx]] <= 0) { hud_element_set_script(id, HUD_NOT_ENOUGH_POW); } yRenderPos = yPos + 7; hud_element_set_render_pos(id, xPos + HUD_SP_COST_X, yRenderPos); } #endif - hud_element_set_alpha(id, BattleMenu_Moves_TextAlpha); + hud_element_set_alpha(id, MovesTextAlpha); hud_element_draw_without_clipping(id); } } @@ -1836,56 +1836,56 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { } xPos = x + X_VAR3; - yPos = battle_menu_moveScrollOffset + y + 24; + yPos = MovesScrollOffset + y + 24; idx = 0; - for (i = 0; i < BattleMenu_Moves_OptionCount; i++, idx++) { - if (i < battle_menu_moveScrollLine - 1) { + for (i = 0; i < MovesOptionCount; i++, idx++) { + if (i < MovesVisibleStart - 1) { yPos += 13; - } else if (battle_menu_moveScrollLine + D_802AD10E < i) { + } else if (MovesVisibleStart + MovesMenuLines < i) { yPos += 13; } else { - id = BattleMenu_Moves_OptionIDs[idx]; + id = MovesOptionHIDs[idx]; hud_element_set_render_pos(id, xPos, yPos); - hud_element_set_alpha(id, BattleMenu_Moves_TextAlpha); + hud_element_set_alpha(id, MovesTextAlpha); hud_element_draw_without_clipping(id); yPos += 13; } } - yPos = (battle_menu_moveCursorPos - battle_menu_moveScrollLine) * 13; - var_t0 = D_802AD112; - temp_f6 = (yPos - D_802AD112) * 1.0; + yPos = (MovesCursorPos - MovesVisibleStart) * 13; + var_t0 = MovesCursorOffset; + temp_f6 = (yPos - MovesCursorOffset) * 1.0; xPos = x + 10; if (temp_f6 != 0) { var_t0 += temp_f6; } else { var_t0 = yPos; } - D_802AD112 = var_t0; - yPos = y + 26 + D_802AD112; + MovesCursorOffset = var_t0; + yPos = y + 26 + MovesCursorOffset; - id = BattleMenu_Moves_CursorID; + id = HID_MovesCursor; hud_element_set_render_pos(id, xPos, yPos); - hud_element_set_alpha(id, BattleMenu_Moves_TextAlpha); + hud_element_set_alpha(id, MovesTextAlpha); hud_element_draw_without_clipping(id); - if (battle_menu_moveScrollLine > 0) { - id = BattleMenu_Moves_UpArrowID; + if (MovesVisibleStart > 0) { + id = HID_MovesArrowUp; hud_element_set_render_pos(id, x + 72, y + 15); - hud_element_set_alpha(id, BattleMenu_Moves_TextAlpha); + hud_element_set_alpha(id, MovesTextAlpha); hud_element_draw_clipped(id); } - if (D_802AD10D < BattleMenu_Moves_OptionCount) { - id = BattleMenu_Moves_DownArrowID; + if (MovesVisibleEnd < MovesOptionCount) { + id = HID_MovesArrowDown; hud_element_set_render_pos(id, x + 72, y + 100); - hud_element_set_alpha(id, BattleMenu_Moves_TextAlpha); + hud_element_set_alpha(id, MovesTextAlpha); hud_element_draw_clipped(id); } - if (battle_menu_moveState == -1) { - if (!BattleMenu_UsingSpiritsSubmenu) { + if (MovesMenuState == -1) { + if (!UsingSpiritsSubmenu) { status_bar_stop_blinking_fp(); } else { status_bar_stop_blinking_sp(); @@ -1908,31 +1908,31 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { #endif void btl_menu_moves_show_title(void* data, s32 x, s32 y) { - if (!BattleMenu_UsingSpiritsSubmenu) { - draw_msg(MSG_Menus_Abilities, x + TEXT_ABILITIES_X, y + 2, BattleMenu_Moves_TextAlpha, MSG_PAL_30, DRAW_MSG_STYLE_MENU); + if (!UsingSpiritsSubmenu) { + draw_msg(MSG_Menus_Abilities, x + TEXT_ABILITIES_X, y + 2, MovesTextAlpha, MSG_PAL_30, DRAW_MSG_STYLE_MENU); } else { - draw_msg(MSG_Menus_StarSpirits, x + TEXT_STAR_SPIRITS_X, y + 2, BattleMenu_Moves_TextAlpha, MSG_PAL_31, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_Menus_StarSpirits, x + TEXT_STAR_SPIRITS_X, y + 2, MovesTextAlpha, MSG_PAL_31, DRAW_MSG_STYLE_MENU); } } void btl_menu_moves_show_icon(void* data, s32 x, s32 y) { - s32 icon = BattleMenu_Moves_TitleID; + s32 icon = HID_MovesTitle; hud_element_set_render_pos(icon, x + 16, y + 15); - hud_element_set_alpha(icon, BattleMenu_Moves_TextAlpha); + hud_element_set_alpha(icon, MovesTextAlpha); hud_element_draw_clipped(icon); } void btl_menu_moves_show_desc(void* data, s32 x, s32 y) { - switch (battle_menu_moveState) { + switch (MovesMenuState) { case BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE: case BTL_SUBMENU_MOVES_STATE_UNK_1: case BTL_SUBMENU_MOVES_STATE_UNK_A: case BTL_SUBMENU_MOVES_STATE_UNK_14: case BTL_SUBMENU_MOVES_STATE_UNK_1E: - if (D_802AD10F != 0) { - draw_msg(BattleMenu_Moves_OptionDescMessages[BattleMenu_Moves_OptionIndexMap[battle_menu_moveCursorPos]], - x + 8, y, BattleMenu_Moves_TextAlpha, BattleMenu_Moves_TextColor, 0); + if (MovesDescVisible != 0) { + draw_msg(MovesOptionDesc[MovesOptionIndexMap[MovesCursorPos]], + x + 8, y, MovesTextAlpha, MovesTextColor, 0); } break; } @@ -1943,9 +1943,9 @@ void btl_menu_moves_show_error(void* data, s32 x, s32 y) { s32 posX = x + 11; s32 posY = y + 6; - if (D_802AD258 != 0) { + if (MovesErrorCode != 0) { draw_msg(MSG_Menus_Battle_CantSelectNow, posX, posY, 255, MSG_PAL_0F, 0); - } else if (!BattleMenu_UsingSpiritsSubmenu) { + } else if (!UsingSpiritsSubmenu) { draw_msg(MSG_Menus_NotEnoughFP, posX, posY, 255, MSG_PAL_0F, 0); } else { draw_msg(MSG_Menus_NotEnoughStarPower, posX, posY, 255, MSG_PAL_0F, 0); @@ -1958,124 +1958,124 @@ void btl_menu_moves_show_error(void* data, s32 x, s32 y) { posY += 6; posX = x + 11; - if (D_802AD258 != 0) { + if (MovesErrorCode != 0) { msgID = MSG_Menus_Battle_CantSelectNow; - } else if (!BattleMenu_UsingSpiritsSubmenu) { + } else if (!UsingSpiritsSubmenu) { msgID = MSG_Menus_NotEnoughFP; } else { msgID = MSG_Menus_NotEnoughStarPower; } - draw_msg(msgID, posX, posY + D_802AB344[get_msg_lines(msgID) - 1], 255, MSG_PAL_0F, 0); + draw_msg(msgID, posX, posY + ErrorMessageAdjustY[get_msg_lines(msgID) - 1], 255, MSG_PAL_0F, 0); #endif } -void func_802A45D8(void) { +void btl_menu_strats_init(void) { s32 sixTemp; s8 temp802AD673; - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_INIT; - StratsMenuPos = StratsMenuLastPos; - OldStratsMenuPos = StratsMenuLastPos; - D_802AD608 = 0; - StratsMenuLines = D_802AD66C; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_INIT; + StratsCursorPos = StratsPrevSelected; + StratsPrevCursorPos = StratsPrevSelected; + StratsVisibleStart = 0; + StratsMenuLines = StratsOptionCount; if (StratsMenuLines > 6) { StratsMenuLines = 6; } - D_802AD609 = sixTemp = 6; + StratsVisibleEnd = sixTemp = 6; - if (D_802AD609 > D_802AD66C) { - D_802AD609 = D_802AD66C; + if (StratsVisibleEnd > StratsOptionCount) { + StratsVisibleEnd = StratsOptionCount; } - D_802AD624 = 255; - D_802AD60B = 1; - temp802AD673 = StratsMenuLastPos; + StratsTextAlpha = 255; + StratsDescVisible = 1; + temp802AD673 = StratsPrevSelected; - if ((s8) StratsMenuLastPos < 0) { - D_802AD608 = StratsMenuLastPos; + if ((s8) StratsPrevSelected < 0) { + StratsVisibleStart = StratsPrevSelected; } - if ((s8) StratsMenuLastPos >= D_802AD609) { - D_802AD608 = (temp802AD673 + 1 - StratsMenuLines); + if ((s8) StratsPrevSelected >= StratsVisibleEnd) { + StratsVisibleStart = (temp802AD673 + 1 - StratsMenuLines); } - D_802AD609 = D_802AD608 + sixTemp; - if (D_802AD609 > D_802AD66C) { - D_802AD609 = D_802AD66C; + StratsVisibleEnd = StratsVisibleStart + sixTemp; + if (StratsVisibleEnd > StratsOptionCount) { + StratsVisibleEnd = StratsOptionCount; } - D_802AD60C = -D_802AD608 * 13; - D_802AD60E = ((s8) StratsMenuLastPos - D_802AD608) * 13; + StratsScrollOffset = -StratsVisibleStart * 13; + StratsCursorOffset = ((s8) StratsPrevSelected - StratsVisibleStart) * 13; ShowingErrorMessage = false; D_802AD6D4 = 0; } -void func_802A4718(void) { - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_UNK_10; +void btl_submenu_strats_hide(void) { + StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_10; } -void func_802A472C(void) { +void btl_submenu_strats_destroy(void) { s32 i; set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - for (i = 0; i < D_802AD66C; i++) { - hud_element_free(D_802AD628[i]); + for (i = 0; i < StratsOptionCount; i++) { + hud_element_free(StratsOptionHIDs[i]); } - hud_element_free(D_802AD618); - hud_element_free(HID_GreenArrowUp); - hud_element_free(HID_GreenArrowDown); + hud_element_free(HID_StratsCursor); + hud_element_free(HID_StratsArrowUp); + hud_element_free(HID_StratsArrowDown); } -void func_802A47E0(void) { +void btl_submenu_strats_resume_choose(void) { s32 i; - for (i = 0; i < D_802AD66C; i++) { - hud_element_set_tint(D_802AD628[i], 255, 255, 255); + for (i = 0; i < StratsOptionCount; i++) { + hud_element_set_tint(StratsOptionHIDs[i], 255, 255, 255); } - hud_element_set_tint(D_802AD618, 255, 255, 255); - hud_element_set_tint(HID_GreenArrowUp, 255, 255, 255); - hud_element_set_tint(HID_GreenArrowDown, 255, 255, 255); - hud_element_set_script(D_802AD618, &HES_AnimatedHandPointer); + hud_element_set_tint(HID_StratsCursor, 255, 255, 255); + hud_element_set_tint(HID_StratsArrowUp, 255, 255, 255); + hud_element_set_tint(HID_StratsArrowDown, 255, 255, 255); + hud_element_set_script(HID_StratsCursor, &HES_AnimatedHandPointer); set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - D_802AD614 = MSG_PAL_STANDARD; - D_802AD60B = 1; - D_802AD624 = 255; - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_CHOOSE; + StratsTextColor = MSG_PAL_STANDARD; + StratsDescVisible = 1; + StratsTextAlpha = 255; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; } -void func_802A48FC(void) { +void btl_submenu_strats_restore_choose(void) { s32 i; set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - for (i = 0; i < D_802AD66C; i++) { - hud_element_set_tint(D_802AD628[i], 255, 255, 255); + for (i = 0; i < StratsOptionCount; i++) { + hud_element_set_tint(StratsOptionHIDs[i], 255, 255, 255); } - hud_element_set_tint(D_802AD618, 255, 255, 255); - hud_element_set_tint(HID_GreenArrowUp, 255, 255, 255); - hud_element_set_tint(HID_GreenArrowDown, 255, 255, 255); - hud_element_set_script(D_802AD618, &HES_AnimatedHandPointer); - D_802AD614 = MSG_PAL_STANDARD; - D_802AD60B = 1; - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_UNK_20; + hud_element_set_tint(HID_StratsCursor, 255, 255, 255); + hud_element_set_tint(HID_StratsArrowUp, 255, 255, 255); + hud_element_set_tint(HID_StratsArrowDown, 255, 255, 255); + hud_element_set_script(HID_StratsCursor, &HES_AnimatedHandPointer); + StratsTextColor = MSG_PAL_STANDARD; + StratsDescVisible = 1; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_20; } -void func_802A4A10(void) { +void btl_submenu_strats_restore_locked(void) { set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_UNK_30; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_30; } #if VERSION_JP @@ -2092,7 +2092,7 @@ void func_802A4A10(void) { #define W_VAR3 280 #endif -s32 btl_update_strats_menu(void) { +s32 btl_submenu_strats_update(void) { BattleStatus* battleStatus = &gBattleStatus; HudElemID hid; s32 x, y; @@ -2100,40 +2100,40 @@ s32 btl_update_strats_menu(void) { s32 msgID; s32 i; - switch (BattleSubmenuStratsState) { + switch (StratsMenuState) { case BTL_SUBMENU_STRATS_STATE_INIT: #if VERSION_JP - D_802AD63C = 32; + StratsMenuPosX = 32; #else - D_802AD63C = 20; + StratsMenuPosX = 20; #endif - D_802AD63E = 68; - D_802AD60C = -D_802AD608 * 13; - D_802AD60E = (StratsMenuPos - D_802AD608) * 13; + StratsMenuPosY = 68; + StratsScrollOffset = -StratsVisibleStart * 13; + StratsCursorOffset = (StratsCursorPos - StratsVisibleStart) * 13; - for (i = 0; i < D_802AD66C; i++) { - D_802AD628[i] = hid = hud_element_create(D_802AD640[i]); + for (i = 0; i < StratsOptionCount; i++) { + StratsOptionHIDs[i] = hid = hud_element_create(StratsOptionHudScripts[i]); hud_element_set_scale(hid, 0.45f); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_MANUAL_RENDER); } - D_802AD618 = hid = hud_element_create(&HES_AnimatedHandPointer); + HID_StratsCursor = hid = hud_element_create(&HES_AnimatedHandPointer); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); - x = D_802AD63C; //! required to match - y = D_802AD63E; + x = StratsMenuPosX; //! required to match + y = StratsMenuPosY; hud_element_set_render_pos(hid, x, y); - HID_GreenArrowUp = hid = hud_element_create(&HES_GreenArrowUp); + HID_StratsArrowUp = hid = hud_element_create(&HES_GreenArrowUp); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); - hud_element_set_render_pos(hid, D_802AD63C + 39, D_802AD63E - 7); + hud_element_set_render_pos(hid, StratsMenuPosX + 39, StratsMenuPosY - 7); - HID_GreenArrowDown = hid = hud_element_create(&HES_GreenArrowDown); + HID_StratsArrowDown = hid = hud_element_create(&HES_GreenArrowDown); hud_element_set_flags(hid, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_MANUAL_RENDER); - hud_element_set_render_pos(hid, D_802AD63C + 39, D_802AD63E + 78); + hud_element_set_render_pos(hid, StratsMenuPosX + 39, StratsMenuPosY + 78); - D_802AD614 = MSG_PAL_STANDARD; - x = D_802AD63C; - y = D_802AD63E; + StratsTextColor = MSG_PAL_STANDARD; + x = StratsMenuPosX; + y = StratsMenuPosY; #if VERSION_PAL width = get_msg_width(MSG_Menus_Strategies, 0) + 32; set_window_properties(WIN_BTL_STRATS_MENU, x, y, D_PAL_802AB4C8[gCurrentLanguage], (StratsMenuLines * 13) + 26, @@ -2150,113 +2150,113 @@ s32 btl_update_strats_menu(void) { set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_CHOOSE; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; return 0; case BTL_SUBMENU_STRATS_STATE_CHOOSE: if (!ShowingErrorMessage) { - OldStratsMenuPos = StratsMenuPos; + StratsPrevCursorPos = StratsCursorPos; // only wrap selection on stick press, not when held if (battleStatus->curButtonsHeld & BUTTON_STICK_UP) { - if (StratsMenuPos > 0) { - StratsMenuPos--; + if (StratsCursorPos > 0) { + StratsCursorPos--; } else if (battleStatus->curButtonsPressed & BUTTON_STICK_UP) { - StratsMenuPos--; + StratsCursorPos--; } } if (battleStatus->curButtonsHeld & BUTTON_STICK_DOWN) { - if (StratsMenuPos < D_802AD66C - 1) { - StratsMenuPos++; + if (StratsCursorPos < StratsOptionCount - 1) { + StratsCursorPos++; } else if (battleStatus->curButtonsPressed & BUTTON_STICK_DOWN) { - StratsMenuPos++; + StratsCursorPos++; } } // wrap the selected index - if (StratsMenuPos < 0) { - StratsMenuPos = D_802AD66C - 1; + if (StratsCursorPos < 0) { + StratsCursorPos = StratsOptionCount - 1; } - if (D_802AD66C - 1 < StratsMenuPos) { - StratsMenuPos = 0; + if (StratsOptionCount - 1 < StratsCursorPos) { + StratsCursorPos = 0; } - if (OldStratsMenuPos != StratsMenuPos) { - hud_element_set_scale(D_802AD628[OldStratsMenuPos], 0.45f); + if (StratsPrevCursorPos != StratsCursorPos) { + hud_element_set_scale(StratsOptionHIDs[StratsPrevCursorPos], 0.45f); sfx_play_sound(SOUND_MENU_CHANGE_SELECTION); } - if (StratsMenuPos < D_802AD608) { - D_802AD608 = StratsMenuPos; + if (StratsCursorPos < StratsVisibleStart) { + StratsVisibleStart = StratsCursorPos; } - if (StratsMenuPos >= D_802AD609) { - D_802AD608 = StratsMenuPos + 1 - StratsMenuLines; + if (StratsCursorPos >= StratsVisibleEnd) { + StratsVisibleStart = StratsCursorPos + 1 - StratsMenuLines; } - D_802AD609 = D_802AD608 + 6; - if (D_802AD609 > D_802AD66C) { - D_802AD609 = D_802AD66C; + StratsVisibleEnd = StratsVisibleStart + 6; + if (StratsVisibleEnd > StratsOptionCount) { + StratsVisibleEnd = StratsOptionCount; } if (battleStatus->curButtonsPressed & BUTTON_A) { - if (D_802AD690[StratsMenuPos] == 1) { + if (StratsOptionEnabled[StratsCursorPos] == 1) { sfx_play_sound(SOUND_MENU_NEXT); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_SELECT; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_SELECT; } else { sfx_play_sound(SOUND_MENU_ERROR); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_ERROR_INIT; - D_802AD610 = D_802AD6A8[StratsMenuPos]; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_ERROR_INIT; + StratsErrorCode = StratsOptionError[StratsCursorPos]; } } else if (battleStatus->curButtonsPressed & BUTTON_B) { sfx_play_sound(SOUND_MENU_BACK); - func_802A472C(); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_CANCEL; + btl_submenu_strats_destroy(); + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CANCEL; } } return 0; case BTL_SUBMENU_STRATS_STATE_SELECT: - for (i = 0; i < D_802AD66C; i++) { - hud_element_set_tint(D_802AD628[i], 160, 160, 160); - } - hud_element_set_tint(D_802AD618, 160, 160, 160); - hud_element_set_tint(HID_GreenArrowUp, 160, 160, 160); - hud_element_set_tint(HID_GreenArrowDown, 160, 160, 160); - hud_element_set_script(D_802AD618, &HES_HandPointer); - D_802AD614 = MSG_PAL_0D; + for (i = 0; i < StratsOptionCount; i++) { + hud_element_set_tint(StratsOptionHIDs[i], 160, 160, 160); + } + hud_element_set_tint(HID_StratsCursor, 160, 160, 160); + hud_element_set_tint(HID_StratsArrowUp, 160, 160, 160); + hud_element_set_tint(HID_StratsArrowDown, 160, 160, 160); + hud_element_set_script(HID_StratsCursor, &HES_HandPointer); + StratsTextColor = MSG_PAL_0D; set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_DARKENED); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_DARKENED); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - return StratsMenuPos + 1; + return StratsCursorPos + 1; case BTL_SUBMENU_STRATS_STATE_CANCEL: return 255; case 10: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_UNK_11; - return StratsMenuPos + 1; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_11; + return StratsCursorPos + 1; case 11: - return StratsMenuPos + 1; + return StratsCursorPos + 1; case 20: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_CHOOSE; - return StratsMenuPos + 1; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; + return StratsCursorPos + 1; case 30: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_SELECT; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_SELECT; return 0; case BTL_SUBMENU_STRATS_STATE_ERROR_INIT: D_802AD6D4 = -1; - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_ERROR_SHOW; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_ERROR_SHOW; return -1; case BTL_SUBMENU_STRATS_STATE_ERROR_SHOW: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - switch (D_802AD610) { + switch (StratsErrorCode) { case 0: msgID = MSG_Menus_Battle_CantSwitch2; break; @@ -2270,28 +2270,28 @@ s32 btl_update_strats_menu(void) { width = get_msg_width(msgID, 0) + 23; x = (SCREEN_WIDTH / 2) - (width / 2); #if VERSION_PAL - set_window_properties(WIN_BTL_POPUP, x, 80, width, D_802AB340[get_msg_lines(msgID) - 1], + set_window_properties(WIN_BTL_POPUP, x, 80, width, ErrorMessageHeight[get_msg_lines(msgID) - 1], 20, btl_menu_strats_show_error, nullptr, -1); #else set_window_properties(WIN_BTL_POPUP, x, 80, width, 28, 20, btl_menu_strats_show_error, nullptr, -1); #endif set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_SHOW); - D_802AD612 = 60; - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_ERROR_DONE; + StratsErrorTimer = 60; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_ERROR_DONE; return -1; case BTL_SUBMENU_STRATS_STATE_ERROR_DONE: if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) { - D_802AD612 = 0; + StratsErrorTimer = 0; } - if (D_802AD612 != 0) { - D_802AD612--; + if (StratsErrorTimer != 0) { + StratsErrorTimer--; return -1; } set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_CHOOSE; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; return 0; } return 0; @@ -2319,7 +2319,7 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { s32 id; s32 i; - switch (BattleSubmenuStratsState) { + switch (StratsMenuState) { case BTL_SUBMENU_STRATS_STATE_SELECT: case BTL_SUBMENU_STRATS_STATE_CHOOSE: case BTL_SUBMENU_STRATS_STATE_UNK_10: @@ -2327,15 +2327,15 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { case BTL_SUBMENU_STRATS_STATE_UNK_30: case BTL_SUBMENU_STRATS_STATE_ERROR_INIT: case BTL_SUBMENU_STRATS_STATE_ERROR_SHOW: - yPos = -D_802AD608 * 13; - var_t0 = D_802AD60C; + yPos = -StratsVisibleStart * 13; + var_t0 = StratsScrollOffset; temp_f6 = (yPos - var_t0) * 0.5; if (temp_f6 != 0) { var_t0 += temp_f6; } else { var_t0 = yPos; } - D_802AD60C = var_t0; + StratsScrollOffset = var_t0; xPos = x + 4; yPos = y + 18; @@ -2343,36 +2343,36 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + STRATS_SUBMENU_WIDTH, var_t0); xPos = x + 33; - yPos = y + 19 + D_802AD60C; + yPos = y + 19 + StratsScrollOffset; idx = 0; - for (i = 0; i < D_802AD66C; i++, idx++) { - s32 palette = D_802AD614; + for (i = 0; i < StratsOptionCount; i++, idx++) { + s32 palette = StratsTextColor; - if (D_802AD678[i] == 5 && is_ability_active(ABILITY_QUICK_CHANGE)) { + if (StratsOptionMenuTypes[i] == 5 && is_ability_active(ABILITY_QUICK_CHANGE)) { palette = MSG_PAL_37; } - if (D_802AD690[idx] == 0) { + if (StratsOptionEnabled[idx] == 0) { palette = MSG_PAL_0B; } - draw_msg(D_802AD658[idx], xPos, yPos - STRATS_OPTION_Y, D_802AD624, palette, DRAW_MSG_STYLE_MENU); + draw_msg(StratsOptionNames[idx], xPos, yPos - STRATS_OPTION_Y, StratsTextAlpha, palette, DRAW_MSG_STYLE_MENU); yPos += 13; } xPos = x + 24; - yPos = D_802AD60C + y + 24; + yPos = StratsScrollOffset + y + 24; idx = 0; - for (i = 0; i < D_802AD66C; i++, idx++) { - id = D_802AD628[idx]; + for (i = 0; i < StratsOptionCount; i++, idx++) { + id = StratsOptionHIDs[idx]; hud_element_set_render_pos(id, xPos, yPos); - hud_element_set_alpha(id, D_802AD624); + hud_element_set_alpha(id, StratsTextAlpha); hud_element_draw_without_clipping(id); yPos += 13; } - yPos = (StratsMenuPos - D_802AD608) * 13; - var_t0 = D_802AD60E; + yPos = (StratsCursorPos - StratsVisibleStart) * 13; + var_t0 = StratsCursorOffset; temp_f6 = (yPos - var_t0) * 1.0; xPos = x + 10; if (temp_f6 != 0) { @@ -2380,24 +2380,24 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { } else { var_t0 = yPos; } - D_802AD60E = var_t0; - yPos = y + 26 + D_802AD60E; + StratsCursorOffset = var_t0; + yPos = y + 26 + StratsCursorOffset; - id = D_802AD618; + id = HID_StratsCursor; hud_element_set_render_pos(id, xPos, yPos); - hud_element_set_alpha(id, D_802AD624); + hud_element_set_alpha(id, StratsTextAlpha); hud_element_draw_clipped(id); - if (D_802AD608 > 0) { - id = HID_GreenArrowUp; + if (StratsVisibleStart > 0) { + id = HID_StratsArrowUp; hud_element_set_render_pos(id, x + 67, y + 16); - hud_element_set_alpha(id, D_802AD624); + hud_element_set_alpha(id, StratsTextAlpha); hud_element_draw_clipped(id); } - if (D_802AD609 < D_802AD66C) { - id = HID_GreenArrowDown; + if (StratsVisibleEnd < StratsOptionCount) { + id = HID_StratsArrowDown; hud_element_set_render_pos(id, x + 67, y + 100); - hud_element_set_alpha(id, D_802AD624); + hud_element_set_alpha(id, StratsTextAlpha); hud_element_draw_clipped(id); } break; @@ -2411,18 +2411,18 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { #endif void btl_menu_strats_show_title(void* data, s32 x, s32 y) { - draw_msg(MSG_Menus_Strategies, x + X_VAR9, y + 2, D_802AD624, MSG_PAL_33, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_Menus_Strategies, x + X_VAR9, y + 2, StratsTextAlpha, MSG_PAL_33, DRAW_MSG_STYLE_MENU); } void btl_menu_strats_show_desc(void* data, s32 x, s32 y) { - switch (BattleSubmenuStratsState) { + switch (StratsMenuState) { case BTL_SUBMENU_STRATS_STATE_SELECT: case BTL_SUBMENU_STRATS_STATE_CHOOSE: case BTL_SUBMENU_STRATS_STATE_UNK_10: case BTL_SUBMENU_STRATS_STATE_UNK_20: case BTL_SUBMENU_STRATS_STATE_UNK_30: - if (D_802AD60B != 0) { - draw_msg(D_802AD6C0[StratsMenuPos], x + 8, y, D_802AD624, D_802AD614, 0); + if (StratsDescVisible != 0) { + draw_msg(StratsOptionMessage[StratsCursorPos], x + 8, y, StratsTextAlpha, StratsTextColor, 0); } break; } @@ -2433,7 +2433,7 @@ void btl_menu_strats_show_error(void* data, s32 x, s32 y) { x += 11; y += 6; - switch (D_802AD610) { + switch (StratsErrorCode) { case 0: msgID = MSG_Menus_Battle_CantSwitch2; break; @@ -2445,12 +2445,12 @@ void btl_menu_strats_show_error(void* data, s32 x, s32 y) { break; } #if VERSION_PAL - y += D_802AB344[get_msg_lines(msgID) - 1]; + y += ErrorMessageAdjustY[get_msg_lines(msgID) - 1]; #endif draw_msg(msgID, x, y, 255, MSG_PAL_0F, 0); } -s32 can_switch_to_player(void) { +s32 btl_player_can_act(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; @@ -2543,7 +2543,7 @@ s32 btl_menu_can_player_move(void) { extern s32 MenuIndexFromPartnerID[]; // TODO MOVE -s32 can_switch_to_partner(void) { +s32 btl_partner_can_act(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; s8 partnerDebuff; @@ -2591,7 +2591,7 @@ void btl_state_update_player_menu(void) { PlayerData* playerData = &gPlayerData; Actor* playerActor = battleStatus->playerActor; Actor* partnerActor = battleStatus->partnerActor; - PopupMenu* popup = &D_802ACCD0; + PopupMenu* popup = &BattlePopupMenu; MoveData* moveData; s32 entryIdx, initialPos; s32 i; @@ -2609,7 +2609,7 @@ void btl_state_update_player_menu(void) { battleStatus->moveCategory = BTL_MENU_TYPE_INVALID; battleStatus->selectedMoveID = 0; battleStatus->curAttackElement = 0; - if (!can_switch_to_player()) { + if (!btl_player_can_act()) { btl_set_state(BATTLE_STATE_END_PLAYER_TURN); return; } @@ -2665,8 +2665,8 @@ void btl_state_update_player_menu(void) { partnerActor->flags |= ACTOR_FLAG_USING_IDLE_ANIM; partnerActor->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS; } - func_80263268(); - func_80263300(); + btl_check_can_change_partner(); + btl_init_menu_items(); btl_init_menu_boots(); btl_init_menu_hammer(); if (player_team_is_ability_active(playerActor, ABILITY_BERSERKER)) { @@ -2681,18 +2681,18 @@ void btl_state_update_player_menu(void) { } // strategies menu category - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_STRATEGIES; - BattleMenu_OptionEnabled[entryIdx] = true; - BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.enabled; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_STRATEGIES]; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_STRATEGIES; + WheelOptionEnabled[entryIdx] = true; + WheelOptionHudScript[entryIdx] = StrategiesHudScripts.enabled; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_STRATEGIES]; if (battleStatus->actionCommandMode == AC_MODE_TUTORIAL || gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) { - BattleMenu_TitleMessages[entryIdx] = MSG_Menus_EndTraining_Centered; + WheelOptionName[entryIdx] = MSG_Menus_EndTraining_Centered; } - battle_menu_isMessageDisabled[entryIdx] = 0; + WheelOptionError[entryIdx] = 0; if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STRATEGIES)) { - BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = StrategiesHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_STRATEGIES) { initialPos = entryIdx; @@ -2701,27 +2701,27 @@ void btl_state_update_player_menu(void) { // items menu category if (battleStatus->menuStatus[0] >= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.enabled; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_ITEMS; - BattleMenu_OptionEnabled[entryIdx] = true; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_ITEMS]; + WheelOptionHudScript[entryIdx] = ItemsHudScripts.enabled; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_ITEMS; + WheelOptionEnabled[entryIdx] = true; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_ITEMS]; if(battleStatus->menuStatus[0] == 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_ITEM_TARGET; + WheelOptionHudScript[entryIdx] = ItemsHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_NO_ITEM_TARGET; } if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_ITEMS)) { - BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = ItemsHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->itemLossTurns >= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = ItemsHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_ITEMS) { @@ -2732,25 +2732,25 @@ void btl_state_update_player_menu(void) { } // jump menu category - BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[playerData->bootsLevel + 1].enabled; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_JUMP; - BattleMenu_OptionEnabled[entryIdx] = true; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_JUMP]; + WheelOptionHudScript[entryIdx] = BootsHudScripts[playerData->bootsLevel + 1].enabled; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_JUMP; + WheelOptionEnabled[entryIdx] = true; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_JUMP]; if (battleStatus->menuStatus[1] <= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].enabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_JUMP_TARGET; + WheelOptionHudScript[entryIdx] = BootsHudScripts[0].enabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_NO_JUMP_TARGET; } if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_JUMP)) { - BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = BootsHudScripts[0].disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->jumpLossTurns >= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = BootsHudScripts[0].disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_JUMP) { initialPos = entryIdx; @@ -2759,24 +2759,24 @@ void btl_state_update_player_menu(void) { // hammer menu category if (playerData->hammerLevel >= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[playerData->hammerLevel + 1].enabled; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_SMASH; - BattleMenu_OptionEnabled[entryIdx] = true; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_SMASH]; + WheelOptionHudScript[entryIdx] = HammerHudScripts[playerData->hammerLevel + 1].enabled; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_SMASH; + WheelOptionEnabled[entryIdx] = true; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_SMASH]; if (battleStatus->menuStatus[2] <= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].enabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_HAMMER_TARGET; + WheelOptionHudScript[entryIdx] = HammerHudScripts[0].enabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_NO_HAMMER_TARGET; } if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_SMASH)) { - BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = HammerHudScripts[0].disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->hammerLossTurns >= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = HammerHudScripts[0].disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_SMASH) { initialPos = entryIdx; @@ -2786,15 +2786,15 @@ void btl_state_update_player_menu(void) { // star powers menu category if (playerData->maxStarPower != 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.enabled; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_STAR_POWERS; - BattleMenu_OptionEnabled[entryIdx] = true; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_STAR_POWERS]; - battle_menu_isMessageDisabled[entryIdx] = 0; + WheelOptionHudScript[entryIdx] = StarPowersHudScripts.enabled; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_STAR_POWERS; + WheelOptionEnabled[entryIdx] = true; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_STAR_POWERS]; + WheelOptionError[entryIdx] = 0; if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STAR_POWERS)) { - BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.disabled; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = StarPowersHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_STAR_POWERS) { initialPos = entryIdx; @@ -2802,11 +2802,11 @@ void btl_state_update_player_menu(void) { entryIdx++; } - BattleMenu_NumOptions = entryIdx; + WheelOptionCount = entryIdx; D_802AD0A8 = 0; - D_802AD0B0 = initialPos; - D_802AD100 = 2 - initialPos; - if (can_switch_to_partner()) { + BattleMenu_PrevSelected = initialPos; + BattleMenu_WheelBase = 2 - initialPos; + if (btl_partner_can_act()) { BattleMenu_ShowSwapIcons = true; } else { BattleMenu_ShowSwapIcons = false; @@ -2826,9 +2826,9 @@ void btl_state_update_player_menu(void) { if (BattleMenu_SwapDelay != 0) { BattleMenu_SwapDelay--; } else if (!(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) && (gGameStatusPtr->pressedButtons[0] & BUTTON_Z)) { - if (can_switch_to_partner() && battleStatus->hustleTurns != 1) { + if (btl_partner_can_act() && battleStatus->hustleTurns != 1) { sfx_play_sound(SOUND_PARTNER_SWAP_BATTLE_POS); - battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = battle_menu_submenuIDs[BattleMenu_CurPos + BattleMenu_HomePos]; + battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = WheelOptionSubmenu[BattleMenu_CurPos + BattleMenu_HomePos]; btl_main_menu_destroy(); btl_set_state(BATTLE_STATE_SWITCH_TO_PARTNER); } else if (partnerActor != nullptr && !(partnerActor->flags & BS_FLAGS1_YIELD_TURN) && battleStatus->hustleTurns != 1) { @@ -2848,7 +2848,7 @@ void btl_state_update_player_menu(void) { } set_actor_anim(ACTOR_PLAYER, 0, ANIM_Mario1_Walk); - battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->curSubmenu = battle_menu_submenuIDs[submenuResult - 1]; + battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->curSubmenu = WheelOptionSubmenu[submenuResult - 1]; for (i = 0; i < ARRAY_COUNT(battleStatus->submenuMoves); i++) { battleStatus->submenuMoves[i] = 0; battleStatus->submenuIcons[0] = 0; /// @bug ? @@ -3047,52 +3047,52 @@ void btl_state_update_player_menu(void) { itemData = &gItemTable[battleStatus->submenuIcons[i]]; hudScriptPair = &gItemHudScripts[itemData->hudElemID]; - BattleMenu_Moves_OptionCantUseMessages[i] = 0; + MovesOptionError[i] = 0; if (battleStatus->submenuStatus[i] == 0) { - BattleMenu_Moves_OptionCantUseMessages[i] = 0; + MovesOptionError[i] = 0; } if (battleStatus->submenuStatus[i] == -1) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->submenuStatus[i] == -2) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->submenuStatus[i] == -3) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW_ALT; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW_ALT; } - battle_menu_moveOptionIconScripts[i] = hudScriptPair->enabled; + MovesOptionHudScripts[i] = hudScriptPair->enabled; if (battleStatus->submenuStatus[i] == 0) { - battle_menu_moveOptionIconScripts[i] = hudScriptPair->disabled; + MovesOptionHudScripts[i] = hudScriptPair->disabled; } - battle_menu_moveOptionDisplayCosts[i] = moveData->costFP; - battle_menu_moveOptionBPCosts[i] = moveData->costBP; - BattleMenu_Moves_OptionSortPriority[i] = 0; - battle_menu_moveOptionDisplayCostReductions[i] = 0; - battle_menu_moveOptionDisplayCostReductionColors[i] = 0; + MovesOptionDisplayCosts[i] = moveData->costFP; + MovesOptionBPCosts[i] = moveData->costBP; + MovesOptionSortPriority[i] = 0; + MovesOptionDiscounts[i] = 0; + MovesOptionDiscountColors[i] = 0; if (player_team_is_ability_active(playerActor, ABILITY_FLOWER_SAVER)) { - battle_menu_moveOptionDisplayCostReductions[i] += player_team_is_ability_active(playerActor, ABILITY_FLOWER_SAVER); - battle_menu_moveOptionDisplayCostReductionColors[i] = 1; + MovesOptionDiscounts[i] += player_team_is_ability_active(playerActor, ABILITY_FLOWER_SAVER); + MovesOptionDiscountColors[i] = 1; } if (player_team_is_ability_active(playerActor, ABILITY_FLOWER_FANATIC)) { - battle_menu_moveOptionDisplayCostReductions[i] += 2 * player_team_is_ability_active(playerActor, ABILITY_FLOWER_FANATIC); - battle_menu_moveOptionDisplayCostReductionColors[i] = 2; + MovesOptionDiscounts[i] += 2 * player_team_is_ability_active(playerActor, ABILITY_FLOWER_FANATIC); + MovesOptionDiscountColors[i] = 2; } - BattleMenu_Moves_OptionIndices[i] = i; - BattleMenu_Moves_OptionEnabled[i] = battleStatus->submenuStatus[i]; - battle_menu_moveOptionNames[i] = moveData->nameMsg; - BattleMenu_Moves_OptionDescMessages[i] = moveData->shortDescMsg; + MovesOptionIndices[i] = i; + MovesOptionEnabled[i] = battleStatus->submenuStatus[i]; + MovesOptionNames[i] = moveData->nameMsg; + MovesOptionDesc[i] = moveData->shortDescMsg; } - BattleMenu_UsingSpiritsSubmenu = false; - D_802AD4A8 = initialPos; - BattleMenu_Moves_OptionCount = battleStatus->submenuMoveCount; - func_802A2684(); + UsingSpiritsSubmenu = false; + MovesPrevSelected = initialPos; + MovesOptionCount = battleStatus->submenuMoveCount; + btl_submenu_moves_init(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; break; } @@ -3103,24 +3103,24 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_7; } else if (submenuResult == 0) { } else if (submenuResult == 255) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->lastSelectedAbility = BattleMenu_Moves_OptionIndices[submenuResult - 1]; + battleStatus->lastSelectedAbility = MovesOptionIndices[submenuResult - 1]; battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastSelectedAbility]; if (battleStatus->curSubmenu == BTL_MENU_TYPE_JUMP) { - battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_JUMP] = battle_menu_moveOptionActive; + battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_JUMP] = SelectedMovesIndex; } if (battleStatus->curSubmenu == BTL_MENU_TYPE_SMASH) { - battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_SMASH] = battle_menu_moveOptionActive; + battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_SMASH] = SelectedMovesIndex; } currentSubmenu2 = battleStatus->curSubmenu; if (battleStatus->curSubmenu == BTL_MENU_TYPE_ITEMS) { - battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_ITEMS] = battle_menu_moveOptionActive; + battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_ITEMS] = SelectedMovesIndex; if (battleStatus->curSubmenu == currentSubmenu2) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_1; btl_state_update_player_menu(); @@ -3128,16 +3128,16 @@ void btl_state_update_player_menu(void) { break; } } - func_802A27D0(); - func_802A1030(); + btl_submenu_moves_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MOVE_CHOOSE_TARGET; } break; case BTL_SUBSTATE_PLAYER_MENU_MOVE_CHOOSE_TARGET: submenuResult = btl_submenu_moves_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4; break; } @@ -3176,12 +3176,12 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; break; case BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CANCEL: - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4; break; case BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CHOSEN: - func_802A27E4(); + btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_7: @@ -3208,13 +3208,13 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; break; case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_10: - func_802A1030(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_11; break; case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_11: submenuResult = btl_main_menu_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { - func_802A1078(); + btl_main_menu_restore_choose(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12; } else if (submenuResult != 0) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_13; @@ -3249,7 +3249,7 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; break; case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_13: - func_802A1078(); + btl_main_menu_restore_choose(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12; break; case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_14: @@ -3311,7 +3311,7 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET: if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { - func_802A2910(); + btl_submenu_moves_resume_choose(); battleStatus->selectedMoveID = 0; battleStatus->itemUsesLeft = 0; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; @@ -3327,8 +3327,8 @@ void btl_state_update_player_menu(void) { battleStatus->curAttackElement = 0; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1; hide_popup_menu(); - func_802A27D0(); - func_802A1030(); + btl_submenu_moves_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3; } } @@ -3336,8 +3336,8 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); - func_802A2C58(); - func_802A1098(); + btl_submenu_moves_restore_locked(); + btl_main_menu_restore_submenu(); battleStatus->selectedMoveID = 0; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4; } else { @@ -3355,14 +3355,14 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL: show_popup_menu(); - func_802A2C58(); - func_802A1098(); + btl_submenu_moves_restore_locked(); + btl_main_menu_restore_submenu(); btl_submenu_moves_update(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4; break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CHOSEN: destroy_popup_menu(); - func_802A27E4(); + btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PLAYER_MENU_ITEMS_1: @@ -3408,7 +3408,7 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_ITEMS_2: if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; @@ -3425,7 +3425,7 @@ void btl_state_update_player_menu(void) { battleStatus->curAttackElement = 0; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1; hide_popup_menu(); - func_802A1030(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_3; } } @@ -3433,7 +3433,7 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_ITEMS_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); - func_802A1098(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_4; } else { if (btl_main_menu_update() != 0) { @@ -3448,7 +3448,7 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_ITEMS_5: show_popup_menu(); - func_802A1098(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_4; break; case BTL_SUBSTATE_PLAYER_MENU_ITEMS_6: @@ -3458,47 +3458,47 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_1: for (i = 0; i < battleStatus->submenuMoveCount; i++) { moveData = &gMoveTable[battleStatus->submenuMoves[i]]; - BattleMenu_Moves_OptionCantUseMessages[i] = 0; + MovesOptionError[i] = 0; if (battleStatus->submenuStatus[i] == 0) { - BattleMenu_Moves_OptionCantUseMessages[i] = 0; + MovesOptionError[i] = 0; } if (battleStatus->submenuStatus[i] == -1) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->submenuStatus[i] == -2) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } if (!(battleStatus->enabledStarPowersFlags & (1 << i))) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } - battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 0]; + MovesOptionHudScripts[i] = StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 0]; if (battleStatus->submenuStatus[i] == 0) { - battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 1]; + MovesOptionHudScripts[i] = StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 1]; } - battle_menu_moveOptionDisplayCosts[i] = moveData->costFP; - battle_menu_moveOptionBPCosts[i] = moveData->costBP; - BattleMenu_Moves_OptionSortPriority[i] = 0; - BattleMenu_Moves_OptionIndices[i] = i; - BattleMenu_Moves_OptionEnabled[i] = battleStatus->submenuStatus[i]; - battle_menu_moveOptionNames[i] = moveData->nameMsg; - BattleMenu_Moves_OptionDescMessages[i] = moveData->shortDescMsg; - battle_menu_moveOptionDisplayCostReductions[i] = 0; - battle_menu_moveOptionDisplayCostReductionColors[i] = 0; + MovesOptionDisplayCosts[i] = moveData->costFP; + MovesOptionBPCosts[i] = moveData->costBP; + MovesOptionSortPriority[i] = 0; + MovesOptionIndices[i] = i; + MovesOptionEnabled[i] = battleStatus->submenuStatus[i]; + MovesOptionNames[i] = moveData->nameMsg; + MovesOptionDesc[i] = moveData->shortDescMsg; + MovesOptionDiscounts[i] = 0; + MovesOptionDiscountColors[i] = 0; } if (battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER] < 0) { battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER] = 0; } initialPos = battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER]; - BattleMenu_Moves_OptionCount = battleStatus->submenuMoveCount; - D_802AD4A8 = initialPos; - BattleMenu_UsingSpiritsSubmenu = true; - func_802A2684(); + MovesOptionCount = battleStatus->submenuMoveCount; + MovesPrevSelected = initialPos; + UsingSpiritsSubmenu = true; + btl_submenu_moves_init(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2; break; case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2: @@ -3507,25 +3507,25 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_7; } else if (submenuResult == 0) { } else if (submenuResult == 255) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->lastSelectedAbility = BattleMenu_Moves_OptionIndices[submenuResult - 1]; - battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER] = battle_menu_moveOptionActive; - func_802A27D0(); - func_802A1030(); + battleStatus->lastSelectedAbility = MovesOptionIndices[submenuResult - 1]; + battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER] = SelectedMovesIndex; + btl_submenu_moves_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_3; } break; case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_3: submenuResult = btl_submenu_moves_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4; } else if (btl_main_menu_update() != 0) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5; @@ -3547,12 +3547,12 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5: - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4; break; case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_6: - func_802A27E4(); + btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_7: @@ -3561,7 +3561,7 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_1: - if (!can_switch_to_player()) { + if (!btl_player_can_act()) { battleStatus->itemUsesLeft = 1; btl_set_state(BATTLE_STATE_END_PLAYER_TURN); } else { @@ -3707,41 +3707,41 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_BUILD_STRATEGIES: entryIdx = 0; - func_80263268(); + btl_check_can_change_partner(); // add 'Change Member' command if (battleStatus->changePartnerAllowed >= 0) { - D_802AD678[entryIdx] = BTL_MENU_TYPE_CHANGE_PARTNER; - D_802AD658[entryIdx] = BattleMenu_LeftJustMessages[BTL_MENU_TYPE_CHANGE_PARTNER]; - D_802AD640[entryIdx] = battle_menu_PartnerHudScripts[playerData->curPartner]; - D_802AD690[entryIdx] = 1; - D_802AD6C0[entryIdx] = MSG_Menus_Action_ChangePartner; + StratsOptionMenuTypes[entryIdx] = BTL_MENU_TYPE_CHANGE_PARTNER; + StratsOptionNames[entryIdx] = LeftJustMenuMessages[BTL_MENU_TYPE_CHANGE_PARTNER]; + StratsOptionHudScripts[entryIdx] = PartnerHudScripts[playerData->curPartner]; + StratsOptionEnabled[entryIdx] = 1; + StratsOptionMessage[entryIdx] = MSG_Menus_Action_ChangePartner; if (battleStatus->changePartnerAllowed <= 0) { - D_802AD640[entryIdx] = battle_menu_DisabledPartnerHudScripts[playerData->curPartner]; - D_802AD690[entryIdx] = 0; - D_802AD6A8[entryIdx] = 0; + StratsOptionHudScripts[entryIdx] = battle_menu_DisabledPartnerHudScripts[playerData->curPartner]; + StratsOptionEnabled[entryIdx] = 0; + StratsOptionError[entryIdx] = 0; } entryIdx++; } // add 'Do Nothing' command - D_802AD640[entryIdx] = battle_menu_DoNothingHudScripts.enabled; - D_802AD678[entryIdx] = BTL_MENU_TYPE_DO_NOTHING; - D_802AD690[entryIdx] = 1; - D_802AD658[entryIdx] = BattleMenu_LeftJustMessages[BTL_MENU_TYPE_DO_NOTHING]; - D_802AD6C0[entryIdx] = MSG_Menus_Action_DoNothing; + StratsOptionHudScripts[entryIdx] = DoNothingHudScripts.enabled; + StratsOptionMenuTypes[entryIdx] = BTL_MENU_TYPE_DO_NOTHING; + StratsOptionEnabled[entryIdx] = 1; + StratsOptionNames[entryIdx] = LeftJustMenuMessages[BTL_MENU_TYPE_DO_NOTHING]; + StratsOptionMessage[entryIdx] = MSG_Menus_Action_DoNothing; entryIdx++; // add 'Run Away' command - D_802AD640[entryIdx] = battle_menu_FleeHudScripts.enabled; - D_802AD678[entryIdx] = BTL_MENU_TYPE_RUN_AWAY; - D_802AD690[entryIdx] = 1; - D_802AD658[entryIdx] = BattleMenu_LeftJustMessages[BTL_MENU_TYPE_RUN_AWAY]; - D_802AD6C0[entryIdx] = MSG_Menus_Action_RunAway; + StratsOptionHudScripts[entryIdx] = FleeHudScripts.enabled; + StratsOptionMenuTypes[entryIdx] = BTL_MENU_TYPE_RUN_AWAY; + StratsOptionEnabled[entryIdx] = 1; + StratsOptionNames[entryIdx] = LeftJustMenuMessages[BTL_MENU_TYPE_RUN_AWAY]; + StratsOptionMessage[entryIdx] = MSG_Menus_Action_RunAway; if (!(gBattleStatus.flags2 & BS_FLAGS2_CAN_FLEE)) { - D_802AD640[entryIdx] = battle_menu_FleeHudScripts.disabled; - D_802AD690[entryIdx] = 0; - D_802AD6A8[entryIdx] = 1; + StratsOptionHudScripts[entryIdx] = FleeHudScripts.disabled; + StratsOptionEnabled[entryIdx] = 0; + StratsOptionError[entryIdx] = 1; } entryIdx++; @@ -3749,42 +3749,42 @@ void btl_state_update_player_menu(void) { battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STRATEGY] = 0; } initialPos = battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STRATEGY]; - D_802AD66C = entryIdx; - StratsMenuLastPos = initialPos; - func_802A45D8(); + StratsOptionCount = entryIdx; + StratsPrevSelected = initialPos; + btl_menu_strats_init(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2; break; case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2: - submenuResult = btl_update_strats_menu(); + submenuResult = btl_submenu_strats_update(); if (submenuResult == -1) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_8; } else if (submenuResult == 0) { } else if (submenuResult == 255) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->curSubmenu = D_802AD678[submenuResult - 1]; + battleStatus->curSubmenu = StratsOptionMenuTypes[submenuResult - 1]; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STRATEGY] = submenuResult - 1; if (battleStatus->curSubmenu == 5) { // change partner gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_1; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - func_802A4718(); - func_802A1030(); + btl_submenu_strats_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_3; } } break; case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_3: - submenuResult = btl_update_strats_menu(); + submenuResult = btl_submenu_strats_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { - func_802A48FC(); - func_802A1098(); + btl_submenu_strats_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4; } else if (btl_main_menu_update() != 0) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_5; @@ -3820,7 +3820,7 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4: - btl_update_strats_menu(); + btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { D_802ACC60 = 8; BattleMenu_SwapDelay = 4; @@ -3828,16 +3828,16 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_5: - func_802A48FC(); - func_802A1098(); + btl_submenu_strats_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4; break; case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6: - func_802A472C(); + btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_8: - if (btl_update_strats_menu() != -1) { + if (btl_submenu_strats_update() != -1) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2; } break; @@ -3847,7 +3847,7 @@ void btl_state_update_player_menu(void) { s32 partnerId = PartnerIDFromMenuIndex[i]; if (playerData->partners[partnerId].enabled) { prop = &gPartnerPopupProperties[partnerId]; - popup->ptrIcon[entryIdx] = battle_menu_PartnerHudScripts[partnerId]; + popup->ptrIcon[entryIdx] = PartnerHudScripts[partnerId]; popup->userIndex[entryIdx] = partnerId; popup->enabled[entryIdx] = 1; popup->nameMsg[entryIdx] = prop->nameMsg; @@ -3877,7 +3877,7 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7; } else if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { - func_802A47E0(); + btl_submenu_strats_resume_choose(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2; btl_state_update_player_menu(); btl_state_update_player_menu(); @@ -3891,8 +3891,8 @@ void btl_state_update_player_menu(void) { battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_PARTNER] = popup->result - 1; hide_popup_menu(); - func_802A4718(); - func_802A1030(); + btl_submenu_strats_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3; } } @@ -3900,11 +3900,11 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); - func_802A4A10(); - func_802A1098(); + btl_submenu_strats_restore_locked(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4; } else { - btl_update_strats_menu(); + btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { gBattleSubState = battleStatus->acceptTargetMenuSubstate; btl_state_update_player_menu(); @@ -3913,20 +3913,20 @@ void btl_state_update_player_menu(void) { } break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4: - btl_update_strats_menu(); + btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; } break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5: show_popup_menu(); - func_802A4A10(); - func_802A1098(); + btl_submenu_strats_restore_locked(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4; break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_6: destroy_popup_menu(); - func_802A472C(); + btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7: @@ -4000,7 +4000,7 @@ void btl_state_update_partner_menu(void) { PlayerData* playerData = &gPlayerData; Actor* playerActor = battleStatus->playerActor; Actor* partnerActor = battleStatus->partnerActor; - PopupMenu* popupMenu = &D_802ACCD0; + PopupMenu* popupMenu = &BattlePopupMenu; s32 entryIdx; s32 i; s32 popupIndex; @@ -4012,7 +4012,7 @@ void btl_state_update_partner_menu(void) { battleStatus->moveCategory = BTL_MENU_TYPE_INVALID; battleStatus->selectedMoveID = MOVE_NONE; battleStatus->curAttackElement = 0; - if (!can_switch_to_partner()) { + if (!btl_partner_can_act()) { btl_set_state(BATTLE_STATE_TRANSFER_TURN); } else { btl_cam_use_preset(BTL_CAM_DEFAULT); @@ -4065,26 +4065,26 @@ void btl_state_update_partner_menu(void) { partnerActor->flags &= ~ACTOR_FLAG_USING_IDLE_ANIM; playerActor->flags |= ACTOR_FLAG_USING_IDLE_ANIM; playerActor->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS; - func_80263300(); - func_80263268(); + btl_init_menu_items(); + btl_check_can_change_partner(); entryIdx = 0; initialPos = 1; if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] < 0) { battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = BTL_MENU_TYPE_ABILITY; } btl_init_menu_partner(); - func_80263268(); + btl_check_can_change_partner(); // strategies menu category - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_STRATEGIES; - BattleMenu_OptionEnabled[entryIdx] = true; - battle_menu_isMessageDisabled[entryIdx] = 0; - BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.enabled; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_STRATEGIES]; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_STRATEGIES; + WheelOptionEnabled[entryIdx] = true; + WheelOptionError[entryIdx] = 0; + WheelOptionHudScript[entryIdx] = StrategiesHudScripts.enabled; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_STRATEGIES]; if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STRATEGIES)) { - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; - BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = StrategiesHudScripts.disabled; } if (battleStatus->lastPartnerMenuSelection[entryIdx] == BTL_MENU_TYPE_STRATEGIES) { initialPos = entryIdx; @@ -4092,19 +4092,19 @@ void btl_state_update_partner_menu(void) { entryIdx++; // abilities menu category - BattleMenu_HudScripts[entryIdx] = battle_menu_PartnerMoveHudScripts[playerData->curPartner][0]; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_ABILITY; - BattleMenu_OptionEnabled[entryIdx] = true; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_ABILITY]; + WheelOptionHudScript[entryIdx] = PartnerMoveHudScripts[playerData->curPartner][0]; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_ABILITY; + WheelOptionEnabled[entryIdx] = true; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_ABILITY]; if (battleStatus->menuStatus[3] <= 0) { - BattleMenu_HudScripts[entryIdx] = battle_menu_PartnerMoveHudScripts[playerData->curPartner][1]; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = PartnerMoveHudScripts[playerData->curPartner][1]; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_ABILITIES)) { - BattleMenu_HudScripts[entryIdx] = battle_menu_PartnerMoveHudScripts[playerData->curPartner][1]; - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = PartnerMoveHudScripts[playerData->curPartner][1]; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_ABILITY) { initialPos = entryIdx; @@ -4113,15 +4113,15 @@ void btl_state_update_partner_menu(void) { // focus menu category if (playerData->maxStarPower != 0 && is_ability_active(ABILITY_GROUP_FOCUS)) { - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_PARTNER_FOCUS; - BattleMenu_OptionEnabled[entryIdx] = true; - battle_menu_isMessageDisabled[entryIdx] = 0; - BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.enabled; - BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_PARTNER_FOCUS]; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_PARTNER_FOCUS; + WheelOptionEnabled[entryIdx] = true; + WheelOptionError[entryIdx] = 0; + WheelOptionHudScript[entryIdx] = StarPowersHudScripts.enabled; + WheelOptionName[entryIdx] = CenteredBattleMessages[BTL_MENU_TYPE_PARTNER_FOCUS]; if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_PARTNER_FOCUS)) { - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; - BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = StarPowersHudScripts.disabled; } if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] == BTL_MENU_TYPE_PARTNER_FOCUS) { initialPos = entryIdx; @@ -4129,11 +4129,11 @@ void btl_state_update_partner_menu(void) { entryIdx++; } - BattleMenu_NumOptions = entryIdx; + WheelOptionCount = entryIdx; D_802AD0A8 = 1; - D_802AD0B0 = initialPos; - D_802AD100 = 2 - initialPos; - if (can_switch_to_player()) { + BattleMenu_PrevSelected = initialPos; + BattleMenu_WheelBase = 2 - initialPos; + if (btl_player_can_act()) { BattleMenu_ShowSwapIcons = true; } else { BattleMenu_ShowSwapIcons = false; @@ -4144,7 +4144,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; return; case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1: - set_actor_anim(ACTOR_PARTNER, 0, BattleMenu_PartnerThinkAnims[playerData->curPartner]); + set_actor_anim(ACTOR_PARTNER, 0, PartnerThinkAnims[playerData->curPartner]); #if VERSION_PAL btl_init_menu_partner(); #endif @@ -4155,9 +4155,9 @@ void btl_state_update_partner_menu(void) { if (BattleMenu_SwapDelay != 0) { BattleMenu_SwapDelay--; } else if (!(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) && (gGameStatusPtr->pressedButtons[0] & BUTTON_Z)) { - if (can_switch_to_player()) { + if (btl_player_can_act()) { sfx_play_sound(SOUND_PARTNER_SWAP_BATTLE_POS); - battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = battle_menu_submenuIDs[BattleMenu_CurPos + BattleMenu_HomePos]; + battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = WheelOptionSubmenu[BattleMenu_CurPos + BattleMenu_HomePos]; btl_main_menu_destroy(); btl_set_state(BATTLE_STATE_SWITCH_TO_PLAYER); } else { @@ -4170,8 +4170,8 @@ void btl_state_update_partner_menu(void) { if (D_802ACC60 != 0) { D_802ACC60--; } else if (entryIdx != 0) { - set_actor_anim(ACTOR_PARTNER, 0, BattleMenu_PartnerIdleAnims[playerData->curPartner]); - battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->curPartnerSubmenu = battle_menu_submenuIDs[entryIdx - 1]; + set_actor_anim(ACTOR_PARTNER, 0, PartnerIdleAnims[playerData->curPartner]); + battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->curPartnerSubmenu = WheelOptionSubmenu[entryIdx - 1]; if (battleStatus->curPartnerSubmenu == 7) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_1; btl_state_update_partner_menu(); @@ -4195,7 +4195,7 @@ void btl_state_update_partner_menu(void) { } else { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_6; - func_802A1030(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_3; } } @@ -4203,7 +4203,7 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_3: entryIdx = btl_main_menu_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { - func_802A1078(); + btl_main_menu_restore_choose(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4; return; } @@ -4224,14 +4224,14 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_5: - func_802A1078(); + btl_main_menu_restore_choose(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4; break; case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_6: btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_MAIN_SHOW_CANT_SWAP: - if (can_switch_to_player() == 0) { + if (btl_player_can_act() == 0) { btl_show_variable_battle_message(BTL_MSG_CANT_MOVE, 60, 0); } else { btl_show_variable_battle_message(BTL_MSG_CANT_SWITCH, 60, 0); @@ -4252,49 +4252,49 @@ void btl_state_update_partner_menu(void) { for (i = 0; i < battleStatus->submenuMoveCount; i++) { moveData = &gMoveTable[battleStatus->submenuMoves[i]]; - BattleMenu_Moves_OptionCantUseMessages[i] = 0; + MovesOptionError[i] = 0; if (battleStatus->submenuStatus[i] == 0) { - BattleMenu_Moves_OptionCantUseMessages[i] = 0; + MovesOptionError[i] = 0; } if (battleStatus->submenuStatus[i] == -1) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } if (battleStatus->submenuStatus[i] == -2) { battleStatus->submenuStatus[i] = 0; - BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; + MovesOptionError[i] = BTL_MSG_CANT_SELECT_NOW; } - battle_menu_moveOptionIconScripts[i] = battle_menu_PartnerMoveHudScripts[playerData->curPartner][2 * i + 2]; + MovesOptionHudScripts[i] = PartnerMoveHudScripts[playerData->curPartner][2 * i + 2]; if (battleStatus->submenuStatus[i] == 0) { - battle_menu_moveOptionIconScripts[i] = battle_menu_PartnerMoveHudScripts[playerData->curPartner][2 * i + 3]; - } - BattleMenu_Moves_OptionIndices[i] = battleStatus->submenuMoves[i]; - BattleMenu_Moves_OptionEnabled[i] = battleStatus->submenuStatus[i]; - battle_menu_moveOptionNames[i] = moveData->nameMsg; - BattleMenu_Moves_OptionDescMessages[i] = moveData->shortDescMsg; - battle_menu_moveOptionDisplayCosts[i] = moveData->costFP; - battle_menu_moveOptionBPCosts[i] = moveData->costBP; - BattleMenu_Moves_OptionSortPriority[i] = i; - - battle_menu_moveOptionDisplayCostReductions[i] = 0; - battle_menu_moveOptionDisplayCostReductionColors[i] = 0; + MovesOptionHudScripts[i] = PartnerMoveHudScripts[playerData->curPartner][2 * i + 3]; + } + MovesOptionIndices[i] = battleStatus->submenuMoves[i]; + MovesOptionEnabled[i] = battleStatus->submenuStatus[i]; + MovesOptionNames[i] = moveData->nameMsg; + MovesOptionDesc[i] = moveData->shortDescMsg; + MovesOptionDisplayCosts[i] = moveData->costFP; + MovesOptionBPCosts[i] = moveData->costBP; + MovesOptionSortPriority[i] = i; + + MovesOptionDiscounts[i] = 0; + MovesOptionDiscountColors[i] = 0; if (player_team_is_ability_active(playerActor, ABILITY_FLOWER_SAVER)) { - battle_menu_moveOptionDisplayCostReductions[i] += player_team_is_ability_active(playerActor, ABILITY_FLOWER_SAVER); - battle_menu_moveOptionDisplayCostReductionColors[i] = 1; + MovesOptionDiscounts[i] += player_team_is_ability_active(playerActor, ABILITY_FLOWER_SAVER); + MovesOptionDiscountColors[i] = 1; } if (player_team_is_ability_active(playerActor, ABILITY_FLOWER_FANATIC)) { - battle_menu_moveOptionDisplayCostReductions[i] += player_team_is_ability_active(playerActor, ABILITY_FLOWER_FANATIC) * 2; - battle_menu_moveOptionDisplayCostReductionColors[i] = 2; + MovesOptionDiscounts[i] += player_team_is_ability_active(playerActor, ABILITY_FLOWER_FANATIC) * 2; + MovesOptionDiscountColors[i] = 2; } } if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY] < 0) { battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY] = 0; } - BattleMenu_UsingSpiritsSubmenu = false; - BattleMenu_Moves_OptionCount = battleStatus->submenuMoveCount; + UsingSpiritsSubmenu = false; + MovesOptionCount = battleStatus->submenuMoveCount; initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY]; - D_802AD4A8 = initialPos; - func_802A2684(); + MovesPrevSelected = initialPos; + btl_submenu_moves_init(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2; break; case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2: @@ -4303,7 +4303,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_7; } else if (entryIdx != 0) { if (entryIdx == 255) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; @@ -4311,8 +4311,8 @@ void btl_state_update_partner_menu(void) { btl_state_update_partner_menu(); } else { battleStatus->lastPartnerPowerSelection = entryIdx - 1; - func_802A27D0(); - func_802A1030(); + btl_submenu_moves_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3; } } @@ -4320,14 +4320,14 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3: entryIdx = btl_submenu_moves_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4; } else if (btl_main_menu_update() != 0) { battleStatus->moveCategory = BTL_MENU_TYPE_ABILITY; - battleStatus->selectedMoveID = BattleMenu_Moves_OptionIndices[battleStatus->lastPartnerPowerSelection]; + battleStatus->selectedMoveID = MovesOptionIndices[battleStatus->lastPartnerPowerSelection]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; - battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY] = battle_menu_moveOptionActive; + battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY] = SelectedMovesIndex; battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5; battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_6; btl_set_state(BATTLE_STATE_SELECT_TARGET); @@ -4340,12 +4340,12 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5: - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4; break; case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_6: - func_802A27E4(); + btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_7: @@ -4390,7 +4390,7 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_ITEMS_2: if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; @@ -4406,7 +4406,7 @@ void btl_state_update_partner_menu(void) { battleStatus->curAttackElement = 0; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER_ITEM] = popupMenu->result - 1; hide_popup_menu(); - func_802A1030(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_3; } } @@ -4414,7 +4414,7 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_ITEMS_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popupMenu->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); - func_802A1098(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_4; } else if (btl_main_menu_update() != 0) { btl_set_state(BATTLE_STATE_SELECT_TARGET); @@ -4427,7 +4427,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_ITEMS_5: show_popup_menu(); - func_802A1098(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_4; break; case BTL_SUBSTATE_PARTNER_MENU_ITEMS_6: @@ -4440,7 +4440,7 @@ void btl_state_update_partner_menu(void) { s32 partnerId = PartnerIDFromMenuIndex[i]; if (playerData->partners[partnerId].enabled) { popupProps = &gPartnerPopupProperties[partnerId]; - popupMenu->ptrIcon[popupIndex] = battle_menu_PartnerHudScripts[partnerId]; + popupMenu->ptrIcon[popupIndex] = PartnerHudScripts[partnerId]; popupMenu->userIndex[popupIndex] = partnerId; popupMenu->enabled[popupIndex] = 1; popupMenu->nameMsg[popupIndex] = popupProps->nameMsg; @@ -4470,7 +4470,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_7; } else if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; @@ -4486,7 +4486,7 @@ void btl_state_update_partner_menu(void) { battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; hide_popup_menu(); - func_802A1030(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3; } } @@ -4494,7 +4494,7 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && (popupMenu->result == POPUP_RESULT_CHOOSING)) { show_popup_menu(); - func_802A1098(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4; } else if (btl_main_menu_update() != 0) { gBattleSubState = battleStatus->acceptTargetMenuSubstate; @@ -4509,7 +4509,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5: show_popup_menu(); - func_802A1098(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4; break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_6: @@ -4529,44 +4529,44 @@ void btl_state_update_partner_menu(void) { battleStatus->submenuStatus[0] = 1; for (i = 0; i < battleStatus->submenuMoveCount; i++) { moveData = &gMoveTable[battleStatus->submenuMoves[i]]; - battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 0]; + MovesOptionHudScripts[i] = StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 0]; if (battleStatus->submenuStatus[i] == 0) { - battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 1]; - } - battle_menu_moveOptionDisplayCosts[i] = moveData->costFP; - battle_menu_moveOptionBPCosts[i] = moveData->costBP; - BattleMenu_Moves_OptionIndices[i] = i; - BattleMenu_Moves_OptionSortPriority[i] = i; - BattleMenu_Moves_OptionEnabled[i] = battleStatus->submenuStatus[i]; - battle_menu_moveOptionNames[i] = moveData->nameMsg; - BattleMenu_Moves_OptionDescMessages[i] = moveData->shortDescMsg; - battle_menu_moveOptionDisplayCostReductions[i] = 0; - battle_menu_moveOptionDisplayCostReductionColors[i] = 0; + MovesOptionHudScripts[i] = StarPowerMovesHudScripts[2 * STAR_POWER_INDEX(battleStatus->submenuMoves[i]) + 1]; + } + MovesOptionDisplayCosts[i] = moveData->costFP; + MovesOptionBPCosts[i] = moveData->costBP; + MovesOptionIndices[i] = i; + MovesOptionSortPriority[i] = i; + MovesOptionEnabled[i] = battleStatus->submenuStatus[i]; + MovesOptionNames[i] = moveData->nameMsg; + MovesOptionDesc[i] = moveData->shortDescMsg; + MovesOptionDiscounts[i] = 0; + MovesOptionDiscountColors[i] = 0; } if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER] < 0) { battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER] = 0; } - BattleMenu_UsingSpiritsSubmenu = true; - BattleMenu_Moves_OptionCount = battleStatus->submenuMoveCount; + UsingSpiritsSubmenu = true; + MovesOptionCount = battleStatus->submenuMoveCount; initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER]; - D_802AD4A8 = initialPos; - func_802A2684(); + MovesPrevSelected = initialPos; + btl_submenu_moves_init(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_2; break; case BTL_SUBSTATE_PARTNER_MENU_FOCUS_2: entryIdx = btl_submenu_moves_update(); if (entryIdx != 0) { if (entryIdx == 255) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->lastPartnerPowerSelection = BattleMenu_Moves_OptionIndices[entryIdx - 1]; - func_802A27D0(); - func_802A1030(); + battleStatus->lastPartnerPowerSelection = MovesOptionIndices[entryIdx - 1]; + btl_submenu_moves_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_3; } } @@ -4574,8 +4574,8 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_FOCUS_3: entryIdx = btl_submenu_moves_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && (entryIdx == 0)) { - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_4; } else if (btl_main_menu_update() != 0) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_5; @@ -4584,7 +4584,7 @@ void btl_state_update_partner_menu(void) { battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastPartnerPowerSelection]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastPartnerPowerSelection]].flags; battleStatus->moveArgument = battleStatus->lastPartnerPowerSelection; - battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER] = battle_menu_moveOptionActive; + battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER] = SelectedMovesIndex; btl_set_state(BATTLE_STATE_SELECT_TARGET); } break; @@ -4595,79 +4595,79 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_FOCUS_5: - func_802A2AB8(); - func_802A1098(); + btl_submenu_moves_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_4; break; case BTL_SUBSTATE_PARTNER_MENU_FOCUS_6: - func_802A27E4(); + btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_1: popupIndex = 0; - func_80263268(); + btl_check_can_change_partner(); // add 'Change Member' command if (battleStatus->changePartnerAllowed >= 0) { - D_802AD678[popupIndex] = BTL_MENU_TYPE_CHANGE_PARTNER; - D_802AD658[popupIndex] = BattleMenu_LeftJustMessages[BTL_MENU_TYPE_CHANGE_PARTNER]; - D_802AD640[popupIndex] = battle_menu_PartnerHudScripts[playerData->curPartner]; - D_802AD690[popupIndex] = 1; - D_802AD6C0[popupIndex] = MSG_Menus_Action_ChangePartner; + StratsOptionMenuTypes[popupIndex] = BTL_MENU_TYPE_CHANGE_PARTNER; + StratsOptionNames[popupIndex] = LeftJustMenuMessages[BTL_MENU_TYPE_CHANGE_PARTNER]; + StratsOptionHudScripts[popupIndex] = PartnerHudScripts[playerData->curPartner]; + StratsOptionEnabled[popupIndex] = 1; + StratsOptionMessage[popupIndex] = MSG_Menus_Action_ChangePartner; if (battleStatus->changePartnerAllowed <= 0) { - D_802AD640[popupIndex] = battle_menu_DisabledPartnerHudScripts[playerData->curPartner]; - D_802AD690[popupIndex] = 0; - D_802AD6A8[popupIndex] = 0; + StratsOptionHudScripts[popupIndex] = battle_menu_DisabledPartnerHudScripts[playerData->curPartner]; + StratsOptionEnabled[popupIndex] = 0; + StratsOptionError[popupIndex] = 0; } popupIndex++; } // add 'Do Nothing' command - D_802AD640[popupIndex] = battle_menu_DoNothingHudScripts.enabled; - D_802AD678[popupIndex] = BTL_MENU_TYPE_DO_NOTHING; - D_802AD690[popupIndex] = 1; - D_802AD658[popupIndex] = BattleMenu_LeftJustMessages[BTL_MENU_TYPE_DO_NOTHING]; - D_802AD6C0[popupIndex] = MSG_Menus_Action_DoNothing; + StratsOptionHudScripts[popupIndex] = DoNothingHudScripts.enabled; + StratsOptionMenuTypes[popupIndex] = BTL_MENU_TYPE_DO_NOTHING; + StratsOptionEnabled[popupIndex] = 1; + StratsOptionNames[popupIndex] = LeftJustMenuMessages[BTL_MENU_TYPE_DO_NOTHING]; + StratsOptionMessage[popupIndex] = MSG_Menus_Action_DoNothing; popupIndex++; if (battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STRATEGY] < 0) { battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STRATEGY] = 0; } - D_802AD66C = popupIndex; + StratsOptionCount = popupIndex; initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STRATEGY]; - StratsMenuLastPos = initialPos; - func_802A45D8(); + StratsPrevSelected = initialPos; + btl_menu_strats_init(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2; break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2: - entryIdx = btl_update_strats_menu(); + entryIdx = btl_submenu_strats_update(); if (entryIdx == 0) { } else if (entryIdx == 255) { - func_802A1050(); + btl_main_menu_resume_choose(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->curPartnerSubmenu = D_802AD678[entryIdx - 1]; + battleStatus->curPartnerSubmenu = StratsOptionMenuTypes[entryIdx - 1]; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STRATEGY] = entryIdx - 1; if (battleStatus->curPartnerSubmenu == 5) { // change partner gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_1; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - func_802A4718(); - func_802A1030(); + btl_submenu_strats_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_3; } } break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_3: - entryIdx = btl_update_strats_menu(); + entryIdx = btl_submenu_strats_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { - func_802A48FC(); - func_802A1098(); + btl_submenu_strats_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4; } else if (btl_main_menu_update() != 0) { battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_5; @@ -4695,7 +4695,7 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4: - btl_update_strats_menu(); + btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { D_802ACC60 = 8; BattleMenu_SwapDelay = 4; @@ -4703,12 +4703,12 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_5: - func_802A48FC(); - func_802A1098(); + btl_submenu_strats_restore_choose(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4; break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6: - func_802A472C(); + btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_1: @@ -4717,7 +4717,7 @@ void btl_state_update_partner_menu(void) { s32 partnerId = PartnerIDFromMenuIndex[i]; if (playerData->partners[partnerId].enabled) { popupProps = &gPartnerPopupProperties[partnerId]; - popupMenu->ptrIcon[popupIndex] = battle_menu_PartnerHudScripts[partnerId]; + popupMenu->ptrIcon[popupIndex] = PartnerHudScripts[partnerId]; popupMenu->userIndex[popupIndex] = partnerId; popupMenu->enabled[popupIndex] = 1; popupMenu->nameMsg[popupIndex] = popupProps->nameMsg; @@ -4747,7 +4747,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7; } else if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { - func_802A47E0(); + btl_submenu_strats_resume_choose(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2; btl_state_update_partner_menu(); btl_state_update_partner_menu(); @@ -4761,8 +4761,8 @@ void btl_state_update_partner_menu(void) { battleStatus->moveArgument = battleStatus->lastSelectedPartner; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; hide_popup_menu(); - func_802A4718(); - func_802A1030(); + btl_submenu_strats_hide(); + btl_main_menu_hide(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3; } } @@ -4770,11 +4770,11 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3: if ((battleStatus->curButtonsPressed & BUTTON_B) && popupMenu->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); - func_802A4A10(); - func_802A1098(); + btl_submenu_strats_restore_locked(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4; } else { - btl_update_strats_menu(); + btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { gBattleSubState = battleStatus->acceptTargetMenuSubstate; btl_state_update_partner_menu(); @@ -4783,20 +4783,20 @@ void btl_state_update_partner_menu(void) { } break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4: - btl_update_strats_menu(); + btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; } break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5: show_popup_menu(); - func_802A4A10(); - func_802A1098(); + btl_submenu_strats_restore_locked(); + btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4; break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_6: destroy_popup_menu(); - func_802A472C(); + btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7: @@ -4938,15 +4938,15 @@ void btl_state_update_peach_menu(void) { entryIdx = 0; battleStatus->selectedMoveID = MOVE_NONE; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_STAR_POWERS; - BattleMenu_OptionEnabled[entryIdx] = true; - battle_menu_isMessageDisabled[entryIdx] = 0; - BattleMenu_HudScripts[entryIdx] = battle_menu_PeachStarPowerHudScripts.enabled; - BattleMenu_TitleMessages[entryIdx] = D_802AB728[entryIdx]; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_STAR_POWERS; + WheelOptionEnabled[entryIdx] = true; + WheelOptionError[entryIdx] = 0; + WheelOptionHudScript[entryIdx] = PeachStarPowerHudScripts.enabled; + WheelOptionName[entryIdx] = PeachMenuMessages[entryIdx]; if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STAR_POWERS)) { - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; - BattleMenu_HudScripts[entryIdx] = battle_menu_PeachStarPowerHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = PeachStarPowerHudScripts.disabled; } initialPos = 0; @@ -4957,10 +4957,10 @@ void btl_state_update_peach_menu(void) { } else { BattleMenu_ShowSwapIcons = false; } - BattleMenu_NumOptions = entryIdx; + WheelOptionCount = entryIdx; D_802AD0A8 = 0; - D_802AD0B0 = initialPos; - D_802AD100 = 2 - initialPos; + BattleMenu_PrevSelected = initialPos; + BattleMenu_WheelBase = 2 - initialPos; btl_main_menu_init(); D_802ACC60 = 8; @@ -4975,8 +4975,8 @@ void btl_state_update_peach_menu(void) { } if (selectedOption != 0) { set_actor_anim(ACTOR_PLAYER, 0, ANIM_Peach1_Walk); - battleStatus->curSubmenu = battle_menu_submenuIDs[selectedOption - 1]; - func_802A1030(); + battleStatus->curSubmenu = WheelOptionSubmenu[selectedOption - 1]; + btl_main_menu_hide(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PEACH_MENU_CHOOSE_TARGET; @@ -4994,7 +4994,7 @@ void btl_state_update_peach_menu(void) { } break; case BTL_SUBSTATE_PEACH_MENU_TARGET_CANCEL: - func_802A1050(); + btl_main_menu_resume_choose(); gBattleSubState = BTL_SUBSTATE_PEACH_MENU_CHOOSE_CATEGORY; btl_state_update_peach_menu(); btl_state_update_peach_menu(); @@ -5144,15 +5144,15 @@ void btl_state_update_twink_menu(void) { entryIdx = 0; battleStatus->selectedMoveID = MOVE_NONE; - battle_menu_submenuIDs[entryIdx] = BTL_MENU_TYPE_STAR_POWERS; - BattleMenu_OptionEnabled[entryIdx] = true; - battle_menu_isMessageDisabled[entryIdx] = 0; - BattleMenu_HudScripts[entryIdx] = battle_menu_TwinkStarPowerHudScripts.enabled; - BattleMenu_TitleMessages[entryIdx] = D_802AB734[entryIdx]; + WheelOptionSubmenu[entryIdx] = BTL_MENU_TYPE_STAR_POWERS; + WheelOptionEnabled[entryIdx] = true; + WheelOptionError[entryIdx] = 0; + WheelOptionHudScript[entryIdx] = TwinkStarPowerHudScripts.enabled; + WheelOptionName[entryIdx] = TwinkMenuMessages[entryIdx]; if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STAR_POWERS)) { - BattleMenu_OptionEnabled[entryIdx] = false; - battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; - BattleMenu_HudScripts[entryIdx] = battle_menu_TwinkStarPowerHudScripts.disabled; + WheelOptionEnabled[entryIdx] = false; + WheelOptionError[entryIdx] = BTL_MSG_CANT_SELECT_NOW; + WheelOptionHudScript[entryIdx] = TwinkStarPowerHudScripts.disabled; } initialPos = 0; @@ -5163,10 +5163,10 @@ void btl_state_update_twink_menu(void) { } else { BattleMenu_ShowSwapIcons = false; } - BattleMenu_NumOptions = entryIdx; + WheelOptionCount = entryIdx; D_802AD0A8 = 0; - D_802AD0B0 = initialPos; - D_802AD100 = 2 - initialPos; + BattleMenu_PrevSelected = initialPos; + BattleMenu_WheelBase = 2 - initialPos; btl_main_menu_init(); D_802ACC60 = 8; @@ -5181,8 +5181,8 @@ void btl_state_update_twink_menu(void) { } if (selection != 0) { set_actor_anim(ACTOR_PARTNER, 0, ANIM_Twink_Angry); - battleStatus->curSubmenu = battle_menu_submenuIDs[selection - 1]; - func_802A1030(); + battleStatus->curSubmenu = WheelOptionSubmenu[selection - 1]; + btl_main_menu_hide(); D_802ACC60 = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_TWINK_MENU_CHOOSE_TARGET; @@ -5200,7 +5200,7 @@ void btl_state_update_twink_menu(void) { } break; case BTL_SUBSTATE_TWINK_MENU_TARGET_CANCEL: - func_802A1050(); + btl_main_menu_resume_choose(); gBattleSubState = BTL_SUBSTATE_TWINK_MENU_CHOOSE_CATEGORY; btl_state_update_twink_menu(); btl_state_update_twink_menu(); diff --git a/src/battle/popup_messages.c b/src/battle/popup_messages.c index ef93ef347c7..18096710002 100644 --- a/src/battle/popup_messages.c +++ b/src/battle/popup_messages.c @@ -70,7 +70,7 @@ u16 TipAction_ReduceDamage_X[] = { 64, 72, 185, 67 }; #endif //TODO Vec3f[] -f32 D_802835DC[] = { +f32 BonkAnimAccel[] = { 0.0f, 4.5f, 0.0f, 1.0f, 4.0f, 0.0f, 2.0f, 3.0f, 0.0f, @@ -88,7 +88,7 @@ f32 D_802835DC[] = { 0.0f, -4.5f, 0.0f, }; -Vec3f D_80283690[] = { +Vec3f BonkAnimScale[] = { { 1.0f, 1.0f, 1.0f }, { 0.8f, 0.8f, 0.8f }, { 0.9f, 0.9f, 0.9f }, @@ -434,9 +434,9 @@ void show_immune_bonk(f32 x, f32 y, f32 z, s32 numStars, s32 arg4, s32 arg5) { one = 1; two = 2; - f1 = &D_802835DC[arg5mod8 * 3]; - f2 = &D_802835DC[arg5mod8 * 3 + one]; - f3 = &D_802835DC[arg5mod8 * 3 + two]; + f1 = &BonkAnimAccel[arg5mod8 * 3]; + f2 = &BonkAnimAccel[arg5mod8 * 3 + one]; + f3 = &BonkAnimAccel[arg5mod8 * 3 + two]; message->vel.x = 2.0 * *f1 * sign * var_f20; message->vel.y = 2.0 * *f2 * var_f20; message->vel.z = 2.0 * *f3 * var_f20; @@ -445,7 +445,7 @@ void show_immune_bonk(f32 x, f32 y, f32 z, s32 numStars, s32 arg4, s32 arg5) { message->accel.z = *f3 * var_f20; iMod8 = (i % 8); - message->scale = D_80283690[iMod8].x * baseScale; + message->scale = BonkAnimScale[iMod8].x * baseScale; message->rotZ = 0; message->rotVelZ = sign * 107; message->rotY = clamp_angle(180.0f - gCameras[CAM_BATTLE].curYaw); diff --git a/src/evt/demo_api.c b/src/evt/demo_api.c index 0784f9564a4..c9861224a75 100644 --- a/src/evt/demo_api.c +++ b/src/evt/demo_api.c @@ -6,8 +6,8 @@ u8 ReflectWallPrevAlpha = 254; u8 ReflectFloorPrevAlpha = 254; u16 StarShrineLightBeamAlpha = 255; -extern s32 gSpriteShadingHeader[2]; -extern u8 gSpriteShadingData[0x100]; +extern s32 ShadingOffsetsBuffer[2]; +extern u8 PackedShadingData[0x100]; extern Addr sprite_shading_profiles_data_ROM_START; @@ -32,39 +32,39 @@ API_CALLABLE(SetSpriteShading) { // load shading group data romStart = (s32)sprite_shading_profiles_ROM_START; romEnd = romStart + 8; - dma_copy((u8*) shadingGroupOffset + romStart, (u8*) shadingGroupOffset + romEnd, gSpriteShadingHeader); + dma_copy((u8*) shadingGroupOffset + romStart, (u8*) shadingGroupOffset + romEnd, ShadingOffsetsBuffer); // load offset to shading data romStart = shadingProfileOffset + (s32)sprite_shading_profiles_ROM_START; - data = gSpriteShadingHeader[0]; - dma_copy((u8*)gSpriteShadingHeader[1] + romStart, (u8*)gSpriteShadingHeader[1] + romStart + 4, gSpriteShadingHeader); + data = ShadingOffsetsBuffer[0]; + dma_copy((u8*)ShadingOffsetsBuffer[1] + romStart, (u8*)ShadingOffsetsBuffer[1] + romStart + 4, ShadingOffsetsBuffer); // load shading data - dataOffset = (s32)sprite_shading_profiles_data_ROM_START + data + gSpriteShadingHeader[0]; - dma_copy((u8*) dataOffset, (u8*) dataOffset + sizeof(gSpriteShadingData), &gSpriteShadingData); + dataOffset = (s32)sprite_shading_profiles_data_ROM_START + data + ShadingOffsetsBuffer[0]; + dma_copy((u8*) dataOffset, (u8*) dataOffset + sizeof(PackedShadingData), &PackedShadingData); profile = gSpriteShadingProfile; - count = gSpriteShadingData[0]; - profile->ambientColor.r = gSpriteShadingData[2]; - profile->ambientColor.g = gSpriteShadingData[3]; - profile->ambientColor.b = gSpriteShadingData[4]; - profile->ambientPower = gSpriteShadingData[5]; + count = PackedShadingData[0]; + profile->ambientColor.r = PackedShadingData[2]; + profile->ambientColor.g = PackedShadingData[3]; + profile->ambientColor.b = PackedShadingData[4]; + profile->ambientPower = PackedShadingData[5]; for (i = 0; i < count; i++) { SpriteShadingLightSource* source = &gSpriteShadingProfile->sources[i]; - source->flags = gSpriteShadingData[6 + 16 * i + 0]; - source->rgb.r = gSpriteShadingData[6 + 16 * i + 1]; - source->rgb.g = gSpriteShadingData[6 + 16 * i + 2]; - source->rgb.b = gSpriteShadingData[6 + 16 * i + 3]; - source->pos.x = (s16) ((gSpriteShadingData[6 + 16 * i + 4] << 8) + gSpriteShadingData[6 + 16 * i + 5]); - source->pos.y = (s16) ((gSpriteShadingData[6 + 16 * i + 6] << 8) + gSpriteShadingData[6 + 16 * i + 7]); - source->pos.z = (s16) ((gSpriteShadingData[6 + 16 * i + 8] << 8) + gSpriteShadingData[6 + 16 * i + 9]); - falloff = gSpriteShadingData[6 + 16 * i + 13] - + (gSpriteShadingData[6 + 16 * i + 12] << 8) - + (gSpriteShadingData[6 + 16 * i + 11] << 16) - + (gSpriteShadingData[6 + 16 * i + 10] << 24); + source->flags = PackedShadingData[6 + 16 * i + 0]; + source->rgb.r = PackedShadingData[6 + 16 * i + 1]; + source->rgb.g = PackedShadingData[6 + 16 * i + 2]; + source->rgb.b = PackedShadingData[6 + 16 * i + 3]; + source->pos.x = (s16) ((PackedShadingData[6 + 16 * i + 4] << 8) + PackedShadingData[6 + 16 * i + 5]); + source->pos.y = (s16) ((PackedShadingData[6 + 16 * i + 6] << 8) + PackedShadingData[6 + 16 * i + 7]); + source->pos.z = (s16) ((PackedShadingData[6 + 16 * i + 8] << 8) + PackedShadingData[6 + 16 * i + 9]); + falloff = PackedShadingData[6 + 16 * i + 13] + + (PackedShadingData[6 + 16 * i + 12] << 8) + + (PackedShadingData[6 + 16 * i + 11] << 16) + + (PackedShadingData[6 + 16 * i + 10] << 24); source->falloff = *(f32*)&falloff; - source->unk_14 = gSpriteShadingData[6 + 16 * i + 14]; + source->unk_14 = PackedShadingData[6 + 16 * i + 14]; } gSpriteShadingProfile->flags |= SPR_SHADING_FLAG_ENABLED; return ApiStatus_DONE2; diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 567aaeee213..8883e6c42ed 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -72,9 +72,9 @@ BSS s32 D_PAL_BSS_802E1E34[0x3]; // TODO: probably just alignment #endif // demo_api -BSS s32 gSpriteShadingHeader; +BSS s32 ShadingOffsetsBuffer; BSS s32 D_802DBB64; // unused? -BSS s32 gSpriteShadingData; +BSS s32 PackedShadingData; BSS s32 D_802DB8B6C; // unused? BSS char D_802DBB70[0x100]; diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 197c38256f3..4b8b88b7bc1 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -102,7 +102,7 @@ Vp D_80249D60 = { .vtrans = { 640, 480, 511, 0}, } }; -f32 D_80249D70[15] = { 7.0f, 12.5f, 13.0f, 14.5f, 14.0f, 13.0f, 11.5f, 9.5f, 7.5f, 5.5f, 3.5f, 2.0f, 1.0f, 0.5f, 0.0f }; +f32 CopyArrowAnimOffsets[15] = { 7.0f, 12.5f, 13.0f, 14.5f, 14.0f, 13.0f, 11.5f, 9.5f, 7.5f, 5.5f, 3.5f, 2.0f, 1.0f, 0.5f, 0.0f }; MenuWindowBP filemenu_common_windowBPs[3] = { { @@ -164,7 +164,7 @@ BSS s32 filemenu_pressedButtons; BSS HudElemID filemenu_cursorHID; BSS s32 filemenu_heldButtons; BSS s8 filemenu_filename_pos; -BSS s32 filemenu_loadedFileIdx; +BSS s32 filemenu_CopyFromFileIdx; BSS s8 filemenu_currentMenu; BSS s32 filemenu_8024C09C; BSS HudElemID filemenu_cursorHIDs[1]; @@ -912,7 +912,7 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 } // check if different files are selected - if (filemenu_menus[FILE_MENU_MAIN]->selected == filemenu_loadedFileIdx) { + if (filemenu_menus[FILE_MENU_MAIN]->selected == filemenu_CopyFromFileIdx) { return; } @@ -921,7 +921,7 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 return; } - switch (filemenu_loadedFileIdx) { + switch (filemenu_CopyFromFileIdx) { case 0: startX = 130.0f; startZ = 90.0f; @@ -984,7 +984,7 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 gSPDisplayList(gMainGfxPos++, D_8024B6F0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - guTranslateF(tempMtx, D_80249D70[gGameStatusPtr->frameCounter % ARRAY_COUNT(D_80249D70)], 0.0f, 0.0f); + guTranslateF(tempMtx, CopyArrowAnimOffsets[gGameStatusPtr->frameCounter % ARRAY_COUNT(CopyArrowAnimOffsets)], 0.0f, 0.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); @@ -1009,7 +1009,7 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 gSPDisplayList(gMainGfxPos++, D_8024B6F0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - guTranslateF(tempMtx, D_80249D70[(gGameStatusPtr->frameCounter % ARRAY_COUNT(D_80249D70))], 0.0f, 0.0f); + guTranslateF(tempMtx, CopyArrowAnimOffsets[(gGameStatusPtr->frameCounter % ARRAY_COUNT(CopyArrowAnimOffsets))], 0.0f, 0.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); diff --git a/src/filemenu/filemenu_info.c b/src/filemenu/filemenu_info.c index 0a20f9856e3..42c0844d031 100644 --- a/src/filemenu/filemenu_info.c +++ b/src/filemenu/filemenu_info.c @@ -80,7 +80,7 @@ void filemenu_info_draw_message_contents( xOffset = D_filemenu_80250948[gCurrentLanguage] + 10; filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + xOffset, baseY + 4, 255, 0, 0); xOffset += D_filemenu_802508FC[gCurrentLanguage]; - draw_number(filemenu_loadedFileIdx + 1, baseX + xOffset, baseY + 6, 0, 0, 255, 3); + draw_number(filemenu_CopyFromFileIdx + 1, baseX + xOffset, baseY + 6, 0, 0, 255, 3); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_TO), baseX + 10, baseY + 18, 255, 0, 0); xOffset = D_filemenu_8025094C[gCurrentLanguage] + 10; filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + xOffset, baseY + 18, 255, 0, 0); @@ -110,7 +110,7 @@ void filemenu_info_draw_message_contents( #if VERSION_IQUE filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_COPY_FROM), baseX + 10, baseY + 7, 255, 0, 0); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 42, baseY + 7, 255, 0, 0); - draw_number(filemenu_loadedFileIdx + 1, baseX + 84, baseY + 10, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); + draw_number(filemenu_CopyFromFileIdx + 1, baseX + 84, baseY + 10, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_TO), baseX + 84, baseY + 7, 255, 0, 0); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 100, baseY + 7, 255, 0, 0); draw_number(filemenu_iterFileIdx + 1, baseX + 140, baseY + 10, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); @@ -118,7 +118,7 @@ void filemenu_info_draw_message_contents( #else filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_COPY_FROM), baseX + 10, baseY + 4, 255, 0, 0); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 84, baseY + 4, 255, 0, 0); - draw_number(filemenu_loadedFileIdx + 1, baseX + 122, baseY + 6, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); + draw_number(filemenu_CopyFromFileIdx + 1, baseX + 122, baseY + 6, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_TO), baseX + 10, baseY + 18, 255, 0, 0); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 30, baseY + 18, 255, 0, 0); draw_number(filemenu_iterFileIdx + 1, baseX + 68, baseY + 20, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); diff --git a/src/filemenu/filemenu_main.c b/src/filemenu/filemenu_main.c index 8785f9dd558..96bb9a72658 100644 --- a/src/filemenu/filemenu_main.c +++ b/src/filemenu/filemenu_main.c @@ -1083,7 +1083,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { if (gSaveSlotHasData[menu->selected]) { sfx_play_sound(SOUND_MENU_NEXT); menu->state = FM_MAIN_SELECT_COPY_TO; - filemenu_loadedFileIdx = menu->selected; + filemenu_CopyFromFileIdx = menu->selected; } else { sfx_play_sound(SOUND_MENU_ERROR); } @@ -1097,7 +1097,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { filemenu_set_selected(menu, 0, 2); } else if (menu->selected <= FM_MAIN_OPT_FILE_4) { // selected a file - if (filemenu_loadedFileIdx == menu->selected) { + if (filemenu_CopyFromFileIdx == menu->selected) { sfx_play_sound(SOUND_MENU_ERROR); } else { filemenu_iterFileIdx = menu->selected; @@ -1113,14 +1113,14 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(WIN_FILES_MESSAGE, WINDOW_UPDATE_SHOW); set_window_update(WIN_FILES_CONFIRM_OPTIONS, WINDOW_UPDATE_HIDE); #if VERSION_PAL - if (fio_load_game(filemenu_loadedFileIdx)) { - gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_loadedFileIdx]; + if (fio_load_game(filemenu_CopyFromFileIdx)) { + gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_CopyFromFileIdx]; fio_save_game(filemenu_iterFileIdx); gSaveSlotHasData[filemenu_iterFileIdx] = true; } #else - fio_load_game(filemenu_loadedFileIdx); - gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_loadedFileIdx]; + fio_load_game(filemenu_CopyFromFileIdx); + gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_CopyFromFileIdx]; fio_save_game(filemenu_iterFileIdx); gSaveSlotHasData[filemenu_iterFileIdx] = true; #endif @@ -1248,7 +1248,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { break; case FM_MAIN_SELECT_COPY_TO: menu->state = FM_MAIN_SELECT_COPY_FROM; - filemenu_set_selected(menu, (filemenu_loadedFileIdx % 2) * 2, filemenu_loadedFileIdx / 2); + filemenu_set_selected(menu, (filemenu_CopyFromFileIdx % 2) * 2, filemenu_CopyFromFileIdx / 2); sfx_play_sound(SOUND_MENU_BACK); break; #if !VERSION_PAL @@ -1299,7 +1299,7 @@ void filemenu_main_update(MenuPanel* menu) { // also add highlight to "copy to" target if (filemenu_menus[FILE_MENU_MAIN]->state == FM_MAIN_SELECT_COPY_TO) { - switch (filemenu_loadedFileIdx) { + switch (filemenu_CopyFromFileIdx) { case FM_MAIN_OPT_FILE_1: gWindowStyles[WIN_FILES_SLOT1_BODY].customStyle = &filemenu_windowStyles[16]; gWindowStyles[WIN_FILES_SLOT1_TITLE].customStyle = &filemenu_windowStyles[18]; diff --git a/src/filemenu/filemenu_yesno.c b/src/filemenu/filemenu_yesno.c index 6ca6bf1493b..331e400d34b 100644 --- a/src/filemenu/filemenu_yesno.c +++ b/src/filemenu/filemenu_yesno.c @@ -342,14 +342,14 @@ void filemenu_yesno_handle_input(MenuPanel* menu) { set_window_update(WIN_FILES_MESSAGE, WINDOW_UPDATE_SHOW); set_window_update(WIN_FILES_CONFIRM_OPTIONS, (s32)filemenu_update_hidden_name_confirm); #if VERSION_PAL - if (fio_load_game(filemenu_loadedFileIdx)) { - gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_loadedFileIdx]; + if (fio_load_game(filemenu_CopyFromFileIdx)) { + gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_CopyFromFileIdx]; fio_save_game(filemenu_iterFileIdx); gSaveSlotHasData[filemenu_iterFileIdx] = true; } #else - fio_load_game(filemenu_loadedFileIdx); - gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_loadedFileIdx]; + fio_load_game(filemenu_CopyFromFileIdx); + gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_CopyFromFileIdx]; fio_save_game(filemenu_iterFileIdx); gSaveSlotHasData[filemenu_iterFileIdx] = true; #endif diff --git a/src/world/action/step_up.c b/src/world/action/step_up.c index 19230754e57..cd65292fa5d 100644 --- a/src/world/action/step_up.c +++ b/src/world/action/step_up.c @@ -24,7 +24,7 @@ AnimID StepUpPeachAnims[] = { [PEACH_BAKING_CAKE_WITH_BERRIES] ANIM_Peach1_CarryBerryCake, }; -void func_802B6198_E24768(void); +void action_update_step_up_set_peach_anim(void); void action_update_step_up(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -44,7 +44,7 @@ void action_update_step_up(void) { } suggest_player_anim_allow_backward(anim); } else { - func_802B6198_E24768(); + action_update_step_up_set_peach_anim(); } playerStatus->actionSubstate = 0; playerStatus->timeInAir = 0; @@ -76,7 +76,7 @@ void action_update_step_up(void) { } } -void func_802B6198_E24768(void) { +void action_update_step_up_set_peach_anim(void) { if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_FLAG_DEPRESSED)) { suggest_player_anim_allow_backward(StepUpPeachAnims[gGameStatusPtr->peachBakingIngredient]); diff --git a/src/world/action/walk.c b/src/world/action/walk.c index 051651d8519..f1ce2862661 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -198,7 +198,7 @@ void action_update_run(void) { playerData->runningStepsTaken++; } -void func_802B6550_E23C30(void) { +void action_update_walk_set_peach_anim(void) { if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_FLAG_DEPRESSED)) { suggest_player_anim_allow_backward(WalkPeachAnims[gGameStatusPtr->peachBakingIngredient]); @@ -221,7 +221,7 @@ static void action_update_walk_peach(void) { if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) { playerStatus->curSpeed = playerStatus->walkSpeed; } - func_802B6550_E23C30(); + action_update_walk_set_peach_anim(); } if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 7b4e97be1cd..771c7e87b3f 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -6416,7 +6416,7 @@ D_80249D34 = 0x80249D34; // rom:0x16A594 D_80249D48 = 0x80249D48; // rom:0x16A5A8 D_80249D4C = 0x80249D5C; // rom:0x16A5BC D_80249D60 = 0x80249D60; // rom:0x16A5C0 -D_80249D70 = 0x80249D70; // rom:0x16A5D0 +CopyArrowAnimOffsets = 0x80249D70; // rom:0x16A5D0 filemenu_common_windowBPs = 0x80249DAC; // rom:0x16A60C D_80249DCC = 0x80249DCC; // rom:0x16A62C D_80249DD0 = 0x80249DD0; // rom:0x16A630 @@ -6425,7 +6425,7 @@ filemenu_pressedButtons = 0x8024C084; // rom:0x16C8E4 filemenu_cursorHudElem = 0x8024C088; // rom:0x16C8E8 filemenu_heldButtons = 0x8024C08C; // rom:0x16C8EC filemenu_filename_pos = 0x8024C090; // rom:0x16C8F0 -filemenu_loadedFileIdx = 0x8024C094; // rom:0x16C8F4 +filemenu_CopyFromFileIdx = 0x8024C094; // rom:0x16C8F4 filemenu_currentMenu = 0x8024C098; // rom:0x16C8F8 filemenu_8024C09C = 0x8024C09C; // rom:0x16C8FC filemenu_cursorHudElemID = 0x8024C0A0; // rom:0x16C900 @@ -6764,8 +6764,8 @@ create_home_target_list = 0x80263048; // type:func rom:0x191928 func_80263064 = 0x80263064; // type:func rom:0x191944 func_80263230 = 0x80263230; // type:func rom:0x191B10 func_8026324C = 0x8026324C; // type:func rom:0x191B2C -func_80263268 = 0x80263268; // type:func rom:0x191B48 -func_80263300 = 0x80263300; // type:func rom:0x191BE0 +btl_check_can_change_partner = 0x80263268; // type:func rom:0x191B48 +btl_init_menu_items = 0x80263300; // type:func rom:0x191BE0 btl_are_all_enemies_defeated = 0x802633E8; // type:func rom:0x191CC8 btl_check_enemies_defeated = 0x80263434; // type:func rom:0x191D14 btl_check_player_defeated = 0x80263464; // type:func rom:0x191D44 @@ -7212,8 +7212,8 @@ D_8028358C = 0x8028358C; // rom:0x1B1E6C BattleMessage_BoxSizesY = 0x802835D0; // rom:0x1B1EB0 BattleMessage_TextOffsetsY = 0x802835D4; // rom:0x1B1EB4 BattleMessage_BoxOffsetsY = 0x802835D8; // rom:0x1B1EB8 -D_802835DC = 0x802835DC; // rom:0x1B1EBC -D_80283690 = 0x80283690; // rom:0x1B1F70 +BonkAnimAccel = 0x802835DC; // rom:0x1B1EBC +BonkAnimScale = 0x80283690; // rom:0x1B1F70 BonkModelScripts = 0x80283744; // rom:0x1B2024 BattleMessages = 0x80283770; // rom:0x1B2050 bActorMessages = 0x802838C4; // rom:0x1B21A4 @@ -9002,38 +9002,38 @@ fx_86_appendGfx = 0xE01281E0; // type:func rom:0x414D80 D_E0128480 = 0xE0128480; // rom:0x415020 D_E01284B0 = 0xE01284B0; // rom:0x415050 btl_main_menu_init = 0x802A1000; // type:func rom:0x415D90 -func_802A1030 = 0x802A1030; // type:func rom:0x415DC0 -func_802A1050 = 0x802A1050; // type:func rom:0x415DE0 -func_802A1078 = 0x802A1078; // type:func rom:0x415E08 -func_802A1098 = 0x802A1098; // type:func rom:0x415E28 +btl_main_menu_hide = 0x802A1030; // type:func rom:0x415DC0 +btl_main_menu_resume_choose = 0x802A1050; // type:func rom:0x415DE0 +btl_main_menu_restore_choose = 0x802A1078; // type:func rom:0x415E08 +btl_main_menu_restore_submenu = 0x802A1098; // type:func rom:0x415E28 btl_main_menu_destroy = 0x802A10B8; // type:func rom:0x415E48 btl_main_menu_update = 0x802A11B0; // type:func rom:0x415F40 btl_main_menu_draw = 0x802A1C54; // type:func rom:0x4169E4 -func_802A2684 = 0x802A2684; // type:func rom:0x417414 -func_802A27D0 = 0x802A27D0; // type:func rom:0x417560 -func_802A27E4 = 0x802A27E4; // type:func rom:0x417574 -func_802A2910 = 0x802A2910; // type:func rom:0x4176A0 -func_802A2AB8 = 0x802A2AB8; // type:func rom:0x417848 -func_802A2C58 = 0x802A2C58; // type:func rom:0x4179E8 +btl_submenu_moves_init = 0x802A2684; // type:func rom:0x417414 +btl_submenu_moves_hide = 0x802A27D0; // type:func rom:0x417560 +btl_submenu_moves_destroy = 0x802A27E4; // type:func rom:0x417574 +btl_submenu_moves_resume_choose = 0x802A2910; // type:func rom:0x4176A0 +btl_submenu_moves_restore_choose = 0x802A2AB8; // type:func rom:0x417848 +btl_submenu_moves_restore_locked = 0x802A2C58; // type:func rom:0x4179E8 btl_submenu_moves_update = 0x802A2C84; // type:func rom:0x417A14 btl_menu_moves_draw_content = 0x802A3C98; // type:func rom:0x418A28 btl_menu_moves_show_title = 0x802A43DC; // type:func rom:0x41916C btl_menu_moves_show_icon = 0x802A4448; // type:func rom:0x4191D8 btl_menu_moves_show_desc = 0x802A4494; // type:func rom:0x419224 btl_menu_moves_show_error = 0x802A4534; // type:func rom:0x4192C4 -func_802A45D8 = 0x802A45D8; // type:func rom:0x419368 -func_802A4718 = 0x802A4718; // type:func rom:0x4194A8 -func_802A472C = 0x802A472C; // type:func rom:0x4194BC -func_802A47E0 = 0x802A47E0; // type:func rom:0x419570 -func_802A48FC = 0x802A48FC; // type:func rom:0x41968C -func_802A4A10 = 0x802A4A10; // type:func rom:0x4197A0 -btl_update_strats_menu = 0x802A4A54; // type:func rom:0x4197E4 +btl_menu_strats_init = 0x802A45D8; // type:func rom:0x419368 +btl_submenu_strats_hide = 0x802A4718; // type:func rom:0x4194A8 +btl_submenu_strats_destroy = 0x802A472C; // type:func rom:0x4194BC +btl_submenu_strats_resume_choose = 0x802A47E0; // type:func rom:0x419570 +btl_submenu_strats_restore_choose = 0x802A48FC; // type:func rom:0x41968C +btl_submenu_strats_restore_locked = 0x802A4A10; // type:func rom:0x4197A0 +btl_submenu_strats_update = 0x802A4A54; // type:func rom:0x4197E4 btl_menu_strats_draw_content = 0x802A5290; // type:func rom:0x41A020 btl_menu_strats_show_title = 0x802A56F8; // type:func rom:0x41A488 btl_menu_strats_show_desc = 0x802A5738; // type:func rom:0x41A4C8 btl_menu_strats_show_error = 0x802A57C8; // type:func rom:0x41A558 -can_switch_to_player = 0x802A5818; // type:func rom:0x41A5A8 -can_switch_to_partner = 0x802A58D0; // type:func rom:0x41A660 +btl_player_can_act = 0x802A5818; // type:func rom:0x41A5A8 +btl_partner_can_act = 0x802A58D0; // type:func rom:0x41A660 btl_state_update_player_menu = 0x802A5988; // type:func rom:0x41A718 btl_state_draw_player_menu = 0x802A8180; // type:func rom:0x41CF10 btl_state_update_partner_menu = 0x802A81C8; // type:func rom:0x41CF58 @@ -9048,28 +9048,28 @@ btl_state_update_select_target = 0x802AA688; // type:func rom:0x41F418 btl_state_draw_select_target = 0x802AACD8; // type:func rom:0x41FA68 btl_state_update_22 = 0x802AB330; // type:func rom:0x4200C0 btl_state_draw_22 = 0x802AB338; // type:func rom:0x4200C8 -D_802AB340 = 0x802AB340; // rom:0x4200D0 -D_802AB344 = 0x802AB344; // rom:0x4200D4 -battle_menu_JumpHudScripts = 0x802AB348; // rom:0x4200D8 -battle_menu_HammerHudScripts = 0x802AB368; // rom:0x4200F8 -battle_menu_ItemHudScripts = 0x802AB388; // rom:0x420118 -battle_menu_StarPowerHudScripts = 0x802AB390; // rom:0x420120 -battle_menu_StarPowerMovesHudScripts = 0x802AB398; // rom:0x420128 -battle_menu_PartnerHudScripts = 0x802AB3F8; // rom:0x420188 +ErrorMessageHeight = 0x802AB340; // rom:0x4200D0 +ErrorMessageAdjustY = 0x802AB344; // rom:0x4200D4 +BootsHudScripts = 0x802AB348; // rom:0x4200D8 +HammerHudScripts = 0x802AB368; // rom:0x4200F8 +ItemsHudScripts = 0x802AB388; // rom:0x420118 +StarPowersHudScripts = 0x802AB390; // rom:0x420120 +StarPowerMovesHudScripts = 0x802AB398; // rom:0x420128 +PartnerHudScripts = 0x802AB3F8; // rom:0x420188 battle_menu_DisabledPartnerHudScripts = 0x802AB438; // rom:0x4201C8 -battle_menu_StrategiesHudScript = 0x802AB478; // rom:0x420208 -battle_menu_DoNothingHudScripts = 0x802AB480; // rom:0x420210 -battle_menu_FleeHudScripts = 0x802AB488; // rom:0x420218 -BattleMenu_LeftJustMessages = 0x802AB490; // rom:0x420220 -BattleMenu_CenteredMessages = 0x802AB4C0; // rom:0x420250 +StrategiesHudScripts = 0x802AB478; // rom:0x420208 +DoNothingHudScripts = 0x802AB480; // rom:0x420210 +FleeHudScripts = 0x802AB488; // rom:0x420218 +LeftJustMenuMessages = 0x802AB490; // rom:0x420220 +CenteredBattleMessages = 0x802AB4C0; // rom:0x420250 BattleMenu_CategoryForSubmenu = 0x802AB4F0; // rom:0x420280 -BattleMenu_PartnerThinkAnims = 0x802AB520; // rom:0x4202B0 -BattleMenu_PartnerIdleAnims = 0x802AB558; // rom:0x4202E8 -battle_menu_PartnerMoveHudScripts = 0x802AB590; // rom:0x420320 -battle_menu_PeachStarPowerHudScripts = 0x802AB720; // rom:0x4204B0 -D_802AB728 = 0x802AB728; // rom:0x4204B8 -battle_menu_TwinkStarPowerHudScripts = 0x802AB72C; // rom:0x4204BC -D_802AB734 = 0x802AB734; // rom:0x4204C4 +PartnerThinkAnims = 0x802AB520; // rom:0x4202B0 +PartnerIdleAnims = 0x802AB558; // rom:0x4202E8 +PartnerMoveHudScripts = 0x802AB590; // rom:0x420320 +PeachStarPowerHudScripts = 0x802AB720; // rom:0x4204B0 +PeachMenuMessages = 0x802AB728; // rom:0x4204B8 +TwinkStarPowerHudScripts = 0x802AB72C; // rom:0x4204BC +TwinkMenuMessages = 0x802AB734; // rom:0x4204C4 PartnerNameMessages = 0x802AB738; // rom:0x4204C8 D_802AB7F0 = 0x802AB7F0; // rom:0x420580 D_802AB7F8 = 0x802AB7F8; // rom:0x420588 @@ -25109,7 +25109,7 @@ action_update_idle_peach = 0x802B61E4; // type:func rom:0xE23444 IdlePeachAnims = 0x802B6430; // rom:0xE23690 action_update_walk = 0x802B6000; // type:func rom:0xE236E0 action_update_run = 0x802B6288; // type:func rom:0xE23968 -func_802B6550_E23C30 = 0x802B6550; // type:func rom:0xE23C30 +action_update_walk_set_peach_anim = 0x802B6550; // type:func rom:0xE23C30 action_update_walk_peach = 0x802B65E8; // type:func rom:0xE23CC8 action_update_run_peach = 0x802B6738; // type:func rom:0xE23E18 WalkPeachAnims = 0x802B6910; // rom:0xE23FF0 @@ -25121,7 +25121,7 @@ action_update_step_down = 0x802B6348; // type:func rom:0xE24388 action_update_peach_falling = 0x802B647C; // type:func rom:0xE244BC action_update_peach_step_down = 0x802B6508; // type:func rom:0xE24548 action_update_step_up = 0x802B6000; // type:func rom:0xE245D0 -func_802B6198_E24768 = 0x802B6198; // type:func rom:0xE24768 +action_update_step_up_set_peach_anim = 0x802B6198; // type:func rom:0xE24768 action_update_step_up_peach = 0x802B6230; // type:func rom:0xE24800 State18PeachAnims = 0x802B6300; // rom:0xE248D0 action_update_land = 0x802B6000; // type:func rom:0xE24920 @@ -25950,12 +25950,12 @@ BtlStarPointShinesHIDs = 0x8029EFE8; // BtlStarPointOnesHIDs = 0x8029F010; // gTattleBgPalette = 0x8029F038; // BattleEnemiesCreated = 0x8029F240; // -D_8029F244 = 0x8029F244; // -BattleSubStateDelay = 0x8029F248; // +NextEnemyWaitingOrdinal = 0x8029F244; // +BattleSubstateDelay = 0x8029F248; // D_8029F24C = 0x8029F24C; // RunAwayRewardStep = 0x8029F250; // -D_8029F254 = 0x8029F254; // -D_8029F258 = 0x8029F258; // +BattleSkipActorTurn = 0x8029F254; // +BattleStatusUpdateDelay = 0x8029F258; // RunAwayRewardTotal = 0x8029F25C; // RunAwayRewardIncrement = 0x8029F260; // D_8029F264 = 0x8029F264; // @@ -26037,7 +26037,7 @@ BattleMenu_TargetPointerAlpha = 0x802ACC64; // BattleMenu_TargetNameOffsetX = 0x802ACC68; // BattleMenu_SwapDelay = 0x802ACC6C; // BattleMenu_TargetHudElems = 0x802ACC70; // -D_802ACCD0 = 0x802ACCD0; // +BattlePopupMenu = 0x802ACCD0; // D_802ACFE8 = 0x802ACFE8; // D_802ACFEC = 0x802ACFEC; // D_802ACFF0 = 0x802ACFF0; // @@ -26045,108 +26045,108 @@ D_802ACFF4 = 0x802ACFF4; // D_802ACFFC = 0x802ACFFC; // D_802ACFFD = 0x802ACFFD; // BattleMenuState = 0x802AD000; // -D_802AD001 = 0x802AD001; // +BattleMenu_ReelAppearTimer = 0x802AD001; // BattleMenu_CurPos = 0x802AD002; // BattleMenu_PrevPos = 0x802AD003; // -D_802AD004 = 0x802AD004; // -D_802AD006 = 0x802AD006; // +BattleMenu_WheelMoving = 0x802AD004; // +BattleMenu_ReelAlpha = 0x802AD006; // BattleMenuAlpha = 0x802AD008; // -D_802AD00A = 0x802AD00A; // -D_802AD010 = 0x802AD010; // -D_802AD028 = 0x802AD028; // -D_802AD040 = 0x802AD040; // -D_802AD044 = 0x802AD044; // -D_802AD048 = 0x802AD048; // -D_802AD04C = 0x802AD04C; // -D_802AD050 = 0x802AD050; // -D_802AD054 = 0x802AD054; // -D_802AD058 = 0x802AD058; // -D_802AD05C = 0x802AD05C; // +BattleMenu_ReelHidePercent = 0x802AD00A; // +HID_OptionIcons = 0x802AD010; // +HID_Spotlights = 0x802AD028; // +HID_HighlightSpot = 0x802AD040; // +HID_ProjectorReelA = 0x802AD044; // +HID_ProjectorReelB = 0x802AD048; // +HID_ProjectorBeam = 0x802AD04C; // +HID_SwapZ = 0x802AD050; // +HID_SwapArrowLeft = 0x802AD054; // +HID_SwapArrowRight = 0x802AD058; // +HID_SwapBackground = 0x802AD05C; // BattleMenu_BasePosX = 0x802AD060; // BattleMenu_BasePosY = 0x802AD064; // -BattleMenuDisableMsg = 0x802AD068; // +BattleMenu_ErrorCode = 0x802AD068; // BattleMenu_MinIdx = 0x802AD069; // BattleMenu_MaxIdx = 0x802AD06A; // BattleMenu_HomePos = 0x802AD06B; // BattleMenu_WheelAngle = 0x802AD06C; // -D_802AD070 = 0x802AD070; // -BattleMenu_HudScripts = 0x802AD078; // -BattleMenu_TitleMessages = 0x802AD090; // +BattleMenu_WheelSpeed = 0x802AD070; // +WheelOptionHudScript = 0x802AD078; // +WheelOptionName = 0x802AD090; // D_802AD0A8 = 0x802AD0A8; // -BattleMenu_NumOptions = 0x802AD0AC; // -D_802AD0B0 = 0x802AD0B0; // -battle_menu_submenuIDs = 0x802AD0B8; // -BattleMenu_OptionEnabled = 0x802AD0D0; // -battle_menu_isMessageDisabled = 0x802AD0E8; // +WheelOptionCount = 0x802AD0AC; // +BattleMenu_PrevSelected = 0x802AD0B0; // +WheelOptionSubmenu = 0x802AD0B8; // +WheelOptionEnabled = 0x802AD0D0; // +WheelOptionError = 0x802AD0E8; // D_802AD0EB = 0x802AD0EB; // -D_802AD100 = 0x802AD100; // +BattleMenu_WheelBase = 0x802AD100; // BattleMenu_ShowSwapIcons = 0x802AD104; // -battle_menu_moveState = 0x802AD108; // -battle_menu_moveCursorPos = 0x802AD109; // -D_802AD10A = 0x802AD10A; // -D_802AD10B = 0x802AD10B; // -battle_menu_moveScrollLine = 0x802AD10C; // -D_802AD10D = 0x802AD10D; // -D_802AD10E = 0x802AD10E; // -D_802AD10F = 0x802AD10F; // -battle_menu_moveScrollOffset = 0x802AD110; // -D_802AD112 = 0x802AD112; // -BattleMenu_Moves_TextColor = 0x802AD114; // -BattleMenu_Moves_TextAlpha = 0x802AD116; // -BattleMenu_Moves_CursorID = 0x802AD118; // -BattleMenu_Moves_UpArrowID = 0x802AD11C; // -BattleMenu_Moves_DownArrowID = 0x802AD120; // -BattleMenu_Moves_OptionIDs = 0x802AD128; // -BattleMenu_Moves_TitleID = 0x802AD188; // -BattleMenu_Moves_OptionCostUnitIDs = 0x802AD190; // -BattleMenu_Moves_PosX = 0x802AD1F0; // -BattleMenu_Moves_PosY = 0x802AD1F2; // -BattleMenu_Moves_OptionIndexMap = 0x802AD1F8; // -D_802AD258 = 0x802AD258; // -battle_menu_moveOptionIconScripts = 0x802AD260; // -battle_menu_moveOptionNames = 0x802AD2C0; // -battle_menu_moveOptionDisplayCosts = 0x802AD320; // -battle_menu_moveOptionDisplayCostReductions = 0x802AD380; // -battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0; // -battle_menu_moveOptionBPCosts = 0x802AD440; // -BattleMenu_UsingSpiritsSubmenu = 0x802AD4A0; // -BattleMenu_Moves_OptionCount = 0x802AD4A4; // -D_802AD4A8 = 0x802AD4A8; // -BattleMenu_Moves_OptionIndices = 0x802AD4B0; // -BattleMenu_Moves_OptionEnabled = 0x802AD510; // -BattleMenu_Moves_OptionDescMessages = 0x802AD570; // -BattleMenu_Moves_OptionSortPriority = 0x802AD5D0; // -BattleMenu_Moves_OptionCantUseMessages = 0x802AD5E8; // -battle_menu_moveOptionActive = 0x802AD600; // +MovesMenuState = 0x802AD108; // +MovesCursorPos = 0x802AD109; // +MovesPrevCursorPos = 0x802AD10A; // +MovesErrorTimer = 0x802AD10B; // +MovesVisibleStart = 0x802AD10C; // +MovesVisibleEnd = 0x802AD10D; // +MovesMenuLines = 0x802AD10E; // +MovesDescVisible = 0x802AD10F; // +MovesScrollOffset = 0x802AD110; // +MovesCursorOffset = 0x802AD112; // +MovesTextColor = 0x802AD114; // +MovesTextAlpha = 0x802AD116; // +HID_MovesCursor = 0x802AD118; // +HID_MovesArrowUp = 0x802AD11C; // +HID_MovesArrowDown = 0x802AD120; // +MovesOptionHIDs = 0x802AD128; // +HID_MovesTitle = 0x802AD188; // +MovesOptionCostHIDs = 0x802AD190; // +MovesMenuPosX = 0x802AD1F0; // +MovesMenuPosY = 0x802AD1F2; // +MovesOptionIndexMap = 0x802AD1F8; // +MovesErrorCode = 0x802AD258; // +MovesOptionHudScripts = 0x802AD260; // +MovesOptionNames = 0x802AD2C0; // +MovesOptionDisplayCosts = 0x802AD320; // +MovesOptionDiscounts = 0x802AD380; // +MovesOptionDiscountColors = 0x802AD3E0; // +MovesOptionBPCosts = 0x802AD440; // +UsingSpiritsSubmenu = 0x802AD4A0; // +MovesOptionCount = 0x802AD4A4; // +MovesPrevSelected = 0x802AD4A8; // +MovesOptionIndices = 0x802AD4B0; // +MovesOptionEnabled = 0x802AD510; // +MovesOptionDesc = 0x802AD570; // +MovesOptionSortPriority = 0x802AD5D0; // +MovesOptionError = 0x802AD5E8; // +SelectedMovesIndex = 0x802AD600; // D_802AD603 = 0x802AD603; // -BattleSubmenuStratsState = 0x802AD604; // -StratsMenuPos = 0x802AD605; // -OldStratsMenuPos = 0x802AD606; // +StratsMenuState = 0x802AD604; // +StratsCursorPos = 0x802AD605; // +StratsPrevCursorPos = 0x802AD606; // ShowingErrorMessage = 0x802AD607; // -D_802AD608 = 0x802AD608; // -D_802AD609 = 0x802AD609; // +StratsVisibleStart = 0x802AD608; // +StratsVisibleEnd = 0x802AD609; // StratsMenuLines = 0x802AD60A; // -D_802AD60B = 0x802AD60B; // -D_802AD60C = 0x802AD60C; // -D_802AD60E = 0x802AD60E; // -D_802AD610 = 0x802AD610; // -D_802AD612 = 0x802AD612; // -D_802AD614 = 0x802AD614; // -D_802AD618 = 0x802AD618; // -HID_GreenArrowUp = 0x802AD61C; // -HID_GreenArrowDown = 0x802AD620; // -D_802AD624 = 0x802AD624; // -D_802AD628 = 0x802AD628; // -D_802AD63C = 0x802AD63C; // -D_802AD63E = 0x802AD63E; // -D_802AD640 = 0x802AD640; // -D_802AD658 = 0x802AD658; // -D_802AD66C = 0x802AD66C; // -StratsMenuLastPos = 0x802AD670; // -D_802AD678 = 0x802AD678; // -D_802AD690 = 0x802AD690; // -D_802AD6A8 = 0x802AD6A8; // -D_802AD6C0 = 0x802AD6C0; // +StratsDescVisible = 0x802AD60B; // +StratsScrollOffset = 0x802AD60C; // +StratsCursorOffset = 0x802AD60E; // +StratsErrorCode = 0x802AD610; // +StratsErrorTimer = 0x802AD612; // +StratsTextColor = 0x802AD614; // +HID_StratsCursor = 0x802AD618; // +HID_StratsArrowUp = 0x802AD61C; // +HID_StratsArrowDown = 0x802AD620; // +StratsTextAlpha = 0x802AD624; // +StratsOptionHIDs = 0x802AD628; // +StratsMenuPosX = 0x802AD63C; // +StratsMenuPosY = 0x802AD63E; // +StratsOptionHudScripts = 0x802AD640; // +StratsOptionNames = 0x802AD658; // +StratsOptionCount = 0x802AD66C; // +StratsPrevSelected = 0x802AD670; // +StratsOptionMenuTypes = 0x802AD678; // +StratsOptionEnabled = 0x802AD690; // +StratsOptionError = 0x802AD6A8; // +StratsOptionMessage = 0x802AD6C0; // D_802AD6D4 = 0x802AD6D4; // Munchlesia_LaunchVelocity = 0x802B62D0; // Munchlesia_LateralVelocity = 0x802B62D4; // @@ -26189,8 +26189,8 @@ MusicEventList = 0x802DB7D0; // RunningMusicEvents = 0x802DB7D8; // RunningMusicEventIDs = 0x802DB800; // D_802DB830 = 0x802DB830; // -gSpriteShadingHeader = 0x802DBB60; // -gSpriteShadingData = 0x802DBB68; // +ShadingOffsetsBuffer = 0x802DBB60; // +PackedShadingData = 0x802DBB68; // gWorldMapFlags = 0x802DBC70; // size:0xC DoorModelsSwingCW = 0x802DBC7C; // wPushBlockGrids = 0x802DBC88; // From fef56ea26be782b0e7615af9e63a86df9e93af6f Mon Sep 17 00:00:00 2001 From: z64a Date: Sun, 23 Nov 2025 23:07:34 -0500 Subject: [PATCH 06/18] last --- include/script_api/common.h | 2 +- src/evt/cam_api.c | 2 +- src/game_modes.c | 2 +- src/game_modes.h | 12 +-- src/game_states.c | 34 +++---- src/main_loop.c | 8 +- src/state_title_screen.c | 2 +- src/state_world.c | 2 +- tools/renames/5_parity_with_dx.txt | 148 +++++++++++++++++++++++++++++ ver/us/symbol_addrs.txt | 14 +-- 10 files changed, 187 insertions(+), 39 deletions(-) create mode 100644 tools/renames/5_parity_with_dx.txt diff --git a/include/script_api/common.h b/include/script_api/common.h index 5740a9b1dbc..9aee6afde48 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -247,7 +247,7 @@ API_CALLABLE(ShakeCam); API_CALLABLE(SetCamLeadPlayer); /// @evtapi -API_CALLABLE(func_802CB710); +API_CALLABLE(SetCamLeadScale); /// @evtapi API_CALLABLE(PanToTarget); diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 803ec476042..72bf2590d91 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -360,7 +360,7 @@ API_CALLABLE(SetCamLeadPlayer) { return ApiStatus_DONE2; } -API_CALLABLE(func_802CB710) { +API_CALLABLE(SetCamLeadScale) { Bytecode* args = script->ptrReadPos; s32 id = evt_get_variable(script, *args++); f32 value = evt_get_variable(script, *args++); diff --git a/src/game_modes.c b/src/game_modes.c index 5a3796bfa71..63cb418a744 100644 --- a/src/game_modes.c +++ b/src/game_modes.c @@ -33,7 +33,7 @@ typedef struct GameModeIncomplete { /* 0x0C */ UNK_FUN_PTR(unusedFunc); /* 0x10 */ void (*render)(void); #ifdef AVOID_UB - /* 0x14 */ void (*renderAux)(void); ///< @see state_render_frontUI + /* 0x14 */ void (*renderAux)(void); ///< @see render_game_mode_frontUI #endif } GameModeIncomplete; // size = 0x14 diff --git a/src/game_modes.h b/src/game_modes.h index a2cfc95e0ed..1fc11dd9de0 100644 --- a/src/game_modes.h +++ b/src/game_modes.h @@ -41,15 +41,15 @@ typedef struct GameMode { /* 0x08 */ void (*step)(void); /* 0x0C */ UNK_FUN_PTR(unusedFunc); /* 0x10 */ void (*render)(void); - /* 0x14 */ void (*renderAux)(void); ///< @see state_render_frontUI + /* 0x14 */ void (*renderAux)(void); ///< @see render_game_mode_frontUI } GameMode; // size = 0x18 void set_game_mode(s16 mode); -void clear_game_modes(void); +void clear_game_mode(void); GameMode* set_game_mode_slot(s32 i, GameMode* mode); -void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void)); -void step_current_game_mode(void); -void state_render_backUI(void); -void state_render_frontUI(void); +void set_game_mode_render_frontUI(s32 i, void (*fn)(void)); +void step_game_mode(void); +void render_game_mode_backUI(void); +void render_game_mode_frontUI(void); #endif diff --git a/src/game_states.c b/src/game_states.c index 6c7edefadfc..80ab32d9f49 100644 --- a/src/game_states.c +++ b/src/game_states.c @@ -4,10 +4,10 @@ BSS GameMode gMainGameMode[2]; BSS s32 D_80151730[4]; // unused? or probably a part of GameMode? -void mode_default_nop(void) { +void game_mode_nop(void) { } -void clear_game_modes(void) { +void clear_game_mode(void) { GameMode* gameMode; s32 i; @@ -36,19 +36,19 @@ GameMode* set_next_game_mode(GameMode* mode) { gameMode->unusedFunc = nullptr; if (gameMode->init == nullptr) { - gameMode->init = mode_default_nop; + gameMode->init = game_mode_nop; } if (gameMode->step == nullptr) { - gameMode->step = mode_default_nop; + gameMode->step = game_mode_nop; } if (gameMode->unusedFunc == nullptr) { - gameMode->unusedFunc = mode_default_nop; + gameMode->unusedFunc = game_mode_nop; } if (gameMode->render == nullptr) { - gameMode->render = mode_default_nop; + gameMode->render = game_mode_nop; } - gameMode->renderAux = mode_default_nop; + gameMode->renderAux = game_mode_nop; gameMode->init(); return gameMode; @@ -64,18 +64,18 @@ GameMode* set_game_mode_slot(s32 i, GameMode* mode) { gameMode->step = mode->step; gameMode->render = mode->render; gameMode->unusedFunc = nullptr; - if (gameMode->init == nullptr) gameMode->init = mode_default_nop; - if (gameMode->step == nullptr) gameMode->step = mode_default_nop; - if (gameMode->unusedFunc == nullptr) gameMode->unusedFunc = mode_default_nop; - if (gameMode->render == nullptr) gameMode->render = mode_default_nop; + if (gameMode->init == nullptr) gameMode->init = game_mode_nop; + if (gameMode->step == nullptr) gameMode->step = game_mode_nop; + if (gameMode->unusedFunc == nullptr) gameMode->unusedFunc = game_mode_nop; + if (gameMode->render == nullptr) gameMode->render = game_mode_nop; - gameMode->renderAux = mode_default_nop; + gameMode->renderAux = game_mode_nop; gameMode->init(); return gameMode; } -void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void)) { +void set_game_mode_render_frontUI(s32 i, void (*fn)(void)) { GameMode* gameMode = &gMainGameMode[i]; ASSERT(i < ARRAY_COUNT(gMainGameMode)); @@ -84,7 +84,7 @@ void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void)) { gameMode->flags |= MODE_FLAG_RENDER_AUX_SET; if (fn == nullptr) { - gameMode->renderAux = mode_default_nop; + gameMode->renderAux = game_mode_nop; } } @@ -109,7 +109,7 @@ void set_game_mode_flag_10(s32 i) { gMainGameMode[i].flags |= MODE_FLAG_10; } -void step_current_game_mode(void) { +void step_game_mode(void) { GameMode* gameMode = gMainGameMode; s32 i; @@ -141,7 +141,7 @@ void state_do_unk(void) { } } -void state_render_backUI(void) { +void render_game_mode_backUI(void) { GameMode* gameMode = gMainGameMode; s32 i; @@ -156,7 +156,7 @@ void state_render_backUI(void) { } } -void state_render_frontUI(void) { +void render_game_mode_frontUI(void) { GameMode* gameMode = gMainGameMode; s32 i; diff --git a/src/main_loop.c b/src/main_loop.c index 3eb79a2d676..b31b84b49ea 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -87,7 +87,7 @@ void step_game_loop(void) { update_scripts(); update_messages(); update_hud_elements(); - step_current_game_mode(); + step_game_mode(); update_entities(); func_80138198(); bgm_update_music_control(); @@ -196,7 +196,7 @@ void gfx_draw_frame(void) { render_workers_backUI(); render_hud_elements_backUI(); render_effects_UI(); - state_render_backUI(); + render_game_mode_backUI(); if (!(gOverrideFlags & GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS)) { render_window_root(); @@ -232,7 +232,7 @@ void gfx_draw_frame(void) { render_window_root(); } - state_render_frontUI(); + render_game_mode_frontUI(); if (gOverrideFlags & GLOBAL_OVERRIDES_SOFT_RESET) { switch (SoftResetState) { @@ -294,7 +294,7 @@ void load_engine_data(void) { reset_background_settings(); clear_character_set(); clear_printers(); - clear_game_modes(); + clear_game_mode(); clear_npcs(); hud_element_clear_cache(); clear_trigger_data(); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 032711b58f3..4648322876e 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -231,7 +231,7 @@ void state_init_title_screen(void) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD; clear_player_data(); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; - game_mode_set_fpDrawAuxUI(0, appendGfx_title_screen); + set_game_mode_render_frontUI(0, appendGfx_title_screen); load_map_bg("title_bg"); set_background(&gBackgroundImage); bgm_set_song(0, SONG_MAIN_THEME, 0, 500, VOL_LEVEL_FULL); diff --git a/src/state_world.c b/src/state_world.c index e9f0935a07f..3df9180150c 100644 --- a/src/state_world.c +++ b/src/state_world.c @@ -5,7 +5,7 @@ void state_world_draw_aux_ui(void); void state_init_world(void) { - game_mode_set_fpDrawAuxUI(0, state_world_draw_aux_ui); + set_game_mode_render_frontUI(0, state_world_draw_aux_ui); } void state_step_world(void) { diff --git a/tools/renames/5_parity_with_dx.txt b/tools/renames/5_parity_with_dx.txt new file mode 100644 index 00000000000..9cba316545c --- /dev/null +++ b/tools/renames/5_parity_with_dx.txt @@ -0,0 +1,148 @@ +D_80249D70 CopyArrowAnimOffsets +filemenu_loadedFileIdx filemenu_CopyFromFileIdx +func_80263268 btl_check_can_change_partner +func_80263300 btl_init_menu_items +gSpriteShadingHeader ShadingOffsetsBuffer +gSpriteShadingData PackedShadingData +D_802835DC BonkAnimAccel +D_80283690 BonkAnimScale +func_802A1030 btl_main_menu_hide +func_802A1050 btl_main_menu_resume_choose +func_802A1078 btl_main_menu_restore_choose +func_802A1098 btl_main_menu_restore_submenu +func_802A2684 btl_submenu_moves_init +func_802A27D0 btl_submenu_moves_hide +func_802A27E4 btl_submenu_moves_destroy +func_802A2910 btl_submenu_moves_resume_choose +func_802A2AB8 btl_submenu_moves_restore_choose +func_802A2C58 btl_submenu_moves_restore_locked +func_802A45D8 btl_menu_strats_init +func_802A4718 btl_submenu_strats_hide +func_802A472C btl_submenu_strats_destroy +func_802A47E0 btl_submenu_strats_resume_choose +func_802A48FC btl_submenu_strats_restore_choose +func_802A4A10 btl_submenu_strats_restore_locked +btl_update_strats_menu btl_submenu_strats_update +can_switch_to_player btl_player_can_act +can_switch_to_partner btl_partner_can_act +D_802AB340 ErrorMessageHeight +D_802AB344 ErrorMessageAdjustY +battle_menu_JumpHudScripts BootsHudScripts +battle_menu_HammerHudScripts HammerHudScripts +battle_menu_ItemHudScripts ItemsHudScripts +battle_menu_StarPowerHudScripts StarPowersHudScripts +battle_menu_StarPowerMovesHudScripts StarPowerMovesHudScripts +battle_menu_PartnerHudScripts PartnerHudScripts +battle_menu_StrategiesHudScript StrategiesHudScripts +battle_menu_DoNothingHudScripts DoNothingHudScripts +battle_menu_FleeHudScripts FleeHudScripts +BattleMenu_LeftJustMessages LeftJustMenuMessages +BattleMenu_CenteredMessages CenteredBattleMessages +BattleMenu_PartnerThinkAnims PartnerThinkAnims +BattleMenu_PartnerIdleAnims PartnerIdleAnims +battle_menu_PartnerMoveHudScripts PartnerMoveHudScripts +battle_menu_PeachStarPowerHudScripts PeachStarPowerHudScripts +D_802AB728 PeachMenuMessages +battle_menu_TwinkStarPowerHudScripts TwinkStarPowerHudScripts +D_802AB734 TwinkMenuMessages +func_802B6550_E23C30 action_update_walk_set_peach_anim +func_802B6198_E24768 action_update_step_up_set_peach_anim +D_8029F244 NextEnemyWaitingOrdinal +BattleSubStateDelay BattleSubstateDelay +D_8029F254 BattleSkipActorTurn +D_8029F258 BattleStatusUpdateDelay +D_802ACCD0 BattlePopupMenu +D_802AD001 BattleMenu_ReelAppearTimer +D_802AD004 BattleMenu_WheelMoving +D_802AD006 BattleMenu_ReelAlpha +D_802AD00A BattleMenu_ReelHidePercent +D_802AD010 HID_OptionIcons +D_802AD028 HID_Spotlights +D_802AD040 HID_HighlightSpot +D_802AD044 HID_ProjectorReelA +D_802AD048 HID_ProjectorReelB +D_802AD04C HID_ProjectorBeam +D_802AD050 HID_SwapZ +D_802AD054 HID_SwapArrowLeft +D_802AD058 HID_SwapArrowRight +D_802AD05C HID_SwapBackground +BattleMenuDisableMsg BattleMenu_ErrorCode +D_802AD070 BattleMenu_WheelSpeed +BattleMenu_HudScripts WheelOptionHudScript +BattleMenu_TitleMessages WheelOptionName +BattleMenu_NumOptions WheelOptionCount +D_802AD0B0 BattleMenu_PrevSelected +battle_menu_submenuIDs WheelOptionSubmenu +BattleMenu_OptionEnabled WheelOptionEnabled +battle_menu_isMessageDisabled WheelOptionError +D_802AD100 BattleMenu_WheelBase +battle_menu_moveState MovesMenuState +battle_menu_moveCursorPos MovesCursorPos +D_802AD10A MovesPrevCursorPos +D_802AD10B MovesErrorTimer +battle_menu_moveScrollLine MovesVisibleStart +D_802AD10D MovesVisibleEnd +D_802AD10E MovesMenuLines +D_802AD10F MovesDescVisible +battle_menu_moveScrollOffset MovesScrollOffset +D_802AD112 MovesCursorOffset +BattleMenu_Moves_TextColor MovesTextColor +BattleMenu_Moves_TextAlpha MovesTextAlpha +BattleMenu_Moves_CursorID HID_MovesCursor +BattleMenu_Moves_UpArrowID HID_MovesArrowUp +BattleMenu_Moves_DownArrowID HID_MovesArrowDown +BattleMenu_Moves_OptionIDs MovesOptionHIDs +BattleMenu_Moves_TitleID HID_MovesTitle +BattleMenu_Moves_OptionCostUnitIDs MovesOptionCostHIDs +BattleMenu_Moves_PosX MovesMenuPosX +BattleMenu_Moves_PosY MovesMenuPosY +BattleMenu_Moves_OptionIndexMap MovesOptionIndexMap +D_802AD258 MovesErrorCode +battle_menu_moveOptionIconScripts MovesOptionHudScripts +battle_menu_moveOptionNames MovesOptionNames +battle_menu_moveOptionDisplayCosts MovesOptionDisplayCosts +battle_menu_moveOptionDisplayCostReductions MovesOptionDiscounts +battle_menu_moveOptionDisplayCostReductionColors MovesOptionDiscountColors +battle_menu_moveOptionBPCosts MovesOptionBPCosts +BattleMenu_UsingSpiritsSubmenu UsingSpiritsSubmenu +BattleMenu_Moves_OptionCount MovesOptionCount +D_802AD4A8 MovesPrevSelected +BattleMenu_Moves_OptionIndices MovesOptionIndices +BattleMenu_Moves_OptionEnabled MovesOptionEnabled +BattleMenu_Moves_OptionDescMessages MovesOptionDesc +BattleMenu_Moves_OptionSortPriority MovesOptionSortPriority +BattleMenu_Moves_OptionCantUseMessages MovesOptionError +battle_menu_moveOptionActive SelectedMovesIndex +BattleSubmenuStratsState StratsMenuState +StratsMenuPos StratsCursorPos +OldStratsMenuPos StratsPrevCursorPos +D_802AD608 StratsVisibleStart +D_802AD609 StratsVisibleEnd +D_802AD60B StratsDescVisible +D_802AD60C StratsScrollOffset +D_802AD60E StratsCursorOffset +D_802AD610 StratsErrorCode +D_802AD612 StratsErrorTimer +D_802AD614 StratsTextColor +D_802AD618 HID_StratsCursor +HID_GreenArrowUp HID_StratsArrowUp +HID_GreenArrowDown HID_StratsArrowDown +D_802AD624 StratsTextAlpha +D_802AD628 StratsOptionHIDs +D_802AD63C StratsMenuPosX +D_802AD63E StratsMenuPosY +D_802AD640 StratsOptionHudScripts +D_802AD658 StratsOptionNames +D_802AD66C StratsOptionCount +StratsMenuLastPos StratsPrevSelected +D_802AD678 StratsOptionMenuTypes +D_802AD690 StratsOptionEnabled +D_802AD6A8 StratsOptionError +D_802AD6C0 StratsOptionMessage +func_802CB710 SetCamLeadScale +mode_default_nop game_mode_nop +clear_game_modes clear_game_mode +game_mode_set_fpDrawAuxUI set_game_mode_render_frontUI +step_current_game_mode step_game_mode +state_render_backUI render_game_mode_backUI +state_render_frontUI render_game_mode_frontUI diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 771c7e87b3f..dfa9f419bfe 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3945,19 +3945,19 @@ set_standard_shadow_scale = 0x8011285C; // type:func rom:0xA8F5C set_npc_shadow_scale = 0x80112900; // type:func rom:0xA9000 set_peach_shadow_scale = 0x801129D4; // type:func rom:0xA90D4 is_block_on_ground = 0x80112B20; // type:func rom:0xA9220 -mode_default_nop = 0x80112B90; // type:func rom:0xA9290 -clear_game_modes = 0x80112B98; // type:func rom:0xA9298 +game_mode_nop = 0x80112B90; // type:func rom:0xA9290 +clear_game_mode = 0x80112B98; // type:func rom:0xA9298 set_next_game_mode = 0x80112BBC; // type:func rom:0xA92BC set_game_mode_slot = 0x80112CA8; // type:func rom:0xA93A8 -game_mode_set_fpDrawAuxUI = 0x80112D84; // type:func rom:0xA9484 +set_game_mode_render_frontUI = 0x80112D84; // type:func rom:0xA9484 set_game_mode_flag_3 = 0x80112DD4; // type:func rom:0xA94D4 set_game_mode_flag_4 = 0x80112DFC; // type:func rom:0xA94FC clear_game_mode_unk_flags = 0x80112E24; // type:func rom:0xA9524 set_game_mode_flag_5 = 0x80112E4C; // type:func rom:0xA954C -step_current_game_mode = 0x80112E78; // type:func rom:0xA9578 +step_game_mode = 0x80112E78; // type:func rom:0xA9578 state_do_unk = 0x80112EEC; // type:func rom:0xA95EC -state_render_backUI = 0x80112F58; // type:func rom:0xA9658 -state_render_frontUI = 0x80112FC4; // type:func rom:0xA96C4 +render_game_mode_backUI = 0x80112F58; // type:func rom:0xA9658 +render_game_mode_frontUI = 0x80112FC4; // type:func rom:0xA96C4 appendGfx_model = 0x80113090; // type:func rom:0xA9790 load_texture_impl = 0x80114B58; // type:func rom:0xAB258 load_texture_by_name = 0x80114D6C; // type:func rom:0xAB46C @@ -5179,7 +5179,7 @@ SpriteShadingPalette = 0x80159880; // rom:0xEFF80 wEnvSounds = 0x801598A0; // rom:0xEFFA0 SetCamLeadPlayer = 0x802CB680; // type:func rom:0xF0030 bEnvSounds = 0x801599B8; // rom:0xF00B8 -func_802CB710 = 0x802CB710; // type:func rom:0xF00C0 +SetCamLeadScale = 0x802CB710; // type:func rom:0xF00C0 PanToTarget = 0x802CB79C; // type:func rom:0xF014C gCurrentEnvSounds = 0x80159AD0; // rom:0xF01D0 SfxReverbMode = 0x80159AD4; // rom:0xF01D4 From 5093c3f7fa46b8ec965ff375f34590cb01b7c23e Mon Sep 17 00:00:00 2001 From: z64a Date: Mon, 24 Nov 2025 00:08:51 -0500 Subject: [PATCH 07/18] fix stray TRUE/FALSE --- src/audio.h | 4 ++-- src/audio/bgm_player.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audio.h b/src/audio.h index a75d7dfda21..3c37acf6b6d 100644 --- a/src/audio.h +++ b/src/audio.h @@ -217,8 +217,8 @@ typedef enum BGMCompositionCommands { BGM_COMP_START_LOOP = 3, BGM_COMP_WAIT = 4, BGM_COMP_END_LOOP = 5, - BGM_COMP_END_COND_LOOP_false = 6, - BGM_COMP_END_COND_LOOP_true = 7, + BGM_COMP_END_COND_LOOP_FALSE = 6, + BGM_COMP_END_COND_LOOP_TRUE = 7, } BGMCompositionCommands; typedef enum BGMSpecialSubops { diff --git a/src/audio/bgm_player.c b/src/audio/bgm_player.c index 2692f08c976..3f780743f4e 100644 --- a/src/audio/bgm_player.c +++ b/src/audio/bgm_player.c @@ -883,12 +883,12 @@ void au_bgm_player_read_composition(BGMPlayer* player) { case BGM_COMP_END_LOOP << 16: au_bgm_end_composition_loop(player, cmd); break; - case BGM_COMP_END_COND_LOOP_false << 16: + case BGM_COMP_END_COND_LOOP_FALSE << 16: if (!(player->conditionalLoopFlags & 1)) { au_bgm_end_composition_loop(player, cmd); } break; - case BGM_COMP_END_COND_LOOP_true << 16: + case BGM_COMP_END_COND_LOOP_TRUE << 16: if (player->conditionalLoopFlags & 1) { au_bgm_end_composition_loop(player, cmd); } From b0389222b218890b825b6a755f240fa3ccb65520 Mon Sep 17 00:00:00 2001 From: z64a Date: Mon, 24 Nov 2025 01:26:52 -0500 Subject: [PATCH 08/18] menu state names --- include/enums.h | 296 +++++----- src/battle/btl_states_actions.c | 36 +- src/battle/btl_states_menus.c | 958 ++++++++++++++++---------------- src/battle/level_up.c | 24 +- 4 files changed, 658 insertions(+), 656 deletions(-) diff --git a/include/enums.h b/include/enums.h index 8c866f3877b..3aa93424f82 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3766,14 +3766,14 @@ enum BattleSubStates { BTL_SUBSTATE_BEGIN_PARTNER_TURN_RESET_STATE = 100, // BATTLE_STATE_TRANSFER_TURN - BTL_SUBSTATE_9_INIT = 0, - BTL_SUBSTATE_9_1 = 1, - BTL_SUBSTATE_9_2 = 2, - BTL_SUBSTATE_9_3 = 3, - BTL_SUBSTATE_9_4 = 4, - BTL_SUBSTATE_9_5 = 5, - BTL_SUBSTATE_9_6 = 6, - BTL_SUBSTATE_9_7 = 7, + BTL_SUBSTATE_TRANSFER_TURN_INIT = 0, + BTL_SUBSTATE_TRANSFER_TURN_RESET_ENEMIES = 1, + BTL_SUBSTATE_TRANSFER_TURN_AWAIT_ALL = 2, + BTL_SUBSTATE_TRANSFER_TURN_RESET_POSITIONS = 3, + BTL_SUBSTATE_TRANSFER_TURN_TRY_MERLEE_DEF = 4, + BTL_SUBSTATE_TRANSFER_TURN_NOTIFY_ENEMY_PHASE = 5, + BTL_SUBSTATE_TRANSFER_TURN_AWAIT_ENEMY_PHASE = 6, + BTL_SUBSTATE_TRANSFER_TURN_DONE = 7, // BATTLE_STATE_SWITCH_TO_PLAYER // BATTLE_STATE_SWITCH_TO_PARTNER @@ -3954,93 +3954,96 @@ enum BattleSubStates { // used with BATTLE_STATE_PLAYER_MENU enum BattlePlayerMenuSubstates { - BTL_SUBSTATE_PLAYER_MENU_INIT = 0, + BTL_SUBSTATE_PLAYER_MENU_INIT = 0, // Main menu - BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY = 1, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2 = 2, - BTL_SUBSTATE_PLAYER_MENU_MOVE_CHOOSE_TARGET = 3, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4 = 4, - BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CANCEL = 5, - BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CHOSEN = 6, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_7 = 7, - BTL_SUBSTATE_PLAYER_MENU_MAIN_SHOW_CANT_SWAP = 8, - BTL_SUBSTATE_PLAYER_MENU_MAIN_AWAIT_CANT_SWAP = 9, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_10 = 10, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_11 = 11, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12 = 12, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_13 = 13, - BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_14 = 14, - // Unknown - BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_1 = 20, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET = 21, - BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3 = 22, - BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4 = 23, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL = 24, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CHOSEN = 25, - // Change Member - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_1 = 30, - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2 = 31, - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3 = 32, - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4 = 33, - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5 = 34, - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_6 = 35, - BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7 = 36, + BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING = 1, + // selecting options from jump, hammer, or outermost items submenus + BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING = 2, + BTL_SUBSTATE_PLAYER_MENU_ABILITIES_HANDOVER = 3, + BTL_SUBSTATE_PLAYER_MENU_ABILITIES_REOPEN_MENU = 4, + BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CANCEL = 5, + BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CHOSEN = 6, + BTL_SUBSTATE_PLAYER_MENU_ABILITIES_SHOW_ERROR = 7, + BTL_SUBSTATE_PLAYER_MENU_MAIN_SHOW_CANT_SWAP = 8, + BTL_SUBSTATE_PLAYER_MENU_MAIN_AWAIT_CANT_SWAP = 9, + // states for target selection when there is no submenu after main + // this occurs when there are no additional options for Jump/Hammer apart from the base move + BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_SHOW = 10, + BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_HANDOVER = 11, + BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_RETURN_MAIN = 12, + BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CANCEL = 13, + BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CHOSEN = 14, + // Initial selection and use for Double/Triple dip + BTL_SUBSTATE_PLAYER_MENU_DIPPING_BUILD_MENU = 20, + BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSING = 21, // choosing double dip item + BTL_SUBSTATE_PLAYER_MENU_DIPPING_HANDOVER = 22, // selecting target + BTL_SUBSTATE_PLAYER_MENU_DIPPING_REOPEN_MENU = 23, + BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL = 24, + BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CHOSEN = 25, + // Change Partner + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_BUILD_MENU = 30, + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_CHOOSING = 31, + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_HANDOVER = 32, + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_REOPEN_MENU = 33, + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CANCEL = 34, + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CHOSEN = 35, + BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_ERROR = 36, // Items - BTL_SUBSTATE_PLAYER_MENU_ITEMS_1 = 40, - BTL_SUBSTATE_PLAYER_MENU_ITEMS_2 = 41, - BTL_SUBSTATE_PLAYER_MENU_ITEMS_3 = 42, - BTL_SUBSTATE_PLAYER_MENU_ITEMS_4 = 43, - BTL_SUBSTATE_PLAYER_MENU_ITEMS_5 = 44, - BTL_SUBSTATE_PLAYER_MENU_ITEMS_6 = 45, + BTL_SUBSTATE_PLAYER_MENU_ITEMS_BUILD_MENU = 40, + BTL_SUBSTATE_PLAYER_MENU_ITEMS_CHOOSING = 41, + BTL_SUBSTATE_PLAYER_MENU_ITEMS_HANDOVER = 42, + BTL_SUBSTATE_PLAYER_MENU_ITEMS_REOPEN_MENU = 43, + BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CANCEL = 44, + BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CHOSEN = 45, // Star Spirits - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_1 = 60, - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2 = 61, - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_3 = 62, - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4 = 63, - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5 = 64, - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_6 = 65, - BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_7 = 66, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_BUILD_MENU = 60, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_CHOOSING = 61, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_HANDOVER = 62, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_REOPEN_MENU = 63, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CANCEL = 64, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CHOSEN = 65, + BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_SHOW_ERROR = 66, // additional item use from Double/Triple dip - BTL_SUBSTATE_PLAYER_MENU_DIPPING_1 = 70, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_2 = 71, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_3 = 72, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_4 = 73, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_5 = 74, - BTL_SUBSTATE_PLAYER_MENU_DIPPING_6 = 75, + BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_BUILD_MENU = 70, + BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_CHOOSING = 71, + BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_HANDOVER = 72, + BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_REOPEN_MENU = 73, + BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_TARGET_CANCEL = 74, + BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_TARGET_CHOSEN = 75, // Berserker - BTL_SUBSTATE_PLAYER_MENU_BERSERKER_CHOOSE = 100, + BTL_SUBSTATE_PLAYER_MENU_BERSERKER_CHOOSE = 100, // Strategies - BTL_SUBSTATE_PLAYER_MENU_BUILD_STRATEGIES = 200, - BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2 = 201, - BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_3 = 202, - BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4 = 203, - BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_5 = 204, - BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6 = 205, - BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_8 = 207, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_BUILD_MENU = 200, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_CHOOSING = 201, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_HANDOVER = 202, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_REOPEN_MENU = 203, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CANCEL = 204, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN = 205, + BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_SHOW_ERROR = 207, // initialize - BTL_SUBSTATE_PLAYER_MENU_PERFORM_SWAP = 300, - BTL_SUBSTATE_PLAYER_MENU_CREATE_MAIN_MENU = 302, + BTL_SUBSTATE_PLAYER_MENU_PERFORM_SWAP = 300, + BTL_SUBSTATE_PLAYER_MENU_CREATE_MAIN_MENU = 302, }; enum BattlePartnerMenuSubstates { BTL_SUBSTATE_PARTNER_MENU_NONE = 0, // Main menu - BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1 = 2, - BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_2 = 3, - BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_3 = 4, - BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4 = 5, - BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_5 = 6, - BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_6 = 7, + BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN = 2, + BTL_SUBSTATE_PARTNER_MENU_MAIN_CHOOSING = 3, + BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER = 4, + BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU = 5, + BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CANCEL = 6, + BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CHOSEN = 7, BTL_SUBSTATE_PARTNER_MENU_MAIN_SHOW_CANT_SWAP = 8, BTL_SUBSTATE_PARTNER_MENU_MAIN_AWAIT_CANT_SWAP = 9, // Abilities - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_1 = 10, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2 = 11, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3 = 12, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4 = 13, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5 = 14, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_6 = 15, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_7 = 16, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_BUILD_MENU = 10, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING = 11, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER = 12, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU = 13, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CANCEL = 14, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CHOSEN = 15, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_SHOW_ERROR = 16, // Unknown, referenced only in btl_state_draw_partner_menu BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_1 = 20, BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_2 = 21, @@ -4048,45 +4051,45 @@ enum BattlePartnerMenuSubstates { BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_4 = 23, BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_5 = 24, // Change Partner - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_1 = 30, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2 = 31, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3 = 32, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4 = 33, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5 = 34, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_6 = 35, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7 = 36, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_BUILD_MENU = 30, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING = 31, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_HANDOVER = 32, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU = 33, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CANCEL = 34, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CHOSEN = 35, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_ERROR = 36, // Items - BTL_SUBSTATE_PARTNER_MENU_ITEMS_1 = 40, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_2 = 41, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_3 = 42, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_4 = 43, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_5 = 44, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_6 = 45, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_BUILD_MENU = 40, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING = 41, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_HANDOVER = 42, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU = 43, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CANCEL = 44, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CHOSEN = 45, // Switch partner (unused) - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_1 = 50, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2 = 51, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3 = 52, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4 = 53, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5 = 54, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_6 = 55, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_7 = 56, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_BUILD_MENU = 50, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING = 51, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_HANDOVER = 52, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU = 53, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CANCEL = 54, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CHOSEN = 55, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_SHOW_ERROR = 56, // Focus - BTL_SUBSTATE_PARTNER_MENU_FOCUS_1 = 60, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_2 = 61, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_3 = 62, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_4 = 63, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_5 = 64, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_6 = 65, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_BUILD_MENU = 60, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING = 61, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER = 62, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU = 63, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_CANCELED = 64, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_SELECTED = 65, // Strategies - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_1 = 200, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2 = 201, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_3 = 202, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4 = 203, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_5 = 204, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6 = 205, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_BUILD_MENU = 200, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING = 201, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER = 202, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU = 203, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CANCEL = 204, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN = 205, // initialize - BTL_SUBSTATE_PARTNER_MENU_12D = 301, - BTL_SUBSTATE_PARTNER_MENU_INIT_MENU = 302, + BTL_SUBSTATE_PARTNER_MENU_PERFORM_SWAP = 301, + BTL_SUBSTATE_PARTNER_MENU_CREATE_MAIN_MENU = 302, }; enum BattleMessages { @@ -4202,45 +4205,44 @@ enum BattleMessageStates { // BattleMenuState enum BattleMenuStates { - BTL_MENU_STATE_OPENED_SUBMENU = -1, - BTL_MENU_STATE_CREATE = 0, - BTL_MENU_STATE_UNK_1 = 1, - BTL_MENU_STATE_ACCEPT_INPUT = 2, - BTL_MENU_STATE_UNK_A = 10, - BTL_MENU_STATE_UNK_B = 11, - BTL_MENU_STATE_UNK_14 = 20, - BTL_MENU_STATE_UNK_1E = 30, - BTL_MENU_STATE_SHOW_DISABLED_POPUP = 100, - BTL_MENU_STATE_AWAIT_DISABLED_POPUP = 101, + BTL_MENU_STATE_SUBMENU_OPEN = -1, + BTL_MENU_STATE_CREATE = 0, + BTL_MENU_STATE_SHOW_REEL = 1, + BTL_MENU_STATE_CHOOSING = 2, + BTL_MENU_STATE_HIDE_INIT = 10, + BTL_MENU_STATE_HIDE_HOLD = 11, + BTL_MENU_STATE_RESTORE = 20, + BTL_MENU_STATE_RESUME_SUBMENU = 30, + BTL_MENU_STATE_ERROR_SHOW = 100, + BTL_MENU_STATE_ERROR_DONE = 101, }; enum BattleMoveSubmenuStates { - BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_TWO = -2, // go back - BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE = -1, - BTL_SUBMENU_MOVES_STATE_UNK_0 = 0, - BTL_SUBMENU_MOVES_STATE_UNK_1 = 1, - BTL_SUBMENU_MOVES_STATE_UNK_A = 10, - BTL_SUBMENU_MOVES_STATE_UNK_B = 11, - BTL_SUBMENU_MOVES_STATE_UNK_14 = 20, - BTL_SUBMENU_MOVES_STATE_UNK_1E = 30, - BTL_SUBMENU_MOVES_STATE_UNK_28 = 40, - BTL_SUBMENU_MOVES_STATE_UNK_29 = 41, - BTL_SUBMENU_MOVES_STATE_UNK_2A = 42, + BTL_SUBMENU_MOVES_STATE_CANCEL = -2, // selection is canceled + BTL_SUBMENU_MOVES_STATE_SELECT = -1, // a result is selected + BTL_SUBMENU_MOVES_STATE_INIT = 0, // build and initialize the menu + BTL_SUBMENU_MOVES_STATE_CHOOSING = 1, // selecting an option + BTL_SUBMENU_MOVES_STATE_HIDE_INIT = 10, // begin hiding the menu, will quickly change to HIDE_HOLD + BTL_SUBMENU_MOVES_STATE_HIDE_HOLD = 11, + BTL_SUBMENU_MOVES_STATE_RESTORE = 20, // reappear and resume choosing + BTL_SUBMENU_MOVES_STATE_LOCK = 30, + BTL_SUBMENU_MOVES_STATE_ERROR_INIT = 40, + BTL_SUBMENU_MOVES_STATE_ERROR_SHOW = 41, + BTL_SUBMENU_MOVES_STATE_ERROR_DONE = 42, }; - enum BattleStratsSubmenuStates { - BTL_SUBMENU_STRATS_STATE_CANCEL = -2, // go back - BTL_SUBMENU_STRATS_STATE_SELECT = -1, // approve choice - BTL_SUBMENU_STRATS_STATE_INIT = 0, - BTL_SUBMENU_STRATS_STATE_CHOOSE = 1, - BTL_SUBMENU_STRATS_STATE_UNK_10 = 10, - BTL_SUBMENU_STRATS_STATE_UNK_11 = 11, - BTL_SUBMENU_STRATS_STATE_UNK_20 = 20, - BTL_SUBMENU_STRATS_STATE_UNK_30 = 30, - BTL_SUBMENU_STRATS_STATE_ERROR_INIT = 40, - BTL_SUBMENU_STRATS_STATE_ERROR_SHOW = 41, - BTL_SUBMENU_STRATS_STATE_ERROR_DONE = 42, + BTL_SUBMENU_STRATS_STATE_CANCEL = -2, // selection is canceled + BTL_SUBMENU_STRATS_STATE_SELECT = -1, // a result is selected + BTL_SUBMENU_STRATS_STATE_INIT = 0, // build and initialize the menu + BTL_SUBMENU_STRATS_STATE_CHOOSING = 1, // selecting an option + BTL_SUBMENU_STRATS_STATE_HIDE_INIT = 10, + BTL_SUBMENU_STRATS_STATE_HIDE_HOLD = 11, + BTL_SUBMENU_STRATS_STATE_RESTORE = 20, + BTL_SUBMENU_STRATS_STATE_LOCK = 30, + BTL_SUBMENU_STRATS_STATE_ERROR_INIT = 40, + BTL_SUBMENU_STRATS_STATE_ERROR_SHOW = 41, + BTL_SUBMENU_STRATS_STATE_ERROR_DONE = 42, }; enum BattleMenuIndex { diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index c8672ddf3aa..6b72c7ccf52 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -1248,7 +1248,7 @@ void btl_state_update_transfer_turn(void) { s32 oldKoDuration; - if (gBattleSubState == BTL_SUBSTATE_9_INIT) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_INIT) { if (!(gBattleStatus.flags2 & BS_FLAGS2_PLAYER_TURN_USED)) { btl_set_state(BATTLE_STATE_SWITCH_TO_PLAYER); return; @@ -1268,7 +1268,7 @@ void btl_state_update_transfer_turn(void) { partner->flags |= ACTOR_FLAG_USING_IDLE_ANIM; } - gBattleSubState = BTL_SUBSTATE_9_1; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_RESET_ENEMIES; BattleStatusUpdateDelay = 0; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; @@ -1276,7 +1276,7 @@ void btl_state_update_transfer_turn(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; } - if (gBattleSubState == BTL_SUBSTATE_9_1) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_RESET_ENEMIES) { waitingForScript = false; for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { actor = battleStatus->enemyActors[i]; @@ -1359,11 +1359,11 @@ void btl_state_update_transfer_turn(void) { } } } - gBattleSubState = BTL_SUBSTATE_9_2; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_AWAIT_ALL; } } - if (gBattleSubState == BTL_SUBSTATE_9_2) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_AWAIT_ALL) { // wait for player HandleEvent script to finish if(player->handleEventScript != nullptr && does_script_exist(player->handleEventScriptID)) { goto WAITING; @@ -1402,9 +1402,9 @@ void btl_state_update_transfer_turn(void) { btl_cam_use_preset(BTL_CAM_DEFAULT); if (partner == nullptr || !(gBattleStatus.flags1 & BS_FLAGS1_PLAYER_IN_BACK)) { - gBattleSubState = BTL_SUBSTATE_9_4; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_TRY_MERLEE_DEF; } else if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) { - gBattleSubState = BTL_SUBSTATE_9_4; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_TRY_MERLEE_DEF; } else { player->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; @@ -1426,12 +1426,12 @@ void btl_state_update_transfer_turn(void) { } state->moveTime = 4; state->angle = 0.0f; - gBattleSubState = BTL_SUBSTATE_9_3; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_RESET_POSITIONS; } } WAITING: - if (gBattleSubState == BTL_SUBSTATE_9_3) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_RESET_POSITIONS) { if (partner->state.moveTime != 0) { partner->curPos.x += (partner->state.goalPos.x - partner->curPos.x) / partner->state.moveTime; partner->curPos.z += (partner->state.goalPos.z - partner->curPos.z) / partner->state.moveTime; @@ -1460,12 +1460,12 @@ void btl_state_update_transfer_turn(void) { player->homePos.x = player->curPos.x; player->homePos.z = player->curPos.z; } - gBattleSubState = BTL_SUBSTATE_9_4; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_TRY_MERLEE_DEF; gBattleStatus.flags1 &= ~BS_FLAGS1_PLAYER_IN_BACK; } } - if (gBattleSubState == BTL_SUBSTATE_9_4) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_TRY_MERLEE_DEF) { if (BattleStatusUpdateDelay != 0) { BattleStatusUpdateDelay--; } else { @@ -1485,7 +1485,7 @@ void btl_state_update_transfer_turn(void) { partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; partner->flags |= ACTOR_FLAG_USING_IDLE_ANIM; } - gBattleSubState = BTL_SUBSTATE_9_5; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_NOTIFY_ENEMY_PHASE; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; @@ -1493,7 +1493,7 @@ void btl_state_update_transfer_turn(void) { } } - if (gBattleSubState == BTL_SUBSTATE_9_5) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_NOTIFY_ENEMY_PHASE) { if (player->takeTurnScript == nullptr || (does_script_exist(player->takeTurnScriptID) == 0)) { player->takeTurnScript = nullptr; @@ -1507,12 +1507,12 @@ void btl_state_update_transfer_turn(void) { script->owner1.enemyID = i | ACTOR_CLASS_ENEMY; } } - gBattleSubState = BTL_SUBSTATE_9_6; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_AWAIT_ENEMY_PHASE; } } waitingForScript = false; - if (gBattleSubState == BTL_SUBSTATE_9_6) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_AWAIT_ENEMY_PHASE) { for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { actor = battleStatus->enemyActors[i]; if (actor != nullptr && actor->handlePhaseSource != nullptr && does_script_exist(actor->handlePhaseScriptID)) { @@ -1520,11 +1520,11 @@ void btl_state_update_transfer_turn(void) { } } if (!waitingForScript) { - gBattleSubState = BTL_SUBSTATE_9_7; + gBattleSubState = BTL_SUBSTATE_TRANSFER_TURN_DONE; } } - if (gBattleSubState == BTL_SUBSTATE_9_7) { + if (gBattleSubState == BTL_SUBSTATE_TRANSFER_TURN_DONE) { btl_set_state(BATTLE_STATE_NEXT_ENEMY); } } @@ -1552,7 +1552,7 @@ void btl_state_update_prepare_menu(void) { btl_set_state(BATTLE_STATE_PARTNER_MENU); } else if (gBattleSubState == BATTLE_SUBSTATE_PREPARE_MENU_DIPPING) { btl_set_state(BATTLE_STATE_PLAYER_MENU); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_1; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_BUILD_MENU; } else { btl_set_state(BATTLE_STATE_PLAYER_MENU); } diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index 238faae5159..643ca14686b 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -369,7 +369,7 @@ s32 PartnerNameMessages[] = { #endif }; -BSS s32 D_802ACC60; +BSS s32 BattleMenu_ChooseDelay; BSS s32 BattleMenu_TargetPointerAlpha; BSS s32 BattleMenu_TargetNameOffsetX; // used to animate the position of the target name box BSS s32 BattleMenu_SwapDelay; // delay before the player and partner can swap after the main menu is opened @@ -548,12 +548,12 @@ void btl_main_menu_init(void) { // btl_main_menu_hide? (after begin targeting) void btl_main_menu_hide(void) { BattleMenu_ReelAppearTimer = 3; - BattleMenuState = BTL_MENU_STATE_UNK_A; + BattleMenuState = BTL_MENU_STATE_HIDE_INIT; } // (after submenu closed/cancelled) void btl_main_menu_resume_choose(void) { - BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; + BattleMenuState = BTL_MENU_STATE_CHOOSING; BattleMenu_ReelAlpha = 255; BattleMenuAlpha = 255; } @@ -561,13 +561,13 @@ void btl_main_menu_resume_choose(void) { // btl_main_menu_show? (canceling targeting -> main menu) void btl_main_menu_restore_choose(void) { BattleMenuAlpha = 255; - BattleMenuState = BTL_MENU_STATE_UNK_14; + BattleMenuState = BTL_MENU_STATE_RESTORE; } // btl_main_menu_show? (canceling targeting -> submenu) void btl_main_menu_restore_submenu(void) { BattleMenuAlpha = 100; - BattleMenuState = BTL_MENU_STATE_UNK_1E; + BattleMenuState = BTL_MENU_STATE_RESUME_SUBMENU; } void btl_main_menu_destroy(void) { @@ -710,10 +710,10 @@ s32 btl_main_menu_update(void) { hud_element_set_render_pos(hid, 102, 210); BattleMenu_ReelHidePercent = 100; BattleMenu_ReelAppearTimer = 3; - BattleMenuState = BTL_MENU_STATE_UNK_1; + BattleMenuState = BTL_MENU_STATE_SHOW_REEL; BattleMenu_WheelAngle = theta = BattleMenu_WheelBase * 28; break; - case BTL_MENU_STATE_UNK_1: + case BTL_MENU_STATE_SHOW_REEL: BattleMenu_ReelHidePercent = (BattleMenu_ReelAppearTimer * 100) / 3; switch (BattleMenu_ReelAppearTimer) { @@ -758,19 +758,19 @@ s32 btl_main_menu_update(void) { hud_element_set_alpha(hid, 180); hud_element_set_scale(hid, 0.85f); hud_element_clear_flags(hid, HUD_ELEMENT_FLAG_DISABLED); - BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; + BattleMenuState = BTL_MENU_STATE_CHOOSING; break; } break; - case BTL_MENU_STATE_ACCEPT_INPUT: + case BTL_MENU_STATE_CHOOSING: if (battleStatus->curButtonsPressed & BUTTON_A) { if (WheelOptionEnabled[BattleMenu_CurPos + BattleMenu_HomePos] == true) { sfx_play_sound(SOUND_MENU_NEXT); - BattleMenuState = BTL_MENU_STATE_OPENED_SUBMENU; + BattleMenuState = BTL_MENU_STATE_SUBMENU_OPEN; } else { sfx_play_sound(SOUND_MENU_ERROR); BattleMenu_ErrorCode = WheelOptionError[BattleMenu_CurPos + BattleMenu_HomePos]; - BattleMenuState = BTL_MENU_STATE_SHOW_DISABLED_POPUP; + BattleMenuState = BTL_MENU_STATE_ERROR_SHOW; } } else { BattleMenu_PrevPos = BattleMenu_CurPos; @@ -793,36 +793,36 @@ s32 btl_main_menu_update(void) { } } break; - case BTL_MENU_STATE_OPENED_SUBMENU: + case BTL_MENU_STATE_SUBMENU_OPEN: BattleMenuAlpha = 100; return BattleMenu_CurPos + BattleMenu_HomePos + 1; - case BTL_MENU_STATE_UNK_A: + case BTL_MENU_STATE_HIDE_INIT: BattleMenu_ReelAppearTimer = 0; BattleMenu_ReelAlpha = 0; - BattleMenuState = BTL_MENU_STATE_UNK_B; + BattleMenuState = BTL_MENU_STATE_HIDE_HOLD; return BattleMenu_CurPos + BattleMenu_HomePos + 1; - case BTL_MENU_STATE_UNK_B: + case BTL_MENU_STATE_HIDE_HOLD: return BattleMenu_CurPos + BattleMenu_HomePos + 1; - case BTL_MENU_STATE_UNK_14: + case BTL_MENU_STATE_RESTORE: BattleMenu_ReelAppearTimer = 3; BattleMenu_ReelAlpha = 255; - BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; + BattleMenuState = BTL_MENU_STATE_CHOOSING; return BattleMenu_CurPos + BattleMenu_HomePos + 1; - case BTL_MENU_STATE_UNK_1E: + case BTL_MENU_STATE_RESUME_SUBMENU: BattleMenu_ReelAppearTimer = 3; BattleMenu_ReelAlpha = 255; - BattleMenuState = BTL_MENU_STATE_OPENED_SUBMENU; + BattleMenuState = BTL_MENU_STATE_SUBMENU_OPEN; break; - case BTL_MENU_STATE_SHOW_DISABLED_POPUP: + case BTL_MENU_STATE_ERROR_SHOW: btl_show_battle_message(BattleMenu_ErrorCode, 90); - BattleMenuState = BTL_MENU_STATE_AWAIT_DISABLED_POPUP; + BattleMenuState = BTL_MENU_STATE_ERROR_DONE; break; - case BTL_MENU_STATE_AWAIT_DISABLED_POPUP: + case BTL_MENU_STATE_ERROR_DONE: if (btl_is_popup_displayed()) { break; } BattleMenu_ErrorCode = -1; - BattleMenuState = BTL_MENU_STATE_ACCEPT_INPUT; + BattleMenuState = BTL_MENU_STATE_CHOOSING; break; } return 0; @@ -845,7 +845,7 @@ void btl_main_menu_draw(void) { s32 l, t; switch (BattleMenuState) { - case BTL_MENU_STATE_UNK_1: + case BTL_MENU_STATE_SHOW_REEL: hud_element_draw_complex_hud_first(-1); id = HID_ProjectorReelB; hud_element_set_transform_rotation(id, 0.0f, 0.0f, 0.0f); @@ -857,11 +857,11 @@ void btl_main_menu_draw(void) { hud_element_set_render_pos(id, 40 - BattleMenu_ReelHidePercent, BattleMenu_ReelHidePercent + 212); hud_element_draw_complex_hud_next(id); break; - case BTL_MENU_STATE_OPENED_SUBMENU: - case BTL_MENU_STATE_ACCEPT_INPUT: - case BTL_MENU_STATE_UNK_A: - case BTL_MENU_STATE_UNK_14: - case BTL_MENU_STATE_UNK_1E: + case BTL_MENU_STATE_SUBMENU_OPEN: + case BTL_MENU_STATE_CHOOSING: + case BTL_MENU_STATE_HIDE_INIT: + case BTL_MENU_STATE_RESTORE: + case BTL_MENU_STATE_RESUME_SUBMENU: opacity = (BattleMenu_ReelAlpha * BattleMenuAlpha) / 255; hud_element_draw_complex_hud_first(-1); theta = (BattleMenu_WheelBase - BattleMenu_CurPos) * 28; @@ -1011,7 +1011,7 @@ void btl_submenu_moves_init(void) { MovesPrevSelected = MovesOptionCount - 1; } - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_0; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_INIT; MovesVisibleStart = 0; MovesCursorPos = MovesPrevSelected; MovesPrevCursorPos = MovesPrevSelected; @@ -1047,7 +1047,7 @@ void btl_submenu_moves_init(void) { } void btl_submenu_moves_hide(void) { - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_A; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_HIDE_INIT; } void btl_submenu_moves_destroy(void) { @@ -1116,7 +1116,7 @@ void btl_submenu_moves_resume_choose(void) { MovesTextColor = MSG_PAL_STANDARD; MovesDescVisible = 1; MovesTextAlpha = 255; - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_CHOOSING; } void btl_submenu_moves_restore_choose(void) { @@ -1155,12 +1155,12 @@ void btl_submenu_moves_restore_choose(void) { hud_element_set_script(HID_MovesCursor, &HES_AnimatedHandPointer); MovesTextColor = MSG_PAL_STANDARD; MovesDescVisible = 1; - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_14; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_RESTORE; } void btl_submenu_moves_restore_locked(void) { set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1E; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_LOCK; } #if VERSION_PAL @@ -1212,7 +1212,7 @@ s32 btl_submenu_moves_update(void) { s32 j; switch (MovesMenuState) { - case BTL_SUBMENU_MOVES_STATE_UNK_0: + case BTL_SUBMENU_MOVES_STATE_INIT: MovesScrollOffset = -MovesVisibleStart * 13; MovesCursorOffset = (MovesCursorPos - MovesVisibleStart) * 13; MovesMenuPosX = POS_X; @@ -1403,12 +1403,12 @@ s32 btl_submenu_moves_update(void) { } } while (cond); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_CHOOSING; MovesVisibleEnd = MovesVisibleStart + 6; MovesScrollOffset = -MovesVisibleStart * 13; MovesCursorOffset = (MovesCursorPos - MovesVisibleStart) * 13; break; - case BTL_SUBMENU_MOVES_STATE_UNK_1: + case BTL_SUBMENU_MOVES_STATE_CHOOSING: MovesPrevCursorPos = MovesCursorPos; if (battleStatus->curButtonsHeld & (BUTTON_STICK_UP | BUTTON_Z)) { if (MovesCursorPos > 0) { @@ -1460,7 +1460,7 @@ s32 btl_submenu_moves_update(void) { if (battleStatus->curButtonsPressed & BUTTON_A) { if (MovesOptionEnabled[MovesOptionIndexMap[MovesCursorPos]] == 1) { sfx_play_sound(SOUND_MENU_NEXT); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_SELECT; } else { sfx_play_sound(SOUND_MENU_ERROR); MovesErrorCode = 0; @@ -1468,7 +1468,7 @@ s32 btl_submenu_moves_update(void) { if (temp_v0_14 != 0) { MovesErrorCode = temp_v0_14; } - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_28; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_ERROR_INIT; } break; } @@ -1476,10 +1476,10 @@ s32 btl_submenu_moves_update(void) { if (battleStatus->curButtonsPressed & BUTTON_B) { sfx_play_sound(SOUND_MENU_BACK); btl_submenu_moves_destroy(); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_TWO; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_CANCEL; } break; - case BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE: + case BTL_SUBMENU_MOVES_STATE_SELECT: for (i = 0; i < MovesOptionCount; i++) { hid = MovesOptionHIDs[i]; hud_element_set_tint(hid, 160, 160, 160); @@ -1512,14 +1512,14 @@ s32 btl_submenu_moves_update(void) { } SelectedMovesIndex = MovesCursorPos; return MovesOptionIndexMap[MovesCursorPos] + 1; - case BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_TWO: + case BTL_SUBMENU_MOVES_STATE_CANCEL: if (!UsingSpiritsSubmenu) { status_bar_stop_blinking_fp(); } else { status_bar_stop_blinking_sp(); } - return 255; - case BTL_SUBMENU_MOVES_STATE_UNK_A: + return POPUP_RESULT_CANCEL; + case BTL_SUBMENU_MOVES_STATE_HIDE_INIT: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_HIDE); if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_HIDE); @@ -1534,13 +1534,13 @@ s32 btl_submenu_moves_update(void) { } else { status_bar_stop_blinking_sp(); } - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_B; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_HIDE_HOLD; SelectedMovesIndex = MovesCursorPos; return MovesOptionIndexMap[MovesCursorPos] + 1; - case BTL_SUBMENU_MOVES_STATE_UNK_B: + case BTL_SUBMENU_MOVES_STATE_HIDE_HOLD: SelectedMovesIndex = MovesCursorPos; return MovesOptionIndexMap[MovesCursorPos] + 1; - case BTL_SUBMENU_MOVES_STATE_UNK_14: + case BTL_SUBMENU_MOVES_STATE_RESTORE: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_SHOW); if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_SHOW); @@ -1550,10 +1550,10 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_SHOW); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_CHOOSING; SelectedMovesIndex = MovesCursorPos; return MovesOptionIndexMap[MovesCursorPos] + 1; - case BTL_SUBMENU_MOVES_STATE_UNK_1E: + case BTL_SUBMENU_MOVES_STATE_LOCK: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_9); if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_9); @@ -1563,13 +1563,13 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_9); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_SELECT; break; - case BTL_SUBMENU_MOVES_STATE_UNK_28: + case BTL_SUBMENU_MOVES_STATE_ERROR_INIT: SelectedMovesIndex = -1; - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_29; - return -1; - case BTL_SUBMENU_MOVES_STATE_UNK_29: + MovesMenuState = BTL_SUBMENU_MOVES_STATE_ERROR_SHOW; + return POPUP_RESULT_INVALID; + case BTL_SUBMENU_MOVES_STATE_ERROR_SHOW: set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_HIDE); if (!UsingSpiritsSubmenu) { set_window_update(WIN_BTL_MOVES_TITLE, WINDOW_UPDATE_HIDE); @@ -1598,15 +1598,15 @@ s32 btl_submenu_moves_update(void) { #endif set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_SHOW); MovesErrorTimer = 60; - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_2A; - return -1; - case BTL_SUBMENU_MOVES_STATE_UNK_2A: + MovesMenuState = BTL_SUBMENU_MOVES_STATE_ERROR_DONE; + return POPUP_RESULT_INVALID; + case BTL_SUBMENU_MOVES_STATE_ERROR_DONE: if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) { MovesErrorTimer = 0; } if (MovesErrorTimer != 0) { MovesErrorTimer--; - return -1; + return POPUP_RESULT_INVALID; } set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_SHOW); @@ -1618,10 +1618,10 @@ s32 btl_submenu_moves_update(void) { set_window_update(WIN_BTL_SPIRITS_ICON, WINDOW_UPDATE_SHOW); } set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - MovesMenuState = BTL_SUBMENU_MOVES_STATE_UNK_1; + MovesMenuState = BTL_SUBMENU_MOVES_STATE_CHOOSING; break; } - return 0; + return POPUP_RESULT_CHOOSING; } #if VERSION_IQUE @@ -1678,13 +1678,13 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { s32 i; switch (MovesMenuState) { - case -1: - case 1: - case 10: - case 20: - case 30: - case 40: - case 41: + case BTL_SUBMENU_MOVES_STATE_SELECT: + case BTL_SUBMENU_MOVES_STATE_CHOOSING: + case BTL_SUBMENU_MOVES_STATE_HIDE_INIT: + case BTL_SUBMENU_MOVES_STATE_RESTORE: + case BTL_SUBMENU_MOVES_STATE_LOCK: + case BTL_SUBMENU_MOVES_STATE_ERROR_INIT: + case BTL_SUBMENU_MOVES_STATE_ERROR_SHOW: yPos = -MovesVisibleStart * 13; var_t0 = MovesScrollOffset; temp_f6 = (yPos - var_t0) * 0.5; @@ -1925,11 +1925,11 @@ void btl_menu_moves_show_icon(void* data, s32 x, s32 y) { void btl_menu_moves_show_desc(void* data, s32 x, s32 y) { switch (MovesMenuState) { - case BTL_SUBMENU_MOVES_STATE_UNK_NEGATIVE_ONE: - case BTL_SUBMENU_MOVES_STATE_UNK_1: - case BTL_SUBMENU_MOVES_STATE_UNK_A: - case BTL_SUBMENU_MOVES_STATE_UNK_14: - case BTL_SUBMENU_MOVES_STATE_UNK_1E: + case BTL_SUBMENU_MOVES_STATE_SELECT: + case BTL_SUBMENU_MOVES_STATE_CHOOSING: + case BTL_SUBMENU_MOVES_STATE_HIDE_INIT: + case BTL_SUBMENU_MOVES_STATE_RESTORE: + case BTL_SUBMENU_MOVES_STATE_LOCK: if (MovesDescVisible != 0) { draw_msg(MovesOptionDesc[MovesOptionIndexMap[MovesCursorPos]], x + 8, y, MovesTextAlpha, MovesTextColor, 0); @@ -2012,7 +2012,7 @@ void btl_menu_strats_init(void) { } void btl_submenu_strats_hide(void) { - StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_10; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_HIDE_INIT; } void btl_submenu_strats_destroy(void) { @@ -2048,7 +2048,7 @@ void btl_submenu_strats_resume_choose(void) { StratsTextColor = MSG_PAL_STANDARD; StratsDescVisible = 1; StratsTextAlpha = 255; - StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSING; } void btl_submenu_strats_restore_choose(void) { @@ -2068,14 +2068,14 @@ void btl_submenu_strats_restore_choose(void) { hud_element_set_script(HID_StratsCursor, &HES_AnimatedHandPointer); StratsTextColor = MSG_PAL_STANDARD; StratsDescVisible = 1; - StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_20; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_RESTORE; } void btl_submenu_strats_restore_locked(void) { set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_TRANSPARENT); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_30; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_LOCK; } #if VERSION_JP @@ -2150,9 +2150,9 @@ s32 btl_submenu_strats_update(void) { set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; - return 0; - case BTL_SUBMENU_STRATS_STATE_CHOOSE: + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSING; + return POPUP_RESULT_CHOOSING; + case BTL_SUBMENU_STRATS_STATE_CHOOSING: if (!ShowingErrorMessage) { StratsPrevCursorPos = StratsCursorPos; @@ -2212,7 +2212,7 @@ s32 btl_submenu_strats_update(void) { StratsMenuState = BTL_SUBMENU_STRATS_STATE_CANCEL; } } - return 0; + return POPUP_RESULT_CHOOSING; case BTL_SUBMENU_STRATS_STATE_SELECT: for (i = 0; i < StratsOptionCount; i++) { hud_element_set_tint(StratsOptionHIDs[i], 160, 160, 160); @@ -2227,31 +2227,31 @@ s32 btl_submenu_strats_update(void) { set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); return StratsCursorPos + 1; case BTL_SUBMENU_STRATS_STATE_CANCEL: - return 255; - case 10: + return POPUP_RESULT_CANCEL; + case BTL_SUBMENU_STRATS_STATE_HIDE_INIT: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); - StratsMenuState = BTL_SUBMENU_STRATS_STATE_UNK_11; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_HIDE_HOLD; return StratsCursorPos + 1; - case 11: + case BTL_SUBMENU_STRATS_STATE_HIDE_HOLD: return StratsCursorPos + 1; - case 20: + case BTL_SUBMENU_STRATS_STATE_RESTORE: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSING; return StratsCursorPos + 1; - case 30: + case BTL_SUBMENU_STRATS_STATE_LOCK: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); StratsMenuState = BTL_SUBMENU_STRATS_STATE_SELECT; - return 0; + return POPUP_RESULT_CHOOSING; case BTL_SUBMENU_STRATS_STATE_ERROR_INIT: D_802AD6D4 = -1; StratsMenuState = BTL_SUBMENU_STRATS_STATE_ERROR_SHOW; - return -1; + return POPUP_RESULT_INVALID; case BTL_SUBMENU_STRATS_STATE_ERROR_SHOW: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); @@ -2278,23 +2278,23 @@ s32 btl_submenu_strats_update(void) { set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_SHOW); StratsErrorTimer = 60; StratsMenuState = BTL_SUBMENU_STRATS_STATE_ERROR_DONE; - return -1; + return POPUP_RESULT_INVALID; case BTL_SUBMENU_STRATS_STATE_ERROR_DONE: if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) { StratsErrorTimer = 0; } if (StratsErrorTimer != 0) { StratsErrorTimer--; - return -1; + return POPUP_RESULT_INVALID; } set_window_update(WIN_BTL_POPUP, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_SHOW); set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_SHOW); - StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSE; - return 0; + StratsMenuState = BTL_SUBMENU_STRATS_STATE_CHOOSING; + return POPUP_RESULT_CHOOSING; } - return 0; + return POPUP_RESULT_CHOOSING; } #if VERSION_IQUE @@ -2321,10 +2321,10 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { switch (StratsMenuState) { case BTL_SUBMENU_STRATS_STATE_SELECT: - case BTL_SUBMENU_STRATS_STATE_CHOOSE: - case BTL_SUBMENU_STRATS_STATE_UNK_10: - case BTL_SUBMENU_STRATS_STATE_UNK_20: - case BTL_SUBMENU_STRATS_STATE_UNK_30: + case BTL_SUBMENU_STRATS_STATE_CHOOSING: + case BTL_SUBMENU_STRATS_STATE_HIDE_INIT: + case BTL_SUBMENU_STRATS_STATE_RESTORE: + case BTL_SUBMENU_STRATS_STATE_LOCK: case BTL_SUBMENU_STRATS_STATE_ERROR_INIT: case BTL_SUBMENU_STRATS_STATE_ERROR_SHOW: yPos = -StratsVisibleStart * 13; @@ -2417,10 +2417,10 @@ void btl_menu_strats_show_title(void* data, s32 x, s32 y) { void btl_menu_strats_show_desc(void* data, s32 x, s32 y) { switch (StratsMenuState) { case BTL_SUBMENU_STRATS_STATE_SELECT: - case BTL_SUBMENU_STRATS_STATE_CHOOSE: - case BTL_SUBMENU_STRATS_STATE_UNK_10: - case BTL_SUBMENU_STRATS_STATE_UNK_20: - case BTL_SUBMENU_STRATS_STATE_UNK_30: + case BTL_SUBMENU_STRATS_STATE_CHOOSING: + case BTL_SUBMENU_STRATS_STATE_HIDE_INIT: + case BTL_SUBMENU_STRATS_STATE_RESTORE: + case BTL_SUBMENU_STRATS_STATE_LOCK: if (StratsDescVisible != 0) { draw_msg(StratsOptionMessage[StratsCursorPos], x + 8, y, StratsTextAlpha, StratsTextColor, 0); } @@ -2812,11 +2812,11 @@ void btl_state_update_player_menu(void) { BattleMenu_ShowSwapIcons = false; } btl_main_menu_init(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 0; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY: + case BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING: if (battleStatus->hustleTurns != 0) { set_actor_anim(ACTOR_PLAYER, 0, ANIM_Mario1_ThinkingRun); } else { @@ -2838,20 +2838,20 @@ void btl_state_update_player_menu(void) { break; } - if (D_802ACC60 != 0) { - D_802ACC60--; + if (BattleMenu_ChooseDelay != 0) { + BattleMenu_ChooseDelay--; break; } - if (submenuResult == 0) { + if (submenuResult == POPUP_RESULT_CHOOSING) { break; } set_actor_anim(ACTOR_PLAYER, 0, ANIM_Mario1_Walk); battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->curSubmenu = WheelOptionSubmenu[submenuResult - 1]; for (i = 0; i < ARRAY_COUNT(battleStatus->submenuMoves); i++) { - battleStatus->submenuMoves[i] = 0; - battleStatus->submenuIcons[0] = 0; /// @bug ? + battleStatus->submenuMoves[i] = MOVE_NONE; + battleStatus->submenuIcons[0] = ITEM_NONE; /// @bug ? battleStatus->submenuStatus[i] = 0; } @@ -2991,13 +2991,13 @@ void btl_state_update_player_menu(void) { currentSubmenu = battleStatus->curSubmenu; if (currentSubmenu == BTL_MENU_TYPE_STAR_POWERS) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_1; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_BUILD_MENU; btl_state_update_player_menu(); btl_state_update_player_menu(); break; } else if (currentSubmenu == BTL_MENU_TYPE_STRATEGIES) { if (battleStatus->actionCommandMode != AC_MODE_TUTORIAL && !(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE)) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_BUILD_STRATEGIES; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_BUILD_MENU; btl_state_update_player_menu(); btl_state_update_player_menu(); break; @@ -3012,10 +3012,10 @@ void btl_state_update_player_menu(void) { } else { if (battleStatus->submenuMoveCount == 0) { if (currentSubmenu != BTL_MENU_TYPE_ITEMS) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_10; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_SHOW; break; } else { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_1; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_BUILD_MENU; btl_state_update_player_menu(); btl_state_update_player_menu(); break; @@ -3093,20 +3093,20 @@ void btl_state_update_player_menu(void) { MovesPrevSelected = initialPos; MovesOptionCount = battleStatus->submenuMoveCount; btl_submenu_moves_init(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING; break; } break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING: submenuResult = btl_submenu_moves_update(); - if (submenuResult == -1) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_7; - } else if (submenuResult == 0) { - } else if (submenuResult == 255) { + if (submenuResult == POPUP_RESULT_INVALID) { + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_SHOW_ERROR; + } else if (submenuResult == POPUP_RESULT_CHOOSING) { + } else if (submenuResult == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { @@ -3122,7 +3122,7 @@ void btl_state_update_player_menu(void) { if (battleStatus->curSubmenu == BTL_MENU_TYPE_ITEMS) { battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_ITEMS] = SelectedMovesIndex; if (battleStatus->curSubmenu == currentSubmenu2) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_1; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_BUILD_MENU; btl_state_update_player_menu(); btl_state_update_player_menu(); break; @@ -3130,22 +3130,22 @@ void btl_state_update_player_menu(void) { } btl_submenu_moves_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MOVE_CHOOSE_TARGET; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_HANDOVER; } break; - case BTL_SUBSTATE_PLAYER_MENU_MOVE_CHOOSE_TARGET: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_HANDOVER: submenuResult = btl_submenu_moves_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == POPUP_RESULT_CHOOSING) { btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_REOPEN_MENU; break; } if (btl_main_menu_update() == 0) { break; } - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CANCEL; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CHOSEN; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CHOSEN; battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastSelectedAbility]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastSelectedAbility]].flags; currentSubmenu = battleStatus->curSubmenu; @@ -3168,25 +3168,25 @@ void btl_state_update_player_menu(void) { break; } break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_REOPEN_MENU: btl_submenu_moves_update(); if (btl_main_menu_update() == 0) { break; } - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CANCEL: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CANCEL: btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_REOPEN_MENU; break; - case BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CHOSEN: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CHOSEN: btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_7: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_SHOW_ERROR: if (btl_submenu_moves_update() != -1) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING; } break; case BTL_SUBSTATE_PLAYER_MENU_MAIN_SHOW_CANT_SWAP: @@ -3203,22 +3203,22 @@ void btl_state_update_player_menu(void) { break; } ShowingErrorMessage = false; - D_802ACC60 = 0; + BattleMenu_ChooseDelay = 0; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_10: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_SHOW: btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_11; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_HANDOVER; break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_11: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_HANDOVER: submenuResult = btl_main_menu_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == POPUP_RESULT_CHOOSING) { btl_main_menu_restore_choose(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12; - } else if (submenuResult != 0) { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_13; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_14; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_RETURN_MAIN; + } else if (submenuResult != POPUP_RESULT_CHOOSING) { + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CHOSEN; switch (battleStatus->curSubmenu) { case BTL_MENU_TYPE_JUMP: battleStatus->moveCategory = BTL_MENU_TYPE_JUMP; @@ -3240,22 +3240,22 @@ void btl_state_update_player_menu(void) { } break; CASE_C: - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_RETURN_MAIN: if (btl_main_menu_update() == 0) { break; } - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_13: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CANCEL: btl_main_menu_restore_choose(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_RETURN_MAIN; break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_14: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CHOSEN: btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_1: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_BUILD_MENU: if (battleStatus->selectedMoveID == MOVE_DOUBLE_DIP) { battleStatus->itemUsesLeft = 2; } @@ -3306,15 +3306,15 @@ void btl_state_update_player_menu(void) { popup->initialPos = initialPos; create_battle_popup_menu(popup); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSING: if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { btl_submenu_moves_resume_choose(); battleStatus->selectedMoveID = 0; battleStatus->itemUsesLeft = 0; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { @@ -3329,17 +3329,17 @@ void btl_state_update_player_menu(void) { hide_popup_menu(); btl_submenu_moves_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_HANDOVER; } } break; - case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_HANDOVER: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); btl_submenu_moves_restore_locked(); btl_main_menu_restore_submenu(); battleStatus->selectedMoveID = 0; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_REOPEN_MENU; } else { btl_submenu_moves_update(); if (btl_main_menu_update()) { @@ -3347,10 +3347,10 @@ void btl_state_update_player_menu(void) { } } break; - case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_REOPEN_MENU: btl_submenu_moves_update(); if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSING; } break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL: @@ -3358,14 +3358,14 @@ void btl_state_update_player_menu(void) { btl_submenu_moves_restore_locked(); btl_main_menu_restore_submenu(); btl_submenu_moves_update(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_REOPEN_MENU; break; case BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CHOSEN: destroy_popup_menu(); btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_1: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_BUILD_MENU: entryIdx = 0; for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { if (playerData->invItems[i] == ITEM_NONE) { @@ -3403,20 +3403,20 @@ void btl_state_update_player_menu(void) { popup->initialPos = initialPos; create_battle_popup_menu(popup); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_2: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_CHOOSING: if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ITEMS_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ITEMS_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CHOSEN; battleStatus->lastSelectedItem = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; battleStatus->moveArgument = battleStatus->lastSelectedItem; @@ -3426,36 +3426,36 @@ void btl_state_update_player_menu(void) { battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1; hide_popup_menu(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_3; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_HANDOVER; } } break; - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_3: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_HANDOVER: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_REOPEN_MENU; } else { if (btl_main_menu_update() != 0) { btl_set_state(BATTLE_STATE_SELECT_TARGET); } } break; - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_4: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_REOPEN_MENU: if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_5: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CANCEL: show_popup_menu(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_ITEMS_REOPEN_MENU; break; - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_6: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CHOSEN: destroy_popup_menu(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_1: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_BUILD_MENU: for (i = 0; i < battleStatus->submenuMoveCount; i++) { moveData = &gMoveTable[battleStatus->submenuMoves[i]]; MovesOptionError[i] = 0; @@ -3499,18 +3499,18 @@ void btl_state_update_player_menu(void) { MovesPrevSelected = initialPos; UsingSpiritsSubmenu = true; btl_submenu_moves_init(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_CHOOSING: submenuResult = btl_submenu_moves_update(); - if (submenuResult == -1) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_7; - } else if (submenuResult == 0) { - } else if (submenuResult == 255) { + if (submenuResult == POPUP_RESULT_INVALID) { + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_SHOW_ERROR; + } else if (submenuResult == POPUP_RESULT_CHOOSING) { + } else if (submenuResult == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { @@ -3518,18 +3518,18 @@ void btl_state_update_player_menu(void) { battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STAR_POWER] = SelectedMovesIndex; btl_submenu_moves_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_3; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_HANDOVER; } break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_3: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_HANDOVER: submenuResult = btl_submenu_moves_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == POPUP_RESULT_CHOOSING) { btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CHOSEN; battleStatus->moveCategory = BTL_MENU_TYPE_STAR_POWERS; battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastSelectedAbility]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastSelectedAbility]].flags; @@ -3540,27 +3540,27 @@ void btl_state_update_player_menu(void) { btl_set_state(BATTLE_STATE_SELECT_TARGET); } break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_REOPEN_MENU: btl_submenu_moves_update(); if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CANCEL: btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_REOPEN_MENU; break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_6: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CHOSEN: btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_7: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_SHOW_ERROR: if (btl_submenu_moves_update() != -1) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_1: + case BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_BUILD_MENU: if (!btl_player_can_act()) { battleStatus->itemUsesLeft = 1; btl_set_state(BATTLE_STATE_END_PLAYER_TURN); @@ -3614,18 +3614,18 @@ void btl_state_update_player_menu(void) { popup->initialPos = initialPos; create_battle_popup_menu(popup); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_CHOOSING; } } break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_2: + case BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_CHOOSING: if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { battleStatus->itemUsesLeft = 1; btl_set_state(BATTLE_STATE_END_PLAYER_TURN); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_DIPPING_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_DIPPING_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_TARGET_CHOSEN; battleStatus->lastSelectedItem = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; battleStatus->moveArgument = battleStatus->lastSelectedItem; @@ -3633,31 +3633,31 @@ void btl_state_update_player_menu(void) { battleStatus->curAttackElement = 0; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1; hide_popup_menu(); - D_802ACC60 = 5; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_3; + BattleMenu_ChooseDelay = 5; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_HANDOVER; } } break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_3: - if (D_802ACC60 != 0) { - D_802ACC60--; + case BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_HANDOVER: + if (BattleMenu_ChooseDelay != 0) { + BattleMenu_ChooseDelay--; } else { btl_set_state(BATTLE_STATE_SELECT_TARGET); } break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_4: - if (D_802ACC60 != 0) { - D_802ACC60--; + case BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_REOPEN_MENU: + if (BattleMenu_ChooseDelay != 0) { + BattleMenu_ChooseDelay--; } else { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_5: + case BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_TARGET_CANCEL: show_popup_menu(); - D_802ACC60 = 5; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_DIPPING_4; + BattleMenu_ChooseDelay = 5; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_REOPEN_MENU; break; - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_6: + case BTL_SUBSTATE_PLAYER_MENU_NEXT_DIP_TARGET_CHOSEN: destroy_popup_menu(); break; case BTL_SUBSTATE_PLAYER_MENU_BERSERKER_CHOOSE: @@ -3705,7 +3705,7 @@ void btl_state_update_player_menu(void) { btl_set_state(BATTLE_STATE_PLAYER_MOVE); } break; - case BTL_SUBSTATE_PLAYER_MENU_BUILD_STRATEGIES: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_BUILD_MENU: entryIdx = 0; btl_check_can_change_partner(); @@ -3752,96 +3752,96 @@ void btl_state_update_player_menu(void) { StratsOptionCount = entryIdx; StratsPrevSelected = initialPos; btl_menu_strats_init(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_CHOOSING: submenuResult = btl_submenu_strats_update(); - if (submenuResult == -1) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_8; - } else if (submenuResult == 0) { - } else if (submenuResult == 255) { + if (submenuResult == POPUP_RESULT_INVALID) { + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_SHOW_ERROR; + } else if (submenuResult == POPUP_RESULT_CHOOSING) { + } else if (submenuResult == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { battleStatus->curSubmenu = StratsOptionMenuTypes[submenuResult - 1]; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_STRATEGY] = submenuResult - 1; - if (battleStatus->curSubmenu == 5) { // change partner - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_1; + if (battleStatus->curSubmenu == BTL_MENU_TYPE_CHANGE_PARTNER) { + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_BUILD_MENU; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { btl_submenu_strats_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_3; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_HANDOVER; } } break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_3: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_HANDOVER: submenuResult = btl_submenu_strats_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && submenuResult == POPUP_RESULT_CHOOSING) { btl_submenu_strats_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN; switch (battleStatus->curSubmenu) { - case 3: - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6; + case BTL_MENU_TYPE_RUN_AWAY: + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN; btl_state_update_player_menu(); battleStatus->moveCategory = BTL_MENU_TYPE_RUN_AWAY; battleStatus->selectedMoveID = MOVE_RUN_AWAY; btl_set_state(BATTLE_STATE_RUN_AWAY); break; - case 9: + case BTL_MENU_TYPE_DO_NOTHING: battleStatus->hustleTurns = 0; gBattleStatus.flags1 &= ~BS_FLAGS1_HUSTLED; gBattleSubState = battleStatus->acceptTargetMenuSubstate; btl_state_update_player_menu(); btl_set_state(BATTLE_STATE_END_PLAYER_TURN); break; - case 4: - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6; + case BTL_MENU_TYPE_DEFEND: + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN; btl_state_update_player_menu(); battleStatus->selectedMoveID = MOVE_DEFEND; battleStatus->moveCategory = BTL_MENU_TYPE_DEFEND; btl_set_state(BATTLE_STATE_DEFEND); break; - case 10: - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6; + case BTL_MENU_TYPE_ACT_LATER: + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN; btl_state_update_player_menu(); btl_set_state(BATTLE_STATE_SWITCH_TO_PARTNER); break; } } break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_REOPEN_MENU: btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_5: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CANCEL: btl_submenu_strats_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_REOPEN_MENU; break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN: btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_8: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_SHOW_ERROR: if (btl_submenu_strats_update() != -1) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_1: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_BUILD_MENU: entryIdx = 0; for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) { s32 partnerId = PartnerIDFromMenuIndex[i]; @@ -3870,20 +3870,20 @@ void btl_state_update_player_menu(void) { popup->titleNumber = 0; create_battle_popup_menu(popup); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_CHOOSING; break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_CHOOSING: if (popup->result == POPUP_RESULT_INVALID) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_ERROR; } else if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { btl_submenu_strats_resume_choose(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_CHOOSING; btl_state_update_player_menu(); btl_state_update_player_menu(); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CHOSEN; battleStatus->lastSelectedPartner = popup->userIndex[popup->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; battleStatus->selectedMoveID = MOVE_CHANGE_PARTNER; @@ -3893,16 +3893,16 @@ void btl_state_update_player_menu(void) { hide_popup_menu(); btl_submenu_strats_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_HANDOVER; } } break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_HANDOVER: if ((battleStatus->curButtonsPressed & BUTTON_B) && popup->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); btl_submenu_strats_restore_locked(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_REOPEN_MENU; } else { btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { @@ -3912,30 +3912,30 @@ void btl_state_update_player_menu(void) { } } break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_REOPEN_MENU: btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_CHOOSING; } break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CANCEL: show_popup_menu(); btl_submenu_strats_restore_locked(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_REOPEN_MENU; break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_6: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CHOSEN: destroy_popup_menu(); btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_ERROR: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); if (popup->result != POPUP_RESULT_INVALID) { set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_9); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_9); - gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; + gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_CHOOSING; } break; } @@ -3943,53 +3943,53 @@ void btl_state_update_player_menu(void) { void btl_state_draw_player_menu(void) { switch (gBattleSubState) { - case BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY: + case BTL_SUBSTATE_PLAYER_MENU_MAIN_CHOOSING: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_2: - case BTL_SUBSTATE_PLAYER_MENU_MOVE_CHOOSE_TARGET: - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_4: - case BTL_SUBSTATE_PLAYER_MENU_MOVE_TARGET_CANCEL: - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_10: - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_11: - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_12: - case BTL_SUBSTATE_PLAYER_MENU_MAIN_MENU_13: - case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_1: - case BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSE_TARGET: - case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_3: - case BTL_SUBSTATE_PLAYER_MENU_UNKNOWN_4: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_CHOOSING: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_HANDOVER: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_REOPEN_MENU: + case BTL_SUBSTATE_PLAYER_MENU_ABILITIES_TARGET_CANCEL: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_SHOW: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_HANDOVER: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_RETURN_MAIN: + case BTL_SUBSTATE_PLAYER_MENU_NOSUBMENU_TARGET_CANCEL: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_BUILD_MENU: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_CHOOSING: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_HANDOVER: + case BTL_SUBSTATE_PLAYER_MENU_DIPPING_REOPEN_MENU: case BTL_SUBSTATE_PLAYER_MENU_DIPPING_TARGET_CANCEL: - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_1: - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2: - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_3: - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_4: - case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_5: - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_1: - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_2: - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_3: - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_4: - case BTL_SUBSTATE_PLAYER_MENU_ITEMS_5: - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_2: - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_3: - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_4: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_BUILD_MENU: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_CHOOSING: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_HANDOVER: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_REOPEN_MENU: + case BTL_SUBSTATE_PLAYER_MENU_CHANGE_PARTNER_TARGET_CANCEL: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_BUILD_MENU: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_CHOOSING: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_HANDOVER: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_REOPEN_MENU: + case BTL_SUBSTATE_PLAYER_MENU_ITEMS_TARGET_CANCEL: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_CHOOSING: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_HANDOVER: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_REOPEN_MENU: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_5: - case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_6: - case BTL_SUBSTATE_PLAYER_MENU_BUILD_STRATEGIES: - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_2: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CANCEL: + case BTL_SUBSTATE_PLAYER_MENU_STAR_SPIRITS_TARGET_CHOSEN: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_BUILD_MENU: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_CHOOSING: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_3: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_HANDOVER: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_4: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_REOPEN_MENU: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_5: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CANCEL: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_6: + case BTL_SUBSTATE_PLAYER_MENU_STRATEGIES_TARGET_CHOSEN: btl_main_menu_draw(); break; } @@ -4020,9 +4020,9 @@ void btl_state_update_partner_menu(void) { playerActor->flags &= ~(ACTOR_FLAG_USING_IDLE_ANIM | ACTOR_FLAG_SHOW_STATUS_ICONS); partnerActor->flags &= ~(ACTOR_FLAG_USING_IDLE_ANIM | ACTOR_FLAG_SHOW_STATUS_ICONS); if (battleStatus->flags1 & BS_FLAGS1_PLAYER_IN_BACK) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_INIT_MENU; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CREATE_MAIN_MENU; } else { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_12D; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_PERFORM_SWAP; partnerActor->state.curPos.x = partnerActor->homePos.x; partnerActor->state.curPos.z = partnerActor->homePos.z; partnerActor->state.goalPos.x = playerActor->homePos.x; @@ -4032,7 +4032,7 @@ void btl_state_update_partner_menu(void) { } } } - if (gBattleSubState == BTL_SUBSTATE_PARTNER_MENU_12D) { + if (gBattleSubState == BTL_SUBSTATE_PARTNER_MENU_PERFORM_SWAP) { if (partnerActor->state.moveTime != 0) { partnerActor->curPos.x += (partnerActor->state.goalPos.x - partnerActor->curPos.x) / partnerActor->state.moveTime; partnerActor->curPos.z += (partnerActor->state.goalPos.z - partnerActor->curPos.z) / partnerActor->state.moveTime; @@ -4047,7 +4047,7 @@ void btl_state_update_partner_menu(void) { if (partnerActor->state.moveTime != 0) { partnerActor->state.moveTime--; } else { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_INIT_MENU; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CREATE_MAIN_MENU; partnerActor->curPos.x = partnerActor->state.goalPos.x; partnerActor->curPos.z = partnerActor->state.goalPos.z; playerActor->curPos.x = partnerActor->state.curPos.x; @@ -4060,7 +4060,7 @@ void btl_state_update_partner_menu(void) { } } switch (gBattleSubState) { - case BTL_SUBSTATE_PARTNER_MENU_INIT_MENU: + case BTL_SUBSTATE_PARTNER_MENU_CREATE_MAIN_MENU: partnerActor->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS; partnerActor->flags &= ~ACTOR_FLAG_USING_IDLE_ANIM; playerActor->flags |= ACTOR_FLAG_USING_IDLE_ANIM; @@ -4139,17 +4139,17 @@ void btl_state_update_partner_menu(void) { BattleMenu_ShowSwapIcons = false; } btl_main_menu_init(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 0; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; return; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN: set_actor_anim(ACTOR_PARTNER, 0, PartnerThinkAnims[playerData->curPartner]); #if VERSION_PAL btl_init_menu_partner(); #endif - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_2; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_2: + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_CHOOSING; + case BTL_SUBSTATE_PARTNER_MENU_MAIN_CHOOSING: entryIdx = btl_main_menu_update(); if (BattleMenu_SwapDelay != 0) { @@ -4167,44 +4167,44 @@ void btl_state_update_partner_menu(void) { break; } - if (D_802ACC60 != 0) { - D_802ACC60--; + if (BattleMenu_ChooseDelay != 0) { + BattleMenu_ChooseDelay--; } else if (entryIdx != 0) { set_actor_anim(ACTOR_PARTNER, 0, PartnerIdleAnims[playerData->curPartner]); battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->curPartnerSubmenu = WheelOptionSubmenu[entryIdx - 1]; if (battleStatus->curPartnerSubmenu == 7) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_BUILD_MENU; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else if (battleStatus->curPartnerSubmenu == 6) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_BUILD_MENU; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else if (battleStatus->curPartnerSubmenu == 8) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_BUILD_MENU; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else if (battleStatus->curPartnerSubmenu == 2) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_BUILD_MENU; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else if (battleStatus->curPartnerSubmenu == 5) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_BUILD_MENU; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CHOSEN; btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_3: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER: entryIdx = btl_main_menu_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { btl_main_menu_restore_choose(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU; return; } if (entryIdx != 0) { @@ -4216,18 +4216,18 @@ void btl_state_update_partner_menu(void) { return; } break; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU: if (btl_main_menu_update() != 0) { - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; } break; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_5: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CANCEL: btl_main_menu_restore_choose(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_6: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CHOSEN: btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_MAIN_SHOW_CANT_SWAP: @@ -4243,12 +4243,12 @@ void btl_state_update_partner_menu(void) { if (btl_is_popup_displayed()) { break; } - D_802ACC60 = 0; + BattleMenu_ChooseDelay = 0; ShowingErrorMessage = false; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_1: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_BUILD_MENU: for (i = 0; i < battleStatus->submenuMoveCount; i++) { moveData = &gMoveTable[battleStatus->submenuMoves[i]]; @@ -4295,65 +4295,65 @@ void btl_state_update_partner_menu(void) { initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY]; MovesPrevSelected = initialPos; btl_submenu_moves_init(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING; break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING: entryIdx = btl_submenu_moves_update(); if (entryIdx == -1) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_7; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_SHOW_ERROR; } else if (entryIdx != 0) { if (entryIdx == 255) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { battleStatus->lastPartnerPowerSelection = entryIdx - 1; btl_submenu_moves_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER: entryIdx = btl_submenu_moves_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { battleStatus->moveCategory = BTL_MENU_TYPE_ABILITY; battleStatus->selectedMoveID = MovesOptionIndices[battleStatus->lastPartnerPowerSelection]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_ABILITY] = SelectedMovesIndex; - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CHOSEN; btl_set_state(BATTLE_STATE_SELECT_TARGET); } break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU: btl_submenu_moves_update(); if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CANCEL: btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_6: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CHOSEN: btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_7: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_SHOW_ERROR: if (btl_submenu_moves_update() != -1) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_1: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_BUILD_MENU: popupIndex = 0; for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { ItemData* item; @@ -4385,20 +4385,20 @@ void btl_state_update_partner_menu(void) { popupMenu->initialPos = initialPos; create_battle_popup_menu(popupMenu); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING; break; - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_2: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING: if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ITEMS_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ITEMS_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CHOSEN; battleStatus->lastSelectedItem = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS; battleStatus->moveArgument = battleStatus->lastSelectedItem; @@ -4407,34 +4407,34 @@ void btl_state_update_partner_menu(void) { battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER_ITEM] = popupMenu->result - 1; hide_popup_menu(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_3: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_HANDOVER: if ((battleStatus->curButtonsPressed & BUTTON_B) && popupMenu->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { btl_set_state(BATTLE_STATE_SELECT_TARGET); } break; - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_4: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU: if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_5: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CANCEL: show_popup_menu(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_6: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CHOSEN: destroy_popup_menu(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_1: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_BUILD_MENU: popupIndex = 0; for (i = 1; i < ARRAY_COUNT(PartnerIDFromMenuIndex); i++) { s32 partnerId = PartnerIDFromMenuIndex[i]; @@ -4463,22 +4463,22 @@ void btl_state_update_partner_menu(void) { popupMenu->titleNumber = 0; create_battle_popup_menu(popupMenu); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING; break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING: if (popupMenu->result == POPUP_RESULT_INVALID) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_7; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_SHOW_ERROR; } else if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CHOSEN; battleStatus->lastSelectedPartner = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; battleStatus->selectedMoveID = MOVE_CHANGE_PARTNER; @@ -4487,41 +4487,41 @@ void btl_state_update_partner_menu(void) { battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1; hide_popup_menu(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_HANDOVER: if ((battleStatus->curButtonsPressed & BUTTON_B) && (popupMenu->result == POPUP_RESULT_CHOOSING)) { show_popup_menu(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { gBattleSubState = battleStatus->acceptTargetMenuSubstate; btl_state_update_partner_menu(); btl_set_state(BATTLE_STATE_CHANGE_PARTNER); } break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU: if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CANCEL: show_popup_menu(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_6: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CHOSEN: destroy_popup_menu(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_7: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_SHOW_ERROR: if (popupMenu->result != POPUP_RESULT_INVALID) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_1: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_BUILD_MENU: entryIdx = 1; battleStatus->submenuMoves[0] = MOVE_FOCUS; battleStatus->submenuMoveCount = entryIdx; @@ -4551,35 +4551,35 @@ void btl_state_update_partner_menu(void) { initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STAR_POWER]; MovesPrevSelected = initialPos; btl_submenu_moves_init(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING; break; - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_2: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING: entryIdx = btl_submenu_moves_update(); if (entryIdx != 0) { if (entryIdx == 255) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { battleStatus->lastPartnerPowerSelection = MovesOptionIndices[entryIdx - 1]; btl_submenu_moves_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_3: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER: entryIdx = btl_submenu_moves_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && (entryIdx == 0)) { btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_CANCELED; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_FOCUS_SELECTED; battleStatus->moveCategory = BTL_MENU_TYPE_STAR_POWERS; battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->lastPartnerPowerSelection]; battleStatus->curTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->lastPartnerPowerSelection]].flags; @@ -4588,22 +4588,22 @@ void btl_state_update_partner_menu(void) { btl_set_state(BATTLE_STATE_SELECT_TARGET); } break; - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_4: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU: btl_submenu_moves_update(); if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_5: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_CANCELED: btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_6: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_SELECTED: btl_submenu_moves_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_1: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_BUILD_MENU: popupIndex = 0; btl_check_can_change_partner(); @@ -4637,81 +4637,81 @@ void btl_state_update_partner_menu(void) { initialPos = battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STRATEGY]; StratsPrevSelected = initialPos; btl_menu_strats_init(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING; break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING: entryIdx = btl_submenu_strats_update(); if (entryIdx == 0) { } else if (entryIdx == 255) { btl_main_menu_resume_choose(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { battleStatus->curPartnerSubmenu = StratsOptionMenuTypes[entryIdx - 1]; battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_STRATEGY] = entryIdx - 1; if (battleStatus->curPartnerSubmenu == 5) { // change partner - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_BUILD_MENU; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { btl_submenu_strats_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_3: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER: entryIdx = btl_submenu_strats_update(); if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { btl_submenu_strats_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU; } else if (btl_main_menu_update() != 0) { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN; entryIdx = battleStatus->curPartnerSubmenu; switch (entryIdx) { case 9: - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN; btl_state_update_partner_menu(); btl_set_state(BATTLE_STATE_END_PARTNER_TURN); break; case 3: - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN; btl_state_update_partner_menu(); battleStatus->moveCategory = entryIdx; battleStatus->selectedMoveID = MOVE_RUN_AWAY; btl_set_state(BATTLE_STATE_RUN_AWAY); break; case 10: - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN; btl_state_update_partner_menu(); btl_set_state(BATTLE_STATE_SWITCH_TO_PLAYER); break; } } break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU: btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN; } break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_5: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CANCEL: btl_submenu_strats_restore_choose(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN: btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_1: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_BUILD_MENU: popupIndex = 0; for (i = 1; i < ARRAY_COUNT(PartnerIDFromMenuIndex); i++) { s32 partnerId = PartnerIDFromMenuIndex[i]; @@ -4740,20 +4740,20 @@ void btl_state_update_partner_menu(void) { popupMenu->titleNumber = 0; create_battle_popup_menu(popupMenu); flush_popup_menu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING; break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING: if (popupMenu->result == POPUP_RESULT_INVALID) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_ERROR; } else if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { btl_submenu_strats_resume_choose(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING; btl_state_update_partner_menu(); btl_state_update_partner_menu(); } else { - battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5; - battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_6; + battleStatus->cancelTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CANCEL; + battleStatus->acceptTargetMenuSubstate = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CHOSEN; battleStatus->lastSelectedPartner = popupMenu->userIndex[popupMenu->result - 1]; battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER; battleStatus->selectedMoveID = MOVE_CHANGE_PARTNER; @@ -4763,16 +4763,16 @@ void btl_state_update_partner_menu(void) { hide_popup_menu(); btl_submenu_strats_hide(); btl_main_menu_hide(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_HANDOVER; } } break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_HANDOVER: if ((battleStatus->curButtonsPressed & BUTTON_B) && popupMenu->result == POPUP_RESULT_CHOOSING) { show_popup_menu(); btl_submenu_strats_restore_locked(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU; } else { btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { @@ -4782,30 +4782,30 @@ void btl_state_update_partner_menu(void) { } } break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU: btl_submenu_strats_update(); if (btl_main_menu_update() != 0) { - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING; } break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CANCEL: show_popup_menu(); btl_submenu_strats_restore_locked(); btl_main_menu_restore_submenu(); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU; break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_6: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CHOSEN: destroy_popup_menu(); btl_submenu_strats_destroy(); btl_main_menu_destroy(); break; - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_ERROR: set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_HIDE); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_HIDE); if (popupMenu->result != POPUP_RESULT_INVALID) { set_window_update(WIN_BTL_STRATS_MENU, WINDOW_UPDATE_9); set_window_update(WIN_BTL_STRATS_TITLE, WINDOW_UPDATE_9); - gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; + gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING; } break; } @@ -4813,56 +4813,56 @@ void btl_state_update_partner_menu(void) { void btl_state_draw_partner_menu(void) { switch (gBattleSubState) { - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_1: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_2: - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_3: - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_4: - case BTL_SUBSTATE_PARTNER_MENU_MAIN_MENU_5: - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_1: - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_2: - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_3: - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_4: - case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_5: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_CHOOSING: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU: + case BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CANCEL: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_BUILD_MENU: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU: + case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CANCEL: case BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_1: case BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_2: case BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_3: case BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_4: case BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_5: - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_1: - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2: - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_3: - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_4: - case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_5: - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_1: - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_2: - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_3: - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_4: - case BTL_SUBSTATE_PARTNER_MENU_ITEMS_5: - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2: - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_3: - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_4: - case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_5: - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_2: - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_3: - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_4: - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_5: - case BTL_SUBSTATE_PARTNER_MENU_FOCUS_6: - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_1: - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_2: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_BUILD_MENU: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_HANDOVER: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU: + case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CANCEL: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_BUILD_MENU: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_HANDOVER: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU: + case BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CANCEL: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_HANDOVER: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU: + case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CANCEL: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_CANCELED: + case BTL_SUBSTATE_PARTNER_MENU_FOCUS_SELECTED: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_BUILD_MENU: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_3: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_4: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_5: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CANCEL: btl_main_menu_draw(); break; - case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_6: + case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN: btl_main_menu_draw(); break; } @@ -4963,21 +4963,21 @@ void btl_state_update_peach_menu(void) { BattleMenu_WheelBase = 2 - initialPos; btl_main_menu_init(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; gBattleSubState = BTL_SUBSTATE_PEACH_MENU_CHOOSE_CATEGORY; break; case BTL_SUBSTATE_PEACH_MENU_CHOOSE_CATEGORY: set_actor_anim(ACTOR_PLAYER, 0, ANIM_Peach2_Delighted); selectedOption = btl_main_menu_update(); - if (D_802ACC60 != 0) { - D_802ACC60--; + if (BattleMenu_ChooseDelay != 0) { + BattleMenu_ChooseDelay--; break; } if (selectedOption != 0) { set_actor_anim(ACTOR_PLAYER, 0, ANIM_Peach1_Walk); battleStatus->curSubmenu = WheelOptionSubmenu[selectedOption - 1]; btl_main_menu_hide(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_PEACH_MENU_CHOOSE_TARGET; } @@ -5012,7 +5012,7 @@ void btl_state_update_peach_menu(void) { break; } ShowingErrorMessage = false; - D_802ACC60 = 0; + BattleMenu_ChooseDelay = 0; gBattleSubState = BTL_SUBSTATE_PEACH_MENU_CHOOSE_CATEGORY; break; } @@ -5169,21 +5169,21 @@ void btl_state_update_twink_menu(void) { BattleMenu_WheelBase = 2 - initialPos; btl_main_menu_init(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; gBattleSubState = BTL_SUBSTATE_TWINK_MENU_CHOOSE_CATEGORY; break; case BTL_SUBSTATE_TWINK_MENU_CHOOSE_CATEGORY: set_actor_anim(ACTOR_PARTNER, 0, ANIM_Twink_Idle); selection = btl_main_menu_update(); - if (D_802ACC60 != 0) { - D_802ACC60--; + if (BattleMenu_ChooseDelay != 0) { + BattleMenu_ChooseDelay--; break; } if (selection != 0) { set_actor_anim(ACTOR_PARTNER, 0, ANIM_Twink_Angry); battleStatus->curSubmenu = WheelOptionSubmenu[selection - 1]; btl_main_menu_hide(); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_TWINK_MENU_CHOOSE_TARGET; } @@ -5218,7 +5218,7 @@ void btl_state_update_twink_menu(void) { break; } ShowingErrorMessage = false; - D_802ACC60 = 0; + BattleMenu_ChooseDelay = 0; gBattleSubState = BTL_SUBSTATE_TWINK_MENU_CHOOSE_CATEGORY; break; } @@ -5370,7 +5370,7 @@ void btl_state_update_select_target(void) { if (battleStatus->curButtonsPressed & BUTTON_A) { sfx_play_sound(SOUND_MENU_NEXT); - D_802ACC60 = 8; + BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; gBattleSubState = BTL_SUBSTATE_SELECT_TARGET_DONE; break; diff --git a/src/battle/level_up.c b/src/battle/level_up.c index 24404434b3d..bf3e9d0b7ae 100644 --- a/src/battle/level_up.c +++ b/src/battle/level_up.c @@ -1212,7 +1212,7 @@ void btl_state_update_celebration(void) { set_window_update(WIN_BTL_DESC_BOX, WINDOW_UPDATE_HIDE); switch (battleStatus->curSubmenu) { - case 0: + case MENU_HP: playerData->hardMaxHP += 5; playerData->curMaxHP += 5; playerData->curHP += 5; @@ -1225,7 +1225,7 @@ void btl_state_update_celebration(void) { player->maxHP = playerData->curMaxHP; player->curHP = playerData->curHP; break; - case 1: + case MENU_FP: playerData->hardMaxFP += 5; playerData->curMaxFP += 5; playerData->curFP += 5; @@ -1236,7 +1236,7 @@ void btl_state_update_celebration(void) { playerData->curFP = playerData->curMaxFP; } break; - case 2: + case MENU_BP: playerData->maxBP += 3; if (playerData->maxBP > 30) { playerData->maxBP = 30; @@ -1261,27 +1261,27 @@ void btl_state_update_celebration(void) { case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_FADE_OUT: if ((gGameStatusPtr->frameCounter % 2) != 0) { switch (battleStatus->curSubmenu) { - case 0: + case MENU_HP: hud_element_set_flags(LevelUpStatEmblemIDs[0], HUD_ELEMENT_FLAG_DISABLED); break; - case 1: + case MENU_FP: hud_element_set_flags(LevelUpStatEmblemIDs[1], HUD_ELEMENT_FLAG_DISABLED); hud_element_set_flags(LevelUpStatEmblemIDs[3], HUD_ELEMENT_FLAG_DISABLED); break; - case 2: + case MENU_BP: hud_element_set_flags(LevelUpStatEmblemIDs[2], HUD_ELEMENT_FLAG_DISABLED); break; } } else { switch (battleStatus->curSubmenu) { - case 0: + case MENU_HP: hud_element_clear_flags(LevelUpStatEmblemIDs[0], HUD_ELEMENT_FLAG_DISABLED); break; - case 1: + case MENU_FP: hud_element_clear_flags(LevelUpStatEmblemIDs[1], HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(LevelUpStatEmblemIDs[3], HUD_ELEMENT_FLAG_DISABLED); break; - case 2: + case MENU_BP: hud_element_clear_flags(LevelUpStatEmblemIDs[2], HUD_ELEMENT_FLAG_DISABLED); break; } @@ -1490,7 +1490,7 @@ void btl_state_draw_celebration(void) { case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_INVALID: case BTL_SUBSTATE_CELEBRATE_LEVEL_UP_INVALID_DELAY: switch (battleStatus->curSubmenu) { - case 0: + case MENU_HP: rotZ = 152; hud_element_set_tint(LevelUpStatEmblemIDs[0], 255, 255, 255); hud_element_set_tint(LevelUpStatEmblemIDs[3], 128, 128, 128); @@ -1532,7 +1532,7 @@ void btl_state_draw_celebration(void) { hud_element_set_script(id, &HES_level_up_badge); } break; - case 1: + case MENU_FP: rotZ = 180; hud_element_set_tint(LevelUpStatEmblemIDs[0], 128, 128, 128); hud_element_set_tint(LevelUpStatEmblemIDs[3], 255, 255, 255); @@ -1557,7 +1557,7 @@ void btl_state_draw_celebration(void) { hud_element_set_tint(id, 128, 128, 128); } break; - case 2: + case MENU_BP: default: rotZ = 208; hud_element_set_tint(LevelUpStatEmblemIDs[0], 128, 128, 128); From e4651f1eb89cef93313066de24d7b98572646b56 Mon Sep 17 00:00:00 2001 From: z64a Date: Mon, 24 Nov 2025 01:31:00 -0500 Subject: [PATCH 09/18] alignment cleanup --- include/enums.h | 90 +++++++++---------- 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 | 8 +- .../kmr_part_3/actor/tutorial_spiked_goomba.c | 6 +- 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 | 10 +-- 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/common/actor/albino_dino.inc.c | 6 +- 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 | 6 +- 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 | 4 +- 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 | 6 +- src/battle/common/actor/goomba.inc.c | 6 +- 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 | 4 +- 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 | 8 +- .../common/actor/hyper_paragoomba.inc.c | 18 ++-- 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 | 4 +- 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 | 4 +- src/battle/common/actor/monty_mole.inc.c | 6 +- src/battle/common/actor/paragloomba.inc.c | 12 +-- src/battle/common/actor/paragoomba.inc.c | 8 +- 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 | 4 +- 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 | 4 +- src/battle/common/actor/sky_guy.inc.c | 14 +-- src/battle/common/actor/slot_machine.inc.c | 4 +- src/battle/common/actor/spear_guy.inc.c | 10 +-- src/battle/common/actor/spike_top.inc.c | 10 +-- src/battle/common/actor/spiked_gloomba.inc.c | 6 +- src/battle/common/actor/spiked_goomba.inc.c | 6 +- src/battle/common/actor/spiny.inc.c | 8 +- src/battle/common/actor/spy_guy.inc.c | 6 +- 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 | 4 +- src/battle/common/actor/white_magikoopa.inc.c | 12 +-- .../common/actor/yellow_magikoopa.inc.c | 12 +-- src/battle/partner/bombette.c | 2 +- src/battle/partner/bow.c | 2 +- src/battle/partner/goombario.c | 2 +- src/battle/partner/goompa.c | 2 +- src/battle/partner/kooper.c | 2 +- src/battle/partner/lakilester.c | 2 +- src/battle/partner/parakarry.c | 2 +- src/battle/partner/sushie.c | 2 +- src/battle/partner/twink.c | 2 +- src/battle/partner/watt.c | 2 +- 161 files changed, 583 insertions(+), 583 deletions(-) diff --git a/include/enums.h b/include/enums.h index 3aa93424f82..4ccb4aa1597 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4026,70 +4026,70 @@ enum BattlePlayerMenuSubstates { }; enum BattlePartnerMenuSubstates { - BTL_SUBSTATE_PARTNER_MENU_NONE = 0, + BTL_SUBSTATE_PARTNER_MENU_NONE = 0, // Main menu - BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN = 2, - BTL_SUBSTATE_PARTNER_MENU_MAIN_CHOOSING = 3, - BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER = 4, - BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU = 5, - BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CANCEL = 6, - BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CHOSEN = 7, - BTL_SUBSTATE_PARTNER_MENU_MAIN_SHOW_CANT_SWAP = 8, - BTL_SUBSTATE_PARTNER_MENU_MAIN_AWAIT_CANT_SWAP = 9, + BTL_SUBSTATE_PARTNER_MENU_MAIN_BEGIN = 2, + BTL_SUBSTATE_PARTNER_MENU_MAIN_CHOOSING = 3, + BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER = 4, + BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU = 5, + BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CANCEL = 6, + BTL_SUBSTATE_PARTNER_MENU_MAIN_TARGET_CHOSEN = 7, + BTL_SUBSTATE_PARTNER_MENU_MAIN_SHOW_CANT_SWAP = 8, + BTL_SUBSTATE_PARTNER_MENU_MAIN_AWAIT_CANT_SWAP = 9, // Abilities - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_BUILD_MENU = 10, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING = 11, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER = 12, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU = 13, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_BUILD_MENU = 10, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING = 11, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER = 12, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU = 13, BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CANCEL = 14, BTL_SUBSTATE_PARTNER_MENU_ABILITIES_TARGET_CHOSEN = 15, - BTL_SUBSTATE_PARTNER_MENU_ABILITIES_SHOW_ERROR = 16, + BTL_SUBSTATE_PARTNER_MENU_ABILITIES_SHOW_ERROR = 16, // Unknown, referenced only in btl_state_draw_partner_menu - BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_1 = 20, - BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_2 = 21, - BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_3 = 22, - BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_4 = 23, - BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_5 = 24, + BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_1 = 20, + BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_2 = 21, + BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_3 = 22, + BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_4 = 23, + BTL_SUBSTATE_PARTNER_MENU_UNKNOWN_5 = 24, // Change Partner - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_BUILD_MENU = 30, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING = 31, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_HANDOVER = 32, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU = 33, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_BUILD_MENU = 30, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_CHOOSING = 31, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_HANDOVER = 32, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_REOPEN_MENU = 33, BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CANCEL = 34, BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_TARGET_CHOSEN = 35, - BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_ERROR = 36, + BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_ERROR = 36, // Items - BTL_SUBSTATE_PARTNER_MENU_ITEMS_BUILD_MENU = 40, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING = 41, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_HANDOVER = 42, - BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU = 43, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_BUILD_MENU = 40, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_CHOOSING = 41, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_HANDOVER = 42, + BTL_SUBSTATE_PARTNER_MENU_ITEMS_REOPEN_MENU = 43, BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CANCEL = 44, BTL_SUBSTATE_PARTNER_MENU_ITEMS_TARGET_CHOSEN = 45, // Switch partner (unused) - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_BUILD_MENU = 50, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING = 51, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_HANDOVER = 52, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU = 53, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_BUILD_MENU = 50, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_CHOOSING = 51, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_HANDOVER = 52, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_REOPEN_MENU = 53, BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CANCEL = 54, BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_TARGET_CHOSEN = 55, - BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_SHOW_ERROR = 56, + BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_SHOW_ERROR = 56, // Focus - BTL_SUBSTATE_PARTNER_MENU_FOCUS_BUILD_MENU = 60, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING = 61, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER = 62, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU = 63, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_CANCELED = 64, - BTL_SUBSTATE_PARTNER_MENU_FOCUS_SELECTED = 65, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_BUILD_MENU = 60, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING = 61, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER = 62, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU = 63, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_CANCELED = 64, + BTL_SUBSTATE_PARTNER_MENU_FOCUS_SELECTED = 65, // Strategies - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_BUILD_MENU = 200, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING = 201, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER = 202, - BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU = 203, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_BUILD_MENU = 200, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING = 201, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER = 202, + BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU = 203, BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CANCEL = 204, BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_TARGET_CHOSEN = 205, // initialize - BTL_SUBSTATE_PARTNER_MENU_PERFORM_SWAP = 301, - BTL_SUBSTATE_PARTNER_MENU_CREATE_MAIN_MENU = 302, + BTL_SUBSTATE_PARTNER_MENU_PERFORM_SWAP = 301, + BTL_SUBSTATE_PARTNER_MENU_CREATE_MAIN_MENU = 302, }; enum BattleMessages { diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index f98f3c76ef5..9176d1e4bcf 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e449cd74f6e..09904a31051 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 fc6cfc586ea..16efea6addd 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 263b0582e20..0f12f47a636 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 2f3d4de0200..310b38b895c 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 44ea3ffb935..482a188ee1b 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 9ee8eedffb6..4b282680793 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 a05e24ed2c2..a13942c9eeb 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 9c93270e4bc..e7a65ede1a2 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_UNUSED, 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_UNUSED, 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 25d7133d2b8..d6f45ee4dac 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 9e5464f33c2..ef3784eb7e3 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_UNUSED, 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_UNUSED, 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 5f4d0b0a594..59e172a7404 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_UNUSED, 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_UNUSED, 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 2d15fc5d2f1..de99a3bdbbf 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_UNUSED, 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_UNUSED, 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 30401de1068..d1fad87f90b 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 7fe60a8e03b..7840259f831 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_UNUSED, 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_UNUSED, 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 3fe6f8e6829..51c38aacc41 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 73e9144e23e..30c9ebdc6cb 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 18312578015..2dee78262a6 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_UNUSED, 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_UNUSED, 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 fb403ba69e5..039ca08b605 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_UNUSED, 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_UNUSED, 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 f571c3f56f1..c0389092fe9 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f24f7886816..e03766ea262 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f6747d0c2e9..e6cc50b2451 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_UNUSED, 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_UNUSED, 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 06cadc848d9..a7f20c21b39 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 bfe050032c0..6e6fcd30252 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_UNUSED, 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_UNUSED, 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 648332cbf8f..a77608f5162 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_UNUSED, 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_UNUSED, 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 573e5311b8b..15843dfe884 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_UNUSED, 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_UNUSED, 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 406f9e61b02..b9d7de79219 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_UNUSED, 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_UNUSED, 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 92ce6ef5361..4692e935822 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 1748676d91b..ae76caf3948 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 @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f8c1dd1953f..1829691bff3 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 ad5d33011e2..66416a366e5 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e546341f014..d1b0c8ccd25 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 b3ced150e2a..9c08a2cff8b 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 bb13c1aa2ab..829fffb868f 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_UNUSED, 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_UNUSED, 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 b88128c1bda..36032e5ca80 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_UNUSED, 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_UNUSED, 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 ea44ffeaf1b..9c95b0f2575 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_UNUSED, 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_UNUSED, 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 10fc0f13bac..7b85f7f9b5c 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_UNUSED, 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_UNUSED, 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 c67d6197b73..0998120a233 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_UNUSED, 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_UNUSED, 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 19dc96a1f6b..7b32fbe0224 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_UNUSED, 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_UNUSED, 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 6d81339f93d..7b99f5e526e 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_UNUSED, 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_UNUSED, 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 27b49014ff8..388b3c8b7aa 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 de05c0fb23d..c7bab2dbc1d 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_UNUSED, 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_UNUSED, 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 23be8709eaa..cb13cbcb993 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 9996f08adf5..656c164fb0b 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 b34cd17764b..04021ed0f63 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 8537180cfe4..04c9aa52495 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 22acd6f3dd2..ea1c1b924f2 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 7f0995d1076..3eafd39c488 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 86d20c224a6..39c71ef0ba3 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 2f284c8deae..c7a24f41820 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 74a15b46dcf..e7abbc68ece 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_UNUSED, 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_UNUSED, 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 ee9888666f1..da3450e3ab8 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_UNUSED, 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_UNUSED, 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 abe7cb58d7f..49da3f52fd1 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_UNUSED, 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_UNUSED, 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 d404c2bbe01..fa7be738a61 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 75bac252afa..987b549788d 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e02f360939f..8d733ceea29 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_UNUSED, 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_UNUSED, 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 c3771900071..20d4b2ac0e8 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_UNUSED, 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_UNUSED, 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 077369e3913..859faa8f19b 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 69f05cc435d..60377b0c36a 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_UNUSED, 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_UNUSED, 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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 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_UNUSED, 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 8be40da6906..4300389e61e 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e08b3f6b434..27f63d26d4f 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_UNUSED, 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_UNUSED, 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 4917cb8ff67..0ada210c3b0 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_UNUSED, 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_UNUSED, 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 a159e407fb3..b65e4b3dca9 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e8ed34a0ead..089271c4563 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 7a08b944c84..c2e9ed4075f 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_UNUSED, 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_UNUSED, 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 f200ba3dbc9..983b3864346 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 af67192e93b..5ed5d00eed4 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_UNUSED, 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_UNUSED, 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 49033cffd18..48b5ddd4076 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_UNUSED, 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_UNUSED, 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 06dff9f75ad..d7667604b1e 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_UNUSED, 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_UNUSED, 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 769df68429c..da8deb50eb3 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 93f9421082b..02d80bd128b 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 468a50a32d0..66e71b98172 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_UNUSED, 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_UNUSED, 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 c0d1024d18a..89b53707daa 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_UNUSED, 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_UNUSED, 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 2bb2c98e2ab..b04cf70aaea 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_UNUSED, 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_UNUSED, 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/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index a18d134d0b5..1072011fa94 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_UNUSED, 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_UNUSED, 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_UNUSED, 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/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index a255ff2b31e..954cf4fbcc8 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 bc55602d2d2..89341e7c560 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 746e9ad6078..0a4b9db9e95 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_UNUSED, 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_UNUSED, ANIM_Bandit_Dizzy, + STATUS_KEY_UNUSED, ANIM_Bandit_Dizzy, STATUS_END, }; @@ -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_UNUSED, 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 db62152bead..3738fdbfee1 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_UNUSED, 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_UNUSED, 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 fe9660a18a8..f77993bb982 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 4572ad08ca1..15ac01ef901 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 7048bac7e00..fe2b78e2d82 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_UNUSED, 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_UNUSED, 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 e56514a7069..03079e39107 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 80f329a3656..f524591754d 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 1448a3c1a14..cbce31e9081 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 8db903e13fb..f2605d8676a 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_UNUSED, ANIM_BattleClubba_Anim05, + STATUS_KEY_UNUSED, ANIM_BattleClubba_Anim05, STATUS_END, }; @@ -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_UNUSED, 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 2a2ee42d071..8a7dcaa7b2c 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 aab05c6f3e0..49c5069bc9f 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 1ee2b5502e5..48bc6d392b9 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e61172376cf..668de6757ab 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 3c855fef8d4..bfeacbb36da 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 b09b947598f..8668e7a5926 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 562ac6bdb99..a91d2b27c58 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f1fd1a80549..aef7ccc9ed1 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f210fe60749..d4e63bd3cde 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 fb20b919a7a..5d277dcf0b8 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 7687a7c4256..12584f08afc 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e1f1930c7f9..534a5e24cab 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 431773c4366..f0663a177a3 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 476dda1cb3c..cd2a25e2876 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 8c87f51bb08..a61478d2b30 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 77a2f1fb871..d410adb57d8 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_UNUSED, 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_UNUSED, 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 bf6d0ee00eb..78267785e02 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f0b4aea45bd..3e8dfb95769 100644 --- a/src/battle/common/actor/gloomba.inc.c +++ b/src/battle/common/actor/gloomba.inc.c @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 9d4dfc2d748..caa178476b8 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 564d86e564b..1f0b1b1c190 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 3d916a76d46..56f1013f46c 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 405ccd46bd8..733bfa5ad92 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_UNUSED, ANIM_GrooveGuy_Anim07, + STATUS_KEY_UNUSED, ANIM_GrooveGuy_Anim07, STATUS_END, }; @@ -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_UNUSED, 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 388938f5325..fb472dbc020 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 a0935d4ea54..0d4cadf0256 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_UNUSED, 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_UNUSED, 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 b85e8dcfa19..10c000851aa 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 60419e62f3e..ee5a0999dee 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 4de7768889f..273535ed959 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 e6123fdea5a..658f037cdb5 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 2554171417c..fb0a0552b51 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 691e4d461f2..b0f491e31ad 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 2c798811c6b..2b8cce08d5e 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 a17456ff0e5..d66c542d40a 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 33c13908231..0bdc3e31f56 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 c7865e16a64..ffa44f3c778 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -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_UNUSED, 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_UNUSED, 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 c9271f3cbe3..f420e6caf68 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 c0e6df41f23..49a389df4fc 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 c901617695f..6e547edb28f 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_UNUSED, ANIM_MediGuy_Anim0A, + STATUS_KEY_UNUSED, ANIM_MediGuy_Anim0A, STATUS_END, }; @@ -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_UNUSED, 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 a4a5989a96b..26198296f3c 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 1fc587a0c36..9718c60a1b5 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 6d9c2766a22..589b3bac674 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 79b10d9d6f3..b44d540d29f 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 18d91882329..f68ddc19fae 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 ee27ed5e650..14c8366fae0 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 602772aada5..b954d1ea4ab 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 aaf773dc61d..d1ee3afd42f 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_UNUSED, 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_UNUSED, 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 2c5b90d64d4..57dcdb90fab 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_UNUSED, ANIM_PyroGuy_Anim08, + STATUS_KEY_UNUSED, ANIM_PyroGuy_Anim08, STATUS_END, }; @@ -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_UNUSED, 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 a45cf625144..2a0a2881ddc 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 05584f0ba82..087344584a3 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_UNUSED, 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_UNUSED, 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 55240c17607..730938ffa12 100644 --- a/src/battle/common/actor/shy_guy_base.inc.c +++ b/src/battle/common/actor/shy_guy_base.inc.c @@ -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_UNUSED, 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_UNUSED, 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 e2635ae2b9c..eaf120f7f9e 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, ANIM_SkyGuy_Anim11, + STATUS_KEY_UNUSED, ANIM_SkyGuy_Anim11, STATUS_END, }; @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 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_UNUSED, 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 9c6bb564dc1..e4704837ede 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_UNUSED, 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_UNUSED, 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 439812a106d..7eca0348fa6 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_UNUSED, 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_UNUSED, ANIM_SpearGuy_Anim0F, + STATUS_KEY_UNUSED, ANIM_SpearGuy_Anim0F, STATUS_END, }; @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 1, STATUS_TURN_MOD_SHRINK, 0, @@ -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_UNUSED, 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 c4537b90b15..eee8bd4f2e0 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 535c3c6c510..0f63307136c 100644 --- a/src/battle/common/actor/spiked_gloomba.inc.c +++ b/src/battle/common/actor/spiked_gloomba.inc.c @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 de6b998d10e..99afd77e4a1 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -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_UNUSED, 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_UNUSED, 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_UNUSED, 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 f8e687ac6e8..004534ea9e3 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 eed20f9355d..5352ef85646 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_UNUSED, 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_UNUSED, ANIM_SpyGuy_Anim12, + STATUS_KEY_UNUSED, ANIM_SpyGuy_Anim12, STATUS_END, }; @@ -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_UNUSED, 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 2441871a8f7..907615018bb 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_UNUSED, 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_UNUSED, 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 a6520d11b69..7493863d0b1 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 9784294b0de..16be6a056c4 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 5e5d331ca81..89b9736812d 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 b1d779dff93..313c36b2f81 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_UNUSED, ANIM_BattleClubba_Frost_Anim05, + STATUS_KEY_UNUSED, ANIM_BattleClubba_Frost_Anim05, STATUS_END, }; @@ -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_UNUSED, 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 4b2df867a84..ea465bbe025 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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 c00dbd3e13e..2a95a8be014 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, 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_UNUSED, ANIM_FlyingMagikoopa_Yellow_Anim07, + STATUS_KEY_UNUSED, ANIM_FlyingMagikoopa_Yellow_Anim07, STATUS_END, }; diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index b33e7fe119d..555e41a6b26 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -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_UNUSED, 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 02edbbc3baf..699457080ef 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -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_UNUSED, 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/goombario.c b/src/battle/partner/goombario.c index 10fa75ed9dd..585e21915f6 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -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_UNUSED, 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 bfed22b361e..24e703c4c66 100644 --- a/src/battle/partner/goompa.c +++ b/src/battle/partner/goompa.c @@ -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_UNUSED, 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 972fd2300f3..54dc92f6e84 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -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_UNUSED, 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 5987f417b46..39065d99bd8 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -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_UNUSED, 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 d4d80720704..f964b092fa7 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -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_UNUSED, 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 38620bf4959..36ee3769fee 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -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_UNUSED, 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 a71693ae939..ddb0a6a24d2 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -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_UNUSED, 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 1ebe081bdb0..ac9dc6095b6 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -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_UNUSED, 0, + STATUS_TURN_MOD_UNUSED, 0, STATUS_TURN_MOD_STATIC, 0, STATUS_TURN_MOD_PARALYZE, 0, STATUS_TURN_MOD_SHRINK, 0, From 73751a5ca3c301e856562e8c27e489e75f0d3cce Mon Sep 17 00:00:00 2001 From: z64a Date: Mon, 24 Nov 2025 13:31:10 -0500 Subject: [PATCH 10/18] cleanup --- src/battle/btl_states_menus.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index 643ca14686b..e63b0725ffa 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -4202,12 +4202,12 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_MAIN_HANDOVER: entryIdx = btl_main_menu_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == POPUP_RESULT_CHOOSING) { btl_main_menu_restore_choose(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_MAIN_REOPEN_MENU; return; } - if (entryIdx != 0) { + if (entryIdx != POPUP_RESULT_CHOOSING) { battleStatus->moveCategory = BTL_MENU_TYPE_STAR_POWERS; battleStatus->selectedMoveID = MOVE_FOCUS; battleStatus->moveArgument = 0; @@ -4299,10 +4299,10 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_CHOOSING: entryIdx = btl_submenu_moves_update(); - if (entryIdx == -1) { + if (entryIdx == POPUP_RESULT_INVALID) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_SHOW_ERROR; - } else if (entryIdx != 0) { - if (entryIdx == 255) { + } else if (entryIdx != POPUP_RESULT_CHOOSING) { + if (entryIdx == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; @@ -4319,7 +4319,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_ABILITIES_HANDOVER: entryIdx = btl_submenu_moves_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == POPUP_RESULT_CHOOSING) { btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_ABILITIES_REOPEN_MENU; @@ -4555,8 +4555,8 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_FOCUS_CHOOSING: entryIdx = btl_submenu_moves_update(); - if (entryIdx != 0) { - if (entryIdx == 255) { + if (entryIdx != POPUP_RESULT_CHOOSING) { + if (entryIdx == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; @@ -4573,7 +4573,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_FOCUS_HANDOVER: entryIdx = btl_submenu_moves_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && (entryIdx == 0)) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && (entryIdx == POPUP_RESULT_CHOOSING)) { btl_submenu_moves_restore_choose(); btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_FOCUS_REOPEN_MENU; @@ -4641,8 +4641,8 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_CHOOSING: entryIdx = btl_submenu_strats_update(); - if (entryIdx == 0) { - } else if (entryIdx == 255) { + if (entryIdx == POPUP_RESULT_CHOOSING) { + } else if (entryIdx == POPUP_RESULT_CANCEL) { btl_main_menu_resume_choose(); BattleMenu_ChooseDelay = 8; BattleMenu_SwapDelay = 4; @@ -4665,7 +4665,7 @@ void btl_state_update_partner_menu(void) { break; case BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_HANDOVER: entryIdx = btl_submenu_strats_update(); - if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == 0) { + if ((battleStatus->curButtonsPressed & BUTTON_B) && entryIdx == POPUP_RESULT_CHOOSING) { btl_submenu_strats_restore_choose(); btl_main_menu_restore_submenu(); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_STRATEGIES_REOPEN_MENU; From aad66935749ef0fa03413057941e1c4d39f3225d Mon Sep 17 00:00:00 2001 From: z64a Date: Wed, 26 Nov 2025 21:58:51 -0500 Subject: [PATCH 11/18] another one --- include/functions.h | 4 ++-- src/battle/190B20.c | 2 +- src/battle/1A5830.c | 6 +++--- src/battle/battle.c | 2 +- src/battle/dmg_item.c | 2 +- src/battle/dmg_partner.c | 2 +- src/battle/dmg_player.c | 2 +- src/screen_overlays.c | 30 ++++++++++++++++-------------- src/world/world.c | 2 +- ver/jp/symbol_addrs.txt | 6 +++--- ver/us/symbol_addrs.txt | 8 ++++---- 11 files changed, 34 insertions(+), 32 deletions(-) diff --git a/include/functions.h b/include/functions.h index 73798770402..d8cc509af15 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1024,8 +1024,8 @@ void update_encounters_conversation(void); void update_encounters_post_battle(void); void load_map_bg(char* optAssetName); void reset_background_settings(void); -void func_80138188(void); -void func_80266970(Actor*); +void reset_back_screen_overlay_progress(void); +void cancel_action_rating_combo(Actor*); void show_actor_health_bar(Actor*); void hide_actor_health_bar(Actor*); void clear_part_pal_adjustment(ActorPart*); diff --git a/src/battle/190B20.c b/src/battle/190B20.c index b2b34cdbdb0..72d86122000 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -2514,7 +2514,7 @@ void show_action_rating(s32 rating, Actor* actor, f32 x, f32 y, f32 z) { } } -void func_80266970(Actor* target) { +void cancel_action_rating_combo(Actor* target) { target->actionRatingCombo = 0; } diff --git a/src/battle/1A5830.c b/src/battle/1A5830.c index 14c667f605a..78e06f352a9 100644 --- a/src/battle/1A5830.c +++ b/src/battle/1A5830.c @@ -452,7 +452,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; } - func_80266970(target); + cancel_action_rating_combo(target); } break; case ACTOR_CLASS_PARTNER: @@ -465,14 +465,14 @@ HitResult calc_enemy_damage_target(Actor* attacker) { gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; } - func_80266970(target); + cancel_action_rating_combo(target); } } break; } if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { - func_80266970(target); + cancel_action_rating_combo(target); } // deal damage and determine resulting battle event diff --git a/src/battle/battle.c b/src/battle/battle.c index 8e07f85d2a5..866cf063f7d 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -235,7 +235,7 @@ void load_demo_battle(u32 index) { clear_model_data(); clear_sprite_shading_data(); reset_background_settings(); - func_80138188(); + reset_back_screen_overlay_progress(); reset_battle_status(); clear_encounter_status(); clear_entity_data(true); diff --git a/src/battle/dmg_item.c b/src/battle/dmg_item.c index 7cc6da87f67..1240997814a 100644 --- a/src/battle/dmg_item.c +++ b/src/battle/dmg_item.c @@ -417,7 +417,7 @@ HitResult calc_item_damage_enemy(void) { } if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { - func_80266970(target); + cancel_action_rating_combo(target); } dispatch_event_actor(target, dispatchEvent); diff --git a/src/battle/dmg_partner.c b/src/battle/dmg_partner.c index 650f62d3b98..554a2605a15 100644 --- a/src/battle/dmg_partner.c +++ b/src/battle/dmg_partner.c @@ -793,7 +793,7 @@ HitResult calc_partner_damage_enemy(void) { } if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { - func_80266970(target); + cancel_action_rating_combo(target); } if (battleStatus->lastAttackDamage > 0) { diff --git a/src/battle/dmg_player.c b/src/battle/dmg_player.c index ab10de9fffd..3afa61cfe88 100644 --- a/src/battle/dmg_player.c +++ b/src/battle/dmg_player.c @@ -940,7 +940,7 @@ HitResult calc_player_damage_enemy(void) { } if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { - func_80266970(target); + cancel_action_rating_combo(target); } if ((battleStatus->lastAttackDamage > 0 || wasSpecialHit) && !partImmuneToElement) { diff --git a/src/screen_overlays.c b/src/screen_overlays.c index edee604c468..8b6563201a1 100644 --- a/src/screen_overlays.c +++ b/src/screen_overlays.c @@ -2,10 +2,12 @@ #include "overlay.h" #include "include_asset.h" +#define OVERLAY_RENDER_OFF (-1.0f) + BSS s32 screen_overlay_frontType; -BSS f32 screen_overlay_frontZoom; +BSS f32 screen_overlay_frontProgress; BSS s32 screen_overlay_backType; -BSS f32 screen_overlay_backZoom; +BSS f32 screen_overlay_backProgress; BSS s32 D_80156910; ScreenOverlay ScreenOverlays[2]; @@ -360,23 +362,23 @@ void _render_transition_stencil(u8 stencilType, f32 progress, ScreenOverlay* ove void set_screen_overlay_params_front(u8 type, f32 zoom) { screen_overlay_frontType = type; - screen_overlay_frontZoom = zoom; + screen_overlay_frontProgress = zoom; } void set_screen_overlay_params_back(u8 type, f32 zoom) { screen_overlay_backType = type; - screen_overlay_backZoom = zoom; + screen_overlay_backProgress = zoom; } void get_screen_overlay_params(s32 layer, u8* type, f32* zoom) { switch (layer) { case SCREEN_LAYER_FRONT: *type = screen_overlay_frontType; - *zoom = screen_overlay_frontZoom; + *zoom = screen_overlay_frontProgress; break; case SCREEN_LAYER_BACK: *type = screen_overlay_backType; - *zoom = screen_overlay_backZoom; + *zoom = screen_overlay_backProgress; break; } } @@ -454,8 +456,8 @@ void clear_screen_overlays(void) { screen_overlay_frontType = OVERLAY_NONE; screen_overlay_backType = OVERLAY_NONE; - screen_overlay_frontZoom = -1.0f; - screen_overlay_backZoom = -1.0f; + screen_overlay_frontProgress = OVERLAY_RENDER_OFF; + screen_overlay_backProgress = OVERLAY_RENDER_OFF; for (it = &ScreenOverlays[0], i = 0; i < ARRAY_COUNT(ScreenOverlays); i++, it++) { it->color.b = 0; @@ -469,8 +471,8 @@ void clear_screen_overlays(void) { } } -void func_80138188(void) { - screen_overlay_backZoom = 0; +void reset_back_screen_overlay_progress(void) { + screen_overlay_backProgress = 0; } void func_80138198(void) { @@ -478,19 +480,19 @@ void func_80138198(void) { void render_screen_overlay_frontUI(void) { if (screen_overlay_frontType != OVERLAY_NONE - && screen_overlay_frontZoom != -1.0f + && screen_overlay_frontProgress != OVERLAY_RENDER_OFF && gGameStatusPtr->context != CONTEXT_PAUSE ) { - _render_transition_stencil(screen_overlay_frontType, screen_overlay_frontZoom, &ScreenOverlays[0]); + _render_transition_stencil(screen_overlay_frontType, screen_overlay_frontProgress, &ScreenOverlays[0]); } } void render_screen_overlay_backUI(void) { if (screen_overlay_backType != OVERLAY_NONE - && screen_overlay_backZoom != -1.0f + && screen_overlay_backProgress != OVERLAY_RENDER_OFF && gGameStatusPtr->context != CONTEXT_PAUSE ) { - _render_transition_stencil(screen_overlay_backType, screen_overlay_backZoom, &ScreenOverlays[1]); + _render_transition_stencil(screen_overlay_backType, screen_overlay_backProgress, &ScreenOverlays[1]); } } diff --git a/src/world/world.c b/src/world/world.c index 7b87cedf930..b4289d6cf01 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -182,7 +182,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { reset_background_settings(); if (gGameStatusPtr->introPart == INTRO_PART_NONE) { - func_80138188(); + reset_back_screen_overlay_progress(); } if (!skipLoadingAssets) { diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index a6c465803e5..a0b6ec55c6c 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -2522,7 +2522,7 @@ get_screen_overlay_params = 0x8013CE70; // type:func rom:0xD1D00 set_screen_overlay_color = 0x8013CEC0; // type:func rom:0xD1D50 set_screen_overlay_center_worldpos = 0x8013CF70; // type:func rom:0xD1E00 set_screen_overlay_alpha = 0x8013D184; // type:func rom:0xD2014 -func_80138188 = 0x8013D238; // type:func rom:0xD20C8 +reset_back_screen_overlay_progress = 0x8013D238; // type:func rom:0xD20C8 update_exit_map_screen_overlay = 0x8013D35C; // type:func rom:0xD21EC update_enter_map_screen_overlay = 0x8013D684; // type:func rom:0xD2514 D_8014ED90 = 0x80153E30; // rom:0xE8CC0 @@ -2870,9 +2870,9 @@ GotItemTutorialPrinter = 0x8015B86C; GotItemTutorialClosed = 0x8015B870; D_801568FC = 0x8015B874; screen_overlay_frontType = 0x8015B880; -screen_overlay_frontZoom = 0x8015B884; +screen_overlay_frontProgress = 0x8015B884; screen_overlay_backType = 0x8015B888; -screen_overlay_backZoom = 0x8015B88C; +screen_overlay_backProgress = 0x8015B88C; D_80156910 = 0x8015B890; ImgFXCurrentTexture = 0x8015B8A0; ImgFXVtxBuffers = 0x8015B8C8; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index dfa9f419bfe..7ccb915de02 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -4261,7 +4261,7 @@ set_screen_overlay_center = 0x80137E4C; // type:func rom:0xCE54C set_screen_overlay_center_worldpos = 0x80137EC0; // type:func rom:0xCE5C0 set_screen_overlay_alpha = 0x801380D4; // type:func rom:0xCE7D4 clear_screen_overlays = 0x80138108; // type:func rom:0xCE808 -func_80138188 = 0x80138188; // type:func rom:0xCE888 +reset_back_screen_overlay_progress = 0x80138188; // type:func rom:0xCE888 func_80138198 = 0x80138198; // type:func rom:0xCE898 render_screen_overlay_frontUI = 0x801381A0; // type:func rom:0xCE8A0 render_screen_overlay_backUI = 0x80138220; // type:func rom:0xCE920 @@ -5070,9 +5070,9 @@ GotItemTutorialPrinter = 0x801568F4; // rom:0xECFF4 GotItemTutorialClosed = 0x801568F8; // rom:0xECFF8 D_801568FC = 0x801568FC; // rom:0xECFFC screen_overlay_frontType = 0x80156900; // rom:0xED000 -screen_overlay_frontZoom = 0x80156904; // rom:0xED004 +screen_overlay_frontProgress = 0x80156904; // rom:0xED004 screen_overlay_backType = 0x80156908; // rom:0xED008 -screen_overlay_backZoom = 0x8015690C; // rom:0xED00C +screen_overlay_backProgress = 0x8015690C; // rom:0xED00C D_80156910 = 0x80156910; // rom:0xED010 ImgFXCurrentTexture = 0x80156920; // rom:0xED020 ImgFXVtxBuffers = 0x80156948; // rom:0xED048 @@ -6804,7 +6804,7 @@ show_next_damage_popup = 0x802665AC; // type:func rom:0x194E8C update_damage_popups = 0x80266684; // type:func rom:0x194F64 show_damage_fx = 0x802666E4; // type:func rom:0x194FC4 show_action_rating = 0x802667F0; // type:func rom:0x1950D0 -func_80266970 = 0x80266970; // type:func rom:0x195250 +cancel_action_rating_combo = 0x80266970; // type:func rom:0x195250 update_action_ratings = 0x80266978; // type:func rom:0x195258 show_actor_health_bar = 0x80266ADC; // type:func rom:0x1953BC hide_actor_health_bar = 0x80266AF8; // type:func rom:0x1953D8 From 865211cd949dbc05be6374ef19154455b8c554fe Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 29 Nov 2025 00:33:32 -0500 Subject: [PATCH 12/18] fix status names --- include/enums.h | 18 ++--------------- src/battle/190B20.c | 20 +++++++++---------- src/battle/1A5830.c | 2 +- src/battle/actor_api.c | 2 +- src/battle/actor_rendering.c | 6 +++--- .../kmr_part_3/actor/tutorial_paragoomba.c | 2 +- src/battle/area/omo2_2/actor/stilt_guy.c | 2 +- src/battle/btl_states_actions.c | 16 +++++++-------- src/battle/btl_states_menus.c | 8 ++++---- src/battle/common/actor/clubba.inc.c | 2 +- src/battle/common/actor/gloomba.inc.c | 2 +- src/battle/common/actor/goomba.inc.c | 2 +- src/battle/common/actor/groove_guy.inc.c | 2 +- src/battle/common/actor/hyper_goomba.inc.c | 2 +- .../common/actor/hyper_paragoomba.inc.c | 2 +- src/battle/common/actor/lava_bubble.inc.c | 2 +- src/battle/common/actor/medi_guy.inc.c | 2 +- src/battle/common/actor/paragloomba.inc.c | 2 +- src/battle/common/actor/paragoomba.inc.c | 2 +- src/battle/common/actor/pyro_guy.inc.c | 2 +- src/battle/common/actor/shy_guy_base.inc.c | 2 +- src/battle/common/actor/sky_guy.inc.c | 4 ++-- src/battle/common/actor/spear_guy.inc.c | 4 ++-- src/battle/common/actor/spy_guy.inc.c | 2 +- src/battle/common/actor/white_clubba.inc.c | 2 +- src/battle/dmg_item.c | 2 +- src/battle/dmg_partner.c | 2 +- src/battle/partner/bombette.c | 4 ++-- src/battle/partner/bow.c | 4 ++-- src/battle/partner/goombario.c | 4 ++-- src/battle/partner/goompa.c | 2 +- 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 | 2 +- src/battle/partner/watt.c | 4 ++-- 37 files changed, 69 insertions(+), 83 deletions(-) diff --git a/include/enums.h b/include/enums.h index 4ccb4aa1597..72fa63c755b 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2242,9 +2242,9 @@ enum StatusKeys { STATUS_KEY_SHRINK = 0x0000000A, STATUS_KEY_STATIC = 0x0000000B, STATUS_KEY_STONE = 0x0000000C, - STATUS_KEY_DAZE = 0x0000000D, + STATUS_KEY_KO = 0x0000000D, STATUS_KEY_TRANSPARENT = 0x0000000E, - STATUS_KEY_KO = 0x0000000F, + STATUS_KEY_0F = 0x0000000F, STATUS_KEY_BERSERK = 0x00000010, STATUS_KEY_11 = 0x00000011, STATUS_KEY_INACTIVE = 0x00000012, @@ -4314,20 +4314,6 @@ enum DebugScriptstModes { DEBUG_SCRIPTS_BLOCK_FUNC_DONE = 2, }; -enum DebuffTypes { - DEBUFF_TYPE_SLEEP = 0x00001000, - DEBUFF_TYPE_STATIC = 0x00002000, - DEBUFF_TYPE_FROZEN = 0x00004000, - DEBUFF_TYPE_PARALYZED = 0x00010000, - DEBUFF_TYPE_POISON = 0x00020000, - DEBUFF_TYPE_DIZZY = 0x00040000, - DEBUFF_TYPE_SHRINK = 0x00080000, - DEBUFF_TYPE_STONE = 0x00100000, - DEBUFF_TYPE_STOP = 0x00200000, - DEBUFF_TYPE_DAZE = 0x01000000, - DEBUFF_TYPE_INVISIBLE = 0x04000000, -}; - enum PlayerBasicJump { PLAYER_BASIC_JUMP_0 = 0, PLAYER_BASIC_JUMP_1 = 1, diff --git a/src/battle/190B20.c b/src/battle/190B20.c index 72d86122000..c5fa2c849da 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -649,7 +649,7 @@ void btl_check_can_change_partner(void) { } if (partnersEnabled >= 2) { - if (partner->koStatus == STATUS_KEY_DAZE) { + if (partner->koStatus == STATUS_KEY_KO) { battleStatus->changePartnerAllowed = 0; } else if (partner->debuff == STATUS_KEY_FROZEN) { battleStatus->changePartnerAllowed = 0; @@ -2245,14 +2245,14 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { target->statusAfflicted = STATUS_KEY_STONE; } return true; - case STATUS_KEY_DAZE: + case STATUS_KEY_KO: if (target->koStatus < statusTypeKey) { - target->koStatus = STATUS_KEY_DAZE; + target->koStatus = STATUS_KEY_KO; target->koDuration = duration; if ((s8)duration > 9) { target->koDuration = 9; } - target->statusAfflicted = STATUS_KEY_DAZE; + target->statusAfflicted = STATUS_KEY_KO; } return true; case STATUS_KEY_TRANSPARENT: @@ -2275,9 +2275,9 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { } s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) { - if (statusTypeKey == STATUS_KEY_DAZE) { + if (statusTypeKey == STATUS_KEY_KO) { if (statusTypeKey != target->koStatus) { - inflict_status(target, STATUS_KEY_DAZE, duration); + inflict_status(target, STATUS_KEY_KO, duration); sfx_play_sound(SOUND_INFLICT_KO); } else { target->koDuration += duration; @@ -2980,7 +2980,7 @@ void btl_update_ko_status(void) { player->koDuration = player->debuffDuration; if (player->koDuration > 0) { - player->koStatus = STATUS_KEY_DAZE; + player->koStatus = STATUS_KEY_KO; player->disableEffect->data.disableX->koDuration = player->koDuration; if (koDuration == 0) { @@ -2990,12 +2990,12 @@ void btl_update_ko_status(void) { if (partner != nullptr) { if (partner->koDuration < partner->debuffDuration) { - partner->koStatus = STATUS_KEY_DAZE; + partner->koStatus = STATUS_KEY_KO; partner->koDuration = partner->debuffDuration; } if (partner->koDuration > 0) { - partner->koStatus = STATUS_KEY_DAZE; + partner->koStatus = STATUS_KEY_KO; partner->disableEffect->data.disableX->koDuration = partner->koDuration; } } @@ -3006,7 +3006,7 @@ void btl_update_ko_status(void) { if (enemy != nullptr) { enemy->koDuration = enemy->debuffDuration; if (enemy->koDuration > 0) { - enemy->koStatus = STATUS_KEY_DAZE; + enemy->koStatus = STATUS_KEY_KO; enemy->disableEffect->data.disableX->koDuration = enemy->koDuration; } } diff --git a/src/battle/1A5830.c b/src/battle/1A5830.c index 78e06f352a9..c55669760f8 100644 --- a/src/battle/1A5830.c +++ b/src/battle/1A5830.c @@ -684,7 +684,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { && gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && !(target->flags & ACTOR_FLAG_NO_DMG_APPLY)) { - inflict_partner_ko(target, STATUS_KEY_DAZE, battleStatus->lastAttackDamage); + inflict_partner_ko(target, STATUS_KEY_KO, battleStatus->lastAttackDamage); } if (!(target->flags & ACTOR_FLAG_NO_DMG_POPUP)) { diff --git a/src/battle/actor_api.c b/src/battle/actor_api.c index 869134de008..a70e1a5158e 100644 --- a/src/battle/actor_api.c +++ b/src/battle/actor_api.c @@ -2875,7 +2875,7 @@ API_CALLABLE(GetStatusFlags) { switch (actor->koStatus) { case 0: break; - case STATUS_KEY_DAZE: + case STATUS_KEY_KO: flags |= STATUS_FLAG_KO; break; } diff --git a/src/battle/actor_rendering.c b/src/battle/actor_rendering.c index 0c4ac24c189..86d6340dfe6 100644 --- a/src/battle/actor_rendering.c +++ b/src/battle/actor_rendering.c @@ -1116,13 +1116,13 @@ void appendGfx_npc_actor(bool isPartner, s32 actorIndex) { } if (isPartner) { - if (actor->koStatus == STATUS_KEY_DAZE) { - part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_DAZE); + if (actor->koStatus == STATUS_KEY_KO) { + part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_KO); animChanged = true; } else { s32 temp = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_NORMAL); do { - if (temp == get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_DAZE)) { + if (temp == get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_KO)) { part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_NORMAL); } } while (0); // required to match 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 4692e935822..5e4a445ef85 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 60377b0c36a..c085927d014 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -118,7 +118,7 @@ s32 N(UnusedStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index 6b72c7ccf52..22cbf2bb670 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -840,7 +840,7 @@ void btl_state_update_begin_player_turn(void) { case BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_TURBO_CHARGE: if (0) { // TODO relocated block - required to match back: - player->koStatus = STATUS_KEY_DAZE; + player->koStatus = STATUS_KEY_KO; player->disableEffect->data.disableX->koDuration = player->koDuration; goto later; } @@ -1346,7 +1346,7 @@ void btl_state_update_transfer_turn(void) { oldKoDuration = actor->koDuration; actor->koDuration = actor->debuffDuration; if (actor->koDuration > 0) { - actor->koStatus = STATUS_KEY_DAZE; + actor->koStatus = STATUS_KEY_KO; actor->disableEffect->data.disableX->koDuration = actor->koDuration; } else if (oldKoDuration != actor->koDuration) { actor->koStatus = 0; @@ -1789,7 +1789,7 @@ void btl_state_update_victory(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; gBattleStatus.flags1 &= ~BS_FLAGS1_SHOW_PLAYER_DECORATIONS; - if (player->koStatus == STATUS_KEY_DAZE) { + if (player->koStatus == STATUS_KEY_KO) { dispatch_event_player(EVENT_RECOVER_FROM_KO); gBattleSubState = BTL_SUBSTATE_VICTORY_AWAIT_RECOVER_KO; } @@ -1802,7 +1802,7 @@ void btl_state_update_victory(void) { player->disableEffect->data.disableX->koDuration = 0; if (partner != nullptr) { - if (partner->koStatus == STATUS_KEY_DAZE) { + if (partner->koStatus == STATUS_KEY_KO) { dispatch_event_partner(EVENT_RECOVER_FROM_KO); gBattleSubState = BTL_SUBSTATE_VICTORY_AWAIT_RECOVER_KO; } @@ -1961,7 +1961,7 @@ void btl_state_update_end_training_battle(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; - if (player->koStatus == STATUS_KEY_DAZE) { + if (player->koStatus == STATUS_KEY_KO) { dispatch_event_player(EVENT_RECOVER_FROM_KO); gBattleSubState = BTL_SUBSTATE_END_TRAINING_AWAIT_RECOVERING; } @@ -1973,7 +1973,7 @@ void btl_state_update_end_training_battle(void) { player->koDuration = 0; player->disableEffect->data.disableX->koDuration = 0; if (partner != nullptr) { - if (partner->koStatus == STATUS_KEY_DAZE) { + if (partner->koStatus == STATUS_KEY_KO) { dispatch_event_partner(EVENT_RECOVER_FROM_KO); gBattleSubState = BTL_SUBSTATE_END_TRAINING_AWAIT_RECOVERING; } @@ -3297,7 +3297,7 @@ void btl_state_update_partner_move(void) { btl_update_ko_status(); - if (partner->statusAfflicted == STATUS_KEY_DAZE && !btl_are_all_enemies_defeated()) { + if (partner->statusAfflicted == STATUS_KEY_KO && !btl_are_all_enemies_defeated()) { btl_cam_use_preset(BTL_CAM_PARTNER_INJURED); btl_show_battle_message(BTL_MSG_PARTNER_INJURED, 60); partner->statusAfflicted = 0; @@ -3762,7 +3762,7 @@ void btl_state_update_enemy_move(void) { switch (gBattleSubState) { case BTL_SUBSTATE_ENEMY_MOVE_CHECK_PARTNER: if (partner != nullptr) { - if (partner->statusAfflicted == STATUS_KEY_DAZE) { + if (partner->statusAfflicted == STATUS_KEY_KO) { player->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS | ACTOR_FLAG_USING_IDLE_ANIM; partner->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS | ACTOR_FLAG_USING_IDLE_ANIM; btl_cam_use_preset(BTL_CAM_PARTNER_INJURED); diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index e63b0725ffa..3bcb76435cd 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -2460,7 +2460,7 @@ s32 btl_player_can_act(void) { s8 debuff = player->debuff; s32 playerCantMove = false; - if (player->koStatus == STATUS_KEY_DAZE) { + if (player->koStatus == STATUS_KEY_KO) { playerCantMove = true; } if (debuff == STATUS_KEY_POISON) { @@ -2504,7 +2504,7 @@ s32 btl_menu_can_player_move(void) { s8 debuff = player->debuff; s32 playerCantMove = false; - if (player->koStatus == STATUS_KEY_DAZE) { + if (player->koStatus == STATUS_KEY_KO) { playerCantMove = true; } if (debuff == STATUS_KEY_POISON) { @@ -2556,7 +2556,7 @@ s32 btl_partner_can_act(void) { partnerDebuff = partner->debuff; partnerCantMove = false; - if (partner->koStatus == STATUS_KEY_DAZE) { + if (partner->koStatus == STATUS_KEY_KO) { partnerCantMove = true; } if (partnerDebuff == STATUS_KEY_POISON) { @@ -5085,7 +5085,7 @@ void btl_state_update_twink_menu(void) { if (player->stoneStatus == STATUS_KEY_STONE) { shouldSkipTurn = true; } - if (player->koStatus == STATUS_KEY_DAZE) { + if (player->koStatus == STATUS_KEY_KO) { shouldSkipTurn = true; } diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index f2605d8676a..c8711d6a8a5 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -42,7 +42,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/gloomba.inc.c b/src/battle/common/actor/gloomba.inc.c index 3e8dfb95769..df5c29123d2 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 80, diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index caa178476b8..200a43d1ca9 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index 733bfa5ad92..038906d4875 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -62,7 +62,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 50, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index 658f037cdb5..ce2eba89949 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 80, diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index fb0a0552b51..96bffcd43e1 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 80, diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index ffa44f3c778..828fc38521c 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 50, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 6e547edb28f..13b5648bcc0 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -48,7 +48,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index 9718c60a1b5..73816a721b2 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 80, diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 589b3bac674..e0bc33483a2 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/common/actor/pyro_guy.inc.c b/src/battle/common/actor/pyro_guy.inc.c index 57dcdb90fab..8ccaa7d82f1 100644 --- a/src/battle/common/actor/pyro_guy.inc.c +++ b/src/battle/common/actor/pyro_guy.inc.c @@ -50,7 +50,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/shy_guy_base.inc.c b/src/battle/common/actor/shy_guy_base.inc.c index 730938ffa12..50632112059 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index eaf120f7f9e..59b4c118a35 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -116,7 +116,7 @@ s32 N(FlyingStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -141,7 +141,7 @@ s32 N(StatusTable_802296D0)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index 7eca0348fa6..2b8f5e2af92 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -99,7 +99,7 @@ s32 N(SpearGuyStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, @@ -124,7 +124,7 @@ s32 N(ShyGuyStatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 90, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index 5352ef85646..aa94b1b8979 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -78,7 +78,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 80, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 0, STATUS_KEY_PARALYZE, 90, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 313c36b2f81..f975bfbeddf 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -45,7 +45,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 50, STATUS_KEY_FROZEN, 0, STATUS_KEY_DIZZY, 75, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 50, STATUS_KEY_PARALYZE, 75, STATUS_KEY_SHRINK, 75, diff --git a/src/battle/dmg_item.c b/src/battle/dmg_item.c index 1240997814a..34aef244106 100644 --- a/src/battle/dmg_item.c +++ b/src/battle/dmg_item.c @@ -424,7 +424,7 @@ HitResult calc_item_damage_enemy(void) { if (actorClass == ACTOR_PARTNER) { if ((battleStatus->lastAttackDamage > 0) && (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) { - inflict_status(target, STATUS_KEY_DAZE, battleStatus->lastAttackDamage); + inflict_status(target, STATUS_KEY_KO, battleStatus->lastAttackDamage); } } diff --git a/src/battle/dmg_partner.c b/src/battle/dmg_partner.c index 554a2605a15..9ed034c9cbe 100644 --- a/src/battle/dmg_partner.c +++ b/src/battle/dmg_partner.c @@ -948,7 +948,7 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) { if (battleStatus->lastAttackDamage > 0) { gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; - inflict_status(partner, STATUS_KEY_DAZE, battleStatus->lastAttackDamage); + inflict_status(partner, STATUS_KEY_KO, battleStatus->lastAttackDamage); } if (!stopMotion) { diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 555e41a6b26..78dbbf4ce20 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -262,7 +262,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleBombette_Sleep, STATUS_KEY_POISON, ANIM_BattleBombette_Still, STATUS_KEY_STOP, ANIM_BattleBombette_Still, - STATUS_KEY_DAZE, ANIM_BattleBombette_Injured, + STATUS_KEY_KO, ANIM_BattleBombette_Injured, STATUS_KEY_INACTIVE, ANIM_BattleBombette_Still, STATUS_END, }; @@ -279,7 +279,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 699457080ef..83917311b87 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -155,7 +155,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleBow_Pray, STATUS_KEY_POISON, ANIM_BattleBow_Still, STATUS_KEY_STOP, ANIM_BattleBow_Still, - STATUS_KEY_DAZE, ANIM_BattleBow_Injured, + STATUS_KEY_KO, ANIM_BattleBow_Injured, STATUS_KEY_INACTIVE, ANIM_BattleBow_Still, STATUS_END, }; @@ -172,7 +172,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 585e21915f6..f6af02c5b0d 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -486,7 +486,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleGoombario_CloseEyes, STATUS_KEY_POISON, ANIM_BattleGoombario_Still, STATUS_KEY_STOP, ANIM_BattleGoombario_Still, - STATUS_KEY_DAZE, ANIM_BattleGoombario_Injured, + STATUS_KEY_KO, ANIM_BattleGoombario_Injured, STATUS_KEY_INACTIVE, ANIM_BattleGoombario_Still, STATUS_END, }; @@ -503,7 +503,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/goompa.c b/src/battle/partner/goompa.c index 24e703c4c66..42550c259c0 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 54dc92f6e84..08ba279be34 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -197,7 +197,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleKooper_Pray, STATUS_KEY_POISON, ANIM_BattleKooper_Still, STATUS_KEY_STOP, ANIM_BattleKooper_Still, - STATUS_KEY_DAZE, ANIM_BattleKooper_Injured, + STATUS_KEY_KO, ANIM_BattleKooper_Injured, STATUS_KEY_INACTIVE, ANIM_BattleKooper_Still, STATUS_END, }; @@ -214,7 +214,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 39065d99bd8..d88795dc78a 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -87,7 +87,7 @@ typedef struct HurricaneState { s32 N(DefaultAnims)[] = { STATUS_KEY_NORMAL, ANIM_BattleLakilester_Walk, - STATUS_KEY_DAZE, ANIM_BattleLakilester_Injured, + STATUS_KEY_KO, ANIM_BattleLakilester_Injured, STATUS_KEY_INACTIVE, ANIM_BattleLakilester_Still, STATUS_END, }; @@ -109,7 +109,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index f964b092fa7..542cc039e6e 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -622,7 +622,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleParakarry_Pray, STATUS_KEY_POISON, ANIM_BattleParakarry_Still, STATUS_KEY_STOP, ANIM_BattleParakarry_Still, - STATUS_KEY_DAZE, ANIM_BattleParakarry_Injured, + STATUS_KEY_KO, ANIM_BattleParakarry_Injured, STATUS_KEY_INACTIVE, ANIM_BattleParakarry_Still, STATUS_END, }; @@ -639,7 +639,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 36ee3769fee..9b03c4f7126 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -393,7 +393,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleSushie_Pray, STATUS_KEY_POISON, ANIM_BattleSushie_Still, STATUS_KEY_STOP, ANIM_BattleSushie_Still, - STATUS_KEY_DAZE, ANIM_BattleSushie_Injured, + STATUS_KEY_KO, ANIM_BattleSushie_Injured, STATUS_KEY_INACTIVE, ANIM_BattleSushie_Still, STATUS_END, }; @@ -410,7 +410,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index ddb0a6a24d2..bf38fb57099 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_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index ac9dc6095b6..a2f18cb74b9 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -451,7 +451,7 @@ s32 N(DefaultAnims)[] = { STATUS_KEY_SLEEP, ANIM_BattleWatt_Sleep, STATUS_KEY_POISON, ANIM_BattleWatt_Still, STATUS_KEY_STOP, ANIM_BattleWatt_Still, - STATUS_KEY_DAZE, ANIM_BattleWatt_Injured, + STATUS_KEY_KO, ANIM_BattleWatt_Injured, STATUS_KEY_INACTIVE, ANIM_BattleWatt_Still, STATUS_END, }; @@ -469,7 +469,7 @@ s32 N(StatusTable)[] = { STATUS_KEY_POISON, 100, STATUS_KEY_FROZEN, 100, STATUS_KEY_DIZZY, 100, - STATUS_KEY_UNUSED, 100, + STATUS_KEY_UNUSED, 100, STATUS_KEY_STATIC, 100, STATUS_KEY_PARALYZE, 100, STATUS_KEY_SHRINK, 100, From ae5b15dcf4b8e4982e6402ad12b1ba5daecca2b4 Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 29 Nov 2025 01:08:10 -0500 Subject: [PATCH 13/18] simplified PLAYER_BUFF --- include/enums.h | 10 +++++----- src/battle/area/kpa2/actor/final_bowser_1.c | 2 +- src/battle/area/kpa2/actor/final_bowser_2.c | 2 +- src/battle/area/kpa2/actor/hallway_bowser.c | 2 +- src/battle/area/kpa2/actor/unused_bowser.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/enums.h b/include/enums.h index 72fa63c755b..375d3bc5ed7 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2831,7 +2831,7 @@ enum Buttons { }; enum PlayerBuffs { - PLAYER_BUFF_ALL = 0xFFFFFFFF, + PLAYER_BUFF_ALL = 0x0FFFFFFF, PLAYER_BUFF_JUMP_CHARGE = 0x00000001, PLAYER_BUFF_HAMMER_CHARGE = 0x00000002, PLAYER_BUFF_STONE = 0x00000008, @@ -2868,21 +2868,21 @@ enum StatusFlags { // general combination of flags for checking if an enemy is immobilized #define STATUS_FLAGS_IMMOBILIZED \ - (STATUS_FLAG_SLEEP \ + ( STATUS_FLAG_SLEEP \ | STATUS_FLAG_FROZEN \ | STATUS_FLAG_UNUSED \ | STATUS_FLAG_PARALYZE \ | STATUS_FLAG_DIZZY \ | STATUS_FLAG_STONE \ - | STATUS_FLAG_STOP) + | STATUS_FLAG_STOP ) // common set of flags used in checks throughout Dojo fights #define STATUS_FLAGS_DOJO \ - (STATUS_FLAG_SLEEP \ + ( STATUS_FLAG_SLEEP \ | STATUS_FLAG_PARALYZE \ | STATUS_FLAG_DIZZY \ | STATUS_FLAG_STONE \ - | STATUS_FLAG_STOP) + | STATUS_FLAG_STOP ) enum DamageTypes { DAMAGE_TYPE_FIRE = 0x00000002, diff --git a/src/battle/area/kpa2/actor/final_bowser_1.c b/src/battle/area/kpa2/actor/final_bowser_1.c index 1829691bff3..2c4d5f6e03f 100644 --- a/src/battle/area/kpa2/actor/final_bowser_1.c +++ b/src/battle/area/kpa2/actor/final_bowser_1.c @@ -1308,7 +1308,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Set(LVar1, DMG_SHOCKWAVE) EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) - Call(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) + Call(RemovePlayerBuffs, PLAYER_BUFF_ALL) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kpa2/actor/final_bowser_2.c b/src/battle/area/kpa2/actor/final_bowser_2.c index 66416a366e5..5c4478e28ec 100644 --- a/src/battle/area/kpa2/actor/final_bowser_2.c +++ b/src/battle/area/kpa2/actor/final_bowser_2.c @@ -1542,7 +1542,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Set(LVar1, DMG_SHOCKWAVE) EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) - Call(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) + Call(RemovePlayerBuffs, PLAYER_BUFF_ALL) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kpa2/actor/hallway_bowser.c b/src/battle/area/kpa2/actor/hallway_bowser.c index d1b0c8ccd25..47c8d9c0b27 100644 --- a/src/battle/area/kpa2/actor/hallway_bowser.c +++ b/src/battle/area/kpa2/actor/hallway_bowser.c @@ -1462,7 +1462,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { Set(LVar1, DMG_SHOCKWAVE) EndIf Call(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) - Call(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) + Call(RemovePlayerBuffs, PLAYER_BUFF_ALL) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kpa2/actor/unused_bowser.c b/src/battle/area/kpa2/actor/unused_bowser.c index 829fffb868f..39ea3ee4a4f 100644 --- a/src/battle/area/kpa2/actor/unused_bowser.c +++ b/src/battle/area/kpa2/actor/unused_bowser.c @@ -569,7 +569,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EndThread Call(SetGoalToTarget, ACTOR_SELF) Call(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, STATUS_FLAG_POISON, DMG_SHOCKWAVE, BS_FLAGS1_TRIGGER_EVENTS) - Call(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) + Call(RemovePlayerBuffs, PLAYER_BUFF_ALL) Switch(LVarF) CaseOrEq(HIT_RESULT_HIT) CaseOrEq(HIT_RESULT_NO_DAMAGE) From d1fb9f24a4a6429381f662d35c6910a8da3dcbec Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 29 Nov 2025 01:13:11 -0500 Subject: [PATCH 14/18] status enum reorg --- include/enums.h | 95 +++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/include/enums.h b/include/enums.h index 375d3bc5ed7..7a8b2cb769b 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2226,53 +2226,6 @@ enum HitSounds { HIT_SOUND_SHOCK = 5, }; -// Player.debuff -// Partner.debuff -enum StatusKeys { - STATUS_END = 0x00000000, - STATUS_KEY_NORMAL = 0x00000001, - STATUS_KEY_DEFAULT = 0x00000002, - STATUS_KEY_UNUSED = 0x00000003, - STATUS_KEY_DIZZY = 0x00000004, - STATUS_KEY_PARALYZE = 0x00000005, - STATUS_KEY_SLEEP = 0x00000006, - STATUS_KEY_FROZEN = 0x00000007, - STATUS_KEY_STOP = 0x00000008, - STATUS_KEY_POISON = 0x00000009, - STATUS_KEY_SHRINK = 0x0000000A, - STATUS_KEY_STATIC = 0x0000000B, - STATUS_KEY_STONE = 0x0000000C, - STATUS_KEY_KO = 0x0000000D, - STATUS_KEY_TRANSPARENT = 0x0000000E, - STATUS_KEY_0F = 0x0000000F, - STATUS_KEY_BERSERK = 0x00000010, - STATUS_KEY_11 = 0x00000011, - STATUS_KEY_INACTIVE = 0x00000012, - STATUS_KEY_INACTIVE_BERSERK = 0x00000013, - STATUS_KEY_14 = 0x00000014, // probably STATUS_KEY_INACTIVE_FROZEN - STATUS_KEY_INACTIVE_SLEEP = 0x00000015, - STATUS_KEY_INACTIVE_WEARY = 0x00000016, - STATUS_KEY_17 = 0x00000017, - STATUS_KEY_INACTIVE_DIZZY = 0x00000018, - STATUS_KEY_HUSTLE = 0x00000019, - STATUS_KEY_DANGER = 0x0000001A, - STATUS_KEY_1B = 0x0000001B, - STATUS_KEY_THINKING = 0x0000001C, - STATUS_KEY_WEARY = 0x0000001D, - STATUS_KEY_1E = 0x0000001E, - STATUS_TURN_MOD_DEFAULT = 0x0000001F, - STATUS_TURN_MOD_SLEEP = 0x00000020, - STATUS_TURN_MOD_STATIC = 0x00000021, - STATUS_TURN_MOD_FROZEN = 0x00000022, - STATUS_TURN_MOD_UNUSED = 0x00000023, - STATUS_TURN_MOD_DIZZY = 0x00000024, - STATUS_TURN_MOD_POISON = 0x00000025, - STATUS_TURN_MOD_PARALYZE = 0x00000026, - STATUS_TURN_MOD_SHRINK = 0x00000027, - STATUS_TURN_MOD_STONE = 0x00000028, - STATUS_TURN_MOD_STOP = 0x00000029, -}; - enum ActorPaletteAdjustments { ACTOR_PAL_ADJUST_NONE = 0, ACTOR_PAL_ADJUST_SLEEP = 3, @@ -2830,6 +2783,7 @@ enum Buttons { BUTTON_STICK_RIGHT = 0x00080000, }; +// only used with RemovePlayerBuffs enum PlayerBuffs { PLAYER_BUFF_ALL = 0x0FFFFFFF, PLAYER_BUFF_JUMP_CHARGE = 0x00000001, @@ -2844,6 +2798,53 @@ enum PlayerBuffs { PLAYER_BUFF_PARTNER_GLOWING = 0x00010000, }; +// Player.debuff +// Partner.debuff +enum StatusKeys { + STATUS_END = 0x00000000, + STATUS_KEY_NORMAL = 0x00000001, + STATUS_KEY_DEFAULT = 0x00000002, + STATUS_KEY_UNUSED = 0x00000003, + STATUS_KEY_DIZZY = 0x00000004, + STATUS_KEY_PARALYZE = 0x00000005, + STATUS_KEY_SLEEP = 0x00000006, + STATUS_KEY_FROZEN = 0x00000007, + STATUS_KEY_STOP = 0x00000008, + STATUS_KEY_POISON = 0x00000009, + STATUS_KEY_SHRINK = 0x0000000A, + STATUS_KEY_STATIC = 0x0000000B, + STATUS_KEY_STONE = 0x0000000C, + STATUS_KEY_KO = 0x0000000D, + STATUS_KEY_TRANSPARENT = 0x0000000E, + STATUS_KEY_0F = 0x0000000F, + STATUS_KEY_BERSERK = 0x00000010, + STATUS_KEY_11 = 0x00000011, + STATUS_KEY_INACTIVE = 0x00000012, + STATUS_KEY_INACTIVE_BERSERK = 0x00000013, + STATUS_KEY_14 = 0x00000014, // probably STATUS_KEY_INACTIVE_FROZEN + STATUS_KEY_INACTIVE_SLEEP = 0x00000015, + STATUS_KEY_INACTIVE_WEARY = 0x00000016, + STATUS_KEY_17 = 0x00000017, + STATUS_KEY_INACTIVE_DIZZY = 0x00000018, + STATUS_KEY_HUSTLE = 0x00000019, + STATUS_KEY_DANGER = 0x0000001A, + STATUS_KEY_1B = 0x0000001B, + STATUS_KEY_THINKING = 0x0000001C, + STATUS_KEY_WEARY = 0x0000001D, + STATUS_KEY_1E = 0x0000001E, + STATUS_TURN_MOD_DEFAULT = 0x0000001F, + STATUS_TURN_MOD_SLEEP = 0x00000020, + STATUS_TURN_MOD_STATIC = 0x00000021, + STATUS_TURN_MOD_FROZEN = 0x00000022, + STATUS_TURN_MOD_UNUSED = 0x00000023, + STATUS_TURN_MOD_DIZZY = 0x00000024, + STATUS_TURN_MOD_POISON = 0x00000025, + STATUS_TURN_MOD_PARALYZE = 0x00000026, + STATUS_TURN_MOD_SHRINK = 0x00000027, + STATUS_TURN_MOD_STONE = 0x00000028, + STATUS_TURN_MOD_STOP = 0x00000029, +}; + enum StatusFlags { STATUS_FLAG_SLEEP = 0x00001000, STATUS_FLAG_STATIC = 0x00002000, From c2552e57b19c2f3bb4b1ca33fa605b246ec66830 Mon Sep 17 00:00:00 2001 From: z64a Date: Fri, 16 Jan 2026 15:34:57 -0500 Subject: [PATCH 15/18] old --- diff.py | 4 +- include/enums.h | 2 +- src/hud_element.c | 6 +-- src/imgfx.c | 58 +++++++++++++++---------- src/inspect_icon.c | 4 +- src/speech_bubble.c | 4 +- src/world/area_end/common/Credits.inc.c | 18 ++++---- 7 files changed, 55 insertions(+), 41 deletions(-) diff --git a/diff.py b/diff.py index 1b12f9a411c..b1f070f171e 100755 --- a/diff.py +++ b/diff.py @@ -1224,7 +1224,7 @@ def search_map_file( + re.escape(config.diff_section) + r"\))? \t" # object name - + "(\S+)", + + r"(\S+)", contents, ) if len(find) > 1: @@ -2907,7 +2907,7 @@ def format_part( for source_line in line2.source_lines: line_format = BasicFormat.SOURCE_OTHER if config.source_old_binutils: - if source_line and re.fullmatch(".*\.c(?:pp)?:\d+", source_line): + if source_line and re.fullmatch(r".*\.c(?:pp)?:\d+", source_line): line_format = BasicFormat.SOURCE_FILENAME elif source_line and source_line.endswith("():"): line_format = BasicFormat.SOURCE_FUNCTION diff --git a/include/enums.h b/include/enums.h index 7a8b2cb769b..3474ce53608 100644 --- a/include/enums.h +++ b/include/enums.h @@ -5111,7 +5111,7 @@ enum ImgFXStateFlags { IMGFX_FLAG_8 = 0x00000008, IMGFX_FLAG_SKIP_GFX_SETUP = 0x00000010, IMGFX_FLAG_SKIP_TEX_SETUP = 0x00000020, - IMGFX_FLAG_40 = 0x00000040, + IMGFX_FLAG_SKIP_ZBUF = 0x00000040, IMGFX_FLAG_LOOP_ANIM = 0x00000080, IMGFX_FLAG_REVERSE_ANIM = 0x00000100, // fold animation plays backwards (from end to start) IMGFX_FLAG_200 = 0x00000200, diff --git a/src/hud_element.c b/src/hud_element.c index 1ab651f1984..1b4481df01c 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -1542,12 +1542,12 @@ void render_complex_hud_element(HudElement* hudElement) { if (hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD) { if (hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING) { - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, sp60); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_SKIP_ZBUF, sp60); } else { - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, sp60); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_SKIP_ZBUF, sp60); } } else { - imgfx_appendGfx_component(transform->imgfxIdx, &ifxImg, IMGFX_FLAG_40, sp60); + imgfx_appendGfx_component(transform->imgfxIdx, &ifxImg, IMGFX_FLAG_SKIP_ZBUF, sp60); } break; case 2: diff --git a/src/imgfx.c b/src/imgfx.c index c968bbaba4e..ff53f2d8448 100644 --- a/src/imgfx.c +++ b/src/imgfx.c @@ -154,25 +154,40 @@ Gfx DefaultImgFXSetupGfx[] = { gsSPEndDisplayList(), }; -//TODO figure out bits +#define RM_IMGFX_A1 \ + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) | \ + ( AA_EN | CVG_DST_FULL | CVG_X_ALPHA | ZMODE_OPA ) + +#define RM_IMGFX_A2 \ + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) | \ + ( AA_EN | CVG_DST_FULL | CVG_X_ALPHA | ZMODE_OPA ) + +#define RM_IMGFX_B1 ((RM_ZB_CLD_SURF(1)) & ~Z_CMP) +// GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) | \ +// ( FORCE_BL | IM_RD | CVG_DST_SAVE | ZMODE_XLU ) + +#define RM_IMGFX_B2 ((RM_ZB_CLD_SURF(2)) & ~Z_CMP) +// GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) | \ +// ( FORCE_BL | IM_RD | CVG_DST_SAVE | ZMODE_XLU ) + ImgFXRenderMode ImgFXRenderModes[] = { - [IMGFX_RENDER_DEFAULT] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_MULTIPLY_RGB] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_MULTIPLY_ALPHA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_MULTIPLY_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_MODULATE_PRIM_RGB] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_MODULATE_PRIM_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_MULTIPLY_SHADE_RGB] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_MULTIPLY_SHADE_ALPHA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_MULTIPLY_SHADE_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_MODULATE_SHADE_RGB] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_MODULATE_SHADE_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_ANIM] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_HOLOGRAM] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_COLOR_FILL] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_OVERLAY_RGB] { 0x00441208, 0x00111208, 0 }, - [IMGFX_RENDER_OVERLAY_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, - [IMGFX_RENDER_UNUSED] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_DEFAULT] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_MULTIPLY_RGB] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_MULTIPLY_ALPHA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MULTIPLY_RGBA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MODULATE_PRIM_RGB] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_MODULATE_PRIM_RGBA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MULTIPLY_SHADE_RGB] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_MULTIPLY_SHADE_ALPHA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MULTIPLY_SHADE_RGBA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MODULATE_SHADE_RGB] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_MODULATE_SHADE_RGBA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_ANIM] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_HOLOGRAM] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_COLOR_FILL] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_OVERLAY_RGB] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, + [IMGFX_RENDER_OVERLAY_RGBA] { RM_IMGFX_B1, RM_IMGFX_B2, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_UNUSED] { RM_IMGFX_A1, RM_IMGFX_A2, 0 }, }; extern Addr shock_header; @@ -854,9 +869,8 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { break; } primAlpha = state->ints.color.a * ifxImgAlpha; - //TODO figure out bits - mode1 = 0x404B40; - mode2 = 0x104B40; + mode1 = RM_IMGFX_B1; + mode2 = RM_IMGFX_B2; skipModeChange = true; } @@ -867,7 +881,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { mode2 |= (ALPHA_CVG_SEL | IM_RD); } - if (state->flags & IMGFX_FLAG_40) { + if (state->flags & IMGFX_FLAG_SKIP_ZBUF) { gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER); } else { gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER); diff --git a/src/inspect_icon.c b/src/inspect_icon.c index f2286e69600..3fc1320d847 100644 --- a/src/inspect_icon.c +++ b/src/inspect_icon.c @@ -81,10 +81,10 @@ void appendGfx_interact_prompt(void) { ifxImg.xOffset = -16; ifxImg.yOffset = 26; ifxImg.alpha = 255; - imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, IMGFX_FLAG_400 | IMGFX_FLAG_40); + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, IMGFX_FLAG_400 | IMGFX_FLAG_SKIP_ZBUF); imgfx_update(0, IMGFX_SET_COLOR, InspectIconPtr->brightness, InspectIconPtr->brightness, InspectIconPtr->brightness, 255, - IMGFX_FLAG_400 | IMGFX_FLAG_40 | IMGFX_FLAG_8); + IMGFX_FLAG_400 | IMGFX_FLAG_SKIP_ZBUF | IMGFX_FLAG_8); imgfx_appendGfx_component(0, &ifxImg, 0, sp78); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/speech_bubble.c b/src/speech_bubble.c index 85bc1848600..1d82805d557 100644 --- a/src/speech_bubble.c +++ b/src/speech_bubble.c @@ -68,10 +68,10 @@ void appendGfx_speech_bubble(void) { ifxImg.xOffset = -16; ifxImg.yOffset = 26; ifxImg.alpha = 255; - imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, IMGFX_FLAG_400 | IMGFX_FLAG_40); + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, IMGFX_FLAG_400 | IMGFX_FLAG_SKIP_ZBUF); imgfx_update(0, IMGFX_SET_COLOR, SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, 255, 0x440); - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, mtxTransform); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_SKIP_ZBUF, mtxTransform); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/world/area_end/common/Credits.inc.c b/src/world/area_end/common/Credits.inc.c index e288fee6e37..a92b3ba3a58 100644 --- a/src/world/area_end/common/Credits.inc.c +++ b/src/world/area_end/common/Credits.inc.c @@ -137,7 +137,7 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -181,7 +181,7 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -224,7 +224,7 @@ void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -268,7 +268,7 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -281,7 +281,7 @@ void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { f32 posX, posY, scaleAmt, rotAngle; f32 startX = (line->posX + line->msgWidth) - 16; f32 startY = line->posY + 60; - u32 imgfxFlags = IMGFX_FLAG_40; + u32 imgfxFlags = IMGFX_FLAG_SKIP_ZBUF; posX = update_lerp(EASING_COS_IN_OUT, startX, chr->posX, chr->fadeInTime, line->appearTime); posY = update_lerp(EASING_CUBIC_OUT, startY, chr->posY, chr->fadeInTime, line->appearTime); @@ -364,7 +364,7 @@ void N(CharAnim_HoldClearImgFX)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -409,7 +409,7 @@ void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -444,7 +444,7 @@ void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -479,7 +479,7 @@ void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); ifxImg.yOffset = 0; ifxImg.alpha = 255; - imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_SKIP_ZBUF, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } From 185565f2d5549955dfe619cce32ff3805222f824 Mon Sep 17 00:00:00 2001 From: z64a Date: Fri, 16 Jan 2026 16:31:23 -0500 Subject: [PATCH 16/18] input names --- include/common_structs.h | 8 +- include/functions.h | 2 +- src/bss/main_pre_bss.c | 2 +- src/input.c | 233 +++++++++++++++++++++++---------------- src/main_loop.c | 12 +- src/state_startup.c | 6 +- ver/jp/symbol_addrs.txt | 12 +- ver/us/symbol_addrs.txt | 14 +-- 8 files changed, 163 insertions(+), 126 deletions(-) diff --git a/include/common_structs.h b/include/common_structs.h index 367e45ee7d5..41eacf3e79e 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1420,11 +1420,11 @@ typedef struct GameStatus { /* 0x030 */ u32 prevButtons[4]; /* from previous frame */ /* 0x040 */ s8 stickX[4]; /* with deadzone */ /* 0x044 */ s8 stickY[4]; /* with deadzone */ - /* 0x048 */ s16 unk_48[4]; - /* 0x050 */ s16 unk_50[4]; - /* 0x058 */ s16 unk_58; + /* 0x048 */ s16 holdDelayTime[4]; + /* 0x050 */ s16 holdRepeatInterval[4]; + /* 0x058 */ s16 holdDelayCounter; /* 0x05A */ char unk_5A[6]; - /* 0x060 */ s16 unk_60; + /* 0x060 */ s16 holdRepeatCounter; /* 0x062 */ char unk_62[6]; /* 0x068 */ s16 demoButtonInput; /* 0x06A */ s8 demoStickX; diff --git a/include/functions.h b/include/functions.h index d8cc509af15..fb8eb26364a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -603,7 +603,7 @@ void render_workers_frontUI(void); void render_screen_overlay_frontUI(void); void render_curtains(void); void fio_init_flash(void); -void func_80028838(void); +void clear_input(void); void clear_screen_overlays(void); void reset_ambient_sounds(void); void poll_rumble(void); diff --git a/src/bss/main_pre_bss.c b/src/bss/main_pre_bss.c index e4d30e5f67a..244b0ef9576 100644 --- a/src/bss/main_pre_bss.c +++ b/src/bss/main_pre_bss.c @@ -13,7 +13,7 @@ BSS u8 nuScPreNMIFlag; BSS s32 D_8009A5B4; -BSS s32 D_8009A5B8; +BSS s32 ContPadData; BSS s32 D_8009A5BC; #if VERSION_IQUE || VERSION_PAL BSS s32 __osFlashVersion; diff --git a/src/input.c b/src/input.c index ef414983fbf..9bdfc5d8016 100644 --- a/src/input.c +++ b/src/input.c @@ -1,87 +1,109 @@ #include "common.h" #include "nu/nusys.h" -OSContPad D_8009A5B8; -BSS s16 D_8009A6A0; -BSS s16 D_8009A6A2; -BSS s16 D_8009A6A4; -BSS s16 D_8009A6A6; +OSContPad ContPadData; +BSS s16 StickExtremeX; +BSS s16 StickExtremeY; +BSS s16 StickAnchorStateX; +BSS s16 StickAnchorStateY; BSS s32 D_8009A6A8; // unused -void func_800287F0(void) { +#define STICK_DEADZONE_THRESHOLD 4 +#define STICK_BUTTON_THRESHOLD 32 +#define STICK_RELEASE_THRESHOLD 16 + +/* + * When converting analog stick input into digital direction buttons (BUTTON_STICK_LEFT/RIGHT/UP/DOWN), + * small oscillations near the threshold can trigger rapid spurious stick 'button' inputs. + * This input system tracks recent stick positions by recording most recent 'extreme' values of StickX/Y + * along with movement direction. + * + * How it works: + * - When the stick crosses the main threshold (|stick| > 32), the corresponding digital stick 'button' is set. + * - While held, the code tracks the furthest extreme reached in the 'outward' direction. + * - If the stick reverses inward by more than 16 units, it enters a release-check state. + * - If the stick then moves outward again by more than 16 units from the inward extreme, the stick button is cleared. + * and a new input may be triggered *without* having to fully return the stick to neutral. + */ +enum { + STATE_BUILDUP = 0, // track outward extremes while the stick is pressed past the threshold + STATE_RELEASE = 1, // track inward motion and determine when the stick direction should be released +}; + +void reset_input_state(void) { gGameStatusPtr->curButtons[0] = 0; gGameStatusPtr->pressedButtons[0] = 0; gGameStatusPtr->heldButtons[0] = 0; gGameStatusPtr->stickX[0] = 0; gGameStatusPtr->stickY[0] = 0; gGameStatusPtr->prevButtons[0] = 0; - gGameStatusPtr->unk_50[0] = 4; - gGameStatusPtr->unk_48[0] = 15; - gGameStatusPtr->unk_60 = 0; - gGameStatusPtr->unk_58 = 0; + gGameStatusPtr->holdRepeatInterval[0] = 4; + gGameStatusPtr->holdDelayTime[0] = 15; + gGameStatusPtr->holdRepeatCounter = 0; + gGameStatusPtr->holdDelayCounter = 0; } -void func_80028838(void) { - func_800287F0(); - D_8009A6A0 = 0; - D_8009A6A2 = 0; - D_8009A6A4 = 0; - D_8009A6A6 = 0; +void clear_input(void) { + reset_input_state(); + StickExtremeX = 0; + StickExtremeY = 0; + StickAnchorStateX = STATE_BUILDUP; + StickAnchorStateY = STATE_BUILDUP; } void update_input(void) { - OSContPad* contData = &D_8009A5B8; - s16 handleInput = false; - s16 cond1; + OSContPad* contData = &ContPadData; + s16 hasInput = false; + s16 stickButtonDetected; s32 buttons; s16 stickX; s16 stickY; if (gGameStatusPtr->contBitPattern & 1) { - handleInput = true; + hasInput = true; nuContDataGet(contData, 0); } if (gGameStatusPtr->demoState != DEMO_STATE_NONE) { if (gGameStatusPtr->demoState < DEMO_STATE_CHANGE_MAP && (contData->button & (BUTTON_A | BUTTON_B | BUTTON_Z | BUTTON_START)) - && handleInput + && hasInput ) { gGameStatusPtr->demoState = DEMO_STATE_CHANGE_MAP; } contData->button = gGameStatusPtr->demoButtonInput; contData->stick_x = gGameStatusPtr->demoStickX; contData->stick_y = gGameStatusPtr->demoStickY; - handleInput = true; + hasInput = true; } - if (!handleInput) { + if (!hasInput) { return; } stickX = contData->stick_x; stickY = contData->stick_y; if (stickX > 0) { - stickX -= 4; + stickX -= STICK_DEADZONE_THRESHOLD; if (stickX < 0) { stickX = 0; } } if (stickX < 0) { - stickX += 4; + stickX += STICK_DEADZONE_THRESHOLD; if (stickX > 0) { stickX = 0; } } if (stickY > 0) { - stickY -= 4; + stickY -= STICK_DEADZONE_THRESHOLD; if (stickY < 0) { stickY = 0; } } if (stickY < 0) { - stickY += 4; + stickY += STICK_DEADZONE_THRESHOLD; if (stickY > 0) { stickY = 0; } @@ -89,122 +111,132 @@ void update_input(void) { gGameStatusPtr->stickX[0] = stickX; gGameStatusPtr->stickY[0] = stickY; - buttons = contData->button; - cond1 = false; - if (stickX > 0x20) { - cond1 = true; + + // check if stickX is over the 'digital' threshold for a right stick 'button' press + stickButtonDetected = false; + if (stickX > STICK_BUTTON_THRESHOLD) { + stickButtonDetected = true; buttons |= BUTTON_STICK_RIGHT; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_RIGHT)) { - D_8009A6A0 = stickX; - } else if (D_8009A6A4 == 0) { - if (D_8009A6A0 < stickX) { - D_8009A6A0 = stickX; + StickExtremeX = stickX; + } else if (StickAnchorStateX == STATE_BUILDUP) { + // track largest value during STATE_BUILDUP + if (StickExtremeX < stickX) { + StickExtremeX = stickX; } } else { - if (D_8009A6A0 > stickX) { - D_8009A6A0 = stickX; + // track smallest value during STATE_RELEASE + if (StickExtremeX > stickX) { + StickExtremeX = stickX; } } } - if (stickX < -0x20) { - cond1 = true; + // likewise for left stick 'button' (comparisons reversed since we are working with negative values) + if (stickX < -STICK_BUTTON_THRESHOLD) { + stickButtonDetected = true; buttons |= BUTTON_STICK_LEFT; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_LEFT)) { - D_8009A6A0 = stickX; - } else if (D_8009A6A4 == 0) { - if (D_8009A6A0 > stickX) { - D_8009A6A0 = stickX; + StickExtremeX = stickX; + } else if (StickAnchorStateX == STATE_BUILDUP) { + if (StickExtremeX > stickX) { + StickExtremeX = stickX; } } else { - if (D_8009A6A0 < stickX) + if (StickExtremeX < stickX) { - D_8009A6A0 = stickX; + StickExtremeX = stickX; } } } - if (!cond1) { - D_8009A6A4 = 0; - D_8009A6A0 = stickX; + if (!stickButtonDetected) { + StickAnchorStateX = STATE_BUILDUP; + StickExtremeX = stickX; } - cond1 = false; - if (stickY > 0x20) { - cond1 = true; + // likewise for up stick 'button' + stickButtonDetected = false; + if (stickY > STICK_BUTTON_THRESHOLD) { + stickButtonDetected = true; buttons |= BUTTON_STICK_UP; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_UP)) { - D_8009A6A2 = stickY; - } else if (D_8009A6A6 == 0) { - if (D_8009A6A2 < stickY) { - D_8009A6A2 = stickY; + StickExtremeY = stickY; + } else if (StickAnchorStateY == STATE_BUILDUP) { + if (StickExtremeY < stickY) { + StickExtremeY = stickY; } } else { - if (D_8009A6A2 > stickY) { - D_8009A6A2 = stickY; + if (StickExtremeY > stickY) { + StickExtremeY = stickY; } } } - if (stickY < -0x20) { - cond1 = true; + // likewise for down stick 'button' + if (stickY < -STICK_BUTTON_THRESHOLD) { + stickButtonDetected = true; buttons |= BUTTON_STICK_DOWN; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_DOWN)) { - D_8009A6A2 = stickY; - } else if (D_8009A6A6 == 0) { - if (D_8009A6A2 > stickY) { - D_8009A6A2 = stickY; + StickExtremeY = stickY; + } else if (StickAnchorStateY == STATE_BUILDUP) { + if (StickExtremeY > stickY) { + StickExtremeY = stickY; } } else { - if (D_8009A6A2 < stickY) { - D_8009A6A2 = stickY; + if (StickExtremeY < stickY) { + StickExtremeY = stickY; } } } - if (!cond1) { - D_8009A6A6 = 0; - D_8009A6A2 = stickY; + if (!stickButtonDetected) { + StickAnchorStateY = STATE_BUILDUP; + StickExtremeY = stickY; } - if (stickX > 0x20) { - if (D_8009A6A4 == 1 && stickX - D_8009A6A0 > 0x10) { + if (stickX > STICK_BUTTON_THRESHOLD) { + // if stick changes direction of motion during a release (from inward back to outward), + // clear the old input and reset to BUILDUP in preparation for a new input. this allows quick + // repeated inputs by rocking the stick without having to fully return to neutral between each. + if (StickAnchorStateX == STATE_RELEASE && stickX - StickExtremeX > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_RIGHT; - D_8009A6A4 = 0; + StickAnchorStateX = STATE_BUILDUP; } - if (D_8009A6A0 - stickX > 0x10) { - D_8009A6A4 = 1; + // if we ever fall STICK_RELEASE_THRESHOLD units below the maximum value recorded, begin RELEASE checks + if (StickExtremeX - stickX > STICK_RELEASE_THRESHOLD) { + StickAnchorStateX = STATE_RELEASE; } } - if (stickX < -0x20) { - if (D_8009A6A4 == 1 && D_8009A6A0 - stickX > 0x10) { + if (stickX < -STICK_BUTTON_THRESHOLD) { + if (StickAnchorStateX == STATE_RELEASE && StickExtremeX - stickX > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_LEFT; - D_8009A6A4 = 0; + StickAnchorStateX = STATE_BUILDUP; } - if (stickX - D_8009A6A0 > 0x10) { - D_8009A6A4 = 1; + if (stickX - StickExtremeX > STICK_RELEASE_THRESHOLD) { + StickAnchorStateX = STATE_RELEASE; } } - if (stickY > 0x20) { - if (D_8009A6A6 == 1 && stickY - D_8009A6A2 > 0x10) { + if (stickY > STICK_BUTTON_THRESHOLD) { + if (StickAnchorStateY == STATE_RELEASE && stickY - StickExtremeY > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_UP; - D_8009A6A6 = 0; + StickAnchorStateY = STATE_BUILDUP; } - if (D_8009A6A2 - stickY > 0x10) { - D_8009A6A6 = 1; + if (StickExtremeY - stickY > STICK_RELEASE_THRESHOLD) { + StickAnchorStateY = STATE_RELEASE; } } - if (stickY < -0x20) { - if (D_8009A6A6 == 1 && D_8009A6A2 - stickY > 0x10) { + if (stickY < -STICK_BUTTON_THRESHOLD) { + if (StickAnchorStateY == STATE_RELEASE && StickExtremeY - stickY > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_DOWN; - D_8009A6A6 = 0; + StickAnchorStateY = STATE_BUILDUP; } - if (stickY - D_8009A6A2 > 0x10) { - D_8009A6A6 = 1; + if (stickY - StickExtremeY > STICK_RELEASE_THRESHOLD) { + StickAnchorStateY = STATE_RELEASE; } } @@ -215,27 +247,32 @@ void update_input(void) { if (gGameStatusPtr->curButtons[0] == 0) { gGameStatusPtr->heldButtons[0] = 0; } else if (gGameStatusPtr->prevButtons[0] != gGameStatusPtr->curButtons[0]) { - gGameStatusPtr->heldButtons[0] = gGameStatusPtr->curButtons[0]; - gGameStatusPtr->unk_60 = -1; + // buttons changed this frame: treat new presses as an immediate "held" pulse + gGameStatusPtr->heldButtons[0] = gGameStatusPtr->pressedButtons[0]; + // NOTE: next two lines are just a duplicate calculation for heldButtons = pressedButtons gGameStatusPtr->heldButtons[0] = gGameStatusPtr->curButtons[0] ^ gGameStatusPtr->prevButtons[0]; gGameStatusPtr->heldButtons[0] &= gGameStatusPtr->curButtons[0]; - gGameStatusPtr->unk_58 = gGameStatusPtr->unk_48[0]; + gGameStatusPtr->holdDelayCounter = gGameStatusPtr->holdDelayTime[0]; + gGameStatusPtr->holdRepeatCounter = -1; } else { - if (gGameStatusPtr->unk_60 >= 0) { - gGameStatusPtr->unk_60--; - if (gGameStatusPtr->unk_60 != 0) { + // no change in buttons and at least one button is still held + if (gGameStatusPtr->holdRepeatCounter >= 0) { + // repeat "held" input pulses at a regular interval + gGameStatusPtr->holdRepeatCounter--; + if (gGameStatusPtr->holdRepeatCounter != 0) { gGameStatusPtr->heldButtons[0] = 0; } else { gGameStatusPtr->heldButtons[0] = gGameStatusPtr->curButtons[0]; - gGameStatusPtr->unk_60 = gGameStatusPtr->unk_50[0]; + gGameStatusPtr->holdRepeatCounter = gGameStatusPtr->holdRepeatInterval[0]; } } else { - gGameStatusPtr->unk_58--; - if (gGameStatusPtr->unk_58 != 0) { + // initial delay before train of "held" pulses begin + gGameStatusPtr->holdDelayCounter--; + if (gGameStatusPtr->holdDelayCounter != 0) { gGameStatusPtr->heldButtons[0] = 0; } else { gGameStatusPtr->heldButtons[0] = gGameStatusPtr->curButtons[0]; - gGameStatusPtr->unk_60 = gGameStatusPtr->unk_50[0]; + gGameStatusPtr->holdRepeatCounter = gGameStatusPtr->holdRepeatInterval[0]; } } } diff --git a/src/main_loop.c b/src/main_loop.c index b31b84b49ea..5ac5a931fda 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -24,8 +24,8 @@ GameStatus gGameStatus = { .prevButtons = { 0 }, .stickX = { 0 }, .stickY = { 0 }, - .unk_48 = { 0 }, - .unk_50 = { 0 }, + .holdDelayTime = { 0 }, + .holdRepeatInterval = { 0 }, }; GameStatus* gGameStatusPtr = &gGameStatus; @@ -279,7 +279,7 @@ void load_engine_data(void) { gGameStepDelayCount = 5; gGameStatusPtr->saveCount = 0; fio_init_flash(); - func_80028838(); + clear_input(); general_heap_create(); clear_render_tasks(); clear_worker_list(); @@ -312,9 +312,9 @@ void load_engine_data(void) { initialize_curtains(); poll_rumble(); - for (i = 0; i < ARRAY_COUNT(gGameStatusPtr->unk_50); i++) { - gGameStatusPtr->unk_50[i] = 3; - gGameStatusPtr->unk_48[i] = 12; + for (i = 0; i < ARRAY_COUNT(gGameStatusPtr->holdRepeatInterval); i++) { + gGameStatusPtr->holdRepeatInterval[i] = 3; + gGameStatusPtr->holdDelayTime[i] = 12; } gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; diff --git a/src/state_startup.c b/src/state_startup.c index 34b19cccb0c..28dc6ea4e7f 100644 --- a/src/state_startup.c +++ b/src/state_startup.c @@ -66,9 +66,9 @@ void state_step_startup(void) { bgm_reset_volume(); initialize_curtains(); - for (i = 0; i < ARRAY_COUNT(gGameStatusPtr->unk_50); i++) { - gGameStatusPtr->unk_50[i] = 4; - gGameStatusPtr->unk_48[i] = 15; + for (i = 0; i < ARRAY_COUNT(gGameStatusPtr->holdRepeatInterval); i++) { + gGameStatusPtr->holdRepeatInterval[i] = 4; + gGameStatusPtr->holdDelayTime[i] = 15; } fio_load_globals(); diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index a0b6ec55c6c..4c5e38fe40b 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -13,7 +13,7 @@ gfx_draw_frame = 0x80026AD4; gfx_init_state = 0x80027170; gfx_transfer_frame_to_depth = 0x80027984; gfx_draw_background = 0x80027DE0; -func_80028838 = 0x80028808; +clear_input = 0x80028808; update_input = 0x80028844; poll_rumble = 0x80028EB0; update_max_rumble_duration = 0x80028F4C; @@ -191,7 +191,7 @@ __osHwIntTable = 0x800958A0; D_80095938 = 0x800958C8; D_80099AA0 = 0x80099A80; main_BSS_START = 0x8009A590; -D_8009A5B8 = 0x8009A598; +ContPadData = 0x8009A598; gTimeFreezeMode = 0x8009A5B8; nuGfxZBuffer = 0x8009A5BC; CamLengthScale = 0x8009A5CC; @@ -208,10 +208,10 @@ gMainGfxPos = 0x8009A64C; gDisplayContext = 0x8009A654; ResetFrameBufferArray = 0x8009A660; SoftResetDelay = 0x8009A670; -D_8009A6A0 = 0x8009A680; -D_8009A6A2 = 0x8009A682; -D_8009A6A4 = 0x8009A684; -D_8009A6A6 = 0x8009A686; +StickExtremeX = 0x8009A680; +StickExtremeY = 0x8009A682; +StickAnchorStateX = 0x8009A684; +StickAnchorStateY = 0x8009A686; FetchSaveBuffer = 0x8009A690; LogicalSaveInfo = 0x8009BA10; PhysicalSaveInfo = 0x8009BA30; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 7ccb915de02..344649b1f8e 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -31,8 +31,8 @@ func_80027774 = 0x80027774; // type:func rom:0x2B74 gfx_transfer_frame_to_depth = 0x800279B4; // type:func rom:0x2DB4 func_80027BAC = 0x80027BAC; // type:func rom:0x2FAC gfx_draw_background = 0x80027E10; // type:func rom:0x3210 -func_800287F0 = 0x800287F0; // type:func rom:0x3BF0 -func_80028838 = 0x80028838; // type:func rom:0x3C38 +reset_input_state = 0x800287F0; // type:func rom:0x3BF0 +clear_input = 0x80028838; // type:func rom:0x3C38 update_input = 0x80028874; // type:func rom:0x3C74 poll_rumble = 0x80028EE0; // type:func rom:0x42E0 start_rumble = 0x80028F08; // type:func rom:0x4308 @@ -2547,7 +2547,7 @@ D_8009A040 = 0x8009A040; // rom:0x75440 D_8009A140 = 0x8009A140; // rom:0x75540 npc_raycast_down = 0x800DC500; // type:func rom:0x759B0 D_8009A5B4 = 0x8009A5B4; // rom:0x759B4 -D_8009A5B8 = 0x8009A5B8; // rom:0x759B8 +ContPadData = 0x8009A5B8; // rom:0x759B8 D_8009A5BC = 0x8009A5BC; // rom:0x759BC gSoundGlobals = 0x8009A5C0; // rom:0x759C0 D_8009A5C4 = 0x8009A5C4; // rom:0x759C4 @@ -2601,10 +2601,10 @@ ResetFrameBufferArray = 0x8009A680; // rom:0x75A80 D_8009A684 = 0x8009A684; // rom:0x75A84 SoftResetDelay = 0x8009A690; // rom:0x75A90 D_8009A694 = 0x8009A694; // rom:0x75A94 -D_8009A6A0 = 0x8009A6A0; // rom:0x75AA0 -D_8009A6A2 = 0x8009A6A2; // rom:0x75AA2 -D_8009A6A4 = 0x8009A6A4; // rom:0x75AA4 -D_8009A6A6 = 0x8009A6A6; // rom:0x75AA6 +StickExtremeX = 0x8009A6A0; // rom:0x75AA0 +StickExtremeY = 0x8009A6A2; // rom:0x75AA2 +StickAnchorStateX = 0x8009A6A4; // rom:0x75AA4 +StickAnchorStateY = 0x8009A6A6; // rom:0x75AA6 D_8009A6A8 = 0x8009A6A8; // rom:0x75AA8 FetchSaveBuffer = 0x8009A6B0; // rom:0x75AB0 npc_raycast_down_around = 0x800DC778; // type:func rom:0x75C28 From 8521371828d15a4c56f93fc3076fe3e93a3d7e8e Mon Sep 17 00:00:00 2001 From: z64a Date: Fri, 16 Jan 2026 18:21:15 -0500 Subject: [PATCH 17/18] fix --- src/input.c | 58 ++++++++++++++++++++--------------------- ver/jp/symbol_addrs.txt | 4 +-- ver/us/symbol_addrs.txt | 4 +-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/input.c b/src/input.c index 9bdfc5d8016..ce1b6dba67a 100644 --- a/src/input.c +++ b/src/input.c @@ -4,8 +4,8 @@ OSContPad ContPadData; BSS s16 StickExtremeX; BSS s16 StickExtremeY; -BSS s16 StickAnchorStateX; -BSS s16 StickAnchorStateY; +BSS s16 StickRetriggerStateX; +BSS s16 StickRetriggerStateY; BSS s32 D_8009A6A8; // unused #define STICK_DEADZONE_THRESHOLD 4 @@ -26,8 +26,8 @@ BSS s32 D_8009A6A8; // unused * and a new input may be triggered *without* having to fully return the stick to neutral. */ enum { - STATE_BUILDUP = 0, // track outward extremes while the stick is pressed past the threshold - STATE_RELEASE = 1, // track inward motion and determine when the stick direction should be released + DIR_OUTWARD = 0, // track outward extremes while the stick is pressed past the threshold + DIR_INWARD = 1, // track inward motion and determine when the stick direction should be released }; void reset_input_state(void) { @@ -47,8 +47,8 @@ void clear_input(void) { reset_input_state(); StickExtremeX = 0; StickExtremeY = 0; - StickAnchorStateX = STATE_BUILDUP; - StickAnchorStateY = STATE_BUILDUP; + StickRetriggerStateX = DIR_OUTWARD; + StickRetriggerStateY = DIR_OUTWARD; } void update_input(void) { @@ -120,13 +120,13 @@ void update_input(void) { buttons |= BUTTON_STICK_RIGHT; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_RIGHT)) { StickExtremeX = stickX; - } else if (StickAnchorStateX == STATE_BUILDUP) { - // track largest value during STATE_BUILDUP + } else if (StickRetriggerStateX == DIR_OUTWARD) { + // track largest value during DIR_OUTWARD if (StickExtremeX < stickX) { StickExtremeX = stickX; } } else { - // track smallest value during STATE_RELEASE + // track smallest value during DIR_INWARD if (StickExtremeX > stickX) { StickExtremeX = stickX; } @@ -139,7 +139,7 @@ void update_input(void) { buttons |= BUTTON_STICK_LEFT; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_LEFT)) { StickExtremeX = stickX; - } else if (StickAnchorStateX == STATE_BUILDUP) { + } else if (StickRetriggerStateX == DIR_OUTWARD) { if (StickExtremeX > stickX) { StickExtremeX = stickX; } @@ -152,7 +152,7 @@ void update_input(void) { } if (!stickButtonDetected) { - StickAnchorStateX = STATE_BUILDUP; + StickRetriggerStateX = DIR_OUTWARD; StickExtremeX = stickX; } @@ -163,7 +163,7 @@ void update_input(void) { buttons |= BUTTON_STICK_UP; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_UP)) { StickExtremeY = stickY; - } else if (StickAnchorStateY == STATE_BUILDUP) { + } else if (StickRetriggerStateY == DIR_OUTWARD) { if (StickExtremeY < stickY) { StickExtremeY = stickY; } @@ -180,7 +180,7 @@ void update_input(void) { buttons |= BUTTON_STICK_DOWN; if (!(gGameStatusPtr->prevButtons[0] & BUTTON_STICK_DOWN)) { StickExtremeY = stickY; - } else if (StickAnchorStateY == STATE_BUILDUP) { + } else if (StickRetriggerStateY == DIR_OUTWARD) { if (StickExtremeY > stickY) { StickExtremeY = stickY; } @@ -192,51 +192,51 @@ void update_input(void) { } if (!stickButtonDetected) { - StickAnchorStateY = STATE_BUILDUP; + StickRetriggerStateY = DIR_OUTWARD; StickExtremeY = stickY; } if (stickX > STICK_BUTTON_THRESHOLD) { // if stick changes direction of motion during a release (from inward back to outward), - // clear the old input and reset to BUILDUP in preparation for a new input. this allows quick + // clear the old input and reset to DIR_OUTWARD in preparation for a new input. this allows quick // repeated inputs by rocking the stick without having to fully return to neutral between each. - if (StickAnchorStateX == STATE_RELEASE && stickX - StickExtremeX > STICK_RELEASE_THRESHOLD) { + if (StickRetriggerStateX == DIR_INWARD && stickX - StickExtremeX > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_RIGHT; - StickAnchorStateX = STATE_BUILDUP; + StickRetriggerStateX = DIR_OUTWARD; } - // if we ever fall STICK_RELEASE_THRESHOLD units below the maximum value recorded, begin RELEASE checks + // if we ever fall RELEASE_THRESHOLD units below the maximum value recorded, begin DIR_INWARD reversal checks if (StickExtremeX - stickX > STICK_RELEASE_THRESHOLD) { - StickAnchorStateX = STATE_RELEASE; + StickRetriggerStateX = DIR_INWARD; } } if (stickX < -STICK_BUTTON_THRESHOLD) { - if (StickAnchorStateX == STATE_RELEASE && StickExtremeX - stickX > STICK_RELEASE_THRESHOLD) { + if (StickRetriggerStateX == DIR_INWARD && StickExtremeX - stickX > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_LEFT; - StickAnchorStateX = STATE_BUILDUP; + StickRetriggerStateX = DIR_OUTWARD; } if (stickX - StickExtremeX > STICK_RELEASE_THRESHOLD) { - StickAnchorStateX = STATE_RELEASE; + StickRetriggerStateX = DIR_INWARD; } } if (stickY > STICK_BUTTON_THRESHOLD) { - if (StickAnchorStateY == STATE_RELEASE && stickY - StickExtremeY > STICK_RELEASE_THRESHOLD) { + if (StickRetriggerStateY == DIR_INWARD && stickY - StickExtremeY > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_UP; - StickAnchorStateY = STATE_BUILDUP; + StickRetriggerStateY = DIR_OUTWARD; } if (StickExtremeY - stickY > STICK_RELEASE_THRESHOLD) { - StickAnchorStateY = STATE_RELEASE; + StickRetriggerStateY = DIR_INWARD; } } if (stickY < -STICK_BUTTON_THRESHOLD) { - if (StickAnchorStateY == STATE_RELEASE && StickExtremeY - stickY > STICK_RELEASE_THRESHOLD) { + if (StickRetriggerStateY == DIR_INWARD && StickExtremeY - stickY > STICK_RELEASE_THRESHOLD) { buttons &= ~BUTTON_STICK_DOWN; - StickAnchorStateY = STATE_BUILDUP; + StickRetriggerStateY = DIR_OUTWARD; } if (stickY - StickExtremeY > STICK_RELEASE_THRESHOLD) { - StickAnchorStateY = STATE_RELEASE; + StickRetriggerStateY = DIR_INWARD; } } @@ -248,7 +248,7 @@ void update_input(void) { gGameStatusPtr->heldButtons[0] = 0; } else if (gGameStatusPtr->prevButtons[0] != gGameStatusPtr->curButtons[0]) { // buttons changed this frame: treat new presses as an immediate "held" pulse - gGameStatusPtr->heldButtons[0] = gGameStatusPtr->pressedButtons[0]; + gGameStatusPtr->heldButtons[0] = gGameStatusPtr->curButtons[0]; // NOTE: next two lines are just a duplicate calculation for heldButtons = pressedButtons gGameStatusPtr->heldButtons[0] = gGameStatusPtr->curButtons[0] ^ gGameStatusPtr->prevButtons[0]; gGameStatusPtr->heldButtons[0] &= gGameStatusPtr->curButtons[0]; diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 4c5e38fe40b..58f5cb149b1 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -210,8 +210,8 @@ ResetFrameBufferArray = 0x8009A660; SoftResetDelay = 0x8009A670; StickExtremeX = 0x8009A680; StickExtremeY = 0x8009A682; -StickAnchorStateX = 0x8009A684; -StickAnchorStateY = 0x8009A686; +StickRetriggerStateX = 0x8009A684; +StickRetriggerStateY = 0x8009A686; FetchSaveBuffer = 0x8009A690; LogicalSaveInfo = 0x8009BA10; PhysicalSaveInfo = 0x8009BA30; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 344649b1f8e..9dffeaeca3b 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2603,8 +2603,8 @@ SoftResetDelay = 0x8009A690; // rom:0x75A90 D_8009A694 = 0x8009A694; // rom:0x75A94 StickExtremeX = 0x8009A6A0; // rom:0x75AA0 StickExtremeY = 0x8009A6A2; // rom:0x75AA2 -StickAnchorStateX = 0x8009A6A4; // rom:0x75AA4 -StickAnchorStateY = 0x8009A6A6; // rom:0x75AA6 +StickRetriggerStateX = 0x8009A6A4; // rom:0x75AA4 +StickRetriggerStateY = 0x8009A6A6; // rom:0x75AA6 D_8009A6A8 = 0x8009A6A8; // rom:0x75AA8 FetchSaveBuffer = 0x8009A6B0; // rom:0x75AB0 npc_raycast_down_around = 0x800DC778; // type:func rom:0x75C28 From 1993090210d331743fe036d87e7b720c57c030fa Mon Sep 17 00:00:00 2001 From: z64a Date: Sat, 17 Jan 2026 19:23:42 -0500 Subject: [PATCH 18/18] better explanation --- src/input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input.c b/src/input.c index ce1b6dba67a..720cf11eb14 100644 --- a/src/input.c +++ b/src/input.c @@ -14,9 +14,9 @@ BSS s32 D_8009A6A8; // unused /* * When converting analog stick input into digital direction buttons (BUTTON_STICK_LEFT/RIGHT/UP/DOWN), - * small oscillations near the threshold can trigger rapid spurious stick 'button' inputs. - * This input system tracks recent stick positions by recording most recent 'extreme' values of StickX/Y - * along with movement direction. + * small oscillations near the threshold could trigger rapid spurious stick 'button' inputs. This code + * prevents such inputs by recording the most recent 'extreme' values of StickX/Y along with the direction + * of motion, inward or outward, and then only counting directional reversals from those extremes. * * How it works: * - When the stick crosses the main threshold (|stick| > 32), the corresponding digital stick 'button' is set.